fixed bug #325217 and added highres icon to netbeans 6.9

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 55 insertions, 55 deletions

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 6af2d86f8dda..2d09938a1798 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/netbeans
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.140 2010/07/07 20:01:01 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.141 2010/07/08 20:45:25 fordfrog Exp $
+
+*netbeans-6.9-r1 (08 Jul 2010)
+
+  08 Jul 2010; Miroslav Šulc <fordfrog@gentoo.org> +files/6.9/netbeans.png,
+  -netbeans-6.9.ebuild, +netbeans-6.9-r1.ebuild:
+  Fixed bug #325217 which caused javadoc could not be built, also added high
+  resolution icon
 
   07 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
   netbeans-6.8-r1.ebuild:
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 981867ce72ed..7aa36b86b24f 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 5.5.1/jdbcstorage-build.xml-comments.patch 1967 RMD160 263b55e7d35ea2623e61453fd46f2e846401703c SHA1 2a49ea838d17bded357cbea9587cb4e83025f4c6 SHA256 82d2b0616f4b0d0624e1bb8438ff47b82b7c9375329a3eb2397d915674abf9c4
 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
@@ -14,6 +11,7 @@ AUX 6.8/nbbuild_build.xml.patch 1989 RMD160 483d9301da88be90ec467c283cff0498f0e4
 AUX 6.8/nbbuild_templates_projectized.xml.patch 883 RMD160 556555de346a1202d36f5ef4bdc7cf1951dc28c0 SHA1 ad5f44dd4ac88dede256746629aae146cec8c363 SHA256 55a8b7e4f9cea194fde29b97372eb473bcc0f3030898c1c74a7d49a8ecff2dd3
 AUX 6.9/nbbuild_build.xml.patch 2462 RMD160 7063d564dbe9f1eb22af201631918699a40637ee SHA1 9ab9eef8247337510f91656eafed75591e14fd53 SHA256 10d9b0677668711215797977f8766ca76b2f838ab4a27d85c3c8b2bc98b1bbda
 AUX 6.9/nbbuild_templates_projectized.xml.patch 935 RMD160 4b11af335e901ba2392bee48a2cc3b1add8b31c5 SHA1 ffbad335f79b0d11f61447b7b3fd6715183ca94f SHA256 bfe90e3da56de91677ba193dac0a5ee3dbd68a6ae32b677c556c0b810e64044e
+AUX 6.9/netbeans.png 20011 RMD160 a941b71b571a9cd30c49446aef1bd4244e689465 SHA1 ebd2e748bb4bc29e667ead9a2fb717a9017f9405 SHA256 1d519f018ebeff6e29436c8492dbb266446bd0144fb5519b2ef6637664de6f4a
 AUX 6.9/o.jruby.distro_disable.patch 1933 RMD160 703a2183fb5f28dc6b5e5ac6f3767b1675ea765e SHA1 398eecdf43e22932a8a052ca1e3fe9e4a40f4e49 SHA256 c5034e8ef935d6f228d9582775163d2134049b0eb283948c83bd2541078a1318
 AUX netbeans.desktop 99 RMD160 0edf4e4343a2695d94ff733ecf50f19ade1ecb30 SHA1 0e04b96dfb9e75db6b333279f4793d93785decbd SHA256 cc536e1cd7f3917efae5fe7722e9cbeb36770d9eeea9673cd1180ade67fa69f4
 AUX netbeans.png 2163 RMD160 280f589bb28f0c297982bd3935afaf738976c723 SHA1 f2c55805396d949b59f3c07ff621c9027befd5db SHA256 42d0e3e5a8901c9386e2079ddaa10b08d31de88be850b693b79f813e2222d93e
