Add WANT_ANT_TASKS for ant-nodeps because otherwise netbeans fails to build with JAVA_PKG_STRICT.

Package-Manager: portage-2.1.4_rc11

3 files changed, 27 insertions, 10 deletions

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index f914feb2dc3b..4f90b8f6a292 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for dev-util/netbeans
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.71 2008/01/02 07:05:07 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.72 2008/01/06 17:01:13 betelgeuse Exp $
 
   02 Jan 2008; Vlastimil Babka <caster@gentoo.org> netbeans-5.5-r6.ebuild,
   netbeans-5.5.1.ebuild:
   Remove direct dependencies to dev-java/ant-tasks
 
+  15 Nov 2007; Petteri Räty <betelgeuse@gentoo.org> netbeans-5.5.1.ebuild:
+  Add WANT_ANT_TASKS for ant-nodeps because otherwise netbeans fails to build
+  with JAVA_PKG_STRICT.
+
 *netbeans-5.5.1 (25 Aug 2007)
 
   25 Aug 2007; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 216bc1ffc9f4..903e429caffc 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
 MD5 0734227595e25a5df0ecb46f96f6cd50 files/5.5-r2/jdbcstorage-build.xml-comments.patch 1967
 RMD160 263b55e7d35ea2623e61453fd46f2e846401703c files/5.5-r2/jdbcstorage-build.xml-comments.patch 1967
@@ -54,14 +57,14 @@ EBUILD netbeans-5.5-r6.ebuild 13537 RMD160 c1f64668f458d3ba8dbf30d72590c9e3e130c
 MD5 ae8ba616792bbf09482f072cad1cb78b netbeans-5.5-r6.ebuild 13537
 RMD160 c1f64668f458d3ba8dbf30d72590c9e3e130c431 netbeans-5.5-r6.ebuild 13537
 SHA256 7278876718d5d4bdb66b25a8a7f0bf53bc3c5040f13e04c056bcb1ac41eb5d11 netbeans-5.5-r6.ebuild 13537
-EBUILD netbeans-5.5.1.ebuild 14702 RMD160 e62889d03d2f8661dc434d4bec5db2a45c528ee3 SHA1 b24eedea87bdbd2e964e565007a91f5a19b3efe5 SHA256 85f1c1174d2ad1a74c6b95e89533480dc1e070ec427941e8beddedc3ea66b4f0
-MD5 63bffc4f575ea43996eac9011da27e47 netbeans-5.5.1.ebuild 14702
-RMD160 e62889d03d2f8661dc434d4bec5db2a45c528ee3 netbeans-5.5.1.ebuild 14702
-SHA256 85f1c1174d2ad1a74c6b95e89533480dc1e070ec427941e8beddedc3ea66b4f0 netbeans-5.5.1.ebuild 14702
-MISC ChangeLog 13252 RMD160 52dfe2b01662f755c0bfa143b6f40d1cbe27686f SHA1 854c1b0f0a4bdefa96768eacd43fdebd87452f1a SHA256 bf5e695d42bf43fdc16ff2e2bd3dd2d191602d7c38bcc417ef0c8b1ae295deeb
-MD5 dd5e2cdd645f105cbadd9c442e372bab ChangeLog 13252
-RMD160 52dfe2b01662f755c0bfa143b6f40d1cbe27686f ChangeLog 13252
-SHA256 bf5e695d42bf43fdc16ff2e2bd3dd2d191602d7c38bcc417ef0c8b1ae295deeb ChangeLog 13252
+EBUILD netbeans-5.5.1.ebuild 14762 RMD160 26cbd46d7855946719e0b7a433c2c2d897cc349f SHA1 f7ceff44b24c9dfaccb7eb79c71396306fa80a7e SHA256 9a5b75f00cc1993d81b1d3c18dc018e3cf5dc570097bc71e96dfaa18ec48158d
+MD5 f4150a2715265ffb6dc676df431c7c0c netbeans-5.5.1.ebuild 14762
+RMD160 26cbd46d7855946719e0b7a433c2c2d897cc349f netbeans-5.5.1.ebuild 14762
+SHA256 9a5b75f00cc1993d81b1d3c18dc018e3cf5dc570097bc71e96dfaa18ec48158d netbeans-5.5.1.ebuild 14762
+MISC ChangeLog 13435 RMD160 3d48b167c7b91898d77812e9c9925192287d093e SHA1 14b6cadb124b76a84d7c40a20f0db31e2aeae43a SHA256 5ac0a7a4a98f82f1b6b14126fcaf62f8441b17b6063b87f34411774b6f429bee
+MD5 3f3b10f70e7c4b6e1ca51d07c7fd2349 ChangeLog 13435
+RMD160 3d48b167c7b91898d77812e9c9925192287d093e ChangeLog 13435
+SHA256 5ac0a7a4a98f82f1b6b14126fcaf62f8441b17b6063b87f34411774b6f429bee ChangeLog 13435
 MISC metadata.xml 1328 RMD160 4eecca7673969a73ff2ca027a39392d9b1a2f4c9 SHA1 dbea16e30375f2831e91c850baf699411fe9d1c6 SHA256 a573ece663e4ce95e27ceaf072610b6e9912dbfd580b8f3b7fc1480345ae2788
 MD5 6f58315d4c3eb8d8a3c27be4f8054542 metadata.xml 1328
 RMD160 4eecca7673969a73ff2ca027a39392d9b1a2f4c9 metadata.xml 1328
@@ -75,3 +78,10 @@ SHA256 6ccefbf351ddcc6eb05dc70fb8ba2453bbec18957ccf012e31f920e52c73e664 files/di
 MD5 4c56632ac409a75570479e4b6966b5a2 files/digest-netbeans-5.5.1 560
 RMD160 99db7e5d508313849fa843e507791d2a41dfa38c files/digest-netbeans-5.5.1 560
 SHA256 973324766bc3ce5278db740862ed5303d1de8362f50d14e6a4b1460cda82e0a3 files/digest-netbeans-5.5.1 560
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHgQlkcxLzpIGCsLQRAuoOAJ4ukDGmxY0DBZkmn/A51yFIseVErwCfR74f
+qJ3J+KUVPwiU1snT09JGd30=
+=aWtl
+-----END PGP SIGNATURE-----
diff --git a/dev-util/netbeans/netbeans-5.5.1.ebuild b/dev-util/netbeans/netbeans-5.5.1.ebuild
index 9bdad4652573..ab49cac46c04 100644
--- a/dev-util/netbeans/netbeans-5.5.1.ebuild
+++ b/dev-util/netbeans/netbeans-5.5.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 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.ebuild,v 1.3 2008/01/02 07:05:07 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5.1.ebuild,v 1.4 2008/01/06 17:01:13 betelgeuse Exp $
+
+WANT_ANT_TASKS="ant-nodeps"
 
 inherit eutils java-pkg-2 java-ant-2 versionator
 
@@ -36,6 +38,7 @@ COMMON_DEPEND="
 	>=dev-java/xml-commons-1.0_beta2"
 
 RDEPEND=">=virtual/jre-1.5
+	>=dev-java/ant-core-1.7.0
 	dev-java/antlr
 	=dev-java/commons-beanutils-1.7*
 	dev-java/commons-collections