diff options
| author |   Alistair Bush <ali_bush@gentoo.org> | 2009-07-23 13:14:44 +0000 |
|---|---|---|
| committer | Alistair Bush <ali_bush@gentoo.org> | 2009-07-23 13:14:44 +0000 |
| commit | fe12dce7047c15721cddce6f12279b4c3eb44feb (patch) | |
| tree | 5687ba163c0739bd466cf04de7b812093b1a1e27 /dev-java/batik | |
| parent | Constrain jython dependency so it doesn't pulling 2.5 slot. (diff) | |
| download | gentoo-2-fe12dce7047c15721cddce6f12279b4c3eb44feb.tar.gz gentoo-2-fe12dce7047c15721cddce6f12279b4c3eb44feb.tar.bz2 gentoo-2-fe12dce7047c15721cddce6f12279b4c3eb44feb.zip | |
Constrain jython dependency so it doesn't pulling 2.5 slot.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/batik')
| -rw-r--r-- | dev-java/batik/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/batik/batik-1.6-r3.ebuild | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog index 354207730994..01f7eb4277e4 100644 --- a/dev-java/batik/ChangeLog +++ b/dev-java/batik/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/batik # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.61 2009/07/19 14:02:16 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.62 2009/07/23 13:14:44 ali_bush Exp $ + + 23 Jul 2009; Alistair Bush <ali_bush@gentoo.org> batik-1.6-r3.ebuild: + Constrain jython dependency so it doesn't pulling 2.5 slot. 19 Jul 2009; nixnut <nixnut@gentoo.org> batik-1.6-r4.ebuild, batik-1.7-r2.ebuild: diff --git a/dev-java/batik/batik-1.6-r3.ebuild b/dev-java/batik/batik-1.6-r3.ebuild index 0f8255aa8410..cdcfc2deae46 100644 --- a/dev-java/batik/batik-1.6-r3.ebuild +++ b/dev-java/batik/batik-1.6-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.6-r3.ebuild,v 1.8 2008/01/20 22:27:27 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.6-r3.ebuild,v 1.9 2009/07/23 13:14:44 ali_bush Exp $ inherit java-pkg-2 java-ant-2 eutils @@ -16,7 +16,7 @@ IUSE="doc python tcl" CDEPEND="=dev-java/rhino-1.5* >=dev-java/xerces-2.7.1 =dev-java/xml-commons-external-1.3* - python? ( dev-java/jython ) + python? ( || ( =dev-java/jython-2.2* =dev-java/jython-2.1* ) ) tcl? ( dev-java/jacl )" DEPEND="=virtual/jdk-1.4* dev-java/ant-core |