dev-java/icu4j-4.4.2: fixed compilation with jdk8

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xCFE47E2F

4 files changed, 28 insertions, 21 deletions

diff --git a/dev-java/icu4j/ChangeLog b/dev-java/icu4j/ChangeLog
index e99a028279fe..77c91e28f2ab 100644
--- a/dev-java/icu4j/ChangeLog
+++ b/dev-java/icu4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/icu4j
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.65 2014/10/25 06:29:18 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.66 2015/02/03 15:36:47 fordfrog Exp $
+
+  03 Feb 2015; Miroslav Šulc <fordfrog@gentoo.org> icu4j-4.4.2.ebuild,
+  +files/icu4j-4.4.2-add-jdk8-to-check.patch:
+  fixed compilation with jdk8
 
 *icu4j-54.1.1 (25 Oct 2014)
 
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 22617563258a..ea0ac9cfe327 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX icu4j-3.8.1-manifest 781 SHA256 1a1db870dac202bf316d4a13b92551d4223a49b7ed8182a17fd053ed03953826 SHA512 a8048d23e26cfed14d714a438613c972fc283c88944ab6ee7cc733e0188c6f1888af540adbf2b36851e743b1ceaf57a9edcff129d77c96fffb530c5a694fbcb7 WHIRLPOOL 5ce432dd0f39ee376a0a5d18884a0415f949fe6a8930ea85df0b1aefe32b776dee75dba24f0dc5c31b379b729cc7a0862597aabf27b00afc4849228be9154c2e
 AUX icu4j-4.0-manifest 785 SHA256 d2b1599ac0826cab97290a4ac3f54b01330d54a046d0ed28c5f26ef558addc41 SHA512 7dbabc8c2429a7e26732314d00a35beb0753a0f8893dc9f79e637c31a8db4db920d9f0c0bf903e79d6f64a3f2b2337c5777f63bfd010064d41f73ef09e0ec0c0 WHIRLPOOL 00f9967693188858690aa4a4338e3ab92a64bd08a83cfedf4ab4470298f5629e9cba62fe24046d7c53cb30bfea86edb1ab2844594ba757c0a4f4a93c142f7f8b
+AUX icu4j-4.4.2-add-jdk8-to-check.patch 407 SHA256 4245e454f2501ecc8192502cd6146033bfddcdf325e590841fbead72f298736f SHA512 c49b084dac6039e9f4a1b30162c8d686c49151071edbbf53808a0040234dd9094be99e751258dd7d818734d93541aef65a63b510fcfbc344e4328de25683bdf1 WHIRLPOOL 5ca816abaf3b8439bddc825ecb6c37ab078cfa84e3b82d211b11ee3902285e9551b67682af764484137a5ad202ba99ba03b8340a887f481da37645a4a515dcb1
 AUX icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-1.patch 1361 SHA256 c6cc179384f0877bf91094615d55f4df2926c74281545e79c73ecd62f50d3bf5 SHA512 07d240db7c6d1e8b421afd912597593d0247b84d0012c07f7c4e135db6c849677022da7664ac1e39408d3c7af50ffd76a298983d3d9bb00dd542848403fb7eea WHIRLPOOL bbf496c9bc6051bc9f4b93d266577919af11043ae90dcb161796a62a9f990567d6eaefe2ac98c2f699ea7bb27fdc1347e9012f9dd9493b1444163f8de60c8aca
 AUX icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch 4250 SHA256 0b2a7d096fa4c4fca944db2b38ec459a9b23c2b68f29bb1c7fcca47262d0b83f SHA512 07219eec95c4cd7a3097d35859cc1dc97db4e8d0c26d869127da829fab2c3fcb551955bd447edbb5f589556449243ce6832b16172e87ed0411f46a57aa54c93b WHIRLPOOL 4aa3c459f8fc8d57fc921baa12d35d2ca55b51bde92d9cc0d10e7aa24e707a5b1799947ec0c0f73cc026945f3e5b32bb20b39426055c46f9cb68bee97d136d60
 DIST icu4j-3_8_1-docs.jar 1470606 SHA256 e3acbb4523ebf90288bde1ff4ebe16241ff8d5a3e53ce9e29636f569a42f0b46 SHA512 88f59573d1070f13ebce9116359603e4d0c6f0c1626ab18a2fc6a08ac5831d50341341e33576c52d97b0b763fe8a8babfd35b34d77466bef5da5ab34aec2bb6e WHIRLPOOL 750c067d4df18780612f0d77c6f48c3c16e502d15d3fdf8339a22e4235e74a192ed2ecec80f4ae00f9e4ee8dc6b949a2969c44a7d7bc93538d53b349d5df324e
