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

[Miroslav Šulc]

commit:     4661796df64ed6274cf1aa884f6b07a347e01aa5
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  1 08:41:19 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jul  1 08:41:19 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=4661796d

netbeans: bumped to the latest sources

 dev-java/netbeans-apisupport/ChangeLog             |   6 +
 dev-java/netbeans-apisupport/Manifest              |   4 +-
 .../netbeans-apisupport-9999_p20150701.ebuild      | 111 ++++++
 dev-java/netbeans-cnd/ChangeLog                    |   6 +
 dev-java/netbeans-cnd/Manifest                     |   5 +-
 .../netbeans-cnd-9999_p20150701.ebuild             | 127 +++++++
 dev-java/netbeans-dlight/ChangeLog                 |   6 +
 dev-java/netbeans-dlight/Manifest                  |   4 +-
 .../netbeans-dlight-9999_p20150701.ebuild          | 101 ++++++
 dev-java/netbeans-enterprise/ChangeLog             |   6 +
 dev-java/netbeans-enterprise/Manifest              |   4 +-
 .../netbeans-enterprise-9999_p20150701.ebuild      | 266 +++++++++++++++
 dev-java/netbeans-ergonomics/ChangeLog             |   6 +
 dev-java/netbeans-ergonomics/Manifest              |   4 +-
 .../netbeans-ergonomics-9999_p20150701.ebuild      | 101 ++++++
 dev-java/netbeans-extide/ChangeLog                 |   6 +
 dev-java/netbeans-extide/Manifest                  |   4 +-
 .../netbeans-extide-9999_p20150701.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/ChangeLog                 |   6 +
 dev-java/netbeans-groovy/Manifest                  |   4 +-
 .../netbeans-groovy-9999_p20150701.ebuild          | 111 ++++++
 dev-java/netbeans-harness/ChangeLog                |   6 +
 dev-java/netbeans-harness/Manifest                 |   4 +-
 .../netbeans-harness-9999_p20150701.ebuild         | 114 +++++++
 dev-java/netbeans-ide/ChangeLog                    |   6 +
 dev-java/netbeans-ide/Manifest                     |   4 +-
 .../netbeans-ide-9999_p20150701.ebuild             | 377 +++++++++++++++++++++
 dev-java/netbeans-java/ChangeLog                   |   6 +
 dev-java/netbeans-java/Manifest                    |   4 +-
 .../netbeans-java-9999_p20150701.ebuild            | 271 +++++++++++++++
 dev-java/netbeans-javacard/ChangeLog               |   6 +
 dev-java/netbeans-javacard/Manifest                |   4 +-
 .../netbeans-javacard-9999_p20150701.ebuild        | 134 ++++++++
 dev-java/netbeans-javadoc/ChangeLog                |   6 +
 dev-java/netbeans-javadoc/Manifest                 |   4 +-
 .../netbeans-javadoc-9999_p20150701.ebuild         | 168 +++++++++
 dev-java/netbeans-javafx/ChangeLog                 |   6 +
 dev-java/netbeans-javafx/Manifest                  |   4 +-
 .../netbeans-javafx-9999_p20150701.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/ChangeLog               |   6 +
 dev-java/netbeans-mobility/Manifest                |   4 +-
 .../netbeans-mobility-9999_p20150701.ebuild        | 126 +++++++
 dev-java/netbeans-nb/ChangeLog                     |   6 +
 dev-java/netbeans-nb/Manifest                      |   4 +-
 .../netbeans-nb/netbeans-nb-9999_p20150701.ebuild  | 148 ++++++++
 dev-java/netbeans-php/ChangeLog                    |   6 +
 dev-java/netbeans-php/Manifest                     |   4 +-
 .../netbeans-php-9999_p20150701.ebuild             | 127 +++++++
 dev-java/netbeans-platform/ChangeLog               |   6 +
 dev-java/netbeans-platform/Manifest                |   4 +-
 .../netbeans-platform-9999_p20150701.ebuild        | 166 +++++++++
 dev-java/netbeans-profiler/ChangeLog               |   6 +
 dev-java/netbeans-profiler/Manifest                |   4 +-
 .../netbeans-profiler-9999_p20150701.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/ChangeLog              |   6 +
 dev-java/netbeans-webcommon/Manifest               |   4 +-
 .../netbeans-webcommon-9999_p20150701.ebuild       | 123 +++++++
 dev-java/netbeans-websvccommon/ChangeLog           |   6 +
 dev-java/netbeans-websvccommon/Manifest            |   4 +-
 .../netbeans-websvccommon-9999_p20150701.ebuild    |  94 +++++
 dev-util/netbeans/ChangeLog                        |   6 +
 dev-util/netbeans/Manifest                         |   4 +-
 dev-util/netbeans/netbeans-9999_p20150701.ebuild   | 264 +++++++++++++++
 63 files changed, 3472 insertions(+), 21 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 3fb7df2..cd179f1 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-apisupport-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index d8778fb..36714a8 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd SHA512 dd4bdde9574a87b46b02fd7204b1e90394bd87dc572dfa015b601203b026b35571f20323db834a310f90aefe6e4a822044b0d71d535a7351137219b50ecb2aa8 WHIRLPOOL f3721521a33b337d7dc24d6b49b0b2fe723f5ec446a5a4befb085051140a41bfd2d3081876e9f02f8b9932a3a0997b92211cd964fe372e40b42813df5db5170e
 EBUILD netbeans-apisupport-7.1.2.ebuild 3143 SHA256 cf24048c0ecca98a7d6371624bb0ddfb78663bead073d515a7c84229dbec00a8 SHA512 ec44c263e786210fd64c9ebb253bc9d4fc34d3be9493157dad06007c19734672bfd767765c003393d1e5cc6755fd5d1eda956b00c2092e98592a73ec1af4e729 WHIRLPOOL d619c304a994a2b818d892fb6315d092588f2ebf95e566f7a909f92daf21bb368a28c4e1af876ae585980dc82996e62aba30b12c41461103c23620a215480b76
 EBUILD netbeans-apisupport-7.2.ebuild 3126 SHA256 b0d64795b8403a932e3e20721a116c755c4de66fc36f7191476fcb4a226bad13 SHA512 cea062a72a8e75a9c2fe91c323f83d542a70149336360e1c41479f401fcae5ead6a301c8a7d5704d5beb27f7810b5d1e3cff0196cce7a26890a001c570179f6a WHIRLPOOL c286f4e4d3a02cbeb1a6e13b2005dc5435a6e9ec026a98fcc00bb83222014b800cd83f437c69352b48d16bdf442a6c7ebbed6aff86f10b3c5e6cdfb7edd9e184
@@ -80,5 +81,6 @@ EBUILD netbeans-apisupport-9999_p20150625.ebuild 3390 SHA256 1b280a5a07600cddbf1
 EBUILD netbeans-apisupport-9999_p20150627.ebuild 3390 SHA256 00d631af5173a6daa1deb1bcd7f9809ab64ba352acd14d77f49c97368e17c74f SHA512 54c5a0f4b1b95ce6dfc385675628070b92474ed001daa668c8e7b2ff0a5722e28df91b7522ac82ed2257c3453ea81ffea699c7d6320cbea60220a4b72e2b19c6 WHIRLPOOL c56f3636de58df7c77827f8cc747138fb4997b3591b12844b78f0b758484516eadeccfb0443b959f01f8f2304bb2727fb015c394da44c7dd80997c3b5151584d
 EBUILD netbeans-apisupport-9999_p20150629.ebuild 3390 SHA256 8f72cd2bf652e71f5ec21be348900ff52af1c39b8856dd0202b5eee16bf5167d SHA512 3efec4617af3fa6b9287098767c7f7987acdede75658fbfdfc73b4faa2ad0f36f5a97b1674e94173bb9c49f8b30be39b35068f7375b60c9bf5028cf8be56298a WHIRLPOOL 958ce7067096d8d2fc4ce23e7af9ec4e37f8d3e6e6b6ff0297d8f32f7cfc9d34bd875f17098ac11c1b28f8bb39eb6c69d9fbff9e60241b6237293b6998626ade
 EBUILD netbeans-apisupport-9999_p20150630.ebuild 3390 SHA256 cc9dbf33f9984e0b1eab3e2e3991fecdbbe5a13a4f0d1fc8268d0b5f965ea22f SHA512 ef97d5577aebe3ab85c0cef85370437984633ba4527ec0b5b34ca5c616995f4571c9be1687e7c4415663e8a57008d13fea262626837270c39548d82fd077d311 WHIRLPOOL eb592c462c9f1cc0737efdf1292b24c336985ad5409a21ad2a85520026748726beac9b9d92677128d7969878d65603eb7c37c404a8ecf1f0ed863dc172ab3b84
-MISC ChangeLog 177481 SHA256 e6c90d40877899e811b1f6b3e9e1fa00634320c32edd9013440900327232502a SHA512 382393cb69a556ce434861536a376a5e23f733d2c4ffb53f4567a1f502ec579f3b3a3ebb1de036fbda17bc2e327434521b262307c80ba6e82534147ab06d2d1f WHIRLPOOL c7306cdb6ed302fc8bc16b98733aca4f29ac756e27714863b064a1d61faa7b6d04236549c5ef111b1635814063d7ca27bb60f395ef065be98a1483850824bc62
+EBUILD netbeans-apisupport-9999_p20150701.ebuild 3390 SHA256 c03864c8cc7bc963f0fc05402d901dbdc15c12a21072173127867f43b7ad35de SHA512 6961ac3060120aa2490a60e492ebfc8e7e822e72a3679c1fb91c416af08558635aaf72ffb5ae4805231c8636b5902052d55cefd1f2ee53eb1183c1b8dcadeb19 WHIRLPOOL 736c0b994556e928be11d824557161717a5a5125bb524c598adb813b12b49e4342c49eaedafef37811d065b69ebc674a5fb5c86a1d7e83921e1a66975163260e
+MISC ChangeLog 177662 SHA256 75e56bc93b1c9c2312c043f937574d299457b8001f7ece0c88c98b1748050979 SHA512 c13810059779c85ad07aeef3bfb5652d01895b45b8207e93b4a07aabd6d18e0e2895dcd128c71186ae646ca0adc54061b7bf550df060cc71799d5e1197cacafd WHIRLPOOL 7c1625625ab80813fa23ef872cac88b8402631311df10260c8e2cf571a1d2a9a181a6cc2f335314bf81d0668a72a5cb092e28dcf32d60dbf46773b295dfe8202
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150701.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150701.ebuild
new file mode 100644
index 0000000..7134554
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150701.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/ChangeLog b/dev-java/netbeans-cnd/ChangeLog
index 9023782..ddc429a 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-cnd-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 890992d..2e7d14e 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -17,6 +17,7 @@ DIST BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip 177647 SHA256 c92c
 DIST BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip 31891 SHA256 dd9105ad309b56d22ef08573ec48a5f21baa2c50f8606df9c7b6245abd9dbe72 SHA512 288229a85536a45fbae6ba5a4dc085fa2053264259f14833cd435f64191a4b2f4b93c3e9981589087ec293afbb0fc76e97d2b5312a196e3b3fed11a605ab650a WHIRLPOOL 69379d331a68e1c4eb15aa8b1ff5256c9b98d9fad4688f2d306841973b151fd22ddbca25c5388af39b487b8810a2e521ffefbbb9775cf02271626179c3810c04
 DIST C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip 27300 SHA256 8bcfad100ee9664b7fb2b6b8f20b14b3790121b06487e790214c571c9ec1f21e SHA512 21e69d6881efaa27ae91eb88cd851bb1e67c755668b1f96bdbdf8f4af2b2aee093c37b5edbb85317c22143083ea1fd1ca7386cb9523c32f502d86d933e27b739 WHIRLPOOL e09be2e79f88d6dd9d2e3cc89710fdcc67d4f825d44916a70a5625ec8b2f12112c9d9c0c39cd2e579d3c7846e9bfbf5ab709197cc784f5742a2ab9b22ae89b07
 DIST C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip 92177 SHA256 71e6d46d9c7e624bc83dbfa4edde20bfdcb47ae76dc2b19dd553d23f22b454e7 SHA512 64b15aa898a45c1dce0d9c58ec4ef8c3dc1a32e1213543d98002cbf5419d67b3caf4357c8a252e36951197f3edd70e34a226c989e5479ce3b2d1405783d3d530 WHIRLPOOL 675db7f81ecadcecfe52f18cf8bd465867c1dac12f818717248da9a7d071d45adeb3c6af2e6ac1863bb5ccca36ae9383722d2361c28af52e51e5f2ac34736e89
+DIST D36EA6B9D385551FF2AD2B8DEC19EDBB4F96666A-clank_0.3.6.zip 7263460 SHA256 1aedac94d942311498cae10fb661c1242ef3ca5be2a18b4d21227d74f0b5946e SHA512 70633391815cbbec75cc37bde390e44336bd61a5a7d2b77bc8050be614745bd0071fd693473170581de4ae24ee8001ce27a0a10c0b5627ae8bb368a715c2c32e WHIRLPOOL f82bcc871761989a9bada6b2ff9aa083f754d83a6c0874fb3f27f34da6168788289b9e7657d94f720defa356ab48d36a87a8c8593e44a785e17f5ce97fab126f
 DIST D4BF6B1BBE51F2D8EEC23CCB28C40BA587885B71-clank_0.3.6.zip 6872400 SHA256 89d0d5e295ffb487e42110e304c158886fe211073e99534ca4bcda75eef4db40 SHA512 9dd5413575fa88406709a0e930a13ade04965ef4684ad7a78b89abc81974f3af2a55d2cb56acee649c4b116da8cc39aec9b733d2090dd05c8138ab3d9d33bd21 WHIRLPOOL 7b2bce0748303766e4ec6f4f46425c3c584d87a1940ad9f29c7331c9e14a99bf128c4d43704a70b3444302874bb43dcfa3a3f70b8a7a7d87d58927b10586b0e0
 DIST DA2DF3E815DADCD2B6A18AB8DD0ED832BA70D077-clank_0.3.6.zip 6865670 SHA256 fe921bfc83944ea1f00a01ea78b5f202b26b8dcd15687e13da2d3877608a7e83 SHA512 02e4e5ee4618ad53a2ba2553d86d6ade7c42e66e2372de575940dd1f72f7e4a864016bec28424ed5282022f60bcafa37cfbf31db069afb378365682809519fff WHIRLPOOL 646469d1e2434f760d8854b27810904f7b964c4e2e8d061bb365e8d1457fef962ae883b92b69b2eacc479fbe4131caadd35c8144a25548b42975724e16938f22
 DIST E03865DA6B38B4F87DEC7F3066A6259B47EB449D-clank_0.3.6.zip 8218974 SHA256 f2a55be466df9441d628cd5ae09113e2bb65719d2297ab36d6c7223d4a27a14f SHA512 6ed22fd49a523904b4b77fd6c5e1d1cdc748ef50dedd7278dd3060c8e9466c6288ad38a93ddf0077b2f84c2f8c9c3c0ab3390ac6aaba6835d4a83807758f324a WHIRLPOOL bf1dc9b7906716456e691ddb736a336208fe8800025ca9298989f5910a6869da2a312cd718059b837b64c093ffe2be48347ca90b97b787879e0f90642376eee4
@@ -66,6 +67,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-cnd-7.0.1.ebuild 4602 SHA256 1336b76de715719ef59a3601dd5ad3b24992f58096f874f0e37935ec0d088d8e SHA512 38745c3ad6364198516ebb64002185fd05c34dee75acdb3933221d772177d5d6fcda853bb63991f0d071b21079fdab0c090db93e59cddd8daeb8f8d571a18a41 WHIRLPOOL cc196275289a01c1168b8c2710e0be0c2483cc86dc47b8fb3383ce1141f7bc11565e2b2feb95436cf448c09aaac7ee8c8804316ce6782d8853c0742367c0963a
 EBUILD netbeans-cnd-7.1.2.ebuild 4218 SHA256 6c80020e4204226274f4a24413dad8bf134f5beb7aee4ecc53d6b4d709093bb2 SHA512 299c07f5e5d930045e8c8ef3d04009beee7035daa2022a803e6dcb16b380096bbf5014c2d684094705d06b4608afcf6925266ef609a483a86452b03505dcb67c WHIRLPOOL 6d6c8bddf3490282b9134315f9bc94ff55675160056fa4c98c302a59d943a9cb38f23ffb9ca313c82061d84d0ae86898ce72d16756d41c468737e319e68f06ce
 EBUILD netbeans-cnd-7.2.ebuild 4201 SHA256 0f77a1a343d437e2eb1236722b27b2f2f03901ecc1afde29e1d38e54aef7c81d SHA512 b5fc985d1280ab900cb5125691a0ff99bab075ff5e93ded9af256310a7dcbea87a28a52ba383875caa24fd0ff28bc8dff4fc0fa0242987a673fdc729f7234b58 WHIRLPOOL 19e79dc426fb05ffb48ff9b13de3bab40f483b6dd9d79514e8f819029c278ee47a09c9531b5b4dba2014f805d502e66745f3355e2932e24e0dd9b5e3e273d2c2
