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

[Miroslav Šulc]

commit:     3089e1070e61b9586f64eea9a5566cbdac770a89
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 15:53:13 2011 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 15:53:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=3089e107

netbeans: removed old beta

---
 dev-java/netbeans-apisupport/ChangeLog             |    4 +
 dev-java/netbeans-apisupport/Manifest              |    4 +-
 .../netbeans-apisupport-7.0_beta2.ebuild           |  106 ------
 dev-java/netbeans-cnd/ChangeLog                    |    4 +
 dev-java/netbeans-cnd/Manifest                     |    5 +-
 .../netbeans-cnd/netbeans-cnd-7.0_beta2.ebuild     |  123 -------
 dev-java/netbeans-dlight/ChangeLog                 |    4 +
 dev-java/netbeans-dlight/Manifest                  |    4 +-
 .../netbeans-dlight-7.0_beta2.ebuild               |  119 -------
 dev-java/netbeans-enterprise/ChangeLog             |    4 +
 dev-java/netbeans-enterprise/Manifest              |    7 +-
 .../netbeans-enterprise-7.0_beta2.ebuild           |  304 -----------------
 dev-java/netbeans-ergonomics/ChangeLog             |    4 +
 dev-java/netbeans-ergonomics/Manifest              |    4 +-
 .../netbeans-ergonomics-7.0_beta2.ebuild           |  101 ------
 dev-java/netbeans-groovy/ChangeLog                 |    4 +
 dev-java/netbeans-groovy/Manifest                  |    4 +-
 .../netbeans-groovy-7.0_beta2.ebuild               |  111 ------
 dev-java/netbeans-harness/ChangeLog                |    4 +
 dev-java/netbeans-harness/Manifest                 |    4 +-
 .../netbeans-harness-7.0_beta2.ebuild              |  114 -------
 dev-java/netbeans-ide/ChangeLog                    |    4 +
 dev-java/netbeans-ide/Manifest                     |    6 +-
 .../netbeans-ide/netbeans-ide-7.0_beta2.ebuild     |  358 --------------------
 dev-java/netbeans-java/ChangeLog                   |    4 +
 dev-java/netbeans-java/Manifest                    |    7 +-
 .../netbeans-java/netbeans-java-7.0_beta2.ebuild   |  306 -----------------
 dev-java/netbeans-javacard/ChangeLog               |    4 +
 dev-java/netbeans-javacard/Manifest                |    4 +-
 .../netbeans-javacard-7.0_beta2.ebuild             |  141 --------
 dev-java/netbeans-javadoc/ChangeLog                |    4 +
 dev-java/netbeans-javadoc/Manifest                 |    4 +-
 .../netbeans-javadoc-7.0_beta2.ebuild              |  158 ---------
 dev-java/netbeans-mobility/ChangeLog               |    4 +
 dev-java/netbeans-mobility/Manifest                |    4 +-
 .../netbeans-mobility-7.0_beta2.ebuild             |  184 ----------
 dev-java/netbeans-nb/ChangeLog                     |    4 +
 dev-java/netbeans-nb/Manifest                      |    4 +-
 dev-java/netbeans-nb/netbeans-nb-7.0_beta2.ebuild  |  149 --------
 dev-java/netbeans-php/ChangeLog                    |    4 +
 dev-java/netbeans-php/Manifest                     |    4 +-
 .../netbeans-php/netbeans-php-7.0_beta2.ebuild     |  119 -------
 dev-java/netbeans-platform/ChangeLog               |    4 +
 dev-java/netbeans-platform/Manifest                |    4 +-
 .../netbeans-platform-7.0_beta2.ebuild             |  122 -------
 dev-java/netbeans-profiler/ChangeLog               |    4 +
 dev-java/netbeans-profiler/Manifest                |    4 +-
 .../netbeans-profiler-7.0_beta2.ebuild             |  113 ------
 dev-java/netbeans-websvccommon/ChangeLog           |    4 +
 dev-java/netbeans-websvccommon/Manifest            |    4 +-
 .../netbeans-websvccommon-7.0_beta2.ebuild         |   94 -----
 dev-util/netbeans/ChangeLog                        |    3 +
 dev-util/netbeans/Manifest                         |    4 +-
 dev-util/netbeans/netbeans-7.0_beta2.ebuild        |  250 --------------
 54 files changed, 89 insertions(+), 3035 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 1308659..e9ccab3 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-apisupport-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-apisupport-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 2b4982d..9736872 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -1,9 +1,7 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-apisupport-7.0_beta2.ebuild 3078 RMD160 36f494c348433c9000e50d3b27f6e7f3ba15680d SHA1 833ecb1b93ff7e73013e1a2bfb163e51eb408838 SHA256 debf591b87941bd61b7d2d95ea1e4be6321378b387f249f582ba3dc0718ae6bb
 EBUILD netbeans-apisupport-7.0_beta2_p20110324.ebuild 3099 RMD160 7e157ec84fb7228210fc4dfe97092e5bcd9cf6d2 SHA1 cb8b29b3bb9f8ddc9ee8a1b29782c3b12f968e48 SHA256 569dbef4b67105ad290a370877cd161a9777209939bf19303f0d9a908ce6e700
 EBUILD netbeans-apisupport-7.0_rc1.ebuild 3074 RMD160 5b093f27dc51fb118f99513a98598a7c03cb4850 SHA1 6546e27439be877c5a6761696ac0bda8f9e2222f SHA256 4dfbe4ecfef8795581918e5be9734b18346a49d0022dc82f318da0bb226d4b1d
-MISC ChangeLog 4640 RMD160 ab92bd90dad0fae99abb6499facc07b55e171efe SHA1 10c7272ae4d0d78d7d96609aa216a233f07339ef SHA256 07c34b0369b9caa00ea612290a0dac91fd8d6161e209dd6a6398cbf11a82202f
+MISC ChangeLog 4761 RMD160 08efc58300b6e97dd386e584c65cb78168022e8b SHA1 e8d60af3a42db71f3a4239af7888b1cea836c4de SHA256 9cb5ef8c42d4b11e6e0db9a2573729027a5772fc3800d57827462a7024c5cb9b
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-7.0_beta2.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-7.0_beta2.ebuild
deleted file mode 100644
index eee3535..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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-7.0-build.xml-r1.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.0-build.xml-r1.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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 425bbdb..9b6e4a2 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-cnd-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-cnd-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 0fc61c2..b03acf7 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -1,13 +1,10 @@
 DIST 1C4FB4BD3508F7A787270A3B65E74FBFC624C2CB-cnd-build-trace-1.0.zip 42779 RMD160 6a84967f604dd70a1736b752874e7ea4c6ad68dd SHA1 1c4fb4bd3508f7a787270a3b65e74fbfc624c2cb SHA256 cbb8548f8e1d177778852dc8d38140c824c38609d7066e155687f730fe9948fe
 DIST 296C195B720404C2683BA2F65E2A423DD0611B8B-open-fortran-parser-0.7.1.2.zip 86627 RMD160 3b9b848a4ebaaac9faa76874626104f4eee81d3a SHA1 296c195b720404c2683ba2f65e2a423dd0611b8b SHA256 de7cf8ce10a3d50eefa5e493953404be7db138007aa9fb53b894e307ea033195
-DIST 3C8F28BB40B1DC5E2BB66C8CEDD9D5958ECBDBB8-cnd-rfs-1.0.zip 298996 RMD160 b54c7db694d60f685d221b78baf8cead2dd03b16 SHA1 3c8f28bb40b1dc5e2bb66c8cedd9d5958ecbdbb8 SHA256 af4edf6045d9ac010345d3a4d3a229391129f2cbc687ab242071b728926b9a79
 DIST 800BD16807CD1A4348AFD0554D920845134E5D55-cnd-rfs-1.0.zip 298998 RMD160 c38362bc45e9c4df26c0aa7da86db9127d45dccb SHA1 800bd16807cd1a4348afd0554d920845134e5d55 SHA256 8d349b4c072cc1a3bc9c6b42de76ac43600335faff6a2ba1c4fc9e593969897d
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-cnd-7.0_beta2.ebuild 4320 RMD160 729e0bcbca3064d30b646f8ba8341f212999cc3a SHA1 3e3d97b9eb370058a542c64dcb8c7bf51ec4e6ca SHA256 89404a2c2c59f7aeea11f5f45688cbd1cc67621b1b9d33256b32689810e4304a
 EBUILD netbeans-cnd-7.0_beta2_p20110324.ebuild 4460 RMD160 fa4c8a8b3ccb2c7f38421c0770da049b2d7b1953 SHA1 462cde53c785b65f5f7ade96a66c35e7c6efe1e2 SHA256 24b0371ddcea683c53abf88b6d4416e2226ca3b62161274b3edcf9cbc940b8af
 EBUILD netbeans-cnd-7.0_rc1.ebuild 4435 RMD160 1b0db82106d883d9f5606ff21577f9d556f2f8f3 SHA1 821286e503c73b75a4767ca4ab3fde77bddab610 SHA256 4f6e9468ed6acf4def207341c80c0cbbcd63deffa752642f35b416608e9ee161
