Added ebuild for Netbeans 6.9 final release

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 151 insertions, 41 deletions

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 3b2bc11e9b15..a3ecccebc725 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,14 @@
 # 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.136 2010/06/22 18:41:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.137 2010/06/22 21:16:57 fordfrog Exp $
+
+*netbeans-6.9 (22 Jun 2010)
+
+  22 Jun 2010; Miroslav Šulc <fordfrog@gentoo.org>
+  files/6.9/nbbuild_build.xml.patch, -netbeans-6.9_beta-r1.ebuild,
+  files/6.9/nbbuild_templates_projectized.xml.patch,
+  +files/6.9/o.jruby.distro_disable.patch, +netbeans-6.9.ebuild:
+  Added ebuild for Netbeans 6.9 final release
 
   22 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   netbeans-6.5-r4.ebuild, netbeans-6.7.ebuild, netbeans-6.7.1.ebuild,
diff --git a/dev-util/netbeans/files/6.9/nbbuild_build.xml.patch b/dev-util/netbeans/files/6.9/nbbuild_build.xml.patch
index 289054ecf2cc..54958e2da48e 100644
--- a/dev-util/netbeans/files/6.9/nbbuild_build.xml.patch
+++ b/dev-util/netbeans/files/6.9/nbbuild_build.xml.patch
@@ -1,6 +1,6 @@
---- nbbuild/build.xml.orig	2010-04-23 03:36:06.000000000 +0200
-+++ nbbuild/build.xml	2010-04-23 03:36:49.000000000 +0200
-@@ -82,13 +82,6 @@
+--- nbbuild/build.xml.orig	2010-06-22 18:39:18.000000000 +0200
++++ nbbuild/build.xml	2010-06-22 19:05:03.000000000 +0200
+@@ -85,13 +85,6 @@
      <validate-hg-configuration root=".."/>
      <taskdef name="deregisterexternalhook" classname="org.netbeans.nbbuild.extlibs.DeregisterExternalHook" classpath="build/antclasses"/>
      <deregisterexternalhook root=".."/>
@@ -14,7 +14,7 @@
  
      <echo message="Bootstrapping NetBeans-specific Ant extensions..."/>
      <path id="bootstrap-cp">
-@@ -121,12 +114,6 @@
+@@ -124,12 +117,6 @@
  
    <target name="download-all-extbins" unless="ext.binaries.downloaded" depends="bootstrap">
      <echo>Downloading external binaries (*/external/ directories)...</echo>
@@ -27,7 +27,7 @@
      <property name="ext.binaries.downloaded" value="true"/>
    </target>
  
-@@ -139,9 +126,6 @@
+@@ -142,9 +129,6 @@
          <map from="${nb_all}/" to=""/>
          <globmapper from="*" to="*/external/binaries-list"/>
      </pathconvert>
@@ -37,7 +37,7 @@
    </target>
  
    <target name="init-module-list" depends="bootstrap,init-tasks">
-@@ -1060,13 +1044,6 @@
+@@ -1064,13 +1048,6 @@
          <include name="contrib/*/external/build.xml"/>
        </fileset>
      </subant>
diff --git a/dev-util/netbeans/files/6.9/nbbuild_templates_projectized.xml.patch b/dev-util/netbeans/files/6.9/nbbuild_templates_projectized.xml.patch
index e2f3ebf790c2..e2f411c56445 100644
--- a/dev-util/netbeans/files/6.9/nbbuild_templates_projectized.xml.patch
+++ b/dev-util/netbeans/files/6.9/nbbuild_templates_projectized.xml.patch
@@ -1,15 +1,15 @@
---- nbbuild/templates/projectized.xml.orig	2010-04-23 03:47:04.000000000 +0200
-+++ nbbuild/templates/projectized.xml	2010-04-23 03:47:16.000000000 +0200
-@@ -81,12 +81,6 @@
-     </target>
+--- nbbuild/templates/projectized.xml.orig	2010-06-22 19:41:31.000000000 +0200
++++ nbbuild/templates/projectized.xml	2010-06-22 19:41:44.000000000 +0200
+@@ -205,12 +205,6 @@
  