@@ -103,5 +105,6 @@ EBUILD netbeans-cnd-9999_p20150625.ebuild 4796 SHA256 b3a1480ba9e7b5431d2eb6b10c
 EBUILD netbeans-cnd-9999_p20150627.ebuild 4796 SHA256 f2b71c7bd8b7af26359d53e72274acf8caac1437f6b43ceca8bd09b79be4d2f7 SHA512 0c03b148015bc4905c6af90f7fe922367017aa5f234fc460fc2575bec3f74d14bb7d8d706c6d9ca3c72555caba313dd9e71f9a82bb741c6d0458fa6d60910d58 WHIRLPOOL 2ea31ede34bcdd409a3110faf41cd3d3eb1afe52a7a566b494b35251c0e3cf0a97bcc09f73ac7a5b9deccbd1b253130695882916d84ebc7865b59ff5db6e406d
 EBUILD netbeans-cnd-9999_p20150629.ebuild 4796 SHA256 36e8034c39fbdac777ed900a8cdb19ab599376a09de7b06c53086271d8bbae85 SHA512 8207a3dc85d5a0a78debab3d72d5ea1022c125a1610ba466b7297a65efb14d942552415c730c868ca9743107918bf6a308b5c142064eef35e68ef48e5c2a3c77 WHIRLPOOL 20da25b0082cb18d57768e7260f3e5ea9e99af210e9545e47f4fbf0780d4160cb366d908af5cb128c2cc2e6f74c4752bb5697a3c9071259cceb87505a3d6e190
 EBUILD netbeans-cnd-9999_p20150630.ebuild 4796 SHA256 cb5ec7cfba23035ad6414d86ac32544be7dc23f7177476f9721f6cb4f98329b2 SHA512 d71f51bf2ece88fe084e60dfbbd7a56417e918fd1d0879c92e68a3cdb5cc7437267e4d2864c387c41fc3c0b1fd4e232a69fb878bebd7138eafb3395b72779648 WHIRLPOOL 447419424345bbf680a2a0ed3b2ac83edb2387f4abc06ed71bf443a49d4eb8da988aa18317d1435c8d839387f035733bc71390ff9dedc71a297809a2b2954fd9
-MISC ChangeLog 161989 SHA256 c20e101476122aba1f8e13704f6aa55c798f41f62e44fd0a07d3dd5bbf865284 SHA512 ae21840b98af383381a48b3320d3ae38f5de7da1a0bdc82cbafb87cc3011c5610f1e02bc374f7762e40b7a39e86cdff301d21ab9fba542a2000f00b4829d761c WHIRLPOOL e4819350fd4d3bc84c91cf79623057ab21a3829af23cd8dda7feda7aa19560740066f24fbd959e608f71ecceb7c848be171f6223b5b3dda951ebdc0ced0a1368
+EBUILD netbeans-cnd-9999_p20150701.ebuild 4796 SHA256 7f6c1b3d13abce85080ef54bc504f246a58356520be11c7a5a8996babba3d491 SHA512 bd1d5d97331b8acd32288836d4d2e5184ca254159c4f1f3e4b9d13831b67731cc20a8a79eef7be0abd848768a19d30e5b30dca7a469da901eec75eb1f0fb5dfd WHIRLPOOL 1319735f9bf688f013c13c00039b1a4090e26f5a67c3ff7eaf17f989adec8d025c8521fb524d48642a8492ccd9174312e9ffb5f5d26df8296e3e3c9eb9ab1b28
+MISC ChangeLog 162156 SHA256 3ab53a96f0bded177ed7a35a414d998fb6229fde2bd788ce2bd62427ac30b8b2 SHA512 c0b7a60b77230396558c3b75524f29467e268ed24ace711a626773f1f71c897eba930ea51f4b16e4d254451a19c97146ba02749f61be34fb9544ac53d1db33f2 WHIRLPOOL 521f94ff9161e0329fb27a1a26c3b6df0c4d97c10b5140471f50d1ec3881c710c07cc812185f21b456f7f9e181387290a9ee89e9cf6aaa77201fb6b6e4fd87ba
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150701.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150701.ebuild
new file mode 100644
index 0000000..39adbfa
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150701.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/D36EA6B9D385551FF2AD2B8DEC19EDBB4F96666A-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}"/D36EA6B9D385551FF2AD2B8DEC19EDBB4F96666A-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/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index 7df94eb..552fc0c 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-dlight-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 997e1ac..c97f972 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-dlight-7.0.1.ebuild 3624 SHA256 499a9303a1972ee89dfa2685e1dc1e4511c7531ff3b29caadd1136ba25dee82e SHA512 ad60adc5d64f93d03e27170311ce7bd0a6952c8b41cdc51385f8efc9140593201064d162b3130bff7a003570de11963d375d3676476115b1129ac74632d4a227 WHIRLPOOL d68dcdba50b2565d40e1adc484b51c1ed0171c2fcf99fbee08a221e6d9767f96d161d45eda612eb4c4d62e0db6826e2cd124b83e11ee2f7c9bfb6a440ec6821d
 EBUILD netbeans-dlight-7.1.2.ebuild 2935 SHA256 dc7d110b80174b1baeaca9c005e2cc9167540f186c7794067cfb45d335251b9a SHA512 7dc2db63ee40a3e64375eb49e669c54f88cc532d7ac8c7320329f8378a3be15ebc4536208ea2975c7fe4a9b3f2ac60d0ec5b8c9a9da392587fb04838f101e0ec WHIRLPOOL 1801653d9e146eba02642dbdb0a39c235a40e5d3d5ac8d4d5b8d2a570aa62330638355ee8df76693db177c58bbf31271342215c70d7e198e4b6bd905984ed9c7
 EBUILD netbeans-dlight-7.2.ebuild 2650 SHA256 9b0c0049b7cf6894cd44327c3697d4ddfb0dba2aebd6aabc1821b550932cd69d SHA512 0584c2a1cc65193673bded284c454b430fa3f5774c33d704922977d25ed26bf88d090670e330299c85ada2e897e5f124ae9f635a6f8be7d7fd10740482df7eae WHIRLPOOL 1c27b0c84a34865cb8a84062127f49aefcd245fa16fb825d7ee57d24c3f5841935242c16b3250319078762ce4e8aa5bc8dbd8dbe497b39af8e027b9e39ee585f
@@ -86,5 +87,6 @@ EBUILD netbeans-dlight-9999_p20150625.ebuild 2995 SHA256 c8008ac700e2a60fe2956ec
 EBUILD netbeans-dlight-9999_p20150627.ebuild 2995 SHA256 ba2970908a93d7a67f1a3278d344ee3813553482b9104014be05cdabdfcbd15f SHA512 2b5fa3642272aefbe2b17f2bfe080add4f9f9976fa1b11179d34f9d638431720ec6dca8f3ade005ab9c0d2ec50d7dd476d06fa57d65b1d862a2b337337bb1803 WHIRLPOOL cb5684448a962f365587204c70864f15e7b24ff5f1f1ce0134aaa8f5d3c0318cbddc6827423743844b0e3ee9ed73df324f83480310b807f6fba0297a883a6aa4
 EBUILD netbeans-dlight-9999_p20150629.ebuild 2995 SHA256 d35124c13ad8530685a5613b403da06f9e235cea4bffc75ac27235c5cccdd513 SHA512 af94259a38a75a0f9c6b0df6e563009d407f0264780c6e81927b3dbbd65ffa9faea561a5a944f6a1d948515b34b7860ba76476ae0ab8ac6998e10f81346c0efe WHIRLPOOL ae78233f4da90088e9a2f18b7c0666aa291b01303dc70c0d11a3f80d1e4aea7c74a8141c2d9c8e93fb50a12da7768104689ded45b4d18a816078c1a9a14e4fcb
 EBUILD netbeans-dlight-9999_p20150630.ebuild 2995 SHA256 19346e17e35db14cda5e36775caf336bd00d4382f7aed0925d1c894d6dc9f340 SHA512 ae4af303cacfabb54d46224202ce99bc8a34655161fddb058cfab6b3c38494f641dbdb0cbf0ff6a263385dc73360ab49f68f610b3080ff2dd33508638e5c64de WHIRLPOOL 905cbf71c7df30918aa5d4e7702f9736cef1ccffe272cbf8ba592b02547b6ec78bc6560a2ac4e59be77f09be8165e6bd68bf5bde8de62e9b761c7f056d0dcbd4
-MISC ChangeLog 169070 SHA256 9a8c94fac326d982ee987cc7d37956612ecd3f5cc26fde795acb84d3a3062db2 SHA512 d8f6ace05db4f330c199f233a3f4b77fa2bb4b94722c63d71906b80afd8fda39f43b327b7d0cfb0b5be437d246ebd55a3e4feba7589d5ff0ae8b915162d7e7f3 WHIRLPOOL c71ccb2c63aab0074cae77103902c4e6fa05d4dadfeec154fbdc3bf47efa0c664a82b3df48b3856f86e6ca6b6c99633f4bfa14838d17cbb21661a9067f77690c
+EBUILD netbeans-dlight-9999_p20150701.ebuild 2995 SHA256 be558d6ac6ad27d6b59c347d444e7dbfab9bb899f90b4f8ebc24a3ed5a7a3da3 SHA512 29dd5428a3ed7d0693ab499911717ffa45903748ccfcc4ff061a847110be9db6a2dc5324af1300351c93248b8eaa7ef651efa68f253538d286448ca94e201fee WHIRLPOOL 2e4e499f892f2cb23fa299503734e437d69db87c85780a7852500cf59953d0d60c8ffa8a9d55a3dd9659a96e176fbe34b54b304451822a7068dab3a6cb7c837a
+MISC ChangeLog 169243 SHA256 294a771ebe7e6d83e0157dbb67264b7348b00f3629f463d70f43376356a0c050 SHA512 ed05f12e55347590bca8e677ede09323a510d26e6ed7bdc7433eb04dbdcb4a28085b96cb8c8448d225a01b5c275ae90ea609d09a0f5cb2df220b95fa7e8e39fe WHIRLPOOL 1ed419c19d2bc138c46bd5fcab646c2a87e12a530d48115ac3fdde3f3852c3f8465a8d9edde63459d5c23a77781653941749f1619dc1c111d6f735e7bd2f19cf
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150701.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150701.ebuild
new file mode 100644
index 0000000..e68c2db
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150701.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/DF1C6C0A0B03BC0147D215D01DA34F2E5DC13245-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}"/DF1C6C0A0B03BC0147D215D01DA34F2E5DC13245-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/ChangeLog b/dev-java/netbeans-enterprise/ChangeLog
index e48133c..f217cc4 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-enterprise-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index f00a174..9501c3e 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -132,6 +132,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe SHA512 4d24162c7920b9a1c65e6c6753900ead387a4941c2db98b522631bb09889c281bce048a74e2e584f8b5732cfaad1d7125e0cfd37aa2dc81fe85160b0e123ccd8 WHIRLPOOL 35eb648c37cb6e59aca7969c1074c2c280814529aa7ec3c3191b0d3f2a92fa24e1a8d981f343e4217fff52f6100b4884b970df734c45145759889aa6e6661ff2
 EBUILD netbeans-enterprise-7.1.2.ebuild 18060 SHA256 f63721b8ce5e1afbc58f783348f66f1e3501be519a1c9c1287ef860acc64ceda SHA512 2ca89ec8f89f106a284136d4d0ed52fe3bcf49c650d56ded6e62306c531e5e41f62b8aa923cb544842cf6e34e5f433fecb278bc1515abac987e2d00fb68ffa26 WHIRLPOOL 879067d72285aa6c7273e84ddc3dfef7d09c7cb9f9a6c279fddfbd3eea6439dea053d3c648fcd56d47ef2292db14d101307eb1aa8b3081dfcdbc3dac4d0c3ed9
 EBUILD netbeans-enterprise-7.2.ebuild 17752 SHA256 2f46916df731fe33c5d4626ae580a77686c392932a3388f755324bc3184bd636 SHA512 3543d033b971108fa2b8e6633ed640e812a83b34807e1cb5a69d425823d1fec1c13ecba3cc36fa4504fbfd6297e7eff1ecabe07d01725d9f13c99ffd70d220ba WHIRLPOOL 512753153bbf714ae3fbf9c580f350234d88bd5ce5690e7bc0fadd1c355bd38c2a5c1e9adb7993c3678d759661bbfb1654b0630e3535a2fb9198742fa7fd2c1e
@@ -169,5 +170,6 @@ EBUILD netbeans-enterprise-9999_p20150625.ebuild 15937 SHA256 4e50c067e23d3b609a
 EBUILD netbeans-enterprise-9999_p20150627.ebuild 15937 SHA256 09001b8d8b7671fe5ceb34753c279215498d8fbf6f5846658b5564cf632cc246 SHA512 4eee45826e514c112c64682b6d5e4b618c25b7c2d8769204ac28537652f5f64924a90f8db3b2afc71f6e57e86a051560da88b244d5e03933b822769a75426b94 WHIRLPOOL 63d1651862ecb68c974fc33ccb7c6f7d227bee70df4cfead569a1f27114948076ae1aa2a81a61f26f11f40654d6eafee94f653eba1c5a421e039a9fc6a0a7ada
 EBUILD netbeans-enterprise-9999_p20150629.ebuild 15937 SHA256 95cad02ca99df9f85d6e7a5fa1d1becfe9b7edd3b964d3550979ee33d0e0f4de SHA512 7480c7af857652c9f6b478c9ee489a986c0ba407f5bb0197587e124711509e875278e3e79c73ca33e183c4d8115fbda4630180b0d2987ac5e5c45979bd7ad1f5 WHIRLPOOL 91ce063f5bb158d77e8a913df5a4a5b5347530246d0e61ae54b5d4dc0df990c2dd3f8e84238b4b3c9cb3036c49d4af61fa5b2d4b760cda383f4fb6065a39543f
 EBUILD netbeans-enterprise-9999_p20150630.ebuild 15937 SHA256 db9eb9092364b83833df636aba914272268b8f838922c6171c0f542190132814 SHA512 71ba55f9588a8a64741494b5db1e7b89a9b23b511cca9aaf3ea2978227ca9118c92669b8d1d3b0f9e120e0c52ee5aacde426a1a9b2907caf89d87f15a1bbef5f WHIRLPOOL 4f4a14688568eee71e80631c39d0bcdb650d7ccd8956861ce4fdfb978e776fd61a62f75b19129980ea6dec1392ed881b46fa1278be31d325fb99a4aa7f8eb072
-MISC ChangeLog 178006 SHA256 0ee3f230fbdca86cbe238d8a04f59fd79e7c74ca043b37b4c348ba83524398e4 SHA512 a8195d785c1df2473eaafe1d49fa1bb4cc3763c28c73320c5404048d1e6550e671b19f4d262da0f9437d237225a3378694d920fe4cd1f799d58b784f6c18af64 WHIRLPOOL 42249f5c850864761b0300acf839b5ab75fdf96447e29cbe6f43c2548ebef5771e18625fb68aece5f05a2fbaaa6129df389cbff5f6c3797261dbab6d79146e9b
+EBUILD netbeans-enterprise-9999_p20150701.ebuild 15937 SHA256 371749f623e5bc06dd01f82d991726b4d0d845fbaebb57c3628021c1f6a4edd9 SHA512 e3d0162f8fa03c9884f3cf2cbd7780e461bf5b4d2998612be8c5b4c0c6e5afdd53bfc2535bac2e2b9a276a478c9cb242b2777566b44ca1d8cc73bda6e9fcb2d1 WHIRLPOOL 3e728404450e05891e6e45f97fa0e08878164277b407386a00fd2734fc6e5f6d1cbc7be6f35017d47906994c68d5518d5ab1ecdf56ec243f3b3818e297c76464
+MISC ChangeLog 178187 SHA256 dcb49fa7c36f5c5c0625b84af240e65b638f4ff03b53bf1d4cbe81217f2353db SHA512 9090eed7cdde702b5983978cd0d08fbd0b3eff657718e0ee6294d7cbd6a5841574fcff3f017018b5274700f69613849e13cb48e5f88f8f1618e1115b45253a8a WHIRLPOOL 578656f046a10bed1ce1276dec174291a0c693580274a4bb83184d27f42d52c0092ed6402d2aaeabdda97c77a043b112e144041043ff22ec80077b5e6f03d56b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150701.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150701.ebuild
new file mode 100644
index 0000000..e05331f
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150701.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/ChangeLog b/dev-java/netbeans-ergonomics/ChangeLog
index 2f2590d..85d6efd 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ergonomics-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 271e4d6..7485116 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab SHA512 3ba2810e650726f48fbdb1bc0c58b6ee1e7d9d29d4be3b27c00bc981b773f26d979fd90154184276e044eafd1d4d8940b47d6f0f58589f9cff7fbadef5fbb05f WHIRLPOOL 5fab7fe6492f91bd0e97a8a95c0652266d771e9b60957e16ce6ff683c1e38081372151cd8c7bea44ee1f1dd7bf435f8b00b9a1a23e4c6106c990794c6093ba10
 EBUILD netbeans-ergonomics-7.1.2.ebuild 2893 SHA256 cd56250980429160b8fa9deb17f15050d016394d5fdef19bf772cf29988c86d8 SHA512 32d4556218791a32efb8cf8ec8303f7e8f27bfb03b97af0c66cee717563c7e02fcd9e350b0425ec0cec28ab09865d4815aba1471ee958e05e7c42e421a7f71c2 WHIRLPOOL 318c8528c2338c1e2f6e342c263be52753fa74c9ac934b0ee60fe0fff2146e86d1761fef8eaeca8eab844709bea2196fbe181fad1f689a9d5b9994da3271b4db
 EBUILD netbeans-ergonomics-7.2.ebuild 2876 SHA256 ca7184ac24c255941c4ec3e686c4237ef0af4be7242c44417fa799813083515e SHA512 c6537bedf2fed4ea914c74a208124fe692af837ab2c81c98b8aa0347cb9d5af496378a8c042437facced26d3b42b101225dfa8b81dfc3d6ec4e3e5613e359f72 WHIRLPOOL c7e4c08ace118690f454dbf6a9040bff3e7013c646947fd02b05bca2b4d802393b6eca3234c6228f8e4df4da1ed193ecfd93c848038e4dd9ae3f50959692aa15
