summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2006-09-09 07:39:04 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2006-09-09 07:39:04 +0000
commit2cb512d1f9643608a2affd153d8dd306ee9edbb0 (patch)
tree0b3567a87541140ae3d78c1e9c8d31d11d6f6b68 /dev-java/cglib
parentFixed to work with JAVA_PKG_STRICT and changed src_test dependencies to use t... (diff)
downloadgentoo-2-2cb512d1f9643608a2affd153d8dd306ee9edbb0.tar.gz
gentoo-2-2cb512d1f9643608a2affd153d8dd306ee9edbb0.tar.bz2
gentoo-2-2cb512d1f9643608a2affd153d8dd306ee9edbb0.zip
Fixed dependencies to not match two different slots of dev-java/asm.
(Portage version: 2.1.1)
Diffstat (limited to 'dev-java/cglib')
-rw-r--r--dev-java/cglib/ChangeLog6
-rw-r--r--dev-java/cglib/cglib-2.0.2-r1.ebuild4
-rw-r--r--dev-java/cglib/cglib-2.0.2-r2.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-java/cglib/ChangeLog b/dev-java/cglib/ChangeLog
index ecfab24fab47..ae5ebc8d5e71 100644
--- a/dev-java/cglib/ChangeLog
+++ b/dev-java/cglib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/cglib
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.15 2006/09/08 03:47:06 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.16 2006/09/09 07:39:04 betelgeuse Exp $
+
+ 09 Sep 2006; Petteri Räty <betelgeuse@gentoo.org> cglib-2.0.2-r1.ebuild,
+ cglib-2.0.2-r2.ebuild:
+ Fixed dependencies to not match two different slots of dev-java/asm.
08 Sep 2006; Joshua Nichols <nichoj@gentoo.org> cglib-2.1.3.ebuild:
Fix for java-strict. Was missing implicitly dependend on jar from ant-core.
diff --git a/dev-java/cglib/cglib-2.0.2-r1.ebuild b/dev-java/cglib/cglib-2.0.2-r1.ebuild
index 994753839c9d..18182c16fdcd 100644
--- a/dev-java/cglib/cglib-2.0.2-r1.ebuild
+++ b/dev-java/cglib/cglib-2.0.2-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/cglib/cglib-2.0.2-r1.ebuild,v 1.4 2006/02/09 03:06:23 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.0.2-r1.ebuild,v 1.5 2006/09/09 07:39:04 betelgeuse Exp $
inherit eutils java-pkg
@@ -13,7 +13,7 @@ KEYWORDS="amd64 ~ppc x86"
RDEPEND=">=virtual/jre-1.4
jikes? ( >=dev-java/jikes-1.21 )
source? ( app-arch/zip )
- =dev-java/asm-1.4*
+ =dev-java/asm-1.4.3*
=dev-java/aspectwerkz-2*"
DEPEND=">=virtual/jdk-1.4
${RDEPEND}
diff --git a/dev-java/cglib/cglib-2.0.2-r2.ebuild b/dev-java/cglib/cglib-2.0.2-r2.ebuild
index a93f18041bb2..16e9b9718908 100644
--- a/dev-java/cglib/cglib-2.0.2-r2.ebuild
+++ b/dev-java/cglib/cglib-2.0.2-r2.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/cglib/cglib-2.0.2-r2.ebuild,v 1.3 2006/08/06 04:10:20 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.0.2-r2.ebuild,v 1.4 2006/09/09 07:39:04 betelgeuse Exp $
inherit eutils java-pkg-2 java-ant-2
@@ -12,7 +12,7 @@ SLOT="2"
KEYWORDS="~x86 ~amd64 ~ppc"
COMMON_DEP="
source? ( app-arch/zip )
- =dev-java/asm-1.4*
+ =dev-java/asm-1.4.3*
=dev-java/aspectwerkz-2*"
RDEPEND=">=virtual/jre-1.4
${COMMON_DEP}"