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

[Miroslav Šulc]

commit:     d2777ab45fccc05ffa417fc377948c44f7759c74
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 13:00:05 2011 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 13:00:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=d2777ab4

netbeans: removed obsolete version

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 5eee644..37649a1 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-apisupport-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-apisupport-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index ec16e74..1cb529b 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -1,10 +1,8 @@
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-apisupport-7.0.ebuild 3069 RMD160 a6ab7f92886067f94a385effbfaed156ebc97bef SHA1 6e385e84970bec91d70fd9f60d6f5bb8b9bef345 SHA256 aa504004b728931a6727eb23a37c2b9e824c49369cbbefa2e3dabc6340815443
-EBUILD netbeans-apisupport-9999_p20110717.ebuild 3096 RMD160 d56c19a435b35e2f29b4c22baf42b0c4e5f183a8 SHA1 fdfafa84fee1c7f997822215e6c5ca3892653c6c SHA256 f3fc70e07acd336a9baefa31a949596993c9cd102600ece0bbb3341a92f4cbdf
 EBUILD netbeans-apisupport-9999_p20110722.ebuild 3096 RMD160 5a066865bfa9ce607c188d2891765f71ec3335ea SHA1 9d1fb1f6c9d0e2a95b38de778fb6950439e5b01d SHA256 c40d61699f6a8bf26545a51bfc1166fe08238067086967323ca65d59f5a367c1
-MISC ChangeLog 11718 RMD160 7e0103778024a361a0cae898f75189c418434a10 SHA1 6b5f9ad3ce236167e358092feb535cb5b4b5ea62 SHA256 e24ead4ad59e54e4c5edf47ac02349633e95e3222928760fa7bb8da44494153a
+MISC ChangeLog 11844 RMD160 3b72a5089c46e9c8ea7baa2f037e24bca1afaf28 SHA1 429f7a5e00ceddb29fe0e80a78e50b8613d3127f SHA256 94b51e750bb5f333a9c7eea8f01c68968594eefcb207055cc5e3ba6cd8a3f40b
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20110717.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20110717.ebuild
deleted file mode 100644
index af6bc76..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20110717.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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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 7bed65a..afec877 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-cnd-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-cnd-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index db0f329..fa81171 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -6,10 +6,8 @@ DIST 84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip 146651 RMD160 b8cd
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-cnd-7.0.ebuild 4430 RMD160 ef34ff1144cdb1628730251a25e2d9a5b503887f SHA1 a1b0f1ab9fe07a6c5c839c3b14782821442d40c3 SHA256 228fc04cd90f647f2b8e94958d671286db01f617e360868be5548f208eebbf00
-EBUILD netbeans-cnd-9999_p20110717.ebuild 4457 RMD160 eb29e47e1112fb9f1c6e21d6fb06ab3bc9a3dd8b SHA1 17465e3fdfd0914aa936c6b3b371ac55b4e2827e SHA256 0022b2be4137aff440ae03a4473b47b7ae56bbd747d073a5dae238da24cc10a7
 EBUILD netbeans-cnd-9999_p20110722.ebuild 4457 RMD160 7e30d0e1d370fd1013a2ab50614f1310f0e7e6b0 SHA1 ddf58e96f2395d712943123379c6a55fe3d37500 SHA256 87494426bc64e9e5cbe79f205daa941bdaaf832681bb51554d83b308a77d0504
-MISC ChangeLog 10847 RMD160 678166fdbe0f41abef7770e3f2e2d89a52f26f39 SHA1 8f6337a07c710fd5bfd2a8869ea5866b17b706d1 SHA256 5736743175f6f930aedc997ace99c04e646674738a582c8c91930f2e61210b9a
+MISC ChangeLog 10966 RMD160 40eca0715bb8e3a864712479333ea7b5407903d3 SHA1 57aa6d9fd923d349e542f91f618d3e2557a75bb9 SHA256 781215b52387ff61a088a9e478f98378afe9fb9ba1cc25c6d06ec86a9641c0d8
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20110717.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20110717.ebuild
deleted file mode 100644
index fe3621a..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20110717.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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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 3486ed9..d02183f 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-dlight-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-dlight-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index c70198c..078a47c 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-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-dlight-7.0.ebuild 3572 RMD160 71996c25aca15f9225e0713f8b5521a0f9b3f44b SHA1 c5a4e7215bfd75b92b42de0843ee2b792dc2d753 SHA256 82a3cbfe70024adefdd3f28a1879b26ab2924522828a4f39df6d98cbe1a26fc2
-EBUILD netbeans-dlight-9999_p20110717.ebuild 3586 RMD160 1502348ab5ec9924014600165af631627078aa15 SHA1 2ffe414a758be00bdf5e8625ff9c37b34fa5f1f1 SHA256 63a98105ddbc7e4f45b138d1a2234b9bd0f41ed54d4c009b268bafbd2e3fff28
 EBUILD netbeans-dlight-9999_p20110722.ebuild 3586 RMD160 8d830c5190df185b9eda40e3e1312546ca6643e1 SHA1 f939f007b122d5f43f44d30baca1786d6737ed4f SHA256 1e5dc38ca7e2aace73d2c592de29986921f1d7448f3a833f6411d0a42fede19e