@@ -80,5 +81,6 @@ EBUILD netbeans-ergonomics-9999_p20150625.ebuild 2919 SHA256 cf33afe0803700bd2a7
 EBUILD netbeans-ergonomics-9999_p20150627.ebuild 2919 SHA256 9f9555f57aa1437575d9c3a10b5ffb7345daa1d30a199331f92ae941724edcef SHA512 9cd1c62425cfcfa348c3c9f94e6b31434e12ee65b07eb113fe3e007652ae9476e070bc4312233412656fea76e9aded48f3f9686683c5b683926b726d7509787a WHIRLPOOL 04367fa6600dde11ce68c079d64f9d2d8f087980e1e92693ea42a8a222a92e8629a5e2f0b566411bcc46cc00b59624a31ab6d44eb760a383dbca4215d5f29eab
 EBUILD netbeans-ergonomics-9999_p20150629.ebuild 2919 SHA256 6c9fd05ccd74ecb77835161cbe09e5fa43f7bb6ac02f9a5f2a875cefecc0939c SHA512 963d7c8a0ed8cb0790429cfd69afe341f2fd3ada94dfb172047d86982bef9396d80328ae8e11d9ced8cca99133c97fa1f8e84849cedc4b679669d7b3909acfee WHIRLPOOL 3e967c9108902e0f4cf9f3a355b5471316f6bf13f4c63fed3969b40022dd07655a98ddc064e8515212a2c2123d57e86c79ebf23a6d23969f50a6237d61cc794e
 EBUILD netbeans-ergonomics-9999_p20150630.ebuild 2919 SHA256 d96a6abd98f00f4b298b87e2111c43fd7835b4b5d295d56621481fc001ea7a1e SHA512 11a3e6ad745782b1f7c1a156a4a7903bb2816e7462206080e4058fb8bcbcfe71cf35ffd067ab8f8b81c7f275fb7f5537261d93546ae0df9b86191679c7c714ef WHIRLPOOL c90121edb0e1494d5a6a362e13004dfe7e4fa95340f257a6ae6deb3c02972807b34e6995c5241caf1e2fc87e8aea3d156c57e425e581dc46da8b27baa91957fe
-MISC ChangeLog 177481 SHA256 b622ba3273f4d4811f4d37798c366a084ccfbd2005b6d2e2292972fa13e9473e SHA512 bb277ae81b17c16e63c1e6bd3a2824b4ebff920621a56799f9645de1dbdb7c37cecfeca107e027faebbec051257ebb121ba5f6e1b74004767eed2fc493b0814d WHIRLPOOL d1c3941b883c813cee3f700c05b47ef9c748698b4da6a7b14e0c0c96e0ef2f7fb15ef9a2e57f93c2ec48402de91cea1340245266c8b02b91161fd8d7d651f6cb
+EBUILD netbeans-ergonomics-9999_p20150701.ebuild 2919 SHA256 52cfc8b1ae6bceb12cc2e3b10cf6d6f9b62bbf3439578e156ca69177e2ef62fc SHA512 33d05ea95eba83aae049f03b48974530fdaa9ad6e80b58297521851ecccd6e401df2fc0cc6bbccf9d1136b7c4cdc5d88c182fffa298420144a9a38669c04ecfa WHIRLPOOL f162647782da46e4396744253364ed424bb4f9a24cfeb8c3e336fe8e3eb275f30c24dcb6404a971a0e2c9fd91f7d841071f510729c920abd17d4c205f26bbec9
+MISC ChangeLog 177662 SHA256 99f8d69abd1be83db458d89969c1f6372ca27b6e1e686a0105f26dc0bc2f35bf SHA512 a83b3d6b3c0ba2b79c95311d8bae6f9a65cfe7b2d3347a7add344be382ee87725000a94c79cb858f347cd4034bde66bb6660658a91cabf08a7b525b9231ae83a WHIRLPOOL 43ee16e5ba8c8a8c7b6a39c9f914138f6ca9aaf983d4328d1859b7e06d8ec00849bae029267ce93c97a8737f3f2ca016932f82ac93d40c76fd4635cb71751c43
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150701.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150701.ebuild
new file mode 100644
index 0000000..23f9cda
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150701.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/ChangeLog b/dev-java/netbeans-extide/ChangeLog
index c98fad3..316a3b7 100644
--- a/dev-java/netbeans-extide/ChangeLog
+++ b/dev-java/netbeans-extide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-extide-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-extide-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 47452da..13cdcfe 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3313 SHA256 d147df43b8e55de81e0429604a2497a82861864ae50fbb85368a3070e1c266c9 SHA512 8f2722ce12c1582ca6e9ed348fcb37b9969585037b5432e592e5dd6ef4b3e49c58783da5fe20f088bee07514e3b42de7aa36607900b285c32c4b91fa218df90c WHIRLPOOL 0fb074484787a5e0e688dc734efe027ff6dfd082dd63bc9bccc612f915fbbe33a4f93db6c43d345abc9c191e22ec196aada1e889d1240968916d54c69497a2d6
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -74,5 +75,6 @@ EBUILD netbeans-extide-9999_p20150625.ebuild 3383 SHA256 7e39a9d45ee00985d6c69bb
 EBUILD netbeans-extide-9999_p20150627.ebuild 3383 SHA256 61c4dbf3698ddbfe9f8db87e508f5879c3b424a899ba184a52ef7555711137e0 SHA512 f76cae44215e0b39aaa56805e47d934b38797936d7e156ce2720578a7a298410468504b85c13217ea7a5d7e9876ee7754f638e8129beb7d1ee8324de1fd13205 WHIRLPOOL 4e75c7bf97b21f8642b09296e26590cb61982462abd2a84f624728a3c42f7aa59d996afd2f28d538e1de1e4a76c617911bd959ceb4f7262e7eb5cb9c44b1800a
 EBUILD netbeans-extide-9999_p20150629.ebuild 3383 SHA256 100f1d590e1f71dccd7e5a659e53017bcc0453a68cb791b56afaab60b4302cf3 SHA512 6a7685e84ab248292049ee7dfc7a294743e5f14dd44e4c16bb02db9932d0e1a3796ec4facf87a39098724812cd29f500cb75d321a14d0cf77c684a0f60ba5ecf WHIRLPOOL bd59d9f6cb301358e2d7b4ae69c548a71dfc63bfe550e6a1e39c84c9fd13f65dba6e46c2bcf6108ea628d98c5d9f49ba63c7aae52efbdfd3d7e50d77c5119217
 EBUILD netbeans-extide-9999_p20150630.ebuild 3383 SHA256 502ac7449f577299eaad9826baf0dd2d953f9bdcfa6fc8704768da4781cc68a7 SHA512 f55a8440315cd8bad1d95d0808e92a92da79b2f55d85b0f857a5580c606c286d2b8d8e978b688850f885b846e3118c4bff5af222144eb4de75e075590821766f WHIRLPOOL 32f86a4a124cc43bb4f2fbbb96a345669922727c62d04c33ed23c497ff7dde576abff0cbc6cb62c4bc9dd1ae46d25c10050b3b44712c4e81ab0c3405c5e81185
-MISC ChangeLog 100980 SHA256 62a671757fc8a36bc326e5b282f7906958cbc90edea4791827a3ac9c1f6ef002 SHA512 986eb0d0e6350c0a6ad14ffee3f356c3c4ff7f5bb871d2647fb9b48b69feb40cf2631877d929d6a5d340fac16ed7db257cd46f6b717690fe9ab814755a2eeeda WHIRLPOOL ac2080bb1c0ac34406b19a590464e710d8a60ed925afd1554312cb0183d904dea3c78e17a65080bd4ff90e791251ae65e4d4138e5b584c7acfd3b570d6dc487c
+EBUILD netbeans-extide-9999_p20150701.ebuild 3383 SHA256 de347eb4410206f42e6e01f9745d22fccf42379c02ea9e4e9843604f2a4d1e6c SHA512 0070c14032ec266d188d07212d0775b8e4723834f92265139666b710227c7da41ee2ceb223889ee116ff58bbfead2d30acc36ae24330c1692075e83d6480772b WHIRLPOOL 4403dfdd69297fe790613c15c47ad35504aec4bbab368a884c9bbad2e8646ab7911dbe7c993afc651343f3e5ef5878b71a33ee58e39c31ebd581a828b2f82485
+MISC ChangeLog 101153 SHA256 2fa101aac4b4a6ab0296679a925ef1e54f94112134f48846b52540a0ee46479d SHA512 296f9e601f44bd30788f7de4a680b54b774eda99a0fc4d39aa56ed4cd7bad2b22e8b130a954508328c9b3dc9cb8892c323378df6d3f81368476a852800df9c0f WHIRLPOOL 64d5cb13c15be1407831a8d3888061960b7e0e04ea91bde34c13170be2d7a2e899c64a97e510118bee8c6b72b70eb6ec0f2c51020d6bc22c9ada087fdc459ebe
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150701.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150701.ebuild
new file mode 100644
index 0000000..2206d9e
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150701.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/ChangeLog b/dev-java/netbeans-groovy/ChangeLog
index f1efd46..e626dc9 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-groovy-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 8b35c77..2f90ea9 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729 SHA512 43a0ddb43354bb3c0b8e29004ab547da508662d037b0006dfd24250c49470ddc0384bfffb6423f1e3eeaca98410c5de8b314a69970189306869a16380ab098a1 WHIRLPOOL bf626cecf6dec0c51e7e0b95ac4ff26a795e44a5dabd25719eeb2244742d96d33cb20ebbd9a68728dc27d28b8e558a7e2a3ee318c2e4fde234e0b5e8d32e6a58
 EBUILD netbeans-groovy-7.1.2.ebuild 3305 SHA256 1e00f335b8cc1e90deec3c3251629ba699286b25be5b6945d135d271004dc34b SHA512 3a1d67d02054478ed15e11789292fcce3fcfd343b8feebde5e07a9463c380c644310603a3f9f984e8071b0b097075809dce423b888e1f2aed316cb90a562d20e WHIRLPOOL a790c1e186c4d1949de6b4dd975b929c132e3e7b7c455c7867bd1445f59fb6ace72b5c9adf09d0c6079718fdc6c34a0c5f0c9c437517b55b7ae109ce3e20b064
 EBUILD netbeans-groovy-7.2.ebuild 3160 SHA256 6d709b7cc07d7ebb59c3ede0a19c9890ca3230144d7f455cf24d984ac2f633b0 SHA512 e30c8d58165b87a39a356f8b813c593910cd2c247de41420369fee21157c2f2881db34612711f77c9ecd9501aa6d7235ab7bc41d4092be1e68fab778c16d8288 WHIRLPOOL 4a6495ca077f3c374105b25698c8251aaa89daf56c2749bdc73867b0ea1ae404cfc7b2a8b435ef7b19f00aee8128be051c04d6a24fb631379fbe98d6854a507b
@@ -84,5 +85,6 @@ EBUILD netbeans-groovy-9999_p20150625.ebuild 3422 SHA256 744ec358f8a9a6bd04a08ba
 EBUILD netbeans-groovy-9999_p20150627.ebuild 3422 SHA256 9eb31f8fd3d61ca559136787e31d7d1605d89a9f6aa7ee8e422478f94a744fcc SHA512 c59c5f65f9c7bc271b7c78af8793d4f715131ba501c5347c29aff8f72cf1c3e443ffcb30fd8df6f8c9e19d3fdf8a3b2bfa9174762def061fde4f206add6cad29 WHIRLPOOL 253d36050e965d9693b0f4d5abede81ad9f9c58bb45b3ec41f570c31b844d965e0034f9dc2f049ba912d499ab8076a2a962483ccd80fb1a4923631fbb18d83b6
 EBUILD netbeans-groovy-9999_p20150629.ebuild 3422 SHA256 2a4787d7a3384e86d94f1f76c580664b598de15ef90da2f1f67dc34b3025b7e1 SHA512 ec9f33db385b2d2d03b05b7b2e145b1716a482b6752eedcb1fcc18353d1b6d9d731ce3893f004c39469f3b77418ea5a4c946e7319f29d208de02e17d2f1b98ae WHIRLPOOL 5a067d154802d4d163f00b5f231319a024cd46b96659fe9d726868a829925b1287130a5ab3196bd6c749528c2067f8c8eb293b1658987e7236e8f597871d4bfe
 EBUILD netbeans-groovy-9999_p20150630.ebuild 3422 SHA256 be82b439af8b200c7003a1dc2c4849c6a2f51d7b412b3e172231f91ba4380835 SHA512 be7e6b20371d08df2c0e4a97e5bb366884edbcf1a77c6672f1c87fa381e7157b09a63f17cc874361a6b7ca12806b383d27cbad9f6a012ae0c1d738f44a6ddee7 WHIRLPOOL 712a4d4ae9b3798b35277655cc49ed201c31008a7e4320e758bcbe219709260d70844a86f1fb437b5fd589688207041d5496c10211ba42173a1168c13a1d99e9
-MISC ChangeLog 168960 SHA256 ed283b26b35564de6d21e5a2fb29431ceb51df86f71fcca279eb7de9e48f00c1 SHA512 898cfc193148f2a32f365299dd7e4b398d7c8885af431d62275b6b1af4149230f51f872511019738e6f191b0d9b5c2bd8f41df23700dade198274a20daceb862 WHIRLPOOL 72c4692973dcb0718704d1d0f21c5e1671117544cf114073dc7d87bf845142328b3f36ce1e18b71df438accfefce21ca898d72b875b79baad9050a3085c2132a
+EBUILD netbeans-groovy-9999_p20150701.ebuild 3422 SHA256 8348cc4eca25aa3c842f428b5cbf11a9a74d10cd36ae89d7bf225a0c7737068e SHA512 30ab5c7d045140333e823f9f75b446aecb7d885433ad27c530e7e2fa1448eced60b9c619f553a53637a2e86d29958a562563c5e47ab933afb07311ad2f89ef0c WHIRLPOOL 13fd939e320a7eebd743c7325aab41e21ffbe640fa4f6061508c7dea49a227303e77b32699a3c724830ddd2e1b205fc7fed0ec9289b5cca2cab93c1cbad44601
+MISC ChangeLog 169133 SHA256 89c053f30f14160c3951a2e3554bd1be7e9e27af302c1b1ee708f1fc46137aa5 SHA512 32cfa84af14bb34b22227138ddc54d4e8176bdaaeaaabe4ebb6379f043187ae70ba222398dbe0a6d6da8e839adb1e54372c44cd7a1035444b5f78424ac86bb4d WHIRLPOOL d57dd46c6b790ee78f276a8fed8ed7ffec8026fd5240fa7233dd1d521e216d0f891aabfebb3cbc6ce49d8aa4013845c83dd644907f1a58cd2352b858e4659b43
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150701.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150701.ebuild
new file mode 100644
index 0000000..3c0f8f6
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150701.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/ChangeLog b/dev-java/netbeans-harness/ChangeLog
index 7880445..e07fd09 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-harness-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index c092c7e..4a59627 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-harness-7.0.1.ebuild 3579 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5 SHA512 390c26b4a3dbc81ad1ef210b3ea668926398cb38ea13fa37dceb6782b4478b1ceb7a49e9db300f691fb8b31c21c56b25f4c3237c0890f0c637ca45f596c88294 WHIRLPOOL ae1e34af6dd61c30f645f39a825b6235e3eb1f9a42dd23431225513733209a2eb225a741b75342f827a4be0ffbf41b9786a6a6430051f543c321abe3c20da6bd
 EBUILD netbeans-harness-7.1.2.ebuild 3587 SHA256 e0adc470109009641bf48569623bf0fc51a400ac1ba686475c7dae1a5b561c96 SHA512 e4157a6b294c17fd7430802b33253d473120dc16173557e0d7840078f4043a383d5e3672af64f124509e54cc85d590abfa4375f181a32ab8b49e976cb6613cea WHIRLPOOL 423a5844a2c55ea99db4ac78e1c605a55a04f634601c0ac054e739c0ab4a3e9c765778dbd81ccf4a1e50e9d9e4cc29ecfad2ec64b483197927f434b67cd4d773
 EBUILD netbeans-harness-7.2.ebuild 3421 SHA256 47a5281d140b47e0235592c58657a9065d1827175ccca7d0c73fd81e90710090 SHA512 403fd1f49e11b27ef8002c4066fc911dbeadcccc7adddcdded86c6cd95e8bddaf0603c0ccafd0e91ef31a0909508deab1eb326e98e621bcbae7304413acca291 WHIRLPOOL fe3c5f95a606db39861a80201c185cb5a25e2d80698ac78ff724587b54e859f861b834b89aa79aac22f2c5da700532eaafae67fbcc33259ee07d578ba5c7f9ee
