Fixed bug #248904, also fixed problem with visualweb not being installed

Package-Manager: portage-2.1.6_rc1/cvs/Linux 2.6.27-gentoo x86_64

4 files changed, 155 insertions, 24 deletions

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 8c8670a2f898..ec3027dc6241 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/netbeans
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.90 2008/11/23 17:46:03 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.91 2008/11/26 19:47:07 fordfrog Exp $
+
+  26 Nov 2008; Miroslav Šulc <fordfrog@gentoo.org>
+  +files/6.5/all-visualweb.insync.JspxSerializer.java.patch,
+  netbeans-6.5-r1.ebuild:
+  Fixed bug #248904, also fixed problem with visualweb not being installed
 
   23 Nov 2008; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.5-r1.ebuild:
   Fixed issues introduced by previous update
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 82e7d3c12339..56aea14d7e56 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,6 +6,7 @@ AUX 5.5.1/jdbcstorage-build.xml-comments.patch 1967 RMD160 263b55e7d35ea2623e614
 AUX 5.5.1/jspparser-build.xml.patch 710 RMD160 ea25ad5654ffcbfd1ba4d68ee646365b8b9bcdfd SHA1 41e82615101da23a4cb5716760a6ed0794bf471a SHA256 0377992a404cc03c8a3de778ce470f439a07a5d8afef20cb6581bd8c58bff649
 AUX 5.5.1/mdrant-build.xml-comments.patch 1943 RMD160 d6c759a758aa6e2cf2cdd09f97b5894e83fe4a64 SHA1 28cf3e5f0906d564724ed816c04d4e84e1e5b4a7 SHA256 c3ffe9773503241a6ed34e4f5e293f048f3da07b7681a9bb2c1b25561d72d190
 AUX 5.5.1/startscript.sh 54 RMD160 bd94453fd8b68f1edf6a1f33ffe1cdc329fe1acc SHA1 64dd2b32c70942b14d0f2042ee20235acc4e6c54 SHA256 28d1b63ec8d52b3510edd7073dedc2fb8dbadd2edeefb33086c830cd62843dd8
+AUX 6.5/all-visualweb.insync.JspxSerializer.java.patch 2256 RMD160 93e31f62559fb1c6e7f0888c97c3fe5a5c1b4ebb SHA1 e89e6cbbc086be6c7912c36284129ded4a9acf46 SHA256 9999f040396901e4779059c7cfbb4a86609b609120a69d68f6672ff2119bcada
 AUX 6.5/nbbuild_build.xml.patch 878 RMD160 d1c94abc36c08efc829bfc2c970667d3339a798f SHA1 263d03b1fb9b0de2d24a04570e4e4f519f010731 SHA256 0e3af1266eb78ae509685417930ad6e024699db5d54bfe297b4a7d6a970294aa
 AUX 6.5/nbbuild_templates_projectized.xml.patch 867 RMD160 f368e1f80e1e332e2886c95d023a9b25f456b4e8 SHA1 4cb2e905a07125afa714bfecdcbee0902e81f67b SHA256 388ac6d71ce9d85efc7ec55585ae12ff8607a7b9e6239455a1545033463bf811
 AUX netbeans.desktop 99 RMD160 0edf4e4343a2695d94ff733ecf50f19ade1ecb30 SHA1 0e04b96dfb9e75db6b333279f4793d93785decbd SHA256 cc536e1cd7f3917efae5fe7722e9cbeb36770d9eeea9673cd1180ade67fa69f4
@@ -19,6 +20,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 15099 RMD160 04b79404ad0eaca06cbd4876303e4ab6e4075066 SHA1 6dba903332599c913458d58a75a1419a6bffa49f SHA256 461c16d7ca7227dfe90409c4fd15001b99dabaf66efa2b68e4b8a614d8c5885d
 EBUILD netbeans-5.5.1.ebuild 14760 RMD160 c64a8ece4df62f4463500ab18fc781af867cdc8c SHA1 fc06f712d63079157d66defba1c3f45f8f5cef81 SHA256 19315a7fae7d98583abc8373464d7d34fc1d34f4e09e8668bab6a7c021ab1757
