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

[Miroslav Šulc]

commit:     5d0ba89f9a184837623a9f708718ffb68b8caf49
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  3 17:33:18 2011 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Sep  3 17:33:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=5d0ba89f

netbeans: removed obsolete version

---
 dev-java/netbeans-apisupport/ChangeLog             |    4 +
 dev-java/netbeans-apisupport/Manifest              |    4 +-
 .../netbeans-apisupport-9999_p20110821.ebuild      |  106 ------
 dev-java/netbeans-cnd/ChangeLog                    |    4 +
 dev-java/netbeans-cnd/Manifest                     |    4 +-
 .../netbeans-cnd-9999_p20110821.ebuild             |  123 -------
 dev-java/netbeans-dlight/ChangeLog                 |    4 +
 dev-java/netbeans-dlight/Manifest                  |    4 +-
 .../netbeans-dlight-9999_p20110821.ebuild          |  119 -------
 dev-java/netbeans-enterprise/ChangeLog             |    4 +
 dev-java/netbeans-enterprise/Manifest              |    4 +-
 .../netbeans-enterprise-9999_p20110821.ebuild      |  317 -----------------
 dev-java/netbeans-ergonomics/ChangeLog             |    4 +
 dev-java/netbeans-ergonomics/Manifest              |    4 +-
 .../netbeans-ergonomics-9999_p20110821.ebuild      |  101 ------
 dev-java/netbeans-groovy/ChangeLog                 |    4 +
 dev-java/netbeans-groovy/Manifest                  |    4 +-
 .../netbeans-groovy-9999_p20110821.ebuild          |  111 ------
 dev-java/netbeans-harness/ChangeLog                |    4 +
 dev-java/netbeans-harness/Manifest                 |    4 +-
 .../netbeans-harness-9999_p20110821.ebuild         |  114 ------
 dev-java/netbeans-ide/ChangeLog                    |    4 +
 dev-java/netbeans-ide/Manifest                     |    4 +-
 .../netbeans-ide-9999_p20110821.ebuild             |  364 --------------------
 dev-java/netbeans-java/ChangeLog                   |    4 +
 dev-java/netbeans-java/Manifest                    |    4 +-
 .../netbeans-java-9999_p20110821.ebuild            |  298 ----------------
 dev-java/netbeans-javacard/ChangeLog               |    4 +
 dev-java/netbeans-javacard/Manifest                |    4 +-
 .../netbeans-javacard-9999_p20110821.ebuild        |  141 --------
 dev-java/netbeans-javadoc/ChangeLog                |    4 +
 dev-java/netbeans-javadoc/Manifest                 |    4 +-
 .../netbeans-javadoc-9999_p20110821.ebuild         |  160 ---------
 dev-java/netbeans-mobility/ChangeLog               |    4 +
 dev-java/netbeans-mobility/Manifest                |    4 +-
 .../netbeans-mobility-9999_p20110821.ebuild        |  184 ----------
 dev-java/netbeans-nb/ChangeLog                     |    4 +
 dev-java/netbeans-nb/Manifest                      |    4 +-
 .../netbeans-nb/netbeans-nb-9999_p20110821.ebuild  |  149 --------
 dev-java/netbeans-php/ChangeLog                    |    4 +
 dev-java/netbeans-php/Manifest                     |    4 +-
 .../netbeans-php-9999_p20110821.ebuild             |  119 -------
 dev-java/netbeans-platform/ChangeLog               |    4 +
 dev-java/netbeans-platform/Manifest                |    4 +-
 .../netbeans-platform-9999_p20110821.ebuild        |  127 -------
 dev-java/netbeans-profiler/ChangeLog               |    4 +
 dev-java/netbeans-profiler/Manifest                |    4 +-
 .../netbeans-profiler-9999_p20110821.ebuild        |  113 ------
 dev-java/netbeans-websvccommon/ChangeLog           |    4 +
 dev-java/netbeans-websvccommon/Manifest            |    4 +-
 .../netbeans-websvccommon-9999_p20110821.ebuild    |   94 -----
 dev-util/netbeans/ChangeLog                        |    4 +
 dev-util/netbeans/Manifest                         |    4 +-
 dev-util/netbeans/netbeans-9999_p20110821.ebuild   |  254 --------------
 54 files changed, 90 insertions(+), 3048 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 8801440..7611cb5 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-apisupport-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-apisupport-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index e44d17d..a62416b 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -1,10 +1,8 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-apisupport-7.0.1.ebuild 3073 RMD160 2309c356c1c37ba7299c4d2eaffb76c6e2b13719 SHA1 2f8c1f33c3cfdb2ee32c87bb2285c4809e2014f5 SHA256 34286bf7e2e1062b7967faeb3d32251a2be0d527e5dc60213dc21304e2cba220
-EBUILD netbeans-apisupport-9999_p20110821.ebuild 3096 RMD160 2cc6219d912c057ba5d69bc819be82152bc8b43f SHA1 1cbb1bb989c3e57aebadfa3ad8a461b24ebf9d42 SHA256 9d2ae7be10d1fac9ba158bb443ece117b9f88fe20ca8b701a35361c5a3a5d564
 EBUILD netbeans-apisupport-9999_p20110902.ebuild 3096 RMD160 b712b9822bc8b2bc40a6a55dca8bc0e2e04b288d SHA1 8393ba6476bf1dc3f5fd8986d1769b9dd09048c6 SHA256 25b2413b26bda34c50580a5822a4a86c170a608cd58cb8512b1be926337f7abb
-MISC ChangeLog 14009 RMD160 5ac4c81c6d498bd7037ffd384964b253a0fa181e SHA1 8a6dabddc2cd4cd3a9fbfde01d36b2f37f5a0f19 SHA256 ac7c6b04c2e75f071a287ac27b6a744aead47db9c2650ddcaa9172a38543119b
+MISC ChangeLog 14135 RMD160 d03cd43f7db538b51b2271fd2452baab6f7a9552 SHA1 ab18d9045298cd3c09906109d4777e0bbcad296f SHA256 8c2b3d10af8b97cb0f9abc4a737341aa667981491f15994b4d1198513c577bf3
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20110821.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20110821.ebuild
deleted file mode 100644
index 3b1d4d0..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20110821.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-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-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 093f15a..b1254f4 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-cnd-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-cnd-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index c14d79d..9475b76 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -4,10 +4,8 @@ DIST 84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip 146651 RMD160 b8cd
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-cnd-7.0.1.ebuild 4434 RMD160 b2a18e4e2d536bc097ff467059c114c59ea8ff6a SHA1 622feeae5a0c43a98a4c0a27fb7f792fb7e791f8 SHA256 81a6fab84ea2132dd6d693ea4fa8aa72b70560a4defbfa92519bdc27fc17acf7
-EBUILD netbeans-cnd-9999_p20110821.ebuild 4457 RMD160 2f2537c6e06ee780c90fdfc948497adf36ee4f1b SHA1 229a87fe5bdc6550fbd3d35a758ecae26548b942 SHA256 713e09a1f1ad7412e86ac3004bb227e353e1db0d33a6a81f7053118f941af71b
 EBUILD netbeans-cnd-9999_p20110902.ebuild 4457 RMD160 954a862fae6a7e3be15f5a82e5a192a6e819c55e SHA1 ab69e81b7bbf0953cab537852919f6f60305aa75 SHA256 3f6388ee3879f284018b34378962ec9e1af22cc6a941bdb4268656e1996d0f57
-MISC ChangeLog 12964 RMD160 41c4d1c896c6513969258d0f27a3f4937c656626 SHA1 26e9c18eabe68f5caa4af14584e3063a6ff9a242 SHA256 277afebc046cbb49b5c5d102eb455591058950220784438bb6239d74701d0555
+MISC ChangeLog 13083 RMD160 823ede8fb1b4d71c466ce42a78e26a1e0eab13ea SHA1 e350d2392642e07eb2d74ac3af5d94b022f28099 SHA256 b92b34f26832ddc084be3ff1a21876fa5b42eebb37fb51faf40b57da39ac1ab6
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20110821.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20110821.ebuild
deleted file mode 100644
index f4e112a..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20110821.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/5C917BCC015510DC6C7E3B511DB85B2978C0774C-cnd-build-trace-1.0.zip
-	http://hg.netbeans.org/binaries/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip
-	http://hg.netbeans.org/binaries/296C195B720404C2683BA2F65E2A423DD0611B8B-open-fortran-parser-0.7.1.2.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-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.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/antlr:0[java]
-	dev-java/antlr:3
-	dev-java/javahelp:0
-	dev-java/stringtemplate:0"
-RDEPEND=">=virtual/jdk-1.6
-	${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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/5C917BCC015510DC6C7E3B511DB85B2978C0774C-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
-	ln -s "${DISTDIR}"/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
-	ln -s "${DISTDIR}"/296C195B720404C2683BA2F65E2A423DD0611B8B-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-build.xml.patch
-	sed -i "s%<classpath path=\"\${antlr3.jar}\"/>%<classpath path=\"\${antlr3.jar}:../libs.antlr3.devel/external/antlr-2.7.jar:../libs.antlr3.devel/external/stringtemplate-3.2.jar\"/>%" cnd.modelimpl/build.xml || die
-
-	# 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.antlr3.devel/external antlr-3 antlr3.jar antlr-3.1.3.jar
-	java-pkg_jar-from --build-only --into libs.antlr3.devel/external antlr antlr.jar antlr-2.7.jar
-	java-pkg_jar-from --build-only --into libs.antlr3.devel/external stringtemplate stringtemplate.jar stringtemplate-3.2.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
-	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.dlight.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/cnd >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	fperms 755 bin/dorun.sh
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
-}

