Migrate to EAPI 2 for bug #239835.

Package-Manager: portage-2.2_rc27/cvs/Linux i686

4 files changed, 28 insertions, 12 deletions

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 943f6e315067..be1cae82c5d9 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/netbeans
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.102 2009/03/24 19:24:24 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.103 2009/03/29 17:48:38 betelgeuse Exp $
+
+  29 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
+  netbeans-5.5.1-r1.ebuild, netbeans-6.5-r4.ebuild:
+  Migrate to EAPI 2 for bug #239835.
 
   24 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
   netbeans-5.5.1-r1.ebuild:
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index e15906544558..a02a8f91d780 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 5.5-r2/jdbcstorage-build.xml-comments.patch 1967 RMD160 263b55e7d35ea2623e61453fd46f2e846401703c SHA1 2a49ea838d17bded357cbea9587cb4e83025f4c6 SHA256 82d2b0616f4b0d0624e1bb8438ff47b82b7c9375329a3eb2397d915674abf9c4
 AUX 5.5-r2/jspparser-build.xml.patch 710 RMD160 ea25ad5654ffcbfd1ba4d68ee646365b8b9bcdfd SHA1 41e82615101da23a4cb5716760a6ed0794bf471a SHA256 0377992a404cc03c8a3de778ce470f439a07a5d8afef20cb6581bd8c58bff649
 AUX 5.5-r2/mdrant-build.xml-comments.patch 1943 RMD160 d6c759a758aa6e2cf2cdd09f97b5894e83fe4a64 SHA1 28cf3e5f0906d564724ed816c04d4e84e1e5b4a7 SHA256 c3ffe9773503241a6ed34e4f5e293f048f3da07b7681a9bb2c1b25561d72d190
@@ -18,7 +21,14 @@ DIST netbeans-6.5-200811100001-ml-src.zip 278956462 RMD160 e277c9c1a15687080099b
 DIST netbeans-6.5-l10n-20081119172200.tar.bz2 13540375 RMD160 909a119096ce1684860c176f11c3bef39e689e44 SHA1 84ebe0bd22ad2506122d2e0ca36ec2eadfd6b7b4 SHA256 c96be4b680045b9e7e452b004f4e321f46e9e5903f92adf17f993b0bba2bfd58
 DIST netbeans-c++-5_5_1-linux.bin 9247744 RMD160 56c91ab483207b1d90554049263a2f2ecf05360e SHA1 adcf3f321b4bf4b972637f9c3ecb91df3b9694a2 SHA256 37010e73841be2b199d6ae85528e551eecacbfcb57df8ab03cb06bae9a367f4a
 EBUILD netbeans-3.6-r1.ebuild 3140 RMD160 ccfc3af6a20cad06d1a41965ea607322ff123cd9 SHA1 26281fb533e287171dc8d9408e63b4e8d8b9a646 SHA256 94a9463eb85659b0a3d224a4e7e1d071125f55c2d361db6a32221391a46746bb
-EBUILD netbeans-5.5.1-r1.ebuild 15101 RMD160 c2db0771ec32f0d05ff43ee7c33272d8c6e32522 SHA1 068071352eac1a4d931eb9cb342b99409b4bfadb SHA256 8e8624d62b40c3d68c4c78408d4f0fcba757c212b6dfdffe92dfced8ca62f36e
-EBUILD netbeans-6.5-r4.ebuild 39578 RMD160 e393aa1e68411bc0ad1a9ba39ca6924002a66fb7 SHA1 55df7335d9ef278cef89335e11ca47d64def9d0e SHA256 89e7af5f8ac86f44795777fa2b73678071254aa518dad9614e4cd4a92220f41f
-MISC ChangeLog 18361 RMD160 e07b002c2a8177f5541700c7ee4223930f58008f SHA1 e190d01253ece7f0fc84d05427d2d3ef1d9696f6 SHA256 e4dbffdee44a51d3d471fc2ed14243b9c8371252577be58c904d65bdf7bea610
+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
+MISC ChangeLog 18504 RMD160 9a708b77b8971bec559fc4cce2a6313e021250be SHA1 63a10b49b9d55a746cba3f39214defd8e63a76e1 SHA256 c798f1a92435723d40b25087a88872f4e9a404856e626072a75ee9b4fc35b518
 MISC metadata.xml 1301 RMD160 1e12597c731e35626197ed6ff4efc2094aa12e61 SHA1 8b0614fb5db9568c8b489908d62fcafc9b636f84 SHA256 14d98dfb63646fb6bc7d433f9626ffa7801ff1de38535167f9b0528dac0182a9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknPtIgACgkQcxLzpIGCsLRG0ACfaqmeb/grjhiX3FJ7z7NXq8XT