@@ -23,21 +21,10 @@ EBUILD icu4j-3.8.1-r1.ebuild 2707 SHA256 01e8d30679158adac20b3913e9caf305696daa1
 EBUILD icu4j-4.0.1.1.ebuild 2491 SHA256 0fc02192469ed50b3827b957ba2b2d383ffbbf364e7429978461f1be5c377748 SHA512 af9a5122471a733597df39fdb2ef7f8b924dfa7d88ce2498652a83416084c709d679a574e68b924f8265e8b6053f9e78b1e9473bf27312f25fdf3ba15781503f WHIRLPOOL 1f5b83eb316c98e79f9c9defe694c3b4bd07933ec28fdfc8b3eb94354d69e509d89424459cf24b44b10be3f59793e9e554c54c4af2f729c4f043805495504ba1
 EBUILD icu4j-4.2.1.1.ebuild 2230 SHA256 3800c258147a9f47cb1ee866be92d538522beac1f3c1ff378d3f15a3f72fbe2c SHA512 09e37990e466f029e7a9ec47a75eba1df8a930956e43eb1bcc78ba5815ffbb9ec27018ba2e38060f94ae7f210dbfc60057825c775b2437e3746c1bb7c4c7b3f4 WHIRLPOOL e50edced43efb019d68d64a417eef2f0e66647c3849815dc05673615eb8925c291dbe6a2f91a6e5ed298f694c510f4b2b5239b06a8fa5a895498d1e9f9493a81
 EBUILD icu4j-4.4.1.1.ebuild 2379 SHA256 4fe4db8289440e87f0367dc26ac49098b9b804f93cf15eda3bd527d2847a59ab SHA512 58946c4d6f0b068ee370cba58d91644dc5c83929749ef2b9740f1efc4179547881f1b6978719beeff031fcc978ca476e627fd79dcd5fd85e23e390ac34206695 WHIRLPOOL 6d8ffa815ff4e377eea817600f71a29c70af4cf6d98d59eda56b078f05c2c5d1e8ae5eeea20826514be16d7d107cdde35af047e7bc52eb51748181acba9127af
-EBUILD icu4j-4.4.2.ebuild 2375 SHA256 0feeace2787ba515582ca47a4ef43a788f2c9663a75f11ba3766a85c7e7ebd1c SHA512 140535436039494a7cf395e43b729cb21b02fe858d32b83f1ff5d860c488098eeab9d3a7082defd7e97c7fe2044c5db6282f397e575d42f96a847dd6dacd24da WHIRLPOOL 2beafcbc5e5282a308eaecb4ccb7f86c286889d03b57dd9b00c021b384a8d418041374c83fe39251c3e3f6ed202af9f399ef21af3d256c492d19718457e7c4f7
+EBUILD icu4j-4.4.2.ebuild 2454 SHA256 14d3d6dd0b293037057b0769b8feba19945db60872fbb7f9acddc3073a6e70d5 SHA512 5ff9522b50233a3f453e4a904611d8fb09e76799a7ba68cff12da9f7c100a8822fd05646d1d89b9d9e4b0c922c576c97807ae67c536e7677bc3bc19a6a57b0a0 WHIRLPOOL 9012a2f68a5f2d7db9bae6c49eefe7122af5981188b20e58c8584fad4b1366e229988cd937520b4bcbcc6c5404cc82327ce8185662c09acce02c32ec4eb064ea
 EBUILD icu4j-49.1.ebuild 1344 SHA256 fbf77f6a8513839747e7e979582711140a12478844e5a76332a159a37e820958 SHA512 80ef6d858e44b6014c718c067d9cbd35e13fe72ed442efdf5f8f7ba6615a4ae5fa4f7aee1f1d574a82d19c7b787276dce1ed6e8a537affa3d06e1f0200fc66d8 WHIRLPOOL f5e107fc3309941b7f4915acd0143b7dec1def15a1cfa9c77a623e6bb0ed559b1291203c297753f1a79ae7526ba1afc403654821358aa617f07695b8ac9c2d30
 EBUILD icu4j-52.1.ebuild 1517 SHA256 107461ee231f8901568a0c1e324e14ab17809b5ff9b7d46ed719522c12747691 SHA512 6cec89183ad9b3f3391fb8cba5f8c726d8ae0c706a8a8c1eb83e30abf8b45e12cf6099be1e6e692e46cd124198f7c4af9fb7658903d41a1e4853cdc1ee228286 WHIRLPOOL 5217bcc6d7cc0258087ac00afeef4789b2251d37f7d30ab720af866366c00c17c8a64efee9512e0a451fc901802c94c3b84c2e0fdfc6dddb9232d85de7628d65
 EBUILD icu4j-53.1.ebuild 1343 SHA256 63fca36f944a565a4592e7e9683f9ad0da8753c710aff55281da4bf31ef01a06 SHA512 1ec0499f97b78fbc5ba18f8d134e38515bfe1b10ec1aa0d6b3241402f35310409ec0bfd799af793b63727994e51c3943c85f04bfc29bf40cfec8710df10b7662 WHIRLPOOL dd25c253bddd1af979388e7a2709825a5f32540ef3fc40dbd66332e683e29db1c7d2eba52ba72df13cebfcfc30a8a0195674eb755f4449a6c0de9fa2650cc834
 EBUILD icu4j-54.1.1.ebuild 1344 SHA256 fcb504d962c16fb68e15ab2f8f9f9c476ed64f8a4792fc4e9a6f5d3792d5fa7c SHA512 7d7e659d1aa2cfcc0400f7e0ba07a8cd51c971d62b8188c3ce3ee000deafe8f36f8c057bcce834257d6eceed1d769fe2e89972fa535664581912b6d5841774d2 WHIRLPOOL 89f2da3fdcdb43dbf0d82856d09f59cb564da97d2d798936bc4a03b8bb582db07232fe0ffa8c713035ee83d16d5b432bd8baf1bf97aec6a29e741f4c007e23d0