-MISC ChangeLog 11226 RMD160 eb135e6060b5ee22febd3b9f45d9ebeeea6100dc SHA1 bf5b219f85248358b2578d39e4ea4f9d6f95e9fe SHA256 828c5659e72fa33167a0f589d31074d784bf4a7bc43df3788369e03bc5f478b3
+MISC ChangeLog 11348 RMD160 4aa99315871e5dbedb7bd5d7948dff7ba82162be SHA1 9eb2d9091f6d8ebb10118ef9c2e1252dc08fbd54 SHA256 30cd20e99272882200798d959cd59913af3e2604859187302ff8ffd6c0c81f8c
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20110717.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20110717.ebuild
deleted file mode 100644
index 11a7f36..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20110717.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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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 90a4677..85ddc14 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-enterprise-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-enterprise-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index afc703a..6cec33b 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -31,10 +31,8 @@ DIST FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar 30411
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-enterprise-7.0.ebuild 16273 RMD160 ebde1e873534cf5fff103587cbd10ed1008c589b SHA1 b01f2649b7f91eb343f8792f52698c979c8c2291 SHA256 a61703db2126074c0dd6fd15fbfe1a206669eeaa67a968d9ff890365982d0dad
-EBUILD netbeans-enterprise-9999_p20110717.ebuild 16300 RMD160 70ba75d785e7a6b4b96167ab6c3db34ba2054fca SHA1 5f98afc3ea1aecb7167f6a6e2d654428ec1e9acd SHA256 e7e312eafbd2c3beed8ae00b21944cba02f9b021e941f4b163f5d1f54fb9609f
 EBUILD netbeans-enterprise-9999_p20110722.ebuild 16300 RMD160 4afcbdd78a02b17a7f02d26b00d25a9fc2b2edbd SHA1 5dfb26eb9eab75e299cb086a3c9a9065d0c2d1c2 SHA256 cd98acbe201b7f5bb4cbe7f7a9b2b0b94ceb558af744a85fc3488330dae60b58
-MISC ChangeLog 12096 RMD160 3935051a6e01f2399080c5d405049b023996912d SHA1 c1f2ae1199e839fd8501d9d05ad31164888820b0 SHA256 500ca905d7af889dbe28f8f2a3b960f695ec9856f459df262370252bb6631bf7
+MISC ChangeLog 12222 RMD160 ffa962dbe817ebd4056a4ef07db4cdfa7315fee4 SHA1 350650814ae90349e043a3341c7c16187dc2370a SHA256 3c58fcfd7f05f7817bce5a8bbc99484a04ecd2fd31bee72122f73da7191f68e5
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20110717.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20110717.ebuild
deleted file mode 100644
index b1e20fe..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20110717.ebuild
+++ /dev/null
@@ -1,304 +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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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/BD6C7BD1452456F2F6B2A8CF6C4166493A24ABED-jersey-1.3.zip
-	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/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar
-	http://hg.netbeans.org/binaries/F10ED4F2ECC7724F7C25D586DC9F25377581CCFC-jersey-multipart-1.3-javadoc.jar
-	http://hg.netbeans.org/binaries/123A7BAAE06D938E5E4533ED745EEE7377E73ED8-jersey-spring-1.3-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/BAEA0B9171897175B0B3E20BDF532EF4CFD44CEE-oauth-client-1.3-javadoc.jar
-	http://hg.netbeans.org/binaries/4855C8481C6951F39DC117C44CA8EE70BF2B003F-oauth-signature-1.3-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}"/BD6C7BD1452456F2F6B2A8CF6C4166493A24ABED-jersey-1.3.zip websvc.restlib/external/jersey-1.3.zip || 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}"/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar websvc.restlib/external/jersey-json-1.3-javadoc.jar || die
-	ln -s "${DISTDIR}"/F10ED4F2ECC7724F7C25D586DC9F25377581CCFC-jersey-multipart-1.3-javadoc.jar websvc.restlib/external/jersey-multipart-1.3-javadoc.jar || die
-	ln -s "${DISTDIR}"/123A7BAAE06D938E5E4533ED745EEE7377E73ED8-jersey-spring-1.3-javadoc.jar websvc.restlib/external/jersey-spring-1.3-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}"/BAEA0B9171897175B0B3E20BDF532EF4CFD44CEE-oauth-client-1.3-javadoc.jar websvc.restlib/external/oauth-client-1.3-javadoc.jar || die
-	ln -s "${DISTDIR}"/4855C8481C6951F39DC117C44CA8EE70BF2B003F-oauth-signature-1.3-javadoc.jar websvc.restlib/external/oauth-signature-1.3-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
-	# 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 cf225ae..46ce3cc 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-ergonomics-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-ergonomics-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index aca408f..d39019b 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -1,10 +1,8 @@
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-ergonomics-7.0.ebuild 2819 RMD160 d172b98e26198c64216664ad15e6cecf961b715f SHA1 20e241c008108f9153543df8befd604c52fcfe51 SHA256 4dfe2b8676375de86cc24c97216ba88385abf7a817f451676ffa63230ca23da6
-EBUILD netbeans-ergonomics-9999_p20110717.ebuild 2846 RMD160 2037d335ed3a1e3e4811f4e75efe5b55bad6d41f SHA1 00b94c11f64b84f361aeaa3cc4bf2ca499a4b709 SHA256 ccdca2dbf89021940602903d814478c6419cbbc262824f36f56e30e39043882b
 EBUILD netbeans-ergonomics-9999_p20110722.ebuild 2846 RMD160 c1fc5037081893de0cf863499f7f2ba72b730f35 SHA1 b1677d4fe34bc465faa4791f44f0feed08b134ba SHA256 b6d133fcb78cad55da187554fc19e325fad382526c9326946db1ebfb97fb8414