+7H4AnAoeHD1p5cE61jqp6U+ptbEliNaF
+=NqFx
+-----END PGP SIGNATURE-----
diff --git a/dev-util/netbeans/netbeans-5.5.1-r1.ebuild b/dev-util/netbeans/netbeans-5.5.1-r1.ebuild
index d30e3f9f1fdf..6b3e8bf077a9 100644
--- a/dev-util/netbeans/netbeans-5.5.1-r1.ebuild
+++ b/dev-util/netbeans/netbeans-5.5.1-r1.ebuild
@@ -1,8 +1,8 @@
 # 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-5.5.1-r1.ebuild,v 1.9 2009/03/24 19:24:24 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5.1-r1.ebuild,v 1.10 2009/03/29 17:48:38 betelgeuse Exp $
 
-EAPI=1
+EAPI="2"
 JAVA_PKG_IUSE="doc"
 WANT_ANT_TASKS="ant-nodeps ant-trax"
 
@@ -39,7 +39,7 @@ COMMON_DEPEND="
 	>=dev-java/xml-commons-1.0_beta2"
 
 RDEPEND=">=virtual/jre-1.5
-	dev-java/antlr:0
+	>=dev-java/antlr-2.7.7:0[java]
 	dev-java/commons-beanutils:1.7
 	dev-java/commons-collections
 	dev-java/commons-digester
@@ -104,7 +104,9 @@ JAVA_PKG_BSFIX="off"
 src_unpack () {
 	unpack "${FILE_IDE}"
 	use cxx && unpack_extra ${FILE_CPP} cpp
-	cd "${S}"
+}
+
+java_prepare() {
 	find -name "*.jar" | grep "/test/" | xargs rm -v
 	find -name "*.class" -delete
 
diff --git a/dev-util/netbeans/netbeans-6.5-r4.ebuild b/dev-util/netbeans/netbeans-6.5-r4.ebuild
index 459d7aeab470..3ef486ca24da 100644
--- a/dev-util/netbeans/netbeans-6.5-r4.ebuild
+++ b/dev-util/netbeans/netbeans-6.5-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.5-r4.ebuild,v 1.2 2008/12/31 03:25:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r4.ebuild,v 1.3 2009/03/29 17:48:38 betelgeuse Exp $
 
 EAPI="2"
 WANT_SPLIT_ANT="true"
@@ -80,7 +80,7 @@ RDEPEND=">=virtual/jdk-1.5
 		>=dev-util/subversion-1.5:0[java]
 	)
 	netbeans_modules_j2ee? (
-		>=dev-java/antlr-2.7.6:0
+		>=dev-java/antlr-2.7.7:0[java]
 		>=dev-java/asm-3.1:3
 		dev-java/commons-beanutils:1.7
 		dev-java/commons-collections:0
@@ -96,7 +96,7 @@ RDEPEND=">=virtual/jdk-1.5
 	)
 	netbeans_modules_java? (
 		>=dev-java/ant-1.7:0
-		>=dev-java/antlr-2.7.6:0
+		>=dev-java/antlr-2.7.7:0[java]
 		dev-java/asm:2.2
 		>=dev-java/beansbinding-1.2.1:0
 		>=dev-java/cglib-2.1:2.1