netbeans-6.7_beta-r2: Fixed problem with freezing when openning css file

3 files changed, 22 insertions, 11 deletions

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 8e9bda4334d0..4d41e995b5fd 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/netbeans
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.107 2009/05/02 23:13:31 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.108 2009/05/03 01:51:05 fordfrog Exp $
+
+*netbeans-6.7_beta-r2 (03 May 2009)
+
+  03 May 2009; Miroslav Šulc <fordfrog@gentoo.org>
+  -netbeans-6.7_beta-r1.ebuild, +netbeans-6.7_beta-r2.ebuild:
+  Fixed problem with freezing when openning css file
 
   02 May 2009; Miroslav Šulc <fordfrog@gentoo.org>
   netbeans-6.7_beta-r1.ebuild:
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index b7e4820b29c8..7e5e503e49e8 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -24,6 +24,6 @@ DIST netbeans-c++-5_5_1-linux.bin 9247744 RMD160 56c91ab483207b1d90554049263a2f2
 EBUILD netbeans-3.6-r1.ebuild 3140 RMD160 ccfc3af6a20cad06d1a41965ea607322ff123cd9 SHA1 26281fb533e287171dc8d9408e63b4e8d8b9a646 SHA256 94a9463eb85659b0a3d224a4e7e1d071125f55c2d361db6a32221391a46746bb
 EBUILD netbeans-5.5.1-r1.ebuild 15127 RMD160 4197f51f7ea021f28b52baab5e14e3c339a3a61b SHA1 c820a49082aa073b5515d8ea204fee24df054040 SHA256 6ef719e19de09aff5e02fd21de7c065f68f75084e5e6d2368f25ff0d3c6c78fd
 EBUILD netbeans-6.5-r4.ebuild 39591 RMD160 aeda3cbba875f25e1223bf5ccac8aa937bc910db SHA1 6ca138e59d05bbf9c98fde6d9fb359f4bb2974cf SHA256 faf9d88505cae8d9b098a2501cb36eaf9d7490db5fbc56f1c293778939d1ff66
-EBUILD netbeans-6.7_beta-r1.ebuild 39521 RMD160 ea9be953c7a6b43da0ea4d23b3e6cf869e1e2cd0 SHA1 7dfe46ceca1c050dc92baaf95f1390a63b85e67b SHA256 b2acfb41ea26bdc655af3570a72f4ed088d08c02c3b2386e0b7a0d0051c470bd
-MISC ChangeLog 19235 RMD160 2f8066d9be57e3e5f85f087faf0a26e2efca7a4a SHA1 f6dbcb836b3d441ca89d8ddfb7853e7d536c4c9a SHA256 3b53df4c14868f302a4600190fd7aba8e657835794b6db45c14654e9972cf0e8
+EBUILD netbeans-6.7_beta-r2.ebuild 39761 RMD160 c5c9c9d6da1fd0f7ef9f1ecf86de82d7efee600b SHA1 a5a83a22dd6900d0458696a10f06ce02233f2fb5 SHA256 b848d6ce2698c9f751d20153ee3831f60b4c71f9376e6e9bdb96a3964028e9da
+MISC ChangeLog 19440 RMD160 31416176af7b763d4d40dc7c52e2c87ace4977ce SHA1 2cb923fa469c95543a25c0792338272503cabede SHA256 dd55fefa862e99cbf32cf4a4c526dad2bcedd2370d17fe670b5730c444ddc101
 MISC metadata.xml 1301 RMD160 1e12597c731e35626197ed6ff4efc2094aa12e61 SHA1 8b0614fb5db9568c8b489908d62fcafc9b636f84 SHA256 14d98dfb63646fb6bc7d433f9626ffa7801ff1de38535167f9b0528dac0182a9
diff --git a/dev-util/netbeans/netbeans-6.7_beta-r1.ebuild b/dev-util/netbeans/netbeans-6.7_beta-r2.ebuild
index b8f6d29462d1..4f630a9b6f0e 100644
--- a/dev-util/netbeans/netbeans-6.7_beta-r1.ebuild
+++ b/dev-util/netbeans/netbeans-6.7_beta-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.7_beta-r1.ebuild,v 1.3 2009/05/02 23:13:31 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.7_beta-r2.ebuild,v 1.1 2009/05/03 01:51:05 fordfrog Exp $
 
 EAPI="2"
 WANT_SPLIT_ANT="true"
