summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Bush <ali_bush@gentoo.org>2009-07-23 13:06:26 +0000
committerAlistair Bush <ali_bush@gentoo.org>2009-07-23 13:06:26 +0000
commit1c89d29494b77b5ef9ce62b357c02ebbd7e261d1 (patch)
tree9e4145243059e5adae3f121358c1435d0bca5977 /dev-java
parentCleanup old version. Trying again?? (diff)
downloadgentoo-2-1c89d29494b77b5ef9ce62b357c02ebbd7e261d1.tar.gz
gentoo-2-1c89d29494b77b5ef9ce62b357c02ebbd7e261d1.tar.bz2
gentoo-2-1c89d29494b77b5ef9ce62b357c02ebbd7e261d1.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')
-rw-r--r--dev-java/aspectj/ChangeLog7
-rw-r--r--dev-java/aspectj/aspectj-1.2-r2.ebuild6
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-java/aspectj/ChangeLog b/dev-java/aspectj/ChangeLog
index 4b56548a5b94..38b040eedf5e 100644
--- a/dev-java/aspectj/ChangeLog
+++ b/dev-java/aspectj/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/aspectj
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.24 2009/02/09 14:09:17 caster Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.25 2009/07/23 13:06:26 ali_bush Exp $
+
+ 23 Jul 2009; Alistair Bush <ali_bush@gentoo.org> aspectj-1.2-r2.ebuild:
+ Constrain jython dependency so it doesn't pulling 2.5 slot.
09 Feb 2009; Vlastimil Babka <caster@gentoo.org> aspectj-1.2.ebuild:
Switch to gen2 eclasses to kill gen1, fixes also bug #204381.
diff --git a/dev-java/aspectj/aspectj-1.2-r2.ebuild b/dev-java/aspectj/aspectj-1.2-r2.ebuild
index b6fdf9bc5b78..4f6a9fb0dd44 100644
--- a/dev-java/aspectj/aspectj-1.2-r2.ebuild
+++ b/dev-java/aspectj/aspectj-1.2-r2.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/aspectj/aspectj-1.2-r2.ebuild,v 1.4 2008/01/10 22:02:11 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/aspectj-1.2-r2.ebuild,v 1.5 2009/07/23 13:06:26 ali_bush Exp $
inherit eutils java-pkg-2 java-ant-2
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/aspectj-CVS-V1_2_0.tar.bz2"
HOMEPAGE="http://www.eclipse.org/aspectj/"
CDEPEND="dev-java/bcel
=dev-java/junit-3.8*
- dev-java/jython
+ =dev-java/jython-2.2*
=dev-java/jakarta-regexp-1.3*
=dev-java/saxon-6.5*
dev-java/ant-core"