@@ -86,5 +87,6 @@ EBUILD netbeans-harness-9999_p20150625.ebuild 4131 SHA256 c9d804cb48ac33975f4615
 EBUILD netbeans-harness-9999_p20150627.ebuild 4131 SHA256 c1dbe6fb7cc42c67c170f77cc93f23cbadabf2cb08f66cfa8fc2e61450780fd1 SHA512 c423c012ff2c4ed40cba0a1845d8ed31dfe4c2251da55d9501e03a1c7a9a4e86fbdc1ff0df8d3f5e6671544c1d91ec3b2caed1924d1e515671c373269b9b2c96 WHIRLPOOL f0ce0658af2782e25af44c96bc2c2e87c1e5ee57123aef66976458fef0f569d826684f827ac5cbb0809cf33565e50e64cd3cb6fd8294c3d1905918645dd99139
 EBUILD netbeans-harness-9999_p20150629.ebuild 4131 SHA256 fb2a6c81c90f04079419b3f7292f456198ea0696cd88fa331e844aa06d349a83 SHA512 eb44fa32995521ca343985e8c7c27e2dc2d49be53c7d2a0f91b135c413651c0c2222b01e45dd46df273d3ba7701acbfb439feb36db9cb35d2c8f25f2a7edfd14 WHIRLPOOL f5c2fa44510ca408221b802638465f57aa0069665f048d16d012cff540fad730b141f566972680d29080274714825b073171a18e9d0a95e536239b663a707618
 EBUILD netbeans-harness-9999_p20150630.ebuild 4131 SHA256 0432f6a198c6e53d599910502460c3cb522671bbbb7f4fe249f7e5164b5a27dc SHA512 32e5172d41868707a0d99607bb915e3a350e5dcfb9341346bbc08b2d15076892eae59e488870d868d7cb2ba1b286aa37cd5462e9c44566b5c636338629b0d486 WHIRLPOOL 6eac63890f0d6fe7c0be84a00cf083ec0babde648640fb5d565728506adcf99fe0c4f3555b3a886c5e59869aaffd6e887f8248e010384c3ebc10eee0bf26712e
-MISC ChangeLog 171119 SHA256 dacf1fb19a1b0ef356c2a8bb42a8b12d3aa985d3cb8eb75c2fe01b983726a137 SHA512 471e6aa3342f4ede56d601871902aa3e06d62a909cb65929169aca57e3e138777d3e64d2bf20a07cc96c8cbe39ece05eddbc62fdab8dba9c01b858e4dd01ed19 WHIRLPOOL 1433c5fb8ac3ae966b0f3ee4a40f517c6b614b7f86e28d79d50959f54ba0511a964b8e415718e4cceb4bcb5d93e061c76a76605eaf2e1b31d62a83a8e709ca25
+EBUILD netbeans-harness-9999_p20150701.ebuild 4131 SHA256 ef07b147f63a30e07c21e618efda0e4dd070a05b3ada019b4fd3a978984da9c8 SHA512 991e82496fe893e9342734cdf2d87e5f4245290d092df12f315f7ce92c18be49e3d128ea50e23c76ce7808f76d38feed3531324c041595ee8a1162a47fd7b687 WHIRLPOOL 7b5be8dadc22db5bc3c5a909c6e9c86b94784e27fdc0e8a91edad749319172ebe6aa85bca8978edf6435c4a3675dcef0ce356360d895b633edfd31cda0d4f629
+MISC ChangeLog 171294 SHA256 e394a7066a0b7fa8f1ec8a9810efbd3444a75215d7bcbdd0b15ca6c859b4c3e3 SHA512 b5e60f06cee22b31d1168720ee69edfcc5e9249dfdf7a41a98a417a93dcc18cf553b185cdaff4052aabe84e849926480ffaf4144890d8cf864fccf2a4d1f8d98 WHIRLPOOL 6f68f30fed6e18574a4409f72a8b154deeb81db83c0e4cc9528ba75d1593012eb0a616f651f783bddb8033bd08a891f419ca7abda989e499e79402e8d832fccf
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150701.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150701.ebuild
new file mode 100644
index 0000000..e17af02
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150701.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/ChangeLog b/dev-java/netbeans-ide/ChangeLog
index d6a757a..54cbcbd 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ide-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 3aab6b3..a23719f 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -253,6 +253,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-ide-7.0.1.ebuild 22653 SHA256 4c1b3e46e2a6cb89d902c7f4fe6ad9306cbd0c9463a514e87d4c6ec019dc0356 SHA512 5dd526a85a70720686c612efb3aa5602c395111d507b91ae4db04c5814b27bafd1480ab7e44e1148b7412f768543110ff58abdf676de303cd3be9d87b87bd373 WHIRLPOOL abaedc56df115c6050ad7824929ee959ba1669fc1f3f9d4cd1eb9f9f948a608828621f46aeedd0b6062c85b1ad4481d12f952a504559e52c110ff37b88ae0d72
 EBUILD netbeans-ide-7.1.2-r1.ebuild 26831 SHA256 2643a4435aa093e292a2728583d8ffbf213dac6a13dad8e47029ed13a2478493 SHA512 5ba14c7b820f2daae788588ae2fdebdc8af6bb870d6ed56adcc2d43810e5dbd2ea21ae639e6b864d6d0b1e69c9aa4f86dfb15e99eb4a170434aadf0109ad876a WHIRLPOOL c9367735f073f9fcf6bb992b6d481aaea1ebe8526907cb6366d432a3f47a0c4d76bc9224206e0e512708dfe896b465878a2a1ad68836c7cd9b51a3a4efa2aecc
 EBUILD netbeans-ide-7.1.2.ebuild 26834 SHA256 1e57e60a1a00b4530f917319b5d8eef915b9669b9dd3ab82b5afabe171d8959a SHA512 4242265c0783a87c028f955425c86596038aa477e3256ff8ba244220a573486bb7f2e47b07b3c94fbef07940a3b32c313a1320b58656a67cb15a490e7307b1ca WHIRLPOOL 1e23b1e4370292500f154527ecd7a0e7ca315ee73588806413f630355677ee8fe9318a0e672b5f6ad60f829c0a5579b37eedbd737bc8ec154aba9f59c53bd337
@@ -292,5 +293,6 @@ EBUILD netbeans-ide-9999_p20150625.ebuild 30352 SHA256 4ab5765479cfb6f3e69539b80
 EBUILD netbeans-ide-9999_p20150627.ebuild 30352 SHA256 bb16b9b037ed15d918def384aeed90241e2ef5e15415da4e9e65708a6c9b4dec SHA512 282193f588e37f4596d284253f34103ee6d2e5c3c3e88bb749cc17281264caab98e58a241e43f77c2ad3828eb70adc154990916e0ad1f7dd4ef69e77130573c3 WHIRLPOOL 3c21e41809065fcd2361d68dc6ccac0db45083d42507a51301691164a2202dc10402b4a10b3d9f0dea00d8a2db16ec4004fd320f95d8dc2a947e31509995fb0d
 EBUILD netbeans-ide-9999_p20150629.ebuild 30352 SHA256 152b7021d2935285ee35c4b4f01effc08addf2525ab2556938cd40eeb351d33a SHA512 b09279a29a2e62402e8ddd4e26d68b2334815dc85120abe43e3c5e14caf27afea12c5cbc418bcb13af668cea53bdb37a252caff358fdd2766c2505dc3b635efd WHIRLPOOL d36953c1a73d01cd7afec728beedb01c32576dc8d57109c171ac828957a8a05b0e3a13ae7d565195c0319db5afaa79fe942ae0f6f89e3ed23f749cb069f35425
 EBUILD netbeans-ide-9999_p20150630.ebuild 30352 SHA256 47f84017cfb7dd65491c2949846f7af868204360a5500995c60328d373235357 SHA512 f4e69a14355694113ef912094fb0cda474197fa758f7ca4ecca4baafaaab8b4ed570e48654a868e58e52deeb546e7b6d3e5326d5e462fcbe2cf4fb0e104ae653 WHIRLPOOL 31e18ce09d4d97a1fea5c0b07c5f94e2062b163ed69f94e0d229ce0063a0d13767ffd8a8123a5078771e1e48b0cc49dfa7c3f0af411ac508130961a193bfa030
-MISC ChangeLog 162911 SHA256 4bc7f4a2d6246fd275c91d2c7a61725ab5a10a9f358b0cc654b225623605bcc2 SHA512 358924b2c6a6964c6d3217c8654115cfef665fef85636c2ffda49c617706c759b00a33973cbab16fd3452e3f7a2a892878ed2c920c19462a0821d29f6953ad27 WHIRLPOOL 7e225f4894461757bad0d97c0cc88d0beccc61f46f19309ef255a2a850ccbe3fb1e82a19bfb5fd14c1d05aa8262d8d7c8a830c7ed98b4d6c73605ff5cee45f78
+EBUILD netbeans-ide-9999_p20150701.ebuild 30352 SHA256 acc2e9fa3a009f1a11125e0a6821dfaa89c018a95fb3ddeb121df1e3285aa82d SHA512 a9ec81ced6ce9570abe716e74d0b8fee7c150f180314545585fbc7237ef209972de8d2781bb94a912b512c3ce351cb558ad2dc80cb8102c63f08e56c43894248 WHIRLPOOL 579e19b539c1452456c9d97b095167e233c84603e2c56c9340d001ab604ef058e74ed939badb8b62307c895f6f2e27e2673d560a1c9573e40c1bf9de16dd4e4a
+MISC ChangeLog 163078 SHA256 9dfb71a2cf4029d42e653e226cbe1846b622b8af33664818550d06c3a5e39105 SHA512 f9761541e81196eae4e190266d65cdedae24b8e0c3f096b30742a7ea9e5a968c00d9a991c2299bf6086a6945347dc1bdf986df2ee383755f0a7ef99463b3bb1b WHIRLPOOL 5d4b63be77d54eccf828c24fd7b1ba10d9900c9fcc7e20c4fc65caaee77190badb4d885756e9c3607c117a131906d990b1e4de1d935a4bb73d5ab81dec7ddf83
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150701.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150701.ebuild
new file mode 100644
index 0000000..d9f7d97
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150701.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/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/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-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/934DCAB9534B8FE12FD9C90759B26B6B0D442837-org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.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/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.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}"/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}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-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}"/934DCAB9534B8FE12FD9C90759B26B6B0D442837-org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.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}"/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.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.51.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/ChangeLog b/dev-java/netbeans-java/ChangeLog
index 756ade5..80762a0 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-java-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 9cb226b..fddd52c 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -124,6 +124,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-java-7.0.1-r2.ebuild 14932 SHA256 3d8eeb5c3aea368c5064e83e9519b2982a3d0f999db11344ba33605f46f865b0 SHA512 0c99037f44aa968f357724650189fe0f6fc89496fbf73f6c5a9bcd589afa5af4974f058a8eea2b6a97e1884f4cabba8b5ecf0214b7e840870358f0e55abbc595 WHIRLPOOL 4c1ccada62d0c8883033500ead9586e5bfcd360e6030b3d8368b0b16b9ed01cc03d3c3d5888de437a16d5382b5fe9ec7c02f3e200c3c19bc9a43f011f32d3a68
 EBUILD netbeans-java-7.1.2-r1.ebuild 14936 SHA256 6082d8d5022e011e7aa9d4ff92bf9a144a4f733b879127552c0ca55566b0f18c SHA512 c03a674b6d93a4261bff40ad9aaad6fa9bc0451d6017aeb51f14c42113cc2ff12f84ff5a6cc01c01b43c7ce1b4d885da5c9cb4c0e13601c8ff780eb140060ac6 WHIRLPOOL d32f06a7bd7d4924f14fcb2ed67fd2f5a1766087e4f46ed77d12d472c4c133eef5431d75a709da1abcf8b8cff5afef303dd57e82e4022651a7278076502300d6
 EBUILD netbeans-java-7.2.ebuild 12206 SHA256 da05f74f2c02e4aac745dcf1be75069cc7070f241d063c19c40465e139ac135f SHA512 62be228321e175ad03c2a7d9270065445ba9e1ca08a1a51927027ddbc78aa43a0c57c6b4193add993764235068c7128655f2f12e00fcd17fbac807334f2483c6 WHIRLPOOL 5f518535df8a5f1e1e4f0bc5c845ca063317221c619c3e8928c89a4f2bb30be5a03838f5a610bcda58959d535e4fb152f92f4edd780bcd423918b448d7ddf2e1
@@ -164,5 +165,6 @@ EBUILD netbeans-java-9999_p20150625.ebuild 14580 SHA256 8b8305f66805edb8869e221e
 EBUILD netbeans-java-9999_p20150627.ebuild 14580 SHA256 16dd19ab2508bf4d7cef27c938d943299aad862389529a17c6701fefc0fc6a3a SHA512 8fff297aebc62758fc8395dff647e73106d16d823ff3f823fe1de9957630d608a108eef2411cf02f747675d54e0027a6692f27f4c15356cca514bf90adc0db5d WHIRLPOOL 5dc5485284936024e6ac7afb5563ee2a955cba9751215888a9cac9ef434c890fa461bab59576fedb15157a576fa769c80b2e23280e066e5b5e3ec294c0d966e9
 EBUILD netbeans-java-9999_p20150629.ebuild 14580 SHA256 967eee34be4e20d9c15a488a90343010396d59da4c10c3fb9facfcd24c5c6953 SHA512 15efcfc3849c3971fd198277689311c60c6cf36ae83c70a30e1ebfc8b69b3bef122d0f679567388153661c89042158b4c0ec8c26319083481b4ac72233dcb721 WHIRLPOOL a6e837e57772da9fb365eb003e333539d3c00844e3abb351c3287348a8576e0f20feebcf2f7387e25b8760cbf7808fc150da3b977d735f847d173f24ce01260b
 EBUILD netbeans-java-9999_p20150630.ebuild 14580 SHA256 1caa01d603785d5859095cef522bd2c1715157abfcc3500c60d8ed583f2e1198 SHA512 decca251b90c3fb8f1edfaca47a851f1c8aa3bfeb54c13eee99263fcf399eeeaad9c874068ed0980cfd072eef3637e44c1c3486bed638fd0dc487e153977f0f9 WHIRLPOOL a6720aa800fd9f6f3068e655995cf165863263297bf7285ee523a4e628404a58bb274f222e744452a51cf931ac4ec5c06a658888aca352e88bc3e9dc0de62563
