Updated patch to fix bug #238648 reported by Christof Schulze <christof.schulze@gmx.net>. Added necessary call to die.

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.25-gentoo-r7 x86_64
RepoMan-Options: --force

4 files changed, 24 insertions, 8 deletions

diff --git a/dev-java/asm/ChangeLog b/dev-java/asm/ChangeLog
index ff3d78b17c4d..9d588d1431bf 100644
--- a/dev-java/asm/ChangeLog
+++ b/dev-java/asm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/asm
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/ChangeLog,v 1.57 2008/09/10 18:17:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/ChangeLog,v 1.58 2008/09/25 20:20:13 serkan Exp $
+
+  25 Sep 2008; Serkan Kaba <serkan@gentoo.org>
+  files/asm-2.2.3-build.xml.patch, asm-2.2.3-r1.ebuild:
+  Updated patch to fix bug #238648 reported by Christof Schulze
+  <christof.schulze@gmx.net>. Added necessary call to die.
 
   10 Sep 2008; Brent Baude <ranger@gentoo.org> asm-2.0-r1.ebuild:
   marking asm-2.0-r1.ebuild ppc64 stable for bug 235747
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index b0427fe70b68..d583ea1dba1c 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,4 +1,7 @@
-AUX asm-2.2.3-build.xml.patch 2357 RMD160 ab25a2ca7d91464cb2ba7ced2d5cf1794ba4a374 SHA1 774b7d45ab08e5ec413dfc966c11870c542c543c SHA256 e506dc773725c1547b1a82f6593aa200740da4e83b42ca660e2c4b7d654af172
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX asm-2.2.3-build.xml.patch 2410 RMD160 1c4a16cc62dc3cd1c42c78e2ecb87569107ac211 SHA1 60df779bc285cc1aae67dc8b98a9c629193e21e0 SHA256 a09802efdb631c5cecc413c36ad0238892bb052ae1c2bbb2c995ef98e1b30c1b
 AUX asm-2.2.3-commons.patch 737 RMD160 6e7b9bc8ec6335b0bf48be3ea6356fca89e78e93 SHA1 14eb9a6b9cd352575e4ec42e2dcb2d0c584ada1f SHA256 63df67584f36fcbac29102c7fe78df99c94efda087885eeacf9f2aaf6a1dd9c0
 DIST asm-1.4.3.tar.gz 135980 RMD160 3808cddc689e8f800802ae83d042a4ecc07f8fca SHA1 ca949c9350da047f28cc99e6973aeb6bcc17beb9 SHA256 45970ef619fb39d30c48379ef362b2e2738586382df1d8090519736219c22a01
 DIST asm-1.5.3.tar.gz 151370 RMD160 73a3e2f82af8cd1f674cf38d84946caf784b5b5e SHA1 f31b55df9242e3df492aa3f34bc343dee4b0fc69 SHA256 e58fda42c5a539ba2a1b99aa68329c27f3732299cf0942f654799b9f1fed1d3a
@@ -9,8 +12,15 @@ DIST asm-3.1.tar.gz 685894 RMD160 21d6328960ef165926c1488618ad7301d708ad81 SHA1
 EBUILD asm-1.4.3-r3.ebuild 1009 RMD160 72b274af0458e537a054932e0ac544ca9c44ab82 SHA1 8ec887ee26888d8456be41b6dc7def56676516d8 SHA256 72c99cc9ebe218e4ad4b7d46719251cb4276822fdb76435f711c78e727916593
 EBUILD asm-1.5.3.ebuild 994 RMD160 ef7bea0fbdcc0c3f64d550a8a19662c087977470 SHA1 ccee3969acbe28a620399a4ca643bdcccd733eed SHA256 e1778ae012cad26cbd8b7e35ca9f399f2d0df9707f63be88c1c80ac36b85ea05
 EBUILD asm-2.0-r1.ebuild 1017 RMD160 c4c7abd604100031001b846d10f323411c42ae53 SHA1 3625d979449cb2ea9b47cbfaf183467ea7947aa8 SHA256 9e6dd604ea521e0d965f3c85ce47bca7bf0eff23d40ba18f6dc440905d625eb2