diff --git a/dev-java/netbeans-dlight/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index b199c4f..0e5c42e 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-dlight-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-dlight-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index f278ede..af75821 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -4,10 +4,8 @@ DIST F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar 2276020 RMD160
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-dlight-7.0.1.ebuild 3563 RMD160 ffb58b0da07f48acb7f8f4f96f38aab7e66bfad6 SHA1 41acc73af0d7c6ec753584db0413865508717305 SHA256 8d09d5ee96a25070e7dfac714f2ab36561d77f3634e0e3f706984fd59a3393ab
-EBUILD netbeans-dlight-9999_p20110821.ebuild 3586 RMD160 18d9a848c9f2737332b849d68219505163de2f1f SHA1 91d253fc6e6c39a9f5ddeab8aa2293f26c216eef SHA256 5690374336bd9da52afd7ad23e3c532043475b677190e02b2bc87d162446cbc8
 EBUILD netbeans-dlight-9999_p20110902.ebuild 3586 RMD160 8812725c3ac40016976e8f802ba056bc65454635 SHA1 6c8c65b54fdfa03c033f9209bea160af103f0215 SHA256 24ebb9516e0d4e64db7c7fdd9ead60dc5593e156bcbe9aca20d7ecb7e793c84b
-MISC ChangeLog 13421 RMD160 0af8463e97c91b3c416f9cce16399f5206f8f18f SHA1 1128419e8f8cce0fa8ce7764c616ce017984296d SHA256 35c340a037151bf8ed7e35a213e99b6d86511dbff83e3cb49d82f4d25d293e66
+MISC ChangeLog 13543 RMD160 d25b4bf4051981e9588de200a84ad1aa488ff01a SHA1 d860f0f73dc16ddfb52ddb16d3e123488fe1d0e9 SHA256 71a80729f8342b7ee3c1781f72c8e25f7902b0e66328fa339c17e4a6a2cac826
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20110821.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20110821.ebuild
deleted file mode 100644
index 1f53118..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20110821.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar
-	http://hg.netbeans.org/binaries/F1AF5929CD612475CCF186F69E268F0CAAA2A90E-dtracectrl-0.1.zip
-	http://hg.netbeans.org/binaries/623DE5A3A60FEA313099D7C42256B146E2BEE9B2-h2-1.0.79.jar"
-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.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar db/external/derby-10.2.2.0.jar || die
-	ln -s "${DISTDIR}"/F1AF5929CD612475CCF186F69E268F0CAAA2A90E-dtracectrl-0.1.zip dlight.dtrace/external/dtracectrl-0.1.zip || die
-	ln -s "${DISTDIR}"/623DE5A3A60FEA313099D7C42256B146E2BEE9B2-h2-1.0.79.jar dlight.libs.h2/external/h2-1.0.79.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-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 *
-
-	for file in bin/SunOS*/* ; do
-		fperms 755 ${file}
-	done
-
-	for file in tools/*/bin/* ; do
-		fperms 755 ${file}
-	done
-
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	# derby-10.2.2.0.jar
-	# h2-1.0.79.jar
-	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 9d965fc..3758abc 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-enterprise-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-enterprise-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index d868a6b..9bb72cd 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -41,10 +41,8 @@ DIST FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar 30411
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-enterprise-7.0.1.ebuild 16277 RMD160 30aeaa6c76b261e9ac83922b4ce93b848ab31152 SHA1 a29182f2dc9e455c2e141ab855e6ccf7b0261364 SHA256 9510edd5c25adb48338dddeea67c27fbafe47341bd9d9381abc657dbb1bb8b27
-EBUILD netbeans-enterprise-9999_p20110821.ebuild 18008 RMD160 e539ebc1345e67f1117fd14b17fa5154195090ce SHA1 bdfbf90eb4e3ad6db29bdce7acef09186238d5a9 SHA256 67679cf4ecc3f8326295deb4e65626fdb2fc7f0bb551438fe58fc170f8758aae
 EBUILD netbeans-enterprise-9999_p20110902.ebuild 18008 RMD160 c6a85492779362006474276d1a1fa016505aa118 SHA1 3e5a39d811dc0f89cc81740ed486fb1f917bb36a SHA256 3cc35624df44c104e8be8cc4077af87f049f26ec8839d9b8ba5eb77c99e682f9
-MISC ChangeLog 14387 RMD160 9f9ec9aaeddef485256fb75b53476cc6307b33a5 SHA1 a164d75d33ddb65222b3df7327b66a251518c147 SHA256 148b0f720a0ef97008cf166769b8c1af803623784bfcad7ab3d08bd50f11683f
+MISC ChangeLog 14513 RMD160 0d1305a45fb74695a7f036f530e0e5b54fa3b579 SHA1 abc52c8e9ddc4ceb0565cd9de1c67d03a078f438 SHA256 ce841d78509cae61d3c9d64a7e2fc653c0db98512a5f3da8ddb8ee446148fee4
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20110821.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20110821.ebuild
deleted file mode 100644
index 5e232f9..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20110821.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar
-	http://hg.netbeans.org/binaries/7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.0.jar
-	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
-	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
-	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
-	http://hg.netbeans.org/binaries/DC9A229C4AB1788D0C20D937A82FB64CE2911171-javaee6-doc-api.zip
-	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
-	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/EEBA5E4DCFB946A8E9CAAF1AC405620E28710BEE-jersey-1.8.zip
-	http://hg.netbeans.org/binaries/6055EAF5B4F778A243B52D2DC4E66CB5F35B3D7C-jersey-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/4D9B1037036E99811D9E393F191058C9CA30CAE2-jersey-apache-client-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar
-	http://hg.netbeans.org/binaries/A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar
-	http://hg.netbeans.org/binaries/3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar
-	http://hg.netbeans.org/binaries/0EE4D36A33681C945339BB1B594F4C0ED9A4C3DE-jersey-multipart-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/D77C6E4AA0F3D3C9B7230F6C0991DBBF0CEF39BA-jersey-simple-server-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
-	http://hg.netbeans.org/binaries/1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip
-	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
-	http://hg.netbeans.org/binaries/FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar
-	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
-	http://hg.netbeans.org/binaries/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip
-	http://hg.netbeans.org/binaries/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/C31A6E33D7D6E77C8123A0830D929187A9707147-primefaces-2.2.1.jar
-	http://hg.netbeans.org/binaries/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-servlet3.0-jsp2.2-api.jar
-	http://hg.netbeans.org/binaries/1A48EDCF8DCFC76882C821931EB0529DB9AF5D9B-spring-webmvc-2.5.6.SEC01.jar
-	http://hg.netbeans.org/binaries/E11C2384FDEAE4F96E433C2A0339DCFC5202CC17-struts-1.3.8-javadoc.zip
-	http://hg.netbeans.org/binaries/A3F62096FB53E14CF09B006458333792890CE429-struts-1.3.8-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-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-websvccommon-${PV}
-	dev-java/commons-fileupload:0
-	dev-java/glassfish-deployment-api:1.2
-	dev-java/jakarta-jstl:0"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	>=dev-java/junit-4.4:4
-	dev-java/tomcat-servlet-api:2.3"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	dev-java/antlr:0[java]
-	dev-java/asm:3
-	dev-java/bsf:2.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-logging:0
-	dev-java/commons-validator:0
-	dev-java/jakarta-oro:2.0
-	dev-java/jettison:0
-	dev-java/jsr311-api: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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar libs.elimpl/external/el-impl.jar || die
-	ln -s "${DISTDIR}"/7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.0.jar web.jspparser/external/glassfish-jspparser-3.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}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.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}"/DC9A229C4AB1788D0C20D937A82FB64CE2911171-javaee6-doc-api.zip j2ee.platform/external/javaee6-doc-api.zip || die
-	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
-	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/EEBA5E4DCFB946A8E9CAAF1AC405620E28710BEE-jersey-1.8.zip websvc.restlib/external/jersey-1.8.zip || die
-	ln -s "${DISTDIR}"/6055EAF5B4F778A243B52D2DC4E66CB5F35B3D7C-jersey-1.8-javadoc.jar websvc.restlib/external/jersey-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/4D9B1037036E99811D9E393F191058C9CA30CAE2-jersey-apache-client-1.8-javadoc.jar websvc.restlib/external/jersey-apache-client-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar websvc.restlib/external/jersey-atom-abdera-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar websvc.restlib/external/jersey-client-1.3-javadoc.jar || die
-	ln -s "${DISTDIR}"/A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar websvc.restlib/external/jersey-core-1.1.5.1-javadoc.jar || die
-	ln -s "${DISTDIR}"/3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar websvc.restlib/external/jersey-guice-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar websvc.restlib/external/jersey-json-1.3-javadoc.jar || die
-	ln -s "${DISTDIR}"/0EE4D36A33681C945339BB1B594F4C0ED9A4C3DE-jersey-multipart-1.8-javadoc.jar websvc.restlib/external/jersey-multipart-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/D77C6E4AA0F3D3C9B7230F6C0991DBBF0CEF39BA-jersey-simple-server-1.8-javadoc.jar websvc.restlib/external/jersey-simple-server-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar websvc.restlib/external/jersey-spring-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
-	ln -s "${DISTDIR}"/1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip web.jsf20/external/jsf-2.1.zip || die
-	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
-	ln -s "${DISTDIR}"/FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar websvc.restlib/external/jsr311-api-1.1.1-javadoc.jar || die
-	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
-	ln -s "${DISTDIR}"/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
-	ln -s "${DISTDIR}"/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar websvc.restlib/external/oauth-client-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar websvc.restlib/external/oauth-server-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar websvc.restlib/external/oauth-signature-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/C31A6E33D7D6E77C8123A0830D929187A9707147-primefaces-2.2.1.jar web.primefaces/external/primefaces-2.2.1.jar || die
-	ln -s "${DISTDIR}"/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-servlet3.0-jsp2.2-api.jar servletjspapi/external/servlet3.0-jsp2.2-api.jar || die
-	ln -s "${DISTDIR}"/1A48EDCF8DCFC76882C821931EB0529DB9AF5D9B-spring-webmvc-2.5.6.SEC01.jar spring.webmvc/external/spring-webmvc-2.5.6.SEC01.jar || die
-	ln -s "${DISTDIR}"/E11C2384FDEAE4F96E433C2A0339DCFC5202CC17-struts-1.3.8-javadoc.zip web.struts/external/struts-1.3.8-javadoc.zip || die
-	ln -s "${DISTDIR}"/A3F62096FB53E14CF09B006458333792890CE429-struts-1.3.8-lib.zip web.struts/external/struts-1.3.8-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-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.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.0.jar
-	java-pkg_jar-from --into web.jstl11/external jakarta-jstl jstl.jar jstl-1.1.2.jar
-	java-pkg_jar-from --into web.jstl11/external jakarta-jstl standard.jar standard-1.1.2.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.8.2.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-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-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.0.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.0.jar || die
-	# el-impl.jar
-	# glassfish-jspparser-3.0.jar
-	# glassfish-logging-2.0.jar
-	# javaee-api-6.0.jar
-	# javaee-api-6.0-license.txt
-	# javaee-web-api-6.0.jar
-	# javaee-web-api-6.0-license.txt
-	# jsp-parser-ext.jar
-	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
-	rm jstl.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl.jar || die
-	# org-netbeans-modules-web-httpmonitor.jar
-	# servlet3.0-jsp2.2-api.jar
-	rm standard.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/javaee6-endorsed
-	pushd "${D}"/${instdir} >/dev/null || die
-	# javax.annotation.jar
-	# javax.annotation-license.txt
-	# jaxb-api-osgi.jar
-	# jaxb-api-osgi-license.txt
-	# webservices-api-osgi.jar
-	# webservices-api-osgi-license.txt
-	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
-	# jsf-api.jar
-	# jsf-impl.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jsf-2_1
-	pushd "${D}"/${instdir} >/dev/null || die
-	# jsf-api.jar
-	# jsf-impl.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/metro
-	pushd "${D}"/${instdir} >/dev/null || die
-	# webservices-api.jar
-	# webservices-extra-api.jar
-	# webservices-extra.jar
-	# webservices-rt.jar
-	# webservices-tools.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/primefaces
-	pushd "${D}"/${instdir} >/dev/null || die
-	# primefaces-2.1.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/rest
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm asm-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-3.1.jar || die
-	# jackson-core-asl-1.1.1.jar
-	# jersey-client-1.3.jar
-	# jersey-core-1.3.jar
-	# jersey-json-1.3.jar
-	# jersey-multipart-1.3.jar
-	# jersey-server-1.3.jar
-	# jersey-spring-1.3.jar
-	rm jettison-1.1.jar && dosym /usr/share/jettison/lib/jettison.jar ${instdir}/jettison-1.1.jar || die
-	rm jsr311-api-1.1.1.jar && dosym /usr/share/jsr311-api/lib/jsr311-api.jar ${instdir}/jsr311-api-1.1.1.jar || die
-	# mimepull-1.4.jar
-	# oauth-client-1.3.jar
-	# oauth-signature-1.3.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-webmvc-2.5.6.SEC01.jar
-	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.7.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.7.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-chain-1.1.jar && dosym /usr/share/commons-chain-1.1/lib/commons-chain.jar ${instdir}/commons-chain-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 jstl-1.0.2.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl-1.0.2.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
-	rm standard-1.0.2.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard-1.0.2.jar || die
-	# struts-core-1.3.8.jar
-	# struts-el-1.3.8.jar
-	# struts-extras-1.3.8.jar
-	# struts-faces-1.3.8.jar
-	# struts-mailreader-dao-1.3.8.jar
-	# struts-scripting-1.3.8.jar
-	# struts-taglib-1.3.8.jar
-	# struts-tiles-1.3.8.jar
-	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 6d0cbc9..6300d92 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-ergonomics-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-ergonomics-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index e61ac3d..1c9fb03 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -1,10 +1,8 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2823 RMD160 814bcf7d11a98f801cffb25348a155eb6a939237 SHA1 5d9a5d4fecf957cab6a5feb124e36ac2c965eb4b SHA256 c6bcda51c994e376430539985a990d845b9fcf9d7077b0fbf62a9c70b27008b4
-EBUILD netbeans-ergonomics-9999_p20110821.ebuild 2846 RMD160 8c376fc89c3f3988d4f7654852b61f58e73dabb5 SHA1 a4d26ad6abceeba58041f27760d343e576f52b9d SHA256 976782fc9d46e122ce07a9332dbdee02f44a34d6ce4e1d56aae0f7617f22ff3a
 EBUILD netbeans-ergonomics-9999_p20110902.ebuild 2846 RMD160 0ff2b312b12e02c08527db80118facc069f1f709 SHA1 f646058ed122e847bf38d3403242ae32bd58492f SHA256 365d0a87240360bc0a9fe4d053b0f6e83894a6769781729c5dd4e62a7f0a8843
-MISC ChangeLog 14009 RMD160 4e86009873b18d581bb83eabd3c87a83516c3c86 SHA1 a49b9db77455164b80206de1e3b54413c5ac1758 SHA256 fb8323abc16dfb06d386e5b8b3149a1abbe7378f4c680fd33316431640b1423b
+MISC ChangeLog 14135 RMD160 45ff3eb1333971824335ad1e628014a19c070070 SHA1 a6a7f77ecd99b8a8b6cc8e0702c5653a99d45ba2 SHA256 df886ca67dacce370a0fc5f861e8870e66dde9b8d49aabb4d9ee72fccb129d79
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20110821.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20110821.ebuild
deleted file mode 100644
index 60d6122..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20110821.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-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-groovy/ChangeLog b/dev-java/netbeans-groovy/ChangeLog
index c539132..f5394fb 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-groovy-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-groovy-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 1892106..83eea64 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -2,10 +2,8 @@ DIST 559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar 4503584 RMD16
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-groovy-7.0.1.ebuild 3235 RMD160 008dbf33bdbdf82bacfda1c2054c2af1221aed52 SHA1 b0525fd58101f48d716e30d07bf245cab4deaf34 SHA256 3bc429667a6d8f971e3853dd94eeb0f0f321bad00881cdab224ddb0c5ca39b4e
-EBUILD netbeans-groovy-9999_p20110821.ebuild 3258 RMD160 5558b167b0b63d203cef435f176c0548f54b9d20 SHA1 59c1c3c0f6464dc8d09826fb39889a79e53ce95f SHA256 3a3b24b84d7107b9abef3d43872d169bd252bcd46fd041361a27d09562dba67b
 EBUILD netbeans-groovy-9999_p20110902.ebuild 3258 RMD160 ba92e6a28668289f2af2c91bfe42b2f40dc36705 SHA1 98e6fa34b513fef37f04b0bca6bd9e58b3130163 SHA256 c73b5eea5b10df28556677c5bfcb5bad4921e13082d256a996069ce9fd017ffb
-MISC ChangeLog 13421 RMD160 5caec4dc3320488d1f0dd32a82d86643ca8a5dfd SHA1 8b87f0d7f34e8f3df538ec6e73e950bac08a31d3 SHA256 a97b034e12f34e9e986da117ba8803a927c46bbf1a185594c785ef9fab339cb2
+MISC ChangeLog 13543 RMD160 3feb1b44261746b4b645c1e61f55d6f630faad5c SHA1 e767cbe117b07b442ec8267133c9aa86c24ef6ec SHA256 7e728b9e4a6564180326e27db0be8d31ce738e6ee47ea3775af6f6a0369391f0
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20110821.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20110821.ebuild
deleted file mode 100644
index 35505a0..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20110821.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar groovy.editor/external/groovy-all-1.6.4.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-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-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
-
-	local instdir=${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	# groovy-all.jar
-	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 dff1c04..fa466c4 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-harness-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-harness-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 9d0cd64..4a1b07c 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -3,10 +3,8 @@ DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 RMD160 4033e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-harness-7.0.1.ebuild 3518 RMD160 8e25ef5366aa13909d07243da5dbd521d68120cb SHA1 6c1b376db04ef2dcc6f9b9d02fc8df2ca9eeb9ea SHA256 3e54df324b36f4ace28a917adc4b782ff1cb45d05c5bb004ea808860a70ec2bb
-EBUILD netbeans-harness-9999_p20110821.ebuild 3541 RMD160 ea36ebebd32c24ffde593a7f0226dc6f043e224b SHA1 4390bfa3ffa50c314ca13de282f2a20157a18795 SHA256 adcfa8c1df147abc2c01fad65115a20ad036391a6f281d9d1f3348fcfab0c9d6
 EBUILD netbeans-harness-9999_p20110902.ebuild 3541 RMD160 c6fa7bf82852f4cda4485362d090715acaaa061f SHA1 41aeeb0d8cbe4a0b9206f52412c7fc1168242274 SHA256 4670d5d481d65d1ac855c607e9c8c04a49eac63492331885d9948e6c960960d0
-MISC ChangeLog 13568 RMD160 281c18699b76bf0b16428d4540c27d0b4c7da3a8 SHA1 3ac03e5d2bedaa49a3f53046018ba1d48a32530e SHA256 f178b36d6a45876752461d2d5adc8d9b41cd7866d09830049e91e453d59f31eb
+MISC ChangeLog 13691 RMD160 f67d4701e602010c86bddceb93fe6391ab237806 SHA1 cfc9dd5692bd4f986dd3448f7d9b024e85691426 SHA256 c85e07038e5142dd651d0b34690ac4ba014f80bb94154166cb2ffd8dc3508802
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20110821.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20110821.ebuild
deleted file mode 100644
index d502567..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20110821.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.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.6
-	app-arch/unzip
-	${CDEPEND}
-	>=dev-java/junit-4.4:4"
-RDEPEND=">=virtual/jdk-1.6
-	${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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-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}"/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar jemmy/external/jemmy-2.3.0.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-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.8.2.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	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
-	# bindex-2.2.jar
-	rm jsearch-2.0_05.jar && dosym /usr/share/javahelp/lib/jsearch.jar ${instdir}/jsearch-2.0_05.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	# jemmy-2.3.0.0.jar
-	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 8130fa0..428c5ed 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-ide-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-ide-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 38c8f01..fc43fbf 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -67,10 +67,8 @@ DIST FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar 182065 RMD160
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-ide-7.0.1.ebuild 22592 RMD160 e15b7340cf1b7c5f112a0d968c20878c4822f11b SHA1 2ef331b81762637a50a3956f389d47ce733ca873 SHA256 61256d7d5fd5b24b1d3450ddfd01c136a8c7295e960e8926de0f1d557e4c81ff
-EBUILD netbeans-ide-9999_p20110821.ebuild 23028 RMD160 f1236560607142e1b140d177e11b76f99850727f SHA1 614123988ef652bfdf6eda254e1f1b7694f60307 SHA256 89ea0be90be67b38c1b845380a7954bdc90311dec0679e74bf6bd3547f0bab2c
 EBUILD netbeans-ide-9999_p20110902.ebuild 26931 RMD160 ee4730879b66a202681269096d9cf71c0c396c3a SHA1 272285433785132965cb6fad73829972390b8bdf SHA256 6be6fa4efa6760121027b899f1198dd05dbb9214d5b459bab2121c6aae93f43d
-MISC ChangeLog 13515 RMD160 a42679fcb86edba2ebf1fa89322541b56bb73ef7 SHA1 833b8d3310019ae6cbc31b29dd6f2fb2e644228f SHA256 efc48f01c22128e7d2b52f672eb511e1204dd1d1299a96f14378611eb8d88712
+MISC ChangeLog 13634 RMD160 7cd120ac2c25e829525ce260579e12e7846fa5fe SHA1 0ba8d0780da76aaabc4ed21be00a3e75e8dff20d SHA256 10ea32d9fc16714aa1e492efb416674e59f3117ceaa44001e418d0f4b5e756d8
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20110821.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20110821.ebuild
deleted file mode 100644
index 34d4259..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20110821.ebuild
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/BDFC25B87D1A034FACBC13133406BAB416814525-antlr3.3-runtime.jar
-	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
-	http://hg.netbeans.org/binaries/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar
-	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
-	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
-	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
-	http://hg.netbeans.org/binaries/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-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/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar
-	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
-	http://hg.netbeans.org/binaries/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar
-	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
-	http://hg.netbeans.org/binaries/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar
-	http://hg.netbeans.org/binaries/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar
-	http://hg.netbeans.org/binaries/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar
-	http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar
-	http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar
-	http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip
-	http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip
-	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
-	http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar
-	http://hg.netbeans.org/binaries/34E70691382D67EE5C84EF207FB8D3784594BA2C-org.eclipse.jgit-1.0.0.201106090707-r.jar
-	http://hg.netbeans.org/binaries/94408B54D039DA036A668C6B331EF944AF2E90EC-org.eclipse.mylyn.bugzilla.core_3.3.1.jar
-	http://hg.netbeans.org/binaries/7D3CCD3ED4DB57F2B746F5ABAF86D10F222AEB87-org.eclipse.mylyn.commons.core_3.3.1.jar
-	http://hg.netbeans.org/binaries/02C39E6C02E2386D4936245F90AC4BFA5A7BCD49-org.eclipse.mylyn.commons.net_3.3.0.jar
-	http://hg.netbeans.org/binaries/DF522A06BF4EFD99A12C545C294D940CF6A2E01D-org.eclipse.mylyn.tasks.core_3.3.1.jar
-	http://hg.netbeans.org/binaries/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip
-	http://hg.netbeans.org/binaries/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar
-	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
-	http://hg.netbeans.org/binaries/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip
-	http://hg.netbeans.org/binaries/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip
-	http://hg.netbeans.org/binaries/0B9606F570B28FFC4FCE6C7222B88B3DCEFB1A36-svnClientAdapter-javahl-1.6.13.jar
-	http://hg.netbeans.org/binaries/A11623D2AF72A99C1509EC2A0ADA2DACBEE9A8E4-svnClientAdapter-main-1.6.13.jar
-	http://hg.netbeans.org/binaries/0AE20EC02958F193ADAB4C272ACCF6FE3196DCA0-svnClientAdapter-svnkit-1.6.13.jar
-	http://hg.netbeans.org/binaries/636C6FF256A978B786D7502F43E788448E9DAB4B-svnkit-1.3.4.jar
-	http://hg.netbeans.org/binaries/AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar
-	http://hg.netbeans.org/binaries/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar
-	http://hg.netbeans.org/binaries/538D727A9A0874019FB11280F07CE3F43EE723BC-sqljet-1.0.3.jar
-	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
-	http://hg.netbeans.org/binaries/68B82D7246FD90E0FC70BB9C8F10611489BF371A-trilead.jar
-	http://hg.netbeans.org/binaries/55CD0B272084EB80B8C91F3A0617BB602B4EF2DF-ValidationAPI.jar
-	http://hg.netbeans.org/binaries/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar
-	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-platform-${PV}
-	dev-java/antlr:3
-	dev-java/commons-codec:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-io:1
-	dev-java/commons-lang:2.1
-	dev-java/commons-logging:0
-	dev-java/flute:0
-	dev-java/freemarker:2.3
-	dev-java/icu4j:4.4
-	dev-java/jdbc-mysql:0
-	dev-java/jdbc-postgresql:0
-	dev-java/jsr173:0
-	dev-java/jvyamlb:0
-	dev-java/log4j:0
-	dev-java/lucene:3.0
-	dev-java/sac:0
-	dev-java/saxon:9
-	dev-java/smack:2.2
-	dev-java/sun-jaf:0
-	dev-java/tomcat-servlet-api:2.2
-	dev-java/xerces:2
-	dev-vcs/subversion:0[java]"
-#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
-#	app-text/jing:0 our version is probably too old
-#	dev-java/ini4j:0 our version is too old
-#	java-virtuals/jaf:0 could use this instead of sun-jaf but it returns empty classpath
-#	dev-java/trilead-ssh2:0 in overlay
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	dev-java/jsch:0
-	dev-java/jzlib:0
-	${CDEPEND}
-	dev-java/javacc:0
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/BDFC25B87D1A034FACBC13133406BAB416814525-antlr3.3-runtime.jar css.lib/external/antlr3.3-runtime.jar || die
-	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
-	ln -s "${DISTDIR}"/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar libs.commons_net/external/commons-net-3.0.1.jar || die
-	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
-	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
-	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
-	ln -s "${DISTDIR}"/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-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}"/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar html.validation/external/isorelax20041111.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}"/BCF23B1D858C6F69D67C851D497984D25345D0B1-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}"/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
-	ln -s "${DISTDIR}"/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
-	ln -s "${DISTDIR}"/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
-	ln -s "${DISTDIR}"/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar html.validation/external/jing.jar || die
-	ln -s "${DISTDIR}"/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar html.validation/external/js.jar || die
-	ln -s "${DISTDIR}"/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip javascript.editing/external/js-domstubs.zip || die
-	ln -s "${DISTDIR}"/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip javascript.editing/external/jsstubs.zip || die
-	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.destroy/external/libpam4j-1.1.jar || die
-	ln -s "${DISTDIR}"/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar html.validation/external/non-schema.jar || die
-	ln -s "${DISTDIR}"/34E70691382D67EE5C84EF207FB8D3784594BA2C-org.eclipse.jgit-1.0.0.201106090707-r.jar o.eclipse.jgit/external/org.eclipse.jgit-1.0.0.201106090707-r.jar || die
-	ln -s "${DISTDIR}"/94408B54D039DA036A668C6B331EF944AF2E90EC-org.eclipse.mylyn.bugzilla.core_3.3.1.jar libs.bugzilla/external/org.eclipse.mylyn.bugzilla.core_3.3.1.jar || die
-	ln -s "${DISTDIR}"/7D3CCD3ED4DB57F2B746F5ABAF86D10F222AEB87-org.eclipse.mylyn.commons.core_3.3.1.jar libs.bugtracking/external/org.eclipse.mylyn.commons.core_3.3.1.jar || die
-	ln -s "${DISTDIR}"/02C39E6C02E2386D4936245F90AC4BFA5A7BCD49-org.eclipse.mylyn.commons.net_3.3.0.jar libs.bugtracking/external/org.eclipse.mylyn.commons.net_3.3.0.jar || die
-	ln -s "${DISTDIR}"/DF522A06BF4EFD99A12C545C294D940CF6A2E01D-org.eclipse.mylyn.tasks.core_3.3.1.jar libs.bugtracking/external/org.eclipse.mylyn.tasks.core_3.3.1.jar || die
-	ln -s "${DISTDIR}"/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip javascript.editing/external/preindexed.zip || die
-	ln -s "${DISTDIR}"/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar extexecution.destroy/external/processtreekiller-1.0.1.jar || die
-	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
-	ln -s "${DISTDIR}"/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip o.mozilla.rhino.patched/external/rhino1_7R2rc1.zip || die
-	ln -s "${DISTDIR}"/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip javascript.editing/external/sdocs.zip || die
-	ln -s "${DISTDIR}"/538D727A9A0874019FB11280F07CE3F43EE723BC-sqljet-1.0.3.jar libs.svnClientAdapter.svnkit/external/sqljet-1.0.3.jar || die
-	ln -s "${DISTDIR}"/0B9606F570B28FFC4FCE6C7222B88B3DCEFB1A36-svnClientAdapter-javahl-1.6.13.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.6.13.jar || die
-	ln -s "${DISTDIR}"/A11623D2AF72A99C1509EC2A0ADA2DACBEE9A8E4-svnClientAdapter-main-1.6.13.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.6.13.jar || die
-	ln -s "${DISTDIR}"/0AE20EC02958F193ADAB4C272ACCF6FE3196DCA0-svnClientAdapter-svnkit-1.6.13.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.6.13.jar || die
-	ln -s "${DISTDIR}"/636C6FF256A978B786D7502F43E788448E9DAB4B-svnkit-1.3.4.jar libs.svnClientAdapter.svnkit/external/svnkit-1.3.4.jar || die
-	ln -s "${DISTDIR}"/AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl.jar || die
-	ln -s "${DISTDIR}"/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar libs.swingx/external/swingx-0.9.5.jar || die
-	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
-	ln -s "${DISTDIR}"/68B82D7246FD90E0FC70BB9C8F10611489BF371A-trilead.jar libs.svnClientAdapter.svnkit/external/trilead.jar || die
-	ln -s "${DISTDIR}"/55CD0B272084EB80B8C91F3A0617BB602B4EF2DF-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
-	ln -s "${DISTDIR}"/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar html.validation/external/validator.jar || die
-	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.destroy/external/winp-1.14-patched.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	popd >/dev/null || die
-
-	java-pkg_jar-from --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.44.jar
-	java-pkg_jar-from --build-only --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
-	#java-pkg_jar-from --into css.lib/external antlr-3 antlr3.jar antlr3.3-runtime.jar
-	java-pkg_jar-from --into css.editor/external flute flute.jar flute-1.3.jar
-	java-pkg_jar-from --into css.editor/external sac sac.jar sac-1.3.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.13-bin.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-8.3-603.jdbc3.jar
-	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
-	java-pkg_jar-from --into extexecution.destroy/external commons-io-1 commons-io.jar commons-io-1.4.jar
-	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_0.jar
-	java-pkg_jar-from --into html.validation/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into html.validation/external commons-logging commons-logging-api.jar commons-logging-api-1.1.1.jar
-	# java-pkg_jar-from --into html.validation/external jing jing.jar jing.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.antlr3.runtime/external antlr-3 antlr3.jar antlr-runtime-3.1.3.jar
-	java-pkg_jar-from --into libs.bugtracking/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
-	java-pkg_jar-from --into libs.bugtracking/external commons-lang-2.1 commons-lang.jar commons-lang-2.3.jar
-	java-pkg_jar-from --into libs.commons_codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
-	java-pkg_jar-from --into libs.commons_logging/external commons-logging commons-logging.jar commons-logging-1.1.jar
-	# java-pkg_jar-from --into libs.commons_net/external commons-net commons-net.jar commons-net-1.4.1.jar
-	java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.8.jar
-	# java-pkg_jar-from --into libs.ini4j/external ini4j ini4j.jar ini4j-0.5.1.jar
-	# java-pkg_jar-from --into libs.jaxb/external jaxb-2 jaxb-impl.jar jaxb-impl.jar
-	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
-	java-pkg_jar-from --into libs.lucene/external lucene-3.0 lucene-core.jar lucene-core-3.0.3.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.6.0.jar
-	# java-pkg_jar-from --into libs.svnClientAdapter.svnkit/external trilead-ssh2 trilead-ssh2.jar trilead.jar
-	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.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 jaxb-2 jaxb-api.jar jaxb-api.jar
-	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_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/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-runtime-3.1.3.jar && dosym /usr/share/antlr-3/lib/antlr3.jar ${instdir}/antlr-runtime-3.1.3.jar || die
-	rm apache-commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/apache-commons-codec-1.3.jar || die
-	# bytelist-0.1.jar
-	rm commons-httpclient-3.1.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.1.jar || die
-	rm commons-io-1.4.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.4.jar || die
-	rm commons-lang-2.3.jar && dosym /usr/share/commons-lang-2.1/lib/commons-lang.jar ${instdir}/commons-lang-2.3.jar || die
-	rm commons-logging-api-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging-api.jar ${instdir}/commons-logging-api-1.1.1.jar || die
-	rm commons-logging-1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.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
-	# rm commons-net-1.4.1.jar && dosym /usr/share/commons-net/lib/commons-net.jar ${instdir}/commons-net-1.4.1.jar || die
-	# ddl.jar
-	rm flute-1.3.jar && dosym /usr/share/flute/lib/flute.jar ${instdir}/flute-1.3.jar || die
-	rm freemarker-2.3.8.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.8.jar || die
-	# html5-datatypes.jar
-	# html5-parser.jar
-	rm icu4j-4_0.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_0.jar || die
-	# [[ -f ini4j-0.5.1.jar ]] && java-pkg_jar-from ini4j ini4j.jar ${instdir}/ini4j-0.5.1.jar || die
-	# io-xml-util.jar
-	# iri.jar
-	# isorelax20041111.jar
-	# [[ -f jing.jar ]] && java-pkg_jar-from jing jing.jar ${instdir}/jing.jar || die
-	# js.jar
-	rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
-	# libpam4j-1.1.jar
-	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
-	rm lucene-core-3.0.3.jar && dosym /usr/share/lucene-3.0/lib/lucene-core.jar ${instdir}/lucene-core-3.0.3.jar || die
-	rm mysql-connector-java-5.1.13-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.13-bin.jar || die
-	# non-schema.jar
-	# org.eclipse.mylyn.bugzilla.core_3.3.1.jar
-	# org.eclipse.mylyn.commons.core_3.3.1.jar
-	# org.eclipse.mylyn.commons.net_3.3.0.jar
-	# org.eclipse.mylyn.tasks.core_3.3.1.jar
-	# org-netbeans-tax.jar
-	rm postgresql-8.3-603.jdbc3.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-8.3-603.jdbc3.jar || die
-	# processtreekiller-1.0.1.jar
-	# resolver-1.2.jar
-	rm sac-1.3.jar && dosym /usr/share/sac/lib/sac.jar ${instdir}/sac-1.3.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
-	# sqljet-1.0.3.jar
-	# svnClientAdapter-javahl-1.6.13.jar
-	# svnClientAdapter-main-1.6.13.jar
-	# svnClientAdapter-svnkit-1.6.13.jar
-	rm svnjavahl-1.6.0.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl-1.6.0.jar || die
-	# svnkit-javahl.jar
-	# svnkit-1.3.4.jar
-	# swingx-0.9.5.jar
-	# [[ -f trilead.jar ]] && java-pkg_jar-from trilead-ssh2 trilead-ssh2.jar ${instdir}/trilead.jar || die
-	# ValidationAPI.jar
-	# validator.jar
-	# webserver.jar
-	# winp-1.14-patched.jar
-	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
-	# [[ -f jaxb-impl.jar ]] && java-pkg_jar-from jaxb-2 jaxb-impl.jar ${instdir}/jaxb-impl.jar || die
-	# jaxb-xjc.jar
-	# jaxb1-impl.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	# [[ -f jaxb-api.jar ]] && java-pkg_jar-from jaxb-2 jaxb-api.jar ${instdir}/jaxb-api.jar || die
-	rm jsr173_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_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 599cb3c..33e073b 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-java-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-java-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 10e8cd8..dd2ba47 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -28,10 +28,8 @@ DIST FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip 2141252 RMD160
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-java-7.0.1.ebuild 14827 RMD160 201ee03babb285863755fe1afa9a37380cf5c4f9 SHA1 8357be5d38cb019cb2b434a1024a87a723c416db SHA256 413af55c2430cfd712ae474e8e8eb49640c2e718d6c4782fb8f9276e580c1ee5
-EBUILD netbeans-java-9999_p20110821.ebuild 14388 RMD160 317ae86b57d5400251f4148282a36077add64801 SHA1 b859c93fd7957a2fa8aa1da59a785da168d023e8 SHA256 f699b45046b7c731f39704affb572c90c9f808b634f9607cdec4047c99561662
 EBUILD netbeans-java-9999_p20110902.ebuild 14388 RMD160 1919139ea731e1ad1f640dee4a4a84ab7934335b SHA1 f6b4c0bb7fe3180cf611e2cd1eb2f1fd360f8432 SHA256 fcb8aacdd222f55e00970d054008aab29ae6c55e88e5c874aa33baf4cdaa09af
-MISC ChangeLog 13533 RMD160 8f1c573095ab665b70f4fcef73ad53b762c379e3 SHA1 8f1d781ced581ed8024f51e39fbc64f27646f59a SHA256 34cac5d4baf46e7fab847ffb6509daeb0be39c149b92b75cd27f6e54a39b515d
+MISC ChangeLog 13653 RMD160 2ebf82a5c6e7f31d04c7a85afeb74a613cfb2f75 SHA1 3ca977f2bf52c5dcf7d0e0575fb979bdf36c672c SHA256 75e697a0fa2bacdbcb794be9754a146645a72f5470e008a37661df68e0cd0120
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20110821.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20110821.ebuild
deleted file mode 100644
index a5c8221..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20110821.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
-	http://hg.netbeans.org/binaries/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar
-	http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar
-	http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar
-	http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar
-	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
-	http://hg.netbeans.org/binaries/89BFCE12CA01C7518739B5AC2C22A220B6B5510E-indexer-artifact-4.1.1.jar
-	http://hg.netbeans.org/binaries/D1B67FE60F2FDD654FDAE0A84B300DDB72CBC209-indexer-core-4.1.1.jar
-	http://hg.netbeans.org/binaries/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/8FB21F7AAC2DEB6215D71F00DCE1FAE9107643A9-javac-impl-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar
-	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
-	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
-	http://hg.netbeans.org/binaries/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar
-	http://hg.netbeans.org/binaries/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar
-	http://hg.netbeans.org/binaries/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:2.2
-	dev-java/jdom:1.0"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	dev-java/antlr:0[java]
-	dev-java/asm:2.2
-	dev-java/cglib:2.1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/ehcache:1.2
-	dev-java/fastinfoset:0
-	dev-java/javassist:3
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	dev-java/jsr250:0
-	dev-java/jta:0
-	dev-java/jtidy:0
-	>=dev-java/maven-bin-3.0.3:3.0
-	dev-java/saaj:0
-	dev-java/stax-ex: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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.2.zip || die
-	ln -s "${DISTDIR}"/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip maven.embedder/external/apache-maven-3.0.3-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}"/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar j2ee.eclipselink/external/eclipselink-2.3.0.jar || die
-	ln -s "${DISTDIR}"/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.3.0.jar || die
-	ln -s "${DISTDIR}"/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar j2ee.toplinklib/external/glassfish-persistence-v2-build-58g.jar || die
-	ln -s "${DISTDIR}"/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar || die
-	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
-	ln -s "${DISTDIR}"/89BFCE12CA01C7518739B5AC2C22A220B6B5510E-indexer-artifact-4.1.1.jar maven.indexer/external/indexer-artifact-4.1.1.jar || die
-	ln -s "${DISTDIR}"/D1B67FE60F2FDD654FDAE0A84B300DDB72CBC209-indexer-core-4.1.1.jar maven.indexer/external/indexer-core-4.1.1.jar || die
-	ln -s "${DISTDIR}"/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/8FB21F7AAC2DEB6215D71F00DCE1FAE9107643A9-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar j2ee.eclipselink/external/javax.persistence-2.0.jar || die
-	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
-	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
-	ln -s "${DISTDIR}"/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_1.0.0.jar || die
-	ln -s "${DISTDIR}"/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar libs.springframework/external/spring-2.5.6.SEC01.jar || die
-	ln -s "${DISTDIR}"/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip libs.springframework/external/spring-framework-3.0.2.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-build.xml.patch
-	sed -i "s%../o.jdesktop.layout/external%\${netbeans.dest.dir}/\${nb.cluster.platform.dir}/modules/ext%" java.examples/build.xml
-
-	# 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-2.2 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --into maven.embedder/external jdom-1.0 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-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 *
-	rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven || die
-	dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
-
-	insinto ${INSTALL_DIR}/ant
-	dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
-	dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
-	doins -r ant/extra
-	dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
-	doins -r ant/nblib
-	dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
-	local vertasks=$(ls -d /usr/share/ant/tasks-*)
-	dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
-
-	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-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	# javac-api-nb-7.0-b07.jar
-	# javac-impl-nb-7.0-b07.jar
-	# org-netbeans-modules-java-j2seplatform-probe.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# dir: eclipselink
-	# eclipselink-javax.persistence-2.0.jar
-	# eclipselink-jpa-modelgen-2.2.0.jar
-	# eclipselink-2.2.0.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
-	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
-	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
-	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
-	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.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 ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
-	# ejb3-persistence.jar
-	# hibernate-annotations.jar
-	# hibernate-commons-annotations.jar
-	# hibernate-entitymanager.jar
-	# hibernate-tools.jar
-	# hibernate3.jar
-	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
-	# jdbc2_0-stdext.jar
-	rm jta.jar && dosym /usr/share/jta/lib/jta.jar ${instdir}/jta.jar || die
-	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.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
-	# gmbal-api-only.jar
-	# http.jar
-	# jaxws-rt.jar
-	# jaxws-tools.jar
-	# management-api.jar
-	# mimepull.jar
-	# policy.jar
-	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 streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
-	# woodstox.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	# jaxws-api.jar
-	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
-	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-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
-	# indexer-artifact-4.1.1.jar
-	# indexer-core-4.1.1.jar
-	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
-	# maven-dependency-tree-1.2.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-2.5.6.SEC01.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-aop-3.0.2.RELEASE.jar
-	# spring-asm-3.0.2.RELEASE.jar
-	# spring-aspects-3.0.2.RELEASE.jar
-	# spring-beans-3.0.2.RELEASE.jar
-	# spring-context-support-3.0.2.RELEASE.jar
-	# spring-context-3.0.2.RELEASE.jar
-	# spring-core-3.0.2.RELEASE.jar
-	# spring-expression-3.0.2.RELEASE.jar
-	# spring-instrument-tomcat-3.0.2.RELEASE.jar
-	# spring-instrument-3.0.2.RELEASE.jar
-	# spring-jdbc-3.0.2.RELEASE.jar
-	# spring-jms-3.0.2.RELEASE.jar
-	# spring-orm-3.0.2.RELEASE.jar
-	# spring-oxm-3.0.2.RELEASE.jar
-	# spring-struts-3.0.2.RELEASE.jar
-	# spring-test-3.0.2.RELEASE.jar
-	# spring-tx-3.0.2.RELEASE.jar
-	# spring-webmvc-portlet-3.0.2.RELEASE.jar
-	# spring-webmvc-3.0.2.RELEASE.jar
-	# spring-web-3.0.2.RELEASE.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/toplink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# toplink-essentials-agent.jar
-	# toplink-essentials.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}
-
-pkg_postinst() {
-	elog "Note that if you change your version of ant, you have to re-emerge"
-	elog "this package to get updated the link to ant tasks of that specific"
-	elog "version."
-}

diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index 75e1bd4..29fda4d 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-javacard-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-javacard-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 24f197d..fcabd4b 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -4,10 +4,8 @@ DIST 9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar 125083 RMD160 e7ad1dd08
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-javacard-7.0.1.ebuild 4900 RMD160 eb61995d5631e22c023db6155a6f04d9ff38ae0a SHA1 c24d47a1be7a2790c46309a54f653e214c964954 SHA256 f92a912decbb573f89985e6a22bd6d6195f71f31bb671a6370eb2fb3ae603759
-EBUILD netbeans-javacard-9999_p20110821.ebuild 4923 RMD160 7fb6385e1a4f4085ebea3ddc70bee75ca246f4fa SHA1 33ae7f1f2437577a9cfede5b3ee6f07457a838e4 SHA256 a621aa625adaaf13df3c823f4fc5c14876f83a65ffd523ee308702d0132a522e
 EBUILD netbeans-javacard-9999_p20110902.ebuild 4923 RMD160 27c4ae0458055643c9f5b5c768c26989abdb7aff SHA1 5cea1265897eff3b03e608ffc8a9582a36a88f11 SHA256 b9719b93450c291471c3452fd58a46393e769e7d953b61d4dc9fac07b1d71e7b
-MISC ChangeLog 13715 RMD160 488cf25fc65972689a76ac18fd3d5f3dd61548ea SHA1 1bab5ac08b742d37678ae2579cc26e9586959415 SHA256 e6c42808a0b15a43dd80bf9b82e63fa46691c500097bc297fd03d63793ec571c
+MISC ChangeLog 13839 RMD160 8483a55c3873abd88db07e8b2392effcb97697bc SHA1 d865f83417bce127fb5075b4e01b443a05e718c7 SHA256 886e2c5fee40e94de4c881182f23ef042a6f8a4a68b1566f54322f5780a11d90
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20110821.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20110821.ebuild
deleted file mode 100644
index 4296d0d..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20110821.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-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-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-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
-	# api_classic.jar
-	# api_connected.jar
-	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
-	# jcapt.jar
-	# jctasks.jar
-	# nbtasks.jar
-	# nbutils.jar
-	# tools.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	# apduio.jar
-	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 072ac52..8d9dcb1 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-javadoc-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-javadoc-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index b8ad8f6..2c7eef0 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -2,10 +2,8 @@ DIST FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip 2141252 RMD160
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-javadoc-7.0.1.ebuild 5816 RMD160 88ecda7e9dea7e00f04d6ee872ee5a22ee3c5f38 SHA1 2681eea7ed0c00f50d2f85b663f4b599c0df363d SHA256 22d996eea7d7f2cb469e65f04e841670647006c3f78e2c27f6bd273df5260e91
-EBUILD netbeans-javadoc-9999_p20110821.ebuild 5839 RMD160 df1da23663bb3ec4177cefdbbab3b7e857cbe240 SHA1 0a60450221112fb7a8522deb6004f704dc879beb SHA256 31c2c63b7e1d722208321a7e1068e97a18dcc6d5bb7d8bcae9023461ad014857
 EBUILD netbeans-javadoc-9999_p20110902.ebuild 5839 RMD160 3f0cb5c7b79330020cbba81d78381bdcc0e95d75 SHA1 65eba89019c1adcfacde0a4569af1ffd55640880 SHA256 82d901c4a89c476778a662cf922ebf8476c49e800aff3b5998bfe04cce30b5ae
-MISC ChangeLog 13543 RMD160 8bcf0193914257ed2adb2549e5851fa8f6b31c42 SHA1 5c83dadfd0b9ddee654aef5ed48976b23fd76556 SHA256 37d6e8019bb1091e76f0729cbe544ad6580712e78d5a31df836c7077a8be8fac
+MISC ChangeLog 13666 RMD160 afed9e7715ddddd804bea6a8b3eb2afc59f13367 SHA1 3ca1e94f327fc1a408ed6879af67f50f0fb39960 SHA256 13fa4e4e4d64111dfd5eaa2136832f21420d43c6fcaa9aba76700f727ab48959
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20110821.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20110821.ebuild
deleted file mode 100644
index 608379d..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20110821.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-DEPEND=">=virtual/jdk-1.6
-	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-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"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.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-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.8.2.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-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-mobility/ChangeLog b/dev-java/netbeans-mobility/ChangeLog
index 011b5c8..c99cdc2 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-mobility-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-mobility-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 3db3bd8..80bb43c 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -9,10 +9,8 @@ DIST D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar 18043 RMD1
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-mobility-7.0.1.ebuild 8594 RMD160 e966510fe30690c1ece9e648aac559db441f901d SHA1 5ebf48ca5fd43de0392a394119c62df0de7509bd SHA256 e99d5d5413b1fb5d59accd1d2f7dde61912142c5ee7e5e7d1c7fe5675e36ce02
-EBUILD netbeans-mobility-9999_p20110821.ebuild 8617 RMD160 927a203789ed2fea84dca08a04afd33e2f5b4723 SHA1 f247da3216bcf4c9d307bd19f026c478fecd3da5 SHA256 64fe5e73e33e7c99390c5258ee63b0374ba817cc7511bcc193993add5bf274da
 EBUILD netbeans-mobility-9999_p20110902.ebuild 8617 RMD160 8beee8206ac9cadf9f0f8138de23df2f1271880f SHA1 439add569adf34a7c9230fd1881a9fced39a169b SHA256 6e06934dd56ee961728bc469010febb9d71fc0f927ee66f6586fe27a2cf2ffb0
-MISC ChangeLog 13856 RMD160 b407e5448c3e5ebdeb4fbbac99bdc4332ec2d02c SHA1 3a624cd8c63fddfdb1f80a220fddefff45bca3b3 SHA256 e4f5fa890e5988a868ab158256e61b9256c3dbf71b781c9a404ed4dafbc4c19c
+MISC ChangeLog 13980 RMD160 2a96924405c5df913a5716c4fc43ca8b056daec4 SHA1 173c62f7efb1907913501a87b56f844af775da33 SHA256 d018f69751e3c4ff500b296aa516c1298d4b5a32fda36ec482a0a0cc2e9be4dc
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20110821.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20110821.ebuild
deleted file mode 100644
index d50087e..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20110821.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar
-	http://hg.netbeans.org/binaries/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar
-	http://hg.netbeans.org/binaries/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip
-	http://hg.netbeans.org/binaries/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar
-	http://hg.netbeans.org/binaries/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar
-	http://hg.netbeans.org/binaries/3A5C68B301F42D3E8D89976F90D4E2AE6F2984B6-nbactivesync-5.0.jar
-	http://hg.netbeans.org/binaries/2EF44D925014E2EF76416535CC0F3A7C7E9F4AE1-perseus-nb-1.0.jar
-	http://hg.netbeans.org/binaries/793B8D020D81284E0B67FB635C17026121F06433-RicohAntTasks-2.0.jar"
-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-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/ant-contrib:0
-	dev-java/commons-codec:0
-	dev-java/commons-httpclient:3
-	dev-java/jdom:1.0"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${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"
-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-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar mobility.deployment.webdav/external/jakarta-slide-ant-webdav-2.1.jar || die
-	ln -s "${DISTDIR}"/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar mobility.deployment.webdav/external/jakarta-slide-webdavlib-2.1.jar || die
-	ln -s "${DISTDIR}"/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip mobility.j2meunit/external/jmunit-1.2.1-api.zip || die
-	ln -s "${DISTDIR}"/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar mobility.j2meunit/external/jmunit4cldc10-1.2.1.jar || die
-	ln -s "${DISTDIR}"/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar mobility.j2meunit/external/jmunit4cldc11-1.2.1.jar || die
-	ln -s "${DISTDIR}"/3A5C68B301F42D3E8D89976F90D4E2AE6F2984B6-nbactivesync-5.0.jar o.n.mobility.lib.activesync/external/nbactivesync-5.0.jar || die
-	ln -s "${DISTDIR}"/2EF44D925014E2EF76416535CC0F3A7C7E9F4AE1-perseus-nb-1.0.jar svg.perseus/external/perseus-nb-1.0.jar || die
-	ln -s "${DISTDIR}"/793B8D020D81284E0B67FB635C17026121F06433-RicohAntTasks-2.0.jar j2me.cdc.project.ricoh/external/RicohAntTasks-2.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-build.xml.patch
-	sed -i "/release\.external.*nbactivesync\.dll/d" o.n.mobility.lib.activesync/nbproject/project.properties || die
-
-	# 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 j2me.cdc.project.ricoh/external commons-codec commons-codec.jar commons-codec-1.3.jar
-	java-pkg_jar-from --into j2me.cdc.project.ricoh/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into mobility.antext/external ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
-	java-pkg_jar-from --into mobility.deployment.webdav/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.1.jar
-	java-pkg_jar-from --into mobility.deployment.webdav/external jdom-1.0 jdom.jar jdom-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-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-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
-
-	local instdir=${INSTALL_DIR}/modules/ext
-	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
-	# cdc-agui-swing-layout.jar
-	# cdc-pp-awt-layout.jar
-	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-httpclient-3.0.1.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.1.jar || die
-	# jakarta-slide-ant-webdav-2.1.jar
-	# jakarta-slide-webdavlib-2.1.jar
-	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
-	# jmunit4cldc10-1.2.1.jar
-	# jmunit4cldc11-1.2.1.jar
-	# nbactivesync-5.0.jar
-	# nb_svg_midp_components.jar
-	# netbeans_databindingme.jar
-	# netbeans_databindingme_pim.jar
-	# netbeans_databindingme_svg.jar
-	# netbeans_midp_components_basic.jar
-	# netbeans_midp_components_pda.jar
-	# netbeans_midp_components_wma.jar
-	# org-netbeans-modules-deployment-deviceanywhere.jar
-	# org-netbeans-modules-j2me-cdc-platform-nsicom-probe.jar
-	# org-netbeans-modules-j2me-cdc-project.jar
-	# org-netbeans-modules-j2me-cdc-project-nokiaS80.jar
-	# org-netbeans-modules-j2me-cdc-project-ojec.jar
-	# org-netbeans-modules-j2me-cdc-project-ricoh.jar
-	# org-netbeans-modules-j2me-cdc-project-savaje.jar
-	# org-netbeans-modules-j2me-cdc-project-semc.jar
-	# org-netbeans-modules-j2me-cdc-project-sjmc.jar
-	# perseus-nb-1.0.jar
-	# RicohAntTasks-2.0.jar
-	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 d6d6450..a5e5893 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-nb-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-nb-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index e3d29cc..76c5cf2 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -4,10 +4,8 @@ DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.0.png 20011 RMD160 a941b71b571a9cd30c49446aef1bd4244e689465 SHA1 ebd2e748bb4bc29e667ead9a2fb717a9017f9405 SHA256 1d519f018ebeff6e29436c8492dbb266446bd0144fb5519b2ef6637664de6f4a
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-nb-7.0.1.ebuild 5055 RMD160 aee62cea6ae4dfa281f92984d064cd8dd99f6901 SHA1 c11d15fe0ef900d0ead4fb2f5d041cad55668983 SHA256 3afe558c3bbccca15e315f26fe854bee8bcf47560d534d931a690e08ee8184d7
-EBUILD netbeans-nb-9999_p20110821.ebuild 5077 RMD160 b55f1c59e77b5ed1354e44b27d6cbde83c6eeea2 SHA1 6d47fb975f73ca6c935920672ba449fbbc4d0197 SHA256 3c5c4d45a59d15037da717ff2a883ef425c204f1dc883f3d260d5e24e05ced72
 EBUILD netbeans-nb-9999_p20110902.ebuild 5077 RMD160 8837804e9ff7f4cea6fcc0c23aa39fd57fe2a4f6 SHA1 a33f09ed93e25ab98f559651dc3d6279218e8ee0 SHA256 5f2074b38238a62b1bdd2660f1caa9ea70c309376fedce4f96cd73feb22f60b9
-MISC ChangeLog 13442 RMD160 f5afd3af48331d389e9948758ffd2b85232c95a1 SHA1 4dc51e0c380a0380df5f68a42c1d19e175062e2f SHA256 3bae0937bddbc8eff290df9cfac5d1b50eef5462b578ae837faeefc237cb2875
+MISC ChangeLog 13560 RMD160 cde6741379002b9808aba25384ee2ff79777b2db SHA1 7d6c7d973773926ed315f4d40575c4d99ce9ad44 SHA256 fe848a254b8c238694a890f22fbf2cab5a4d6e5c6b6934ecfff382544b9dada4
 MISC metadata.xml 396 RMD160 80c4086b305af8d5e4adae8a263111590f183c05 SHA1 11224a41781dde9ebd92c32e5c0a9d1921b628cb SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20110821.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20110821.ebuild
deleted file mode 100644
index 5ec49cb..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20110821.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-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
-	sed -i "s%#netbeans_jdkhome=\"/path/to/jdk\"%netbeans_jdkhome=\"\$(java-config -O)\"%" "${D}"/etc/netbeans-${SLOT}/netbeans.conf || die
-
-	# 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 http://www.gentoo.org/doc/en/keychain-guide.xml"
-	fi
-}

diff --git a/dev-java/netbeans-php/ChangeLog b/dev-java/netbeans-php/ChangeLog
index 0e99636..97d97a3 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-php-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-php-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index bc1931d..92f6762 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -5,10 +5,8 @@ DIST C3E8FC2F69123F598F29F930DC39F5B55A08824C-phpsigfiles.zip 421035 RMD160 8a73
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-php-7.0.1.ebuild 4090 RMD160 a99982b71446ddb9dcad738420f21d526caab6ef SHA1 098929748b8aa2ae050daa252987f1331230bfe5 SHA256 2549fa4e9881bb453c63d2c984ff7c9ff6475aa2a9947c1875c746ed4c6c8040
-EBUILD netbeans-php-9999_p20110821.ebuild 4113 RMD160 9957780ef7e120e0a3b8c9cc9aa56dc68e5a2e8d SHA1 656013b061962c18e0cf600fa5cd59bc4a1004a2 SHA256 3fe1eef95407695f6518f81350762149c0cc8fde46a94fa9327b916c16941d45
 EBUILD netbeans-php-9999_p20110902.ebuild 4113 RMD160 0196d364c3bb1d989832fa8bf42d3fc89ae03ce1 SHA1 b2065be85f32b2ad13763a97cf5ca5e03f3fefbf SHA256 e3b3683c2bfc8344c6f597d2d122e67525a260ccd702582e68340915a03fb2d2
-MISC ChangeLog 12964 RMD160 f90ddeed680c80876f1d5dcf96a58d79e110a9e1 SHA1 43f9d544f64d67201f8a3b8479f1745931604776 SHA256 daad0467f7b225f0115e1769978234039bba9a22456d6864767cd92fe13bb631
+MISC ChangeLog 13083 RMD160 ef792b7c688a42a29a81d66d8ef61efd665bfc41 SHA1 431d38da7d7ecd79b7996facbc7229489ae1d8ac SHA256 bbd7bbfa5b06bf81d1915e9d65b8d559151c23cad1ba8523f973e58bb80fa158
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20110821.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20110821.ebuild
deleted file mode 100644
index 69243a4..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20110821.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
-	http://hg.netbeans.org/binaries/C3E8FC2F69123F598F29F930DC39F5B55A08824C-phpsigfiles.zip
-	http://hg.netbeans.org/binaries/06D0F78D33106A7E5D33B414BE4CA0CE474D969A-preindexed-php.zip
-	http://hg.netbeans.org/binaries/40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.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}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/javacup:0"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-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}"/C3E8FC2F69123F598F29F930DC39F5B55A08824C-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
-	ln -s "${DISTDIR}"/06D0F78D33106A7E5D33B414BE4CA0CE474D969A-preindexed-php.zip php.project/external/preindexed-php.zip || die
-	ln -s "${DISTDIR}"/40BC40A6E6DBD598900E8FAB87E460FCC601275C-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-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-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-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 5ef5fcc..e1ea94e 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-platform-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-platform-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 52f7c96..faa31a4 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -8,10 +8,8 @@ DIST F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar 416668 RMD160 de31
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-platform-7.0.1.ebuild 4988 RMD160 044cf71db52c5718f11e0586f5f08e5cb6f09b15 SHA1 47ad9159f57f16af3167c834a6a120509a670039 SHA256 21dbf43987b108e822e90a16e995745e2506436d99963876888c156c830352f9
-EBUILD netbeans-platform-9999_p20110821.ebuild 5057 RMD160 10a8445435c4cbdace27d60cde4458245ec12d64 SHA1 d3338fc58984bd19d4c8fc2200d9d26d41560ea4 SHA256 47f4c83b32c647f9d006e2e8a220fd75bc4b62c76909f8157fb9e822cc733f75
 EBUILD netbeans-platform-9999_p20110902.ebuild 5057 RMD160 1b6560d6c080b2649bde035d56b792d93d6e1c2b SHA1 2eef7a9ea3562670fa58f5b6b886aeb2cbbb4508 SHA256 49985a7130e498ec653027d9aa836f00d417b806460a2daa15a9673cca8a0e91
-MISC ChangeLog 14420 RMD160 735aff26a99941aab2a2d9c3519f6b43f56fc73e SHA1 3d8b2a72dcb71272695f08f595d8ec6fc033d47d SHA256 3d7b094d8eebff526ee9afd38a4e5cff966527e6d11440d10a088cf231e38c8d
+MISC ChangeLog 14544 RMD160 e9b57316753ba7d4f1f1e3565aec807d99946127 SHA1 733eebd13004070c960012fbbf051014aa6b36da SHA256 3e4de77d1859ead9f06e7eb6a802ae13523e03831f97171dbe30d455196b522b
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20110821.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20110821.ebuild
deleted file mode 100644
index c96c838..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20110821.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar
-	http://hg.netbeans.org/binaries/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar
-	http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
-	http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar
-	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="dev-java/javahelp:0
-	>=dev-java/jna-3.2.7:0
-	dev-java/swing-layout:1[source]"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-RDEPEND=">=virtual/jdk-1.6
-	${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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar libs.felix/external/felix-3.2.2.jar || die
-	ln -s "${DISTDIR}"/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar netbinox/external/org.eclipse.osgi_3.6.0.v20100517.jar || die
-	ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.jar || die
-	ln -s "${DISTDIR}"/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar libs.osgi/external/osgi.core-4.2.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
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-build.xml.patch
-	# upstream jna jar contains bundled binary libraries so we disable that feature
-	sed -i "/jnidispatch/d" libs.jna/nbproject/project.properties || die
-
-	# 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 core.nativeaccess/external jna platform.jar platform-3.2.7.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-3.2.7.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-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/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
-	# felix-main-2.0.2.jar
-	# felix-2.0.3.jar
-	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
-	rm jna-3.2.7.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-3.2.7.jar || die
-	# osgi.cmpn-4.2.jar
-	# osgi.core-4.2.jar
-	rm platform-3.2.7.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/platform-3.2.7.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
-	# updater.jar
-	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 dea377a..6ceeb7e 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-profiler-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-profiler-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 73a32c7..8b0c6a6 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -1,10 +1,8 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-profiler-7.0.1.ebuild 3052 RMD160 5f0f1476d460b95f08e9b34cfae44911e4ee8f01 SHA1 ecf1027c7efb64f7ba3ff1a31a98967c1cbe9b26 SHA256 cf1fee983b9c32c3652b4bf83d2f32b905dec0971e6cc95235cb78209bb13260
-EBUILD netbeans-profiler-9999_p20110821.ebuild 3075 RMD160 1c38edd4c539a0f69097085b8dc6301c762d50d2 SHA1 7baa951e9c8af6e7c0e8485d55fa90110fa2f98a SHA256 7aada9ea04b6dfdf3f92593cfb121d148bde053c19e0f332a851089ac5d60c27
 EBUILD netbeans-profiler-9999_p20110902.ebuild 3075 RMD160 4468a57e298032a1cd0e47dab08d52b74c74dcb1 SHA1 17ff0ffbd605cc0e419dbf59a16820e15e4a6ff2 SHA256 629306890526c8fd85cbf4aa8d688d102f66ccc73e5392be55cff75e734263d3
-MISC ChangeLog 13715 RMD160 1528de72ab63ebff35d417d1c7d2cdc8b68e350c SHA1 02612f98c9c5a7134ef8e71a404bfb8bfca528f3 SHA256 5c6b5370e417b444292811b7f1030fbd927d99efcd3e32ce40f48949fbcbf363
+MISC ChangeLog 13839 RMD160 1195fa195c3c3dfe2c4d2f777c7abf14be257146 SHA1 765a7341b3089fa5525762500589666cbe4aa5d1 SHA256 f24f8de9d2cf7358098a7bb1c927eaebe956eff9dfff8284d3a9d725dd33c6ee
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20110821.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20110821.ebuild
deleted file mode 100644
index 926584e..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20110821.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-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-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-websvccommon/ChangeLog b/dev-java/netbeans-websvccommon/ChangeLog
index 70e3f63..133af7f 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-websvccommon-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-websvccommon-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 799bed7..9c006b0 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -1,10 +1,8 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2631 RMD160 5e895abb0fd658e28970941861400315f7fb0229 SHA1 4ea02a6a2d8365577f47040dfb893198d0088c79 SHA256 f2f99c96bb3d7fa7d6ec499a7198b34990c8dfc1d89157444ec76a1b96fae94f
-EBUILD netbeans-websvccommon-9999_p20110821.ebuild 2654 RMD160 7a6f5cc430db82cccfb50cc2375f481680dcd4c3 SHA1 6284e5e9e3aa13b382c9649c0ac1fbf996e3b01e SHA256 dcb8c3a1ef7fbf5551e2675bf5f0752ab8f994c5cd2171c1268d1d5f3215cf2d
 EBUILD netbeans-websvccommon-9999_p20110902.ebuild 2654 RMD160 f86293d070a674110433e734efd41c50255d9f71 SHA1 0a04fa9e63d74954873bfc1fb23e899c0b322adc SHA256 9a8bb098ef35bbd9ab4708558ec4e68a78ce76a152501f5be28c0f3a171bca0a
-MISC ChangeLog 14303 RMD160 929a3565f7f0255f97a252a3c4dd1a5f115a3f52 SHA1 f5c2f4d4cbddc2c948e52f3a14d0dffb703cf23e SHA256 7a412ee2b1737723a7b7a8d4632bb6b43173bda6355053a6cb60971311af62be
+MISC ChangeLog 14431 RMD160 f14f5236aed77b0a11e3743b780cb3ab360bd6b5 SHA1 0e8412049c0fa67e0e987ca7829b02d0c527c8d7 SHA256 b1658d439582a2bdf5a15a9bf31785f3b7eb05c662ef819135cdc922bd4be7bd
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20110821.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20110821.ebuild
deleted file mode 100644
index e8a27e6..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20110821.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-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 9a49264..b6dc437 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-9999_p20110821.ebuild:
+  Removed obsolete version
+
 *netbeans-9999_p20110902 (03 Sep 2011)
 
   03 Sep 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 7ae150b..34d9edf 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -3,10 +3,8 @@ DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-l10n-7.0-20110413.tar.bz2 13405280 RMD160 146a1e4e72e44659fa547bec00712f55063e31ab SHA1 04d91b859a64405c4b71821a4d0ca543f9ab523e SHA256 30c2008d5b7d3b03a1d80b32b681e473fdf89a907c564a1ca4b4dac2fcea7eab
 DIST netbeans-l10n-9999-20110613.tar.bz2 13405097 RMD160 9f8fb8fcdbdf87c958b2a8e162e150cd30c6c327 SHA1 fb06e579426ebad1909f17e36d31fe1b1b6d9f7d SHA256 c8ad3bfdd8c7da892780caa29cef57006f39016b6598327ebdab5704c9ad08a4
-DIST netbeans-trunk-nightly-201108210601-src.zip 174330014 RMD160 72d9f90c8eebe9450341604ae9cbabf8fc2b726d SHA1 c30d7c5728309b3cf59eecd57c2267f1f3961eb7 SHA256 893f169163480402219fde165ab1f7b9b6c50140d1f14790184e9776204362c6
 DIST netbeans-trunk-nightly-201109021148-src.zip 175432237 RMD160 a231a85fcf77e7e8b72f8535f114cde3093deb02 SHA1 aa6392b56d5f4c4a373c157b8f785dd88e4b5e7c SHA256 bb75dfa0fbe9cfcb719687712a6d53df0954910115e6b1de68818acc0ea07285
 EBUILD netbeans-7.0.1.ebuild 6713 RMD160 dd604b32921009a4ee34c0c44c24d0176014bef0 SHA1 85897c109c1dc0fce484d8313bb9c70f8c0a01cb SHA256 140d03387981aa1967fe7bb730c44d89f18aead54b935b19e4d9d1ac56ad6646
-EBUILD netbeans-9999_p20110821.ebuild 6825 RMD160 1def271360ecc425b1885b0602c55054bbb9d43e SHA1 e12cf584ae731398b1ff92dace86768a226476f9 SHA256 44acf6c832f786e99e229d77925cb85c63333e0d09bba17f8109c5489fdd2ce7
 EBUILD netbeans-9999_p20110902.ebuild 6921 RMD160 a1653b248f7553ba6447531a6d361e348f9ac597 SHA1 e8d2f3f1283595dc7849b28ece6e7db150650a80 SHA256 7cb56b928af9f60a35e063a063b18f1c6afbadf27554b5fb89b9b258fb8d1d2d
-MISC ChangeLog 12528 RMD160 527bd4ad6f80a7d37b5ca739955c7f994a95787c SHA1 fa714fef3cfd092bde5a69931a98597457d3cdff SHA256 e67b1fab4490052a711f2b9451ed5f1b5099916c23e89d85902c327f25ab606f
+MISC ChangeLog 12643 RMD160 38245dfc2353e0cab65dee9a5fe49772cd598544 SHA1 9408922ffbb4fe5e366a0a1758aa2473a11f7f4e SHA256 443b1181d628fc5de7fc9989948d95bcea3b7598409548b1f6981be070f69ada
 MISC metadata.xml 333 RMD160 848a246f77fbcc88bb03d4a8d0769ef60353148a SHA1 e9afe19410a907fb47230f824b2d592ba3f465d4 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a

diff --git a/dev-util/netbeans/netbeans-9999_p20110821.ebuild b/dev-util/netbeans/netbeans-9999_p20110821.ebuild
deleted file mode 100644
index 582eeb5..0000000
--- a/dev-util/netbeans/netbeans-9999_p20110821.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2011 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/2011-08-21_06-01-44/zip/netbeans-trunk-nightly-201108210601-src.zip"
-PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2"
-L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20110613.tar.bz2"
-ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
-SRC_URI="linguas_af? ( ${ALL_URLS} )
-	linguas_ar? ( ${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_groovy
-	+netbeans_modules_java
-	netbeans_modules_javacard
-	netbeans_modules_mobility
-	netbeans_modules_php
-	netbeans_modules_profiler
-	+netbeans_modules_websvccommon"
-IUSE_LINGUAS="
-	linguas_af
-	linguas_ar
-	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.6
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	~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_groovy? ( ~dev-java/netbeans-groovy-${PV} )
-	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
-	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${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_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
-}
-
-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-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-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="" \
-			-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 mobility php platform profiler 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
-}