-MISC ChangeLog 166335 SHA256 c58423a4c7da72d731f2c0c65bcd5f3e1925b9ce70ce6b479617f0282662611e SHA512 93f22d249c976c68077b47b4efb1e309f6a720cbea2c2d1f33357cf971fd820b71b36c1389f33a2a4b784edd659129c3fb2f15f45668bea36e09adeef83b29ba WHIRLPOOL 7fb2cd1e18764e8939dfd810c88d6f89143678a4e956bdd15da997d03e95c15fce2814949a53fb00de9a539b13e5732eb2f816d4297056c2ec3c156e2ea480a2
+EBUILD netbeans-java-9999_p20150701.ebuild 14580 SHA256 150aea09e074b53e76d822ae293ef0275c20cd818cfca1e55f658bfa7e9ce239 SHA512 97d2f010c78d8f060209efacfb201b7fca2f79bc993decb947a6ef202a4d2df6c0d1d3985c81103f4ca0271ec017208a31911aea9b7e2695056a8bea254f82ec WHIRLPOOL e13c00f695d03ceac6cc2ac0e215ecb2f76842aae769d081635a65367f7d5ebbe9a771758fc0223d5ee10cfaa36686b9ad3d8feca3508fe4f2f1a3af16896eea
+MISC ChangeLog 166504 SHA256 43d0caff307f3e102490f78dd25f6d3873b36580c34869778465fa685c0d377e SHA512 171d857a824cd9a11d62c7fe8f05bbd225f8072ddb26efa7e4cf66d94065c4065f1da9acc22efc66cfa3de2d3542fa0f99b714a85e395a46a56f6777b34e2aa5 WHIRLPOOL abc60f8c7e843c30c14d09d64c2c64bee1a203b7030a1e0332d91279688b82202897c4762dac2f0e4634af3d7488ed952ecf084319a788932fd0db19769ce865
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150701.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150701.ebuild
new file mode 100644
index 0000000..0a1101c
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150701.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/0FA9517D00E0783DBFD1C9633CF9EF159FFCEAA9-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"
+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}"/0FA9517D00E0783DBFD1C9633CF9EF159FFCEAA9-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
+	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/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index a8d5db1..ad7d331 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javacard-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 428d9c2..8683b53 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c SHA512 5973c8d4254943473209b0881c0fbe40ac6b61563d508e58adc248dd40c8c2d6b742bd6c1667ee11fb404f9d2e62f08a8e4d822a2a3db9fccab254f73828c3b0 WHIRLPOOL fd1e08943ce754a2abfe8c8b83954399287500ce574a46fe0d76f94b300fd2a5978957f94a3ac1d85781330248a46fefacfbae25db95669c3de910145ef96424
 EBUILD netbeans-javacard-7.1.2.ebuild 4970 SHA256 15ff13152b140edaa549ea6515949d99cdb2a4656918566179836ab2277f01b8 SHA512 b7e52b477f6ba645084034eb27e848fb48361351937fc45455bf4b7d74acbdd257427ec589286f0edc71cc98c8cdb114e55988b6d3dc92143e13f407e3b45a52 WHIRLPOOL 85ab6dc2c230ea89fd19d7602ac24e3d2b0f226590998e6a6e277c24ef60a7e86874f7e95e90921d255e84f05e04ad1998ee7361b4d26c6f14828076792a933c
 EBUILD netbeans-javacard-7.2.ebuild 4718 SHA256 d173c848e825b342a52073ba16b7784016f92124d4bc3b5ad8beebb7a7dda772 SHA512 019183c236c59ec2b961445c49643c6da0b376048f1be1d58677a753890bcb03db126f6441221c7572a74fe45c4c27aeee4acb38db620f9203ad04ae8ff2c426 WHIRLPOOL f2a10183045edd22ef4419b630cedafc093b326eb593178a0f50e8d82ebb25ab732fb8c561d49969073d9fce551c5b9150fb1900b49458ed53f0234baa29a78e
@@ -83,5 +84,6 @@ EBUILD netbeans-javacard-9999_p20150625.ebuild 4982 SHA256 f2bbc7a87c25c738c717c
 EBUILD netbeans-javacard-9999_p20150627.ebuild 4982 SHA256 8e3d7dc61c7c7cbab3778c912431a5d1fff8fc2fdb159ded66e552ad9af056cb SHA512 2a7fae78b445f02443ba5df360fb0b84edb203a0560a38c5c8d387bd5cc10de96a8c6e9ed754c78d2e1b5a36bc04d5b676f268a2b95df0c909a1e0358e7c4860 WHIRLPOOL a2d1705c2e8a28c0379dfc99f8aa6c19322622b9ebca92f12e840d8e6dd5ec50f81a5df0a98a34a31c9990fca2b19c04892d9cb40ae11abab03951eb2ae9f404
 EBUILD netbeans-javacard-9999_p20150629.ebuild 4982 SHA256 6dae88eab2f30c3e3d2012663bfa0f3607c418ae01317eb24b4743eff4197404 SHA512 495f0b5cca65fb695d6a5e97cc55f0bdd1b78f36cba58e6bae16997a228bf16cf729658945007a24212d808554466f421e1dac47b116abb798e4052077db1dad WHIRLPOOL b4ec4adc9b8bd0eb9a2fc34ae98897c7d01e9553af4807ebd55d797d274fbeef5feac66203c67c4e1fb4577722014a7ae24527efe9b45e0cb5b3c308706ceb90
 EBUILD netbeans-javacard-9999_p20150630.ebuild 4982 SHA256 45f3c57fc04e6ddf0daedff8863f9a6d01f43fcba66cfa57702492389a3bd801 SHA512 ce78ed411bfe16c2583258be1a709b2bcdd446ccdd566996ed5fc17e022534383fcd4ff0c3c4f0458572d0a4e10f4a8ecf99b8f4a08db93fc712e70133e02389 WHIRLPOOL 4579d0b96964573e4aac34b443677c553e66a254642a88ca674e18ad07744f9b2cf3288c09770ca955d5095feb612f2ef72bf6ffcac63070a9eeaeaef1066cc8
-MISC ChangeLog 173278 SHA256 b7a25f66f3ae54d2d84dac57c0e8851bf253b112ed398a27d90fd56bf71786d9 SHA512 f71102e374ae8707f65924968d541e74c080d85df8bd560fcba254643cdb53e66e828def4ff7ccb66b596c2d191c3bca824e6ab5f52462f3b69deb737d5284d7 WHIRLPOOL cf6b5e9d701bd0ef648d17f09f722c62938afe253ffd329c5aa44ecbbef7061bcc3ef99936005fb0640b798e3d0a842806ab5f2afef390dddf18fab1add18031
+EBUILD netbeans-javacard-9999_p20150701.ebuild 4982 SHA256 48a73173c322cffeb28be1981aec548798872f3383a2ad671ce092c3e4cc1e52 SHA512 cbf4ea11854649a017f25010f930ad26710505b8fa4ae28b47167a7753688ffcd9688dcded2cb385ff4c0b9f9b2c60bcb5dd05546a20e97c870289a7f5eeb66f WHIRLPOOL 2999fddf52cde76d2ccfd981557262ad28f2a753174996d758ab4b75f7e55b19f79fa163241246eb2538f8ca2e7aeaeca12be2153c423ca1b48e89b3ad56d939
+MISC ChangeLog 173455 SHA256 4364aafb623221469f269a718f944c91f4fd687b8686d95e8d7309a2555bc96b SHA512 25697c325524f8e617118901d800f73858e9b1144983f39d3709fb6cd5df7a246a75624b410947e9446e95c12e4220c3a7c55953b54785f24869b95a1efbc79a WHIRLPOOL c5ec38a5662d1e0adfad4a051dcc6bd365d6b2b846b97910aa7547f973019f6d91be57530df4311c7a43e9b2d8d24484b18948ba6630ad42d06f025bf55a6be0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150701.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150701.ebuild
new file mode 100644
index 0000000..9228f42
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150701.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/ChangeLog b/dev-java/netbeans-javadoc/ChangeLog
index 6e125b6..48ac358 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javadoc-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index a70734c..83ae9eb 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f SHA512 3bfe0ecc46f371d2553b031a5699229fb874dad1e94415635558b7d46b6764c31337d03444753e687b19a7c0976c68cb72007ccc82df7d1e5848a81f241f80c3 WHIRLPOOL 6571f7a73c262b3b67407840523b79eecc14bad9678cff05fb32a2811049158400870de51bbcef97ecb3f18f8ff59f965bdca8e788918d53822b92e2f20f75f5
 EBUILD netbeans-javadoc-7.1.2.ebuild 5855 SHA256 af28efb956ac3b7147e254ca3083dfaab11b84ea42e20677ebdd18aa29ff87e0 SHA512 ee06c552782170b51cfe70d603792b4240aef6064ba0a5074f394701a43285ed1e4030f539622c616be3175dab013e791c1a3a1193ad379193f5fa3e92eefa40 WHIRLPOOL dfcc63d6c9fcf094e2998ce1c08e29b4d4acbefbe9bea6498c2e28f84576f628da50164a1e0ab3ff5528720fe54cae71f2f5e6f84aedca5b639f13053464e6c1
 EBUILD netbeans-javadoc-7.2.ebuild 5805 SHA256 20d01deae745a7e8d84ffe55ca63ad74342bd8528c0dd15a20aac6570a1a83e3 SHA512 3947f1ab3efc236b8faa14736406ee3e537bbdbe377ea1bbd4f1eafa06a36d2863f8700dc7c84e6c8501abdf130a78e87ad6a0f52c5172bf0ab52f288617bc86 WHIRLPOOL 8301cce0679ed5f68a09e2e968ab2ba0955547f438758b042a04744539324fd79d83d853dfb8b48421f6dac616362cf1a9dd2a0e0ff8763dc2e12a470d16b95f
@@ -86,5 +87,6 @@ EBUILD netbeans-javadoc-9999_p20150625.ebuild 6234 SHA256 9b2aae75badadbeec40fef
 EBUILD netbeans-javadoc-9999_p20150627.ebuild 6234 SHA256 11449196981a5c31dc7e1b3f3357d0c3ed19621e923694150cc308a8d2d80486 SHA512 35b0715bf9f4b45b400300b1d3f6390c8c4d6f8409c09bee6f773f87e7343a3f9c3c7b04c553ce97d3f67af861f343f2b1d37e59ebecb8559f8d1ffc4838a20b WHIRLPOOL 63b35ab2eccf6b08c574d0707c23ec6cc125f2029f1279c6749481b82b1dc16cf825dbd02329280b67ac6ff582b45ff1784fd42df986885d47db8b1dab838886
 EBUILD netbeans-javadoc-9999_p20150629.ebuild 6234 SHA256 b98c73ca177de23330ae9f1582cf146d3385a628930ba8d1e849c2008fe2be8d SHA512 725d29d6e389f772ffd3c5e80086564796d8b1939bc503781b39241bef722301604fdc51be8815b0eb9185d00c25ee9fd4501f1c5ce977388aad8a1684e36da4 WHIRLPOOL b95f6b145e35615acee9875e1db0c6d56f53e215e944cbae93fd7eba75f30b13e1d041f84e1461498f74d8de3f1ab4d76b2a115ba06d9c0800dddf5b707bf807
 EBUILD netbeans-javadoc-9999_p20150630.ebuild 6234 SHA256 bffd06a426ea4517df3ec56255b789baf1c63a0668a4111b355afbbd616c1c81 SHA512 c822df80ecb66a133e48ab9325b4f42e2e3f6076397cdc486272de0bfa5acb4f3c2a80a98041128484c1473a4e2bd73987fdec64335b2c61e9a374ae76a9e10d WHIRLPOOL bd72da819c1eb1d88dddb79f0abf2a8804d25c4a9049926b5ec20bd75827a9416742be2bcab0c4bb8e825d37baf667f4c319c0d1a6bd31f9c5d085706298cabb
-MISC ChangeLog 170945 SHA256 0dd37edbb28248130c5e647e785d6da83d47da7b653808f31b4e41f1f2fc0397 SHA512 d614d53fd5606ae687898494457d31c76cac58aca5869b330d18e82b6a84c2a09805f4b00840c7d207cc5e0cc0a8b2653730aef5cb022b9c97899d2679570326 WHIRLPOOL 1527d07b8df4d7747036608d343784484c51711e7ae7518042131fb6975671d0a6eee65b49da413718ef39548a996317b442f8b4d6daecabde6c9cf97d89d385
+EBUILD netbeans-javadoc-9999_p20150701.ebuild 6234 SHA256 b72e6ccb401ff5783e8aba915cdd349d6dc52360b01ccf0b9f36682d2408781d SHA512 25841f62817f89a444209e996a7cc64da8f93e6dc2b4afc2b97bda7a0b898b605ceeb8dd686d257d1c75cc7cbd7980a389c3beb7b45185c77db88bcf01103ff0 WHIRLPOOL 32d50fd90fc34f4a75caab2a2d311f635d2358ca7e90e0b4623cc93a1df3fe995cf533bd1b3e259566907759f297063cef6467cf5cae28eb6a8b2a624cf63ce1
+MISC ChangeLog 171120 SHA256 75016564224c484503f762caef8503a5bbf8c5038ef2f1f53015f3b81a142d18 SHA512 bfd456852649b8a600cee393810226c765b2d1b4a21c19529691e90d5eedd1697210335732856d19974ee0004f39491134aaf193ece2d99abe3d9e63bf5f7326 WHIRLPOOL 82bceffe390055e8be5bf2ccab7285b9485222ba8ec4e9adbcf14e419071bb0c6415c3134a41ae59e19171000e605b5f44c78000fedeaecffa79200d35cd455b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150701.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150701.ebuild
new file mode 100644
index 0000000..a7ad8f8
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150701.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/ChangeLog b/dev-java/netbeans-javafx/ChangeLog
index 928e9a9..4ef1373 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javafx-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javafx-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 0838173..f71a82a 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-javafx-7.1.2.ebuild 3593 SHA256 76a29b37765000745794e6ae20c6b8528d8637507a257ffef3bef2ce648f05cc SHA512 a04618bda036e6652c7208f90a4dd91e07e75b85243580263f6ec846425ab907a87c318117990d4e8d9044bcd7a0ca8b63bc32bdd0d84e5373a10e67a77b79c0 WHIRLPOOL 11acad585f7315ae6b4edd53c764167567a948cb0e2037d95f2f4de34765909b71d095540c054f4cef3ba70224d294b42720536566e445cbdd06ebf2ad903841
 EBUILD netbeans-javafx-7.2.ebuild 3576 SHA256 3441b901a5074013351bc6c7ba6c424455e2affe52e448f2cfac0058c82345e2 SHA512 ee384d6e4ac767ade82b5d337d7a1c5d2b463c15a7596d91e1a850b37349f88d7867a0ffa11a118c48e2ed463f38dcfa791ec42b3fe85ea1e6bf7c4b27f9b073 WHIRLPOOL 15c7d20f2caa39c6cfcba2f846736754b049483f135ac90ced399672932a6a73467f0b4016550c3b2d8583be20d1467486f5652111893ec16111095a3e9c941c
 EBUILD netbeans-javafx-7.3.ebuild 4476 SHA256 9f268a852d45f37f9d22c3bb58d36be17f438e4b4cb5105d88ac4404731facb3 SHA512 3fa0e48e949d0df0a4404c04379623529f73ff15259f4164fddd10afb9faa046ceed16aac1a7b14728af89bf3a4ed7037638fb7e7e932a64cc71e84f7ecaa44a WHIRLPOOL 0395ca679fa41610c61dceb6ac018d7a76b62c08ca740de2fa2d98523f8e5f840a2d0a8c357b674d171841f93d980b536a671a1f12b5261d402c03b691ac6504
@@ -85,5 +86,6 @@ EBUILD netbeans-javafx-9999_p20150625.ebuild 4723 SHA256 fde8a5cc9775b292184067e
 EBUILD netbeans-javafx-9999_p20150627.ebuild 4723 SHA256 d0cf8d6b3cb3c1ddddb06455a4ed73dd39a4488de7e3cf298d4bba2ca43da43c SHA512 8bf39997e3fa5b275fa1e8f13c0545aecbbd902d52f45f3e0b42f0f084870242741fca55f6a2a011fce91d10b7a57696396e025fb5459ec93b91b8fbdbfb14e6 WHIRLPOOL c674c7fbf75a5941aee4154a877e7b0feaa452e8f197d122ba533e560302a0a01fd4ec55381637fe74f96987f0741dc00d50e0ddeb3bf09a24fb93160a2d9974
 EBUILD netbeans-javafx-9999_p20150629.ebuild 4723 SHA256 3e62208a0b1e465d33eaa4a39a71d10a83ac52f43e4fa5b62a596ac3d99994fb SHA512 29309299d53c1a8898463fdc8c23b5a90b6444ad119ccef48b017903ee6411ff3e1f4e1908d623e1abfff2315293236b5a98fac06a2c3d4de7d66dc907c88a54 WHIRLPOOL 0e203c8b0e7b27126afd7ed35ff0f8d07fa62645a21833efc5415ea8774bf7fe27da92bf27ab14f94144cc60b8b310fb14c3a38261f38c40fafa63dc4b4366d5
 EBUILD netbeans-javafx-9999_p20150630.ebuild 4723 SHA256 c7112252f3861b7758733b4bf7ea1da421876f4d5c53849f1642655d2cea64a5 SHA512 6c5aa7ae79124e605c9390d03be91835f352b9cf9a5e33d521768f354d41d6a449719a17d2a47a44e6ae3d37a009514256cd8fc38c45125883af190c715d7c01 WHIRLPOOL 56dd83eef4adf3b8f10e11f1127979ef1c4544a4b9b68c25244b5786cee8a0e33f499d178c6ca06ace83e25624c9f6472a7f50f6b2c86cf55e8df48899c82f2b
