summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2007-01-24 17:48:47 +0000
committerVlastimil Babka <caster@gentoo.org>2007-01-24 17:48:47 +0000
commit6cfa5cc9e088d264cd10f204ba69dd40cd7a64f9 (patch)
tree14868688638a7bcacd05db830db8b8dbe1b87e23 /dev-java
parentMask cvs version of net-p2p/linuxdcpp (diff)
downloadgentoo-2-6cfa5cc9e088d264cd10f204ba69dd40cd7a64f9.tar.gz
gentoo-2-6cfa5cc9e088d264cd10f204ba69dd40cd7a64f9.tar.bz2
gentoo-2-6cfa5cc9e088d264cd10f204ba69dd40cd7a64f9.zip
Correct asm-2 dep which could have pulled different slot.
(Portage version: 2.1.2-r3)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/hibernate/ChangeLog6
-rw-r--r--dev-java/hibernate/hibernate-3.0.5-r2.ebuild4
-rw-r--r--dev-java/hibernate/hibernate-3.1.3.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index 68bdf29461c4..62bc7aad8f96 100644
--- a/dev-java/hibernate/ChangeLog
+++ b/dev-java/hibernate/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/hibernate
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.27 2007/01/12 12:53:38 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.28 2007/01/24 17:48:47 caster Exp $
+
+ 24 Jan 2007; Vlastimil Babka <caster@gentoo.org>
+ hibernate-3.0.5-r2.ebuild, hibernate-3.1.3.ebuild:
+ Correct asm-2 dep which could have pulled different slot.
12 Jan 2007; Vlastimil Babka <caster@gentoo.org>
hibernate-3.0.5-r2.ebuild:
diff --git a/dev-java/hibernate/hibernate-3.0.5-r2.ebuild b/dev-java/hibernate/hibernate-3.0.5-r2.ebuild
index e54065f30da1..ce1c6f789a37 100644
--- a/dev-java/hibernate/hibernate-3.0.5-r2.ebuild
+++ b/dev-java/hibernate/hibernate-3.0.5-r2.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/hibernate/hibernate-3.0.5-r2.ebuild,v 1.3 2007/01/12 12:53:38 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.0.5-r2.ebuild,v 1.4 2007/01/24 17:48:47 caster Exp $
inherit java-pkg-2 java-ant-2 eutils
@@ -16,7 +16,7 @@ SLOT="3"
KEYWORDS="~amd64 ~x86"
COMMON_DEPEND="
- =dev-java/asm-2*
+ =dev-java/asm-2.0*
dev-java/c3p0
=dev-java/cglib-2.1*
dev-java/commons-collections
diff --git a/dev-java/hibernate/hibernate-3.1.3.ebuild b/dev-java/hibernate/hibernate-3.1.3.ebuild
index 92a7ced33a71..72459210722e 100644
--- a/dev-java/hibernate/hibernate-3.1.3.ebuild
+++ b/dev-java/hibernate/hibernate-3.1.3.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/hibernate/hibernate-3.1.3.ebuild,v 1.2 2007/01/11 19:13:59 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.1.3.ebuild,v 1.3 2007/01/24 17:48:47 caster Exp $
inherit java-pkg-2 java-ant-2 eutils
@@ -15,7 +15,7 @@ KEYWORDS="~x86 ~amd64"
COMMON_DEPEND="
dev-java/antlr
- =dev-java/asm-2*
+ =dev-java/asm-2.0*
dev-java/c3p0
=dev-java/cglib-2.1*
dev-java/commons-collections