-MISC ChangeLog 11718 RMD160 aee61353cb070f83bf81e0bd0eda1cdf6e6e8bda SHA1 34dc9cc2156754d0c05e738ec259fa86c0a27a7f SHA256 02e1b65727234b315cde6ba440a2406a647b99aabe3ef44bd1491cd86a0ed449
+MISC ChangeLog 11844 RMD160 de342450121375af34a658e0d7fde0df6d806bb8 SHA1 7e4a8f5ebbf2fce190df54d03108372a1b34d25e SHA256 3ecfd9dc32a6243299d18868eae3b17dd3bb520273296e0e36d6086b6befe915
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20110717.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20110717.ebuild
deleted file mode 100644
index 960275e..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20110717.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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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 8e7ac28..a6b85c7 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-groovy-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-groovy-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 25b37c8..e725771 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-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-groovy-7.0.ebuild 3231 RMD160 44e744c51e4c45ce60cff46b1500a9dbf1bdcc03 SHA1 7e454ff58ed94993fd412faa564373b27163d431 SHA256 929ebdedccba38fd75f47200b4d94b52f662bcceb82c4321661a64259d3c39d1
-EBUILD netbeans-groovy-9999_p20110717.ebuild 3258 RMD160 23aa716c8b20d5c9a9ff32010090357f68e81cb2 SHA1 4c6ffa82df08a327fdeddcd270f527a71296e0b2 SHA256 641ed43cafe089c17f34d6dbc339720d58364b48919861c90ecb44c43072c21c
 EBUILD netbeans-groovy-9999_p20110722.ebuild 3258 RMD160 c156bca1e1a61f7e78f0962ea3966edb69323eb4 SHA1 dc3e001b947e496889121de4d82426db171ea578 SHA256 38e1a486438510546ca20e01b4b2f0e4780c07751a8ad699aec3770836d3bfba
-MISC ChangeLog 11226 RMD160 6295d4686117caefad3305211ca73c7ccd25babc SHA1 e933ad06b18f379a0d506c8160fe2c6dcf08ab00 SHA256 ee7cf209444e870af6e7928fbc394d58ece1f9e44a622979cf6a324235fed2e1
+MISC ChangeLog 11348 RMD160 beda59afb1e2226074183821ac5b084c57c301aa SHA1 d2bfca7419b7ec3256f54a6a8452193866db8ed3 SHA256 85ee18de387a8d77b0482d5310cdbb036436493142879c4366139d9b6dc22aff
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20110717.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20110717.ebuild
deleted file mode 100644
index bc31fcf..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20110717.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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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 58fa78c..bf86e76 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-harness-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-harness-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 41be134..52b21a3 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-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-harness-7.0.ebuild 3514 RMD160 6e4f7ca5e957c6d1dc7da80e132f1c51d6a10ba8 SHA1 b3b481e1bdf452d7afc475388d012330192b03be SHA256 ffe81227e5ac910ab4f13b092fa60b6486602809b983c8b55941c85dec1fc7cc
-EBUILD netbeans-harness-9999_p20110717.ebuild 3541 RMD160 0e53f3094800c46394a2a2b9b5f0229efd4bbaee SHA1 b9b8691057c73aa15a2773fbf22ad2dc34f6fb74 SHA256 9d8271d4110dab9000e4930bf370d82238a1ad062b2ae9199646a88d7171399c
 EBUILD netbeans-harness-9999_p20110722.ebuild 3541 RMD160 b677cc1c0e34da8862f57485a7a197583022c210 SHA1 50197d7da8a0203242201f478a0853ff9ad9bce5 SHA256 06d65e1d16227fb9f732ad35d00b66e49beb7cd1d126dcf993adcdfac7951c82
