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

Package-Manager: portage-2.1.2_rc1-r5

diff --git a/dev-java/asm/ChangeLog b/dev-java/asm/ChangeLog
index 269d1adf580fd2b6f56c39a0c0aaa9535f20a2f2..b0b063fb3ee7965375b4189fb63c610ca8a5539d 100644 (file)
--- 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/Manifest b/dev-java/asm/Manifest
index 73f0400c08f43394ff10776734491bd4efab970a..52b9137dd0c878a37e3ac540f5df7f5aefc90306 100644 (file)
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -2,6 +2,10 @@ AUX asm-2.2.3-build.xml.patch 2357 RMD160 ab25a2ca7d91464cb2ba7ced2d5cf1794ba4a3
 MD5 d28e70c25ee8914a057fe65c9f1f0db5 files/asm-2.2.3-build.xml.patch 2357
 RMD160 ab25a2ca7d91464cb2ba7ced2d5cf1794ba4a374 files/asm-2.2.3-build.xml.patch 2357
 SHA256 e506dc773725c1547b1a82f6593aa200740da4e83b42ca660e2c4b7d654af172 files/asm-2.2.3-build.xml.patch 2357
+AUX asm-2.2.3-commons.patch 737 RMD160 6e7b9bc8ec6335b0bf48be3ea6356fca89e78e93 SHA1 14eb9a6b9cd352575e4ec42e2dcb2d0c584ada1f SHA256 63df67584f36fcbac29102c7fe78df99c94efda087885eeacf9f2aaf6a1dd9c0
+MD5 6f416c3eb6f071182aa1820a03a6d929 files/asm-2.2.3-commons.patch 737
+RMD160 6e7b9bc8ec6335b0bf48be3ea6356fca89e78e93 files/asm-2.2.3-commons.patch 737
+SHA256 63df67584f36fcbac29102c7fe78df99c94efda087885eeacf9f2aaf6a1dd9c0 files/asm-2.2.3-commons.patch 737
 DIST ASM_1.4.1_src.zip 845832 RMD160 567a04434bf0b5750084f3ac00270f49c3ab6385 SHA1 dd514470eeab30cdeeca19938eed571a957028d3 SHA256 233e99f292870eb1b946bbb3351120596e399bb30866150ce23c2654dfe0874d
 DIST asm-1.4.3.tar.gz 135980 RMD160 3808cddc689e8f800802ae83d042a4ecc07f8fca SHA1 ca949c9350da047f28cc99e6973aeb6bcc17beb9 SHA256 45970ef619fb39d30c48379ef362b2e2738586382df1d8090519736219c22a01
 DIST asm-1.5.2.tar.gz 149059 RMD160 57538d7710396bbaa099e8539ffe62cff8c56001 SHA1 c0e949d03ff26c1facfdb070ac1e74f812480300 SHA256 2ee53206ea5d582bc9fa0acd5c417dbf37b3418891c6d418edc491e0be819b4a
@@ -39,14 +43,18 @@ EBUILD asm-2.0.ebuild 1090 RMD160 5d652b0c4edecb322cc525edebf304643f013157 SHA1
 MD5 766f4510c4b431136cefc0074b71075f asm-2.0.ebuild 1090
 RMD160 5d652b0c4edecb322cc525edebf304643f013157 asm-2.0.ebuild 1090
 SHA256 9e2f6ec3998cd0b063f7e3315578e364845fb87b1d14811ccb6122f74554f8cb asm-2.0.ebuild 1090
