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

[Miroslav Šulc]

commit:     5947b57a4f345c5844d704d524c1d0bc534104de
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 18:48:19 2011 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 18:48:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=5947b57a

netbeans: removed obsolete ebuild from 7.1 branch

---
 dev-java/netbeans-apisupport/ChangeLog             |    4 +
 dev-java/netbeans-apisupport/Manifest              |    5 +-
 .../netbeans-apisupport-7.1_beta.ebuild            |  107 ------
 dev-java/netbeans-cnd/ChangeLog                    |    4 +
 dev-java/netbeans-cnd/Manifest                     |    7 +-
 dev-java/netbeans-cnd/netbeans-cnd-7.1_beta.ebuild |  121 ------
 dev-java/netbeans-dlight/ChangeLog                 |    4 +
 dev-java/netbeans-dlight/Manifest                  |    5 +-
 .../netbeans-dlight-7.1_beta.ebuild                |  102 -----
 dev-java/netbeans-enterprise/ChangeLog             |    4 +
 dev-java/netbeans-enterprise/Manifest              |    5 +-
 .../netbeans-enterprise-7.1_beta.ebuild            |  318 ----------------
 dev-java/netbeans-ergonomics/ChangeLog             |    4 +
 dev-java/netbeans-ergonomics/Manifest              |    5 +-
 .../netbeans-ergonomics-7.1_beta.ebuild            |  102 -----
 dev-java/netbeans-groovy/ChangeLog                 |    4 +
 dev-java/netbeans-groovy/Manifest                  |    5 +-
 .../netbeans-groovy-7.1_beta.ebuild                |  112 ------
 dev-java/netbeans-harness/ChangeLog                |    4 +
 dev-java/netbeans-harness/Manifest                 |    5 +-
 .../netbeans-harness-7.1_beta.ebuild               |  115 ------
 dev-java/netbeans-ide/ChangeLog                    |    4 +
 dev-java/netbeans-ide/Manifest                     |    7 +-
 dev-java/netbeans-ide/netbeans-ide-7.1_beta.ebuild |  396 --------------------
 dev-java/netbeans-java/ChangeLog                   |    4 +
 dev-java/netbeans-java/Manifest                    |    8 +-
 .../netbeans-java/netbeans-java-7.1_beta.ebuild    |  298 ---------------
 dev-java/netbeans-javacard/ChangeLog               |    4 +
 dev-java/netbeans-javacard/Manifest                |    5 +-
 .../netbeans-javacard-7.1_beta.ebuild              |  142 -------
 dev-java/netbeans-javadoc/ChangeLog                |    4 +
 dev-java/netbeans-javadoc/Manifest                 |    5 +-
 .../netbeans-javadoc-7.1_beta.ebuild               |  160 --------
 dev-java/netbeans-javafx/ChangeLog                 |    4 +
 dev-java/netbeans-javafx/Manifest                  |    5 +-
 .../netbeans-javafx-7.1_beta.ebuild                |  112 ------
 dev-java/netbeans-mobility/ChangeLog               |    4 +
 dev-java/netbeans-mobility/Manifest                |    5 +-
 .../netbeans-mobility-7.1_beta.ebuild              |  175 ---------
 dev-java/netbeans-nb/ChangeLog                     |    4 +
 dev-java/netbeans-nb/Manifest                      |    5 +-
 dev-java/netbeans-nb/netbeans-nb-7.1_beta.ebuild   |  149 --------
 dev-java/netbeans-php/ChangeLog                    |    4 +
 dev-java/netbeans-php/Manifest                     |    5 +-
 dev-java/netbeans-php/netbeans-php-7.1_beta.ebuild |  120 ------
 dev-java/netbeans-platform/ChangeLog               |    4 +
 dev-java/netbeans-platform/Manifest                |    5 +-
 .../netbeans-platform-7.1_beta.ebuild              |  127 -------
 dev-java/netbeans-profiler/ChangeLog               |    4 +
 dev-java/netbeans-profiler/Manifest                |    5 +-
 .../netbeans-profiler-7.1_beta.ebuild              |  114 ------
 dev-java/netbeans-websvccommon/ChangeLog           |    4 +
 dev-java/netbeans-websvccommon/Manifest            |    5 +-
 .../netbeans-websvccommon-7.1_beta.ebuild          |   95 -----
 dev-util/netbeans/ChangeLog                        |    4 +
 dev-util/netbeans/Manifest                         |    6 +-
 dev-util/netbeans/netbeans-7.1_beta-r1.ebuild      |  258 -------------
 57 files changed, 95 insertions(+), 3207 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index d850861..5c64e29 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-apisupport-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-apisupport-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 83ad349..03bcfc9 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -1,13 +1,10 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 RMD160 83833605d9930ea81e6d80fbd70114df76e55219 SHA1 cd4689976639175d581d34114db4dc18c8e86123 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd
-EBUILD netbeans-apisupport-7.1_beta.ebuild 3124 RMD160 f141bcfa958c2b1dadac1d8fd99de4b4de65d57a SHA1 14d5c7441ba25991752f7da4194a252d70beb714 SHA256 120333397077e30f1f430becff46a82f99ea8d48ef3b1c182ea7bfdd0d071a55
 EBUILD netbeans-apisupport-7.1_rc1.ebuild 3140 RMD160 0b27ed57c999c04b9b5253665bbc4753e568d929 SHA1 6d8c3d0179c8c6d6e75323128051ca05068bad9c SHA256 d813e1d3d6334cd8c5615dbc1ed351d699da05dc599f7ecf743c8b1458b5a5b9
 EBUILD netbeans-apisupport-9999_p20111125.ebuild 3166 RMD160 d6c27467f6e546c5ba6a6ecd0e7151e40be57a50 SHA1 64d191e41456279823dc531d6be0fd1d94479390 SHA256 4bcc4ff10c11d71b9816333db2092bb1a242e2e56f6fb93ea90bbbb1d0d00f98
-MISC ChangeLog 20724 RMD160 ec2c502d4cc9969c8c7e8b8812e4d39516c9ad20 SHA1 3d331e47d4f84d4690bbb83bdc96c1bf90132e4d SHA256 47ce4425f8d87dbb2817969624b45dcb41c736bac87d28122d5e6369e1d8f0d5
+MISC ChangeLog 20859 RMD160 0ccd43c8be7a535fe2e1713adc186fce1bf25cb1 SHA1 b4fa1eafd63ccd5d2eeef54478c1b007d47ab4a6 SHA256 5d73908a82eed565728db040fa40121fc09eaf81eab5f137c8b29b2fff1a0f64
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-7.1_beta.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-7.1_beta.ebuild
deleted file mode 100644
index 69c9eb4..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-7.1_beta.ebuild
+++ /dev/null
@@ -1,107 +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.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_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 3f511fb..57eff0c 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-cnd-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-cnd-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 5884579..af7d83d 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -1,21 +1,16 @@
 DIST 11B1CFD9AB9B7BB572F272CD1972693D1E9721E9-antlr-3.3.jar 1940955 RMD160 606a4238df41019ca1013a08134db41202c4c944 SHA1 11b1cfd9ab9b7bb572f272cd1972693d1e9721e9 SHA256 7cb0fc0c46b960e49cd22a7d84879e9e5033b26bcd20ac9c668bd96c40914b88
-DIST 1E18576780EB117E410E7A262453A99B01E55B02-antlr-3.1.3.jar 3415952 RMD160 0d35c44fbdb351d597a2ef0497bad492ebcb0cfe SHA1 1e18576780eb117e410e7a262453a99b01e55b02 SHA256 96fd414fb582fa210b19f6b5cade0341cdf0551ad58e0110ecea44d35d1f2d54
 DIST 296C195B720404C2683BA2F65E2A423DD0611B8B-open-fortran-parser-0.7.1.2.zip 86627 RMD160 3b9b848a4ebaaac9faa76874626104f4eee81d3a SHA1 296c195b720404c2683ba2f65e2a423dd0611b8b SHA256 de7cf8ce10a3d50eefa5e493953404be7db138007aa9fb53b894e307ea033195
 DIST 5C917BCC015510DC6C7E3B511DB85B2978C0774C-cnd-build-trace-1.0.zip 19708 RMD160 e89629f5ac9704cf65863b95eea228f283d64183 SHA1 5c917bcc015510dc6c7e3b511db85b2978c0774c SHA256 e2c7a9e2ae6488e1c7cddfb969f42ac19335077bfe8b39fdb57ad3202648bac3
 DIST 61CC1E7181A8B26E9B3E1357C06B63F8F0077FA5-open-fortran-parser-0.7.1.2.zip 94483 RMD160 a97f1baa0f4cc4a730d0e692145ea3cf5f1f8218 SHA1 61cc1e7181a8b26e9b3e1357c06b63f8f0077fa5 SHA256 11fa943df02788767f4c3439f142a4d1d9937818e9c0b2812dc824230d890a7c
-DIST 6FE2E3BB57DAEBD1555494818909F9664376DD6C-stringtemplate-3.2.jar 172023 RMD160 92c89e25625bad2d9b434adfde09cde081aa7d1c SHA1 6fe2e3bb57daebd1555494818909f9664376dd6c SHA256 013bddbade90e8311d55b3655d410ebfcbdaf3a49a995023edeb0840fb6e85f6
 DIST 84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip 146651 RMD160 b8cdca7f3a024c57f1fe84c6ac35eab04b33c9e1 SHA1 84f10beaa967e2896f0b43b0bbd08d834841f554 SHA256 4921fdeeb7dcf6b7c8677000a75e36894757cf78ba87cc744fb7239480d3ad17
 DIST C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip 27300 RMD160 9136e6a2b4b9c07e96ff6404667445862ea1825f SHA1 c4cf9314a530e51b891d46db65806a5a0ed240af SHA256 8bcfad100ee9664b7fb2b6b8f20b14b3790121b06487e790214c571c9ec1f21e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-cnd-7.0.1.ebuild 4495 RMD160 7ae92927ff3a4bf2b69385c0d6898e2cb98c68d7 SHA1 63a4276dd98cadddcc1e87183df9135fb0d70057 SHA256 35b1368456dd7495507a3a093e7e4a6d9caf21818138b9d600a8a97791b11670
-EBUILD netbeans-cnd-7.1_beta.ebuild 4336 RMD160 a1127c62ec5da6ffdac59ddbeeef2f210d17d210 SHA1 571a221710070631f0d5babe89e9b0e93c32736d SHA256 2acad5f18b88277a81fe85e8d0e18422e45d6d9757d844a51d4104a1f6a6653f
 EBUILD netbeans-cnd-7.1_rc1.ebuild 4108 RMD160 125a82579247984c018a4aaf7f9f5e9249bb9353 SHA1 aaff60bac67e43be2057eefd7c30c122730b4f23 SHA256 f9fc209d2bc1f34eb798fcc866916a3383c03530ffc8b6ae1f5c8572087b67de
 EBUILD netbeans-cnd-9999_p20111125.ebuild 4134 RMD160 38458edd65139ee9c64730d0e9cc81bcb9746a5b SHA1 7596bc0a2e8d0f38767fb77988722d21c786c03a SHA256 6e9dbd0ab2ceb996a0ce17958334ec845f32e513fa72484f7300c9b80564e5b7
-MISC ChangeLog 19145 RMD160 d587f7d5c5b952803349e8a159cab94102bc7704 SHA1 fd06c2a14b5146845a60cafea68c7e7213863f0e SHA256 9ca70a59546cb344416f94ede85693c576446aa32a13116cf9808ea5d28b8981
+MISC ChangeLog 19273 RMD160 96891380685a0453a0a466a35cb859caf234b219 SHA1 e67f82a1d75c98a0ec285864e8b9787927a4bc97 SHA256 abfd55685a4844883d92c23024e2be5719d3cc712e8c3173681a579365a16ad5
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-7.1_beta.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-7.1_beta.ebuild
deleted file mode 100644
index b1df7e4..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-7.1_beta.ebuild
+++ /dev/null
@@ -1,121 +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.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/1E18576780EB117E410E7A262453A99B01E55B02-antlr-3.1.3.jar
-	http://hg.netbeans.org/binaries/5C917BCC015510DC6C7E3B511DB85B2978C0774C-cnd-build-trace-1.0.zip
-	http://hg.netbeans.org/binaries/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip
-	http://hg.netbeans.org/binaries/296C195B720404C2683BA2F65E2A423DD0611B8B-open-fortran-parser-0.7.1.2.zip
-	http://hg.netbeans.org/binaries/6FE2E3BB57DAEBD1555494818909F9664376DD6C-stringtemplate-3.2.jar"
-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/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.cnd -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/1E18576780EB117E410E7A262453A99B01E55B02-antlr-3.1.3.jar libs.antlr3.devel/external/antlr-3.1.3.jar || die
-	ln -s "${DISTDIR}"/5C917BCC015510DC6C7E3B511DB85B2978C0774C-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
-	ln -s "${DISTDIR}"/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
-	ln -s "${DISTDIR}"/296C195B720404C2683BA2F65E2A423DD0611B8B-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
-	ln -s "${DISTDIR}"/6FE2E3BB57DAEBD1555494818909F9664376DD6C-stringtemplate-3.2.jar libs.antlr3.devel/external/stringtemplate-3.2.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_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-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 5db32ad..52328f9 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-dlight-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-dlight-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 36b3a0b..7b5633f 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -3,14 +3,11 @@ DIST F1AF5929CD612475CCF186F69E268F0CAAA2A90E-dtracectrl-0.1.zip 8834 RMD160 79b
 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.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-dlight-7.0.1.ebuild 3624 RMD160 508b76c4699c15431166be0200cb5b8c69400a2b SHA1 f72af18653ce0a3e4576d1fadcec350ed5a16b3d SHA256 499a9303a1972ee89dfa2685e1dc1e4511c7531ff3b29caadd1136ba25dee82e