-MISC ChangeLog 11349 RMD160 3a3897330122ce6c85029e30da6e7752badb3912 SHA1 cad0f7aad2ab184971c2a178dcddb8cd62aa39d1 SHA256 90e0d9bea4c4b43dc6919ccc11e93c2c5d03056edb14056781abba1007ff88b3
+MISC ChangeLog 11472 RMD160 d38196d5d29a3eb893361df8c6ff5fad33c1bb94 SHA1 e31b7e0d371a7b1662476b28cfaf839fd2f51210 SHA256 7e392cd9ea248623e221cb6e7d9d490bd3f66936fe8a0ef6ad2b44cc9c784cbb
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20110717.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20110717.ebuild
deleted file mode 100644
index fe680fa..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20110717.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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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 8226ab6..0f0cdd9 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-ide-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-ide-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index d5e009b..ba56e6a 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -45,10 +45,8 @@ DIST FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar 182065 RMD160
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-ide-7.0.ebuild 22224 RMD160 8b4392edbe15388f879765aaca4ca9c239b7ae5b SHA1 2f7d23f6be8a7abd4ce4eb5c2e70a0720dceb25b SHA256 1eb2490e3e8a700fbe81eef8dbb323e77687d67bd92683c1128cee43e4c0a99c
-EBUILD netbeans-ide-9999_p20110717.ebuild 22462 RMD160 aed09e0c1f244990c9d27555ea90ebfc0d9bf63e SHA1 b1676f02e1fc3f91fcedb913b01909baa8e4f769 SHA256 3b6e3834d20b1521fa09b5dbba6ae679f0a67b7e1d69c31b7c53b1b0e1da43eb
 EBUILD netbeans-ide-9999_p20110722.ebuild 22462 RMD160 ec719dba31a7e4bd0c6b6f6cd946b3dee2168a78 SHA1 03704fd3f27caac45d53a5a686b0debb9476d8c0 SHA256 37daae1e611adf435978112a9e97b593e3d63a887661f64ef7b77951bbb4ab81
-MISC ChangeLog 11143 RMD160 58b243565040ef7e2a421de28a54d2662423e467 SHA1 4ff713858b63bac8f0a314c8a2c749021542c7d7 SHA256 0cf3a82318cee834162067cc0221467276232d6e72a04a64aef745800f8c2a99
+MISC ChangeLog 11262 RMD160 ca656b553184dacaedf02bce88b7992e34bc0172 SHA1 5019c69235b921693101651001fce7c714331b1c SHA256 904934ce26aa79b41ab0eb391677d3c406934af46e91b4258c60bc8181534961
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20110717.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20110717.ebuild
deleted file mode 100644
index 124ec9a..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20110717.ebuild
+++ /dev/null
@@ -1,358 +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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-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/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/commons-net:0
-	dev-java/flute:0
-	dev-java/freemarker:2.3
-	dev-java/icu4j:4.4
-	dev-java/jakarta-oro:2.0
-	dev-java/jdbc-mysql:0
-	dev-java/jdbc-postgresql:0
-	dev-java/jsch:0
-	dev-java/jsr173:0
-	dev-java/jvyamlb:0
-	dev-java/jzlib: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
-	${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"
-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}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-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}"/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 --into css.visual/external flute flute.jar flute-1.3.jar
-	java-pkg_jar-from --into css.visual/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.jakarta_oro/external jakarta-oro-2.0 jakarta-oro.jar jakarta-oro-2.0.8.jar
-	# java-pkg_jar-from --into libs.jaxb/external jaxb-2 jaxb-impl.jar jaxb-impl.jar
-	java-pkg_jar-from --into libs.jsch/external jsch jsch.jar jsch-0.1.44.jar
-	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
-	java-pkg_jar-from --into libs.jzlib/external jzlib jzlib.jar jzlib-1.0.7.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_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
-	rm jakarta-oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/jakarta-oro-2.0.8.jar
-	# [[ -f jing.jar ]] && java-pkg_jar-from jing jing.jar ${instdir}/jing.jar || die
-	rm jsch-0.1.44.jar && dosym /usr/share/jsch//lib/jsch.jar ${instdir}/jsch-0.1.44.jar || die
-	# js.jar
-	rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
-	rm jzlib-1.0.7.jar && dosym /usr/share/jzlib/lib/jzlib.jar ${instdir}/jzlib-1.0.7.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 afd9fbc..a51da9a 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-java-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-java-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index ba7c76d..bc95b27 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -29,10 +29,8 @@ DIST FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip 2141252 RMD160
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-java-7.0.ebuild 14895 RMD160 9b2dd800c4901f781eddbba280770d09466e0aea SHA1 84b870b767ad5618b1088762d12c40fdb8df7ba5 SHA256 110ae71dfd837ccc1db3aa0003097576ec88df62203353daeb7db5d551a92b4b
-EBUILD netbeans-java-9999_p20110717.ebuild 15111 RMD160 a312d589c62938d020c243fa7a7aaca82fa06308 SHA1 85cfbd6217f09f8485232f8b8abc7d6d3fd8aebd SHA256 bfd75d0b8f32f369619c94ba5b4da8b00f81c7503873fded0f0c1bbcc54c6a0c
 EBUILD netbeans-java-9999_p20110722.ebuild 14388 RMD160 a5b554acc39bfa1a03879cf13e5bc08fc611ce48 SHA1 ab9114621655574762d9c1812d789effca568c6e SHA256 df949d36d59da92cfb86453fb051feb2a8f819f1fc07768d012dbe7bbd4adb50