-EBUILD asm-2.2.3-r1.ebuild 1322 RMD160 4fc19a32e011b6397a5402da024ab4dc4372083b SHA1 500244fafd76aa6a202d083f09da3f3964cd9ddf SHA256 92c97e8842f4645b6007dfbe205ea45f9c14e6b3d51bd89cceb5613756cf4c5b
+EBUILD asm-2.2.3-r1.ebuild 1328 RMD160 2ab94a9957eb1592aee1482c925b57016478b2cc SHA1 57121e5a2812128608c9860bb95ce75e05192518 SHA256 6ee89a39cc180080338ccc96896f39b8e42799ae1a8d60b1e38fd15f8f7e8823
 EBUILD asm-3.0.ebuild 896 RMD160 1fa3e6d73a1486ff331b9a3e7071937f1040acb9 SHA1 cad109d94a293a670b2e638307b1ef562bfe867c SHA256 606d2ec0ae6c0f415a71e19785593e86f0c0035d35bd63e9c5911cfa08f5785d
 EBUILD asm-3.1.ebuild 947 RMD160 e9a3fb031382d940315c37d9a9310d90a141305f SHA1 f7a8b2516fb8dff96d2b2502966b032502b2fe7a SHA256 eea07569e856a4467de46009ca7a11147e0db5db2960bd0efb0e3b5aad48b55b
-MISC ChangeLog 6993 RMD160 02938eb4c3bdeb7beaa8c02c7d9eb63b2102bc6c SHA1 5d029fa804573c113585cb6f84f8ca8d6241e842 SHA256 bb4a58af55bfd2be170365277f447e6286627f98ee865f95a2df93e711844427
+MISC ChangeLog 7220 RMD160 342578f4f24a5a74e368e3126bdd16bfbd919180 SHA1 94aff77160f0e965e38f4205d4a301142d28f5e4 SHA256 19df242a0144f7daf415d13c2867858fefe12303cbd9c2b9e4dfb3fbf29bde52
 MISC metadata.xml 887 RMD160 ffc019291737f6ac4c82f7531484fc69cac80c19 SHA1 055d458f584cc7079ea89d63fe10cfd5ff2e83a8 SHA256 f8618d0e80406ef0ec2e4c287c0f09b0dcced9688dec3fd7dafa8601bba10527
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjb8ogACgkQRh6X64ivZaKjGQCeMm1S7eLxez6s50wxRyV1/D0F
+c2YAnian/2iL6PemWdPzrs6mt76rSHr/
+=ZtzP
+-----END PGP SIGNATURE-----
diff --git a/dev-java/asm/asm-2.2.3-r1.ebuild b/dev-java/asm/asm-2.2.3-r1.ebuild
index 6134a020d76b..af0d8c144cf2 100644
--- a/dev-java/asm/asm-2.2.3-r1.ebuild
+++ b/dev-java/asm/asm-2.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.5 2008/03/30 16:59:25 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-2.2.3-r1.ebuild,v 1.6 2008/09/25 20:20:13 serkan Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -24,7 +24,7 @@ RESTRICT="test"
 src_unpack() {
 	unpack ${A}
 
-	cd "${S}"
+	cd "${S}" || die
 	# 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
diff --git a/dev-java/asm/files/asm-2.2.3-build.xml.patch b/dev-java/asm/files/asm-2.2.3-build.xml.patch
index 4eb31e6483f6..b2c4a7e67190 100644
--- a/dev-java/asm/files/asm-2.2.3-build.xml.patch
+++ b/dev-java/asm/files/asm-2.2.3-build.xml.patch
@@ -1,5 +1,6 @@
---- build.xml	2006-09-14 22:30:35.000000000 +0200
-+++ /home/fordfrog/tmp/asm/asm-2.2.3/build.xml	2006-09-14 22:26:19.000000000 +0200
+diff -Nur asm-2.2.3/build.xml asm-2.2.3_patched/build.xml
+--- asm-2.2.3/build.xml	2006-07-05 18:32:20.000000000 +0300
++++ asm-2.2.3_patched/build.xml	2008-09-25 23:12:06.000000000 +0300
 @@ -96,17 +96,6 @@
        <pathelement location="${out.build}"/>

      </path>