diff options
| -rw-r--r-- | dev-java/icedtea/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/icedtea/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/icedtea/files/6.1.10.2-371405-linux_version.patch | 29 | ||||
| -rw-r--r-- | dev-java/icedtea/files/6.1.9.6-sparc.patch | 29 |
4 files changed, 6 insertions, 62 deletions
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index efa9312c1194..ba7f21d3d8aa 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/icedtea # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.35 2011/11/04 09:44:17 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.36 2011/11/04 09:47:02 caster Exp $ + + 04 Nov 2011; Vlastimil Babka <caster@gentoo.org> + -files/6.1.10.2-371405-linux_version.patch, -files/6.1.9.6-sparc.patch: + Remove unused patches. *icedtea-6.1.10.4-r1 (04 Nov 2011) diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index 60d2fd880ea3..24cd29b7052a 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -1,5 +1,3 @@ -AUX 6.1.10.2-371405-linux_version.patch 1318 RMD160 72e980e7fded30fc07af89fdbf1cff50b3f9bf32 SHA1 35b7c16abdbe3c1158cd8b8d9c41f587a1feb5a9 SHA256 c8d9171f076fe5b61db5d8ab0a92789336bbb47f5acbfc95fefcd8174fa90ef6 -AUX 6.1.9.6-sparc.patch 1533 RMD160 44843984c048821ee9625b53fc7e58d4c2651f7c SHA1 3af79d2792443272b1b10b87b465a0ec2e9fcce7 SHA256 42bf07d0c587bbd9655c6c795eae6bf527d4a9d77fca56f4d4aa2f9afcac5397 AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 AUX icedtea.env 1014 RMD160 566c46cd11c9d9b18d600702b1d4857cacc824ec SHA1 fb2439f39863088b5525102946d154fc54f14c08 SHA256 63d0c03dce0d546bcd9f52ebf7abb56e61f9acaeb659c9fbf19fec315a0cf5ae DIST c7bf150bfa46.tar.gz 4210056 RMD160 f0afca5b073dba922eebbbbd6a9be1725ccaf86e SHA1 d192a1f7ba73346c86e71a295587381f8a4b2bce SHA256 73629f5ac9514afbcf63b6cdf58556e889a5f6a22d4bd70de1dd2816c6500aee @@ -12,5 +10,5 @@ DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b EBUILD icedtea-6.1.10.4-r1.ebuild 10901 RMD160 35a1922c192469bde056e28556e8a979f4c7a20a SHA1 8106276634f574457bee03144ab065076f60fcf8 SHA256 b5f474d18853e4d0be6b0e1d0a51e100fc02f155aef917969dda30f0c772e395 EBUILD icedtea-6.1.10.4.ebuild 10669 RMD160 7d9eadb3b2553f8f0e881c5732fa9b8a486f34f4 SHA1 b52ba57da1427d5e0844818a2c2ced43d508dccc SHA256 5bf2ed661c49f530e1b3382454a52149eb6e36b08dcd1e0559bf40d50d1f5349 -MISC ChangeLog 7174 RMD160 c7b18cba7431b3ee496309831960d874cd1eddfd SHA1 65ae30f91dda5a240df2483bece5fcec7ac504cc SHA256 ca690b452cedf470ad90b71f74f6304f7e58c25c4d1c00e3e78509c4420b45b1 +MISC ChangeLog 7325 RMD160 038d876bcdfef0454aba2322606b3da0fd2368fe SHA1 edf0a706ddea1d00bed05203d049eed9e09917ab SHA256 6249b5de8ef1714cec4b3c82ec5bc3d759aa1466f5fe610d6cb0a8891d80b30d MISC metadata.xml 1631 RMD160 72e61e27b431b353472ca7c0469dc1adaab14971 SHA1 6010b4cfbf447ec6bfce758b42283f3e4d3ffb21 SHA256 dec15c576e0651a896199d0282487de83b2413779097ca4845cde4e85c0a92aa diff --git a/dev-java/icedtea/files/6.1.10.2-371405-linux_version.patch b/dev-java/icedtea/files/6.1.10.2-371405-linux_version.patch deleted file mode 100644 index 7eaa09d955ab..000000000000 --- a/dev-java/icedtea/files/6.1.10.2-371405-linux_version.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nru icedtea6-1.10.2.orig/Makefile.am icedtea6-1.10.2/Makefile.am ---- icedtea6-1.10.2.orig/Makefile.am 2011-05-25 17:35:41.000000000 +0100 -+++ icedtea6-1.10.2/Makefile.am 2011-06-13 15:47:16.000000000 +0100 -@@ -341,7 +341,8 @@ - patches/openjdk/7031385-gcc-register-allocation-fix.patch \ - patches/shark-llvm-2.9.patch \ - patches/openjdk/pgram-pipe-regression.patch \ -- patches/openjdk/mutter.patch -+ patches/openjdk/mutter.patch \ -+ patches/linux_version.patch - - if WITH_ALT_HSBUILD - ICEDTEA_PATCHES += \ -diff -Nru icedtea6-1.10.2.orig/patches/linux_version.patch icedtea6-1.10.2/patches/linux_version.patch ---- icedtea6-1.10.2.orig/patches/linux_version.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea6-1.10.2/patches/linux_version.patch 2011-06-13 15:46:50.000000000 +0100 -@@ -0,0 +1,12 @@ -+diff -r d4dac52dafbc make/linux/Makefile -+--- openjdk.orig/hotspot/make/linux/Makefile Thu Jun 02 18:59:50 2011 +0100 -++++ openjdk/hotspot/make/linux/Makefile Mon Jun 13 15:40:58 2011 +0100 -+@@ -230,7 +230,7 @@ -+ # Solaris 2.5.1, 2.6). -+ # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. -+ -+-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% -++SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% -+ OS_VERSION := $(shell uname -r) -+ EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) -+ diff --git a/dev-java/icedtea/files/6.1.9.6-sparc.patch b/dev-java/icedtea/files/6.1.9.6-sparc.patch deleted file mode 100644 index ea41ad005ab1..000000000000 --- a/dev-java/icedtea/files/6.1.9.6-sparc.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nru icedtea6-1.9.6.orig/Makefile.am icedtea6-1.9.6/Makefile.am ---- icedtea6-1.9.6.orig/Makefile.am 2011-02-09 10:48:29.464832314 +0000 -+++ icedtea6-1.9.6/Makefile.am 2011-02-09 13:01:39.430490143 +0000 -@@ -327,7 +327,8 @@ - patches/openjdk/6795356-proxylazyvalue-leak.patch \ - patches/openjdk/6687968-pngimagereader_mem_leak.patch \ - patches/openjdk/6541476-png-iTXt-chunk.patch \ -- patches/openjdk/6782079-png_metadata_oom.patch -+ patches/openjdk/6782079-png_metadata_oom.patch \ -+ patches/g344659-sparc_fscanf_fix.patch - - if WITH_ALT_HSBUILD - ICEDTEA_PATCHES += \ -diff -Nru icedtea6-1.9.6.orig/patches/g344659-sparc_fscanf_fix.patch icedtea6-1.9.6/patches/g344659-sparc_fscanf_fix.patch ---- icedtea6-1.9.6.orig/patches/g344659-sparc_fscanf_fix.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea6-1.9.6/patches/g344659-sparc_fscanf_fix.patch 2011-02-09 13:01:39.430490143 +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; -+ } |