-EBUILD netbeans-6.5-r1.ebuild 40371 RMD160 f2ae53cbe158ed06473b06ba9fbe4ad24d929497 SHA1 1e14834053cda245891cd5adc0165385db004b59 SHA256 7d084af99baa2d9f7f2d2feb3acf0eff98121e6ef8fd1c311621b60372e61656
-MISC ChangeLog 16313 RMD160 3a16bc6b0b909fa91a5039f20ec306dc1ccbe5b9 SHA1 6be19efca4b93ee20da3b162987eb583ed6ae535 SHA256 061c550109a2a268b53b86a6d75ec6082ed8140c909c5c706ac75ccb221ec51a
+EBUILD netbeans-6.5-r1.ebuild 42121 RMD160 239ce256653a6ec630e8274585a3f9040154825e SHA1 635f8bfcc45d44e82d2619bd360c27c9f3f27a9c SHA256 ae4ea7880414cbbbd8ea95ba430c82ed56f4243b09636a6f2a947cc0848b7b67
+MISC ChangeLog 16528 RMD160 5814b0e4172927716b1c7a4b83f62d12ea5e5167 SHA1 6b46c03a94e35c94bdc1cc127a1ba924b2367060 SHA256 e0349dbf1c2d21e29606ded81e50cb5e06be8bbfe1236c3bc0e8341f13aba8f4
 MISC metadata.xml 1301 RMD160 963030ae8c98e8baeb1e6913a2c0569cc089c5cd SHA1 e99fd059abfb66933036184b2868af4de7c76240 SHA256 10553ba9aa39b0858b0cf4c14af24624fe682848165789e04ddabd748d988ada
