diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-01-09 00:20:27 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-01-09 00:20:27 +0000 |
| commit | f5a6434276f53e5e3e488618992d331c427730aa (patch) | |
| tree | 42d4d102aa5a1f372913dcb5b70d2f2191a57c65 /dev-java/bsf | |
| parent | Version bump. Bug #160871. (diff) | |
| download | gentoo-2-f5a6434276f53e5e3e488618992d331c427730aa.tar.gz gentoo-2-f5a6434276f53e5e3e488618992d331c427730aa.tar.bz2 gentoo-2-f5a6434276f53e5e3e488618992d331c427730aa.zip | |
Removed xalan (optional) dependency to prevent circular deps reported in bug #161011 by Darren Dale <dd55@cornell.edu>.
(Portage version: 2.1.2_rc4-r7)
Diffstat (limited to 'dev-java/bsf')
| -rw-r--r-- | dev-java/bsf/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/bsf/bsf-2.3.0-r4.ebuild | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-java/bsf/ChangeLog b/dev-java/bsf/ChangeLog index 10ef5e4802b3..ce771313a090 100644 --- a/dev-java/bsf/ChangeLog +++ b/dev-java/bsf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/bsf # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.33 2007/01/08 00:37:14 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.34 2007/01/09 00:20:27 caster Exp $ + + 09 Jan 2007; Vlastimil Babka <caster@gentoo.org> bsf-2.3.0-r4.ebuild: + Removed xalan dependency (it's optional)to prevent circular deps reported + in bug #161011 by Darren Dale <dd55@cornell.edu>. *bsf-2.3.0-r4 (08 Jan 2007) diff --git a/dev-java/bsf/bsf-2.3.0-r4.ebuild b/dev-java/bsf/bsf-2.3.0-r4.ebuild index bf3d882588b1..849fecdbd38e 100644 --- a/dev-java/bsf/bsf-2.3.0-r4.ebuild +++ b/dev-java/bsf/bsf-2.3.0-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r4.ebuild,v 1.1 2007/01/08 00:37:14 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r4.ebuild,v 1.2 2007/01/09 00:20:27 caster Exp $ inherit java-pkg-2 eutils java-ant-2 @@ -16,7 +16,6 @@ IUSE="doc jython rhino source" COMMON_DEP=" jython? ( >=dev-java/jython-2.1-r5 ) rhino? ( =dev-java/rhino-1.5* ) - dev-java/xalan =dev-java/servletapi-2.3*" RDEPEND=">=virtual/jre-1.4 ${COMMON_DEP}" @@ -34,8 +33,8 @@ src_unpack() { } src_compile() { - local cp="$(java-pkg_getjars xalan)" - local antflags="-Dxalan.present=true" + local cp + local antflags if use rhino; then antflags="${antflags} -Drhino.present=true" cp="${cp}:$(java-pkg_getjars rhino-1.5)" |