-MISC ChangeLog 155479 SHA256 e0588d4286d5afc8a97e1f887e28cd8a8721b192647f76d59b30a79a198227b7 SHA512 7f8d7733b4d463a7fbe2f50166c6e7746ac79f6509a889dd188dc7a78f8c07ea14705dcc494acd876fbac19fdfc200f35e2b0ad644f9572247ec9238306fd3c3 WHIRLPOOL 281a2bf2aeb4f6f086d980ef26530402b7af8d3e72718cf4b939d7fadbbcf61da5f5b320ef6ff27b34a04c64046f8b079cc22977d10941a252433ac23c42c7d9
+EBUILD netbeans-javafx-9999_p20150701.ebuild 4723 SHA256 b6e72cb4bdd3e391a49c74f9198f01c8f6ee97a28f832d432e8f50069be8a539 SHA512 52f4a0b8d592e93083ddff6cf24a8cbd1ef5f9a38bc6f384544ff7c864552181dff4fa6085b58a96b2a8e53ae44f5dfd748f4a543ea22b04dbd1a106bdab0e1f WHIRLPOOL c2c7f7d48d7fff2738435aa6f8843aacc5f2feea4f2b1fa88150d05fc7f25d0cce355b0da75ea6ddd3cd203272a904c88fc2489a9438233838bfc805d413964f
+MISC ChangeLog 155652 SHA256 b54ec6b226ab82978b0416db9afd2266afa30460ba2a798b926c182c0783ca65 SHA512 5aea6edfea5e4691f07d5077eb31883c67424af3add6acc8422ca1b92d274c226ea5b99a233336dc18f9d0ec911b6a50127527472f652946b9fe13b4d9b098fb WHIRLPOOL 3488ad7bf68bbfed846a48a0ef2089773a1357a91dceb0b1c2e5b6b1440b056df7eb5e820aefc56af2df2f6a89deef3b3698030f6bc9436c0dc6af4585331392
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150701.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150701.ebuild
new file mode 100644
index 0000000..925f54c
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150701.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/ChangeLog b/dev-java/netbeans-mobility/ChangeLog
index ec2c421..d19d089 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-mobility-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 0852048..16e5838 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130 SHA512 d51bc003f4b637cfe71c9f49a96427e535596542ac195a9621bc4f92c04a6f720a87fac6eb267732f869ba105f263d9d36f848b54a89c734b6a68a78ed323808 WHIRLPOOL 515da7153b12c3b5779cfad16e3800b4d26ba4b174027d9a7b06a26754fad065751c7eda137ba6199315d024a322d59e7ea39a1b2f4244ea75b30770ac505791
 EBUILD netbeans-mobility-7.1.2.ebuild 7543 SHA256 bb3f1245ad68133798fa507f06dd1ffbc1d55f6ba38f4cccc29ff0240e5b5f22 SHA512 41f663977a0716c5449db597d5f90054717ff3579a9137a910d1943d3e0b39379c34c0d9aa9c98d231037a042074c8ecf5fc62c018cd7cd5e8680734ff854c51 WHIRLPOOL c3c6feb41ce3df356f617ca80530673ac653cdf50da0aead00518854d0850d6420333529aa6591e15ddd4053249191fcb47100c5f39a804352722e54f802bae4
 EBUILD netbeans-mobility-7.2.ebuild 6571 SHA256 58af97ca9a6adc56fa6abe91777a1ac35a3a9b7d68af1e73c23a45dc5631abb2 SHA512 ac42c3a3daa7d55c9c13d1c99dd6880d5d99741f80cfceb683da27e30c70d6228d9434571f2405d0dbbf27d2203e3f877da6347794b07b98331edd1631d3a69d WHIRLPOOL 5a6af3cbcd08180dcdf708a038f3119faacb9c78532b4bb1945c7260fb0a8232af57745e41a73311fafffe185c969e0c88ac34970caab7708313f53417695374
@@ -89,5 +90,6 @@ EBUILD netbeans-mobility-9999_p20150625.ebuild 4418 SHA256 b68ceee381580f48bb9ba
 EBUILD netbeans-mobility-9999_p20150627.ebuild 4418 SHA256 220cf6dc2857061c46e22433f288e8283d8c91c3e018d482525660eb5888c00c SHA512 b7ef496e92d680ab4ecc1ff4469047068f9a82b77b88a1b4182a9b7ab89225c2de306f049b550efe94c704cdc035be37aad7932e941e9eda9bd06b529b7ae56a WHIRLPOOL 37954051876e9b6bc6c04b4e5212aad1efa82dea73bce24775ccc4d5ecbadc5264cfe3451b932c931281a0a8165c4a09b4956936712a3b5e21b36e023b990b70
 EBUILD netbeans-mobility-9999_p20150629.ebuild 4418 SHA256 ffee3d00f99d1f298addb0a5c4d111c7fff54b9665973b03f3cab9b01fdb4f2e SHA512 2348fc85bee9292c63e152002ae62c42ba4494beb64fa14251e624d599fab353b36cc9d9448a20f5534c7a4e2e34b6b69abd39fb1f6cae400d18eebaa2f0489e WHIRLPOOL 6fb9655a2e305641421e9b1eb531d070cb73245aa9f78b364b9f5dbbff3750da0b38b1cf9caf4a1e732469cd29aa8494e04ec65095df3bce3e2a25018be3b951
 EBUILD netbeans-mobility-9999_p20150630.ebuild 4418 SHA256 b2cce124323d17c610e67cc05c6b5267a4ead0b8409290bd09efbd2ab5a736f5 SHA512 9e799a6222b6bcb800a59c89a4133994db6fcb05d344dc79bd2e6d2864d5dbf9bf689cad7fb4c55a125da2b1597b23923100698f2ed86254c517706ee5f67e87 WHIRLPOOL 94030322bd6f8d5af22c96eeab532c02942f70dc3c18a77b38f2f96c156fc535eccec3b6be2b44e22d42a7aeca395756dbdef5ddf5c7d436e4043022d030a726
-MISC ChangeLog 173419 SHA256 60736a77fb12874d7a403a15a09d061e42b2bb085a93fa203addb91475c9be54 SHA512 76e6dae307fdd722a27dc1f7482d27792ee3e328ad71746ce8ea7498e2d26fe9516715ecd77a19f9ec1a6cd8b89d239d554be1e77fd82ab4352132fdfe6c03b5 WHIRLPOOL 9a6f36ac15db788c405e3c85cea1cf6774f78c52785bb031f6a9334032a048cda07a1fa67d6e599785e98be01701cab54db2568be8621ed60530523c81cb2c27
+EBUILD netbeans-mobility-9999_p20150701.ebuild 4418 SHA256 31b3114d2de6a4a92eff8fdaaae3e27cce3101da204b780367340aaaf2c6e6e6 SHA512 b84786b5276d4372083a668582a7578cf6ff814cc78a317d267df5dbc889b1a10e7637fc3318ed80f3399e673ac1e784a9cb4284724fd610f03f603fccdbbfa9 WHIRLPOOL b00aa4d953184ba56624c85088f7b5f1a79358095d87e752ab14d9e05b5b8098ad022a42be76964deb0401093db17a719c409b051b7acc060e31430f42f03c03
+MISC ChangeLog 173596 SHA256 3b72b8d257e8a4d25abb521c90ef18acce7922ff49ecbc5ce9919245475f56ad SHA512 4d1828d8b154ced0237c667f376450324ba16a931b59b7759ac0417e3cb6231367071744ab1de6c465c28bc06ec0f078f63e4595141056a8f1a994769c7546b1 WHIRLPOOL 1269fa7de3a3b65aa5da3c182eada8d707ed542f0840cc87415db292160499fcbd20d43e474ac676d5a686a3c5bc845e31401422b0517a1bfe61a76af4f3ff41
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150701.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150701.ebuild
new file mode 100644
index 0000000..3502dc9
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150701.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/ChangeLog b/dev-java/netbeans-nb/ChangeLog
index c5c2b37..843590b 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-nb-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 247c2e1..8f2c8d9 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-nb-7.0.1.ebuild 5106 SHA256 3c68751bf5face5f80e2d7dcedb7466e69343f2d06c0a4dd30a722a987fbb207 SHA512 d79343e0ca8655b074a8f96b9898e4bc0123d60e346602ba8d7a239597993cadb33a036b43862ef1a39630e4f0ba7e79892d8b2eed8b30535f12a5d0b9f4b581 WHIRLPOOL 9f2cd645e34fbcfa8f0059fbda4f355f411aaff7966121360dfe5b3c769966c5a4586bbc04142b279e3a3fa323bc4b51a6349cf3eafe89063db44fcae58ef119
 EBUILD netbeans-nb-7.1.2.ebuild 4977 SHA256 265f9e4a9490937a65632ddaef48e3a731154b07b9ee5f9536a991181fc2fcbd SHA512 65d1065993dba3b1fece428beb1b75f17d89eddb08aacd2cbf5ecd3ee5ca844e75e9100c324ecdeeed5b138b1da4ab8cd5a4598e584a17545ffc2c52ea763779 WHIRLPOOL 9b63f2b5671bd38d24ff6b280de37fc19c74170bf80c22818da5e8af415a85211c6cfcf690e68d7697c41a1b749a3c7b48ec9b362782df140856f892d381e360
 EBUILD netbeans-nb-7.2.ebuild 4960 SHA256 bef2020a6e0d722ca77c0931b9a06014cedc822f14a21d8d916200e358dcdfb8 SHA512 988d902bbef52e123b5800e56049210d69c4dd6dbeca80396aeac58c70d90b76da65b338e664368ea3f9a3973b7b94ffd0a47a77b01be53452c2cc04c4067442 WHIRLPOOL a27fa8a1a066499a3fc2cb82e955b6b18b1725889b088ea1e94528cde3ec58f3b46c1e757fa597af6ad4ba96218dacfacff9561799f46add316e233d46127d28
@@ -88,5 +89,6 @@ EBUILD netbeans-nb-9999_p20150625.ebuild 5003 SHA256 d5ca2f06480076823a2b048ea65
 EBUILD netbeans-nb-9999_p20150627.ebuild 5003 SHA256 b12f8ddf0f73d72be0accda6706b467aa11f4e9a42cf59a9ff032de20dfcee14 SHA512 bfaeac13711b1a99c7e535f892a908f243ef685718a8c5411b8ff8800f8ca61f122557fce6ce31aec007478fa0475265e258d1f98a50d0fe84718743bb02fc95 WHIRLPOOL 395e64ab067ee563d275fe980441a9aa0ff7d758e4e067f16e21c3aae67877981b25a868de40e57c01b829c9cb7568dc6774d3895ce6526e8eb3dfe5273680ba
 EBUILD netbeans-nb-9999_p20150629.ebuild 5003 SHA256 a4b4ed7fb5a745b5d1cfbcc217a048bfc8097f40eb44420508377d8a6b03372c SHA512 79c0d8ec1d0f610bcef4b8d8eaef06493f10f6bce5c839f270d65f9499c3f77ea19d69e5364e6b51fcc32b547bace5acfb69e42dc0bdbe43fb234dc3dcc68dd9 WHIRLPOOL ecbb9c2d47833cd1dcb4e2ab32cf9319ca44aabfdbe0350c17fe0e0ca9e4cc72305f8f0e29ba338cc51b0acf10299b2804603221d752202a17cbfda67d5486cd
 EBUILD netbeans-nb-9999_p20150630.ebuild 5003 SHA256 588b2e9b4ddacb464b3901b7a7991b777dc0d9365c02323e507aec80b138a6a4 SHA512 db3d051f538dcd05bb7310ebe5431b0fc9a23197e39c2bb6867e2936bda9b59a99156803f09d1b7806e2362d3396e326e387759a634816793857d55b606a074b WHIRLPOOL 5f8ed5524922cdd0da8692a904b721cf0d4f9f74e85fc6bcd805bede9b1a536039a3ab23e8b471badf5c2fbc02e8012339be1d62c4267210c07887a7917a9388
-MISC ChangeLog 161949 SHA256 b04e6cc2491cf856cb74267609941b3ee1d1ca225aa00d2f1bcfe1b4e2e33e16 SHA512 1d683aa9ffc77298a367ed4654f3acdaccf5ea0d302b83d5a7f51d05ad5a18190c56d80f4c12ad86779812270fa8eedec361aa5a1ff31ab5c98f3ea9e3e37e10 WHIRLPOOL cec8cd286dbce59d14f1cd63106dc344f0a29a566da45c8bb37b63bc1c7afd71d946480799f5ef81c4bdac3ebacc4004b72cee2b166a63a64903c16034bb92f6
+EBUILD netbeans-nb-9999_p20150701.ebuild 5003 SHA256 064de241db10ac190ccfb71ca080c1f109bba6510a01751f941a0077ed6cefe3 SHA512 202be23dc30ec6ecf2a869d40944f3f3ebb02c84d4a5cb73d655ba4ea1ff4db0fdf758420e2a73d86cddb0b04744f82e84bb7e081de58befe9f4c6a2e5a468d7 WHIRLPOOL 86ee490e3436fbf9499a3fd8c9c641a25bd0170f387fca1478b4e189e749b5f1d4940642a7cc23da66f8876ae7daaf1696100256e511c48d297093768fe9aeb8
+MISC ChangeLog 162114 SHA256 e2174f016f1173e4aacc6e4e6d1e0e1c7a9294df333a5fa7cdb3223a6a3084e3 SHA512 1e67fb986394ed6b5fcbd372bebc145cc99ef82c02ab205896f2d8df660c4d023685d2d6ec389176b943626df6aa807ad8efe3bacce3bcdf93a4199d2057deee WHIRLPOOL ae63d899763f9c127235162b3f99cf5f1aee5c82ed2d5db70f48e64022d0968aa19424b7df64b5dc9df425e6302068351e3a51ccea4d690f1f20acfc9bcb45e0
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150701.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150701.ebuild
new file mode 100644
index 0000000..640fde3
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150701.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/ChangeLog b/dev-java/netbeans-php/ChangeLog
index 80decd1..5a6fd07 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-php-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 56895a4..dbe91cf 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-php-7.0.1.ebuild 4151 SHA256 3aee393fe89aa4788ccd17af46f1df43a5681c28af6d580724d8db0f5e804ff0 SHA512 60106805595338b83e17d906c199c54dc4cc5d979f964a41f9938a508e8514670f4e5538eeecd91f8cd06dd2b4376119674f9a7a9f2fac6c1255e14929f2bc19 WHIRLPOOL 1a09962a5bd67a4fd4eed48af3f185146d2de6f506952f626756aabf6a157678fe71e0752ed5988ff414803b83150d9b8b4de956895667e331659bb59f94e09c
 EBUILD netbeans-php-7.1.2.ebuild 3940 SHA256 779f3bceb2b5a49e923fff28c36c653e31e2d11e186fabab1e656c3314b48d28 SHA512 1296c8ccbec945e66588c2a1a490d3ea93a28672e77751e16c3dff1f1aa6e3a00b454345f0b888c684a0d31fe05aad4f44310998eb72bf1febba85da1bcdd08b WHIRLPOOL b0238f8c5aa4a8c0a5cff82b0daa29860fe39712e96110916cd8a26938ca07b8e05c308e1387c84e7d693026590846392227e95668d150bbc7f1cbc660676eec
 EBUILD netbeans-php-7.2.ebuild 4159 SHA256 bb5c66ed19c9341332e1e42efb29a4ab5d19a22c995bae93efc952ec105ad493 SHA512 c919b120bdc51b56f58b390e9a017f9e059c6b5709220e80138caf7ca3e58d432f53c9ed28f899dc9537851a4cb8cafa9e7067eaefc5d5798b05fb0be9d5bd5f WHIRLPOOL 9857d2e6ac50c4daf5c8afc0a5b65b068b6010ecf2ef04f063bc184810c18b50feda683d2d80c84c0e621909bb05b19731135f2a69f1e56db927c42e8057a658
@@ -93,5 +94,6 @@ EBUILD netbeans-php-9999_p20150625.ebuild 4423 SHA256 c5d3789d8be16570ab76e4b2c5
 EBUILD netbeans-php-9999_p20150627.ebuild 4423 SHA256 ccc7b6972b1436c7decbc7b6cffd107b93faa70ae3d4f38f56dbce0c944ca3d7 SHA512 b6bc2c95f6ffed24d06f945e03afae82bc7bc274a9a7d6e1430a85d881ecc232614dfd9c66e19f28fc9c9ff16941ec57d90ee0695337769e4ff26a39c72b3c9d WHIRLPOOL 57c1ae7c15f4dab455def04f02502764c833c88c92c3388f87c1644cc79d75ae713c9c2305907a0202bf12d44106e54a911734caaff6b68017990aa23839f2f9
 EBUILD netbeans-php-9999_p20150629.ebuild 4423 SHA256 115a14365a669871165efb22b711f27790458495892a24dedb23038a7b39a1f4 SHA512 b4750ad68b50424a63e1fda33ff545c0b63daa8cd70434090d0f694605cfd4708397f8915d1b18855c560642c0ba5b2da3be5fb873c49bee8ebc316dcf72f33d WHIRLPOOL cdbccbb61b135d940d638b73fcbb544867d437abc7b7cde9c7b952ae51a4b0001641a36579fed787d4cb0091706493cbdaa5023930466765bbcd70645f663606
 EBUILD netbeans-php-9999_p20150630.ebuild 4423 SHA256 062a4dfa1644a1892ccea4d0608263fea18eaff56ed111464dc2cc6f5a2c058b SHA512 86b7763ec60fa916f6ec5d1a1553250d424a0bf07613b2efbba0951082b61efd5748ca840807adb1b2b372dfee85fcf76303cdd253941b2009a6142df0fb1a50 WHIRLPOOL 51d8fbad2336e382fb4835cf7445d2b440b64c81da9190226a63e640f4159f1e51bee07624de4abf62ef238870092c751101716c2e8b9a22788888a41275a9ce