-MISC ChangeLog 11390 RMD160 f310ce9322a8743577fd132ba07c4aca14bd7a02 SHA1 dbb5ab74fe5f250e77f2024b5ab087aa739fcd85 SHA256 7d90455ad3042ae8289a2f58ca5d07a52f0e91e677e012403dcc563cd0bb6802
+MISC ChangeLog 11510 RMD160 ab2de385ce59db465b8c48340db2fac750e073d1 SHA1 9f8f819eba2db89a6437bbf0d0645e5fac2595bd SHA256 b1be8ca8058ccedf5a8d9ded6d4dc0895914c0d82e69bc06148f96e1d7439fbb
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20110717.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20110717.ebuild
deleted file mode 100644
index f6a55ce..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20110717.ebuild
+++ /dev/null
@@ -1,306 +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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/1E4BAF3553AE5691E81647D30ABE8FFFC250B59E-eclipselink-2.3.0.jar
-	http://hg.netbeans.org/binaries/E9DCFD351C4A7EB6C172612C987752F715BF2E6B-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/9B2ACF67C1DADE48B9FDFC398F6848FDCD7454D9-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/appframework:0
-	dev-java/beansbinding:0
-	dev-java/cglib:2.2
-	dev-java/jdom:1.0
-	dev-java/swing-worker: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}"/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip swingapp/external/appframework-1.0.3-doc.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}"/1E4BAF3553AE5691E81647D30ABE8FFFC250B59E-eclipselink-2.3.0.jar j2ee.eclipselink/external/eclipselink-2.3.0.jar || die
-	ln -s "${DISTDIR}"/E9DCFD351C4A7EB6C172612C987752F715BF2E6B-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}"/9B2ACF67C1DADE48B9FDFC398F6848FDCD7454D9-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
-	java-pkg_jar-from --into swingapp/external appframework appframework.jar appframework-1.0.3.jar
-	java-pkg_jar-from --into swingapp/external swing-worker swing-worker.jar swing-worker-1.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	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 appframework-1.0.3.jar && dosym /usr/share/appframework/lib/appframework.jar ${instdir}/appframework-1.0.3.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
-	rm swing-worker-1.1.jar && dosym /usr/share/swing-worker/lib/swing-worker.jar ${instdir}/swing-worker-1.1.jar || die
-	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 29c0252..a3ffbc1 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-javacard-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-javacard-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 830e670..91aa021 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-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-javacard-7.0.ebuild 4896 RMD160 dbe54ac4f637c3a0b74d2db673d4d8109f9a79fb SHA1 d8409b8fbacd12fdc9272eb94b63bec7bf0b240c SHA256 06c630d02e4cf765d2c48db5a6d55036ac6de2fab7375c1976060739eb1957b6
-EBUILD netbeans-javacard-9999_p20110717.ebuild 4923 RMD160 d63a73c8c0df569a9de388b634426887cac730c9 SHA1 977e2d5c02fce8a6e4b1e3a27e402aecc61a3124 SHA256 c2b5ebfcbec334c26ff19d34ddf67379c12b97432eba6544278990d33db6905b
 EBUILD netbeans-javacard-9999_p20110722.ebuild 4923 RMD160 ed3c82c7e32b4222307bcdbca8c6fca3bc4461ea SHA1 8546d96b859bdc5e44383c6a24e338c3fa45748d SHA256 bae8cfd928c294f578c7cf976ed599a04d264503140f2bdf8b5b07ee6ba664c6
-MISC ChangeLog 11472 RMD160 0431884a9ae01d70abadd9ab3759800e025637f3 SHA1 2c309843fad2ebfcbcdb7298ec9e2e012052750a SHA256 30d0822f9545d603e12bec047368c0cdf246dc145ea9531a781da9d68732ce4a
+MISC ChangeLog 11596 RMD160 8cb45814ae71ba99d52a5a732cc43236a8c8cfd6 SHA1 48e3acea4322a8ecf1180efc2c6e15b66d6c20b9 SHA256 c310d27cfd84f85515f1590f31ad693696e34ed6f49194f5536c35a5d7dd7e1c
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20110717.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20110717.ebuild
deleted file mode 100644
index 611ece8..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20110717.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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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 623a548..32c4c7f 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-javadoc-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-javadoc-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index dcef269..174b8f4 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-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-javadoc-7.0.ebuild 5812 RMD160 3cb4bf6f10337d1f92b099124318fbccaca82165 SHA1 2665506a07b7405994381ee44836cdabc8ee7f1c SHA256 93a2d7ceee7fd373ce59f1b154f4815b68bff3cf8fb260dcdf73ff896c53060c
-EBUILD netbeans-javadoc-9999_p20110717.ebuild 5839 RMD160 d3316d739326a79eabdd578e1efd47c04bf14658 SHA1 441ecb51fd9de788de66b166007e277d668ffcd7 SHA256 f5d20cb04e84b9a38d1659cc2f6fc7e9c88c45a4e585be3514aabba88a449c74
 EBUILD netbeans-javadoc-9999_p20110722.ebuild 5839 RMD160 e9f0537323cd373ce782a8405037ca2e7e7509c5 SHA1 646d92a8b0ee3b88813b314efc2164a455749d7a SHA256 233378cf9ae1f645f2781bfc462e816f30b0a1a8ca502cceecc84588b21ea5fd
