[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ant-tasks.eclass

[Vlastimil Babka (caster)]

caster      12/03/03 22:39:14

  Modified:             ChangeLog ant-tasks.eclass
  Log:
  Add support for ANT_TASK_DISABLE_VM_DEPS variable - when enabled, the jdk/jre deps are not added by eclass.

Revision  Changes    Path
1.153                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.153&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.153&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.152&r2=1.153

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- ChangeLog	3 Mar 2012 02:29:41 -0000	1.152
+++ ChangeLog	3 Mar 2012 22:39:14 -0000	1.153
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.152 2012/03/03 02:29:41 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.153 2012/03/03 22:39:14 caster Exp $
+
+  03 Mar 2012; Vlastimil Babka <caster@g.o> ant-tasks.eclass:
+  Add support for ANT_TASK_DISABLE_VM_DEPS variable - when enabled, the jdk/jre
+  deps are not added by eclass.
 
   03 Mar 2012; Ryan Hill <dirtyepic@g.o> toolchain.eclass:
   Prevent bundled libffi from being installed with gcj or gccgo (bug #354903 by



1.11                 eclass/ant-tasks.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?r1=1.10&r2=1.11

Index: ant-tasks.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ant-tasks.eclass	16 Feb 2012 22:25:20 -0000	1.10
+++ ant-tasks.eclass	3 Mar 2012 22:39:14 -0000	1.11
@@ -1,9 +1,9 @@
 # Eclass for building dev-java/ant-* packages
 #
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Vlastimil Babka <caster@g.o>
-# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.10 2012/02/16 22:25:20 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.11 2012/03/03 22:39:14 caster Exp $
 
 # we set ant-core dep ourselves, restricted
 JAVA_ANT_DISABLE_ANT_CORE_DEP=true
@@ -60,6 +60,13 @@
 ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}}
 
 # -----------------------------------------------------------------------------
+# @variable-preinherit ANT_TASK_DISABLE_VM_DEPS
+# @variable-default unset
+#
+# If set, no JDK/JRE deps are added.
+# -----------------------------------------------------------------------------
+
+# -----------------------------------------------------------------------------
 # @variable-internal ANT_TASK_PV
 # @variable-default Just the number in $PV without any beta/RC suffixes
 #
@@ -99,10 +106,15 @@
 SLOT="0"
 IUSE=""
 
-RDEPEND=">=virtual/jre-${ANT_TASK_JREVER}
-	~dev-java/ant-core-${PV}"
-DEPEND=">=virtual/jdk-${ANT_TASK_JDKVER}
-	${RDEPEND}"
+RDEPEND="~dev-java/ant-core-${PV}"
+DEPEND="${RDEPEND}"
+
+if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then
+	RDEPEND=">=virtual/jre-${ANT_TASK_JREVER}
+		${DEPEND}"
+	DEPEND=">=virtual/jdk-${ANT_TASK_JDKVER}
+		${RDEPEND}"
+fi
 
 # we need direct blockers with old ant-tasks for file collisions - bug #252324
 if version_is_at_least 1.7.1 ; then