-MISC ChangeLog 4290 RMD160 6395ddefb0823d32f82f289a775b2e7e840e0d01 SHA1 1c92738ec9dc8f262956b18a262faee0617b0dff SHA256 75674a06cab9414bab3a9a6075d00043823596da69ca966115a83b8759831a51
+MISC ChangeLog 4404 RMD160 dcbb14e8ca4f04188fb2f0cd025482fd683862da SHA1 59be283a1ad3863f329f9451f4b529f6cafe9e42 SHA256 87ea3a9143ba0907cff1c7472f53bdc9255767c369f2dd63a81525ae44d02d5e
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-7.0_beta2.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-7.0_beta2.ebuild
deleted file mode 100644
index 7bf73af..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
-	http://hg.netbeans.org/binaries/3C8F28BB40B1DC5E2BB66C8CEDD9D5958ECBDBB8-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/junit-4.4:4
-	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-7.0-build.xml-r1.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/3C8F28BB40B1DC5E2BB66C8CEDD9D5958ECBDBB8-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-7.0-build.xml-r1.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 "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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
-	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-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 0e79021..eeaafbb 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-dlight-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-dlight-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index a6fb1a6..c924aa4 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -2,11 +2,9 @@ DIST 623DE5A3A60FEA313099D7C42256B146E2BEE9B2-h2-1.0.79.jar 1086505 RMD160 93aed
 DIST F1AF5929CD612475CCF186F69E268F0CAAA2A90E-dtracectrl-0.1.zip 8834 RMD160 79b324bcfe0938371089a38eb0468dbb36f0327c SHA1 f1af5929cd612475ccf186f69e268f0caaa2a90e SHA256 af00adae935a995cce5d668fd220cefcbe5e35ef943412109d25106982f2fd56
 DIST F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar 2276020 RMD160 ea3e733fd709c6c6b6776d05d3e3d08a0f00f166 SHA1 f787c9b484cd7526f866c21d8925c4dace467f8a SHA256 fc563bf30d51408ee092a59cc6abe381172040954ab1654061efb8eaf67fd2ba
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-dlight-7.0_beta2.ebuild 3581 RMD160 51994e5d594590ea416531fb0c0716cca1b55378 SHA1 4e784f80d3aee96d36bcb9adc22e40d3b8b7bc95 SHA256 fb9c3a1f1e695feaf7e47b2fb2b7e7ff4cab49f53619aacbb9d295206eed64da
 EBUILD netbeans-dlight-7.0_beta2_p20110324.ebuild 3602 RMD160 e31ff0e52d516ec052806dcef70066fffd1bb56a SHA1 583120b07db4ca28429d7a3f2661fdc02a76ea0a SHA256 49d1e999f64997b79b4de5158f5c607ba58e0449bcf8d5f1213f52558ebbf71a
 EBUILD netbeans-dlight-7.0_rc1.ebuild 3577 RMD160 9f90f63c8c673619df843ed686f80b7ca7956ccf SHA1 f1d157f137639ced2423f166889d0824db525d7f SHA256 2c612de6797596678b5aef6dfee375ecedebcd9eee63feff80dbe36fd6f6abbe
-MISC ChangeLog 4440 RMD160 50abb9d324ec39d94e6fecb1a6da99bb7f3c7327 SHA1 d62e3be3e6ea3a683f685cff044e91b220c07021 SHA256 41cc04ab36bb8082e85ba8fcded63c29c2162249eef6082e685922e265779d79
+MISC ChangeLog 4557 RMD160 29bece9d0c914e3be4a015b89d1dfeddb33014c4 SHA1 a14b0f0e33049223c2c97fe3d513424c5d728264 SHA256 be0bdc5fb36f881fd14f4a4d1d56315af8b37d07a281b3d67e65a897648b3e4d
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-7.0_beta2.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-7.0_beta2.ebuild
deleted file mode 100644
index 47141f1..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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-7.0-build.xml-r1.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar dlight.db.derby/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-7.0-build.xml-r1.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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 44caa11..e7da8b3 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-enterprise-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-enterprise-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index f7f4ce9..7f5f0b8 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -1,14 +1,11 @@
-AUX maven.j2ee.patch 4166 RMD160 e00b1194bdfa44d80a339cb8a38def4b2de96a3a SHA1 5e488d5c5aec9b4bc3f3f87bfb87288553a9a66e SHA256 5b0e94bde7fffe3642bdb1f1d270a6b9c9edd4446095d8cbe2d7839a6288845e
 DIST 123A7BAAE06D938E5E4533ED745EEE7377E73ED8-jersey-spring-1.3-javadoc.jar 55457 RMD160 8376afbec0a8004d5e591f966a2a12157102f15e SHA1 123a7baae06d938e5e4533ed745eee7377e73ed8 SHA256 a66c6f446e5f01e53c9eb7e29bc2092b9627de3e9c964f11b9a6b730d0aa3407
 DIST 16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip 15969889 RMD160 c7178a992d303eb3d6eba70a2bdc27d6d19e20e5 SHA1 16cd40905b389b27afd81daff8f163cec810fbc6 SHA256 d2d6d6fb711334657deb1debe4b546a6bee02a2714c2bab5823ad16477833ba4
 DIST 1A48EDCF8DCFC76882C821931EB0529DB9AF5D9B-spring-webmvc-2.5.6.SEC01.jar 402348 RMD160 86c33d4674abbd9c6af22649da7e800eb3335420 SHA1 1a48edcf8dcfc76882c821931eb0529db9af5d9b SHA256 a432fa403f568e02e39effd52f2fe1672155a1c2c6273535d80aeee61ddd9a11
 DIST 2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar 111719 RMD160 c3db8ce1835efe49fb0a7f432ff88286a945d584 SHA1 2ea8e5bdc70e1b1d738140e52e4793385b2567a3 SHA256 61b1c254f1529632d98a9261e0fd50c77e5c2a1c4c53e43cee65cedb279c7703
 DIST 4855C8481C6951F39DC117C44CA8EE70BF2B003F-oauth-signature-1.3-javadoc.jar 77306 RMD160 0372d69b83cdde74c54795ed134a87f07da7b8a1 SHA1 4855c8481c6951f39dc117c44ca8ee70bf2b003f SHA256 bf7cb3a0e9d2e23e1d1aafeeda524953e318b7e2f2e688bef1c5626db68ac9ef
-DIST 6017380527B332AD174FED03973C8FB8094E3258-primefaces-2.1.jar 2077762 RMD160 15c8fb21286e4a88d9644354487b994a26729205 SHA1 6017380527b332ad174fed03973c8fb8094e3258 SHA256 1c0cfec82059327fdfef1808e84cc40128c59c6bf7d246137fbca6fa685005dc
 DIST 6B90A110E1B1503C4623B13D3BB536212F1BF3DB-jsf-2.0.zip 2306840 RMD160 bf0d1361a4aea635dea89786ee399864798c4d5a SHA1 6b90a110e1b1503c4623b13d3bb536212f1bf3db SHA256 102ace4cf39e29dc075f0d144303c849e95fc010e984b287edcaf8318caf0737
 DIST 6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar 89300 RMD160 68e6b9b7fb63e086ce8e1d2801597c89be63dbb3 SHA1 6e3105315f3100f65d66355b04ba6b6c2b8480d3 SHA256 46f4221448d3b3123e27535094f142c7eabe528e6febbd2573cda3bf11c0660b
 DIST 7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.0.jar 628998 RMD160 83eebfcdc65bae7248338a3f32ac0bc958596b9b SHA1 7763236b189d9b910e2bdba6822e6eb4dddac41b SHA256 d430e44351bdb132e2f37a4361b6950a16b9486c82c4434fb43383c3f8cd46a3
