diff options
author | Vlastimil Babka <caster@gentoo.org> | 2008-01-10 09:51:13 +0000 |
---|---|---|
committer | Vlastimil Babka <caster@gentoo.org> | 2008-01-10 09:51:13 +0000 |
commit | ae22ac7a4cab6802efab5ab13ee2662efce2fc79 (patch) | |
tree | 29fadf770a7d51fb49819e9246e4b542d2fd7817 /dev-java/jaxme | |
parent | arm/sh stable (diff) | |
download | historical-ae22ac7a4cab6802efab5ab13ee2662efce2fc79.tar.gz historical-ae22ac7a4cab6802efab5ab13ee2662efce2fc79.tar.bz2 historical-ae22ac7a4cab6802efab5ab13ee2662efce2fc79.zip |
Restrict junit dep to 3.8* to prevent circular deps. Fix order of 1.5 and 1.4 deps.
Package-Manager: portage-2.1.4_rc14
Diffstat (limited to 'dev-java/jaxme')
-rw-r--r-- | dev-java/jaxme/ChangeLog | 8 | ||||
-rw-r--r-- | dev-java/jaxme/jaxme-0.3.1-r4.ebuild | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/dev-java/jaxme/ChangeLog b/dev-java/jaxme/ChangeLog index 23fcf544e364..f8f2c7664ce2 100644 --- a/dev-java/jaxme/ChangeLog +++ b/dev-java/jaxme/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jaxme -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.26 2007/10/22 10:13:21 betelgeuse Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.27 2008/01/10 09:51:13 caster Exp $ + + 10 Jan 2008; Vlastimil Babka <caster@gentoo.org> jaxme-0.3.1-r4.ebuild: + Restrict junit dep to 3.8* to prevent circular deps. Fix order of 1.5 and + 1.4 deps. 22 Oct 2007; Petteri Räty <betelgeuse@gentoo.org> jaxme-0.3.1-r4.ebuild: Use mirror://apache instead of a hardcoded server in SRC_URI. Fixes bug diff --git a/dev-java/jaxme/jaxme-0.3.1-r4.ebuild b/dev-java/jaxme/jaxme-0.3.1-r4.ebuild index d9f3c0d14631..9136ded51b3d 100644 --- a/dev-java/jaxme/jaxme-0.3.1-r4.ebuild +++ b/dev-java/jaxme/jaxme-0.3.1-r4.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/jaxme/jaxme-0.3.1-r4.ebuild,v 1.2 2007/10/22 10:13:21 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.3.1-r4.ebuild,v 1.3 2008/01/10 09:51:13 caster Exp $ JAVA_PKG_IUSE="doc source" @@ -19,7 +19,7 @@ IUSE="" COMMON_DEP=" >=dev-java/xerces-2.7 - dev-java/junit + =dev-java/junit-3.8* dev-java/gnu-crypto >=dev-java/log4j-1.2.8 dev-java/ant-core @@ -28,8 +28,8 @@ RDEPEND=">=virtual/jre-1.4 ${COMMON_DEP}" # FIXME doesn't like to compile with Java 1.6 DEPEND="|| ( - =virtual/jdk-1.4* =virtual/jdk-1.5* + =virtual/jdk-1.4* ) ${COMMON_DEP}" |