Updated to be able to build with 1.4. See bug #153971.

(Portage version: 2.1.2_rc1-r5)

4 files changed, 65 insertions, 1 deletions

diff --git a/dev-java/asm/ChangeLog b/dev-java/asm/ChangeLog
index 269d1adf580f..b0b063fb3ee7 100644
--- a/dev-java/asm/ChangeLog
+++ b/dev-java/asm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/asm
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/ChangeLog,v 1.27 2006/09/28 02:08:26 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/ChangeLog,v 1.28 2006/11/19 05:26:41 nichoj Exp $
+
+*asm-2.2.3-r1 (19 Nov 2006)
+
+  19 Nov 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/asm-2.2.3-commons.patch, +asm-2.2.3-r1.ebuild:
+  Updated to be able to build with 1.4. See bug #153971.
 
   28 Sep 2006; Joshua Nichols <nichoj@gentoo.org> asm-2.2.3.ebuild:
   Fixed JDK dependency, bug #148848.
diff --git a/dev-java/asm/asm-2.2.3-r1.ebuild b/dev-java/asm/asm-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..0a67c7fe716b
--- /dev/null
+++ b/dev-java/asm/asm-2.2.3-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-2.2.3-r1.ebuild,v 1.1 2006/11/19 05:26:41 nichoj Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="http://asm.objectweb.org"
+SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="2.2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc source"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	dev-java/ant-owanttask
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# disables test coverage stuff
+	epatch ${FILESDIR}/${P}-build.xml.patch
+	# see bug #153971 and http://forge.objectweb.org/tracker/index.php?func=detail&aid=306349&group_id=23&atid=100023
+	epatch ${FILESDIR}/${P}-commons.patch
+	echo "objectweb.ant.tasks.path = $(java-pkg_getjar --build-only ant-owanttask ow_util_ant_tasks.jar)" >> build.properties
+}
+
+src_compile() {
+	eant jar $(use_doc jdoc)
+}
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar ${x} $(basename ${x/-${PV}})
+	done
+	use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
+	use source && java-pkg_dosrc src/*
+}
+
diff --git a/dev-java/asm/files/asm-2.2.3-commons.patch b/dev-java/asm/files/asm-2.2.3-commons.patch
new file mode 100644
index 000000000000..f7b9d7931efa
--- /dev/null
+++ b/dev-java/asm/files/asm-2.2.3-commons.patch
@@ -0,0 +1,13 @@
+diff -ru asm-2.2.3-orig/src/org/objectweb/asm/commons/SerialVersionUIDAdder.java asm-2.2.3/src/org/objectweb/asm/commons/SerialVersionUIDAdder.java
+--- asm-2.2.3-orig/src/org/objectweb/asm/commons/SerialVersionUIDAdder.java	2006-11-19 00:21:09.000000000 -0500
++++ asm-2.2.3/src/org/objectweb/asm/commons/SerialVersionUIDAdder.java	2006-11-19 00:22:12.000000000 -0500
+@@ -431,7 +431,7 @@
+         try {

+             return MessageDigest.getInstance("SHA").digest(value);

+         } catch (Exception e) {

+-            throw new UnsupportedOperationException(e);

++            throw new UnsupportedOperationException(e.toString());

+         }

+     }

+ 

+Only in asm-2.2.3/src/org/objectweb/asm/commons: SerialVersionUIDAdder.java.orig
diff --git a/dev-java/asm/files/digest-asm-2.2.3-r1 b/dev-java/asm/files/digest-asm-2.2.3-r1
new file mode 100644
index 000000000000..c46f6f44d5fc
--- /dev/null
+++ b/dev-java/asm/files/digest-asm-2.2.3-r1
@@ -0,0 +1,3 @@
+MD5 7a92c87bf067925685cf68dcc0dd8998 asm-2.2.3.tar.gz 287535
+RMD160 9cdda5f5e03217c18f884f0515af713b202a2e5e asm-2.2.3.tar.gz 287535
+SHA256 56c5ce25bff92c3641b6435e28eee71718bc4eb62d4964faa9da6bb9d1002344 asm-2.2.3.tar.gz 287535