--- netbeans-6.5-r1.ebuild.old	2008-11-26 14:41:18.000000000 +0100
+++ netbeans-6.5-r1.ebuild	2008-11-26 15:29:56.000000000 +0100
@@ -237,8 +237,8 @@
 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"
+	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
 
@@ -247,8 +247,8 @@
 		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"
+	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
 
@@ -258,12 +258,12 @@
 	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"
+		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"
+	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
 
@@ -276,8 +276,8 @@
 	# 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"
+	if use netbeans_modules_mobility && ! ( use netbeans_modules_apisupport && use netbeans_modules_gsf && use netbeans_modules_groovy && 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', 'harness', 'ide', 'j2ee', 'java' and 'websvccommon' modules"
 		die
 	fi
 
@@ -291,8 +291,8 @@
 		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"
+	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
 
@@ -301,13 +301,13 @@
 	#	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"
+	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"
+	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