@@ -84,7 +84,6 @@ RDEPEND=">=virtual/jdk-1.5
 		>=dev-java/commons-logging-1.1:0
 		>=dev-java/commons-net-1.4:0
 		>=dev-java/flute-1.3:0
-		>=dev-java/flyingsaucer-7:0
 		>=dev-java/freemarker-2.3.8:2.3
 		>=dev-java/jakarta-oro-2:2.0
 		>=dev-java/jaxb-2:2
@@ -167,7 +166,6 @@ DEPEND=">=virtual/jdk-1.5
 		>=dev-java/commons-logging-1.1:0
 		>=dev-java/commons-net-1.4.1:0
 		>=dev-java/flute-1.3:0
-		>=dev-java/flyingsaucer-7:0
 		>=dev-java/freemarker-2.3.8:2.3
 		>=dev-java/jakarta-oro-2:2.0
 		>=dev-java/javacc-3.2:0
@@ -414,8 +412,9 @@ pkg_setup() {
 	[ -n "${need_websvccommon}" ] && ! use netbeans_modules_websvccommon && missing="${missing} websvccommon"
 
 	if [ -n "${missing}" ] ; then
-		eerror "You need to add these modules to NETBEANS_MODULES because they are needed by modules you have selected"
-		eerror "   Missing NETBEANS_MODULES: ${missing}"
+		eerror "You need to add these modules to NETBEANS_MODULES because they are needed by modules you have selected."
+		use doc && eerror "With \"doc\" USE flag enabled, all modules are required."
+		eerror "   Missing NETBEANS_MODULES:${missing}"
 		die "Missing NETBEANS_MODULES"
 	fi
 
@@ -494,6 +493,8 @@ src_prepare () {
 			sed -e "/libs\.jaxb\/external\/jaxb-xjc\.jar/d" -i ${tmpfile} || die
 			sed -e "/libs\.jsch\/external\/jsch-0\.1\.39\.jar/d" -i ${tmpfile} || die
 			sed -e "/o\.apache\.xml\.resolver\/external\/resolver-1\.2\.jar/d" -i ${tmpfile} || die
+			# system core-renderer.jar causes deadlocks when openning css files
+			sed -e "/web\.flyingsaucer\/external/core-renderer-R7final\.jar/d" -i ${tmpfile} || die
 		fi
 
 		if use netbeans_modules_java ; then
@@ -673,6 +674,9 @@ src_install() {
 		for file in *.sh ; do
 			fperms 755 ${file} || die
 		done
+		for file in *.so ; do
+			fperms 755 ${file} || die
+		done
 	fi
 	if use netbeans_modules_profiler ; then
 		cd "${D}"/${DESTINATION}/profiler3/remote-pack-defs || die
@@ -725,7 +729,9 @@ src_install() {
 
 pkg_postinst() {
 	if use netbeans_modules_nb ; then
-		einfo "If you want to use specific locale of netbeans, use --locale argument, for example:"
+		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
@@ -759,7 +765,6 @@ place_unpack_symlinks() {
 		dosymcompilejar "libs.bugtracking/external" commons-lang-2.1 commons-lang.jar commons-lang-2.3.jar
 		dosymcompilejar "libs.svnClientAdapter/external" subversion svn-javahl.jar svnjavahl-1.6.0.jar
 		dosymcompilejar "libs.lucene/external" lucene-2.4 lucene-core.jar lucene-core-2.3.2.jar
-		dosymcompilejar "web.flyingsaucer/external" flyingsaucer core-renderer.jar core-renderer-R7final.jar
 		dosymcompilejar "css.visual/external" sac sac.jar sac-1.3.jar
 		dosymcompilejar "css.visual/external" flute flute.jar flute-1.3.jar
 		dosymcompilejar "db.drivers/external" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.6-bin.jar
@@ -903,7 +908,7 @@ symlink_extjars() {
 		dosyminstjar ${targetdir} commons-logging commons-logging.jar commons-logging-1.1.jar
 		dosyminstjar ${targetdir} commons-net commons-net.jar commons-net-1.4.1.jar
 		dosyminstjar ${targetdir} flute flute.jar flute-1.3.jar
-		dosyminstjar ${targetdir} flyingsaucer core-renderer.jar core-renderer.jar
+		# core-renderer.jar - system one causes deadlock
 		dosyminstjar ${targetdir} freemarker-2.3 freemarker.jar freemarker-2.3.8.jar
 		# ini4j-0.4.1.jar
 		dosyminstjar ${targetdir} jakarta-oro-2.0 jakarta-oro.jar jakarta-oro-2.0.8.jar