commit: 347b517adedf76c4f9f3896330aff8379b6963af Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> AuthorDate: Sat Jan 3 18:14:37 2015 +0000 Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> CommitDate: Sat Jan 3 18:14:37 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=347b517a
Fix currency generation failure caused by 2014-12-31 being > 10 years ago; #534118 Package-Manager: portage-2.2.14 Manifest-Sign-Key: 248BDC07 --- dev-java/icedtea/ChangeLog | 7 +- dev-java/icedtea/Manifest | 31 +- dev-java/icedtea/files/7085757-currency_fix.patch | 412 ++++++++++++++++++++++ dev-java/icedtea/icedtea-7.2.5.3.ebuild | 7 +- 4 files changed, 439 insertions(+), 18 deletions(-) diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index c53fd27..7564ca7 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for dev-java/icedtea -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 03 Jan 2015; Andrew John Hughes <gnu_and...@member.fsf.org> + +files/7085757-currency_fix.patch, icedtea-7.2.5.3.ebuild: + Fix currency generation failure caused by 2014-12-31 being > 10 years ago; + #534118 + *icedtea-7.2.6.0_pre11 (13 Nov 2014) 13 Nov 2014; Andrew John Hughes <gnu_and...@member.fsf.org> diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index 0c393b7..d24bf97 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX 7085757-currency_fix.patch 13087 SHA256 0735c2235ab7ed0c54769e6709ef0c30e4c892ae702a7bdd355eefb0e0f91802 SHA512 249579d9910d3fbf30e7cf5ffe41b0ea47af9ddc2cdec592008c597a9102bd4482565016c71389d2ea9bd6d806f68b38f52e2e237f0daa9109cac5d192e0c63d WHIRLPOOL 90f04220538e3855da0727ba12a3d3c4f146cd122a99aaa12fd4c76e9647cb2ec04f9e585d5d400d0dc7ee477a56d511c95b8a9018a7bbb1a339a7c9b3f75cb5 AUX fontconfig.Gentoo.properties.src 15602 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647 SHA512 eac3fd310bf0757284a4a0c3c72759a8516bd2d9b8f9d9c7df10ff15fd291833d5adb5429b166175c6f333c883974d56fe7d0339cc16db3a5786a77780217a39 WHIRLPOOL f9f702848c38ef9cca0577f1db5a7c4cd6847e79d205b8e855c14b3a80070328b12fdcd854f5bd2dcf07c7cb9bd2aaf433a770a0752ec01a4e8b308dedf3bf19 AUX generate-cacerts.pl 11051 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 WHIRLPOOL ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619 AUX icedtea.env 1074 SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a WHIRLPOOL 57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258 @@ -42,24 +43,24 @@ DIST openjdk-6-src-b33-14_oct_2014.tar.xz 33476800 SHA256 cabc35587a90fa81edd8ba EBUILD icedtea-3.9999.ebuild 10711 SHA256 fc6a22bf47db40c0f25d0bdc321901dd2585680b7c98e3e2d47b8235476182da SHA512 c1e36c3022f8712d32fa1d68191d97a1f0dbec2139ef4e8bc8f5b92494523c248c5731b9ada45afee2c275de8d233624cb1581b15041bd078fbbc44860ce236c WHIRLPOOL df90a1f053354da1330de836d08ab5f52fb00e02dbc15dfd6d9d58481d42a17805b4550f013171044a4913f103d08765042a8a1cbdd951e06948b439c153f142 EBUILD icedtea-6.1.13.5-r1.ebuild 10311 SHA256 822d0b24e1c81491fe292eb218aeada638a7f63c4096ad336df73a5bf219946a SHA512 c91327f708f4a42b2788a160ae5682f4f4c9d5600ab42b34149e083e8c5ba5ea1b1af4714e613ac7eaa3c53755346f63c6256597408af95cbccf2fcacd2fff7b WHIRLPOOL a2cabedc8e72c1703f9aaea659cebb3a59a461514b73e382b524d1c57e3d52150d1d90cf82c197fadb187155310eb7397bbb758bbd662ec7efd19435fd1e04b3 EBUILD icedtea-6.9999.ebuild 10014 SHA256 33a297abe609e27f3ca3c93ba374327c8e0beca9b277806a072715f61bd45784 SHA512 6507b894510471668698e7be1fa355e77033a9204f5e96351a37ff0abc67fe606d2c71213c2fa4810c6dedf3884da18d5a39cbcc7130303c98d95c0e7e737f46 WHIRLPOOL 79182d9db491f3900264680541e675ca033f174dfb223037fefe21abf8260a47dbc7e6d1d86e062655e76c15a23070f503d6757a0d71959f24f918261eff32a5 -EBUILD icedtea-7.2.5.3.ebuild 12295 SHA256 05d2ec8352756f0145c88b9e771f05d1426f693eb4b2dabb8150015fa89a9148 SHA512 4ca28934f8672c514e15549cb1bf65bc3b90dc72a5e3330d650922fbb304603c0ce4bd9648cdb7a33c5004b10a9660ba97fd8a5c9a597eb3a04d31dab4dd14d1 WHIRLPOOL d8638311e5c785124e685c1f23b217ee8a7a013f3e9e920592ca3d4dff7147bb4291c0f2f0f85a2112d638b0d4e19fb72dd3f3ce8f4dcf6b581885bf0a050716 +EBUILD icedtea-7.2.5.3.ebuild 12368 SHA256 215bb04afea4a560627c3b0252022e9d0c50ac881bf24ff8a742fd9f73415e97 SHA512 c38914d08a7fc323dc6257ead6cadb14b28f98255952acdc5e5bb3ce1118ebdef82ccecab2b20f9a38cda5fb0d07bb69007a3cbec49b6d3f71c964282c1afec6 WHIRLPOOL 265ae035b8fcaf3ddc29376d9dbee460a873e9061a09057ccc9f86e65dd56d6ecfff8578086080b1552a11beb454880fecd66b02c856a19d2c09999bb10a2ca5 EBUILD icedtea-7.2.6.0_pre11.ebuild 12228 SHA256 a93b555be8a38542c367461862d729cace970dee5cd437e7ba4684d6b77a9a13 SHA512 7fa0ed72dae3c87ddf33cbda2a18a2999d06f9c1e75016536790df3ea81bc6a84edde1923a45aa7751198ea67409bd2e28d21e4d008ac03916f151c5376bc3c1 WHIRLPOOL 903cc4312916107cb2d7db7e01c9cc14fc5fbce829e152c5ad0987d68b845e56e42bc8d21b9d9196a8b28300422b22895a0ceeeb352eeeaab6613efd6505ce08 -MISC ChangeLog 87214 SHA256 e4b44587b85f013d2b3f46833cfa523084e11ac579db37fae85ffb067a21f20e SHA512 4e5586158f3a3ca39009fd523b89561a10050aa304020560e24bae57993d14237ab2ed860a5cf831bf4216c9339cc5b8465c6cb2d993f5530ed0d0ba92a9a738 WHIRLPOOL edd2c67b5d3e59e254a67918cb5ba04152f2fd97a0bf6861e26909e1aff581127b5965d1637bfcfb87b0c88dc05a93abe48f57b07cab2258f1b47c4035070a7e +MISC ChangeLog 87425 SHA256 478dc44a6caab7a7bf5ed6430b7a3a087f42605cf74fdbcfabc14e8f7323021d SHA512 49835bc07c3da39457375f77ae3eb2c54380ef13839775d87d7297ade59e8294f1fc89da92c95e1116af2bdf8af1b4513416d059acf783eaec5589eed459874f WHIRLPOOL 88b116fa006e8f5a01ed70922245f1c6f6779c89b8e39a47c8f7bc776407f0dde53759ed7493b190c8c0dbf80879bbebce8cfd2e47fbc0e7cb06e0b06e2eb563 MISC metadata.xml 1680 SHA256 41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512 5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c WHIRLPOOL 5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUZIqBAAoJEDuWpXgki9wHPjQP/0mOYPisIe1TRORSf19HWVxB -W72cUZ1XqM3uzGm4CI8LIQVvK3RF2FHOpiXHLXo+JDykaMwkKw8Mg3PAtK4SXUxo -w2FAYwIODXXfXBmkEuaYby+g7q/esMoPeByqz1zgVGuGBECr9qqUrEALhqb2cpCl -aAZOEOfK0tNPCJ7VWWzCDmgn446xk6r0/lTul37oNVaP7Av5yCJ/t3DyLTvYUO0A -vBEzg5jFNYImjG9GHHdr9bCOTCX7pDGrgL6JlGmEKAW4b89ZRzZ8WiR5Nb3dxzF5 -vI+pvxrNM+ROsZsBjYHNOJWW/mK+HcVaqRngbNMSTntO+WPeWPR9Zq6OqBrcadek -YZqEK76QdCR7NisuMSDwF081lmXU478Lkl5aE3pViVbNtu8zwa1CgthEdTHj1anw -FZAFh6XUiWdd//iyOP6WDamntxdGZS/5GEvfT0Gh0ddgSonm4YWfAlshMEZjJ2jA -qrCu0TWJmJpbqayByNNOaVR/ofbza7NRS2/wuT+bTx6VAXTG1JlA6AVT8IZ0hiAs -YRG+eSzinV4nNTKq78N9KWlzPHRh7QAi9uTgZYKXbWzzIv1dcI2Ek5ZNFyAPceYU -dMZzDkNVXicgd8QRqEp8R5kKI5pNt3m7u0ZyEBARlhwqXSdAvNCyt5Hk1xXPiwOc -lYZDtX9esqiNP5iIMNLl -=csS6 +iQIcBAEBCAAGBQJUqDGNAAoJEDuWpXgki9wHvUMQAI49mD8CPwUiF6LtUE5gHV7y +F5JuhfIQDJKeqKP7X80mexZdTj19qT80nS+KtexzdktFolpJidZ6qVoPE6J1Heb5 +6UENEOwCzQGUuMG7omKrsfYjaB2NHbNdFrny5CKGQK2FtIP6hPQTQLkBYE4IlZHB +aIqRmaylAt4EWtHrpfSWRlNLp55TrAGQ2sZekWYYFS++YpQWzJkP33j5XRO8cIKO +9Tc/H3LGgi337MXmwxQVMdt3/g179OApCV3sLNUh7eTSR8PSW/JCeI05qNqnesjw +G6fgx1qD03iqsih3tMun+r4vOa8GP6fSYQiGP3HpkeSRJHvz0I9/hfy4vvliH6CC +TZcyaMGrSOpFqwsah4fXi7CA2VCUfLNrmhIkP4uOHeqGT0QI9bg+lYRg49p99ztn +tLIrGMOjHMn5tvHO/+oEvHaSTri7i8BAL1hG0ggw9HawMUwMJmrEm53C8DJCRLWQ +yjUrg2g/bJFfq6yiVOxlTcDkg1ItL1SHgdTQ9IQSikY6MmCHDbHVtBQKTuxQ0Xlp +lAJQlBTHVEDuTfi1dwhQw7Zb/5+scQ4bAuyc6K1NurngXcdgwQIh8N2qHwDnRG0D +tgWuuW4BEjGpOWFVDjfBsQoQNGIRWLrMkwZXhOxutB6sCcZCjK8fnCIVe+Kdm1J7 +GFKNZyKdmCoCSC29f49S +=jNs0 -----END PGP SIGNATURE----- diff --git a/dev-java/icedtea/files/7085757-currency_fix.patch b/dev-java/icedtea/files/7085757-currency_fix.patch new file mode 100644 index 0000000..5a01325 --- /dev/null +++ b/dev-java/icedtea/files/7085757-currency_fix.patch @@ -0,0 +1,412 @@ +diff -r 13b10ea1447c Makefile.am +--- a/Makefile.am Fri Dec 12 20:13:40 2014 +0000 ++++ b/Makefile.am Sat Jan 03 16:53:45 2015 +0000 +@@ -242,7 +242,7 @@ + + # Patch list + +-ICEDTEA_PATCHES = ++ICEDTEA_PATCHES = patches/7085757-currency_data.patch + + # Conditional patches + +diff -r 13b10ea1447c patches/7085757-currency_data.patch +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/patches/7085757-currency_data.patch Sat Jan 03 16:53:45 2015 +0000 +@@ -0,0 +1,396 @@ ++# HG changeset patch ++# User coffeys ++# Date 1412008618 -3600 ++# Mon Sep 29 17:36:58 2014 +0100 ++# Node ID 2f94c1a494f0aaad61626a7f901ddfbf57bd0199 ++# Parent 993c08c0fcc7c6f404f708728679e6e707a95f8c ++7085757: Currency Data: ISO 4217 Amendment 152 ++7195759: ISO 4217 Amendment 154 ++8021121: ISO 4217 Amendment Number 156 ++8055222: Currency update needed for ISO 4217 Amendment #159 ++8006748: getISO3Country() returns wrong value ++7077119: remove past transition dates from CurrencyData.properties file ++7028073: The currency symbol for Peru is wrong ++Reviewed-by: naoto ++ ++diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/java/util/CurrencyData.properties ++--- openjdk/jdk/src/share/classes/java/util/CurrencyData.properties Fri Sep 27 13:06:47 2013 -0700 +++++ openjdk/jdk/src/share/classes/java/util/CurrencyData.properties Mon Sep 29 17:36:58 2014 +0100 ++@@ -1,5 +1,5 @@ ++ # ++-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. +++# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. ++ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ # ++ # This code is free software; you can redistribute it and/or modify it ++@@ -26,10 +26,9 @@ ++ formatVersion=1 ++ ++ # Version of the currency code information in this class. ++-# It is a serial number that accompanies with each amendment, such as ++-# 'MAxxx.doc' +++# It is a serial number that accompanies with each amendment. ++ ++-dataVersion=151 +++dataVersion=159 ++ ++ # List of all valid ISO 4217 currency codes. ++ # To ensure compatibility, do not remove codes. ++@@ -49,11 +48,12 @@ ++ NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\ ++ PKR586-PLN985-PTE620-PYG600-QAR634-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\ ++ SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\ ++- SRD968-SRG740-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\ +++ SRD968-SRG740-SSP728-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\ ++ TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-\ ++ UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\ ++ XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\ ++- XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZWD716-ZWL932-ZWN942-ZWR935 +++ XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWL932-\ +++ ZWN942-ZWR935 ++ ++ ++ # Mappings from ISO 3166 country codes to ISO 4217 currency codes. ++@@ -71,7 +71,7 @@ ++ # ++ # The table is based on the following web sites: ++ # http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/db_en.html ++-# http://www.bsi-global.com/iso4217currency +++# http://www.currency-iso.org/iso_index/iso_tables.htm ++ # http://www.cia.gov/cia/publications/factbook/indexgeo.html ++ ++ # AFGHANISTAN ++@@ -105,7 +105,7 @@ ++ # AUSTRIA ++ AT=EUR ++ # AZERBAIJAN ++-AZ=AZM;2005-12-31-20-00-00;AZN +++AZ=AZN ++ # BAHAMAS ++ BS=BSD ++ # BAHRAIN ++@@ -320,7 +320,7 @@ ++ # LAO PEOPLE'S DEMOCRATIC REPUBLIC ++ LA=LAK ++ # LATVIA ++-LV=LVL +++LV=LVL;2013-12-31-22-00-00;EUR ++ # LEBANON ++ LB=LBP ++ # LESOTHO ++@@ -332,7 +332,7 @@ ++ # LIECHTENSTEIN ++ LI=CHF ++ # LITHUANIA ++-LT=LTL +++LT=LTL;2014-12-31-22-00-00;EUR ++ # LUXEMBOURG ++ LU=EUR ++ # MACAU ++@@ -378,7 +378,7 @@ ++ # MOROCCO ++ MA=MAD ++ # MOZAMBIQUE ++-MZ=MZM;2006-06-30-22-00-00;MZN +++MZ=MZN ++ # MYANMAR ++ MM=MMK ++ # NAMIBIA ++@@ -440,7 +440,7 @@ ++ # REUNION ++ RE=EUR ++ # ROMANIA ++-RO=ROL;2005-06-30-21-00-00;RON +++RO=RON ++ # RUSSIAN FEDERATION ++ RU=RUB ++ # RWANDA ++@@ -463,6 +463,8 @@ ++ WS=WST ++ # SAN MARINO ++ SM=EUR +++# SOUTH SUDAN +++SS=SSP ++ # SAO TOME AND PRINCIPE ++ ST=STD ++ # SAUDI ARABIA ++@@ -532,7 +534,7 @@ ++ # TUNISIA ++ TN=TND ++ # TURKEY ++-TR=TRL;2004-12-31-22-00-00;TRY +++TR=TRY ++ # TURKMENISTAN ++ TM=TMT ++ # TURKS AND CAICOS ISLANDS ++@@ -558,7 +560,7 @@ ++ # VANUATU ++ VU=VUV ++ # VENEZUELA ++-VE=VEB;2008-01-01-04-00-00;VEF +++VE=VEF ++ # VIET NAM ++ VN=VND ++ # VIRGIN ISLANDS, BRITISH ++@@ -572,7 +574,7 @@ ++ # YEMEN ++ YE=YER ++ # ZAMBIA ++-ZM=ZMK +++ZM=ZMW ++ # ZIMBABWE ++ ZW=ZWL ++ ++@@ -583,7 +585,7 @@ ++ minor0=\ ++ ADP-BEF-BIF-BYB-BYR-CLF-CLP-DJF-ESP-GNF-\ ++ GRD-ISK-ITL-JPY-KMF-KRW-LUF-MGF-PYG-PTE-RWF-\ ++- TPE-TRL-VUV-XAF-XOF-XPF +++ TPE-TRL-UGX-VND-VUV-XAF-XOF-XPF ++ minor1= ++ minor3=\ ++ BHD-IQD-JOD-KWD-LYD-OMR-TND ++diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/java/util/LocaleISOData.java ++--- openjdk/jdk/src/share/classes/java/util/LocaleISOData.java Fri Sep 27 13:06:47 2013 -0700 +++++ openjdk/jdk/src/share/classes/java/util/LocaleISOData.java Mon Sep 29 17:36:58 2014 +0100 ++@@ -1,5 +1,5 @@ ++ /* ++- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +++ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++@@ -433,6 +433,7 @@ ++ + "SN" + "SEN" // Senegal, Republic of ++ + "SO" + "SOM" // Somalia, Somali Republic ++ + "SR" + "SUR" // Suriname, Republic of +++ + "SS" + "SSD" // South Sudan ++ + "ST" + "STP" // Sao Tome and Principe, Democratic Republic of ++ + "SV" + "SLV" // El Salvador, Republic of ++ + "SX" + "SXM" // Sint Maarten (Dutch part) ++diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/sun/util/resources/CurrencyNames.properties ++--- openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties Fri Sep 27 13:06:47 2013 -0700 +++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties Mon Sep 29 17:36:58 2014 +0100 ++@@ -1,5 +1,5 @@ ++ # ++-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +++# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. ++ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ # ++ # This code is free software; you can redistribute it and/or modify it ++@@ -26,7 +26,7 @@ ++ # ++ # COPYRIGHT AND PERMISSION NOTICE ++ # ++-# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved. +++# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. ++ # Distributed under the Terms of Use in http://www.unicode.org/copyright.html. ++ # ++ # Permission is hereby granted, free of charge, to any person obtaining ++@@ -226,6 +226,7 @@ ++ SOS=SOS ++ SRD=SRD ++ SRG=SRG +++SSP=SSP ++ STD=STD ++ SVC=SVC ++ SYP=SYP ++@@ -277,6 +278,7 @@ ++ YUM=YUM ++ ZAR=ZAR ++ ZMK=ZMK +++ZMW=ZMW ++ ZWD=ZWD ++ ZWL=ZWL ++ ZWN=ZWN ++@@ -443,6 +445,7 @@ ++ sos=Somali Shilling ++ srd=Surinamese Dollar ++ srg=Surinamese Guilder +++ssp=South Sudanese Pound ++ std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra ++ svc=Salvadoran Col\u00f3n ++ syp=Syrian Pound ++@@ -486,7 +489,9 @@ ++ xpd=Palladium ++ xpf=CFP Franc ++ xpt=Platinum +++xsu=Sucre ++ xts=Testing Currency Code +++xua=ADB Unit of Account ++ xxx=Unknown Currency ++ yer=Yemeni Rial ++ yum=Yugoslavian New Dinar (1994-2002) ++diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties ++--- openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties Fri Sep 27 13:06:47 2013 -0700 +++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties Mon Sep 29 17:36:58 2014 +0100 ++@@ -35,4 +35,4 @@ ++ # This notice and attribution to Taligent may not be removed. ++ # Taligent is a registered trademark of Taligent, Inc. ++ ++-PEN=S/ +++PEN=S/. ++diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties ++--- openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties Fri Sep 27 13:06:47 2013 -0700 +++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties Mon Sep 29 17:36:58 2014 +0100 ++@@ -35,4 +35,5 @@ ++ # This notice and attribution to Taligent may not be removed. ++ # Taligent is a registered trademark of Taligent, Inc. ++ +++EUR=\u20AC ++ LTL=Lt ++diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties ++--- openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties Fri Sep 27 13:06:47 2013 -0700 +++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties Mon Sep 29 17:36:58 2014 +0100 ++@@ -35,4 +35,5 @@ ++ # This notice and attribution to Taligent may not be removed. ++ # Taligent is a registered trademark of Taligent, Inc. ++ +++EUR=\u20AC ++ LVL=Ls ++diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/sun/util/resources/LocaleNames.properties ++--- openjdk/jdk/src/share/classes/sun/util/resources/LocaleNames.properties Fri Sep 27 13:06:47 2013 -0700 +++++ openjdk/jdk/src/share/classes/sun/util/resources/LocaleNames.properties Mon Sep 29 17:36:58 2014 +0100 ++@@ -1077,6 +1077,7 @@ ++ SN=Senegal ++ SO=Somalia ++ SR=Suriname +++SS=South Sudan ++ ST=Sao Tome And Principe ++ SV=El Salvador ++ SX=Sint Maarten (Dutch part) ++diff -r 993c08c0fcc7 -r 2f94c1a494f0 test/java/util/Currency/ValidateISO4217.java ++--- openjdk/jdk/test/java/util/Currency/ValidateISO4217.java Fri Sep 27 13:06:47 2013 -0700 +++++ openjdk/jdk/test/java/util/Currency/ValidateISO4217.java Mon Sep 29 17:36:58 2014 +0100 ++@@ -1,5 +1,5 @@ ++ /* ++- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. +++ * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++@@ -22,7 +22,7 @@ ++ */ ++ /* ++ * @test ++- * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 +++ * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759 ++ * @summary Validate ISO 4217 data for Currency class. ++ */ ++ ++@@ -92,7 +92,7 @@ ++ ++ /* Codes that are obsolete, do not have related country */ ++ static final String otherCodes = ++- "ADP-AFA-ATS-AYM-BEF-BGL-BOV-BYB-CLF-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-NLG-PTE-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-USN-USS-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZWD-ZWN-ZWR"; +++ "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-CLF-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-MZM-NLG-PTE-ROL-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-USN-USS-VEB-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZMK-ZWD-ZWN-ZWR"; ++ ++ static boolean err = false; ++ ++diff -r 993c08c0fcc7 -r 2f94c1a494f0 test/java/util/Currency/tablea1.txt ++--- openjdk/jdk/test/java/util/Currency/tablea1.txt Fri Sep 27 13:06:47 2013 -0700 +++++ openjdk/jdk/test/java/util/Currency/tablea1.txt Mon Sep 29 17:36:58 2014 +0100 ++@@ -1,12 +1,12 @@ ++ # ++ # ++-# Based on BSi's ISO4217 data - "TABLE A1.doc" + amendments up until MA151.doc ++-# (As of 7 April 2011) +++# Amendments up until ISO 4217 AMENDMENT NUMBER 159 +++# (As of 15 August 2014) ++ # ++ ++ # Version ++ FILEVERSION=1 ++-DATAVERSION=151 +++DATAVERSION=159 ++ ++ # ISO 4217 currency data ++ AF AFN 971 2 ++@@ -23,7 +23,7 @@ ++ AU AUD 36 2 ++ AT EUR 978 2 ++ # MA 129 ++-AZ AZM 31 2 2005-12-31-20-00-00 AZN 944 2 +++AZ AZN 944 2 ++ BS BSD 44 2 ++ BH BHD 48 3 ++ BD BDT 50 2 ++@@ -96,7 +96,7 @@ ++ GM GMD 270 2 ++ GE GEL 981 2 ++ DE EUR 978 2 ++-GH GHC 288 2 2007-07-01-00-00-00 GHS 936 2 +++GH GHS 936 2 ++ GI GIP 292 2 ++ GR EUR 978 2 ++ GL DKK 208 2 ++@@ -135,14 +135,14 @@ ++ KW KWD 414 3 ++ KG KGS 417 2 ++ LA LAK 418 2 ++-LV LVL 428 2 +++LV LVL 428 2 2013-12-31-22-00-00 EUR 978 2 ++ LB LBP 422 2 ++ #LS ZAR 710 2 ++ LS LSL 426 2 ++ LR LRD 430 2 ++ LY LYD 434 3 ++ LI CHF 756 2 ++-LT LTL 440 2 +++LT LTL 440 2 2014-12-31-22-00-00 EUR 978 2 ++ LU EUR 978 2 ++ MO MOP 446 2 ++ MK MKD 807 2 ++@@ -166,7 +166,7 @@ ++ MS XCD 951 2 ++ MA MAD 504 2 ++ # MA 130 ++-MZ MZM 508 2 2006-06-30-22-00-00 MZN 943 2 +++MZ MZN 943 2 ++ MM MMK 104 2 ++ # MA 134 ++ ME EUR 978 2 ++@@ -200,7 +200,7 @@ ++ PR USD 840 2 ++ QA QAR 634 2 ++ RE EUR 978 2 ++-RO ROL 946 2 2005-06-30-21-00-00 RON 946 2 +++RO RON 946 2 ++ RU RUB 643 2 ++ RW RWF 646 0 ++ SH SHP 654 2 ++@@ -227,6 +227,7 @@ ++ SB SBD 90 2 ++ SO SOS 706 2 ++ ZA ZAR 710 2 +++SS SSP 728 2 ++ ES EUR 978 2 ++ LK LKR 144 2 ++ SD SDG 938 2 ++@@ -255,7 +256,7 @@ ++ TM TMT 934 2 ++ TC USD 840 2 ++ TV AUD 36 2 ++-UG UGX 800 2 +++UG UGX 800 0 ++ UA UAH 980 2 ++ AE AED 784 2 ++ GB GBP 826 2 ++@@ -266,14 +267,14 @@ ++ UY UYU 858 2 ++ UZ UZS 860 2 ++ VU VUV 548 0 ++-VE VEB 862 2 2008-01-01-04-00-00 VEF 937 2 ++-VN VND 704 2 +++VE VEF 937 2 +++VN VND 704 0 ++ VG USD 840 2 ++ VI USD 840 2 ++ WF XPF 953 0 ++ EH MAD 504 2 ++ YE YER 886 2 ++-ZM ZMK 894 2 +++ZM ZMW 967 2 ++ ZW ZWL 932 2 ++ #XAU XAU 959 ++ #XBA XBA 955 diff --git a/dev-java/icedtea/icedtea-7.2.5.3.ebuild b/dev-java/icedtea/icedtea-7.2.5.3.ebuild index 7fc0c77..18eea8f 100644 --- a/dev-java/icedtea/icedtea-7.2.5.3.ebuild +++ b/dev-java/icedtea/icedtea-7.2.5.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.5.3.ebuild,v 1.1 2014/11/01 21:43:06 caster Exp $ # Build written by Andrew John Hughes (gnu_and...@member.fsf.org) @@ -10,7 +10,7 @@ EAPI="5" SLOT="7" -inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx +inherit autotools check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx ICEDTEA_VER=$(get_version_component_range 2-) ICEDTEA_BRANCH=$(get_version_component_range 2-3) @@ -197,6 +197,9 @@ java_prepare() { # icedtea doesn't like some locales. #330433 #389717 export LANG="C" LC_ALL="C" + + epatch "${FILESDIR}/7085757-currency_fix.patch" + eautoreconf } src_configure() {
