[gentoo-commits] gentoo-x86 commit in dev-util/netbeans: ChangeLog netbeans-6.5-r1.ebuild

[Miroslav Sulc (fordfrog)]

fordfrog    08/11/26 19:47:07

  Modified:             ChangeLog netbeans-6.5-r1.ebuild
  Log:
  Fixed bug #248904, also fixed problem with visualweb not being installed
  (Portage version: 2.1.6_rc1/cvs/Linux 2.6.27-gentoo x86_64)

Revision  Changes    Path
1.91                 dev-util/netbeans/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?r1=1.90&r2=1.91

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- ChangeLog	23 Nov 2008 17:46:03 -0000	1.90
+++ ChangeLog	26 Nov 2008 19:47:07 -0000	1.91
@@ -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@g.o>
+  +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@g.o> netbeans-6.5-r1.ebuild:
   Fixed issues introduced by previous update



1.4                  dev-util/netbeans/netbeans-6.5-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild?r1=1.3&r2=1.4

Index: netbeans-6.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- netbeans-6.5-r1.ebuild	23 Nov 2008 17:46:03 -0000	1.3
+++ netbeans-6.5-r1.ebuild	26 Nov 2008 19:47:07 -0000	1.4
@@ -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 @@
 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 @@
 	# 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 @@
 	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 @@
 	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"