/[gentoo-x86]/eclass/ant-tasks.eclass
Gentoo

Diff of /eclass/ant-tasks.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.10 Revision 1.11
1# Eclass for building dev-java/ant-* packages 1# Eclass for building dev-java/ant-* packages
2# 2#
3# Copyright 1999-2011 Gentoo Foundation 3# Copyright 1999-2012 Gentoo Foundation
4# Distributed under the terms of the GNU General Public License, v2 or later 4# Distributed under the terms of the GNU General Public License, v2 or later
5# Author Vlastimil Babka <caster@gentoo.org> 5# Author Vlastimil Babka <caster@gentoo.org>
6# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.10 2012/02/16 22:25:20 caster Exp $ 6# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.11 2012/03/03 22:39:14 caster Exp $
7 7
8# we set ant-core dep ourselves, restricted 8# we set ant-core dep ourselves, restricted
9JAVA_ANT_DISABLE_ANT_CORE_DEP=true 9JAVA_ANT_DISABLE_ANT_CORE_DEP=true
10# rewriting build.xml for are the testcases has no reason atm 10# rewriting build.xml for are the testcases has no reason atm
11JAVA_PKG_BSFIX_ALL=no 11JAVA_PKG_BSFIX_ALL=no
58# override it before inheriting this eclass. 58# override it before inheriting this eclass.
59# ----------------------------------------------------------------------------- 59# -----------------------------------------------------------------------------
60ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}} 60ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}}
61 61
62# ----------------------------------------------------------------------------- 62# -----------------------------------------------------------------------------
63# @variable-preinherit ANT_TASK_DISABLE_VM_DEPS
64# @variable-default unset
65#
66# If set, no JDK/JRE deps are added.
67# -----------------------------------------------------------------------------
68
69# -----------------------------------------------------------------------------
63# @variable-internal ANT_TASK_PV 70# @variable-internal ANT_TASK_PV
64# @variable-default Just the number in $PV without any beta/RC suffixes 71# @variable-default Just the number in $PV without any beta/RC suffixes
65# 72#
66# Version of ant-core this task is intended to register and thus load with. 73# Version of ant-core this task is intended to register and thus load with.
67# ----------------------------------------------------------------------------- 74# -----------------------------------------------------------------------------
97 ${GENTOO_PREFIX}/ant-${PV}-gentoo.tar.bz2" 104 ${GENTOO_PREFIX}/ant-${PV}-gentoo.tar.bz2"
98LICENSE="Apache-2.0" 105LICENSE="Apache-2.0"
99SLOT="0" 106SLOT="0"
100IUSE="" 107IUSE=""
101 108
109RDEPEND="~dev-java/ant-core-${PV}"
110DEPEND="${RDEPEND}"
111
112if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then
102RDEPEND=">=virtual/jre-${ANT_TASK_JREVER} 113 RDEPEND=">=virtual/jre-${ANT_TASK_JREVER}
103 ~dev-java/ant-core-${PV}" 114 ${DEPEND}"
104DEPEND=">=virtual/jdk-${ANT_TASK_JDKVER} 115 DEPEND=">=virtual/jdk-${ANT_TASK_JDKVER}
105 ${RDEPEND}" 116 ${RDEPEND}"
117fi
106 118
107# we need direct blockers with old ant-tasks for file collisions - bug #252324 119# we need direct blockers with old ant-tasks for file collisions - bug #252324
108if version_is_at_least 1.7.1 ; then 120if version_is_at_least 1.7.1 ; then
109 DEPEND="${DEPEND} 121 DEPEND="${DEPEND}
110 !dev-java/ant-tasks" 122 !dev-java/ant-tasks"

Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11

  ViewVC Help
Powered by ViewVC 1.1.20