diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2006-12-09 12:57:15 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2006-12-09 12:57:15 +0000 |
| commit | 66f8eb5b3cb94634c6be2df0f47ba71ee8043729 (patch) | |
| tree | 1753e9a85395cd1ade1790e717ca84c2bc42a39d /dev-java/ant-tasks | |
| parent | Fix #157589 (diff) | |
| download | historical-66f8eb5b3cb94634c6be2df0f47ba71ee8043729.tar.gz historical-66f8eb5b3cb94634c6be2df0f47ba71ee8043729.tar.bz2 historical-66f8eb5b3cb94634c6be2df0f47ba71ee8043729.zip | |
Block on dev-java/ant-optional because some people still seem to have it. If you get the block, unmerge ant-optional.
Package-Manager: portage-2.1.2_rc3
Diffstat (limited to 'dev-java/ant-tasks')
| -rw-r--r-- | dev-java/ant-tasks/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild | 11 |
2 files changed, 13 insertions, 5 deletions
diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog index 9000c2061c6e..f78f72f4af5e 100644 --- a/dev-java/ant-tasks/ChangeLog +++ b/dev-java/ant-tasks/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/ant-tasks # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.42 2006/12/07 22:35:26 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.43 2006/12/09 12:57:15 caster Exp $ + + 09 Dec 2006; Vlastimil Babka <caster@gentoo.org> + ant-tasks-1.6.5-r2.ebuild: + Block on dev-java/ant-optional because some people still seem to have it. If + you get the block, unmerge ant-optional. 07 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> ant-tasks-1.6.5-r2.ebuild: diff --git a/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild index 696ec2434575..7743580ef2c2 100644 --- a/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild +++ b/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild,v 1.12 2006/12/07 22:35:26 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild,v 1.13 2006/12/09 12:57:15 caster Exp $ inherit java-pkg-2 eutils @@ -16,8 +16,8 @@ SLOT="0" KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd" IUSE="javamail noantlr nobcel nobeanutils nobsh nobsf nocommonsnet nocommonslogging nojdepend nojsch nojython nolog4j nooro noregexp norhino noxalan noxerces" -RDEPEND=">=virtual/jre-1.4 - =dev-java/ant-core-${PV}* + +CDEPEND="=dev-java/ant-core-${PV}* >=dev-java/junit-3.8 !nolog4j? ( >=dev-java/log4j-1.2.8 ) !noxerces? ( >=dev-java/xerces-2.7.1 ) @@ -36,9 +36,12 @@ RDEPEND=">=virtual/jre-1.4 !noregexp? ( >=dev-java/jakarta-regexp-1.3-r2 ) !nojython? ( >=dev-java/jython-2.1-r5 ) javamail? ( >=dev-java/sun-javamail-bin-1.3.1-r1 )" +RDEPEND=">=virtual/jre-1.4 + ${CDEPEND}" DEPEND=">=virtual/jdk-1.4 >=dev-java/java-config-1.2 - ${RDEPEND}" + !dev-java/ant-optional + ${CDEPEND}" S="${WORKDIR}/apache-ant-${MY_PV}" |