diff options
author | Petteri Räty <betelgeuse@gentoo.org> | 2007-04-28 22:49:41 +0000 |
---|---|---|
committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-04-28 22:49:41 +0000 |
commit | 8be5737704a0f4d01b8636d2eff826b9b2a4dbaf (patch) | |
tree | e0420f4d903d43c9e758cd640d7d58099cb2cf72 /dev-java/tagunit | |
parent | fixup *initd (diff) | |
download | gentoo-2-8be5737704a0f4d01b8636d2eff826b9b2a4dbaf.tar.gz gentoo-2-8be5737704a0f4d01b8636d2eff826b9b2a4dbaf.tar.bz2 gentoo-2-8be5737704a0f4d01b8636d2eff826b9b2a4dbaf.zip |
Prefer virtual/jdk-1.4 over 1.3 and add dev-java/ant-core to RDEPEND.
(Portage version: 2.1.2.5)
Diffstat (limited to 'dev-java/tagunit')
-rw-r--r-- | dev-java/tagunit/ChangeLog | 6 | ||||
-rw-r--r-- | dev-java/tagunit/tagunit-1.0.1-r1.ebuild | 19 |
2 files changed, 16 insertions, 9 deletions
diff --git a/dev-java/tagunit/ChangeLog b/dev-java/tagunit/ChangeLog index 1baf41a87bd0..f1db62ba5664 100644 --- a/dev-java/tagunit/ChangeLog +++ b/dev-java/tagunit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/tagunit # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/tagunit/ChangeLog,v 1.12 2007/01/30 00:41:04 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/tagunit/ChangeLog,v 1.13 2007/04/28 22:49:41 betelgeuse Exp $ + + 28 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> + tagunit-1.0.1-r1.ebuild: + Prefer virtual/jdk-1.4 over 1.3 and add dev-java/ant-core to RDEPEND. 30 Jan 2007; Vlastimil Babka <caster@gentoo.org> tagunit-1.0.1-r1.ebuild: Put java-ant-2 after java-pkg-2 in inherit. diff --git a/dev-java/tagunit/tagunit-1.0.1-r1.ebuild b/dev-java/tagunit/tagunit-1.0.1-r1.ebuild index 5f36ccf6c65c..ed0f3bd381c0 100644 --- a/dev-java/tagunit/tagunit-1.0.1-r1.ebuild +++ b/dev-java/tagunit/tagunit-1.0.1-r1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/tagunit/tagunit-1.0.1-r1.ebuild,v 1.3 2007/01/30 00:41:04 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/tagunit/tagunit-1.0.1-r1.ebuild,v 1.4 2007/04/28 22:49:41 betelgeuse Exp $ + +JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 @@ -13,14 +15,15 @@ SLOT="0" KEYWORDS="~x86 ~amd64 ~ppc" IUSE="doc source" -RDEPEND="|| ( =virtual/jre-1.3 =virtual/jre-1.4* ) - =dev-java/servletapi-2.4*" +COMMON_DEP=" + =dev-java/servletapi-2.4* + >=dev-java/ant-core-1.6" +RDEPEND=">=virtual/jre-1.3 + ${COMMON_DEP}" -DEPEND=" || ( =virtual/jdk-1.3 =virtual/jdk-1.4* ) - ${RDEPEND} - >=dev-java/ant-core-1.6 - app-arch/unzip - source? ( app-arch/zip )" +DEPEND=" || ( =virtual/jdk-1.4* =virtual/jdk-1.3* ) + ${COMMON_DEP} + app-arch/unzip" S="${WORKDIR}/${P}-src/tagunit-core" |