-MISC ChangeLog 161740 SHA256 81eab8f95ca1ea11e1dd7bf72507a9f3a786e18e5d5a08cde06919d68f4e80ab SHA512 302e01985cbb66dabb79bffefa08dd7e85417c76440d16f32bdffcc1c87fb0728e7c150ae124c497bf5dde79aba7656e398dc8f676e22bbc027f78e3225f39c1 WHIRLPOOL 2ba0a6999f445593b25a1ff821f9cccf3bf96c0435b235634cf2c9eaa404d28a9269b11730435fb489bc16914b14e35efb5766f9f86794525b01533d022d522d
+EBUILD netbeans-php-9999_p20150701.ebuild 4423 SHA256 2c7fa2d5dfbb653a6986bb7b2853deb846b4596e01b4d2ef25bfcc676e2cfe7e SHA512 18b41737b9c4290b691baa399392beedbdd16db008412d350a215bd637fe22af969b06a3da3f80e072b6654b70c92d06868048aac762dceecfcd67a825fc91ee WHIRLPOOL e622a630c2ea44ef69c501896a81329496d42f5fd12f99f13f05e7128793975067d8f3c6fb984b8db94aa52da901a6bbc3360798967f2458e57866c005cc1f41
+MISC ChangeLog 161907 SHA256 62f3b881b2f42694836b01e745814522f6c0f929ba093172c8711857347db601 SHA512 1236a981c059660ce7172594da0328a6de968f47753993c18745115a21acebd873a2337fc3aba4905bd3b579c02c4e32f95ea0a33c6febf7b57ca79bc26701de WHIRLPOOL 25f2f23e4760de4d877203b1f91e53d344a0a3658f4ad5720f1c801e41e96b33dbd38c7f1394e0d11b0f5c736adaa4a6fa17e774c1f3bc0d974ce187fa0310fc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-platform/ChangeLog b/dev-java/netbeans-platform/ChangeLog
index 3b91f0f..ff1d512 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-platform-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index b49f518..e8c4b9b 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -70,6 +70,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-platform-7.0.1.ebuild 5049 SHA256 b67cf0867358fea808614c02b8b6ea2ab88223f8642175ac3f91dc8c610aca4e SHA512 611b8e831a95d1b4e1c3a1f5e4904c84f9606298a94eb0900ac06cc88670849d218a3a03cce07b2463e206da01ce2931cdb6677948d20d8326908a36851589e6 WHIRLPOOL 01769eca4eb20c2702a432a6180eed16a9a50687016e307e585ab5de5cab8b3b664e456d489ff15d9f5af349f791b161eecb9fef7bfaba09a70e1eaab5d545a0
 EBUILD netbeans-platform-7.1.2.ebuild 5034 SHA256 a069e7e45f768e590e5b30fdda26185d8fde492355e4c530ce44169def991cc6 SHA512 31cfb0d9f13eacfcafd49be995bc456d17a689776e032f68ed4585e068a49f6e992c37c57f23c5e27176fb060996bcfc86b0446ae26efbc488909102fc10c979 WHIRLPOOL 1bd35ac39366fd13192e4a6a177280727bceb2f5f12ff684a288725954a29a240f2d264c3ef2ca38fa3e133063cdd943cce1d0f493f0f8ea9a621833c8f0031b
 EBUILD netbeans-platform-7.2.ebuild 5432 SHA256 227add7f41117667d8487f2bf8eb846c21529e7b2c49dac46e4b3b33062f69b0 SHA512 e49958f21358fe9689336d5cd5edbe435d0a2fd12c315174dcb408bf6ed4e6515d39d458554fb576c342a43f0af50c327bada8fa0b2eb485e14c01ddcdb6248d WHIRLPOOL 4f9101a2d5495fb6002b7791822f85091309c04d6c475060c116725f8da32f9ed270f0c27a9f6a2bd2aa0bd7417b18e9165d1feff7e98f6205bdafff3223e5a3
@@ -107,5 +108,6 @@ EBUILD netbeans-platform-9999_p20150625.ebuild 9244 SHA256 41b5b8e0aab7c167bad75
 EBUILD netbeans-platform-9999_p20150627.ebuild 9244 SHA256 1e5cbdc9a6fcc17ffbe5bc0d1d6a7014187cd18355956b15410f5ccd09a67e55 SHA512 890314488ad2018188ec03d872f6fcb3adc72c5830ca697046cc211da35bda7a1a57113a27d1ca7e5dde7c21f92fbb213e96cb43f9fdb9bcccaf47c9d663f7e3 WHIRLPOOL ed4b8f5841496bb20c07f0665756b33d0f3296e9be294e8f77547b3e7553d95e880b4eb2a7ef10b47ced90419e2875854e30b65e9db1e3fca13a288ebc3d8e82
 EBUILD netbeans-platform-9999_p20150629.ebuild 9244 SHA256 de830ff9f8ff835de909086e387f0776844bf8e34d06931ddec50a364ad487b7 SHA512 c89172e1edf4d99bb760c29abe2bd3912ff41f2b16bfdd201c8e167b151f5f0416dd218fc787dc8d5cd4e5e1d7d43132e3b2676f3cdf1e114f7157d3881e7785 WHIRLPOOL e175813a2c2f8d49647f8139b500e3e695a0658f28d81b879cd13634a2561f4b68e32e8164c05a78d8abaad0a19c7bc5d4564ca579a702207af8eceb5b6aeeb0
 EBUILD netbeans-platform-9999_p20150630.ebuild 9244 SHA256 8ab6afc982574fcb9c55770a660452d1e1ad4c31b3e37e2b43dee0d3e8e28aad SHA512 1f62bd8cb41ef3d6dd79a21f0a2885ad3ab18b24f1299f7849606668081977122b7f7bcbb6ab6653f49458838e9ae5835dc238225059866e1f28911a25e1b22f WHIRLPOOL 30c2fad60c77810977676da59e6c7657496ce80d5c517292b9b8f1016bbcb15989837f0dfebcc8bfde983cdc599bde180b33c75f8911c9839121e8e88486f4eb
-MISC ChangeLog 174015 SHA256 c89ac6eac4d19ea8a1b31246472d2def276e2164b6418b4697c4d3d02761bf37 SHA512 663e45d08912f10f651373e593f2e08cadaac7ea8e60d9de073ac1c6f3415c5ee91382da08f2694713479fdfa88537d803133912f12fced8b5c118a25ae4bb9f WHIRLPOOL b109dafea6016c8709faa26c1eddca45aa0d77ea9b63bede8cbab89d1a3580cde82ceb7e0b466500cf5e7c70b9849e01d1500c9c05fb585d1b001b933b0cb6f4
+EBUILD netbeans-platform-9999_p20150701.ebuild 9244 SHA256 523403d7b130b9fd2106ced5464e372db26f77f8de0159e88e490dd82999c8c8 SHA512 07d72709c8acb18447a93775cff9a410cdc8763e8acaff25ab7b94e046cecd829a042bf38a1736b26e14f8771b220ea7918c4476e4cfc3bb2fceb21f59f7faec WHIRLPOOL f16e21c88b98ca1040d692a9b425746816d3095232e2145f3ad5156db6f5e13396ad5258bd43a487117303edcc0e787e12ee2916733859634488a6bbe97fba24
+MISC ChangeLog 174192 SHA256 eba2be2e61f9b4bd426f1edd129edc410642d0faf56b0fec1c1792dd8f2c9d31 SHA512 24c46f98ce5743bea631485317f75f42bf5a8aebda832e26d0da73a84404b10107b230ca1865116227da08ff0f6e4c6747513b668a89d6c1d495d03c75ad3746 WHIRLPOOL 69a6c7d869a25ba66d08f6e96a14130d627a98af989bc6448334e1051bab7e6fd5f0fbc89029d08c53aa761125ee07378883540e46546b18dc18f251cfc2fca5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index 04dc0d0..d0729e9 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-profiler-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 7f9cf63..4b8ee8b 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-profiler-7.0.1.ebuild 3222 SHA256 b1bab800a27c30aaea26b8ff5ab21abdd1bec16b9890133429eca9ea77c018fe SHA512 d6198f44a06561b7e2598fdd6a37f8a3dc13c38f63dfbf6a86a083adbf71e9c62af87cb4e1b5b8dd2dc99feeeb99a7afcbb8f7747c378ad92c71263cc91a6c54 WHIRLPOOL c62613f511636b1f0393ac32c6b50641cdf7df9f9fdc95fd5acbe1a602ffe42fdabb556f989552b05b0607a5ad9d324a2019440c3ae66c50995ef3fc8775f385
 EBUILD netbeans-profiler-7.1.2.ebuild 3231 SHA256 94d87bf6f86add3bdc27f9f20084f35fe584fc2bd697acafa8c23cce16a0d1ee SHA512 dcc8da918a6b6e07ccae513fb4296d16891e205b49098fb8269d16beb9b1367b1920797cc78053b83f4321c1b69faa393365265c72213bb2abfb9d3f84f66319 WHIRLPOOL 18325a1df836e7242838920483c41d43f37b9dae8322d36a2a562b414baa0dc76971f581204ce76a6d64196dd60643089e8704da69617590cda61ce54ce82e8d
 EBUILD netbeans-profiler-7.2.ebuild 3214 SHA256 ddcba9ba672ad566ef256538fc8631ae691aa7c6574269199f26df5382c37f4b SHA512 1bb7eb95381861b8265ab366fe3c7a9b99971d1c4600eb6c7bffb521f4cebb32bcf3d662f82c811d47fe95e77cd39e48f3665f0fcabf9145eb171c2746d89684 WHIRLPOOL 7f74c2be9ec4e7ff419086f1da3b1a12b1c187102def004316ef89ed28f30da62542ed3409a51473a8d9d68d18a30de36b1d0307cd8eeb7e580668fe896c5aa5
@@ -80,5 +81,6 @@ EBUILD netbeans-profiler-9999_p20150625.ebuild 3478 SHA256 d0b7c73c40dcc8e424251
 EBUILD netbeans-profiler-9999_p20150627.ebuild 3478 SHA256 7bf8aa3bc526ef2d2643b180d326a352e08591e1b198d5e64b4c2db431c1a72e SHA512 098e36d3a3457316ee6566c6e9d5600d0aad6679cc310ec2836fe0b2c25b520285067e092929f67aaa1ed1b0c21b37de1d944f73edffed17416782e2b0457e78 WHIRLPOOL f6004524332196fbba132c8431577c9cd7c8627337ae8ff832648cde4f20b0f38d4b8731b8d5301569e5b9ecbf034b350140f94156c35cd76f0b78712af39f7b
 EBUILD netbeans-profiler-9999_p20150629.ebuild 3478 SHA256 00861c8d79f057e90f93cab2368b83df927d3461640715a1c8a1ae357bbbc909 SHA512 69d689e576f8946ab3caf9c848525d2892cfed75070955a5b0271a275088e926078b9c080592370b2983e10ee965856be3ac32a054e725fffb4bcc7183ba595d WHIRLPOOL c3d5b48700435d693d5256af8b04c82b0b3c8e05d6d07199b74783eea8e84f5621c3cbde8e222484060b3b7c2f7ff8459ffa765839e586da96b4ff06d48975d2
 EBUILD netbeans-profiler-9999_p20150630.ebuild 3478 SHA256 d5ae3a75018fa58353b211dadc8d76b14a5410e3b096a9b845a03424cc71124f SHA512 6416e179e7be1f0eb9ea6d3deb684c0935cddc1f765223c8d9947d0de9c6731391acc835890dcdc517c16d07d4f9d87841293af18d14e3faa7306427b862bafc WHIRLPOOL 94876f70ac4ced876cc9c99bec5dcf37dad4d8ff70ea8d5d83569b66d3e4f47344944bfc9fe8ec5718b7c8332c063d9eeff7ff33770ba5334c163eacf8409e0a
-MISC ChangeLog 173476 SHA256 4d258605f4874ec469a796008a4bd5e8fe66410ad10dd8fa208e432d910e8b13 SHA512 5b0e26504b92104af5b9b078caff61fa38dba3837b5309c17f9b45fbc7e1ba6ec42008345bae12dbbb8dd825954336bf8f66eec0063a685c43678b86d5231e09 WHIRLPOOL 1557e3b5586cf421627b3873113eb8b1e94f9c3d958e726f17c96d5e3b729d083a2792d0f976892a4f983e43a8e42ac29744ba9d782e5bc0a7e9a777d46a2aff
+EBUILD netbeans-profiler-9999_p20150701.ebuild 3478 SHA256 16937e72c913f4d55fb2f2c17350451f23271ba48f0960649b17eeaa558b1c7f SHA512 ca381eb0bbe5cfd36e8acbd9269c3b097eca75cd6b05e79cedec1818c32ffc8b7bc0b51438a010764ffcc1ed230e30e1f32e7e5fcece5aeb848e08b09bcd03c1 WHIRLPOOL b16c18ce4f2b6f2c8a7baf24290edeac47079ab1b6bda73b0f99f04a4d61fa1e855f62348f2da406c55063f11205a18f472476082b9602d8c7fb7e1d440a74a3
+MISC ChangeLog 173653 SHA256 444ee47bb3b47a8fcc7b5b964a44573c44d71ad15af8f05eecd8b687fef0c6d1 SHA512 9181cca0370020b427537ab91a6d7086098b6e88f961203d20659910148b4d9b8fa06a8ca5cc65c2782ebe50397483c456e0a0d4b8eb1ea6e5d41f033582f0af WHIRLPOOL 253ed51bd6cf388fd6dfd5cecde6fe271fd57b5cf9a13ea80e57fac9ec7cc587e746e76d8019acc10b7ae0010ade56da220b65ce5464dfd9b0d39a21503d268b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150701.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150701.ebuild
new file mode 100644
index 0000000..89ea79e
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150701.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/ChangeLog b/dev-java/netbeans-webcommon/ChangeLog
index 07bbfb8..a64bc38 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-webcommon-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-webcommon-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index b5203e7..3f6f47f 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-webcommon-7.2.ebuild 2665 SHA256 9328ea550dfeca5be5c2b03aa5f512d451f1673e49a40994155fca0b2fb2f79d SHA512 d8b80b79e78769a70d01605a79a8a91f7e839d4138b4cbf28cafca6f56ae3d7003c2f5f40aff77bbe3f2882f43a7d7dca3f0428f0f2723a42ae5b49e4c71ffff WHIRLPOOL 31254cbd2fc6cfb2d1bed4d22958595dbbf73032439f19e684463efbe466ee80c144f77ab00ced7a07815b1cdc1d45a87ceda83e7a2fd20ac2ce65e45d30a093
 EBUILD netbeans-webcommon-7.3.ebuild 2986 SHA256 327c0a73fb20778d9fbe4a12024fa065e4102a7aff3fcbda7448874656a46420 SHA512 3d270e940424b3bcdc8c7f8ff2016d33eb55420ac4037f4e406b688c2acea1b07a04625772265ac293d80c0d1afe3bbe6f865051ed9234b700619bd0781d8b39 WHIRLPOOL 5bc288949ed3aa9c3c4cd4cd33b817fe317754229ad30e80da8cfea817bfb77e988a1d6d3280aaef90619968e0309fad212deff0f7970f04438494a893a30a5b
 EBUILD netbeans-webcommon-7.4.ebuild 4727 SHA256 54a0b63527001da34a21ae3ed69c2cfbf9a446ee69bda4bb6ac5ebb939ebb68d SHA512 96895c972cf7092426ec8bc06dccc6ab4f33334da4e67fd4da01e586801110bda8d955f2f29ecd93b8bb58ae64c4af4139e9954a784c10dec925e2beaeab2394 WHIRLPOOL aa7b3b59d315bd37553052470b1f56f435979569e5ef033493cf6f93c29827f2ecd30f6b874f07a0cd8824469c6546982ac3ed360bf3b6cbf211d95943a3398a
@@ -84,5 +85,6 @@ EBUILD netbeans-webcommon-9999_p20150625.ebuild 4997 SHA256 b839edd52cf6b7ffba4c
 EBUILD netbeans-webcommon-9999_p20150627.ebuild 4997 SHA256 0b76febe860e560cca8854fcdea1942368e45e40edf35e566f54797b2e741aa3 SHA512 35bd9722bcd4402a9a3bde611e3f50b69c25f463475e381dcd0a04d514f146695580166c7401f75c19097785e2d237966b58d0b29c05075925c5e2c1d2c78329 WHIRLPOOL fffb3ee84c15ab662b3232df29ca09b913c648a3ae4dabae46ee5019de756d4d3326a7171fa74d2e15ac48bb07cdcc8983368ae815d83292f7748265151c7ed8
 EBUILD netbeans-webcommon-9999_p20150629.ebuild 4997 SHA256 f14b99c4915382eb2f124233d4e3a90a950c2e015ef6b2a7251783aa96a3d67c SHA512 893ba5c292b035a075f8dad2bab43e1961aa9d62efc794b070a2d32223e308d62a2c3c9ffe4792ff4e3d38798dee1a3bcc85e09e531b26783aaa052334566e94 WHIRLPOOL 4500422a66d74d73e8c39870ce07a02d723b73230f5fa3eca3913a47107c5d844ce23918f9068da84ced841082bb755af67dcf8d82a5a042e24cdbb62cfe9948
 EBUILD netbeans-webcommon-9999_p20150630.ebuild 4997 SHA256 adf8a4a34a983a3917ebf6df10009f672e3a07bfe57497ab16d815caf0bdbbeb SHA512 f69b3434ff0819803d905331986bf4f6e6c8aa0c54b6140cbc3044fbcdf1ffd2af7d3624e6df1c00736109ea8ec6145395516dda9e2de1acc75785be6c346fca WHIRLPOOL 28c886bd3e3de161633ad460f32cf824b6d93ffa97d521b01ead73500f1235f4e9433ec4dfd959c52897b6d578515cf88bd7e4a24932e0ac3083350592b47021
