Added ebuild for Netbeans 6.9 final release

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

6 files changed, 158 insertions, 47 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/Manifest b/dev-util/netbeans/Manifest
index e0d04c7da575..2f1e10999c90 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -9,8 +9,9 @@ AUX 6.7/nbbuild_build.xml.patch 1989 RMD160 483d9301da88be90ec467c283cff0498f0e4
 AUX 6.7/nbbuild_templates_projectized.xml.patch 867 RMD160 eb3021fbc02eefc074315fe7ec8991f3210c6a1d SHA1 1f6f7da1fe055e3826195e29e13b0999be797e8b SHA256 558c52a2365a0605277aa49db271c54e7c93e3919c2e056610343816fd8451ec
 AUX 6.8/nbbuild_build.xml.patch 1989 RMD160 483d9301da88be90ec467c283cff0498f0e4de63 SHA1 3113a60c005eb84238cce17e9f927bee4ffb7a38 SHA256 e01b8cc5b25873e94da3310719ba51bbe40a0269d7af69a3f5596a773fe5b9a6
 AUX 6.8/nbbuild_templates_projectized.xml.patch 883 RMD160 556555de346a1202d36f5ef4bdc7cf1951dc28c0 SHA1 ad5f44dd4ac88dede256746629aae146cec8c363 SHA256 55a8b7e4f9cea194fde29b97372eb473bcc0f3030898c1c74a7d49a8ecff2dd3
-AUX 6.9/nbbuild_build.xml.patch 2462 RMD160 114ecd829112b55a216719a5a9efd5e1221324bd SHA1 19227f277a4de5e3cbe02161590c11f61f1a071d SHA256 cb0be4c49c6f81b98ebebfb465ea732e3c933407139a57bf4183464d9f4f21fb
-AUX 6.9/nbbuild_templates_projectized.xml.patch 883 RMD160 43c95979ef0b1822b907e5fed5085ee7648fd2a6 SHA1 b2a936f8cc6fae99d889383d2c3f31cc832418dd SHA256 2511bb63e76b07bf6019eb43ac6b63ca0d85b816e723976f8f84613672da264e
+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/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
 AUX startscript.sh 409 RMD160 602a9d56a47f799c1b29a1a8a9e2616252109a4b SHA1 ca245693b313ca319ccfe9c1546206bdce0b8832 SHA256 e702d5b321e55dd949f16bb3c5783e1974f9fd04b76548dd6fb565f2381d0f39
@@ -23,8 +24,8 @@ DIST netbeans-6.7-l10n-20090626125342.tar.bz2 15425488 RMD160 57ef911b6a392a90e7
 DIST netbeans-6.7.1-200907230101-src.zip 292362632 RMD160 c1f661e6862efcf6e5fe4215f7bc975532781cf9 SHA1 d2082b8a55bac53e5e918f51886fbcbbd4828f2f SHA256 878ae7c812303dc114ddce9900e3a80247cf7e55d9678fc1f83f81b1c00ead23
 DIST netbeans-6.8-200912041610-src.zip 317263916 RMD160 26e666740563a4e0efd39e3a535efbcffb85e663 SHA1 c0449f86e57893ba6190266ce293247a8189e3ad SHA256 c632df943196fbec21ffdf53538d50ca1a7561e514415a71d5c3f17ff78a4f2e
 DIST netbeans-6.8-l10n-20091209164706.tar.bz2 11453127 RMD160 2cff6a0d78aa57d8b451d778263c3f2b1ff49f15 SHA1 454d391dffc41315c3306754c6b4f4732483ef9b SHA256 3b44c5cc8e25a48bd1de631c5510327a29c7c4ab373b22e306795f0496b78a60
