Version bump

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

3 files changed, 23 insertions, 20 deletions

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index fba050ab9712..5193c743bb18 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,12 @@
 # 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.124 2009/10/11 11:11:51 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.125 2009/10/24 00:04:50 fordfrog Exp $
+
+*netbeans-6.8_beta (24 Oct 2009)
+
+  24 Oct 2009; Miroslav Šulc <fordfrog@gentoo.org>
+  -netbeans-6.8_alpha2.ebuild, +netbeans-6.8_beta.ebuild:
+  Version bump
 
 *netbeans-6.8_alpha2 (11 Oct 2009)
 
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 7a5626b1ada0..0e62907db5d5 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -23,13 +23,13 @@ DIST netbeans-6.5-l10n-20081119172200.tar.bz2 13540375 RMD160 909a119096ce168486
 DIST netbeans-6.7-200906261335-src.zip 292313369 RMD160 e84e389a8659558ca75e09b5e45e9ec7bcbcf2e6 SHA1 851b3a45e6dca1bcff9308dfb1c8bd525a190cf1 SHA256 c1851f3472a4ad4a808caa9b4a335fb4682e4a2b7756aed606ea9d0eb8915a56
 DIST netbeans-6.7-l10n-20090626125342.tar.bz2 15425488 RMD160 57ef911b6a392a90e76a0dd9b34c877edab282e6 SHA1 4d0198746473d9013da1b0e8126e3299cb51d97d SHA256 1fa281d6f93dafa29978bd61ddada47eb0ba7b3877a64f659e73098c4c11d54b
 DIST netbeans-6.7.1-200907230101-src.zip 292362632 RMD160 c1f661e6862efcf6e5fe4215f7bc975532781cf9 SHA1 d2082b8a55bac53e5e918f51886fbcbbd4828f2f SHA256 878ae7c812303dc114ddce9900e3a80247cf7e55d9678fc1f83f81b1c00ead23
-DIST netbeans-6.8m2-200910071658-src.zip 310462650 RMD160 60556c52689ed6d58362f5b3f0cde0a45295349f SHA1 6c3458f8dc76115fdd7f9da5be8ac1b704c872ec SHA256 62a121eab3960726f169f5117474bbd38b629930889cfceb99c7b0fe2eeebdf7
+DIST netbeans-6.8beta-200910212001-src.zip 313559695 RMD160 1e5ee9728eb41ed0186133c56e57404259d4a684 SHA1 90aa986c3fe102bb12b3c33f21ef9605fe99e9f2 SHA256 cc3081a3f1ae61d73120608a1b9ef09c312334a2c7684aef3e05f83b421fb5e4
 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 15127 RMD160 4197f51f7ea021f28b52baab5e14e3c339a3a61b SHA1 c820a49082aa073b5515d8ea204fee24df054040 SHA256 6ef719e19de09aff5e02fd21de7c065f68f75084e5e6d2368f25ff0d3c6c78fd
 EBUILD netbeans-6.5-r4.ebuild 39591 RMD160 aeda3cbba875f25e1223bf5ccac8aa937bc910db SHA1 6ca138e59d05bbf9c98fde6d9fb359f4bb2974cf SHA256 faf9d88505cae8d9b098a2501cb36eaf9d7490db5fbc56f1c293778939d1ff66
 EBUILD netbeans-6.7.1.ebuild 42308 RMD160 c6d6c38a9b5f9804498922ffd55d3c22a5933e2f SHA1 258b73c8dcd390423508795af3b597a0202ce3e8 SHA256 c0bf04ee80fdbd8609c326b9b30cb9c367e48424a425e185a2399b4158473f59
 EBUILD netbeans-6.7.ebuild 42096 RMD160 de7bd80262a24cee50bd2ae358efda780c7d307c SHA1 11162c9746d60403ccd62323fbc7a70bf3570c3a SHA256 2c82b6132fa98e3c7c97db37fda432732a46f9aa3253db78f3b9987e50729704
-EBUILD netbeans-6.8_alpha2.ebuild 43356 RMD160 c9014801bdaf4d88f02a262cea5d4387da349a1b SHA1 9c7aabd70c28ac6c4f542a5f1a47332bd340df0b SHA256 adb7c612908c4b8879d1b2f357408da84ffb5c97b3a9baa827aefe2bd24446e0
-MISC ChangeLog 23203 RMD160 a6defaac1305dc15972baad1f7b254ec7c268eec SHA1 3ed077b9b78d11e1aab039def9aaa0f4039d8481 SHA256 b1bbc2d90ca4e5a4fed6f17a54c929db3f4d06b06c2ecb92bf4ec533ad942787
+EBUILD netbeans-6.8_beta.ebuild 43403 RMD160 29a93b55373485c446cf86e7a57f4859e26130b5 SHA1 b94a33d8bbcaa8562f9d0d3869e88d9bcce27571 SHA256 4388240f486681d2eb6aab8a1aae3ac750fdf19a4e9c8db68d41c7154964b17f
+MISC ChangeLog 23363 RMD160 ee7d975e12d43b71347611e082d84f362e088c06 SHA1 147dd1d1be2416283f1257fcacfb000135bee06f SHA256 541d4e7ac434603de1ec9d18aa24744730d15b3a8540007c858279c2a486d8c8
 MISC metadata.xml 1301 RMD160 1e12597c731e35626197ed6ff4efc2094aa12e61 SHA1 8b0614fb5db9568c8b489908d62fcafc9b636f84 SHA256 14d98dfb63646fb6bc7d433f9626ffa7801ff1de38535167f9b0528dac0182a9
