From: Miroslav Šulc <fordfrog@gentoo.org>
Date: Wed, 26 May 2010 11:28:49 +0000 (+0000)
Subject: fixed problem with ant
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6b85d03500f8d61aa85e6aca75a352fb86d577f5;p=gentoo.git

fixed problem with ant
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
---

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index fe32d6578d91..1e65b0678e28 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,12 @@
 # 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.134 2010/04/28 12:27:48 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.135 2010/05/26 11:28:49 fordfrog Exp $
+
+*netbeans-6.9_beta-r1 (26 May 2010)
+
+  26 May 2010; Miroslav Å ulc <fordfrog@gentoo.org>
+  -netbeans-6.9_beta.ebuild, +netbeans-6.9_beta-r1.ebuild:
+  fixed problem with ant (bug #319165)
 
 *netbeans-6.9_beta (28 Apr 2010)
 
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index c0ed68c9a2bb..697af75546ee 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -32,6 +32,6 @@ EBUILD netbeans-6.5-r4.ebuild 39581 RMD160 20b6756addc84365a02da229f6fc8f8891326
 EBUILD netbeans-6.7.1.ebuild 42300 RMD160 ea183a464f694ac4fcf2a2e8a76e9e1a7a11f570 SHA1 e36a3515011076851d8c61db3bd984edc2af0570 SHA256 0c771434c7f979a2191043130124a910b6c0f3adce21f627067fa6e944a0765f
 EBUILD netbeans-6.7.ebuild 42088 RMD160 ff497f227494d58f3b34805514ce16e8a70937bf SHA1 37dd9891f525aa39708d0fcb86e227fdb71045e6 SHA256 8d52118e56502dbe6b29c1e6420b5bb20a27f431f246cc5dfb418ff55d79789a
 EBUILD netbeans-6.8-r1.ebuild 43139 RMD160 35c2d6ce7a2b1e45e8e7160301f5298fc9f03e8a SHA1 3d52371008da1a306301e7241034e8db7ccf0a14 SHA256 69e99e12f4e9d856a6a4969c9badb04c855f774746406db64ef4bdaf3e21cc16
-EBUILD netbeans-6.9_beta.ebuild 44109 RMD160 f9832617f255fde771666f5c5ca4ed0d09db5528 SHA1 a91efca9731eaf4e2dd572c6cda08fb76b1cb862 SHA256 cfbfe839e468b666a43e60ecc644fce150b57256e8322367a5c10128cbe49d74
-MISC ChangeLog 25203 RMD160 11c1750a673fd4cdb4346e772479a9b6c3c81e3b SHA1 0080854f2e21a690d7a255ff8d736c5344309dbb SHA256 47cd217977e5c6b2e390a2f51e7a6c4d6b6ab46721ed44e46472907efae4cbe1
+EBUILD netbeans-6.9_beta-r1.ebuild 44062 RMD160 64f8978c4198155af817b8b76e6fcd4e22401b01 SHA1 e41d13ce0d51919b848d13fc47fa1a8d3801f5cf SHA256 8f0fe818d2f761bc5fd467270fd95022169b4d161be1690e5fc2c306e248da8b
+MISC ChangeLog 25391 RMD160 0162146e7b6ee21f4724b4baed18a371aa974ca0 SHA1 954ea50539a94d6c5354735cd6155b9370fe312b SHA256 156a5486bb7b30459f1c888d2ee32f85e3fff8748486b1c0db98666b0051c71a
 MISC metadata.xml 1301 RMD160 1e12597c731e35626197ed6ff4efc2094aa12e61 SHA1 8b0614fb5db9568c8b489908d62fcafc9b636f84 SHA256 14d98dfb63646fb6bc7d433f9626ffa7801ff1de38535167f9b0528dac0182a9
diff --git a/dev-util/netbeans/netbeans-6.9_beta.ebuild b/dev-util/netbeans/netbeans-6.9_beta-r1.ebuild
similarity index 99%
rename from dev-util/netbeans/netbeans-6.9_beta.ebuild
rename to dev-util/netbeans/netbeans-6.9_beta-r1.ebuild
index 74bc2c437abc..67c70d343002 100644
--- a/dev-util/netbeans/netbeans-6.9_beta.ebuild
+++ b/dev-util/netbeans/netbeans-6.9_beta-r1.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.ebuild,v 1.1 2010/04/28 12:27:48 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.9_beta-r1.ebuild,v 1.1 2010/05/26 11:28:49 fordfrog Exp $
 
 EAPI="2"
 WANT_SPLIT_ANT="true"
@@ -776,9 +776,10 @@ src_install() {
 
 	# Ant installation
 	if use netbeans_modules_java ; then
-		local ANTDIR="${DESTINATION}/java3/ant"
+		local ANTDIR="${DESTINATION}/java/ant"
 		dosym /usr/share/ant/lib ${ANTDIR}/lib
 		dosym /usr/share/ant-core/bin ${ANTDIR}/bin
+		dosym /usr/share/ant-core/etc ${ANTDIR}/etc
 	fi
 
 	# Documentation
@@ -1037,8 +1038,6 @@ symlink_extjars() {
 	fi
 
 	if use netbeans_modules_java ; then
-		targetdir="java/ant/etc"
-		dosyminstjar ${targetdir} ant ant-bootstrap.jar ant-bootstrap.jar
 		targetdir="java/ant/nblib"
 		# bridge.jar
 		targetdir="java/ant/patches"