-MISC ChangeLog 11324 RMD160 8e967eca6cf08c08798d89b47939c7022aedf1d0 SHA1 9004902700d660490b20a1fd8b1f1143caa621a7 SHA256 58db4bc8edf216afbd1ce5a25f07925b62f2f4ac0285b5c9a9320dff172d36fc
+MISC ChangeLog 11447 RMD160 8a6a401a4492f978ef8c6b0ec3bc06003045fca4 SHA1 6e6da157a8ca07b3e151bc5d5a845685e4195baf SHA256 d565a37e0c3f1c9a231756c04a5eceb89e40678cae19b8c77aaf21dfdfeba715
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20110717.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20110717.ebuild
deleted file mode 100644
index f840dcf..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20110717.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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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 bf35513..e1bc6c5 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-mobility-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-mobility-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index e85279a..40b349f 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-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-mobility-7.0.ebuild 8590 RMD160 9def01a8eb4d25f3e423cb808ec7fc4b432fe2ff SHA1 c50a2eb86085769ba5a85d3b399b13cd91811a6a SHA256 b65564f38baf7560c37dfdaf0eac14db7e47fc3fc4585e33d5399e12d8c455d5
-EBUILD netbeans-mobility-9999_p20110717.ebuild 8617 RMD160 aedd5c9cb0101b617c1bfe846a4322caa7766e77 SHA1 a75f2bf48d33210448e22ad0d75a738b46d0ca15 SHA256 0829196d7294310c92638c4e19d72889550fa43716166774e0fc23c24018fdfe
 EBUILD netbeans-mobility-9999_p20110722.ebuild 8617 RMD160 726600c47b2ecdbb93745bb705d80dab37bdcddf SHA1 d36cd1270fe5289bb972e53a8bd081309a2101e2 SHA256 b753cfd0a133f58eccb2bc73ebdb09248a38e3e0999926d35509dc135f869d84
-MISC ChangeLog 11613 RMD160 e60bedbbc0d6b9e5d627a823774c0b439e9e15de SHA1 7902e84b7fa999c36d7e4ce82013954e52138b93 SHA256 40c831eb463d1e77aa475302dcd74aea8c7d17e851a85780161814424050b78e
+MISC ChangeLog 11737 RMD160 c8d3313d956062f0cc0c8c0726e387b9e78143a4 SHA1 52c9b67f674e5097c59b6501ba110500f9e09a65 SHA256 c471b17f5302f6d64eb670531c8d77deffe0b6feb9dec58f4420a6bd86cf6c9f
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20110717.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20110717.ebuild
deleted file mode 100644
index 3d1746f..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20110717.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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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 17d1841..0c68df9 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-nb-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-nb-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index bcdd82f..9ce9b79 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -4,10 +4,8 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 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-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-nb-7.0.ebuild 5037 RMD160 3802011d7c4d6b89129d3d442f0198c50ad71432 SHA1 c6cdc29caaf7e51dab159cbdabb56f80369aad29 SHA256 416a2c810e7f17e113ed9b5026062ee6471c7e652f40f08a9d410ec18cca70d7
-EBUILD netbeans-nb-9999_p20110717.ebuild 5060 RMD160 1023bf820e9116be71ad846a6ea7897ced4fe1cb SHA1 cf39d469a7f10059526d22cf0b298081e8045cab SHA256 de593ce1dde13049125b0ae879a3b23aeb57cf7d55e4a9f0005b433c9c6fd0f6
 EBUILD netbeans-nb-9999_p20110722.ebuild 5060 RMD160 1a0cf1ca70e5c1fabcf71963e705708c4a06f9ba SHA1 e5a90f2732a9169778ee6e966c8f2acec9fd195a SHA256 d69076281ab96e5196f3bb730d2e756867eeaa844fdfefe693d11d11c15ac349
-MISC ChangeLog 10922 RMD160 fef45e3312317c8ed3c4b954388adbf26b65db15 SHA1 b58047cf7d6a41fae572f3ae1bd771550352890c SHA256 53010af662073d5362e3808988b6c46f4567f3cf0ec3858dcf479a80099bebe5
+MISC ChangeLog 11040 RMD160 b29da8a83d35dd8adde394c0293492f82b79acba SHA1 281d55beef61ab065222b44da54683cc663e1a40 SHA256 bf6c4cb5b3bae1014ba4ad13a2d1cf650be39cc091085df85f42d235dede4eae
 MISC metadata.xml 396 RMD160 80c4086b305af8d5e4adae8a263111590f183c05 SHA1 11224a41781dde9ebd92c32e5c0a9d1921b628cb SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20110717.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20110717.ebuild
deleted file mode 100644
index 5ae2e3e..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20110717.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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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-7.0/:' "${D}"/${INSTALL_DIR}/bin/netbeans
-		sed -i -e 's:"${userdir}"/etc/:/etc/netbeans-7.0/:' "${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-${SLOT}.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png
-	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 fea442f..3c7bbfb 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-php-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-php-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index b4b5340..f5dc7c5 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-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-php-7.0.ebuild 4086 RMD160 3b0516c1fb5f77b7845bf956eccd2106aa5b477d SHA1 2deee7e95837905a26f7c3476d4067fd404b7055 SHA256 03a362429af46895dd6f50b8f44a68b9760e47320a52a137f088b3aec4bd2d93
-EBUILD netbeans-php-9999_p20110717.ebuild 4113 RMD160 9b3097e8b7f6a9e4b43354d4ea155a475986ac4f SHA1 0d20d5852982513e61b0f027a52629fc87527e10 SHA256 8946b80dc9eaaca7a933b007de747ad68cfdce7c483d5c066ab37c4692e4881f
 EBUILD netbeans-php-9999_p20110722.ebuild 4113 RMD160 e9cedd518706d2ee584812ae836bd240b667499a SHA1 7614fe31d451b9933ad9e4a352f5f7bacabc2c58 SHA256 33eaca97e7d77cf4c26e87def6995c389d33fd6b9d553f15b171c8c74412fe67