-EBUILD netbeans-dlight-7.1_beta.ebuild 2916 RMD160 38eb851b286b59390545f0046e448bce81c89213 SHA1 96b6c839e653ffd032462c30465bc796dafc8d1e SHA256 4bb86ae3ef50bfe2d49738aeafdb6ede12b299e8b3cc154d134bc90f5ad42d94
 EBUILD netbeans-dlight-7.1_rc1.ebuild 2932 RMD160 d3201edc5febe133edb5bbd31891aa05d9d4892d SHA1 c94ca2732669b820a3715248588b32d1aec9109b SHA256 8f53e5a8b2bcb5f8878053b994eeb605b30cd53397bb57e5ce0bfe42bf808efd
 EBUILD netbeans-dlight-9999_p20111125.ebuild 2958 RMD160 30e79a2452694349d070ef3533aa9cd83e55cf39 SHA1 2328a8ee357d44c051d4cb5451ff3631e6d21983 SHA256 9e82211c7cdad237e497091154be2204817aff490f66675a3c8f7d6c24b56f5e
-MISC ChangeLog 19840 RMD160 8f64413505397a010f9e81c383b905af468e166b SHA1 f4276e3474209fa1e6dc8506f48ea473d01633f5 SHA256 e09cbb98e98418555b6e0140e4bc35d21e13284202e00350c06bf60e76a8231b
+MISC ChangeLog 19971 RMD160 b3413ec0c7a5dca2eea1e1d23b8448c05d3e0cf0 SHA1 1d5db6110997092ed2194645965d1e889bcf9080 SHA256 074d2b41b773f3680a5b70a8ca4ec85ef8ae9ec67451e7359432b77cfe15e1b2
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-7.1_beta.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-7.1_beta.ebuild
deleted file mode 100644
index 1910ac6..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-7.1_beta.ebuild
+++ /dev/null
@@ -1,102 +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.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.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"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar db/external/derby-10.2.2.0.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/dlight >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
-}

diff --git a/dev-java/netbeans-enterprise/ChangeLog b/dev-java/netbeans-enterprise/ChangeLog
index 0eb0c00..3043deb 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-enterprise-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-enterprise-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 9ffe042..010239b 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -42,14 +42,11 @@ DIST FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip 5025064 RMD160 e
 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.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 RMD160 0ecafb9ced600f753a5ab6359d6c762313ac2631 SHA1 d710a4694c708d8f78cfe04211ad1a199fa6ce0a SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe
-EBUILD netbeans-enterprise-7.1_beta.ebuild 18036 RMD160 9bd16698b7f9b2950ac0500d6ab895be2af3b3c0 SHA1 ca78a2d195da14b60e4bec76d526856c0f84a0c0 SHA256 72f94b4ec6260a3ccb11fecb7490f24002a285494a975531d8636b3a0a92ac5c
 EBUILD netbeans-enterprise-7.1_rc1.ebuild 18057 RMD160 07be31e20b26a218002c733e1b646fc97c30d5eb SHA1 d0eeece5eac5f696f3ba3d8fd11961f4d0f0dcf3 SHA256 f6267dc495d4309c62f9b15a4fccd0a9562d772f9260c71f6abdd0db67ce451c
 EBUILD netbeans-enterprise-9999_p20111125.ebuild 18083 RMD160 63cb6464c151a51ecb3245fab0c7618f29f51425 SHA1 0467e21642a8c67d8e2d7d16481ecf6840cd2854 SHA256 17505f5b7661f10f9c64af01496d0584fb230bbb8c15275b22a7ecc45aaeb338
-MISC ChangeLog 21102 RMD160 819e5091d47b84160e9feb1e6ac97f92c9afb156 SHA1 dd90d743e353e66f58c1671aa9c427110244bb77 SHA256 ab177e8f92356001421745a119c5e4fcbac2479fa54311b1c5e199a8ba7a6a81
+MISC ChangeLog 21237 RMD160 31aaa9e314bdfec1069e11ef25206c7f9939d2d9 SHA1 77368f7ac3563bdc157aad6cab992ef8e97f1738 SHA256 b011f52dfa14de3c35c815c04c76de69e11745c1a210cf21b7911f8d3779bc83
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-7.1_beta.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-7.1_beta.ebuild
deleted file mode 100644
index 391cd8a..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-7.1_beta.ebuild
+++ /dev/null
@@ -1,318 +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.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar
-	http://hg.netbeans.org/binaries/7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.0.jar
-	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
-	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
-	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
-	http://hg.netbeans.org/binaries/DC9A229C4AB1788D0C20D937A82FB64CE2911171-javaee6-doc-api.zip
-	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
-	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/EEBA5E4DCFB946A8E9CAAF1AC405620E28710BEE-jersey-1.8.zip
-	http://hg.netbeans.org/binaries/6055EAF5B4F778A243B52D2DC4E66CB5F35B3D7C-jersey-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/4D9B1037036E99811D9E393F191058C9CA30CAE2-jersey-apache-client-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar
-	http://hg.netbeans.org/binaries/A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar
-	http://hg.netbeans.org/binaries/3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar
-	http://hg.netbeans.org/binaries/0EE4D36A33681C945339BB1B594F4C0ED9A4C3DE-jersey-multipart-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/D77C6E4AA0F3D3C9B7230F6C0991DBBF0CEF39BA-jersey-simple-server-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
-	http://hg.netbeans.org/binaries/1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip
-	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
-	http://hg.netbeans.org/binaries/FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar
-	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
-	http://hg.netbeans.org/binaries/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip
-	http://hg.netbeans.org/binaries/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar
-	http://hg.netbeans.org/binaries/C31A6E33D7D6E77C8123A0830D929187A9707147-primefaces-2.2.1.jar
-	http://hg.netbeans.org/binaries/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-servlet3.0-jsp2.2-api.jar
-	http://hg.netbeans.org/binaries/1A48EDCF8DCFC76882C821931EB0529DB9AF5D9B-spring-webmvc-2.5.6.SEC01.jar
-	http://hg.netbeans.org/binaries/E11C2384FDEAE4F96E433C2A0339DCFC5202CC17-struts-1.3.8-javadoc.zip
-	http://hg.netbeans.org/binaries/A3F62096FB53E14CF09B006458333792890CE429-struts-1.3.8-lib.zip
-	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
-	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/commons-fileupload:0
-	dev-java/glassfish-deployment-api:1.2
-	dev-java/jakarta-jstl:0"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	>=dev-java/junit-4.4:4
-	dev-java/tomcat-servlet-api:2.3"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	dev-java/antlr:0[java]
-	dev-java/asm:3
-	dev-java/bsf:2.3
-	dev-java/commons-beanutils:1.7
-	dev-java/commons-collections:0
-	dev-java/commons-digester:0
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-	dev-java/commons-validator:0
-	dev-java/jakarta-oro:2.0
-	dev-java/jettison:0
-	dev-java/jsr311-api:0"
-#	dev-java/commons-chain:1.1 in overlay
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar libs.elimpl/external/el-impl.jar || die
-	ln -s "${DISTDIR}"/7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.0.jar web.jspparser/external/glassfish-jspparser-3.0.jar || die
-	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
-	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
-	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
-	ln -s "${DISTDIR}"/DC9A229C4AB1788D0C20D937A82FB64CE2911171-javaee6-doc-api.zip j2ee.platform/external/javaee6-doc-api.zip || die
-	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
-	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/EEBA5E4DCFB946A8E9CAAF1AC405620E28710BEE-jersey-1.8.zip websvc.restlib/external/jersey-1.8.zip || die
-	ln -s "${DISTDIR}"/6055EAF5B4F778A243B52D2DC4E66CB5F35B3D7C-jersey-1.8-javadoc.jar websvc.restlib/external/jersey-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/4D9B1037036E99811D9E393F191058C9CA30CAE2-jersey-apache-client-1.8-javadoc.jar websvc.restlib/external/jersey-apache-client-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar websvc.restlib/external/jersey-atom-abdera-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar websvc.restlib/external/jersey-client-1.3-javadoc.jar || die
-	ln -s "${DISTDIR}"/A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar websvc.restlib/external/jersey-core-1.1.5.1-javadoc.jar || die
-	ln -s "${DISTDIR}"/3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar websvc.restlib/external/jersey-guice-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar websvc.restlib/external/jersey-json-1.3-javadoc.jar || die
-	ln -s "${DISTDIR}"/0EE4D36A33681C945339BB1B594F4C0ED9A4C3DE-jersey-multipart-1.8-javadoc.jar websvc.restlib/external/jersey-multipart-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/D77C6E4AA0F3D3C9B7230F6C0991DBBF0CEF39BA-jersey-simple-server-1.8-javadoc.jar websvc.restlib/external/jersey-simple-server-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar websvc.restlib/external/jersey-spring-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
-	ln -s "${DISTDIR}"/1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip web.jsf20/external/jsf-2.1.zip || die
-	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
-	ln -s "${DISTDIR}"/FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar websvc.restlib/external/jsr311-api-1.1.1-javadoc.jar || die
-	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
-	ln -s "${DISTDIR}"/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
-	ln -s "${DISTDIR}"/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar websvc.restlib/external/oauth-client-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar websvc.restlib/external/oauth-server-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar websvc.restlib/external/oauth-signature-1.8-javadoc.jar || die
-	ln -s "${DISTDIR}"/C31A6E33D7D6E77C8123A0830D929187A9707147-primefaces-2.2.1.jar web.primefaces/external/primefaces-2.2.1.jar || die
-	ln -s "${DISTDIR}"/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-servlet3.0-jsp2.2-api.jar servletjspapi/external/servlet3.0-jsp2.2-api.jar || die
-	ln -s "${DISTDIR}"/1A48EDCF8DCFC76882C821931EB0529DB9AF5D9B-spring-webmvc-2.5.6.SEC01.jar spring.webmvc/external/spring-webmvc-2.5.6.SEC01.jar || die
-	ln -s "${DISTDIR}"/E11C2384FDEAE4F96E433C2A0339DCFC5202CC17-struts-1.3.8-javadoc.zip web.struts/external/struts-1.3.8-javadoc.zip || die
-	ln -s "${DISTDIR}"/A3F62096FB53E14CF09B006458333792890CE429-struts-1.3.8-lib.zip web.struts/external/struts-1.3.8-lib.zip || die
-	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
-	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
-	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.0.jar
-	java-pkg_jar-from --into web.jstl11/external jakarta-jstl jstl.jar jstl-1.1.2.jar
-	java-pkg_jar-from --into web.jstl11/external jakarta-jstl standard.jar standard-1.1.2.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.8.2.jar
-	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
-	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.profiler.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/enterprise >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm commons-fileupload-1.0.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.0.jar || die
-	# el-impl.jar
-	# glassfish-jspparser-3.0.jar
-	# glassfish-logging-2.0.jar
-	# javaee-api-6.0.jar
-	# javaee-api-6.0-license.txt
-	# javaee-web-api-6.0.jar
-	# javaee-web-api-6.0-license.txt
-	# jsp-parser-ext.jar
-	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
-	rm jstl.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl.jar || die
-	# org-netbeans-modules-web-httpmonitor.jar
-	# servlet3.0-jsp2.2-api.jar
-	rm standard.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/javaee6-endorsed
-	pushd "${D}"/${instdir} >/dev/null || die
-	# javax.annotation.jar
-	# javax.annotation-license.txt
-	# jaxb-api-osgi.jar
-	# jaxb-api-osgi-license.txt
-	# webservices-api-osgi.jar
-	# webservices-api-osgi-license.txt
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
-	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
-	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
-	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
-	# jsf-api.jar
-	# jsf-impl.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jsf-2_1
-	pushd "${D}"/${instdir} >/dev/null || die
-	# jsf-api.jar
-	# jsf-impl.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/metro
-	pushd "${D}"/${instdir} >/dev/null || die
-	# webservices-api.jar
-	# webservices-extra-api.jar
-	# webservices-extra.jar
-	# webservices-rt.jar
-	# webservices-tools.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/primefaces
-	pushd "${D}"/${instdir} >/dev/null || die
-	# primefaces-2.1.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/rest
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm asm-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-3.1.jar || die
-	# jackson-core-asl-1.1.1.jar
-	# jersey-client-1.3.jar
-	# jersey-core-1.3.jar
-	# jersey-json-1.3.jar
-	# jersey-multipart-1.3.jar
-	# jersey-server-1.3.jar
-	# jersey-spring-1.3.jar
-	rm jettison-1.1.jar && dosym /usr/share/jettison/lib/jettison.jar ${instdir}/jettison-1.1.jar || die
-	rm jsr311-api-1.1.1.jar && dosym /usr/share/jsr311-api/lib/jsr311-api.jar ${instdir}/jsr311-api-1.1.1.jar || die
-	# mimepull-1.4.jar
-	# oauth-client-1.3.jar
-	# oauth-signature-1.3.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-webmvc-2.5.6.SEC01.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/struts
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
-	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
-	rm commons-beanutils-1.7.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.7.0.jar || die
-	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
-	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
-	# rm commons-chain-1.1.jar && dosym /usr/share/commons-chain-1.1/lib/commons-chain.jar ${instdir}/commons-chain-1.1.jar || die
-	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
-	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
-	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
-	rm jstl-1.0.2.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl-1.0.2.jar || die
-	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
-	rm standard-1.0.2.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard-1.0.2.jar || die
-	# struts-core-1.3.8.jar
-	# struts-el-1.3.8.jar
-	# struts-extras-1.3.8.jar
-	# struts-faces-1.3.8.jar
-	# struts-mailreader-dao-1.3.8.jar
-	# struts-scripting-1.3.8.jar
-	# struts-taglib-1.3.8.jar
-	# struts-tiles-1.3.8.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
-}

