netbeans-6.7_beta-r1: Fixed and improved documentation building

3 files changed, 48 insertions, 13 deletions

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index f477869f2006..8e9bda4334d0 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,10 @@
 # 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.106 2009/05/02 19:09:23 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.107 2009/05/02 23:13:31 fordfrog Exp $
+
+  02 May 2009; Miroslav Šulc <fordfrog@gentoo.org>
+  netbeans-6.7_beta-r1.ebuild:
+  Fixed and improved documentation building
 
   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 dd41a862e74b..d18c9825267c 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 38559 RMD160 d87cf83763778425f00052b840c4b096e0c03265 SHA1 dc8a28310f46f3860845ef928fb6fd773863c7a4 SHA256 80bb4a77406a9c4e92c5985a847ddc2d3cda11432e488dfd2533f1dc218ef289
-MISC ChangeLog 19107 RMD160 4fd5cc61972fb76abe661aeaf7102d7710357ac6 SHA1 fd3ff377083f38f73897e1d583d01e159bc8f016 SHA256 466d564eea010f7a0d5660d997abe1169d89326a241579f5276e5e4af4765347
+EBUILD netbeans-6.7_beta-r1.ebuild 39521 RMD160 a64d139f230cb735d167fa12f4f5f9e163dd5540 SHA1 f469964042bf1b70dda3c9405c9904f34f9fefcf SHA256 5f5f4405686c56e9b71acdbcc05491a977da3c457dcd0bfe0134084f87cc300f
+MISC ChangeLog 19235 RMD160 33e9fa50b0eaf9cfc8765a86c38b34dda82010da SHA1 748c4d1bb89a0e9163aa0ed8d8b776b1b519c5b7 SHA256 7f6ae89585a47c6e6d7869d203811554fd061dfa2b09654169786109ab67eb15
 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-r1.ebuild
index 20a22c9f93e1..b8f6d29462d1 100644
--- a/dev-util/netbeans/netbeans-6.7_beta-r1.ebuild
+++ b/dev-util/netbeans/netbeans-6.7_beta-r1.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.2 2009/05/02 19:09:23 fordfrog Exp $
+# $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 $
 
 EAPI="2"
 WANT_SPLIT_ANT="true"
@@ -216,14 +216,20 @@ JAVA_PKG_BSFIX="off"
 
 pkg_setup() {
 	local need_apisupport=""
+	local need_cnd=""
 	local need_dlight=""
 	local need_enterprise=""
+	local need_ergonomics=""
 	local need_groovy=""
 	local need_harness=""
 	local need_ide=""
+	local need_identity=""
 	local need_java=""
+	local need_mobility=""
 	local need_nb=""
+	local need_php=""
 	local need_profiler=""
+	local need_ruby=""
 	local need_webcommon=""
 	local need_websvccommon=""
 
@@ -321,6 +327,28 @@ pkg_setup() {
 		need_ide="1"
 	fi
 
+	# currently we require all clusters when building javadoc, can be tested
+	# what clusters are really needed to build javadoc
+	if use doc ; then
+		need_apisupport="1"
+		need_cnd="1"
+		need_dlight="1"
+		need_enterprise="1"
+		need_ergonomics="1"
+		need_groovy="1"
+		need_harness="1"
+		need_ide="1"
+		need_identity="1"
+		need_java="1"
+		need_mobility="1"
+		need_nb="1"
+		need_php="1"
+		need_profiler="1"
+		need_ruby="1"
+		need_webcommon="1"
+		need_websvccommon="1"
+	fi
+
 	if [ -n "${need_apisupport}" ] ; then
 		need_harness="1"
 		need_ide="1"
@@ -368,14 +396,20 @@ pkg_setup() {
 
 	local missing=""
 	[ -n "${need_apisupport}" ] && ! use netbeans_modules_apisupport && missing="${missing} apisupport"
+	[ -n "${need_cnd}" ] && ! use netbeans_modules_cnd && missing="${missing} cnd"
 	[ -n "${need_dlight}" ] && ! use netbeans_modules_dlight && missing="${missing} dlight"
 	[ -n "${need_enterprise}" ] && ! use netbeans_modules_enterprise && missing="${missing} enterprise"
+	[ -n "${need_ergonomics}" ] && ! use netbeans_modules_ergonomics && missing="${missing} ergonomics"
 	[ -n "${need_groovy}" ] && ! use netbeans_modules_groovy && missing="${missing} groovy"
 	[ -n "${need_harness}" ] && ! use netbeans_modules_harness && missing="${missing} harness"
 	[ -n "${need_ide}" ] && ! use netbeans_modules_ide && missing="${missing} ide"
+	[ -n "${need_identity}" ] && ! use netbeans_modules_identity && missing="${missing} identity"
 	[ -n "${need_java}" ] && ! use netbeans_modules_java && missing="${missing} java"
+	[ -n "${need_mobility}" ] && ! use netbeans_modules_mobility && missing="${missing} mobility"
 	[ -n "${need_nb}" ] && ! use netbeans_modules_nb && missing="${missing} nb"
+	[ -n "${need_php}" ] && ! use netbeans_modules_php && missing="${missing} php"
 	[ -n "${need_profiler}" ] && ! use netbeans_modules_profiler && missing="${missing} profiler"
+	[ -n "${need_ruby}" ] && ! use netbeans_modules_ruby && missing="${missing} ruby"
 	[ -n "${need_webcommon}" ] && ! use netbeans_modules_webcommon && missing="${missing} webcommon"
 	[ -n "${need_websvccommon}" ] && ! use netbeans_modules_websvccommon && missing="${missing} websvccommon"
 
@@ -536,8 +570,8 @@ src_compile() {
 	java-pkg_filter-compiler ecj-3.2 ecj-3.3 ecj-3.4
 
 	# Build the clusters
-	ANT_TASKS="ant-nodeps ant-trax"
-	ANT_OPTS="-Xmx1g -Djava.awt.headless=true" eant ${antflags} ${clusters} -f nbbuild/build.xml ${build_target}
+	ANT_TASKS="ant-nodeps ant-trax" ANT_OPTS="-Xmx1g -Djava.awt.headless=true" \
+		eant ${antflags} ${clusters} -f nbbuild/build.xml ${build_target} $(use_doc build-javadoc)
 
 	local locales=""
 	for lang in ${IUSE_LINGUAS} ; do
@@ -557,12 +591,6 @@ src_compile() {
 			-f l10n/build.xml build
 	fi
 
-	# Running build-javadoc from the same command line as build-nozip doesn't work
-	# so we must run it separately
-	if use doc ; then
-		ANT_TASKS="ant-nodeps ant-trax" ANT_OPTS="-Xmx1g" eant ${antflags} ${clusters} -f nbbuild/build.xml build-javadoc
-	fi
-
 	# Remove non-Linux binaries
 	einfo "Removing libraries and scripts for non-linux archs..."
 	find "${BUILDDESTINATION}" -type f \
@@ -680,7 +708,10 @@ src_install() {
 	dohtml CREDITS.html README.html netbeans.css
 	rm -f build_info CREDITS.html README.html netbeans.css
 
-	use doc && java-pkg_dojavadoc "${S}"/nbbuild/build/javadoc
+	if use doc ; then
+		rm "${S}"/nbbuild/build/javadoc/*.zip
+		java-pkg_dojavadoc "${S}"/nbbuild/build/javadoc
+	fi
 
 	# Icons and shortcuts
 	if use netbeans_modules_nb ; then