-     <target name="build-init" depends="basic-init,jdk-6-check,set-buildnumber">
+     <!-- See: http://wiki.netbeans.org/wiki/view/DevFaqExternalLibrariesUpdated -->
+     <target name="-release.files" depends="projectized-common.-release.files">
 -        <taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="${nb_all}/nbbuild/nbantext.jar"/>
 -        <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
 -            <manifest dir=".">
 -                <include name="external/binaries-list"/>
 -            </manifest>
 -        </downloadbinaries>
-         <property name="public.package.jar.dir" location="${nb_all}/nbbuild/build/public-package-jars"/>
-         <mkdir dir="${public.package.jar.dir}"/>
-         <property name="test.dist.dir" location="${nb_all}/nbbuild/build/testdist"/>
+         <taskdef name="releasefilesextra" classname="org.netbeans.nbbuild.extlibs.ReleaseFilesExtra" classpath="${nb_all}/nbbuild/nbantext.jar"/>
+         <releasefilesextra property="release.files.extra"/>
+     </target>
diff --git a/dev-util/netbeans/files/6.9/o.jruby.distro_disable.patch b/dev-util/netbeans/files/6.9/o.jruby.distro_disable.patch
new file mode 100644
index 000000000000..a62cfbe2a215
--- /dev/null
+++ b/dev-util/netbeans/files/6.9/o.jruby.distro_disable.patch
@@ -0,0 +1,52 @@
+diff --git nbbuild/cluster.properties b/nbbuild/cluster.properties
+--- nbbuild/cluster.properties
++++ nbbuild/cluster.properties
+@@ -915,12 +915,10 @@
+         nb.cluster.ide,\
+         nb.cluster.harness
+ nb.cluster.ruby=\
+-        glassfish.jruby,\
+         jellytools.ruby,\
+         libs.jrubyparser,\
+         libs.yydebug,\
+         o.jruby,\
+-        o.jruby.distro,\
+         o.kxml2,\
+         o.rubyforge.debugcommons,\
+         ruby,\
+diff --git ruby.kit/nbproject/project.xml b/ruby.kit/nbproject/project.xml
+--- ruby.kit/nbproject/project.xml
++++ ruby.kit/nbproject/project.xml
+@@ -56,6 +56,7 @@
+                         <specification-version>0.114</specification-version>
+                     </run-dependency>
+                 </dependency>
++                <!--
+                 <dependency>
+                     <code-name-base>org.jruby.distro</code-name-base>
+                     <run-dependency>
+@@ -63,6 +64,7 @@
+                         <specification-version>0.115</specification-version>
+                     </run-dependency>
+                 </dependency>
++                -->
+                 <dependency>
+                     <code-name-base>org.kxml2</code-name-base>
+                     <run-dependency>
+@@ -76,6 +78,7 @@
+                         <specification-version>1.4</specification-version>
+                     </run-dependency>
+                 </dependency>
++                <!--
+                 <dependency>
+                     <code-name-base>org.netbeans.modules.glassfish.jruby</code-name-base>
+                     <run-dependency>
+@@ -83,6 +86,7 @@
+                         <specification-version>1.0</specification-version>
+                     </run-dependency>
+                 </dependency>
++                -->
+                 <dependency>
+                     <code-name-base>org.netbeans.modules.gsf.codecoverage</code-name-base>
+                     <build-prerequisite/>
+
diff --git a/dev-util/netbeans/netbeans-6.9_beta-r1.ebuild b/dev-util/netbeans/netbeans-6.9.ebuild
index 81600240c31f..4d8681692316 100644
--- a/dev-util/netbeans/netbeans-6.9_beta-r1.ebuild
+++ b/dev-util/netbeans/netbeans-6.9.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_beta-r1.ebuild,v 1.2 2010/06/22 18:41:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.9.ebuild,v 1.1 2010/06/22 21:16:57 fordfrog Exp $
 
 EAPI="2"
 WANT_SPLIT_ANT="true"
@@ -12,11 +12,11 @@ HOMEPAGE="http://www.netbeans.org"
 SLOT="6.9"
 # netbeans distributes sources without jar files now so we need our own tarball
 # netbeans does not distribute tarball with localizations at all
-SRC_URI="mirror://gentoo/netbeans-6.9_beta.tar.bz2
-	mirror://gentoo/netbeans-6.9-l10n-20100421122556.tar.bz2"
+SRC_URI="mirror://gentoo/netbeans-6.9.tar.bz2
+	mirror://gentoo/netbeans-6.9-l10n.tar.bz2"
 
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 IUSE_NETBEANS_MODULES="
 	+netbeans_modules_apisupport