diff --git a/dev-java/netbeans-ergonomics/ChangeLog b/dev-java/netbeans-ergonomics/ChangeLog
index 6a6f991..4615c77 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-ergonomics-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-ergonomics-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index e3ffb67..28c78c9 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -1,13 +1,10 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 RMD160 3ce16ca958ba2e556cd0e2361cb94cc0cf4bbe62 SHA1 ed3139bb1005c01513c3b0e2602a71622f81ecc9 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab
-EBUILD netbeans-ergonomics-7.1_beta.ebuild 2874 RMD160 a48a67bb01615cb48efa7732225b9bb65deb48e4 SHA1 d0ff29fc73da16e79c77b59108b11b4a730abb65 SHA256 be16329fe34c857d36243e1b5b5228cf6cc2c37e9414587ff77ac9c609a26459
 EBUILD netbeans-ergonomics-7.1_rc1.ebuild 2890 RMD160 809e4b5627296ccfce3da40f5ede2729a3b73c0f SHA1 deed679601d6e450bca0ba66ec812e99a23d6c61 SHA256 65f8e65821e26a159d3ae2047f3aa10e9865348697e6fed148ebc10c61052ea8
 EBUILD netbeans-ergonomics-9999_p20111125.ebuild 2916 RMD160 cf4a88baa979df884c88a238265ecfc1462929cb SHA1 3846689108ccff088387ef0af3750373a89ef43e SHA256 21e86bb464175c4d91bfdccb6eee939ef0071811178fa0eb131ff3d6fc601ffe
-MISC ChangeLog 20724 RMD160 200d6705cb2542710661f832ce0a5c1955269071 SHA1 68cdfec76eed3427746a811c154f57ab54c45188 SHA256 d378acc4bdc9bfecf1a79653e83aaba7930d0c6a886d7df3f4c474afb752cfd4
+MISC ChangeLog 20859 RMD160 3b20a2afc478aded6e2157d04f92cdebe2c8eabf SHA1 0e7cc496379431af906a6580029827391ff61ec3 SHA256 20212d4f720d49ecfa0c47c33e8ce09ed5f6cc2ac8da6eab4bfd9b358f006dd3
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.1_beta.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.1_beta.ebuild
deleted file mode 100644
index 0a933d9..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.1_beta.ebuild
+++ /dev/null
@@ -1,102 +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.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ergonomics -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_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 c4cfc28..f1a7c9f 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-groovy-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-groovy-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 4b1605c..5a614ec 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -1,14 +1,11 @@
 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.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 RMD160 8dfd04f7498e840e727faa16d85c1e6998933be3 SHA1 8c5f081cb89500e97feedfd39824fd913fed8044 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729
-EBUILD netbeans-groovy-7.1_beta.ebuild 3286 RMD160 41b9ca26e2d8d50a6afc5af2d841c062df7287ef SHA1 438129f46775f269a5244360ca9467e1f6f04115 SHA256 0299e2e9fd137ad928ad8cf55b2c35b8e9f491d0077e96cc99d00af9291275ab
 EBUILD netbeans-groovy-7.1_rc1.ebuild 3302 RMD160 119a92ca8900e830e961a980567481aa4bf5d015 SHA1 f2555d2621acc8040713e08e90884aadc69bb881 SHA256 f124c708fe65061c01f330db6a98b5459f454048f20f28bc89cd00fdf3333cf8
 EBUILD netbeans-groovy-9999_p20111125.ebuild 3328 RMD160 b26b3fd51082790b8a3bb554ee832165b250c55a SHA1 d8f657f0eef4d319eef5adb37e1a64fc78a88325 SHA256 22a870a3824f824574ae9b8c8b5255298519f0efde56fb873f60c5c90afecd80
-MISC ChangeLog 19840 RMD160 1984261f23ea5f9f9d740d28bfbafbbfabc9b4ca SHA1 cdf7dce3e222d513e8c09d6e88489c5e344edb4a SHA256 68866cf1e1e6393fae1141cb155e1078f4b1f4b1b68acdd83b20d96063025bcd
+MISC ChangeLog 19971 RMD160 02053169fac6d3f9c0a7fe869572a9b37282fd23 SHA1 df3b4046e45da5f2a7b4213776a953cdb447e04a SHA256 8dbda9e3403601f17395ce62adc761368640f418065eeddca71e93be885e15f7
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-7.1_beta.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-7.1_beta.ebuild
deleted file mode 100644
index 43de075..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-7.1_beta.ebuild
+++ /dev/null
@@ -1,112 +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.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.groovy -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar groovy.editor/external/groovy-all-1.6.4.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_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 cfdc6b7..fb7bfc2 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-harness-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-harness-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 06ef14e..4b970a4 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -2,14 +2,11 @@ DIST 418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar 1695373 RMD160 f
 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.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-harness-7.0.1.ebuild 3579 RMD160 dd36fe87364dc9a15cfad15b64f8d05e46632705 SHA1 d39ddfab960f1b9430a5eee2919d06e2854ae848 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5
-EBUILD netbeans-harness-7.1_beta.ebuild 3569 RMD160 6406e2b1a39b19abdacdeb96d293a6049ea0cc84 SHA1 bb75aea5f62643040b05a9832fc86c26e47f763e SHA256 5651f3204960999b8fb0be86f392f88594b2ab34cb0ac6888276dfc98ca0f5d3
 EBUILD netbeans-harness-7.1_rc1.ebuild 3584 RMD160 a6438a4a66cb3b79b7f67dbe5a45e873df26f640 SHA1 7893ac2b70277911827b52d814609b4d46a36cdc SHA256 b2d61a01a3cee0ad6be136778a2dd8167963731c6113ba43c0f66e511f64b1b8
 EBUILD netbeans-harness-9999_p20111125.ebuild 3610 RMD160 332acc27bb76a4865506291a2f87e9ee5e1d72d6 SHA1 a0a39e881923c00b0be2ab9310f42b9b23d2a7ac SHA256 2ec18373b16483c94a28f486275031616e359728da6d179e4acb950605b80f79
-MISC ChangeLog 20061 RMD160 95e5fd5bd1fc6729bca57adec59d101e3a5f7520 SHA1 242e5cc4e6cb582b1a7cadabad743da1c23d7824 SHA256 4c25c1471dea5990335e213484689184b50beaf57b830d8ce6aff0ebe8ca50d3
+MISC ChangeLog 20193 RMD160 0aac242372accaca5763b92473c96c3ad36f55ba SHA1 a6caeed9fb96fdfb1b88ed594a7cf6aa9f62cbc6 SHA256 d4b8f5d56d9f6022a74193c52035135b7e45b22bbebe59be82f9fc578677f3c1
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-harness/netbeans-harness-7.1_beta.ebuild b/dev-java/netbeans-harness/netbeans-harness-7.1_beta.ebuild
deleted file mode 100644
index d558da6..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-7.1_beta.ebuild
+++ /dev/null
@@ -1,115 +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.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	dev-java/javahelp:0"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	>=dev-java/junit-4.4:4"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
-	ln -s "${DISTDIR}"/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar jemmy/external/jemmy-2.3.0.0.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_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 6514c84..de68a0e 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-ide-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-ide-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 05fbfb8..854b1f1 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -8,7 +8,6 @@ DIST 0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar 150954 RMD160 3f9c933590ef
 DIST 1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip 577326 RMD160 a69d4012f91c81f4cab55f0615967c3728e34e96 SHA1 1162833e0fe87b69b99b1f7deb3a6c386eab6f84 SHA256 108791b171658e5f828003c5f974008a4c3ec13125550c91092d715a80c9fd17
 DIST 1FE453D0B251571463F9BE4F51F413BBA5A376A7-org.eclipse.equinox.security-1.0.200.jar 106100 RMD160 00d2dfef2bbae959db739b91b83de20927e42f80 SHA1 1fe453d0b251571463f9be4f51f413bba5a376a7 SHA256 f45ca9bf2cd8d407458f1618eeb3958230a5adbd4ea271b1555934fb1bca7dad
 DIST 23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip 401328 RMD160 9b85293a7e8016fa20252dff4bbde6ad5c7336d7 SHA1 23123bb29025254556b6e573023fcdf0f6715a66 SHA256 c0b63e8b5f246574ce5571e1fbc6b716b68a9e64bf9433800a61777e5ccaf3e2
-DIST 23EF7B58C74CC9CFA6956553C78F69AC71651888-css3-spec.zip 4157366 RMD160 de7236b2b777baed8f16ee1b02fb5f05495535bc SHA1 23ef7b58c74cc9cfa6956553c78f69ac71651888 SHA256 d67768d6fe44822cea376c15d35ecd1527f36b1f27d001cd120217596a1a1913
 DIST 27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip 428971 RMD160 4a1b467859d9d603eb333b9987f66a8fc794a016 SHA1 27fae927b5b9ae53a5b0ed825575dd8217ce7042 SHA256 e8a264a9f8951347bd133033e29790964773b74ecac2e924acfdac332aaa89e1
 DIST 2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar 12471 RMD160 8746e25de3d3c88979072e84fac6e0c8c1c1a6ec SHA1 2e07375e5ca3a452472f0e87fb33f243f7a5c08c SHA256 14db2413c87355b06b5f3a7d14ce046f1a9aebf95d4e6b2dd36f3f39ac367196
 DIST 2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar 872839 RMD160 5b912560ffa80ed370a9cba50ffcb4138750702d SHA1 2ec69bd69b66b0dabea392de713a11f975001760 SHA256 4e0788d4b3638b98e67a6501d47e0ca666116ea7b6dbaa8a15dc65ed349b6918
@@ -52,7 +51,6 @@ DIST AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0
 DIST B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar 90859 RMD160 cde382392df3dbf58a2c9dcac4b85e8c06b67f31 SHA1 b0d0fcbac68826d2afa3c7c89fc4d57b95a000c3 SHA256 b3b421fd586c67e0c7f04b879ad527a8a295de222392ded6e68c62b9af669d11
 DIST B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar 163648 RMD160 d3d48b88083ba5dae4f611d7945e13947f9c8715 SHA1 b7adb35c7bc16afa8ae49c4d61f87e607bdadb41 SHA256 8047f549bfccaa4c7b2234cf25c13f549031fc0bdc08fc1cf0780b86f8567312
 DIST BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar 104172 RMD160 70595eb5dd26ecf5e506fd08bec91584a5c774d5 SHA1 bcf23b1d858c6f69d67c851d497984d25345d0b1 SHA256 34c022696b577e984d42641428e6e49a8afa0257c4ec96feff36e4b67c093390
-DIST BDFC25B87D1A034FACBC13133406BAB416814525-antlr3.3-runtime.jar 177185 RMD160 412a1970462e9a80c59c6426e83095c6b0203622 SHA1 bdfc25b87d1a034facbc13133406bab416814525 SHA256 30965a74b3409b235d9cb105115030badd2f872301fb8b50d6fc9e265ff69041
 DIST C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar 625400 RMD160 0d0a0a7fb80b85503ce85dee4ac302e804e7a6ed SHA1 c0c5653d2200f2bd2e834b26dfdbc830d07fa0f4 SHA256 7f71ade91cb8e0c503ac334a1b76143d94a266f87cf1621991ec9b133f90f2bd
 DIST C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip 348661 RMD160 0c0618080d909af181cca9f5b7e3632b9bacd6c1 SHA1 c56f4f5c42102a67f56eb8f12d0219e92e5307c2 SHA256 3db0a5869f40fe897b05ff7f9bd6889a25a4390584c6ab9ad58d00417c862155
 DIST C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar 18627 RMD160 b32245bfbf94e120190260a952f7eb706f98f261 SHA1 c9757efb2cfba523a7375a78fa9ecfaf0d0ac505 SHA256 a8fdf6cc2afb7e11c7ddc28cc8e7242e7678c65186a78429b81a0bffec9a200f
@@ -70,14 +68,11 @@ DIST F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip 459564 RMD1
 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.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-ide-7.0.1.ebuild 22653 RMD160 fe693a0abc3253af1850b99bfb4fa0d9a488bd94 SHA1 5b6547694a3193ce89cc2a5dfb8fc134cb81fabe SHA256 4c1b3e46e2a6cb89d902c7f4fe6ad9306cbd0c9463a514e87d4c6ec019dc0356