@@ -36,13 +34,6 @@ EBUILD netbeans-6.5-r4.ebuild 39583 RMD160 158952f34096de9267be8fa499946745b50d5
 EBUILD netbeans-6.7.1.ebuild 42302 RMD160 97684afb2c5ca20d654e03fb44c75918f5bb4f03 SHA1 04502d6b1a6a00eb98f1d3f306aa8d4186d7b7b2 SHA256 367aad17c9ed274ba549a53b4a1a7dacc21534eebb588ab4baf61d7db26c27d1
 EBUILD netbeans-6.7.ebuild 42090 RMD160 96f48f27dadbac4189af2ae56e3d88e1ea94e749 SHA1 7820f23bd52d68a021471bd292106898cb633843 SHA256 a91aba869b0f5d66e91c1aaa2fe1a5bf6799d5632d6a19e858a4661a21a96a6e
 EBUILD netbeans-6.8-r1.ebuild 43136 RMD160 1ed63a12ce46beb4838913c8f65690aaec9d2a3a SHA1 bf2af027925686c64e58a34d60bbe7fada2cac4a SHA256 5b34a9b43e28cefa7518645f2850f480e25701e09b9cbb4afb304cdb893d3d80
-EBUILD netbeans-6.9.ebuild 45508 RMD160 43aa02a3f4c4ec32738d6635bfc5e172929fe27f SHA1 4500ae7d8f856ff420dc4de476d8f2fb03c34dde SHA256 2e7c61b0d31e2367fbcd8e1b815892de4404f47ff5aae547fa94338fbc7cb7bf
-MISC ChangeLog 26279 RMD160 6fca3c182f6cf17807e1259edaf718e4c4059e26 SHA1 f471848a9250cc9fe8d45eceb8b23eaa19bf7aab SHA256 169393afd3d8970d643817edecbca1df3a3b6a0bb36e96a1a51fbc1572957e36
+EBUILD netbeans-6.9-r1.ebuild 45740 RMD160 c5e24b496031eb21a568f390622bfbfb9220ee07 SHA1 8c4937c6e35064c1a99ea54eb981228d769aa693 SHA256 92f56ba7581c038a3686a713c7c3c68c0046fc58c3b4459f7321c48cf726749d
+MISC ChangeLog 26536 RMD160 adf5bb4cbea8a4d1d78b9b4c99f7978d347d0152 SHA1 47c17e57de6551122cc2d48c2426743beea48294 SHA256 222c8a61502a2a57abb15eff90662074f9e72ca5e1dd1a693e74fff584298f43
 MISC metadata.xml 1301 RMD160 1e12597c731e35626197ed6ff4efc2094aa12e61 SHA1 8b0614fb5db9568c8b489908d62fcafc9b636f84 SHA256 14d98dfb63646fb6bc7d433f9626ffa7801ff1de38535167f9b0528dac0182a9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkw03WEACgkQNQqtfCuFneNhEwCeIh4aoORnLRtZ4+qAuFTVnuqQ
-wlUAn3OM9WK583LZ7GhZXoNFekS33t/S
-=2jzS
------END PGP SIGNATURE-----
diff --git a/dev-util/netbeans/files/6.9/netbeans.png b/dev-util/netbeans/files/6.9/netbeans.png
new file mode 100644
index 000000000000..f99dbb6b7a62
--- /dev/null
+++ b/dev-util/netbeans/files/6.9/netbeans.png
diff --git a/dev-util/netbeans/netbeans-6.9.ebuild b/dev-util/netbeans/netbeans-6.9-r1.ebuild
index 38c1f09d2836..ca47c831caac 100644
--- a/dev-util/netbeans/netbeans-6.9.ebuild
+++ b/dev-util/netbeans/netbeans-6.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.9.ebuild,v 1.2 2010/06/30 12:16:56 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.9-r1.ebuild,v 1.1 2010/07/08 20:45:25 fordfrog Exp $
 
 EAPI="2"
 WANT_SPLIT_ANT="true"