diff --git a/dev-util/netbeans/files/6.5/all-visualweb.insync.JspxSerializer.java.patch b/dev-util/netbeans/files/6.5/all-visualweb.insync.JspxSerializer.java.patch
new file mode 100644
index 000000000000..a09a229d06ed
--- /dev/null
+++ b/dev-util/netbeans/files/6.5/all-visualweb.insync.JspxSerializer.java.patch
@@ -0,0 +1,47 @@
+--- JspxSerializer.java.orig	2008-11-26 19:34:52.000000000 +0100
++++ JspxSerializer.java	2008-11-26 19:36:19.000000000 +0100
+@@ -1381,7 +1381,7 @@
+             int ch = source.charAt(i);
+             if (!XMLChar.isValid(ch)) {
+                 if (++i < length) {
+-                    surrogates(ch, source.charAt(i));
++                    surrogates(ch, source.charAt(i), true);
+                 } else {
+                     fatalError("The character '" + (char) ch + "' is an invalid XML character");
+                 }
+@@ -1441,7 +1441,7 @@
+                 if (!XMLChar.isValid(ch)) {
+                     // check if it is surrogate
+                     if (++index <length) {
+-                        surrogates(ch, text.charAt(index));
++                        surrogates(ch, text.charAt(index), true);
+                     } else {
+                         fatalError("The character '"+(char)ch+"' is an invalid XML character"); 
+                     }
+@@ -1463,7 +1463,7 @@
+                 if (!XMLChar.isValid(ch)) {
+                     // check if it is surrogate
+                     if (++index <length) {
+-                        surrogates(ch, text.charAt(index));
++                        surrogates(ch, text.charAt(index), true);
+                     } else {
+                         fatalError("The character '"+(char)ch+"' is an invalid XML character"); 
+                     }
+@@ -1495,7 +1495,7 @@
+                 if (!XMLChar.isValid(ch)) {
+                     // check if it is surrogate
+                     if (++start <length) {
+-                        surrogates(ch, chars[start]);
++                        surrogates(ch, chars[start], true);
+                     } else {
+                         fatalError("The character '"+(char)ch+"' is an invalid XML character"); 
+                     }
+@@ -1519,7 +1519,7 @@
+                 if (!XMLChar.isValid(ch)) {
+                     // check if it is surrogate
+                     if (++start <length) {
+-                        surrogates(ch, chars[start]);
++                        surrogates(ch, chars[start], true);
+                     } else {
+                         fatalError("The character '"+(char)ch+"' is an invalid XML character"); 
+                     }
diff --git a/dev-util/netbeans/netbeans-6.5-r1.ebuild b/dev-util/netbeans/netbeans-6.5-r1.ebuild
index 6ce0a36fd020..7b4efcf0c9a4 100644
--- a/dev-util/netbeans/netbeans-6.5-r1.ebuild
+++ b/dev-util/netbeans/netbeans-6.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v 1.3 2008/11/23 17:46:03 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v 1.4 2008/11/26 19:47:07 fordfrog Exp $
 
 EAPI="2"
 WANT_SPLIT_ANT="true"
@@ -237,37 +237,65 @@ DESTINATION="/usr/share/netbeans-${SLOT}"
 JAVA_PKG_BSFIX="off"
 
 pkg_setup() {
-	if use netbeans_modules_apisupport && ! ( use netbeans_modules_harness && use netbeans_modules_ide && use netbeans_modules_java ) ; then
-		eerror "'apisupport' module requires 'harness', 'ide' and 'java' modules"
+	# direct deps: harness, ide, java
+	if use netbeans_modules_apisupport && ! ( \
+		use netbeans_modules_harness && \
+		use netbeans_modules_ide && \
+		use netbeans_modules_java && \
+		use netbeans_modules_websvccommon ) ; then
+		eerror "'apisupport' module requires 'harness', 'ide', 'java' and 'websvccommon' modules"
 		die
 	fi
 
+	# direct deps: ide
 	if use netbeans_modules_cnd && ! use netbeans_modules_ide ; then
 		eerror "'cnd' module requires 'ide' module"
 		die
 	fi
 
-	if use netbeans_modules_groovy && ! (use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_java ) ; then
-		eerror "'groovy' module requires 'gsf', 'ide' and 'java' modules"
+	# direct deps: gsf, ide, java
+	if use netbeans_modules_groovy && ! ( \
+		use netbeans_modules_gsf && \
+		use netbeans_modules_ide && \
+		use netbeans_modules_java && \
+		use netbeans_modules_websvccommon ) ; then
+		eerror "'groovy' module requires 'gsf', 'ide', 'java' and 'websvccommon' modules"
 		die
 	fi
 
+	# direct deps: ide
 	if use netbeans_modules_gsf && ! use netbeans_modules_ide ; then
 		eerror "'gsf' module requires 'ide' module"
 		die
 	fi
 
-	if use netbeans_modules_identity && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then
-		eerror "'identity' module requires 'gsf', 'ide', 'j2ee' and 'java' modules"
+	# direct deps: gsf, ide, j2ee, java
+	if use netbeans_modules_identity && ! ( \
+		use netbeans_modules_groovy && \
+		use netbeans_modules_gsf && \
+		use netbeans_modules_ide && \
+		use netbeans_modules_j2ee && \
+		use netbeans_modules_java && \
+		use netbeans_modules_websvccommon ) ; then
+		eerror "'identity' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java' and 'websvccommon'  modules"
 		die
 	fi
 
-	if use netbeans_modules_j2ee && ! ( use netbeans_modules_groovy && use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_java ) ; then
-		eerror "'j2ee' module requires 'groovy', 'gsf', 'ide' and 'java' modules"
+	# direct deps: groovy, gsf, ide, java
+	if use netbeans_modules_j2ee && ! ( \
+		use netbeans_modules_groovy && \
+		use netbeans_modules_gsf && \
+		use netbeans_modules_ide && \
+		use netbeans_modules_java && \
+		use netbeans_modules_websvccommon ) ; then
+		eerror "'j2ee' module requires 'groovy', 'gsf', 'ide', 'java' and 'websvccommon' modules"
 		die
 	fi
 
-	if use netbeans_modules_java && ! ( use netbeans_modules_ide && use netbeans_modules_websvccommon ) ; then
+	# direct deps: ide, websvccommon
+	if use netbeans_modules_java && ! ( \
+		use netbeans_modules_ide && \
+		use netbeans_modules_websvccommon ) ; then
 		eerror "'java' module requires 'ide' and 'websvccommon' module"
 		die
 	fi
@@ -276,51 +304,95 @@ pkg_setup() {
 	# needed to build 'mobility' cluster
 	# because of bug http://www.netbeans.org/issues/show_bug.cgi?id=151538 'apisupport' cluster is also
 	# needed to build 'mobility' cluster
-	if use netbeans_modules_mobility && ! ( use netbeans_modules_apisupport && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then
-		eerror "'mobility' module requires 'apisupport', 'ide', 'j2ee' and 'java' modules"
+	# direct deps: apisupport, ide, j2ee, java
+	if use netbeans_modules_mobility && ! ( \
+		use netbeans_modules_apisupport && \
+		use netbeans_modules_groovy && \
+		use netbeans_modules_gsf && \
+		use netbeans_modules_harness && \
+		use netbeans_modules_ide && \
+		use netbeans_modules_j2ee && \
+		use netbeans_modules_java && \
+		use netbeans_modules_websvccommon ) ; then
+		eerror "'mobility' module requires 'apisupport', 'groovy', 'gsf', 'harness', 'ide', 'j2ee', 'java' and 'websvccommon' modules"
 		die
 	fi
 
-	if use netbeans_modules_nb && ! ( use netbeans_modules_harness && use netbeans_modules_ide ) ; then
+	# direct deps: harness, ide
+	if use netbeans_modules_nb && ! ( \
+		use netbeans_modules_harness && \
+		use netbeans_modules_ide ) ; then
 		eerror "'nb' module requires 'harness' and 'ide' module"
 		die
 	fi
 
-	if use netbeans_modules_php && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_websvccommon ) ; then
+	# direct deps: gsf, ide, websvccommon
+	if use netbeans_modules_php && ! ( \
+		use netbeans_modules_gsf && \
+		use netbeans_modules_ide && \
+		use netbeans_modules_websvccommon ) ; then
 		eerror "'php' module requires 'gsf', 'ide' and 'websvccommon' modules"
 		die
 	fi
 
-	if use netbeans_modules_profiler && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then
-		eerror "'profiler' module requires 'gsf', 'ide', 'j2ee' and 'java' modules"
+	# direct deps: gsf, ide, j2ee, java
+	if use netbeans_modules_profiler && ! ( \
+		use netbeans_modules_groovy && \
+		use netbeans_modules_gsf && \
+		use netbeans_modules_ide && \
+		use netbeans_modules_j2ee && \
+		use netbeans_modules_java && \
+		use netbeans_modules_websvccommon ) ; then
+		eerror "'profiler' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java' and 'websvccommon' modules"
 		die
 	fi
 
+	# direct deps: gsf, ide
 	#if use netbeans_modules_ruby && ! ( use netbeans_modules_gsf && use netbeans_modules_ide ) ; then
 	#	eerror "'ruby' module requires 'gsf' and 'ide' module"
 	#	die
 	#fi
 
-	if use netbeans_modules_soa && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java && use netbeans_modules_xml ) ; then
-		eerror "'soa' module requires 'gsf', 'ide', 'j2ee', 'java' and 'xml' modules"
+	# direct deps: gsf, ide, j2ee, java, xml
+	if use netbeans_modules_soa && ! ( \
+		use netbeans_modules_groovy && \
+		use netbeans_modules_gsf && \
+		use netbeans_modules_ide && \
+		use netbeans_modules_j2ee && \
+		use netbeans_modules_java && \
+		use netbeans_modules_websvccommon && \
+		use netbeans_modules_xml ) ; then
+		eerror "'soa' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java', 'websvccommon' and 'xml' modules"
 		die
 	fi
 
-	if use netbeans_modules_visualweb && ! ( use netbeans_modules_gsf && use netbeans_modules_ide && use netbeans_modules_j2ee && use netbeans_modules_java ) ; then
-		eerror "'visualweb' module requires 'gsf', 'ide', 'j2ee' and 'java' modules"
+	# direct deps: gsf, ide, j2ee, java
+	if use netbeans_modules_visualweb && ! ( \
+		use netbeans_modules_groovy && \
+		use netbeans_modules_gsf && \
+		use netbeans_modules_ide && \
+		use netbeans_modules_j2ee && \
+		use netbeans_modules_java && \
+		use netbeans_modules_websvccommon ) ; then
+		eerror "'visualweb' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java' and 'websvccommon' modules"
 		die
 	fi
 
-	if use netbeans_modules_webcommon && ! ( use netbeans_modules_gsf && use netbeans_modules_ide ) ; then
+	# direct deps: gsf, ide
+	if use netbeans_modules_webcommon && ! ( \
+		use netbeans_modules_gsf && \
+		use netbeans_modules_ide ) ; then
 		eerror "'webcommon' module requires 'gsf' and 'ide' modules"
 		die
 	fi
 
+	# direct deps: ide
 	if use netbeans_modules_websvccommon && ! use netbeans_modules_ide ; then
 		eerror "'websvccommon' module requires 'ide' module"
 		die
 	fi
 
+	# direct deps: ide
 	if use netbeans_modules_xml && ! use netbeans_modules_ide ; then
 		eerror "'xml' module requires 'ide' module"
 		die
@@ -341,6 +413,11 @@ src_unpack () {
 	epatch "${FILESDIR}"/${SLOT}/nbbuild_build.xml.patch \
 		"${FILESDIR}"/${SLOT}/nbbuild_templates_projectized.xml.patch
 
+	if use netbeans_modules_visualweb ; then
+		cd ${S}/visualweb.insync/src/org/netbeans/modules/visualweb/insync/markup || die
+		epatch "${FILESDIR}"/${SLOT}/all-visualweb.insync.JspxSerializer.java.patch
+	fi
+
 	# Clean up nbbuild
 	einfo "Removing prebuilt *.class files from nbbuild"
 	find "${S}" -name "*.class" -delete
@@ -453,6 +530,7 @@ src_compile() {
 	use netbeans_modules_profiler && clusters="${clusters},nb.cluster.profiler"
 	#use netbeans_modules_ruby && clusters="${clusters},nb.cluster.ruby"
 	use netbeans_modules_soa && clusters="${clusters},nb.cluster.soa"
+	use netbeans_modules_visualweb && clusters="${clusters},nb.cluster.visualweb"
 	use netbeans_modules_webcommon && clusters="${clusters},nb.cluster.webcommon"
 	use netbeans_modules_websvccommon && clusters="${clusters},nb.cluster.websvccommon"
 	use netbeans_modules_xml && clusters="${clusters},nb.cluster.xml"