-DIST 7F8D0C26FEADDE01940E39B1D9CD175895A3243E-jsf-2.0.zip 2250612 RMD160 0383ff4c6f3cc2f9bdb289607fc91e88e85211c5 SHA1 7f8d0c26feadde01940e39b1d9cd175895a3243e SHA256 0ed9958cec84d41abfd862b1010665da35deedf474cafd2bf4647634d3778005
 DIST 93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip 1699050 RMD160 d6418501837089078e70ddf864d3b770b134e512 SHA1 93a58e37ba1d014375b1578f3d904736cb2d408f SHA256 ce29ef11b17fe5e36304bca4383af8a4b828902f2da1486509ca909bfb93eab4
 DIST 955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar 373331 RMD160 7982e8784a7168e931f64b70a2178cf0d52bbe16 SHA1 955396db8ce0477c6bd70ba830ff84cb9b7ab47b SHA256 88ac6b76c897fe277d05623f1efd37f717731bb4ff47604a73e3166378d3d6c7
 DIST A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar 742909 RMD160 e4425ed0e7c9e7d879516f3f5581fc32cba89177 SHA1 a27843863a5eae9ddff1c70f7a95d3bfc2a59d99 SHA256 aeefffbfac45880d81da06bf72de77e06ecf2faf5ae24e8b93c3cedd9d2b9543
@@ -31,11 +28,9 @@ DIST F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip 57110 RMD160 a2c0d
 DIST FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip 5025064 RMD160 e8d39c939b6eec86e13cc5fef983cfec6cdcae1e SHA1 fdecfb78184c7d19e7e20130a7d7e88c1df0bdd1 SHA256 7233497b97430016cd84dfcea79907c5c00f44fff09d448070d2b9799aea4592
 DIST FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar 304118 RMD160 99deb07ee4c3d7257a2431830eb4f5889b4f5d6c SHA1 ffe3425e304f0836912d2b8abfb5302100b39423 SHA256 af3fbe42b4993a904673eb4500952093384cc85295ca5a35d1cb2059d41b2153
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-enterprise-7.0_beta2.ebuild 16276 RMD160 8524717a77f369f2422c183dafc680698059469e SHA1 ad696df3377cf8602ea661d4df00cbea2cbc895b SHA256 f3ff233b9b037bf0f19737f8bff274fd8169bf196826e10451f43905b7089b53
 EBUILD netbeans-enterprise-7.0_beta2_p20110324.ebuild 16303 RMD160 db5bd7e9c4c1822a38be74af8440605ef338efcd SHA1 831c988948ead9322db2b728ac307c50c4631f78 SHA256 4d07c504586933f0d1f969a0c9d54421bfbac9ecd39e77e334b887770ac2e0ce
 EBUILD netbeans-enterprise-7.0_rc1.ebuild 16278 RMD160 47683559a7f70adbd5671593ebcd1f6b4c1f4d1a SHA1 b0c65fbe4b327b21b8e1ce105dc03ac1288ae0af SHA256 427329b3934282c1be078add97736c7f800411fdb2ce6047d85a34087d5c4eef
-MISC ChangeLog 5018 RMD160 85ddab15616f5bdfd694510528bb7518ce67e0b0 SHA1 b4b82502720a20f918f7e44d4ca879b76e0da120 SHA256 911366975dc152de5d98edd1159da0cdb57f7a3f6ffdab4c9e330823c25e9c0d
+MISC ChangeLog 5139 RMD160 fb559c2b36e16dca2a388a8b61bbdf03654bdf8a SHA1 64d0795f06e474900f9e4d43f2381b4cf59ab2b0 SHA256 03e97a0c666abf4f3f120998f629407c8fb2d483404fc4522ca443826cb44054
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-7.0_beta2.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-7.0_beta2.ebuild
deleted file mode 100644
index 4ebfd77..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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/7F8D0C26FEADDE01940E39B1D9CD175895A3243E-jsf-2.0.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/6017380527B332AD174FED03973C8FB8094E3258-primefaces-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-7.0-build.xml-r1.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}"/7F8D0C26FEADDE01940E39B1D9CD175895A3243E-jsf-2.0.zip web.jsf20/external/jsf-2.0.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}"/6017380527B332AD174FED03973C8FB8094E3258-primefaces-2.1.jar web.primefaces/external/primefaces-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-7.0-build.xml-r1.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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_0
-	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 3d8b7f9..3532edb 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-ergonomics-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-ergonomics-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 3618c36..ff9b510 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -1,9 +1,7 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-ergonomics-7.0_beta2.ebuild 2828 RMD160 cf495e31f811a0578adc03553c46ac5638275a7f SHA1 3982881bac52616493c243dd5cd85669888b0858 SHA256 dc9165255961758aa8d05304234394ca80512258fede67809ac2d0acac44a4fa
 EBUILD netbeans-ergonomics-7.0_beta2_p20110324.ebuild 2849 RMD160 35ca8f11a070f55c12e98a0e591bd1a34c85d8f5 SHA1 ebd87e1004f8c8f9c15a4b5ebf8c73ca58b19b06 SHA256 dc43731e473ec06e5d98233bdbffd307f698e4c0265a6374b219722cef9c5f20
 EBUILD netbeans-ergonomics-7.0_rc1.ebuild 2824 RMD160 088bacba0982f430cf7159be33337baa6d4d1c07 SHA1 97d2ec538b72e9c55147601326b368600c481977 SHA256 c12d3f7113d0e8536d609615ba0ba498f2b575ee8c91fc5a6f927379b8411c4d
-MISC ChangeLog 4640 RMD160 5a7d2fa8d76d72341d54bd9bd6a3ee1002ce6ce8 SHA1 e498a378c7a4e6d87cba55cec32b31334058e24a SHA256 3aff93aaf3ab9fa680d304482639ae224ec7a5e194fb3f3a7f6d2c20c049fb46
+MISC ChangeLog 4761 RMD160 a90cfa18cfd6a40149a6cb9e9bbc30bcc1a370f9 SHA1 b6a50203258f1dbdc79f9c905bc40aa644f15c67 SHA256 f0a97dcc86839b9e54c4410619ebf5a9534425aac2bbe41a58f5d30f22a090f0
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.0_beta2.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.0_beta2.ebuild
deleted file mode 100644
index 5bda975..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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-7.0-build.xml-r1.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.0-build.xml-r1.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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 e659ae3..2a8189b 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-groovy-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-groovy-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index f9e76f4..dee9e4e 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -1,10 +1,8 @@
 DIST 559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar 4503584 RMD160 0886cf2b601464a436613854925c5be74b86ec83 SHA1 559c961a6ce793fac94c8040253ea1fbd32b668b SHA256 4e1c36766e9af21519c6f6ee1a6ea21cfc020b253c27aa6d12d58f09c78602f9
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-groovy-7.0_beta2.ebuild 3240 RMD160 da270e339c185a58604c933da28716642fe6ba9b SHA1 9341773d4b89f1c4891977f51f6aa596a1c4753b SHA256 8993c8805fa38dc17ddcbfb0df640f18b17aeb7c9231728f62b2529790ffe971
 EBUILD netbeans-groovy-7.0_beta2_p20110324.ebuild 3261 RMD160 d768c6d2fc0d85274dabd177c818ad725f4c407a SHA1 9b6bb2721c0c4beb0dbbdf368a5e3387d190fb24 SHA256 8f9959c199f85b183e1ef9fd7954aa228a0d2b58edea8077aa608077862164fc
 EBUILD netbeans-groovy-7.0_rc1.ebuild 3236 RMD160 eaf9fc3c983a8a813ce1656950bc980c552bcb8f SHA1 9cedb9ca67826971645c2df553bed774a4d2b0bc SHA256 85de54d811f6681ef20c285baab6b491c16a333a42ccda3ae30937443178bf4e
-MISC ChangeLog 4440 RMD160 812b742137ccebf755f3c352bb22f921b4fcc838 SHA1 a40942b85f314c4036b8d4dadcd2574970c0fab0 SHA256 0a10ff92d8020038801d7add6f0be289214c2014efccc5969901ce898207fe36
+MISC ChangeLog 4557 RMD160 200ecd094b0ae86a1d86c4dd113405241626863a SHA1 10aba4a9aa66184b506762cc480a3fc1fd663c37 SHA256 fc12bb4821ab7a9a901dd1ba2f5d71248ce07232b5e20036dceb479d469e908d
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-7.0_beta2.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-7.0_beta2.ebuild
deleted file mode 100644
index a125335..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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-7.0-build.xml-r1.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-7.0-build.xml-r1.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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 8479d14..869893f 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-harness-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-harness-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 317e9a8..0b87f78 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -1,11 +1,9 @@
 DIST 418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar 1695373 RMD160 f668bba808f22b28f6dcb70d5a1d6e98a166da8d SHA1 418fc62c8a6ef5311987b01fe389b1f88efddca2 SHA256 7676709cfadc97da5056cb90f35b57850259444ef97f03905b83bd08e39fa0db
 DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 RMD160 4033e5b1d3508c6bbf43c03476967e665b9cbe79 SHA1 a806d99716c5e9441bfd8b401176fddefc673022 SHA256 18050686d2da634f3612a8100c405eb092dc06d86b8917c6b945d096daf49f94
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-harness-7.0_beta2.ebuild 3523 RMD160 db66de5cbe485de2b7cdf2bdb930aeabb4da33fe SHA1 51e70e0b260f24c68d17d8d2af6cec55f1089884 SHA256 a24428212c6d2cbd852216d50a627bd1bd117e72d08cc2bca8771439c464e1c0
 EBUILD netbeans-harness-7.0_beta2_p20110324.ebuild 3544 RMD160 5a07cecb6e9eb42776f239ff74a715a7e44adaa7 SHA1 7bfb619c3219b4df5059f595bdb113ad0ba0708d SHA256 4696e84de6de52a2f79b6af8fd9867e3afda5f28f49dd904f7413b378c65d34f
 EBUILD netbeans-harness-7.0_rc1.ebuild 3519 RMD160 8b1c363323c27674087852022696621013421d82 SHA1 eef673da39ffa083e11bea72588c40769b69d195 SHA256 1ce168338d6eaeca8fe6e611068bc62844e82aedf576d44a0c6e8fa74c244f8a