-MISC ChangeLog 146622 SHA256 51b7a34740ca39fb8b7989aff4337c3b31b8c7043828885bb71cc1e8451ca543 SHA512 43c83921d27415700928e8d0bfcfd3c34aead5e32da03df72ca86fb85511c6c0b59f61c7473e2b59dfa496d7d239180ffcc8919007e0fc35c726835f4bc1103a WHIRLPOOL 9700cec9b87a60418a04fe6a8fb3f17927e810d1862e8db32d44ad23c1c70643fcf203a3f0f0348d661f03dd9740702d7011c9e0eb45fb404fc420d7d98fc624
+EBUILD netbeans-webcommon-9999_p20150701.ebuild 4997 SHA256 c8733642848560cda5479db1293f41c956602f1db0ef00cbbbad442d0a8d162c SHA512 4eb58479d9ff9b0356c61364e8ad1267a55c86a90f554b6ea6c39eb919795cf6eb4e33f220df1309ecd350056a75458da6add775a8582b18ab21342c12d17659 WHIRLPOOL a38b615d296e72b5e181fc347fecb70fc1b1e7fbc4f51724cc87c31c5dd8101565a9c1f09376a94ba5f97be40540807514416893a9d337e75315de587c815687
+MISC ChangeLog 146801 SHA256 e9c22a2231af4899114fad715de0ebaa7aa6cd4dd0782041dfedd5906d624c57 SHA512 75b4a91372f593cd4b0ece6552f2e219a662dc90d139068c50669da82f2b7cf0858c45e83fcf03a7ddd5b7c7afeced03a56ef566ff8d113a61a43078ffccd79e WHIRLPOOL 192cf45a0e62411618aabce5cf2d50f8402cee5a11abc3fb008f965b1b4c88afc76e83f53780b683f5f15d3f99a9603308b97c63780c333a9dae40764a665c77
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150701.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150701.ebuild
new file mode 100644
index 0000000..061e4a8
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150701.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/ChangeLog b/dev-java/netbeans-websvccommon/ChangeLog
index 23d8ea6..027aca8 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-websvccommon-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 469f863..109e809 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda SHA512 32b32894713d7235ebd03446c5c411d22eb8701b96e3d3ac54eca78b2abc833babf279085cea3b74bb7bddc6d89a283a21c58a0b0462042ddd10e22dfcadeb84 WHIRLPOOL 59c18168245767acd1f8e53046f8942698237aa6fd903a669c626b7f17cf3d39247b7ae57f2984562230267885a4b6a62be43dc8a330f1dfeb2cc7acbbd7d3c6
 EBUILD netbeans-websvccommon-7.1.2.ebuild 2701 SHA256 3b2a1cf0d32db3c55b66d1c6b8c4ae2ad5487d3fdb27752468ce5c860f9b9515 SHA512 b9be64755f00157c2d6984887b8c0fdc1e34470f21df1fd72b3e399d3ec894af01c9b79fd604778213ac2086a6c96bf66366e8c2c8bf97f7fee23d16ceb36974 WHIRLPOOL 91559de8c8f6391c3c69888854778a91a1a7e0052ae69eb9762bcbd64d8bc5587fb84ebb55d7d0375da5a7855aa8672abfd035b6a38b3eeb5c23a4cd59b3cdce
 EBUILD netbeans-websvccommon-7.2.ebuild 2684 SHA256 8bf8cad1e0469713c63280620fed089600191230f501a78b834b010f8fa9b3e9 SHA512 fe885f92a7c6cfac532c8e40e4df6283253c43294e9d82ee4d0d070425496eee3792479c268b46bf1fd484f753ca1f21e7ca38a5d71816b6d4fd219082e8e276 WHIRLPOOL 9d2d622d4a800470c874d8751e9c2055e0a4ef72ad01a01aefda4e95a7f295d55fc95fdb55fdd1f631212e1f610bdc7a6b4ee631b92492bb85f73b0d9fb4ba26
@@ -81,5 +82,6 @@ EBUILD netbeans-websvccommon-9999_p20150625.ebuild 2727 SHA256 cf2d029d32680b016
 EBUILD netbeans-websvccommon-9999_p20150627.ebuild 2727 SHA256 14f0738371a82efdee181f6836bb61f7654f4cfb287429fc5c7c942d659f3a16 SHA512 8e818555573b84d3f98497a87e35dc961da260595860b8d002d0d7d31c9a72bba97716b78a9a50871de6e82803936d670fcb15ad8830334b8fd300a7fd363395 WHIRLPOOL 66664c10213a993de58e0dd3f1fb4f175ac91d3d296f267446e9d3532556e6a31a3558b634a9478bfcacdaf9b9335e345e0aacc9ebfc1eed52deb3d3dab68281
 EBUILD netbeans-websvccommon-9999_p20150629.ebuild 2727 SHA256 9b96c8fd5529194d1337662891e639a380e1550ffaadb4140cc987c2c673bc20 SHA512 39fc1d32645712abe889fe9fd5d31376c0950b14797d4cc640a1e8a8fd2f9b925094ad33a004521914cad199f5df83cdf08bf00fd9d83949975c578c46c99094 WHIRLPOOL 6713282603ef8e88b755a39773a5883521307ce47a55bb33bb36eddf8732515c3777f21a61eaf9b0c08199cefc503414c0a9edc551d83fdcd1fb1701d64e2ef4
 EBUILD netbeans-websvccommon-9999_p20150630.ebuild 2727 SHA256 23cecff76caa19abab38fed424453171e24ec1352eec1e5d0fa479914dbdd67d SHA512 089ce03a414158cc5f23eb7befc40bf7b49bdd1071c1b54249dfbb0d6ee99545180b39d4c5a6417d3919a3dd60b200b86bf87417072cbd3b791c2ddfdde3c23e WHIRLPOOL 7481d5d8f26300d8f3f50ebbe8ee8bad6365ade983dc9a98909c3896bfa80ab95cdb1698b21b86f00f901a0e169e4d47f7e7bc7e6b94542866df14ae77080f79
-MISC ChangeLog 181814 SHA256 1e6df6a801fffc56794171e90eae8f0c333e60432a2deb07b3e165c0bc65f49c SHA512 cf8478e31ca1e63f536e8e4bd16d84b605cae5851b5352ee06db0fc0b2c7c42ee456bd198cadd353c089912ba51150a889f3c78d904bef4d8f7fc66cabcd4846 WHIRLPOOL 6f2eab85509a0c3810a9f9962db246e358bad30d6f75fa4dd2dc695db8be3e2079eadd4b5e78ccb616d7d8f639b362cd3ab35b4a92b546fef8f1f46f03c3144b
+EBUILD netbeans-websvccommon-9999_p20150701.ebuild 2727 SHA256 687d252bfd85e68a899cfcbb8ff90249fd6d046066b56b7b89a0941b3a4e4821 SHA512 3ccf9e70469c91a2463c23106b36bc0685d3a97eaa54687cf59edbe6d2fc91cccb3adf957b28a571f3d46c337265f045eb4a9557cd4bf294c0f279398931fc45 WHIRLPOOL e4fbf73f4e79eb9803f7c964b3d7377412f6f3d990f273aa1097ff42a8402f0b2a2e04d7e4d5a013f8395c71b23cafead114e6a7b8d8cc064ba280b51c0166e4
+MISC ChangeLog 181999 SHA256 6c48fd59650b6d145b7475c37dc790aaa1ca627624c64c2410f5299cede20076 SHA512 34fe3b19beb555691406ac751e6342e823e854af224fafcaecd7182dc7b2392149c82bb8c5650cd14b13e40f0869fb4ae5a17d8bdf61a5691fed612d6e385779 WHIRLPOOL 60ff816501dff7f2cf736101ac7b4d10e7c9a4149651538e300f70598f25daabd145acbbc6cfb9435cf3bc9d397de7ec7bb4822d462591de4a0cdd781b5a0810
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150701.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150701.ebuild
new file mode 100644
index 0000000..de3f9b0
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150701.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-01_00-01-56/zip/netbeans-trunk-nightly-201507010001-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/ChangeLog b/dev-util/netbeans/ChangeLog
index 48601c5..370a12e 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-9999_p20150701 (01 Jul 2015)
+
+  01 Jul 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-9999_p20150701.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150630 (30 Jun 2015)
 
   30 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 60d52bc..d8c5574 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587
 DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 DIST netbeans-trunk-nightly-201506290001-src.zip 208007970 SHA256 c946f79e8d9834dca6bd485149b7d7c8c3492657ddb689755d41282963ef8614 SHA512 d687ad4eafe28512247f154eb4627c343fe7fdcd58ab895970c7eb68cfd1b0473e6c8fc0ba3d5f29b534ec8e3fd73c775ea7de13fc32158da85c93eafe7b1d3b WHIRLPOOL 29d0e1b08fdc0f2c8ba8563f3e9809900682e9d66f8656d30c73c2ee2529ce1d423b11350eb8cfeb82a845f72951d5af2fd11a078426a44bb94c7b2c5eb16bd5
 DIST netbeans-trunk-nightly-201506300001-src.zip 208032815 SHA256 ce244f0502b501486aba525f65b315bd424268cf5e73bf1c8ec8d7671afcc4b5 SHA512 d0d079b531c0d74a4ddc01f3afaa5448d1a9a6506ed3ae11ccf803d2bbab2601e6158dfab88be9408014daceed62a5ecba54f3d4372e535fb02147a167d825cc WHIRLPOOL a69f202dfb2106898986a5eca7ead2156669879ca97d4a41d475eabf7cea0be2859ff8bffeb1dad81a75cea80058cb2f52803c3d3679a5c0a46e2cc115ed6028
+DIST netbeans-trunk-nightly-201507010001-src.zip 208078805 SHA256 981fd8029e8ed54eeb163701a3f75b8f501ef478159c94fc22b1b2157e1b1a82 SHA512 80e41ea6451a356ee2a760cffd8e8424730bbc26ef7338da251bf1427bb540517153f0f5a6402d0e53ce5dda34b4c0bdf14ca4499b9ed0ae9e220c4debd193a5 WHIRLPOOL 3c324d6dea7f457075ce2b4fe6b5dab77b7059798ebec9d7975d3818844d00c24a683fa7e29c24837d6a2e2694764dddec8d562eabc8f43c94caf93061079a8f
 EBUILD netbeans-7.0.1-r2.ebuild 6736 SHA256 e808fba2ddb516270d93b5cf67cff60d98b37ca58a158878f2e3b3ad696cfc82 SHA512 653fb585d9eaa20fcf88d778a7f34d63c9f29f2af2153a432fcab6d977ef9619c699b19587a48b148ccf717f4b31a43859b81cff80d5d84ad273c5fa16e8f565 WHIRLPOOL 257f2466c3ad198a05db9d5e377cad2707f8a4daf1f421e516d7435670a85fd4bb5f6b3ab657ebda8cc23937e1b4e1f4acce8cccd85bccddc5a7b1f9abbde0ce
 EBUILD netbeans-7.1.2.ebuild 6976 SHA256 4222e248dfb664ccfea85d4938ad691d3685f32d8e9b33289d1dda088057261b SHA512 cc0a20bd542b61621fe08d5413611f7bcbbebf0c37d5f67c590c31324e74eb5594e72efacc86d843ff3abffc98c4859c2733c63ce6f993baf51e24d69197b64d WHIRLPOOL 30fb7b0cbf22fc39a8dabefd27a0073ce73e62ef082d55839fb7f815bb73bc5c3c24c3418ce175f355d7c64138ef7e9616da41c68b3b57a70353d16c6113daf7
 EBUILD netbeans-7.2.ebuild 7057 SHA256 29140b2779f1a24722499605101c286d05415b4f97d2363afedef711cc586067 SHA512 0776f530f9530c533b13019f7b34fc664990a16926bcff768d0a9f3b9035de82dcd2ed66425ad8da27c65aa69fe3e6be966e0a1ee1bc222949e5d42e14f7f7f1 WHIRLPOOL 9fcb95348171fb0bd8d794b80b51b2e3ce36fd84ccc81653bdd0172cbfa99791e527b33c895ebf7b4d81c228f17d4afab367eb55ceffe28df835b2d09dc8f778
@@ -88,5 +89,6 @@ EBUILD netbeans-9999_p20150625.ebuild 7216 SHA256 8cacf70a03ccfbf1312d97d77213ad
 EBUILD netbeans-9999_p20150627.ebuild 7216 SHA256 5a93e95f705fe4bbcec7ddbef3622df0b9b96162047c1988a55906d397d5fd22 SHA512 bf1bdb38229c4d382d7ecbc013e5c7f203b15b04198b2f05659ad345f5e876e693339d0a2c20bf75a14db7f3e127e171d282ed4438fa60843412ac38f3b2578b WHIRLPOOL 6f68404b9f34f7f481c5fe1ba082b8dd5235ab580fae75821bc91228b6b23a14466d50606416713e2056113e52c468593a12b4f5b123e8027ecb52c230eb99e8
 EBUILD netbeans-9999_p20150629.ebuild 7216 SHA256 f9f26e516ca4e7c8fd31327f0740d3675e6b41dbe92f908ab232982b3273108a SHA512 95ec833589dd5c9c1252660491ff9c3dc9704dc527eb3f8e16a2cd07229b9672ea5d893f4c42938a7f3620e7c1e3affcd040c13313007617ae58cd8ae0f4f322 WHIRLPOOL 61c2a6a7c0904e3586225ed482085566ad296dcbe13cd4e799ae3954eff248c85fa4dcdb5e1ff508ef7cd757e34a68c78878b69a69c6e37762e5312511365ddc
 EBUILD netbeans-9999_p20150630.ebuild 7216 SHA256 56768fd131b7b6a996204a8ec45d55fce430e19bba13219244543b1a387f1820 SHA512 b4133e9bb403be9e2cd2c19b12982e54b0e16d22ddecbc59358bb0faefa8205ab02810483145dfbed726b584744a7bbd22be3f2f2d07ce4bb4adb3ac345bc402 WHIRLPOOL 7ebbadaf364151b482f9fa41d2684eb2d2acf6589d52489025796cc6f7fd9b685c7f4b160a4a14bca88a1fcd0f6cb4684eb568b498e57a7d618ba14ff82ce7d9
-MISC ChangeLog 154489 SHA256 aea39a83338967c2be8548c30b5f0f5f6d12e71733a122fae69edd252b717122 SHA512 92102320aec27c5df30fec5c35ed1879b733b35313ea34f4d9c0e5f73efaae2937d98c231b372426877e23fe1daed250b1eea2e14057e9449f44cb5cc773ad7b WHIRLPOOL ca3637b8843b2bdf3d7f54ed3ca174ff05a92b40f2d795a1530076836a4de0a406192e31d266685afdbde1bf87cbed40d8c0707fb4835cb7920c37cf385cf20b
+EBUILD netbeans-9999_p20150701.ebuild 7216 SHA256 044fd88c20b24aa8f46c7f89197733c72ebac7505d5b85d7f0cbd38f1bda58e7 SHA512 84731e001ca310c5a70fdbdd124227c4a47cda284a1b997792d9dd27ae6b62d4dd22f5523f3a5e9dbc17756996b2c63f113cd6058920129aed5b349f2de86410 WHIRLPOOL 4b8571d39ab72f0473920d5300d65fb21bd59079fed695f0d74d52b41bbabbbf696e32569ffdee11f6495a8de44d1877d190aa58de62c2a0eabddfb58a61601d
+MISC ChangeLog 154648 SHA256 e9f6d5b9f63cec3883c4112e4786a9c103651185257ae1ec8f39343661a0edb4 SHA512 cd1296cb7bd3d04a95e95083f6068e2d99054aae5ac5b9d5b1313f6ce7b57afbe6125bb83cde29dd01596b30576c12bd4a5548671bd7a1d8ebe22ac9de8c2045 WHIRLPOOL 9af14e95123b9c2b5906ea266100074bbbed137fe2ea1dfb21bba58c69c534780cd49ad74b4cda0ea4f115bf3abe431981c535624ded6c6217a5cd45f5aa0c8e
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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