@@ -351,24 +351,26 @@ pkg_setup() {
 
 	# 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_websvccommon="1"
-	fi
+	# disabled for now as building javadoc now fails with providing clusters
+	# so trying to drop this requirement
+	#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_websvccommon="1"
+	#fi
 
 	if [ -n "${need_apisupport}" ] ; then
 		need_harness="1"
@@ -430,7 +432,7 @@ pkg_setup() {
 
 	if [ -n "${missing}" ] ; then
 		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."
+		# use doc && eerror "With \"doc\" USE flag enabled, all modules are required."
 		eerror "   Missing NETBEANS_MODULES:${missing}"
 		die "Missing NETBEANS_MODULES"
 	fi
@@ -447,8 +449,11 @@ pkg_setup() {
 src_prepare () {
 	# We need to disable downloading of jars
 	epatch "${FILESDIR}"/${SLOT}/nbbuild_build.xml.patch \
-		"${FILESDIR}"/${SLOT}/nbbuild_templates_projectized.xml.patch \
-		"${FILESDIR}"/${SLOT}/o.jruby.distro_disable.patch
+		"${FILESDIR}"/${SLOT}/nbbuild_templates_projectized.xml.patch
+
+	if [ -z "${JAVA_PKG_NB_TRY_JRUBY}" ] ; then
+		epatch "${FILESDIR}"/${SLOT}/o.jruby.distro_disable.patch
+	fi
 
 	# Clean up nbbuild
 	einfo "Removing prebuilt *.class files from nbbuild"
@@ -640,19 +645,14 @@ src_compile() {
 	# Fails to compile
 	java-pkg_filter-compiler ecj-3.2 ecj-3.3 ecj-3.4 ecj-3.5
 
-	# Build the clusters
-	local heap=""
+	ANT_TASKS="ant-nodeps ant-trax" ANT_OPTS="-Xmx1g -Djava.awt.headless=true" \
+		eant ${antflags} ${clusters} -f nbbuild/build.xml ${extra_flags} ${build_target}
+
 	if use doc ; then
-		heap="-Xmx1536m"
-	else
-		heap="-Xmx1g"
+		ANT_TASKS="ant-nodeps ant-trax" ANT_OPTS="-Xmx1536m -Djava.awt.headless=true" \
+			eant ${antflags} -f nbbuild/build.xml ${extra_flags} build-javadoc
 	fi
 
-	local extra_tasks=""
-
-	ANT_TASKS="ant-nodeps ant-trax" ANT_OPTS="${heap} -Djava.awt.headless=true" \
-		eant ${antflags} ${clusters} -f nbbuild/build.xml ${extra_flags} ${build_target} $(use_doc build-javadoc)
-
 	local locales=""
 	for lang in ${IUSE_LINGUAS} ; do
 		local mylang=${lang/linguas_/}
@@ -778,14 +778,16 @@ src_install() {
 		done
 	fi
 
-	# this is disabled because we have issue with building jruby-1.5.0, so we do not
-	# build jruby at all and instead users will have to use only system jruby
-	#if use netbeans_modules_ruby ; then
-	#	cd "${D}"/${DESTINATION}/ruby/jruby-1.5.0/bin || die
-	#	for file in * ; do
-	#		fperms 755 ${file} || die
-	#	done
-	#fi
+	# DISABLED FOR NOW BECAUSE BUILDING BUNDLED JRUBY FAILS
+	# see: http://netbeans.org/bugzilla/show_bug.cgi?id=186736
+	if [ -n "${JAVA_PKG_NB_TRY_JRUBY}" ] ; then
+		if use netbeans_modules_ruby ; then
+			cd "${D}"/${DESTINATION}/ruby/jruby-1.5.0/bin || die
+			for file in * ; do
+				fperms 755 ${file} || die
+			done
+		fi
+	fi
 
 	# Link netbeans executable from bin
 	if [[ -f "${D}"/${DESTINATION}/bin/netbeans ]]; then
@@ -817,8 +819,8 @@ src_install() {
 	# Icons and shortcuts
 	if use netbeans_modules_nb ; then
 		einfo "Installing icon..."
-		dodir /usr/share/icons/hicolor/32x32/apps
-		dosym ${DESTINATION}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
+		dodir /usr/share/icons/hicolor/128x128/apps
+		dosym "${FILESDIR}"/${SLOT}/netbeans.png /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png
 	fi
 
 	make_desktop_entry netbeans-${SLOT} "Netbeans ${SLOT}" netbeans-${SLOT} Development