Updated jar-from asm calls to satisfy the new asm-1.4 slot.

3 files changed, 16 insertions, 12 deletions

diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index adaea623c789..96c8ee7cb6ef 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/groovy
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.8 2004/10/16 17:15:35 axxo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.9 2005/01/05 22:16:31 luckyduck Exp $
+
+  05 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  groovy-1.0_beta4-r1.ebuild, groovy-1.0_beta4.ebuild:
+  Updated jar-from asm calls to satisfy the new asm-1.4 slot.
 
   16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> groovy-1.0_beta4-r1.ebuild,
   groovy-1.0_beta4.ebuild:
diff --git a/dev-java/groovy/groovy-1.0_beta4-r1.ebuild b/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
index 7ec642f7ae0f..6424ae7b891a 100644
--- a/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
+++ b/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_beta4-r1.ebuild,v 1.5 2004/10/16 17:15:35 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_beta4-r1.ebuild,v 1.6 2005/01/05 22:16:31 luckyduck Exp $
 
 inherit java-pkg
 
@@ -9,17 +9,17 @@ HOMEPAGE="http://groovy.codehaus.org/"
 SRC_URI="http://dist.codehaus.org/groovy/distributions/${PN}-1.0-beta-4-src.tar.gz"
 LICENSE="codehaus-groovy"
 SLOT="1"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="doc jikes"
 DEPEND="=dev-java/xerces-2.6* \
 	>=dev-java/commons-cli-1.0-r3
-	=dev-java/ant-1.5*
+	>=dev-java/ant-1.5*
 	=dev-java/junit-3.8*
 	=dev-java/asm-1.4*
 	>=dev-java/classworlds-1.0-r2
 	=dev-java/mockobjects-0.0*
 	=dev-java/bsf-2.3*
-	=www-servers/tomcat-5*
+	=dev-java/servletapi-2.4*
 	=dev-java/xmojo-bin-5.0*"
 # karltk:
 # xmojo-bin is a JMX provider, we should add a list of alternatives
@@ -35,13 +35,13 @@ src_unpack() {
 	cd ${S}/target/lib
 	java-pkg_jar-from xerces-2 || die "Missing xerces"
 	java-pkg_jar-from junit || die "Missing junit"
-	java-pkg_jar-from asm-1 || die "Missing asm"
+	java-pkg_jar-from asm-1.4 || die "Missing asm"
 	java-pkg_jar-from commons-cli-1 || die "Missing commons-cli"
 	java-pkg_jar-from classworlds-1 || die "Missing classworlds"
 	java-pkg_jar-from bsf-2.3 || die "Missing bsf"
 	java-pkg_jar-from mockobjects || die "Missing mockobjects"
 	java-pkg_jar-from xmojo-bin-5.0 || die "Missing xmojo-bin"
-	ln -s /opt/tomcat/common/lib/servlet-api.jar .
+	java-pkg_jar-from servletapi-2.4 servlet-api.jar || die "Missing servletapi"
 
 	cd ${S}
 
diff --git a/dev-java/groovy/groovy-1.0_beta4.ebuild b/dev-java/groovy/groovy-1.0_beta4.ebuild
index 5f044cb0fa5c..0849020f45f3 100644
--- a/dev-java/groovy/groovy-1.0_beta4.ebuild
+++ b/dev-java/groovy/groovy-1.0_beta4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_beta4.ebuild,v 1.4 2004/10/16 17:15:35 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_beta4.ebuild,v 1.5 2005/01/05 22:16:31 luckyduck Exp $
 
 inherit java-pkg
 
@@ -34,7 +34,7 @@ src_unpack() {
 	(
 		cd ${S}/target/lib
 		java-pkg_jar-from xerces || die
-		java-pkg_jar-from asm || die
+		java-pkg_jar-from asm-1.4 || die
 		java-pkg_jar-from commons-cli || die
 		java-pkg_jar-from junit || die
 		java-pkg_jar-from classworlds || die