-EBUILD netbeans-ide-7.1_beta.ebuild 27250 RMD160 a10896158d7d5a2f5dcb10aad46b923244d68444 SHA1 b5bd29961948300b0f4dce670040afa33f8c6b13 SHA256 2ebf65c2cf579623f49905d253276a8d003590435005789c4307275fd4f57436
 EBUILD netbeans-ide-7.1_rc1.ebuild 26831 RMD160 5e65226dfedce00b8d0e16a813eee9ab7a234eb3 SHA1 1d3869d8af9be9a8f8715d4bfdcc0055594f57fb SHA256 53de5645c771f8409c8fc7cc053ed006b7184613c7f69a14a903e4544a598843
 EBUILD netbeans-ide-9999_p20111125.ebuild 26857 RMD160 51e9627f7b0555fd9b692a36ed5c09c8677a64c5 SHA1 bf86ee48735382a3edfde9a4465a803f0af20222 SHA256 d662c1489bd49c3f3c6c9c7b01e32dbaf4cfd2c0cc60d6ccf66169284f01a48e
-MISC ChangeLog 19696 RMD160 80887d26aa42313401e24d2b2a56d3222eafba40 SHA1 2546ecc0b81139d7f9b6ad25c795815db7b9e3b0 SHA256 932edee8a1fa495fdd4ea5b41df66bbbfc1bbc468bd5cde2bddd8c3c505af27b
+MISC ChangeLog 19824 RMD160 8ed3edb1537eb8abe0073d9c92b13cfdc11b9fb9 SHA1 f036887873f03d95fee0a0880e6be9850a420b60 SHA256 0741b5cf16045e2f44f93e73bd95972ab2a70b44006c8745a96990dc6dd74242
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ide/netbeans-ide-7.1_beta.ebuild b/dev-java/netbeans-ide/netbeans-ide-7.1_beta.ebuild
deleted file mode 100644
index abd7658..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-7.1_beta.ebuild
+++ /dev/null
@@ -1,396 +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.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/BDFC25B87D1A034FACBC13133406BAB416814525-antlr3.3-runtime.jar
-	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
-	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
-	http://hg.netbeans.org/binaries/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar
-	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
-	http://hg.netbeans.org/binaries/23EF7B58C74CC9CFA6956553C78F69AC71651888-css3-spec.zip
-	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
-	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
-	http://hg.netbeans.org/binaries/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-html5-datatypes.jar
-	http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip
-	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
-	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
-	http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
-	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
-	http://hg.netbeans.org/binaries/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar
-	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
-	http://hg.netbeans.org/binaries/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar
-	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
-	http://hg.netbeans.org/binaries/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar
-	http://hg.netbeans.org/binaries/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar
-	http://hg.netbeans.org/binaries/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar
-	http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar
-	http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar
-	http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip
-	http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip
-	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
-	http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar
-	http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar
-	http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar
-	http://hg.netbeans.org/binaries/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar
-	http://hg.netbeans.org/binaries/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar
-	http://hg.netbeans.org/binaries/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar
-	http://hg.netbeans.org/binaries/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar
-	http://hg.netbeans.org/binaries/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar
-	http://hg.netbeans.org/binaries/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar
-	http://hg.netbeans.org/binaries/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar
-	http://hg.netbeans.org/binaries/1FE453D0B251571463F9BE4F51F413BBA5A376A7-org.eclipse.equinox.security-1.0.200.jar
-	http://hg.netbeans.org/binaries/34E70691382D67EE5C84EF207FB8D3784594BA2C-org.eclipse.jgit-1.0.0.201106090707-r.jar
-	http://hg.netbeans.org/binaries/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar
-	http://hg.netbeans.org/binaries/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar
-	http://hg.netbeans.org/binaries/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar
-	http://hg.netbeans.org/binaries/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar
-	http://hg.netbeans.org/binaries/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.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
-	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
-	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
-	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-platform-${PV}
-	dev-java/antlr:3
-	dev-java/commons-httpclient:3
-	dev-java/commons-io:1
-	dev-java/commons-lang:2.1
-	dev-java/commons-logging:0
-	dev-java/flute:0
-	dev-java/freemarker:2.3
-	dev-java/icu4j:4.4
-	dev-java/jdbc-mysql:0
-	dev-java/jdbc-postgresql:0
-	dev-java/jsr173:0
-	dev-java/jvyamlb:0
-	dev-java/log4j:0
-	dev-java/lucene:3.0
-	dev-java/sac:0
-	dev-java/saxon:9
-	dev-java/smack:2.2
-	dev-java/sun-jaf:0
-	dev-java/tomcat-servlet-api:2.2
-	dev-java/ws-commons-util:0
-	dev-java/xerces:2
-	dev-vcs/subversion:0[java]"
-#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
-#	app-text/jing:0 our version is probably too old
-#	dev-java/ini4j:0 our version is too old
-#	java-virtuals/jaf:0 could use this instead of sun-jaf but it returns empty classpath
-#	dev-java/trilead-ssh2:0 in overlay
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	dev-java/commons-codec:0
-	dev-java/jsch:0
-	dev-java/jzlib:0
-	${CDEPEND}
-	dev-java/javacc:0
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/BDFC25B87D1A034FACBC13133406BAB416814525-antlr3.3-runtime.jar css.lib/external/antlr3.3-runtime.jar || die
-	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
-	ln -s "${DISTDIR}"/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar libs.commons_net/external/commons-net-3.0.1.jar || die
-	# system commons-io fails with following error:
-	# Missing manifest tag OpenIDE-Module; /var/tmp/portage/dev-java/netbeans-ide-9999_p20110911/work/nbbuild/netbeans/ide/modules/org-apache-commons-io.jar is not a module
-	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar ||die
-	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
-	ln -s "${DISTDIR}"/23EF7B58C74CC9CFA6956553C78F69AC71651888-css3-spec.zip css.editor/external/css3-spec.zip || die
-	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
-	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
-	ln -s "${DISTDIR}"/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
-	ln -s "${DISTDIR}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip html.parser/external/html5doc.zip || die
-	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
-	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
-	ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
-	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
-	ln -s "${DISTDIR}"/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar html.validation/external/isorelax20041111.jar || die
-	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
-	ln -s "${DISTDIR}"/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
-	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
-	ln -s "${DISTDIR}"/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
-	ln -s "${DISTDIR}"/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
-	ln -s "${DISTDIR}"/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
-	ln -s "${DISTDIR}"/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar html.validation/external/jing.jar || die
-	ln -s "${DISTDIR}"/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar html.validation/external/js.jar || die
-	ln -s "${DISTDIR}"/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip javascript.editing/external/js-domstubs.zip || die
-	ln -s "${DISTDIR}"/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip javascript.editing/external/jsstubs.zip || die
-	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.destroy/external/libpam4j-1.1.jar || die
-	ln -s "${DISTDIR}"/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar html.validation/external/non-schema.jar || die
-	ln -s "${DISTDIR}"/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype-3.4.100.jar || die
-	ln -s "${DISTDIR}"/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.1.jar || die
-	ln -s "${DISTDIR}"/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar o.eclipse.core.net/external/org.eclipse.core.net-1.2.100.jar || die
-	ln -s "${DISTDIR}"/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.6.0.jar || die
-	ln -s "${DISTDIR}"/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth-3.2.200.jar || die
-	ln -s "${DISTDIR}"/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.1.jar || die
-	ln -s "${DISTDIR}"/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common-3.6.0.jar || die
-	ln -s "${DISTDIR}"/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.3.0.jar || die
-	ln -s "${DISTDIR}"/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry-3.5.0.jar || die
-	ln -s "${DISTDIR}"/1FE453D0B251571463F9BE4F51F413BBA5A376A7-org.eclipse.equinox.security-1.0.200.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.0.200.jar || die
-	ln -s "${DISTDIR}"/34E70691382D67EE5C84EF207FB8D3784594BA2C-org.eclipse.jgit-1.0.0.201106090707-r.jar o.eclipse.jgit/external/org.eclipse.jgit-1.0.0.201106090707-r.jar || die
-	ln -s "${DISTDIR}"/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core-3.6.0.jar || die
-	ln -s "${DISTDIR}"/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core-3.6.0.jar || die
-	ln -s "${DISTDIR}"/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net-3.6.0.jar || die
-	ln -s "${DISTDIR}"/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar || die
-	ln -s "${DISTDIR}"/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core-3.6.0.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
-	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
-	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
-	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	popd >/dev/null || die
-
-	java-pkg_jar-from --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.44.jar
-	java-pkg_jar-from --build-only --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
-	#java-pkg_jar-from --into css.lib/external antlr-3 antlr3.jar antlr3.3-runtime.jar
-	java-pkg_jar-from --into css.editor/external flute flute.jar flute-1.3.jar
-	java-pkg_jar-from --into css.editor/external sac sac.jar sac-1.3.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.13-bin.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-8.3-603.jdbc3.jar
-	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
-	java-pkg_jar-from --into extexecution.destroy/external commons-io-1 commons-io.jar commons-io-1.4.jar
-	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_0.jar
-	java-pkg_jar-from --into html.validation/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into html.validation/external commons-logging commons-logging-api.jar commons-logging-api-1.1.1.jar
-	# java-pkg_jar-from --into html.validation/external jing jing.jar jing.jar
-	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
-	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
-	java-pkg_jar-from --into libs.antlr3.runtime/external antlr-3 antlr3.jar antlr-runtime-3.1.3.jar
-	# java-pkg_jar-from --into libs.commons_net/external commons-net commons-net.jar commons-net-1.4.1.jar
-	java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.8.jar
-	# java-pkg_jar-from --into libs.ini4j/external ini4j ini4j.jar ini4j-0.5.1.jar
-	# java-pkg_jar-from --into libs.jaxb/external jaxb-2 jaxb-impl.jar jaxb-impl.jar
-	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
-	java-pkg_jar-from --into libs.lucene/external lucene-3.0 lucene-core.jar lucene-core-3.0.3.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
-	java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.6.0.jar
-	# java-pkg_jar-from --into libs.svnClientAdapter.svnkit/external trilead-ssh2 trilead-ssh2.jar trilead.jar
-	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
-	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
-	java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
-	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.jar
-	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
-	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
-	# java-pkg_jar-from --into xml.jaxb.api/external jaxb-2 jaxb-api.jar jaxb-api.jar
-	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_api.jar
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/ide >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
-	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	insinto ${INSTALL_DIR}/bin/nativeexecution
-	doins bin/nativeexecution/*
-
-	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
-	for file in *.sh ; do
-		fperms 755 ${file}
-	done
-	popd >/dev/null || die
-
-	if use x86 ; then
-		doins -r bin/nativeexecution/Linux-x86
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	elif use amd64 ; then
-		doins -r bin/nativeexecution/Linux-x86_64
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	fi
-
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-runtime-3.1.3.jar && dosym /usr/share/antlr-3/lib/antlr3.jar ${instdir}/antlr-runtime-3.1.3.jar || die
-	# bytelist-0.1.jar
-	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.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
-	# rm commons-net-1.4.1.jar && dosym /usr/share/commons-net/lib/commons-net.jar ${instdir}/commons-net-1.4.1.jar || die
-	# ddl.jar
-	rm flute-1.3.jar && dosym /usr/share/flute/lib/flute.jar ${instdir}/flute-1.3.jar || die
-	rm freemarker-2.3.8.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.8.jar || die
-	# html5-datatypes.jar
-	# html5-parser.jar
-	rm icu4j-4_0.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_0.jar || die
-	# [[ -f ini4j-0.5.1.jar ]] && java-pkg_jar-from ini4j ini4j.jar ${instdir}/ini4j-0.5.1.jar || die
-	# io-xml-util.jar
-	# iri.jar
-	# isorelax20041111.jar
-	# [[ -f jing.jar ]] && java-pkg_jar-from jing jing.jar ${instdir}/jing.jar || die
-	# js.jar
-	rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
-	# libpam4j-1.1.jar
-	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
-	rm lucene-core-3.0.3.jar && dosym /usr/share/lucene-3.0/lib/lucene-core.jar ${instdir}/lucene-core-3.0.3.jar || die
-	rm mysql-connector-java-5.1.13-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.13-bin.jar || die
-	# non-schema.jar
-	# org.eclipse.mylyn.bugzilla.core_3.3.1.jar
-	# org.eclipse.mylyn.commons.core_3.3.1.jar
-	# org.eclipse.mylyn.commons.net_3.3.0.jar
-	# org.eclipse.mylyn.tasks.core_3.3.1.jar
-	# org-netbeans-tax.jar
-	rm postgresql-8.3-603.jdbc3.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-8.3-603.jdbc3.jar || die
-	# processtreekiller-1.0.1.jar
-	# resolver-1.2.jar
-	rm sac-1.3.jar && dosym /usr/share/sac/lib/sac.jar ${instdir}/sac-1.3.jar || die
-	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
-	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
-	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
-	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
-	# sqljet-1.0.3.jar
-	# svnClientAdapter-javahl-1.6.13.jar
-	# svnClientAdapter-main-1.6.13.jar
-	# svnClientAdapter-svnkit-1.6.13.jar
-	rm svnjavahl-1.6.0.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl-1.6.0.jar || die
-	# svnkit-javahl.jar
-	# svnkit-1.3.4.jar
-	# swingx-0.9.5.jar
-	# [[ -f trilead.jar ]] && java-pkg_jar-from trilead-ssh2 trilead-ssh2.jar ${instdir}/trilead.jar || die
-	# ValidationAPI.jar
-	# validator.jar
-	# webserver.jar
-	# winp-1.14-patched.jar
-	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxb
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
-	# [[ -f jaxb-impl.jar ]] && java-pkg_jar-from jaxb-2 jaxb-impl.jar ${instdir}/jaxb-impl.jar || die
-	# jaxb-xjc.jar
-	# jaxb1-impl.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	# [[ -f jaxb-api.jar ]] && java-pkg_jar-from jaxb-2 jaxb-api.jar ${instdir}/jaxb-api.jar || die
-	rm jsr173_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_api.jar || die
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
-}

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index e31730b..211c1ba 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-java-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-java-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 09cf417..f0d0df3 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -11,11 +11,9 @@ DIST 653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar 3455
 DIST 7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip 4155185 RMD160 27465ad4b7a016fecfc801c581620a0c02b71c33 SHA1 7622cb23daedd9de0acbd16c820d3a02f94572af SHA256 22cc81921af00b1bf18b1c1b14a4f61e2882d5a2335b1940797fda2b2b4bd8a4
 DIST 7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar 11465 RMD160 25ea55cd28307c867422448a0e1c3c9c89db4a7a SHA1 7c60f22d32f56478ac25a732038e9dd7dfecf5dd SHA256 2f2f412c975f8ca54175f4d205d13e3ce43825ddcbd3bb69134257165f701196
 DIST 7E522BB174CA4A6D660381800F54454B2D96CF1D-javac-impl-nb-7.0-b07.jar 1672793 RMD160 8e5a3ab30335bd0d0ef0df7332cf59869ea46af5 SHA1 7e522bb174ca4a6d660381800f54454b2d96cf1d SHA256 9255eddff74cfe18e6ca145d1c73e9e3ab8c6e02883e612277ba5bb0fa3e508e
-DIST 89BFCE12CA01C7518739B5AC2C22A220B6B5510E-indexer-artifact-4.1.1.jar 24791 RMD160 775f3b699f00816bc8d360f4d99929d660d38723 SHA1 89bfce12ca01c7518739b5ac2c22a220b6b5510e SHA256 ebad6f60df645c840f6a24590bc37c460699bc373a514a257362bfc980f0c98e
 DIST 8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar 1672677 RMD160 f37b1b6ebe8dbeb37885fc96a7b73bb390878031 SHA1 8ba05b53db763aa62efd389b2f1c8cfa889079ef SHA256 be4a7722d0b37ef497ef2a08876abb4f8e89477383501efb53a1975abd5063b7
 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 8FB21F7AAC2DEB6215D71F00DCE1FAE9107643A9-javac-impl-nb-7.0-b07.jar 1671756 RMD160 1da0920db04a9df1e8f776fa51324a1a01213af4 SHA1 8fb21f7aac2deb6215d71f00dce1fae9107643a9 SHA256 01a67f464138f0baa5824b566a17ccd9f03512f479e5f5bc8cfecb70d686c969
 DIST 907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar 2284306 RMD160 ee5935c7e43a60a453bef9bebe7068c20f481a25 SHA1 907363e301e2279930c82beb466bf2053c6e993b SHA256 4284a90a28993a18379c5b682eb63a77e6eb2911b5c1f2a60aace19b4938c91b
 DIST A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip 3076808 RMD160 5c05105359edcd9f603ce6cca7af6e755be83ca3 SHA1 a511890049a6a9b8d675f4417721337580cbd2f9 SHA256 39d928daced5072063fa3b9da3b6826ea2f52c4aa9082109eff9847fc1a442f1
 DIST AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar 1673570 RMD160 c3f0bb5fc77d7bcc9109fdcd19baa88f432e5c86 SHA1 aa6fd013c506bac98bce1174eacad00383650342 SHA256 a8f7a0047d8ca6021fbb2deb8c65ab0a658f10aba1a99d451aa05f25e1be171d
@@ -25,7 +23,6 @@ DIST B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip 301845
 DIST BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar 6503498 RMD160 dd40d7b00141fe3c3f2f23925683de2cb1837cd9 SHA1 bc0919190add3a7fb764c8412d10a2b026cd9563 SHA256 ddd722c70d74201e7f06463e6b59fd2563d2b043a36825cb47ede8f9bf03c213
 DIST C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip 5029407 RMD160 546dd5f8c9039925e89e76655265e6105658951d SHA1 c8a5e0d558ea7e7349f9d32b838553d5e7dd214f SHA256 7492417ca97835935912d931f9c2a1c9d98fc35fab455d086fd11f7ff663acb8
 DIST CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar 220841 RMD160 6d0afc9ec328e3b3c2901d0941b29feca57350ee SHA1 caf99efbb25e9183609d6fba4f63d85e7606903f SHA256 f6140d9e9f52a50c381ac500c119b268bae84e84c9ba37d361baf22d4e4ec68f
-DIST D1B67FE60F2FDD654FDAE0A84B300DDB72CBC209-indexer-core-4.1.1.jar 222456 RMD160 d3efbde69218a9255a3fd5256a27c2a2688e4e70 SHA1 d1b67fe60f2fdd654fdae0a84b300ddb72cbc209 SHA256 1c6d3f35f6ae907a6c9990f723bac8ca0d19234604ae0f8163267ee69456d1aa
 DIST D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip 4054621 RMD160 8d410595e912d2a8d30a0bdfbdf83413692a4269 SHA1 d88a41174c5f85d1b791d6a8e0f8b8a1c459d6c0 SHA256 5901b2a23c80f2669016697aadf27fefd8350fdd5cc876f8e979d5aac92a857e
 DIST E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar 130251 RMD160 bc5cbedbc2ae6ca85f2abd5718d946273ca0b356 SHA1 e90f4b2f8972aa5ef58139f16b78d5f6acfc6ef9 SHA256 cc025405fbfb86113b6f0c2f80c6d34babc59be0ef2c8778043ad108296faa21
 DIST EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar 231058 RMD160 798a4028230bb087efd5ee133f01b08a11e99452 SHA1 ea1f2b2504fc5abcb06146d858f74a97b85a2998 SHA256 7dbbee8f9000b1a157b75425f54495dd90c63621f5a8a88f40e5780712c12a5e
@@ -33,14 +30,11 @@ DIST F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip 930828
 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.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-java-7.0.1.ebuild 14888 RMD160 19208f48ccc5d5d19ba03bf7c60d27a429243b98 SHA1 2c116b4798f92dcac23bdcacd04bb01b0116c7d2 SHA256 98b4789883e375d817f509dbe9067b6f5c3685d92c714d443d51b00bb54704ad
-EBUILD netbeans-java-7.1_beta.ebuild 14287 RMD160 4b867ca716300db3448d57e61055e694d170f5ad SHA1 4e8a27cd31d7db585728676af3c8e972cb39a6ff SHA256 971045e0c62e803ab9f72c90aea275461cc67410721360634d779dfd48de2b6d
 EBUILD netbeans-java-7.1_rc1.ebuild 14414 RMD160 a2cf170d5e45ec24349836f85578d204025af150 SHA1 f43af9de02b227e2418c740864a2123611573648 SHA256 3682ab777d8460f7bfdea057c87d78c3cafdb4b2b28e403e3d2edcfbeb9ff043
 EBUILD netbeans-java-9999_p20111125.ebuild 14440 RMD160 dd260909f5f2ae131b9bf3f9af14dd8feb938f59 SHA1 c18f89dcf8cabde50d5eb9fa4bb609ffdf22fa19 SHA256 5b4da10c517f52c9db630a05704fb06f902be5e6afe4e94d669378342feccdad
-MISC ChangeLog 19788 RMD160 abe3b4462460024d2e2a477635933e1d8bed905e SHA1 74326d1bcc9516c451426b4926839e3f6017cb48 SHA256 1622f16831e53e0ef35b0aaf02efdda6d4e922133a78ad3a5466436d4c535ca6
+MISC ChangeLog 19917 RMD160 93975faab588a37f06a4ec424dc9cd91d7a9da17 SHA1 5e1330aef71fb651ac46ac7b57afbaae232ae36a SHA256 9b8db3a66196ba7e9468019b707a284bd7bfd5d3262070c11b0457084144c6fe
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-java/netbeans-java-7.1_beta.ebuild b/dev-java/netbeans-java/netbeans-java-7.1_beta.ebuild
deleted file mode 100644
index 694e48f..0000000
--- a/dev-java/netbeans-java/netbeans-java-7.1_beta.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="7.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
-	http://hg.netbeans.org/binaries/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar
-	http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar
-	http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar
-	http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar
-	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
-	http://hg.netbeans.org/binaries/89BFCE12CA01C7518739B5AC2C22A220B6B5510E-indexer-artifact-4.1.1.jar
-	http://hg.netbeans.org/binaries/D1B67FE60F2FDD654FDAE0A84B300DDB72CBC209-indexer-core-4.1.1.jar
-	http://hg.netbeans.org/binaries/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/8FB21F7AAC2DEB6215D71F00DCE1FAE9107643A9-javac-impl-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar
-	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
-	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
-	http://hg.netbeans.org/binaries/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar
-	http://hg.netbeans.org/binaries/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar
-	http://hg.netbeans.org/binaries/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:2.2
-	dev-java/jdom:1.0"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	dev-java/antlr:0[java]
-	dev-java/asm:2.2
-	dev-java/cglib:2.1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/ehcache:1.2
-	dev-java/fastinfoset:0
-	dev-java/javassist:3
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	dev-java/jsr250:0
-	dev-java/jta:0
-	dev-java/jtidy:0
-	>=dev-java/maven-bin-3.0.3:3.0
-	dev-java/saaj:0
-	dev-java/stax-ex:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.2.zip || die
-	ln -s "${DISTDIR}"/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip maven.embedder/external/apache-maven-3.0.3-bin.zip || die
-	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
-	ln -s "${DISTDIR}"/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar j2ee.eclipselink/external/eclipselink-2.3.0.jar || die
-	ln -s "${DISTDIR}"/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.3.0.jar || die
-	ln -s "${DISTDIR}"/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar j2ee.toplinklib/external/glassfish-persistence-v2-build-58g.jar || die
-	ln -s "${DISTDIR}"/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar || die
-	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
-	ln -s "${DISTDIR}"/89BFCE12CA01C7518739B5AC2C22A220B6B5510E-indexer-artifact-4.1.1.jar maven.indexer/external/indexer-artifact-4.1.1.jar || die
-	ln -s "${DISTDIR}"/D1B67FE60F2FDD654FDAE0A84B300DDB72CBC209-indexer-core-4.1.1.jar maven.indexer/external/indexer-core-4.1.1.jar || die
-	ln -s "${DISTDIR}"/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/8FB21F7AAC2DEB6215D71F00DCE1FAE9107643A9-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar j2ee.eclipselink/external/javax.persistence-2.0.jar || die
-	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
-	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
-	ln -s "${DISTDIR}"/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_1.0.0.jar || die
-	ln -s "${DISTDIR}"/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar libs.springframework/external/spring-2.5.6.SEC01.jar || die
-	ln -s "${DISTDIR}"/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip libs.springframework/external/spring-framework-3.0.2.RELEASE.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven || die
-	dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
-
-	insinto ${INSTALL_DIR}/ant
-	dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
-	dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
-	doins -r ant/extra
-	dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
-	doins -r ant/nblib
-	dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
-	local vertasks=$(ls -d /usr/share/ant/tasks-*)
-	dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
-
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
-	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	# javac-api-nb-7.0-b07.jar
-	# javac-impl-nb-7.0-b07.jar
-	# org-netbeans-modules-java-j2seplatform-probe.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# dir: eclipselink
-	# eclipselink-javax.persistence-2.0.jar
-	# eclipselink-jpa-modelgen-2.2.0.jar
-	# eclipselink-2.2.0.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
-	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
-	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
-	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
-	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
-	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
-	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
-	# ejb3-persistence.jar
-	# hibernate-annotations.jar
-	# hibernate-commons-annotations.jar
-	# hibernate-entitymanager.jar
-	# hibernate-tools.jar
-	# hibernate3.jar
-	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
-	# jdbc2_0-stdext.jar
-	rm jta.jar && dosym /usr/share/jta/lib/jta.jar ${instdir}/jta.jar || die
-	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
-	# gmbal-api-only.jar
-	# http.jar
-	# jaxws-rt.jar
-	# jaxws-tools.jar
-	# management-api.jar
-	# mimepull.jar
-	# policy.jar
-	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
-	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
-	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
-	# woodstox.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	# jaxws-api.jar
-	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
-	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-api.jar || die
-	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/maven
-	pushd "${D}"/${instdir} >/dev/null || die
-	# indexer-artifact-4.1.1.jar
-	# indexer-core-4.1.1.jar
-	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
-	# maven-dependency-tree-1.2.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-2.5.6.SEC01.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
-	pushd "${D}"/${instdir} >/dev/null || die
-	# spring-aop-3.0.2.RELEASE.jar
-	# spring-asm-3.0.2.RELEASE.jar
-	# spring-aspects-3.0.2.RELEASE.jar
-	# spring-beans-3.0.2.RELEASE.jar
-	# spring-context-support-3.0.2.RELEASE.jar
-	# spring-context-3.0.2.RELEASE.jar
-	# spring-core-3.0.2.RELEASE.jar
-	# spring-expression-3.0.2.RELEASE.jar
-	# spring-instrument-tomcat-3.0.2.RELEASE.jar
-	# spring-instrument-3.0.2.RELEASE.jar
-	# spring-jdbc-3.0.2.RELEASE.jar
-	# spring-jms-3.0.2.RELEASE.jar
-	# spring-orm-3.0.2.RELEASE.jar
-	# spring-oxm-3.0.2.RELEASE.jar
-	# spring-struts-3.0.2.RELEASE.jar
-	# spring-test-3.0.2.RELEASE.jar
-	# spring-tx-3.0.2.RELEASE.jar
-	# spring-webmvc-portlet-3.0.2.RELEASE.jar
-	# spring-webmvc-3.0.2.RELEASE.jar
-	# spring-web-3.0.2.RELEASE.jar
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/toplink
-	pushd "${D}"/${instdir} >/dev/null || die
-	# toplink-essentials-agent.jar
-	# toplink-essentials.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}
-
-pkg_postinst() {
-	elog "Note that if you change your version of ant, you have to re-emerge"
-	elog "this package to get updated the link to ant tasks of that specific"
-	elog "version."
-}

diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index 0304a16..ad37877 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-javacard-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-javacard-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index d0d2f45..b445b41 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -3,14 +3,11 @@ DIST 6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip 7788619 RMD160 b85
 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.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 RMD160 2838467c87ae15ce2a24214cb6d69ff5c77cbcd5 SHA1 74adc0ad143660dd782396a68fe702b2a3a43a9a SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c
-EBUILD netbeans-javacard-7.1_beta.ebuild 4951 RMD160 b24dbb2796d34d5551a78b1eb9909de8d5640bb2 SHA1 79763b0910deec1684a4982f85d0a711e5b7e190 SHA256 e10d99770cf3394ce66fa34107451cb5897801347033caba9ef4c2a6312434b4
 EBUILD netbeans-javacard-7.1_rc1.ebuild 4967 RMD160 381db183abe3b673a806fe7ef1091efb902c6026 SHA1 34be685df72d92bb54c2ea464ecfea59a30baa59 SHA256 53e38c57b2513c319b5f5f67696f435d0bdc870cdfe5f227778b2cfe178460a0
 EBUILD netbeans-javacard-9999_p20111125.ebuild 4993 RMD160 ef141af187af665eaa104993022b3525d3d6b2b6 SHA1 93f545b7c8ccbb86d7e260a37a227f234ed37d7a SHA256 56e23f5cd48502d7b8285ac7191577efc62659bcad5a5438ec95c6288a2b5dc6
-MISC ChangeLog 20282 RMD160 0de8679778837b86b2eec02aad02dd9fcceb7e54 SHA1 b44757968b3da28962e5673c161061e1c5464b2d SHA256 8579427de521b7e878a940e3e92285c107a16cec926fa1b41afee4a2294c4670
+MISC ChangeLog 20415 RMD160 2dc2b91663f1df0a393b4fbb40b903ea4ecad37d SHA1 de4a7c8cd11720b38fee7fc700367f2958938007 SHA256 f38a0f94c27fc989e3631fa3b44896b03360df4bfa482e1ff05475a7c22452ac
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-7.1_beta.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-7.1_beta.ebuild
deleted file mode 100644
index b2d2a55..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-7.1_beta.ebuild
+++ /dev/null
@@ -1,142 +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.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
-	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
-	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	dev-java/ant-contrib:0
-	dev-java/asm:3
-	dev-java/bcel:0
-	dev-java/commons-cli:1
-	dev-java/commons-codec:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-logging:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
-	ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
-	ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_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 7063eec..f24166c 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-javadoc-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-javadoc-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 959b3b9..145a392 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -1,14 +1,11 @@
 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.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 RMD160 d5b77264285edf96d0a3a30666a4ae72ee2387a7 SHA1 ec29b545b0632d7ea9e8bdd2208f5d1fe9532561 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f
-EBUILD netbeans-javadoc-7.1_beta.ebuild 5804 RMD160 ef81507ead86f393096028c287b6b1146da7b837 SHA1 aff145dea81cef3603d7f6030fe4a53394e97425 SHA256 b379a25d3f829fcff76a80ad78e1e828de844f4ace660220f20e75770f5959c7
 EBUILD netbeans-javadoc-7.1_rc1.ebuild 5819 RMD160 2c2550796e63f106c02268e3457d8c3a0190b587 SHA1 0f76ea1f33d53468b8751d50b4dcd51f838b996b SHA256 2b8b503011e0325b907f84e305a4a776c7aafbf10274d3a26be8e71687829db4
 EBUILD netbeans-javadoc-9999_p20111125.ebuild 5845 RMD160 e39fce7c1472570a58821dd1a1da1887f3d38c0d SHA1 3f94dd42cf7fba8d3c7c6e7a4c17d413c51c4f92 SHA256 b49f2be5354e953dea876cc72ca19b306728bada4137400a91b647ed5980771f
-MISC ChangeLog 19809 RMD160 77d314498254555bfd2f8973ace908fc1da43941 SHA1 4fde6feea6396a07a433ce1a9d60b3717dc26561 SHA256 361205d548045775e257cd0d2975e097cca684686b84dbc8c86b1fc419961b62
+MISC ChangeLog 19941 RMD160 0b4a9e38b724934ea9bd55894312bc7d7f798eae SHA1 9ff8bb9925c5e2418f57275a2121854afb42d5a1 SHA256 f323978eda75734077fb77db1b493eab851ebacb941665f180df24d8588d71bf
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-7.1_beta.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-7.1_beta.ebuild
deleted file mode 100644
index 84d83a5..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-7.1_beta.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaDocs"
-HOMEPAGE="http://netbeans.org/"
-SLOT="7.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	dev-java/javahelp:0
-	dev-java/junit:4
-	~dev-java/netbeans-apisupport-${PV}
-	~dev-java/netbeans-cnd-${PV}
-	~dev-java/netbeans-dlight-${PV}
-	~dev-java/netbeans-enterprise-${PV}
-	~dev-java/netbeans-ergonomics-${PV}
-	~dev-java/netbeans-groovy-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-javacard-${PV}
-	~dev-java/netbeans-mobility-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-php-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-websvccommon-${PV}"
-RDEPEND=""
-
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.2.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.8.2.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
-	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.apisupport.built
-
-	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
-	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.cnd.built
-
-	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
-	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.dlight.built
-
-	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
-	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.enterprise.built
-
-	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
-	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ergonomics.built
-
-	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
-	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.groovy.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
-	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.javacard.built
-
-	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
-	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.mobility.built
-
-	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
-	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.nb.built
-
-	ln -s /usr/share/netbeans-php-${SLOT} php || die
-	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.php.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
-	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.profiler.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	eant -f nbbuild/build.xml bootstrap || die
-	ANT_OPTS="-Xmx1536m" eant -f nbbuild/javadoctools/build.xml build-javadoc
-}
-
-src_install() {
-	rm nbbuild/build/javadoc/*.zip
-	java-pkg_dojavadoc nbbuild/build/javadoc
-}

diff --git a/dev-java/netbeans-javafx/ChangeLog b/dev-java/netbeans-javafx/ChangeLog
index 1c21b43..93d7c61 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-javafx-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-javafx-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index a481a97..eeb9a00 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -1,12 +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.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
-EBUILD netbeans-javafx-7.1_beta.ebuild 3575 RMD160 c2ba08e0a499ec7b21154fda15dfa4d32659fc9d SHA1 0fb7260ab05e5be36b320af40133f84205b6abdd SHA256 3acf3cce8a87a928e7e72f4bbf9a0b5df8dde5b9d509241689fbf0cdfde2df3f
 EBUILD netbeans-javafx-7.1_rc1.ebuild 3590 RMD160 b863f683ce14339536a43bf1f4205a29d9a0413f SHA1 6e73f7380421f01c119a8734bc6992b038d12cca SHA256 90f855fd40f5fdd5c42a0ee5c5e9a231d5211fca80b5c68991a04a0d5c723e6d
 EBUILD netbeans-javafx-9999_p20111125.ebuild 3616 RMD160 b71ea0007a0986978a4926d763dc266be72100c7 SHA1 48ee934858ca652bdf34d82597a62e8d63ef305a SHA256 6829491d27104f07972f6f3c8a1aa77083ca5f8b03d3f19984347fc1a64839d7
-MISC ChangeLog 6496 RMD160 1601385239fcb6b9ba20051de0c918921b0d7113 SHA1 921267dbeb5a369f23f065ea5b9872a73917527f SHA256 ebfc3cb75e7c6f979207cfe5e6679aaa8d1c1d0388290b3d58c945700a5d9a45
+MISC ChangeLog 6627 RMD160 ba2bdcaffc46cbf31fe5f509091d03d08299606c SHA1 c58236804fa46d5dedf94a74fae614c0a792a1d3 SHA256 bfd9242a2d2b58b60f801a9dbf911a857648dbbc83f3999ed707352d305dab31
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-7.1_beta.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-7.1_beta.ebuild
deleted file mode 100644
index b53ff27..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-7.1_beta.ebuild
+++ /dev/null
@@ -1,112 +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 JavaFX Cluster"
-HOMEPAGE="http://netbeans.org/projects/javafx"
-SLOT="7.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-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
-	dev-java/junit: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.javafx -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
-	ln -s "${DISTDIR}"/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar jemmy/external/jemmy-2.3.0.0.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.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-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/javafx >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/javafx$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javafx
-}

diff --git a/dev-java/netbeans-mobility/ChangeLog b/dev-java/netbeans-mobility/ChangeLog
index 4a284d1..4190176 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-mobility-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-mobility-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index b97f81b..b3dd48c 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -9,14 +9,11 @@ DIST D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar 1791104 RMD16
 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.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 RMD160 97622d84257291737ea08fa69205ba0377747896 SHA1 2240a20d8c81315c88ed2468e6ca9e3a54ecc5d5 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130
-EBUILD netbeans-mobility-7.1_beta.ebuild 7524 RMD160 ebaf17fc52d0ccdd244ad6280e2c19fa17b0182f SHA1 1c3d9a336bb9f3c7e46aba03d641db7ae40b9035 SHA256 bbc1f4984fb1d90744e05452322f5394e26dd4520ee8d622db82a0181f75ecbd
 EBUILD netbeans-mobility-7.1_rc1.ebuild 7540 RMD160 b9114bbf9b035e151a6c22a5bcf77508f4077965 SHA1 f31565c7b983bba1f82af4b43de44a15d44f9c7d SHA256 6764f5476e57abf00f3d56d2c09cefdd5bc54881b4847ae552cce23fe11922e2
 EBUILD netbeans-mobility-9999_p20111125.ebuild 7566 RMD160 a70db37bb2f20931730dc0dd1f089005f2d738b6 SHA1 66f37fd5531fc9b8eeb97c42814170a09649e840 SHA256 85dc020adcc8f57cbf59704f453f40c31bc6a163d77bde16afef171a368753f6
-MISC ChangeLog 20423 RMD160 bc0dec87995189cb9c52a8c8bf817aa27fd2e9b1 SHA1 c21b597b0a503a486a2b4325b90e5e0450cf173a SHA256 8b696290c0b86953397fd3c355266d9765aad89c30f706c4132253f4e4f898f8
+MISC ChangeLog 20556 RMD160 b239235560eebc449dc05aad56c38eb9af82a5d5 SHA1 b3d24cd13037dcfe1ddf4606ddb4ba3313995e13 SHA256 798bbc3fd946c8a4dd4adb40fe20006af861a7543180ac24c50749befa767018
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-7.1_beta.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-7.1_beta.ebuild
deleted file mode 100644
index 566a10d..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-7.1_beta.ebuild
+++ /dev/null
@@ -1,175 +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.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar
-	http://hg.netbeans.org/binaries/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar
-	http://hg.netbeans.org/binaries/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip
-	http://hg.netbeans.org/binaries/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar
-	http://hg.netbeans.org/binaries/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar
-	http://hg.netbeans.org/binaries/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.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-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"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f | grep -vE "mobility.databindingme/lib/netbeans_databindingme.*\.jar" \
-		| grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" \
-		| grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" \
-		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
-		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar mobility.deployment.webdav/external/jakarta-slide-ant-webdav-2.1.jar || die
-	ln -s "${DISTDIR}"/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar mobility.deployment.webdav/external/jakarta-slide-webdavlib-2.1.jar || die
-	ln -s "${DISTDIR}"/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip mobility.j2meunit/external/jmunit-1.2.1-api.zip || die
-	ln -s "${DISTDIR}"/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar mobility.j2meunit/external/jmunit4cldc10-1.2.1.jar || die
-	ln -s "${DISTDIR}"/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar mobility.j2meunit/external/jmunit4cldc11-1.2.1.jar || die
-	ln -s "${DISTDIR}"/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar svg.perseus/external/perseus-nb-1.0.1.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_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 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-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.1.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 903738d..190e9a2 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-nb-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-nb-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index cc257d7..8bc5fa1 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -4,14 +4,11 @@ AUX 9999/keychain-support.patch 872 RMD160 8063d4dc226f04c6fda72fd9b8837757eb3f3
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.0.png 20011 RMD160 a941b71b571a9cd30c49446aef1bd4244e689465 SHA1 ebd2e748bb4bc29e667ead9a2fb717a9017f9405 SHA256 1d519f018ebeff6e29436c8492dbb266446bd0144fb5519b2ef6637664de6f4a
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-nb-7.0.1.ebuild 5116 RMD160 df3e2ea3364e01de002fbb97b56c2bf927ba0e2c SHA1 f962fd0ba56bab72ef843342d94d0992e615698f SHA256 17ac4a9aa7931d052a899ad8649bed42d5c37a06d913e0dc8ded118d7ef01c47
-EBUILD netbeans-nb-7.1_beta.ebuild 4968 RMD160 927586ad1bf5d2a2518e02f41a2eb738805bd725 SHA1 aa32a8b4671c0e05983e703b1ed145de0877bd9e SHA256 4ad186d4712fbfb3ba3ecce9ddbcf17498901d5fdcbc8ef6e8f507180079178e
 EBUILD netbeans-nb-7.1_rc1.ebuild 4984 RMD160 f5bbc2533f63c5561019309b0f7e2cbd68a7b270 SHA1 e0ea792e52b933e046023dd457b519e39d6dbaeb SHA256 e99b5fd6c3f147bcb34ba531810f0415fbc5d6f23ac9b3e0baa0f7603667f010
 EBUILD netbeans-nb-9999_p20111125.ebuild 5010 RMD160 bb71aaf3903113b2894ca1e68c18c8b5917a404c SHA1 ff7e89c2e6e0c3bad0c7424b1c38b0e6693adebd SHA256 a12bcbf00857da92e97b7856669cb9bfdfd0e47ecdd0053cf4ac86b2c3fbc13f
-MISC ChangeLog 19584 RMD160 1f7d4883af254c107ca39fe1b4930c3b88b38dd1 SHA1 8130d509b2649a1833b1d427e1ac927e0970a2f6 SHA256 1a42486755dfdb6b487d50a840b2861549b18cc90374415f9af4564a31f43a98
+MISC ChangeLog 19711 RMD160 65f1538e7b598203aef49419c0a5d899092d8605 SHA1 cc12c8816b67a3582af43b3542b76da9aef90f69 SHA256 006cb7d0aa31720566b4f1fdf3b904482df3d2c90f38c54869a1eb24d8e97ec6
 MISC metadata.xml 396 RMD160 80c4086b305af8d5e4adae8a263111590f183c05 SHA1 11224a41781dde9ebd92c32e5c0a9d1921b628cb SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49

diff --git a/dev-java/netbeans-nb/netbeans-nb-7.1_beta.ebuild b/dev-java/netbeans-nb/netbeans-nb-7.1_beta.ebuild
deleted file mode 100644
index 8610de5..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-7.1_beta.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.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE="keychain"
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	keychain? (
-		net-misc/keychain:0
-		net-misc/x11-ssh-askpass:0
-	)"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-	use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans >/dev/null || die
-
-	insinto ${INSTALL_DIR}/nb
-
-	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r nb
-	dodoc *.txt
-	dohtml *.html *.css
-
-	insinto ${INSTALL_DIR}/bin
-	doins bin/netbeans
-	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
-	fperms 755 ${INSTALL_DIR}/bin/netbeans
-
-	insinto /etc/netbeans-${SLOT}
-	doins etc/*
-	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
-
-	# fix paths per bug# 163483
-	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
-		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
-		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
-	fi
-
-	dodir /usr/share/icons/hicolor/32x32/apps
-	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
-	dodir /usr/share/icons/hicolor/128x128/apps
-	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
-	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
-
-	popd >/dev/null || die
-
-	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
-
-	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
-	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
-}
-
-pkg_postinst() {
-	if use keychain ; then
-		einfo "You enabled keychain support, that means NetBeans will use keychain for managing"
-		einfo "your keys while connecting to ssh protected repositories. If you want to load some"
-		einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir"
-		einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file,"
-		einfo "each key on single line, for example:"
-		einfo "id_dsa"
-		einfo "id_dsa_gentoo"
-		einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked"
-		einfo "for key password (only this time and never again). You can find more information"
-		einfo "about keychain at 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 9c2435e..b4c614d 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-php-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-php-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 4ec4a9c..c626dad 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -5,14 +5,11 @@ DIST BB8CBBD70CCD7ABF40943487C48512D82FB01AE9-phpsigfiles.zip 498740 RMD160 aa0e
 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.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-php-7.0.1.ebuild 4151 RMD160 948630039891c480cbc0a9440fd9d74438bbcca4 SHA1 9afb5f8b29bc9c86fce11b8a44976da980741ec8 SHA256 3aee393fe89aa4788ccd17af46f1df43a5681c28af6d580724d8db0f5e804ff0
-EBUILD netbeans-php-7.1_beta.ebuild 4141 RMD160 2e0094fae2ee104bc4364e75427d7862e103f922 SHA1 ac31d5b3ffc020eacf2de81bc6b694d8d21700b5 SHA256 acb776ea91e7854a821f6473a411d28564a913657577395631b7b0c298949514
 EBUILD netbeans-php-7.1_rc1.ebuild 3937 RMD160 33c8f782a7db3ce10c15b7e8d220075ea2d0a46f SHA1 e55d88a1d254a39a0325b687a3fc8fa42b7d840f SHA256 2f4ea87d6756ea9179d7b2a33ca945dd193d2914c625be5c333d6f8b4064ab00
 EBUILD netbeans-php-9999_p20111125.ebuild 3963 RMD160 dd70373404128946fbb33562607aae51b073a52e SHA1 62133b1d5636e7367cda3aafa41f7ab2d7698a32 SHA256 fb50cc1840cf2c02fd52f434c0d4a81abbf88a88994cc6a755531e68eafefd20
-MISC ChangeLog 19145 RMD160 fa2b3f579b3b09a52542894a475b75de13f49ace SHA1 1632b495caca306bed630edbeeea45a1033b7dd4 SHA256 4e55eeeae21100a453fbc9516b4479bc93dfdd7ee7ed6a285c12288cd3ea056c
+MISC ChangeLog 19273 RMD160 d55e99b1b5be2137b8e4eaf58e01184293a34d05 SHA1 4e8b47057cd5e449df6b49077c072b71ad703dfb SHA256 6810a13add43729c675a9dc57bcb8131079f5d403377891f9796f0e4282789d1
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-php/netbeans-php-7.1_beta.ebuild b/dev-java/netbeans-php/netbeans-php-7.1_beta.ebuild
deleted file mode 100644
index 7ae4470..0000000
--- a/dev-java/netbeans-php/netbeans-php-7.1_beta.ebuild
+++ /dev/null
@@ -1,120 +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.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
-	http://hg.netbeans.org/binaries/C3E8FC2F69123F598F29F930DC39F5B55A08824C-phpsigfiles.zip
-	http://hg.netbeans.org/binaries/06D0F78D33106A7E5D33B414BE4CA0CE474D969A-preindexed-php.zip
-	http://hg.netbeans.org/binaries/40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/javacup:0"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
-	ln -s "${DISTDIR}"/C3E8FC2F69123F598F29F930DC39F5B55A08824C-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
-	ln -s "${DISTDIR}"/06D0F78D33106A7E5D33B414BE4CA0CE474D969A-preindexed-php.zip php.project/external/preindexed-php.zip || die
-	ln -s "${DISTDIR}"/40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.zip php.editor/external/predefined_vars.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_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 5996965..df8858c 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-platform-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-platform-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index b3b3ec5..ab4e8e8 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -7,14 +7,11 @@ DIST BD5615C6A15497B60A0AAA9A04D4F05E2BC42D07-felix-main-2.0.2.jar 23434 RMD160
 DIST F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar 416668 RMD160 de31d5e7d732da26015589c920fe2c0fb79813b9 SHA1 f1c19117b73a6819fa91eb646ecba7f41073dc2a SHA256 292d7dd3f88d0b692a6cf15d1299dc0126d751be0f8e32114a6c94bf3d041bf4
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-platform-7.0.1.ebuild 5049 RMD160 d6a01c7785d02b9e5aebb1a2f192c5a2b6f1ccae SHA1 2acc23f9e9f6f5c60cabce30e651b3d31d91ac41 SHA256 b67cf0867358fea808614c02b8b6ea2ab88223f8642175ac3f91dc8c610aca4e
-EBUILD netbeans-platform-7.1_beta.ebuild 5015 RMD160 d451518dbaa2b909ccdf25e2233f84ac4f5c9d1b SHA1 cb9647971def8a358e84eea4fe555daaea25a82e SHA256 ede89cde75008458a615ee8b2ec09b6066b37e6e72adbc48b4f7dc3cd917e8c1
 EBUILD netbeans-platform-7.1_rc1.ebuild 5031 RMD160 f23b230e7a1b3dbe429b1189123cb5ffae2ac0ad SHA1 d5014156fbbe7fae0b15cbe958e400dfb4550acc SHA256 3958d1bf32eb36cc672ca67236be19ea39eb2a8146f72d3d3f557646b62f317d
 EBUILD netbeans-platform-9999_p20111125.ebuild 5057 RMD160 a671b860305c015ed71c64dba4ec4f44234107ea SHA1 d5513c24802f0f47f5e59359b5c3096cd1023d74 SHA256 46cc42b5852d74b0b7b1695911c1664e0850fcc15cf1e10f8af138e638d0c12d
-MISC ChangeLog 20987 RMD160 187164557bcf6b834057589472c12160982a2821 SHA1 6ac1d1e6306dc42e2760486a742accdf055ea346 SHA256 3e5a1dd829fb53356e52482a31f69198df9e07838cf81176d14fe376ff8c1f6b
+MISC ChangeLog 21120 RMD160 b64ae1dadefec0e7d620769fc2c1f7e8cae62c48 SHA1 54b9e5e50ec8c39cf0c6b49d53624b913090ed95 SHA256 260b2f1146a7d439377124870274a1e642b386e136ab9cb9c01ad95f368e1ed0
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-platform/netbeans-platform-7.1_beta.ebuild b/dev-java/netbeans-platform/netbeans-platform-7.1_beta.ebuild
deleted file mode 100644
index ac2c6fa..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-7.1_beta.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Platform"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="7.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar
-	http://hg.netbeans.org/binaries/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar
-	http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
-	http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar
-	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="dev-java/javahelp:0
-	>=dev-java/jna-3.2.7:0
-	dev-java/swing-layout:1[source]"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar libs.felix/external/felix-3.2.2.jar || die
-	ln -s "${DISTDIR}"/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar netbinox/external/org.eclipse.osgi_3.6.0.v20100517.jar || die
-	ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.jar || die
-	ln -s "${DISTDIR}"/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar libs.osgi/external/osgi.core-4.2.jar || die
-	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-	# upstream jna jar contains bundled binary libraries so we disable that feature
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into core.nativeaccess/external jna platform.jar platform-3.2.7.jar
-	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-3.2.7.jar
-	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/platform >/dev/null || die
-
-	java-pkg_dojar lib/*.jar
-	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r *
-	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
-	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
-	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
-	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
-	rm -fr "${D}"/modules/lib || die
-
-	popd >/dev/null || die
-
-	fperms 775 ${INSTALL_DIR}/lib/nbexec
-	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
-
-	local instdir=${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	# felix-main-2.0.2.jar
-	# felix-2.0.3.jar
-	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
-	rm jna-3.2.7.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-3.2.7.jar || die
-	# osgi.cmpn-4.2.jar
-	# osgi.core-4.2.jar
-	rm platform-3.2.7.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/platform-3.2.7.jar || die
-	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
-	# updater.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
-}

diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index 274cd46..7cff92c 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-profiler-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-profiler-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index b272d07..9fe259d 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -1,13 +1,10 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-profiler-7.0.1.ebuild 3113 RMD160 dcfd93da14dbcf6a090cefd843bd8e6bbdcaa051 SHA1 a9fee09c442cbcd4187f2dc1443e19cdd9a96003 SHA256 588797a6b81c7f5ba5e1cf06ad66e593bd89aa28261b68006ebb973d0eae8044
-EBUILD netbeans-profiler-7.1_beta.ebuild 3103 RMD160 b13f5713ba3ee16ec9c54b791369fb4d0615f82d SHA1 0ea2565f4523855e7f815d6aedeac10601bafa20 SHA256 e30d318331f537d5ef56e9125ef2c133b1a05f42952fcfecb756c82059024db9
 EBUILD netbeans-profiler-7.1_rc1.ebuild 3119 RMD160 4860b0839cdc360f46a79c96550ba96d1574e8c8 SHA1 4f83e99ceafa6f30590beda5bf37eab8e8a5d8e2 SHA256 a4aa64bd9877201a82e5cdb68ca86e2f6cfb62a33f91ec088311da09da737e23
 EBUILD netbeans-profiler-9999_p20111125.ebuild 3145 RMD160 49f0b1ef00119964402a9a11f98456fb27eca006 SHA1 b7a55d8aa64dd79ec7e46311d6c9fc93e01aec33 SHA256 65758989d03c2bcdee88d2a6c70d6291e5923760a0a32e3aabbe23bca27bfd15
-MISC ChangeLog 20282 RMD160 f65039ae05e57e9c901f88c6722e9dff4d44dd02 SHA1 b05e99c3138660c20059a4c18909ff5b1b8c3bbc SHA256 b20a3db7bd7a2d388fb9451f00663ee42e110aa29c401cc4257f2bfb48e2a81f
+MISC ChangeLog 20415 RMD160 7e8449b906febd4adcf1dadf3689d59d9e5a44c1 SHA1 cfd923f9a2402886e4c3e973442239ea78b9578b SHA256 89593c6975aa84140121a80a153a434586e54e8e8b279356a1060cd7e34485b9
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-7.1_beta.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-7.1_beta.ebuild
deleted file mode 100644
index 8be50e7..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-7.1_beta.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 Profiler Cluster"
-HOMEPAGE="http://netbeans.org/projects/profiler"
-SLOT="7.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.profiler -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_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 1fdfe3d..4e747cb 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: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-websvccommon-7.1_beta.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-websvccommon-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 89d0d85..498a773 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -1,13 +1,10 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 RMD160 78a0dae148b2c583b596a625a6e6622a1c7cafcc SHA1 f3e52c193e9dfdf9d236f655a705c55da76cfad4 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda
-EBUILD netbeans-websvccommon-7.1_beta.ebuild 2682 RMD160 f52f3d0404701eed8bb84d3e3911d63ba0912ae8 SHA1 28745544628045640cea377f15a3868314ded46c SHA256 39b79567e8e4b7bcef07d1680fbb09da63f55d3081c03cb8f38750823dda337c
 EBUILD netbeans-websvccommon-7.1_rc1.ebuild 2698 RMD160 a1d1797ee15777c3d7381921210d13d04febb6a9 SHA1 451118e32854676b552a03e1dc276865bc8f2e33 SHA256 b2ecb9f177280f8b4d548fa23ed124849bd8b45863d25bc750e702235b57eb6f
 EBUILD netbeans-websvccommon-9999_p20111125.ebuild 2724 RMD160 b5fa0fe4c87ce915bab51a9e0f32fb60ee1513d7 SHA1 a019bedb10059065e9d7ed611b1d559cb5e59e83 SHA256 0f3f2346edd40dbb9d2429a64eabf37f0ea2b26bb42ea3d5ca1241ebd6171a37
-MISC ChangeLog 21170 RMD160 2680f8c0595a5c36812c7393b78ed75932af9f7f SHA1 544e033a8074b26fdf447c8e770eb16eed8be8c5 SHA256 95c1c4231b1be65d106882f7c3cddee9456ffa57e2fb29e6626aac02974f2074
+MISC ChangeLog 21307 RMD160 da7524afda9d1e0e9b0250b351b9f89ff8b6652b SHA1 7a6ca73effce1cd1caf95ce86ee3b2d92a67a08d SHA256 c83996f41db7667ad9fdd8a720795dff086d9897fdb04255930ca3dae08a4529
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.1_beta.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.1_beta.ebuild
deleted file mode 100644
index 186afe3..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.1_beta.ebuild
+++ /dev/null
@@ -1,95 +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.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND="virtual/jdk:1.6
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.websvccommon -Dext.binaries.downloaded=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-7.1-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-7.1-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS71_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 3f57c0c..2c36925 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Nov 2011; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-7.1_beta-r1.ebuild:
+  Removed obsolete ebuild from 7.1 branch
+
 *netbeans-7.1_rc1 (28 Nov 2011)
 
   28 Nov 2011; Miroslav Šulc <fordfrog@g.o> +netbeans-7.1_rc1.ebuild:

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index c68e021..cb9af14 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -1,17 +1,13 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
-DIST netbeans-7.1-build.xml.patch.bz2 2377 RMD160 ccd282e6ce2b3e9283fa6faeaf75f8eada2ca8e5 SHA1 ff2eef00d47b572d7e64f41cb8d5f99b7bb13061 SHA256 e7efa99c7d53ae3bd2f8c916947eaa4c9bd96ac33069a9277173a73d3a71ac46
-DIST netbeans-7.1beta-201109252201-src.zip 176829721 RMD160 1d79b221dd17b57ea05a635b4fdd25fd7882b700 SHA1 e170e16f4a955528a6f0dabb853f75f7ad09bfb5 SHA256 07a534e151070899a3f0f250ce3d3fc9e904c1b37df266d77c5df670fc2090e4
 DIST netbeans-7.1rc1-201111242103-src.zip 171725061 RMD160 082ef0a256a2c74b6611265914c2e79b2b1b45f0 SHA1 eba0d5e5062d420deb4867fdc393aff6aec36163 SHA256 4d1af2d3b590237381147b35e92ba99795b695f6b128607d127b8343aafdec8d
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-l10n-7.0.1-20110930.tar.bz2 13491185 RMD160 1db97d282a59bbee490fa06046e12c5bc8fb3437 SHA1 fcbe2052e0ee4c9e85ec4819e3c723c53dd0a01d SHA256 ba1b83dd4a543918b7147304d8bba6e35d39fe4e567432766e4749b100c9b2a3
-DIST netbeans-l10n-7.1-20110926.tar.bz2 13489084 RMD160 24fee5132da760376a1439c479c7db4d3156da84 SHA1 3fff23001898af24fc4bb59889cbaf475e0f700a SHA256 c714880e99b30cf54b87f42d4fea89ad24942ab07acc952eb69f6713b4ba9575
 DIST netbeans-l10n-7.1-20111129010014.tar.bz2 13775638 RMD160 e7e04800407c60fd3f2d7abc7ff2e487f87ffb32 SHA1 dcb570255b7a600211ab1c0e31008ad6368171a8 SHA256 75a49d277ebae04b73935b96304e9ab33519a628f73f2ef3ce1b19a5a45f6f53
 DIST netbeans-l10n-9999-20110613.tar.bz2 13405097 RMD160 9f8fb8fcdbdf87c958b2a8e162e150cd30c6c327 SHA1 fb06e579426ebad1909f17e36d31fe1b1b6d9f7d SHA256 c8ad3bfdd8c7da892780caa29cef57006f39016b6598327ebdab5704c9ad08a4
 DIST netbeans-trunk-nightly-201111250600-src.zip 171937249 RMD160 28797408fb5c72497927d60d8d13d59f6a836f76 SHA1 b3e0a0060a513156b58b946bab473a29e54bffbf SHA256 0c03cd89123688a27a3e51830400a06d11fdb0e1f3c0f3289237474785e660e1
 EBUILD netbeans-7.0.1-r2.ebuild 6736 RMD160 8780b584bedf0cfd4cd40f1e26c015079b19da4c SHA1 9e31064b4e19fad1d0ca79476f32c5153b4b18cf SHA256 e808fba2ddb516270d93b5cf67cff60d98b37ca58a158878f2e3b3ad696cfc82
-EBUILD netbeans-7.1_beta-r1.ebuild 6908 RMD160 6987adeb8f99d340a207eb662d406cc80c354478 SHA1 a296dc5dddf14ed25fee6eba5c35aed5cb2490d6 SHA256 563e9d9b2d12e31d6369fd3c2f0d24a1815a1c24b2f99bd19626020452080413
 EBUILD netbeans-7.1_rc1.ebuild 7011 RMD160 40cc9a039e35600ebfebe2dd6b2c254f62ba02f3 SHA1 6907e2b2e048023264b89660ab9dafdb2816bb6c SHA256 f674a723d53b567c0531b1c2ae594e4c2beff4ecc9c14a9752d2af5bfca9f795
 EBUILD netbeans-9999_p20111125.ebuild 6991 RMD160 2ddb224a9b23cad8be200a3ce0d064132f6db908 SHA1 93ec85a037c286c3ff26c1248e0b38901b32dcca SHA256 248bb53d67b0795a7e9c65a97447abae6316729a9a6c3dc96c1112dd57735c21
-MISC ChangeLog 19114 RMD160 dc7f6f3c3ed49a9f3a588565667fab96460cbfb6 SHA1 040d2b1c2fccff9eb82a03098e436a2ef113ce15 SHA256 123c85bf451735be662fd8aaefa494bdbe37aedb5fbec84a6c7af980dcdfd665
+MISC ChangeLog 19241 RMD160 604a45cc86746bbf0b1932aa7ffc7f0e6f7f2e0d SHA1 0a26f47c81a6f3a006828feb9ec96c89518a7461 SHA256 7f8391c5df459a8a89036f5a24eff6b96003f464eca5757b3953b38ea8866396
 MISC metadata.xml 333 RMD160 848a246f77fbcc88bb03d4a8d0769ef60353148a SHA1 e9afe19410a907fb47230f824b2d592ba3f465d4 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a

diff --git a/dev-util/netbeans/netbeans-7.1_beta-r1.ebuild b/dev-util/netbeans/netbeans-7.1_beta-r1.ebuild
deleted file mode 100644
index 9353e12..0000000
--- a/dev-util/netbeans/netbeans-7.1_beta-r1.ebuild
+++ /dev/null
@@ -1,258 +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.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/beta/zip/netbeans-7.1beta-201109252201-src.zip"
-PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.1-build.xml.patch.bz2"
-L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1-20110926.tar.bz2"
-ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
-SRC_URI="linguas_af? ( ${ALL_URLS} )
-	linguas_ar? ( ${ALL_URLS} )
-	linguas_ca? ( ${ALL_URLS} )
-	linguas_cs? ( ${ALL_URLS} )
-	linguas_de? ( ${ALL_URLS} )
-	linguas_el? ( ${ALL_URLS} )
-	linguas_es? ( ${ALL_URLS} )
-	linguas_fr? ( ${ALL_URLS} )
-	linguas_gl? ( ${ALL_URLS} )
-	linguas_hi_IN? ( ${ALL_URLS} )
-	linguas_id? ( ${ALL_URLS} )
-	linguas_it? ( ${ALL_URLS} )
-	linguas_ja? ( ${ALL_URLS} )
-	linguas_ko? ( ${ALL_URLS} )
-	linguas_lt? ( ${ALL_URLS} )
-	linguas_nl? ( ${ALL_URLS} )
-	linguas_pl? ( ${ALL_URLS} )
-	linguas_pt_BR? ( ${ALL_URLS} )
-	linguas_pt_PT? ( ${ALL_URLS} )
-	linguas_ro? ( ${ALL_URLS} )
-	linguas_ru? ( ${ALL_URLS} )
-	linguas_si? ( ${ALL_URLS} )
-	linguas_sq? ( ${ALL_URLS} )
-	linguas_sr? ( ${ALL_URLS} )
-	linguas_sv? ( ${ALL_URLS} )
-	linguas_ta_IN? ( ${ALL_URLS} )
-	linguas_tl? ( ${ALL_URLS} )
-	linguas_tr? ( ${ALL_URLS} )
-	linguas_vi? ( ${ALL_URLS} )
-	linguas_zh_CN? ( ${ALL_URLS} )
-	linguas_zh_TW? ( ${ALL_URLS} )
-"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE_NETBEANS_MODULES="
-	+netbeans_modules_apisupport
-	netbeans_modules_cnd
-	netbeans_modules_dlight
-	netbeans_modules_enterprise
-	netbeans_modules_ergonomics
-	netbeans_modules_groovy
-	+netbeans_modules_java
-	netbeans_modules_javacard
-	+netbeans_modules_javafx
-	netbeans_modules_mobility
-	netbeans_modules_php
-	+netbeans_modules_profiler
-	+netbeans_modules_websvccommon"
-IUSE_LINGUAS="
-	linguas_af
-	linguas_ar
-	linguas_ca
-	linguas_cs
-	linguas_de
-	linguas_el
-	linguas_es
-	linguas_fr
-	linguas_gl
-	linguas_hi_IN
-	linguas_id
-	linguas_it
-	linguas_ja
-	linguas_ko
-	linguas_lt
-	linguas_nl
-	linguas_pl
-	linguas_pt_BR
-	linguas_pt_PT
-	linguas_ro
-	linguas_ru
-	linguas_si
-	linguas_sq
-	linguas_sr
-	linguas_sv
-	linguas_ta_IN
-	linguas_tl
-	linguas_tr
-	linguas_vi
-	linguas_zh_CN
-	linguas_zh_TW"
-IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
-S="${WORKDIR}"
-
-DEPEND="virtual/jdk:1.6
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.6
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}
-	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
-	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
-	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
-	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
-	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
-	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
-	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
-	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
-	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
-	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
-	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
-	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
-	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
-	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
-JAVA_PKG_BSFIX="off"
-NBLOCALES=""
-
-pkg_setup() {
-	for lingua in ${IUSE_LINGUAS} ; do
-		local lang=${lingua/linguas_/}
-
-		if [[ "${lang}" = "ar" ]] ; then
-			lang="ar_EG,ar_SA"
-		elif [[ "${lang}" = "es" ]] ; then
-			lang="es,es_CO"
-		elif [[ "${lang}" = "gl" ]] ; then
-			lang="gl_ES"
-		elif [[ "${lang}" = "id" ]] ; then
-			lang="in_ID"
-		elif [[ "${lang}" = "nl" ]] ; then
-			lang="nl_BE,nl_NL"
-		elif [[ "${lang}" = "tl" ]] ; then
-			lang="fil_PH"
-		fi
-
-		if use ${lingua} ; then
-			if [ -z "${NBLOCALES}" ] ; then
-				NBLOCALES="${lang}"
-			else
-				NBLOCALES="${NBLOCALES},${lang}"
-			fi
-		fi
-	done
-
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	if [ -n "${NBLOCALES}" ] ; then
-		unpack $(basename ${SOURCE_URL})
-		unpack $(basename ${L10N_URL})
-
-		einfo "Deleting bundled jars..."
-		find -name "*.jar" -type f -delete
-
-		unpack netbeans-7.1-build.xml.patch.bz2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Deleting bundled class files..."
-		find -name "*.class" -type f | xargs rm -vf
-
-		epatch netbeans-7.1-build.xml.patch
-
-		# Support for custom patches
-		if [ -n "${NETBEANS71_PATCHES_DIR}" -a -d "${NETBEANS71_PATCHES_DIR}" ] ; then
-			local files=`find "${NETBEANS71_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 javafx 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
-}