@@ -36,17 +36,21 @@ IUSE_NETBEANS_MODULES="
 	netbeans_modules_ruby
 	+netbeans_modules_websvccommon"
 IUSE_LINGUAS="
+	linguas_af
 	linguas_ar
 	linguas_ca
 	linguas_cs
 	linguas_de
+	linguas_el
 	linguas_es
 	linguas_fr
 	linguas_gl
+	linguas_hi_IN
 	linguas_id
 	linguas_it
 	linguas_ja
 	linguas_ko
+	linguas_lt
 	linguas_nl
 	linguas_pl
 	linguas_pt_BR
@@ -54,8 +58,11 @@ IUSE_LINGUAS="
 	linguas_ro
 	linguas_ru
 	linguas_sq
+	linguas_sr
 	linguas_sv
+	linguas_tl
 	linguas_tr
+	linguas_vi
 	linguas_zh_CN
 	linguas_zh_TW"
 IUSE="debug doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
@@ -154,7 +161,7 @@ RDEPEND=">=virtual/jdk-1.6
 		dev-java/jna-posix:0
 		dev-java/joda-time:0
 		dev-java/joni:0
-		dev-java/jruby:0
+		>=dev-java/jruby-1.5:0
 		dev-util/jay:0[java]
 	)"
 
@@ -440,7 +447,8 @@ 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}/nbbuild_templates_projectized.xml.patch \
+		"${FILESDIR}"/${SLOT}/o.jruby.distro_disable.patch
 
 	# Clean up nbbuild
 	einfo "Removing prebuilt *.class files from nbbuild"
