Add patch for sparc, bug #344659.

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

4 files changed, 44 insertions, 5 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index b9083244ece2..2eb10a35ce53 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.16 2010/12/02 19:38:54 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.17 2010/12/12 11:36:16 caster Exp $
+
+  12 Dec 2010; Vlastimil Babka <caster@gentoo.org> +files/6.1.9.3-sparc.patch,
+  icedtea-6.1.9.3.ebuild:
+  Add patch for sparc, bug #344659.
 
   02 Dec 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.3.ebuild,
   metadata.xml:
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 0be9378d90ff..730a4203e668 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,3 +1,4 @@
+AUX 6.1.9.3-sparc.patch 1490 RMD160 fac1e9e3ac3344db332e68789f3222c13010f6e2 SHA1 09be6ad20c687553bab07bcf0a7ca533caa156f2 SHA256 1aab4538d893bd1a009a61add2c9cda5bffc82bf7d4853f1968e491bde84c7e7
 AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433
 AUX icedtea.env 999 RMD160 83d735b0941a9e33c4dd3f3bd3fe16e64c55f5e1 SHA1 6d8da5ad9d396d96f16f148c3a826d9e2a357d0e SHA256 85dc9543de305637739eea7b58e61865bd780aa50fd574ce19ccd95bc1013ec1
 DIST 0803c0f69b51.tar.gz 8394035 RMD160 4b3f252df8f37e227d60714534f30bf567285b25 SHA1 95194930575dbe078a01eb9ed0eae1008cc1cb56 SHA256 e3dbef797c1fd8cd2fc050ce2d998d508baa3f14cab55c6ed0f82d4c724ae08b
@@ -12,6 +13,6 @@ DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5
 DIST openjdk-6-src-b20-21_jun_2010.tar.gz 45078703 RMD160 5248e9b3ed762829c33bf2ff7e3ca0cbf4bee5d2 SHA1 39fc162a740f16aa18afa855fea9d5daf8cf03d4 SHA256 fcf8f1d614e5965e90ef1b1a6d5eecc2bcc3078eaffbb62b83dfba52da62e54b
 EBUILD icedtea-6.1.9.1.ebuild 10608 RMD160 6d210b5ca9c3926928d92eec707353df86df92e0 SHA1 d643e30f32f859b6ca15d8e65acbc6b4d102bbe9 SHA256 db4936fac710825238335187dea5d6ad4d7b4b58d034c804f57dd9d696bc770e
 EBUILD icedtea-6.1.9.2.ebuild 10613 RMD160 aaaaea5202090207a3136888d357fc77e84d6987 SHA1 bb34379f15eaf0628c30d7bbb3c9a889006aa5a1 SHA256 ebef769c7e234cf4a14afbef0b195b44b2c7d905b60b70ff60b75aa2afe28498
-EBUILD icedtea-6.1.9.3.ebuild 10751 RMD160 ec1a105da62d3986090921ba5de5d60d2d3fbf3f SHA1 d77c0fa320667d21fcf384386d5ef9c86774d49d SHA256 633a976e54494606111ce5e18c17e25e89a6c66aac3e766a2b2c3e45fec1f237
-MISC ChangeLog 3414 RMD160 ab959614f6e1098e63d4f6fc358332cc7d5f9414 SHA1 1dcc1867e496e8c8a5d3b544b9aa03420183edc7 SHA256 32ef95a0570d1340cb6dbd6f490d3021e75c63073b9057b6468d2f3f99927873
+EBUILD icedtea-6.1.9.3.ebuild 10833 RMD160 d43fdc91885b513cae79e705e77af7a3e853cd6f SHA1 be9aaf3ee30335ffb73061071063ad2641bc3664 SHA256 02bd252bae391de80343e1fe72ff7f74f65faeabdb4249f422dc6f2f7d622b7c
+MISC ChangeLog 3556 RMD160 efdf2b3d6a8f62a4a92a43c73da5779fd5645ad0 SHA1 95c9548b7edb4327b6beb5618c375a92177ef4e8 SHA256 a38adab1a73ef281a2841e4b322d4393b4b316e06206f00c3b3ffe1a2edbe51a
 MISC metadata.xml 1488 RMD160 c219e274f64f63b4c4592f2e3e9a3ad057164c40 SHA1 7f502d7b065098357570a5e88066008eec7532b5 SHA256 cc617d5cc3325f92365746d0fcdb62cd247fa2077b2b8686dbe553c05c8c1311
diff --git a/dev-java/icedtea/files/6.1.9.3-sparc.patch b/dev-java/icedtea/files/6.1.9.3-sparc.patch
new file mode 100644
index 000000000000..e0af5bb0ee9c
--- /dev/null
+++ b/dev-java/icedtea/files/6.1.9.3-sparc.patch
@@ -0,0 +1,29 @@
+diff -Nru icedtea6-1.9.3.old/Makefile.am icedtea6-1.9.3/Makefile.am
+--- icedtea6-1.9.3.old/Makefile.am	2010-12-01 19:09:51.959606503 +0000
++++ icedtea6-1.9.3/Makefile.am	2010-12-07 12:51:29.306308677 +0000
+@@ -317,7 +317,8 @@
+ 	patches/openjdk/6876282-bigdecimal_divide.patch \
+ 	patches/f14-fonts.patch \
+ 	patches/applet_hole.patch \
+-	patches/openjdk/7002666-eclipse_cdt_oops_crash.patch
++	patches/openjdk/7002666-eclipse_cdt_oops_crash.patch \
++	patches/g344659-sparc_fscanf_fix.patch
+ 
+ if WITH_ALT_HSBUILD
+ ICEDTEA_PATCHES += \
+diff -Nru icedtea6-1.9.3.old/patches/g255873-sparc_fscanf_fix.patch icedtea6-1.9.3/patches/g255873-sparc_fscanf_fix.patch
+--- icedtea6-1.9.3.old/patches/g344659-sparc_fscanf_fix.patch	1970-01-01 01:00:00.000000000 +0100
++++ icedtea6-1.9.3/patches/g344659-sparc_fscanf_fix.patch	2010-12-07 12:52:39.213034154 +0000
+@@ -0,0 +1,12 @@
++diff -uNr openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp
++--- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp	2010-06-21 22:12:15.000000000 +0100
+++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp	2010-11-29 20:15:36.179541001 +0000
++@@ -35,7 +35,7 @@
++   }
++ 
++   while (!feof(fp)) {
++-    if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu) == 1) {
+++    if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu[0]) == 1) {
++       if (strstr(cpu, "Niagara") != NULL) {
++         rv = true;
++       }
diff --git a/dev-java/icedtea/icedtea-6.1.9.3.ebuild b/dev-java/icedtea/icedtea-6.1.9.3.ebuild
index 45e1f8161d8f..bec174be2138 100644
--- a/dev-java/icedtea/icedtea-6.1.9.3.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.9.3.ebuild,v 1.2 2010/12/02 19:38:54 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.9.3.ebuild,v 1.3 2010/12/12 11:36:16 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -9,7 +9,7 @@
 
 EAPI="2"
 
-inherit pax-utils java-pkg-2 java-vm-2 versionator
+inherit autotools pax-utils java-pkg-2 java-vm-2 versionator
 
 LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
 SLOT="6"
@@ -169,6 +169,11 @@ unset_vars() {
 	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-sparc.patch"
+	eautoreconf
+}
+
 src_configure() {
 	local config procs rhino_jar
 	local vm=$(java-pkg_get-current-vm)