-DIST netbeans-6.9-l10n-20100421122556.tar.bz2 11911838 RMD160 85febd5f95ff84d54286cbcef3b79dfaf088e05c SHA1 2f8b7c2745b40f5ad00bac0cfbfe9d573803e317 SHA256 1604be07a14960bc0ff1cbfc31b1c7bee5f641b1bb65de468c8ccbaeed38510e
-DIST netbeans-6.9_beta.tar.bz2 253642196 RMD160 27ae1392751a61ffc5356dead05a54ee4467a435 SHA1 1545dc70c102e951b5046b3dfccbd7aefed08f0d SHA256 a45156867b8b37013d15186994123857cb028c66257d310c33ce9dedff32d501
+DIST netbeans-6.9-l10n.tar.bz2 12352439 RMD160 f923d0a8dfbc520cd5d18c9bb97fa1fb0b15ba3a SHA1 4f2530fca18b2a7a28fc527e53d581bf077dec99 SHA256 ce09b2b121bda7da68de3e355b8f9954d4e33afdf346e4df64d7249a26fc0495
+DIST netbeans-6.9.tar.bz2 258605390 RMD160 30f1bb44ba024590f39af8c421eed5a0f3bc9ae7 SHA1 cb3429ebbfb2878f73ac72bd412f1b4f66c127b3 SHA256 3521abee5e6c5f68f406f4aef67898742f777a87b782fb4116945e20e625993c
 DIST netbeans-c++-5_5_1-linux.bin 9247744 RMD160 56c91ab483207b1d90554049263a2f2ecf05360e SHA1 adcf3f321b4bf4b972637f9c3ecb91df3b9694a2 SHA256 37010e73841be2b199d6ae85528e551eecacbfcb57df8ab03cb06bae9a367f4a
 EBUILD netbeans-3.6-r1.ebuild 2058 RMD160 27d195261cbc8d1cd076e6271e8d9e36d85d3e49 SHA1 7637749d56cf216a132cb6031c87073ed58753e0 SHA256 b84994f3b6dbccbe4f12136a775018d8e7a6150a5433d33afe9e6d60e3d7dcd6
 EBUILD netbeans-5.5.1-r1.ebuild 15143 RMD160 6831b0011cca13442216feb0c2f56463ebcc3c16 SHA1 bc668ff192ae2f5870e3279acf3ac36948959676 SHA256 0bbe3da70fadb256ed9a834f5d582628ce8a9d7c8aa9e0e20d39cc5df10989ad
@@ -32,6 +33,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 43141 RMD160 5d5a6f10fa25cef167a2922f537355fdac3ad505 SHA1 7b00790e2104a09fbb092323ff95e15c05fe0107 SHA256 2cba15124a834e622c52b18ff719af26c152e2567850cb3e98b80ce464032baf
-EBUILD netbeans-6.9_beta-r1.ebuild 44060 RMD160 b865d2f521133af8a6401704f9d605358f071d4c SHA1 c5331b6a4f2cad169147eb0f7cb5d30335581402 SHA256 b561b71d2eba32dbff6f69ee7ffabad2603a80ad5d794e0a3622156f1f2c5267
-MISC ChangeLog 25643 RMD160 c9a6b3f16a208adc40de9d3c14ad4fa1b52d7149 SHA1 c2a6a38c3f3884548e86a1e23b865907d90d2a7f SHA256 204a5a4ee6dee1345e0b4aee3917ed211bd5b68cd0c3645699efbecdb1d62a04
+EBUILD netbeans-6.9.ebuild 45503 RMD160 7ca0a56a00f8386e56d7e1acc5a12af4c3779de5 SHA1 63994fb6c9205a91fd3b68a086f5f5f1f79c37a3 SHA256 723b98828bbb8c90acbb5dc6d64a006739236797004d230a6b491477174a3649
+MISC ChangeLog 25956 RMD160 704f40d12d61e2e01de3e20f6852c0332d2ca99f SHA1 072e5c09c9ec66ad1bcf3399e2bc21f5d2287a3d SHA256 65bfcb7f240727237a173c10ec41f57ca52e0838a77c1475a57407262979d84b
 MISC metadata.xml 1301 RMD160 1e12597c731e35626197ed6ff4efc2094aa12e61 SHA1 8b0614fb5db9568c8b489908d62fcafc9b636f84 SHA256 14d98dfb63646fb6bc7d433f9626ffa7801ff1de38535167f9b0528dac0182a9
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