[gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass

["Vlastimil Babka (caster)" <caster@gentoo.org>]

caster      08/12/29 00:16:40

  Modified:             java-utils-2.eclass
  Log:
  Add EANT_NEEDS_TOOLS variable for adding tools.jar to gentoo.classpath, bug #231673 by James Le Cuirot <chewi@aura-online.co.uk>.

Revision  Changes    Path
1.120                eclass/java-utils-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.120&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.120&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.119&r2=1.120

Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- java-utils-2.eclass	20 Dec 2008 19:25:29 -0000	1.119
+++ java-utils-2.eclass	29 Dec 2008 00:16:40 -0000	1.120
@@ -6,7 +6,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.119 2008/12/20 19:25:29 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.120 2008/12/29 00:16:40 caster Exp $
 
 # -----------------------------------------------------------------------------
 # @eclass-begin
@@ -1838,6 +1838,9 @@
 # EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
 #                         gentoo.classpath property. Be sure to call
 #                         java-ant_rewrite-classpath in src_unpack.
+# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
+#                    for build-time purposes, the dependency is not recorded to
+#                    package.env!
 # JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
 # *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
 # ------------------------------------------------------------------------------
@@ -1942,6 +1945,8 @@
 		cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
 	done
 
+	[[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
+
 	if [[ ${cp} ]]; then
 		# It seems ant does not like single quotes around ${cp}
 		cp=${cp#:}