summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-java/commons-jxpath/ChangeLog6
-rw-r--r--dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild9
2 files changed, 10 insertions, 5 deletions
diff --git a/dev-java/commons-jxpath/ChangeLog b/dev-java/commons-jxpath/ChangeLog
index ddcb7290aa83..83b7adab542e 100644
--- a/dev-java/commons-jxpath/ChangeLog
+++ b/dev-java/commons-jxpath/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/commons-jxpath
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.15 2007/01/22 21:24:55 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.16 2007/04/25 18:01:47 betelgeuse Exp $
+
+ 25 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+ commons-jxpath-1.2-r2.ebuild:
+ Prefer virtual/jdk-1.5 over virtual/jdk-1.4.
21 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
commons-jxpath-1.2-r2.ebuild:
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild
index 5441e4d49b63..e06da104cd9c 100644
--- a/dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.2-r2.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/commons-jxpath/commons-jxpath-1.2-r2.ebuild,v 1.2 2007/01/21 18:02:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild,v 1.3 2007/04/25 18:01:47 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source test"
inherit java-pkg-2 java-ant-2
@@ -11,7 +13,7 @@ SRC_URI="mirror://apache/jakarta/commons/jxpath/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="doc source test"
+IUSE=""
COMMON_DEPEND="=dev-java/commons-beanutils-1.6*
=dev-java/servletapi-2.3*
@@ -19,8 +21,7 @@ COMMON_DEPEND="=dev-java/commons-beanutils-1.6*
RDEPEND=">=virtual/jre-1.4
${COMMON_DEPEND}"
# Java 1.6's javadoc doesn't like enums
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
- !test? ( dev-java/ant-core )
+DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
test? (
dev-java/ant
dev-java/commons-collections