-MISC ChangeLog 10847 RMD160 c91db76f05c69808e57a5d7d7b48cb163569e595 SHA1 df3547d85a496d25fa47268ef526e6a8ee6a7452 SHA256 4aa21118ff344e14177342260cb2de7c59b15083665edbec4d32f4161f84e1fb
+MISC ChangeLog 10966 RMD160 efacdc8e66316c777a5254d6d462d2e4cabb194c SHA1 731048143aa7d2e850b4502fc8a9651af248be5d SHA256 373ce08e22216e983f19fc9e3b0c447b1e1e9e66b5f0a65b810b2173a56a05d9
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20110717.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20110717.ebuild
deleted file mode 100644
index c502009..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20110717.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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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 073a9b9..3cbbb1d 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-platform-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-platform-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 5ce851e..c6bd280 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -6,10 +6,8 @@ DIST BD5615C6A15497B60A0AAA9A04D4F05E2BC42D07-felix-main-2.0.2.jar 23434 RMD160
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-platform-7.0.ebuild 4855 RMD160 1bf2c46bf11d3c8767d5f03996acf9f8e81b5b87 SHA1 b26949f5b85e72c7e2b7b55b6f8f40f9493dfcd3 SHA256 3375b2dd5b9b638e91d78dc56c81128adf63b03e909c518dcae6dacb6d3ef761
-EBUILD netbeans-platform-9999_p20110717.ebuild 4882 RMD160 6264510424533819eae4b2a678cfc32413dfe3ca SHA1 a6ece06c0516fd1b91c8ec6b3627fb7e8465f6b2 SHA256 a955d36df94ab6d2aba7f363e3725bc640130ce55d300b5fde75be369491e5e2
 EBUILD netbeans-platform-9999_p20110722.ebuild 4882 RMD160 ff3e75ef5c4cd90b73df51c4ab726a0e0dc9f49e SHA1 fbc32b53d9b0e2603319d4fa4480a42be17ae78f SHA256 d07efa50f3b8ff8df2daf5a9b35995657eac9080557c377880bf54916ee9b24b
-MISC ChangeLog 11908 RMD160 a65925bc5cde7dd056a488cfa91d1147edbc6655 SHA1 86ddf780c2e909fc9893019871611b4b1e16a3e6 SHA256 f61bb1b61d646bdf0746b0f2ebcf5bd4ac477fb6664fed45eca50a11704babfd
+MISC ChangeLog 12032 RMD160 86676f90ec317852feb0d51b5c8828a81811d549 SHA1 56074fbc036f0a0405d37a0f4df74c2db7383e71 SHA256 a691c833455c0cf86494a70562503fc1f2935611120b6645b3253d201c8a1fcf
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20110717.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20110717.ebuild
deleted file mode 100644
index 267b654..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20110717.ebuild
+++ /dev/null
@@ -1,122 +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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/08676C719D33D26DF4F3988E210A04D7F11183B7-felix-2.0.3.jar
-	http://hg.netbeans.org/binaries/BD5615C6A15497B60A0AAA9A04D4F05E2BC42D07-felix-main-2.0.2.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}"/08676C719D33D26DF4F3988E210A04D7F11183B7-felix-2.0.3.jar libs.felix/external/felix-2.0.3.jar || die
-	ln -s "${DISTDIR}"/BD5615C6A15497B60A0AAA9A04D4F05E2BC42D07-felix-main-2.0.2.jar libs.felix/external/felix-main-2.0.2.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_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 513a26b..2c4ac5f 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-profiler-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-profiler-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index f9d5042..9c74c77 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -1,10 +1,8 @@
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-profiler-7.0.ebuild 3048 RMD160 ff8573b89f3dabc65e232a60c31fabc2c480b181 SHA1 80b0946f0fdcaa9b6f10f3bc78535b94b582dcc7 SHA256 7148f39f6ebb55e5ed0581bcfa361eb6e4fb5e225e50035cd972f3152340a58a
-EBUILD netbeans-profiler-9999_p20110717.ebuild 3075 RMD160 1d99f880556f5a9b4edb437598b1a15e1959ae20 SHA1 aa1ac1edb2227903e0583cadb389a9eaab77b27c SHA256 b7f510be7db29ecb6e0145edc803755cdb2e5968f5267c62d5ad330cda22375c
 EBUILD netbeans-profiler-9999_p20110722.ebuild 3075 RMD160 001bb5d8197c33b5a311b449226e783b0bba5346 SHA1 8309d741d6001f58b7963afa3ac1c5230f4ff7cf SHA256 0793e1031c2f8f4e6d404e3ecfb248fc681279c888d6a43ab7de4830f3aacd0b