-MISC ChangeLog 4490 RMD160 408607d4349b90ee2496ee661bbcec4839b2710e SHA1 343091688a21fe3b1789bc8cd17b428562900a86 SHA256 74a98f0391162a6a550091f147e5e2d56c0098aa12b492db071cb6c49bf494a4
+MISC ChangeLog 4608 RMD160 ded9c21f0587bac4bc6a513b639904a9c98f51ce SHA1 de877a8380218137cbae7b981af731819c69ba52 SHA256 22ff54330606c27efd1e8a6c287bf410a840ef83486718224d1865a882904aa1
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-harness/netbeans-harness-7.0_beta2.ebuild b/dev-java/netbeans-harness/netbeans-harness-7.0_beta2.ebuild
deleted file mode 100644
index 60c6c6e..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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-7.0-build.xml-r1.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-7.0-build.xml-r1.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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 eba8df0..ff7f2cf 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-ide-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-ide-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 3e47de7..67b3a03 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -29,7 +29,6 @@ DIST A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar 124372 RMD160 8cf56
 DIST A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar 190101 RMD160 dde17618bc65f2a180dde956c481bc1b714d28c8 SHA1 a2862b7795ef0e0f0716bec84528fa3b629e479c SHA256 4333ace938017979a402f497f6535aad9784ab726463c6232a79c0246f57c9ed
 DIST AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar 108278 RMD160 f2e20aca47db9fea33c1849ba3c518b0faa1f393 SHA1 ab271cfc19469d9088be306685a7ac8787373f99 SHA256 0d7da46bfa2dd5d4daf2eebb086082915d73e6a1dab9c17885b2b30600a20b53
 DIST B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar 90859 RMD160 cde382392df3dbf58a2c9dcac4b85e8c06b67f31 SHA1 b0d0fcbac68826d2afa3c7c89fc4d57b95a000c3 SHA256 b3b421fd586c67e0c7f04b879ad527a8a295de222392ded6e68c62b9af669d11
-DIST B5A42F83FEBBB9781C7F2CAA6DC59D37AF09B8E8-jsstubs.zip 164680 RMD160 dad0eeb528784e019b785f2adb701be805c198ba SHA1 b5a42f83febbb9781c7f2caa6dc59d37af09b8e8 SHA256 b5a4454ec373fc969fdf5f4bf3c463a3dbecdac2feb8799413866c11d9a9d57a
 DIST BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar 104172 RMD160 70595eb5dd26ecf5e506fd08bec91584a5c774d5 SHA1 bcf23b1d858c6f69d67c851d497984d25345d0b1 SHA256 34c022696b577e984d42641428e6e49a8afa0257c4ec96feff36e4b67c093390
 DIST C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar 625400 RMD160 0d0a0a7fb80b85503ce85dee4ac302e804e7a6ed SHA1 c0c5653d2200f2bd2e834b26dfdbc830d07fa0f4 SHA256 7f71ade91cb8e0c503ac334a1b76143d94a266f87cf1621991ec9b133f90f2bd
 DIST C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip 348661 RMD160 0c0618080d909af181cca9f5b7e3632b9bacd6c1 SHA1 c56f4f5c42102a67f56eb8f12d0219e92e5307c2 SHA256 3db0a5869f40fe897b05ff7f9bd6889a25a4390584c6ab9ad58d00417c862155
@@ -39,16 +38,13 @@ DIST CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar 406767 RM
 DIST D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar 290305 RMD160 1e037445f71376846e05f67ffb1de369c92d729f SHA1 d528b44ae7593d2275927396bf930b28078c5220 SHA256 5a66f5d12058cdaddf6f945b419c3b2f7fcddbd5e6d3a933ccbebaad569452c7
 DIST DF522A06BF4EFD99A12C545C294D940CF6A2E01D-org.eclipse.mylyn.tasks.core_3.3.1.jar 342835 RMD160 9d6245681d6c385bfcd7e19cbce3462f07939c25 SHA1 df522a06bf4efd99a12c545c294d940cf6a2e01d SHA256 a207e1469504969340ded4c6ca02d24624c05148e08f1ddd9b0ebf8311532cd1
 DIST E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar 33750 RMD160 b15263587fbb04bb24f5a88a103c9b74991d1dac SHA1 e66876eb5f33aa0e57f035f1aadd8c44feae7fcb SHA256 06a523b6db1cbc3ef5fa61d13a425e884b526887b8ab9a9be9d3ae53e1df9a91
-DIST EE337176CFEC21CF191C12BA7B02C8E08F297FEE-js-domstubs.zip 313956 RMD160 3c0beacb5b186d20ac3d44e9c70263b641b7e4e5 SHA1 ee337176cfec21cf191c12ba7b02c8e08f297fee SHA256 de50cdc8bcb83f6328f251cbd31704d2cb9bd74ce6f4596067c66e5dffcadb12
 DIST F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar 980264 RMD160 4389b34490128fe64c5403c277796d04471b6014 SHA1 f02664a059617d060bec3eba0bc002b2102aeb84 SHA256 c11e41f2ab089113949870b570298d5873aad61d7112ff19a0e116b95150f4ff
 DIST F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip 459564 RMD160 a8e3257537d008a213da0f7307a096bd65cbc7a0 SHA1 f90e3da5259db07f36e6987efded647a5231de76 SHA256 bc323866c2341105db83621fdaedf14a0076fcbecfe6ebd8361726e76a6fb3d7
 DIST FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar 182065 RMD160 424c76e973ea39aba3851f556e046643ca8d335d SHA1 facc6d84b0b0a650b1d44fed941e9add9f326862 SHA256 171034ff98f1c480bc84029f7a0f5fc57a25adeaf691112a5a251345b81fc5ce
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-ide-7.0_beta2.ebuild 22354 RMD160 cec1f88a9e8335f3744cfdf909b7decac023a0fd SHA1 dba21500976474abc2d504838b4c3095a5be14ed SHA256 eee176d62ba094a3442fce9cd773ab578f6a1e2f4b0b821ffb4d58c2d3fd9d31
 EBUILD netbeans-ide-7.0_beta2_p20110324.ebuild 22257 RMD160 c1e894c58f50c16276224fe29249faf0b0cd89ce SHA1 c131affe0fbdeeac4727c8369f75c354a12efe0a SHA256 94053bf8932895f93867fa0fab9e1ec9210ff682c53a4d4e7e25722e51578c47
 EBUILD netbeans-ide-7.0_rc1.ebuild 22232 RMD160 b36da42abe68a30a36ad0af8ea9e73f971341057 SHA1 c2d7554e94e8de7f0cd9367723bb2b7b597ffdb5 SHA256 4b92026715e490725ba34d6e1d210fc46eab8aa58774d941ef7066ffe71d3d5a