diff --git a/dev-util/netbeans/netbeans-6.8_alpha2.ebuild b/dev-util/netbeans/netbeans-6.8_beta.ebuild
index 0f5dbdba2abf..dee361eb6df2 100644
--- a/dev-util/netbeans/netbeans-6.8_alpha2.ebuild
+++ b/dev-util/netbeans/netbeans-6.8_beta.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.8_alpha2.ebuild,v 1.1 2009/10/11 11:11:51 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.8_beta.ebuild,v 1.1 2009/10/24 00:04:50 fordfrog Exp $
 
 EAPI="2"
 WANT_SPLIT_ANT="true"
@@ -10,7 +10,7 @@ DESCRIPTION="NetBeans IDE for Java"
 HOMEPAGE="http://www.netbeans.org"
 
 SLOT="6.8"
-SRC_URI="http://bits.netbeans.org/netbeans/6.8/m2/zip/netbeans-6.8m2-200910071658-src.zip
+SRC_URI="http://download.netbeans.org/netbeans/6.8/beta/zip/netbeans-6.8beta-200910212001-src.zip
 	mirror://gentoo/netbeans-6.7-l10n-20090626125342.tar.bz2"
 
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
@@ -468,6 +468,11 @@ src_prepare () {
 		fi
 
 		if use netbeans_modules_enterprise ; then
+			filter_file "javaee.api/external/javaee-api-6.0-SNAPSHOT.jar" ${tmpfile}
+			filter_file "javaee.api/external/javaee-web-api-6.0-SNAPSHOT.jar" ${tmpfile}
+			filter_file "javaee.api/external/javax.annotation.jar" ${tmpfile}
+			filter_file "javaee.api/external/jaxb-api-osgi.jar" ${tmpfile}
+			filter_file "javaee.api/external/webservices-api-osgi.jar" ${tmpfile}
 			filter_file "j2ee.sun.appsrv81/external/appservapis-2.0.58.3.jar" ${tmpfile}
 			filter_file "j2ee.sun.appsrv81/external/org-netbeans-modules-j2ee-sun-appsrv81.jar" ${tmpfile}
 			filter_file "libs.glassfish_logging/external/glassfish-logging-2.0.jar" ${tmpfile}
@@ -485,8 +490,8 @@ src_prepare () {
 		fi
 
 		if use netbeans_modules_harness ; then
-			filter_file "apisupport.harness/external/cobertura-1.9.jar" ${tmpfile}
 			filter_file "apisupport.harness/external/openjdk-javac-6-b12.jar" ${tmpfile}
+			filter_file "apisupport.tc.cobertura/external/cobertura-1.9.jar" ${tmpfile}
 			filter_file "jemmy/external/jemmy-2.3.0.0.jar" ${tmpfile}
 		fi
 
@@ -567,14 +572,6 @@ src_prepare () {
 			filter_file "o.rubyforge.debugcommons/external/debug-commons-java-0.10.0.jar" ${tmpfile}
 		fi
 
-		if use netbeans_modules_websvccommon ; then
-			filter_file "libs.wag/external/JSON.org.jar" ${tmpfile}
-			filter_file "libs.wag/external/zcl-api-doc.jar" ${tmpfile}
-			filter_file "libs.wag/external/zcl4j_min-0.5.jar" ${tmpfile}
-			filter_file "libs.wag/external/zclcore-0.5.jar" ${tmpfile}
-			filter_file "libs.wag/external/zclfx_min-0.5.jar" ${tmpfile}
-		fi
-
 		if [ -n "${NB_FILTERFILESFAILED}" ] ; then
 			die "Some files that should be filtered do not exist"
 		fi
@@ -736,7 +733,7 @@ src_install() {
 		for file in *.sh ; do
 			fperms 755 ${file} || die
 		done
-		for file in *.so ; do
+		for file in `find -name "*.so"` ; do
 			fperms 755 ${file} || die
 		done
 	fi
@@ -827,10 +824,10 @@ place_unpack_symlinks() {
 	fi
 
 	if use netbeans_modules_harness ; then
-		dosymcompilejar "apisupport.harness/external" asm-2.2 asm.jar asm-2.2.1.jar
-		dosymcompilejar "apisupport.harness/external" asm-2.2 asm-tree.jar asm-tree-2.2.1.jar
-		dosymcompilejar "apisupport.harness/external" jakarta-oro-2.0 jakarta-oro.jar jakarta-oro-2.0.8.jar
-		dosymcompilejar "apisupport.harness/external" log4j log4j.jar log4j-1.2.9.jar
+		dosymcompilejar "apisupport.tc.cobertura/external" asm-2.2 asm.jar asm-2.2.1.jar
+		dosymcompilejar "apisupport.tc.cobertura/external" asm-2.2 asm-tree.jar asm-tree-2.2.1.jar
+		dosymcompilejar "apisupport.tc.cobertura/external" jakarta-oro-2.0 jakarta-oro.jar jakarta-oro-2.0.8.jar
+		dosymcompilejar "apisupport.tc.cobertura/external" log4j log4j.jar log4j-1.2.9.jar
 	fi
 
 	if use netbeans_modules_ide ; then