+EBUILD asm-2.2.3-r1.ebuild 1240 RMD160 d4fe60f772a4eab7684c5f7b4291b38fb2354661 SHA1 fde30a9ab3820b8f98610ea2d0a10b800d9d0a3d SHA256 4b5502d57a1b486c161b05742547c15a35b86680328ba9dc8db06eb6d3f46705
+MD5 81307d222696d5cfb6812d690fb35268 asm-2.2.3-r1.ebuild 1240
+RMD160 d4fe60f772a4eab7684c5f7b4291b38fb2354661 asm-2.2.3-r1.ebuild 1240
+SHA256 4b5502d57a1b486c161b05742547c15a35b86680328ba9dc8db06eb6d3f46705 asm-2.2.3-r1.ebuild 1240
 EBUILD asm-2.2.3.ebuild 1083 RMD160 50b66d504113858d6cc461aba21a23b40deca04d SHA1 1749845a03a1b11817cd445ed3ce5242252063fc SHA256 56f3a917ebaa7209aa30754beaf62a57ad55532e5fe4e02a099ba2757f9b9636
 MD5 c349fbadc43934e9639a603b23f48eb4 asm-2.2.3.ebuild 1083
 RMD160 50b66d504113858d6cc461aba21a23b40deca04d asm-2.2.3.ebuild 1083
 SHA256 56f3a917ebaa7209aa30754beaf62a57ad55532e5fe4e02a099ba2757f9b9636 asm-2.2.3.ebuild 1083
-MISC ChangeLog 3314 RMD160 ca3d762f35a71111b75473611822dcbe351851cf SHA1 ee7bcd54fa030bd1da0880ed9ec7cd9c698cf141 SHA256 1f6597dd2b72569cc7145b2b023089d1cc54560ac406c108cee2c48a1e169f7f
-MD5 4ab2d3b11070983ea70c0ffa0963f56c ChangeLog 3314
-RMD160 ca3d762f35a71111b75473611822dcbe351851cf ChangeLog 3314
-SHA256 1f6597dd2b72569cc7145b2b023089d1cc54560ac406c108cee2c48a1e169f7f ChangeLog 3314
+MISC ChangeLog 3507 RMD160 fb35b32e3f40316db65033ef34235e3889001f89 SHA1 891969d56077afe5631ea8c1a89ba4850e2ef747 SHA256 3e1326d6e4ad2e59f7c28763f9a766a8dea4a0e49afb69c2321c6c2c3693c9c5
+MD5 8814f626c3cbe29b79fb3dfea213bdfa ChangeLog 3507
+RMD160 fb35b32e3f40316db65033ef34235e3889001f89 ChangeLog 3507
+SHA256 3e1326d6e4ad2e59f7c28763f9a766a8dea4a0e49afb69c2321c6c2c3693c9c5 ChangeLog 3507
 MISC metadata.xml 887 RMD160 ffc019291737f6ac4c82f7531484fc69cac80c19 SHA1 055d458f584cc7079ea89d63fe10cfd5ff2e83a8 SHA256 f8618d0e80406ef0ec2e4c287c0f09b0dcced9688dec3fd7dafa8601bba10527
 MD5 4dc1e10b1b2b46929ef7bcca0c634374 metadata.xml 887
 RMD160 ffc019291737f6ac4c82f7531484fc69cac80c19 metadata.xml 887
@@ -78,3 +86,6 @@ SHA256 da540bafc7e4567e0ad909b68f780ec25e8e921c11dfd39a671d635a6c65f4cb files/di
 MD5 36453ccf5a5c9ca804be2cfbfeb1fb15 files/digest-asm-2.2.3 229
 RMD160 9069a7ec894544c82e2cafca18d7ea1e2624f590 files/digest-asm-2.2.3 229
 SHA256 6b7909a53ce31c07d41b68d7575eb7c2585309d12d5d6674f7f07915e1f60071 files/digest-asm-2.2.3 229
+MD5 36453ccf5a5c9ca804be2cfbfeb1fb15 files/digest-asm-2.2.3-r1 229
+RMD160 9069a7ec894544c82e2cafca18d7ea1e2624f590 files/digest-asm-2.2.3-r1 229
+SHA256 6b7909a53ce31c07d41b68d7575eb7c2585309d12d5d6674f7f07915e1f60071 files/digest-asm-2.2.3-r1 229

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 (file)
index 0000000..0a67c7f
--- /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 (file)
index 0000000..f7b9d79
--- /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 {\r
+             return MessageDigest.getInstance("SHA").digest(value);\r
+         } catch (Exception e) {\r
+-            throw new UnsupportedOperationException(e);\r
++            throw new UnsupportedOperationException(e.toString());\r
+         }\r
+     }\r
+ \r
+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 (file)
index 0000000..c46f6f4
--- /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