-MISC ChangeLog 4441 RMD160 b928c60060f08786fa6d27c0ebae8f0b13e52038 SHA1 8485643239509b0c646bf0994c5de8a093b79faf SHA256 5e29c6575b46ceda252adecd924e05dac80c66386f78eefaaac9c5fdedafbfc8
+MISC ChangeLog 4555 RMD160 cc64f4a553971982b014d7dec7450e66eb83cd14 SHA1 784f3c695e56b39f00f056c0eb77c6f78fa6b648 SHA256 0c0b6783cafdda03328f5705f8955c44c5e220ed6ef390a50ba8277ec11f2757
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ide/netbeans-ide-7.0_beta2.ebuild b/dev-java/netbeans-ide/netbeans-ide-7.0_beta2.ebuild
deleted file mode 100644
index fc02190..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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/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/EE337176CFEC21CF191C12BA7B02C8E08F297FEE-js-domstubs.zip
-	http://hg.netbeans.org/binaries/B5A42F83FEBBB9781C7F2CAA6DC59D37AF09B8E8-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
-	>=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.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-7.0-build.xml-r1.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}"/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}"/EE337176CFEC21CF191C12BA7B02C8E08F297FEE-js-domstubs.zip javascript.editing/external/js-domstubs.zip || die
-	ln -s "${DISTDIR}"/B5A42F83FEBBB9781C7F2CAA6DC59D37AF09B8E8-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-7.0-build.xml-r1.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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.43.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.8.2.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 --virtual --into servletapi/external 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.43.jar && dosym /usr/share/jsch//lib/jsch.jar ${instdir}/jsch-0.1.43.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 28f8ea6..2a61d44 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-java-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-java-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index dd9bd60..09203d5 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -7,14 +7,11 @@ DIST 39E868B62080080DC349253E6050DF4B6ABAAE60-indexer-core-4.0.0.jar 211713 RMD1
 DIST 3AF24D401F76D153B77641865737DE53E41E60D6-indexer-artifact-4.0.0.jar 26720 RMD160 21715cceaad884c9ec3e38b5e440ab1c33fd6914 SHA1 3af24d401f76d153b77641865737de53e41e60d6 SHA256 ec1cf79857e57e9ba986389e9b1e404c35316e08be9a88b90224d3df04c0781a
 DIST 3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar 126856 RMD160 edc878d500477c53aad1ad637ca2dc35b701cd2d SHA1 3bca561b1b7b284b3d3c097f92a9cd47ff485058 SHA256 28a500f9150a9b7ce76179d0ec13a7227032c4997d226e5685550ae2c2e54393
 DIST 4721463A87B9DBD165254C73E64D824AD748DA18-javac-impl-nb-7.0-b07.jar 1671799 RMD160 4e50163b0d8685922fe05123343f1147be8141f9 SHA1 4721463a87b9dbd165254c73e64d824ad748da18 SHA256 bb5cc2eb396b391499e5016ccd3dbeac6da286a86c05a9b30f672fd22d4a3d93
-DIST 4F9C9E8D39630B3B285C72C8A88820A220898B7D-apache-maven-3.0.2-bin.zip 2990019 RMD160 d64045fb5d1fbc0ef41cf1803cfd850eadbd33a4 SHA1 4f9c9e8d39630b3b285c72c8a88820a220898b7d SHA256 530697c0a8d3461ae73f150bb7d56a21cb236fc67d80c0d41dea3052e3c7a0be
-DIST 52AB33F791EF41D3B1B3AAA6130D8ACEA1B554D0-javac-impl-nb-7.0-b07.jar 1700700 RMD160 b91c9e19d91ba1449e2e6b4f9b7d71c3787f30da SHA1 52ab33f791ef41d3b1b3aaa6130d8acea1b554d0 SHA256 6ce0af28d06ae0431bc3dab18588b02235d955f26235736bbeb6a5780e9891ed
 DIST 59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar 2286677 RMD160 7f14647470dadbde4ecb7b1f4278fd4d2e2a5ad4 SHA1 59fad2a4d4a1cfeced8149854eeec3a7b9668927 SHA256 763aeee3fceaed696f61bf14f922ea9c6abaa0af2afce2ec586efec32e677074
 DIST 653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar 34559 RMD160 2f9b657dfb6eb672ee33811df3183bba84d8ef59 SHA1 653a6ad1ef786bc577fc20f56e5f2b1d30423805 SHA256 dbb8c53ccc0b16a9dd8370d6e7de63102468caedac1e5fa2eb418319a6875293
 DIST 8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar 6383304 RMD160 f0cfb0a017dfafaf6f17b1475aa3c7e01417e2c6 SHA1 8c9bffbcb34db6e9c9c03413623f05375d44ce49 SHA256 b2e19c48066648bb30f7e1763d3049c1537b4816bb385e3dd47157bc11077963
 DIST 8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip 266314 RMD160 feca5ad347e36ccf532bcc7fc21a67a5ec115699 SHA1 8ecd169e9e308c258287e4f28b03b6d6f1e55f47 SHA256 36c3189a2d495bc713bfeac0eaf05612fe90d8df6c3c20d943bea38d290cd375
 DIST 907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar 2284306 RMD160 ee5935c7e43a60a453bef9bebe7068c20f481a25 SHA1 907363e301e2279930c82beb466bf2053c6e993b SHA256 4284a90a28993a18379c5b682eb63a77e6eb2911b5c1f2a60aace19b4938c91b
-DIST 996E701582423D2BD7AC331AA6CDF5084821BDE0-javac-api-nb-7.0-b07.jar 128839 RMD160 fa4185260cf1b2ad013df6399bbc8394de7fa352 SHA1 996e701582423d2bd7ac331aa6cdf5084821bde0 SHA256 a183fc8cf19552d5bef7a7974266488664d7e7e484f85ecd5adf1793699c367e
 DIST A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip 3076808 RMD160 5c05105359edcd9f603ce6cca7af6e755be83ca3 SHA1 a511890049a6a9b8d675f4417721337580cbd2f9 SHA256 39d928daced5072063fa3b9da3b6826ea2f52c4aa9082109eff9847fc1a442f1
 DIST B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip 301845 RMD160 170bbc400e7001567a6f0aec9394c04ab6f1ec37 SHA1 b456600d274b835e1e7ddb16fd843ddab2ed3ef1 SHA256 0667f86903d97f78ec1022ef1f31a173990bf69b3f882f95e11ea2bf968ec7d0
 DIST C537EAEE0EB142BB8F7AB6AFF340D79913997DD9-indexer-core-4.0.0.MINDEXER-12+MINDEXER-13.jar 211897 RMD160 b470616abd8cf91c694aff1c71cfe50ed6a8a570 SHA1 c537eaee0eb142bb8f7ab6aff340d79913997dd9 SHA256 8845a4582ded27cb07c0a52e00d6888a6f250e33d56dcd0dc0c2728757f57ced
@@ -23,11 +20,9 @@ DIST D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip
 DIST F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip 930828 RMD160 7034dd5c48bcf6e44a1de417206f799c942b9f11 SHA1 f7bd95641780c2aae8cb9bed1686441a1ce5e749 SHA256 5f41fe1ef8a7607bafbc04baa7814aecaf72b90a6fa796adec0846f50f8ac7f0
 DIST FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip 2141252 RMD160 97e4e22e7d9a1c9731bac89252399a560d9c3dbf SHA1 ff23dbb427d09aaec3998b50d740c42b6a3fcd61 SHA256 4dea45582ff69620a906347fc1b085bb1cffb75e215cb55ec74181ae240a5be4
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-java-7.0_beta2.ebuild 14942 RMD160 1b54dd65bf6247e73720ec59c4adef6fcf2f7dca SHA1 3c7f783b66de9e9e8af32a40c09e2429a0e411a0 SHA256 d69adf7afc9c573654c920e1cef61f4c56e2a60f113a5050c94846434e17514f
 EBUILD netbeans-java-7.0_beta2_p20110324.ebuild 14845 RMD160 37db4dcc14bf6b223e475423ddd75b5ba61639e4 SHA1 f762f93cdfce54a79e39f0f1ee3ed8a8f857891a SHA256 566448277b2d3220ca65b6d513db6a4c71b77f46e3ead463ca9f8b822d27ef49
 EBUILD netbeans-java-7.0_rc1.ebuild 14892 RMD160 48ff8722ce1465adf9d2b95e924ec121036e8a3c SHA1 46b4299f50844acd593dce78f5d128c426c2493e SHA256 a9b9ef10266ba0129b0c78959ef41c7278369ac8b603900f4a1787403364edb5
