diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2006-07-29 22:59:07 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2006-07-29 22:59:07 +0000 |
| commit | 69b7a451dd23a5db52c55b53456951084eafe0ac (patch) | |
| tree | a0e956baf241d01489fc4f2747743ca3b3b484a0 /dev-java/jaxen | |
| parent | stable bump for x86 (#142060) (diff) | |
| download | gentoo-2-69b7a451dd23a5db52c55b53456951084eafe0ac.tar.gz gentoo-2-69b7a451dd23a5db52c55b53456951084eafe0ac.tar.bz2 gentoo-2-69b7a451dd23a5db52c55b53456951084eafe0ac.zip | |
Fixed JDK dependencies, so Java 1.5 won't be used.
(Portage version: 2.1.1_pre3-r5)
Diffstat (limited to 'dev-java/jaxen')
| -rw-r--r-- | dev-java/jaxen/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/jaxen/jaxen-1.0-r1.ebuild | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/dev-java/jaxen/ChangeLog b/dev-java/jaxen/ChangeLog index f1e4f3d80019..3b5719820e8b 100644 --- a/dev-java/jaxen/ChangeLog +++ b/dev-java/jaxen/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/jaxen # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.24 2006/07/29 15:20:52 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.25 2006/07/29 22:59:07 nichoj Exp $ + + 29 Jul 2006; Joshua Nichols <nichoj@gentoo.org> jaxen-1.0-r1.ebuild: + Fixed JDK dependencies, so Java 1.5 won't be used *jaxen-1.0-r1 (29 Jul 2006) diff --git a/dev-java/jaxen/jaxen-1.0-r1.ebuild b/dev-java/jaxen/jaxen-1.0-r1.ebuild index e1ba0e9ef6e8..49abaaa5363c 100644 --- a/dev-java/jaxen/jaxen-1.0-r1.ebuild +++ b/dev-java/jaxen/jaxen-1.0-r1.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/jaxen/jaxen-1.0-r1.ebuild,v 1.1 2006/07/29 15:20:52 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.0-r1.ebuild,v 1.2 2006/07/29 22:59:07 nichoj Exp $ inherit java-pkg-2 java-ant-2 eutils @@ -11,19 +11,22 @@ LICENSE="jaxen" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="doc junit source" -RDEPEND="|| ( >=virtual/jre-1.3* ) +COMMON_DEP=" dev-java/xalan >=dev-java/xerces-2.6.2-r1 =dev-java/dom4j-1* ~dev-java/jdom-1.0_beta9 dev-java/saxpath" -DEPEND="|| ( >=virtual/jdk-1.3* ) +RDEPEND="|| ( >=virtual/jre-1.3* ) + ${COMMON_DEP}" +# FIXME doesn't like Java 1.5's XML API +DEPEND="|| ( =virtual/jdk-1.3* =virtual/jdk-1.4* ) dev-java/ant junit? ( dev-java/junit ) - ${RDEPEND}" + ${COMMON_DEP}" -S=${WORKDIR}/${P}-FCS +S="${WORKDIR}/${P}-FCS" src_unpack() { unpack ${A} @@ -56,4 +59,3 @@ src_install() { use doc && java-pkg_dohtml -r build/doc/* use source && java-pkg_dosrc src/java/main/* } - |