-MISC ChangeLog 9351 SHA256 ea2fdb4d106d325013c6e9a23d75648b40a49802aa590358b6d187eb9a051a82 SHA512 72350154194ae7164a6c33e993cf974b10df93efc1c509ecd8e0ad51e6b60f1c3bb96f1c860d66ded3a07cc426ab2e7bec8d4366deef97132b18984fd9b5df52 WHIRLPOOL 6f8d1ba86a3243527e364669f5c0ad7aa70fcf26e163a5fba23ef6b6b195baee65c1e692c58b36e38fd8e8450e64a1c936b60b0a6d19828e3653773fc27d8263
+MISC ChangeLog 9503 SHA256 4ebf6124a3df00dd29dbce5404cdc8879865f4b7cc014ee9b5f17dd789f9fa58 SHA512 e6ed40749dc34132b358ec26a137f71c30ecfe10bd44a273c4e72ba1b44f0f0d4e360c4d20c3bef055a3dd6df85eadf637273705fb2844b7110a4bfbd73a773a WHIRLPOOL 9eb6b87a641c99a71e18de5fb4f7516ce90cf9c480181d8f1b628125c3bb20c3c0bdc07193102464c7d15f509f7113b6e3955e78415a6f9b524b2a03deaa3bf7
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJUS0NDAAoJEKCEBkJ3xQHtyFgH/0LAtR2j753VlKVmQVs7l0jH
-Y2cp0HeuIDEE5xik5I/McmrvcvocLwMqHkIcZ72MRzazlr+Hat3FHnkFm/XuIHAw
-HdE8C6giruko66HeLEuvIKFlVbzczq+q82TZs+SGiQtFfnwsP6NBzrfT8uwxF2RS
-lpJ1ldsj0bhnI1JnfMfS5xC1zzPns39tAbwKpyT0HvUY1Jz3Jtllhv7UgrAQSstV
-Bxbgguwq0UhgLX88i7QOnAFcrHV7oUk7ionWJWJdLqEwcvyinWr15mOLyB4eTB/E
-RrV7YzItct91ft06/K0hODk/41dT/qWNkEte9Qc8+hEGnbTSmkZdnhXceg1+eNQ=
-=r36K
------END PGP SIGNATURE-----
diff --git a/dev-java/icu4j/files/icu4j-4.4.2-add-jdk8-to-check.patch b/dev-java/icu4j/files/icu4j-4.4.2-add-jdk8-to-check.patch
new file mode 100644
index 000000000000..4946cf8c9840
--- /dev/null
+++ b/dev-java/icu4j/files/icu4j-4.4.2-add-jdk8-to-check.patch
@@ -0,0 +1,12 @@
+diff --git a/build.xml b/build.xml
+index 6f82ec5..9e763ae 100644
+--- a/build.xml
++++ b/build.xml
+@@ -27,6 +27,7 @@
+         <or>

+             <contains string="${java.version}" substring="1.6."/>

+             <contains string="${java.version}" substring="1.7."/>

++            <contains string="${java.version}" substring="1.8."/>

+         </or>

+     </condition>

+     <condition property="is.java5">

diff --git a/dev-java/icu4j/icu4j-4.4.2.ebuild b/dev-java/icu4j/icu4j-4.4.2.ebuild
index bcbf3ba40299..dba30db01bcf 100644
--- a/dev-java/icu4j/icu4j-4.4.2.ebuild
+++ b/dev-java/icu4j/icu4j-4.4.2.ebuild
@@ -1,8 +1,8 @@
-# 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/icu4j/icu4j-4.4.2.ebuild,v 1.6 2014/08/10 20:15:08 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-4.4.2.ebuild,v 1.7 2015/02/03 15:36:47 fordfrog Exp $
 
-EAPI=2
+EAPI=5
 
 # We currently download the Javadoc documentation.
 # It could optionally be built using the Ant build file.
@@ -48,6 +48,10 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/icu4j-4.4.2-add-jdk8-to-check.patch
+}
+
 src_compile() {
 	# Classes extending CharsetICU not implementing Comparable
 	# Breaks with ecj on jdk 1.5+, javac doesn't mind - Sun's hack?