-MISC ChangeLog 4622 RMD160 c910bd1896fd26434387ea0772905475d0051e6d SHA1 975d495f0f7ca87690847e9ae9fb6c459ac972f6 SHA256 9f1c2d73b6b5800dabeea160d44bd520c8cc9d206fd44b2ae6469260a481bb65
+MISC ChangeLog 4737 RMD160 80acd820c46a3385ffd367a8d9f56c1ded6c00ae SHA1 64c3fc7c5b6cb70013dfbdfbd3f27414b991987a SHA256 a16ddd8df206a3d51e94e197a3a16d57e827b50f8e52a28997febc5f5000353e
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-java/netbeans-java-7.0_beta2.ebuild b/dev-java/netbeans-java/netbeans-java-7.0_beta2.ebuild
deleted file mode 100644
index f969a7a..0000000
--- a/dev-java/netbeans-java/netbeans-java-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
-	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
-	http://hg.netbeans.org/binaries/4F9C9E8D39630B3B285C72C8A88820A220898B7D-apache-maven-3.0.2-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/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar
-	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar
-	http://hg.netbeans.org/binaries/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.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/3AF24D401F76D153B77641865737DE53E41E60D6-indexer-artifact-4.0.0.jar
-	http://hg.netbeans.org/binaries/39E868B62080080DC349253E6050DF4B6ABAAE60-indexer-core-4.0.0.jar
-	http://hg.netbeans.org/binaries/996E701582423D2BD7AC331AA6CDF5084821BDE0-javac-api-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/52AB33F791EF41D3B1B3AAA6130D8ACEA1B554D0-javac-impl-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.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/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
-	>=dev-java/junit-4.4:4"
-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
-	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-7.0-build.xml-r1.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}"/4F9C9E8D39630B3B285C72C8A88820A220898B7D-apache-maven-3.0.2-bin.zip maven.embedder/external/apache-maven-3.0.2-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}"/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar j2ee.eclipselink/external/eclipselink-2.2.0.jar || die
-	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar j2ee.eclipselink/external/eclipselink-javax.persistence-2.0.jar || die
-	ln -s "${DISTDIR}"/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.2.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}"/3AF24D401F76D153B77641865737DE53E41E60D6-indexer-artifact-4.0.0.jar maven.indexer/external/indexer-artifact-4.0.0.jar || die
-	ln -s "${DISTDIR}"/39E868B62080080DC349253E6050DF4B6ABAAE60-indexer-core-4.0.0.jar maven.indexer/external/indexer-core-4.0.0.jar || die
-	ln -s "${DISTDIR}"/996E701582423D2BD7AC331AA6CDF5084821BDE0-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/52AB33F791EF41D3B1B3AAA6130D8ACEA1B554D0-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.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}"/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-7.0-build.xml-r1.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 "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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 --build-only --into libs.junit4/external junit-4 junit.jar junit-4.8.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-3.1.0.jar
-	# indexer-core-3.1.0.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 35c5201..e69107e 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-javacard-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-javacard-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index bfc2dfe..faa85ad 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -2,11 +2,9 @@ DIST 33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar 60835 RMD160 992f7e7d
 DIST 6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip 7788619 RMD160 b85beeff50cc5acebdb57599a435e582efed2b90 SHA1 6243337e93f5841d4ffb404011aa076bfeb1590a SHA256 86c9576a56b9f994be663224b0505c1f61f8945d401bec63c70dd78c74fb91fe
 DIST 9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar 125083 RMD160 e7ad1dd08f29db894e5af4a6fb5455226be36530 SHA1 9c1a8bc9d3270d184f1d1bcc5f60aa81d46e1adf SHA256 d2379466134f239b9dd723f021976e3d2ade9624296d3d4a6d3241beeecfc6ba
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-javacard-7.0_beta2.ebuild 4905 RMD160 f08908ce0a5c83fb1f20dc970b50709ebc756004 SHA1 7f2ae7e6b8361ebe68e03e939b2f41e202a6e02d SHA256 c69f9af7d2e3e0adcd48a806080d803f6e55120a4f63a8fc204a8038c9ce7c31
 EBUILD netbeans-javacard-7.0_beta2_p20110324.ebuild 4926 RMD160 da7f2e01f93c4f200774a0cd06e0825770e6dae7 SHA1 79af843131d846c131b053febed3581238233c51 SHA256 f2829a4831ad100409ad4b8c7ea6b4a78d22191af1a58afa8e702dfb6383c802
 EBUILD netbeans-javacard-7.0_rc1.ebuild 4901 RMD160 b1bdf06a0e068dcda740f5bb548689b60b015b87 SHA1 d2e78bd998c79534a8f06002ca012745cd9fac0a SHA256 ec4f96df48ed370a7610179517b8b14b9d254b9e773435d7b2961bfa07c33d75
-MISC ChangeLog 4540 RMD160 5e876105f95f87dcd63bb1f2d27274b0dd47d71e SHA1 5082b7bf421cc183f461a5f56c7a146fdf1d8db6 SHA256 bed7fdc66aef92ac623901a1b8a916e27504243d084b29cd81c0a8928c5a6ef4
+MISC ChangeLog 4659 RMD160 63e41db67ba87507d3dfbf11e51d8a149d6e703f SHA1 fc9d6973f9b23e16257ce555f4044e7519da3578 SHA256 fcbf4d12f4a2a69e28c61b1cc2415a4e0f3f9b5bc379e25820b5f27b4961ad86
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-7.0_beta2.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-7.0_beta2.ebuild
deleted file mode 100644
index 57921dc..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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-7.0-build.xml-r1.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-7.0-build.xml-r1.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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 6f2c7bb..ddbb43f 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-javadoc-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-javadoc-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 3ee7d9f..aa5cdb9 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -1,10 +1,8 @@
 DIST FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip 2141252 RMD160 97e4e22e7d9a1c9731bac89252399a560d9c3dbf SHA1 ff23dbb427d09aaec3998b50d740c42b6a3fcd61 SHA256 4dea45582ff69620a906347fc1b085bb1cffb75e215cb55ec74181ae240a5be4
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-javadoc-7.0_beta2.ebuild 5709 RMD160 2162d90140d615e24b7e30ce2d72259bc5bb2889 SHA1 6a281b99732f5ff1b97609f964da3dc55d14ad7c SHA256 bf2375f1b8496a54b2bc6ab727274e71168f8b771b3db02d9819b3a4095776b4
 EBUILD netbeans-javadoc-7.0_beta2_p20110324.ebuild 5730 RMD160 5462bdea69c85b7480b4576e5dbc5622549565f5 SHA1 5e1a8478d81877f3edc732103538e9fa905273d2 SHA256 42d3d5dab49bb7718fc41f8d3c3a3814f1a138212a8a3ece6a06ebd273807256
 EBUILD netbeans-javadoc-7.0_rc1.ebuild 5705 RMD160 0a75c2853fc01566a0f29b9efabca4c176cd7bb8 SHA1 2cdcb22ce19bdc4be6bc6484f4bc7e0586276e39 SHA256 025b2515a16e033937400e1a4f3f31c401e916413975bf500a0afb57794be3d9
-MISC ChangeLog 4269 RMD160 d4c5f70f465d04b7d302987c3be912c746122f88 SHA1 2ba9ed15f1fb50a92b45a0cbbc16ad509eff35ac SHA256 717d9bb38f661dc1db51d3a966f56963a98a4de225190fe0453cf1ba4a450c47
+MISC ChangeLog 4387 RMD160 efc8921cc11a09db73914af5e6d35003652ae93e SHA1 5a52693f8a5f295d2cb508e509aff4a3b1a7b522 SHA256 f726c0ee18eaa401a6a1dc499d546daf61353aeabb12258c487ab510c3d27d82
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-7.0_beta2.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-7.0_beta2.ebuild
deleted file mode 100644
index 33bd3ff..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-7.0_beta2.ebuild
+++ /dev/null
@@ -1,158 +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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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/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-7.0-build.xml-r1.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-7.0-build.xml-r1.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
-	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.apisupport.built
-
-	ln -s /usr/share/netbeans-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 380d1b5..e9b6ef2 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-mobility-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-mobility-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 8920028..1c1c7ad 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -7,11 +7,9 @@ DIST CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar 4
 DIST D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar 172713 RMD160 1214a5f9e3439af251a5c8be6493c2bc862a7ab7 SHA1 d1b5ba3bfe8dcfaf08a0468f8879ef1d0e998038 SHA256 1924535a4a240581e5d6ccc38b95aefc168ca92e70198edb46bac67fba996242
 DIST D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar 18043 RMD160 856f168f2cb3996ba7769eb543cc4995985aef2b SHA1 d76b8334dcbdbe93297aa5c02b17d9a856e72246 SHA256 f12eb81605e0d6f5c52515545cc6899baac1fc5f6ed069408a5eb5ede8a88c88
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-mobility-7.0_beta2.ebuild 8599 RMD160 7ff9b8c8253221cad7975849bb42fbe2d317700a SHA1 6da37c2611276de40503887bfebf1c517292d6a8 SHA256 4d54c94a69e9b4329c840e8c4d2335f4b9f396cf3fbff6ee2e9b02c551b1dfa3
 EBUILD netbeans-mobility-7.0_beta2_p20110324.ebuild 8620 RMD160 6fae777e8a18db7cbc992ffc120539fbc52fc7b8 SHA1 3b5a925f8e4529abf41268fd54b6f84f13ddfdee SHA256 74b9d94c391ac2fd21d95207956af9de8525f61c6931c1231e6a8cefac5a9b47
 EBUILD netbeans-mobility-7.0_rc1.ebuild 8595 RMD160 6310d982b7a958b4113f09e80e6e5dcf02bf70ea SHA1 ed3c9896ebc8a66800b493eb8c34e28d8d860de1 SHA256 5b6b2c94294510164fb4a8daa4a184da517698e67852d63835455768b1b24310