@@ -486,8 +494,7 @@ src_prepare () {
 			filter_file "libs.glassfish_logging/external/glassfish-logging-2.0.jar" ${tmpfile}
 			# http://www.netbeans.org/issues/show_bug.cgi?id=164334
 			filter_file "servletjspapi/external/servlet2.5-jsp2.1-api.jar" ${tmpfile}
-			filter_file "spring.webmvc/external/spring-webmvc-2.5.jar" ${tmpfile}
-			filter_file "spring.webmvc/external/spring-webmvc-3.0.0.RELEASE.jar" ${tmpfile}
+			filter_file "spring.webmvc/external/spring-webmvc-2.5.6.SEC01.jar" ${tmpfile}
 			filter_file "web.jspparser/external/glassfish-jspparser-2.0.jar" ${tmpfile}
 			# api documentation packaged as jar
 			filter_file "websvc.restlib/external/jersey-client-1.1.5.1-javadoc.jar" ${tmpfile}
@@ -541,7 +548,7 @@ src_prepare () {
 		fi
 
 		if use netbeans_modules_java ; then
-			filter_file "j2ee.eclipselink/external/eclipselink-2.0.1.jar" ${tmpfile}
+			filter_file "j2ee.eclipselink/external/eclipselink-2.0.2.jar" ${tmpfile}
 			filter_file "j2ee.eclipselink/external/eclipselink-javax.persistence-2.0.jar" ${tmpfile}
 			# netbeans bundles also toplink-essentials in the jar
 			filter_file "j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar" ${tmpfile}
@@ -553,7 +560,7 @@ src_prepare () {
 			filter_file "libs.javacapi/external/javac-api-nb-7.0-b07.jar" ${tmpfile}
 			# some netbeans stuff
 			filter_file "libs.javacimpl/external/javac-impl-nb-7.0-b07.jar" ${tmpfile}
-			filter_file "libs.springframework/external/spring-2.5.jar" ${tmpfile}
+			filter_file "libs.springframework/external/spring-2.5.6.SEC01.jar" ${tmpfile}
 			# maven stuff - ignoring for now
 			filter_file "maven.embedder/external/maven-dependency-tree-1.2.jar" ${tmpfile}
 			# maven stuff - ignoring for now
@@ -649,13 +656,22 @@ src_compile() {
 	local locales=""
 	for lang in ${IUSE_LINGUAS} ; do
 		local mylang=${lang/linguas_/}
-		if use ${lang} ; then
-			if [ "${mylang}" = "gl" ] ; then
-				mylang="gl_ES"
-			elif [ "${mylang}" = "id" ] ; then
-				mylang="in_ID"
-			fi
 
+		if [[ "${mylang}" = "ar" ]] ; then
+			mylang="ar_EG,ar_SA"
+		elif [[ "${mylang}" = "es" ]] ; then
+			mylang="es,es_CO"
+		elif [[ "${mylang}" = "gl" ]] ; then
+			mylang="gl_ES"
+		elif [[ "${mylang}" = "id" ]] ; then
+			mylang="in_ID"
+		elif [[ "${mylang}" = "nl" ]] ; then
+			mylang="nl_BE,nl_NL"
+		elif [[ "${mylang}" = "tl" ]] ; then
+			mylang="fil_PH"
+		fi
+
+		if use ${lang} ; then
 			if [ -z "${locales}" ] ; then
 				locales="${mylang}"
 			else
@@ -686,9 +702,10 @@ src_compile() {
 
 	# Use the system ant
 	if use netbeans_modules_java ; then
-		cd "${BUILDDESTINATION}"/java/ant || die "Cannot cd to "${BUILDDESTINATION}"/java3/ant"
+		cd "${BUILDDESTINATION}"/java/ant || die "Cannot cd to "${BUILDDESTINATION}"/java/ant"
 		rm -fr lib
 		rm -fr bin
+		rm -fr etc
 	fi
 
 	# Set initial default jdk
@@ -698,8 +715,8 @@ src_compile() {
 
 	# Install Gentoo Netbeans ID
 	# This ID is used to identify our netbeans package while contacting update center
-	mkdir -p  "${BUILDDESTINATION}"/nb${SLOT}/config || die
-	echo "NBGNT" > "${BUILDDESTINATION}"/nb${SLOT}/config/productid || die "Could not set Gentoo Netbeans ID"
+	mkdir -p  "${BUILDDESTINATION}"/nb/config || die
+	echo "NBGNT" > "${BUILDDESTINATION}"/nb/config/productid || die "Could not set Gentoo Netbeans ID"
 
 	# fix paths per bug# 163483
 	if [[ -e "${BUILDDESTINATION}"/bin/netbeans ]]; then
@@ -760,12 +777,15 @@ src_install() {
 			fperms 755 ${file} || die
 		done
 	fi
-	if use netbeans_modules_ruby ; then
-		cd "${D}"/${DESTINATION}/ruby/jruby-1.4.0/bin || die
-		for file in * ; do
-			fperms 755 ${file} || die
-		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
 
 	# Link netbeans executable from bin
 	if [[ -f "${D}"/${DESTINATION}/bin/netbeans ]]; then
@@ -798,7 +818,7 @@ src_install() {
 	if use netbeans_modules_nb ; then
 		einfo "Installing icon..."
 		dodir /usr/share/icons/hicolor/32x32/apps
-		dosym ${DESTINATION}/nb${SLOT}/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
+		dosym ${DESTINATION}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
 	fi
 
 	make_desktop_entry netbeans-${SLOT} "Netbeans ${SLOT}" netbeans-${SLOT} Development
@@ -812,6 +832,36 @@ pkg_postinst() {
 		einfo "${PN}-${SLOT} --locale de"
 		einfo "${PN}-${SLOT} --locale pt:BR"
 	fi
+
+	if use linguas_ar ; then
+		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
+	fi
+
+	if use linguas_es ; then
+		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
+	fi
+
+	if use linguas_gl ; then
+		einfo "You selected Galician locale which has locale code gl:ES in Netbeans."
+	fi
+
+	if use linguas_id ; then
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+
+	if use linguas_nl ; then
+		einfo "You selected Dutch locale so you can choose either nl:BE or nl:NL variant."
+	fi
+
+	if use linguas_tl ; then
+		einfo "You selected Tagalog locale which has for Filipino locale code fil:PH in Netbeans."
+	fi
+
+	if use netbeans_modules_ruby ; then
+		ewarn "Due to issue with building jruby-1.5.0, bundled jruby is completely removed from"
+		ewarn "build, and also Glassfish JRuby module is removed. Nevertheless you should be able"
+		ewarn "to use Gentoo JRuby package with Netbeans without any problems."
+	fi
 }
 
 # Supporting functions for this ebuild