-MISC ChangeLog 11472 RMD160 00c22634aa99da80393d1bd7bbf019b731c75081 SHA1 423d8600d8a420ea504f2c18d7786039e4d3da1c SHA256 d432d41bd4a34bb3d036cbe65022bef50a48ff3dd53a34a3b4095c37cc3e9496
+MISC ChangeLog 11596 RMD160 1c1c6bc00bdf51e80fac20aa3366a29f61544b32 SHA1 91287b695580ac60f28305cdbfdc8730b0868160 SHA256 620db696606cab092943fe10456153ab67ce9d93e7aeca1c8d32074aa467c93d
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20110717.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20110717.ebuild
deleted file mode 100644
index 5958e83..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20110717.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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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 af90603..0ad5f43 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-websvccommon-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-websvccommon-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index c70396a..796cc3b 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -1,10 +1,8 @@
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
-DIST netbeans-trunk-nightly-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-websvccommon-7.0.ebuild 2627 RMD160 22ae06750bdadf3aff577b598b79228c9e061a75 SHA1 17e5c709c6863bd09112924cce9ae267fd427f36 SHA256 7a89f0152d080d3fbf76008832ac4d858b969a034abac69d252b2ed821a34a21
-EBUILD netbeans-websvccommon-9999_p20110717.ebuild 2654 RMD160 6c2456c0528eb63391e0e0ed037851af5986dbd9 SHA1 6ccf73170a36be1b84b4a0ca605353a0effd20b1 SHA256 adcc55864246151fa7666313b68abb8054fda841b4e686bfc18d1c33081f78d8
 EBUILD netbeans-websvccommon-9999_p20110722.ebuild 2654 RMD160 8714edff35da89774cd25276ae0b07653bdeda6f SHA1 338202b94bc085266b3b4314fb6cc93a918ffdd5 SHA256 a0b5c367c9e86c662b99cfac099d2167b0cbc8031743a21716f840cf3b3c6913
-MISC ChangeLog 11964 RMD160 c894b731ca3433539548842656c6149267a7853f SHA1 b959a6c212bd67409a0145cf30b649fa5eb84528 SHA256 7882fd82f2b0d1e143455e0ed01506e67e0b8341a3391156d79ddac111438661
+MISC ChangeLog 12092 RMD160 816cdaebfbc1dfafe45d87ffe9be8b0845a46156 SHA1 793c80147349dacc7dbef7a6f0d29c42f06de904 SHA256 4b20a3da3d3d8ff63526520c40e75d49538eaff2fe07d926deb858d24df98fff
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20110717.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20110717.ebuild
deleted file mode 100644
index 4166e24..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20110717.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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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 8829e6a..174d85c 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: $
 
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-9999_p20110717.ebuild:
+  Removed obsolete version
+
 *netbeans-9999_p20110722 (23 Jul 2011)
 
   23 Jul 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 3b68494..7f7a492 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -3,10 +3,8 @@ DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674
 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-201107170600-src.zip 173715175 RMD160 4818b39b2d1635fbfdff13beb09c33d0e861ad33 SHA1 d4465a651de0c333f369abadd93a08f8f1236ef5 SHA256 0dd9d2a291a94b00c2510974efcea7a63c78858672b99f0b8e974c4057b24678
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
 EBUILD netbeans-7.0.ebuild 6709 RMD160 3e3200c10f2a343501e9658fb7730063d0e7f326 SHA1 1cee5a87e542c8da6b167a7f8edfe8cdd511987f SHA256 347005e2f9d19eee6d54446b0318501f9a3a70b5965aaf883af47b41b851682b
-EBUILD netbeans-9999_p20110717.ebuild 6825 RMD160 db4d5c1fa983c237d87fb8bc4ccce05965482bf1 SHA1 7206ee74fb3a676c332affaf518d8fe11c6a7663 SHA256 fdc35795d97e5039aeeab753d56d9409ce2bb70a6c9cb280289211d921f3ce9b
 EBUILD netbeans-9999_p20110722.ebuild 6825 RMD160 5445786811c5e21142d806499edef1972279b166 SHA1 a3ebc5390cb09785d4cf14bfcc64e715fb8791e1 SHA256 2a2582503ee9dfefc0c5c2bdddd7ab7b1d6feea1a792db9df2fc44c59d5e050d
-MISC ChangeLog 10507 RMD160 96115b9d3a85c00dc86bc3d85c6c0505e760129f SHA1 f747612f44165aa9d1bf788e325577d9b904ed98 SHA256 25e549d7ae641e2fc7e280e88dca5779d735046f7c30d0c03925fc1a1fd4dbe3
+MISC ChangeLog 10622 RMD160 4892431b0f4b06655aaf6bb624c1f7bff48df34e SHA1 999a3772ae07ecbd66f299079ef14e150663353e SHA256 71f4ebd2b9be3577498d2c54b95d03e278cda4eb669e0b48e398f9add4d0c563
 MISC metadata.xml 333 RMD160 848a246f77fbcc88bb03d4a8d0769ef60353148a SHA1 e9afe19410a907fb47230f824b2d592ba3f465d4 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a

diff --git a/dev-util/netbeans/netbeans-9999_p20110717.ebuild b/dev-util/netbeans/netbeans-9999_p20110717.ebuild
deleted file mode 100644
index fbd6faa..0000000
--- a/dev-util/netbeans/netbeans-9999_p20110717.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-07-17_06-00-32/zip/netbeans-trunk-nightly-201107170600-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
-}