-MISC ChangeLog 4681 RMD160 5225228ff09ff5676ddaf8770a311330df67745a SHA1 4558272714bf580d3329b974aa2a969ec370fb1b SHA256 f240bd461fc55f72fc06a481a86fc4c4f4ca5b1d009b9045e413af6ed84ff70d
+MISC ChangeLog 4800 RMD160 a21681a15c460f8f4282049b1a97264093bdd609 SHA1 f6ae8aedf2929d6777427a8f4aea1b17e168804e SHA256 59090ffaa5a0d1125880e2da409b3bac63d9680675b8cf917274b5c2c4929980
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-7.0_beta2.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-7.0_beta2.ebuild
deleted file mode 100644
index 0cf3842..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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-7.0-build.xml-r1.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-7.0-build.xml-r1.patch
-	sed -i "/release\.external.*nbactivesync\.dll/d" o.n.mobility.lib.activesync/nbproject/project.properties || die
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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 2575506..2d3dc2d 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-nb-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-nb-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 1d7cf56..b48343f 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -1,11 +1,9 @@
 AUX 7.0/keychain-support.patch 872 RMD160 8063d4dc226f04c6fda72fd9b8837757eb3f3276 SHA1 fd22c305e56cde92cb943cf3bca975ebde7781c4 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6
 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-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-nb-7.0_beta2.ebuild 5046 RMD160 9acfc86ea82d200a7588c1741351c1a50b954ca0 SHA1 6272f02b09f3835244d440d823ea3a9371a221f6 SHA256 f8f2283a04b3e494a692a5ac007c811bca3ed177d3e2279d07a2b594279b02b0
 EBUILD netbeans-nb-7.0_beta2_p20110324.ebuild 5067 RMD160 e63ac9b11974aa60073322ddd00eda49fff1bbce SHA1 550289fccf77133b29cfd31c091cd57ab9375d6e SHA256 de8c7769dbb0bf56f56de74a10ba6cd10a614afc771f7a76a9f6d63aed5a8578
 EBUILD netbeans-nb-7.0_rc1.ebuild 5042 RMD160 6011ca3da5e64352a605c4863dd837772752b5a2 SHA1 5e27c7d1a37ba77a12abdb27c471b852ddb06595 SHA256 471acd4fa770d38b38dd9c44386450099b2201b44ad47c6afb79337ab8df9656
-MISC ChangeLog 4404 RMD160 76e6039ac38ad5455a20971a7fee7cf58cd472c6 SHA1 79e38ad741169ec374ba573d990743ac9676b6d9 SHA256 e42e10fddf50e4594261a6f625bba66f1a6b20aa63d1425df77825631f86c021
+MISC ChangeLog 4517 RMD160 eb581dcba296abf0ca5b2669c538fd06831367fb SHA1 6ad376fc9fa697283ba9aca15351bd7c1fc59699 SHA256 f9ed73c951a19afefd86339e820bbb063f88f8bf3ac646067516a170ce59af9d
 MISC metadata.xml 396 RMD160 80c4086b305af8d5e4adae8a263111590f183c05 SHA1 11224a41781dde9ebd92c32e5c0a9d1921b628cb SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49

diff --git a/dev-java/netbeans-nb/netbeans-nb-7.0_beta2.ebuild b/dev-java/netbeans-nb/netbeans-nb-7.0_beta2.ebuild
deleted file mode 100644
index bd57ba9..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}.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-7.0-build.xml-r1.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.0-build.xml-r1.patch
-	use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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 ceb23b4..8f31ee1 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-php-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-php-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 2b5d40e..7dce1ca 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -3,11 +3,9 @@ DIST 0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip 38814 RMD160 cc87af
 DIST 40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.zip 4792 RMD160 95079efbed4e4fa3bb4c363e54b8410f934424b0 SHA1 40bc40a6e6dbd598900e8fab87e460fcc601275c SHA256 2cfd49c1dd77a5aa99dd4689aa2becffdfca5fc4af16f3cdf613aedbc868ea13
 DIST C3E8FC2F69123F598F29F930DC39F5B55A08824C-phpsigfiles.zip 421035 RMD160 8a739c44280b1f239a1ef645ca2a8d43d1cc4ad8 SHA1 c3e8fc2f69123f598f29f930dc39f5b55a08824c SHA256 0622147048e07b8ca59c2674d28327880264d05b775964d032e91f5101f7abd4
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-php-7.0_beta2.ebuild 4095 RMD160 c60dc31eb3f5c96c0416c8aef81418bee7d11fc8 SHA1 3cea87f209d7378e5cb9e9c04557a2da67cd0f50 SHA256 3fc0c3273b71dc826336c475893eceb9bc407192c982a37b4ec4a93b9ff13df7
 EBUILD netbeans-php-7.0_beta2_p20110324.ebuild 4116 RMD160 4ddbf166d07842df91c6c5c125fefbcfced24c2c SHA1 156dad5b2d360d4e3365be18f9bd1c9f55178fff SHA256 dd4c3c1593247e81def4fed04455bdba06d8fcea4bb2626ab8fd6b3893e4d1c4
 EBUILD netbeans-php-7.0_rc1.ebuild 4091 RMD160 ea86e930ab84534983aa945ec9da09023ef691e3 SHA1 4a13563b367381e98b2355c1c4af349bf7246491 SHA256 c0e0ca0a57fb10e0ea81b6dd83e20671b49f1eaf9d57b7a278cb878b33374667
-MISC ChangeLog 4290 RMD160 cd96c5849e38701e24079f4ef60236389855c71b SHA1 bb39a4ea37094871bfebde6e1482c19c22cefa2d SHA256 b9bca79e27f1396a0c8626c5722ef1d2e022e4e75ffaae0d112fd22dba650e51
+MISC ChangeLog 4404 RMD160 aff7f56c63c45ddc6d63cf4dbdcf2aeee24d02b1 SHA1 8b4341cd3d94752e9d07b820a3a67f78e70c7de5 SHA256 d8790833b2f834da0249c580cf4c80663d871d496b8f81119f0b100bfd25c7c5
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-php/netbeans-php-7.0_beta2.ebuild b/dev-java/netbeans-php/netbeans-php-7.0_beta2.ebuild
deleted file mode 100644
index 085be91..0000000
--- a/dev-java/netbeans-php/netbeans-php-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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-7.0-build.xml-r1.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-7.0-build.xml-r1.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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 97720d6..3cac0c3 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-platform-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-platform-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 95d7743..97f1bf3 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -4,11 +4,9 @@ DIST 972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar 234898 RMD160 fb
 DIST 986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar 101276 RMD160 887f80145dde360aa24df4cd9ac8cff16c95e5da SHA1 986195a7e31034ee73f7a896a36b24169692f142 SHA256 f352484ea4d982793637f9c6978ebb283b2b026ec4c5add78b776084f420b8d8
 DIST BD5615C6A15497B60A0AAA9A04D4F05E2BC42D07-felix-main-2.0.2.jar 23434 RMD160 83c333240433200ff319157d89ea88e1774c1061 SHA1 bd5615c6a15497b60a0aaa9a04d4f05e2bc42d07 SHA256 73bb137228039e9aef458d1ee6272f3c0adcac2d0565d3ad307c60c941d33abf
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-platform-7.0_beta2.ebuild 4839 RMD160 04819704d57ebd2a847fc4de7b6433f8486bce40 SHA1 c30679dc8c1cfc941997184a8a0bcf33e77637f7 SHA256 557e88eb1cc8b9388f8759ddc40e868f9687a447a7847262d7e677b50c34ba01
 EBUILD netbeans-platform-7.0_beta2_p20110324.ebuild 4860 RMD160 0ce94b11d482f3f2a36a7b6b8cce20499968ae0f SHA1 3ed40227b0225daf0a1e6251ced7831b0a4d2eac SHA256 d52a3d18d4c3086a19b47d31cf76450aea786f3fbaa04464b33c753b680d51c7
 EBUILD netbeans-platform-7.0_rc1.ebuild 4835 RMD160 ea1bbe2b2bb992cfee479ef47f06ed250159be08 SHA1 82be94abdf61ca76b160ec041a2256f0041e9810 SHA256 a777764ea7f4001e11dbbb39034cc9a7a030e6870fb3b58a5367a924ba8327a8
