diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2008-01-10 09:48:14 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2008-01-10 09:48:14 +0000 |
| commit | 3825391431073f0694121532352158ba877b0ddc (patch) | |
| tree | 48d3097406ece21af50a2677db266d412d719f4d /dev-java/junitperf | |
| parent | arm/s390/sh love (diff) | |
| download | gentoo-2-3825391431073f0694121532352158ba877b0ddc.tar.gz gentoo-2-3825391431073f0694121532352158ba877b0ddc.tar.bz2 gentoo-2-3825391431073f0694121532352158ba877b0ddc.zip | |
Restrict junit dep to 3.8* to prevent circular deps in junit-4. Raise jdk/jre deps to 1.4.
(Portage version: 2.1.4_rc14)
Diffstat (limited to 'dev-java/junitperf')
| -rw-r--r-- | dev-java/junitperf/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-java/junitperf/junitperf-1.9.1-r1.ebuild | 20 |
2 files changed, 18 insertions, 11 deletions
diff --git a/dev-java/junitperf/ChangeLog b/dev-java/junitperf/ChangeLog index daee20f6e294..3bcc7ba6a4c4 100644 --- a/dev-java/junitperf/ChangeLog +++ b/dev-java/junitperf/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/junitperf -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/ChangeLog,v 1.16 2007/05/25 23:50:45 betelgeuse Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/ChangeLog,v 1.17 2008/01/10 09:48:14 caster Exp $ + + 10 Jan 2008; Vlastimil Babka <caster@gentoo.org> + junitperf-1.9.1-r1.ebuild: + Restrict junit dep to 3.8* to prevent circular deps in junit-4. Raise + jdk/jre deps to 1.4. 25 May 2007; Petteri Räty <betelgeuse@gentoo.org> junitperf-1.9.1-r1.ebuild: diff --git a/dev-java/junitperf/junitperf-1.9.1-r1.ebuild b/dev-java/junitperf/junitperf-1.9.1-r1.ebuild index cff00e43a232..cd85fe1ebec9 100644 --- a/dev-java/junitperf/junitperf-1.9.1-r1.ebuild +++ b/dev-java/junitperf/junitperf-1.9.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/junitperf-1.9.1-r1.ebuild,v 1.9 2007/05/25 23:50:45 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/junitperf-1.9.1-r1.ebuild,v 1.10 2008/01/10 09:48:14 caster Exp $ JAVA_PKG_IUSE="doc test source" @@ -15,18 +15,20 @@ KEYWORDS="amd64 ppc x86" IUSE="" -RDEPEND=">=virtual/jre-1.3 - dev-java/junit" +COMMON_DEP="=dev-java/junit-3.8*" -DEPEND=">=virtual/jdk-1.3 - ${RDEPEND} +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" + +DEPEND=">=virtual/jdk-1.4 app-arch/unzip - test? ( dev-java/ant-junit )" + test? ( dev-java/ant-junit ) + ${COMMON_DEP}" src_unpack () { unpack ${A} - rm "${S}"/lib/*.jar - cd "${S}"/lib + cd "${S}"/lib || die + rm -fv *.jar || die java-pkg_jar-from junit } |