-MISC ChangeLog 4819 RMD160 cff108da30fbe0fd2fad12f54640c89c08c49347 SHA1 d6c480095658b9ac00fd78ae9df3fa0c52813fd3 SHA256 208d52abfda2e11cc388832be5e8ba965283d18f8510fe725d5061f653fd9b71
+MISC ChangeLog 4938 RMD160 99f96d3380ca0f3ab8d9694b74956d6a3cf1f120 SHA1 2867f4f78e557bf30ee148d6670cd7ea974e9ca9 SHA256 0c4382f6443bc90706e89b9796d12c3736b6517a2eed3797ea4a0cd916e0fc53
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-platform/netbeans-platform-7.0_beta2.ebuild b/dev-java/netbeans-platform/netbeans-platform-7.0_beta2.ebuild
deleted file mode 100644
index dc051c4..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.0-build.xml-r1.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-7.0-build.xml-r1.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 "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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 3a595de..837a0ff 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-profiler-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-profiler-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index dadf931..ba90177 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -1,9 +1,7 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-profiler-7.0_beta2.ebuild 3057 RMD160 83eb784050cb713df31acf96b81704a89b367bdb SHA1 8fd0afb291d43a42f728894e5ee62c4327b08fe3 SHA256 cd2ad5af4dd64c1e81517d9b46fff640d0b369794958ed0778af7c5d433b8323
 EBUILD netbeans-profiler-7.0_beta2_p20110324.ebuild 3078 RMD160 baf63749072625a7e03191f4f9f33688a34532ae SHA1 d6d58240bb39b80ecfde0249699b48a94beae2a1 SHA256 097eb78e3dee2bd59a6d1ee6522af4c5fb793fdd396290230e4e0a0961074d7d
 EBUILD netbeans-profiler-7.0_rc1.ebuild 3053 RMD160 865a8250abe4d4370711a5b1c5f1d54c80f948c6 SHA1 cb5d15e41f4d7ab0d240ee40feaebdda1a801862 SHA256 6f7011e6e097ab6155110be41eff91edcecdfbe3419f140ab8f751644959ea68
-MISC ChangeLog 4540 RMD160 bbd6d1fdebcab9c02e2677e9be4d1632cef0bbf1 SHA1 6c17781df35383b581b17fae47184424d79e746b SHA256 e55b4f292004727d629011716cfe98c9efa819ef7965c1c8621c506d8b48283d
+MISC ChangeLog 4659 RMD160 6cf0b775916a45b5a3417cc3d3bf91ba1cff3f9d SHA1 6cc72acd68b14ca1fe6322820af68a9a73a3f9af SHA256 668f06ce52acbcc0f1b94d7ccd800d77b5e7f2f1d907c7306c38be70a19d0e22
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-7.0_beta2.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-7.0_beta2.ebuild
deleted file mode 100644
index e9319ce..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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-7.0-build.xml-r1.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.0-build.xml-r1.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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 a729719..22f006c 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: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-websvccommon-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-websvccommon-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index f137e87..2387569 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -1,9 +1,7 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-websvccommon-7.0_beta2.ebuild 2636 RMD160 f2d94622f3bb5fb5c8fb2fc485013641bbdffeba SHA1 cc361cd25758849e3a874d52880e543e54084b46 SHA256 4f7f81f52c69547e3864a1019fe519abeefadeb6a4d0e0357b16bf4b5009875c
 EBUILD netbeans-websvccommon-7.0_beta2_p20110324.ebuild 2657 RMD160 a0dd96c9a5faf8e4e404dd7306dbd048e7019216 SHA1 37f14660da8ccaf3b90d7c8c27025520a39f9fac SHA256 6712db6cf3dc438eea48e9b30c143c72a16858a7ccd671df8c81f7257b175c41
 EBUILD netbeans-websvccommon-7.0_rc1.ebuild 2632 RMD160 fc8458befa0451e4916bc3c970a79acfee20a9b3 SHA1 f116ef1845aa63a37085538bfc518d1bb912c6e0 SHA256 7774ef3afbe38b3ff2e03f2c19832db0e283500eab5a158fe0e1268f931116fb
-MISC ChangeLog 4740 RMD160 618967b58f566b02c9c7047fa7ec650bf25024ad SHA1 ce4f966f3bf35d676a95aa3429c08186cc01b496 SHA256 0943e80b17a0f8fbcb657700a3ef156f294a98e09ef33c74c1769400b077a6ff
+MISC ChangeLog 4863 RMD160 3fa29eb7843894270247e42eb6e44f5a9c85fa90 SHA1 76dfd2fb6373b225fda2272cdff2ace75d920e64 SHA256 e7da21563a5d2c32ea3ded53bdf855048639d5449da7972be19f8c87fc570129
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.0_beta2.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.0_beta2.ebuild
deleted file mode 100644
index 81fd348..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.0_beta2.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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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-7.0-build.xml-r1.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.0-build.xml-r1.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_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 77d7519..211aece 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Mar 2011; Miroslav Šulc <fordfrog@g.o> -netbeans-7.0_beta2.ebuild:
+  Removed old beta release
+
 *netbeans-7.0_rc1 (30 Mar 2011)
 
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o> +netbeans-7.0_rc1.ebuild:

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 0aa7cb3..0e10165 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -1,10 +1,8 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
-DIST netbeans-7.0beta2-201102140001-src.zip 175628584 RMD160 97826d70ff8f60ba1d91bf3a8a96df94ede32644 SHA1 9af268e232a94e840d054fefa9b06b12c6043116 SHA256 3496a63c2044c2fd01ca8772b1f495e5ff35cd4b8c23ae6d818aac837765c4f4
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-l10n-7.0-20101108.tar.bz2 13994679 RMD160 0996a9c8941dfd1662a65605ea518c694dea31e7 SHA1 ccc544bb26274ee84a63cd457e82dc0b0d68504f SHA256 7b6fa265b22d02f8be9e9fb2990055c46f5bfa031d3b7c87feafe5a88acf9834
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
-EBUILD netbeans-7.0_beta2.ebuild 6718 RMD160 29282fe513a3991ca121fe184424945be8cda75f SHA1 3c77f2e39efa6a8d16d0735251a4732c6e1584d6 SHA256 95af330381f98b52cc7a7aa1e03e033479a6a2629b2cd546f4fdde61d9294f51
 EBUILD netbeans-7.0_beta2_p20110324.ebuild 6739 RMD160 b7d4f199d7e8d524b3a1e0eddaea7091d62a2ae4 SHA1 6a6ee2fe259122f042df94d297411d88774418f6 SHA256 8dafcf0552912709e48ad46d53a113ade3eb00587ea401706c1a71211d515858
 EBUILD netbeans-7.0_rc1.ebuild 6714 RMD160 edfc12f40b8f0e1d0efe3f308e9c0969f3afc482 SHA1 efba0b27478c5a92540fbe009eaa79127058a3fc SHA256 4312b24154181c18eb004aabb0ea3968adb976b8534f0eed21704b096cfcc5ae
-MISC ChangeLog 4250 RMD160 9204cdd4968d160da5b92435c892141c2ee38d2d SHA1 65710442cebd8b264b4e7f3497e9d8bc532b1d45 SHA256 f06b20c983d66f2b2f84a625308dced1d06f61cc33882d962bff52851619bfd5
+MISC ChangeLog 4358 RMD160 8b45ee30ba2f8ead34742c312337b6ee2a541a7f SHA1 88f84442aabbdcbaf56087ccc503aaefe0a9a100 SHA256 e75a4746d2df159a32fef22f5d176b0ffbf3614ce778f352e886f5a60951e660
 MISC metadata.xml 333 RMD160 848a246f77fbcc88bb03d4a8d0769ef60353148a SHA1 e9afe19410a907fb47230f824b2d592ba3f465d4 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a

diff --git a/dev-util/netbeans/netbeans-7.0_beta2.ebuild b/dev-util/netbeans/netbeans-7.0_beta2.ebuild
deleted file mode 100644
index b4ac137..0000000
--- a/dev-util/netbeans/netbeans-7.0_beta2.ebuild
+++ /dev/null
@@ -1,250 +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="7.0"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.0/beta2/zip/netbeans-7.0beta2-201102140001-src.zip"
-PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2"
-L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0-20101108.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_sq? ( ${ALL_URLS} )
-	linguas_sr? ( ${ALL_URLS} )
-	linguas_sv? ( ${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_sq
-	linguas_sr
-	linguas_sv
-	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-7.0-build.xml-r1.patch.bz2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Deleting bundled class files..."
-		find -name "*.class" -type f | xargs rm -vf
-
-		epatch netbeans-7.0-build.xml-r1.patch
-
-		# Support for custom patches
-		if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-			local files=`find "${NETBEANS70_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
-}