dev-java/antlr: Fix for JDK 8 (bug #506678)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

4 files changed, 42 insertions, 11 deletions

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index 4fc7bca4f8ee..83a3e6af757d 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/antlr
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.120 2015/07/19 08:22:24 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.121 2015/08/08 01:55:34 sping Exp $
+
+  08 Aug 2015; Sebastian Pipping <sping@gentoo.org> antlr-3.1.3-r3.ebuild,
+  +files/antlr-3.1.3-jdk-8.patch:
+  Fix compilation with oracle-jdk-bin-1.8 (bug #506678)
 
 *antlr-2.7.7-r6 (19 Jul 2015)
 
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 88ea4ffeed31..723653e8a4d0 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -5,6 +5,7 @@ AUX 2.7.7-gcc-4.3.patch 383 SHA256 de68d3a12a03d7bcdbd3e1cf5ab7d773123a55b4d9e8b
 AUX 2.7.7-gcc-4.4.patch 257 SHA256 4d1c713424893be36f5b29f73a9e7f491274abe6535af31c26bf0aa8dbf00256 SHA512 d93af8f5c8dc415bab85f320bd39fcbbcae0e30c17dfa87b531599610b251c3472b72a84d5aa540d74342762d9a6ac510dfbf6001464d997b3753cac6ed85542 WHIRLPOOL f66210f8e129b9694340c996e41fa515c0b56981b9cf4393a5d091a98ba989f5278f2141b9bdf6da2258d3cc9f6e143c0fac3e76bb6315c35f6a75ab83ed3f57
 AUX 2.7.7-makefixes.patch 3151 SHA256 04c15e4c6054c3504e21ed5ef00bfb011f5345146e5c044f607e14a30fda1360 SHA512 7f001edebf543490955548eac602159651efe78a1120b88d3a1eec6a227121455522f00ac65a0815b6707d57004e0abc7a811bc4933c9873a0b379c3a207c901 WHIRLPOOL 4cfae2edf530564f1d1f141e99a78e3098ac34d8674d8b9119eb581fe52cb16497f56435025e3d0004d47a6af2ceffa7e7a0957e43a14704ec1d45a87e034097
 AUX 2.7.7-static-libs-fix.patch 507 SHA256 a4a3e56c1c583e868f3dff477ca052fd80abfb49889e848b79b57ebdee8a134e SHA512 3d5bdf61a857e6b3856814bbe7481e3420499bec2da874e9e2363178295b10ad239a792674a3cbb0fe19198a29ef5c63ec677c76750f4ba1d025ce0d96349c31 WHIRLPOOL a3388c3ae1e20b1bd0d4d6f37cc76401daf50eab96ce64efb8ecc413b6cf4324214ef1dd3a1ee91c974b4c3f500776bfa959d61ab811ed235cd02a5761e5f05a
+AUX antlr-3.1.3-jdk-8.patch 1006 SHA256 2059cfebca0f3f7f5057f07ccb7bb97f15859665abdb1d52071eb068a7854860 SHA512 32094567d6d79cb8ac91de666b01ba4f9e5a3bee97cd821cacfb9f3a163e808cd645295c1b95102fcd4e0fdcc1730096762e9ef57c1f89a8afe29906536855b0 WHIRLPOOL 7cfa60803d4e7941cd352a8547adcbd0869d5d010c341366079b28e555075fe3f9156505e79101e88f8cdb1664e1f21a56cfdcbd7112411b12c126d30ee16540
 AUX antlr-4.4-build.xml.patch 1181 SHA256 35fea0cecadd2da2cb11be61eed72cae6669872bcf4af818d34086035e905038 SHA512 84b0d94d6c7193be795cc8fe8ff94adca83434f8104d8814f925ea050fa85ccbd85b572ea5ddb5de6066f1169d3c577bae55ccf2cf2c7adcacaa900427aa2a17 WHIRLPOOL 225f61f9a1be5cf9b4e71b5b418f7f23479f51e387209a0b8414c4456f7b0836224d89d908000ed7cd45cb46a77ff209c07c1cfb079c8c1503e94e5fd582c558
 AUX antlr.pc.in 155 SHA256 31bf717831c33e3088958712f2c6629427a505ee0a48030e65b4f733e0bf277f SHA512 30fe3cb55ca8df57f60eb117a6c2670ffe24b590e3e19e5976c80a06750aa88d6eb392e3b6d6f6c545dbd178976a55bdf1de2b93b313e03231877781a9587757 WHIRLPOOL 1b6fa0e73c888f5f57d01087b562ab9427a1e08614d5cdc6e78321a23eee6c66db5773bf611f4a1637fb67fb1cb43c6181b544b84d713d7ead33e4e59fe041f7
 DIST 4.4.zip 1107695 SHA256 68a79e4accae4dfd9d45a8292fe9b2812c6a3ec1d903412e205a06ead083b8ae SHA512 5e4a92b3d0bb8583f52cbed554ef68909412cd3e9de7589870eead3359a6f5efb492029c3bcce50d6a19a220c83c809824dbde3d08a6b39a42e9fbe3eaef8ce4 WHIRLPOOL 80cf60f9679cd5d3cb512b2e1a9c4987d34fb7994a976b42c95351fb4670944343dd8b8cf0e1738b94cc177122dcf635ee5d1a262290f6b89a8e38d06adc2077
@@ -15,18 +16,14 @@ DIST antlr-3.5.2-complete-no-st3.jar 1862097 SHA256 46531814ba9739cdf20c6c1789c2
 DIST antlr-4.3-complete.jar 1340431 SHA256 da9afec193edcc4d8080a4897e77e1e2f6a0c0bc265fccb8c44ae10660f7a8f0 SHA512 669cc21ef72ec899509181b1ec77d918fce9dba3db165d9d7429e0058c58a9d716cbf274d7a54b6bd9143d95d9a902d82acfa5bcb5e6c805c4e9fdf90b83349e WHIRLPOOL f665a200850d294ee0f8c3127bb918a9c9625098a97a960afe08b3a3940ba2c2ad54099e34c82fab5058b668a721b3ed5621a85820d0aca0e16af2f81627c723
 EBUILD antlr-2.7.7-r5.ebuild 4645 SHA256 98802ec628c60aca78db2d5f41a64fbab1a8b65b4f7dad3cccd7063497467b10 SHA512 85987b9708fbdf724da878a3c731e8b21b4e58c2130e746838ff602815f57d02e4409f32b27f1b4fb3797488c3a7731e0b0818f95752f098ccbb6a17760bfc58 WHIRLPOOL d93d9a38ce41318824de28b41759c1e94c1292e986697e8ad8a318095774b036c46793fe1f5a42b58c145df82eec50ff47dc7f3979727bf83254bf2319efd9a1
 EBUILD antlr-2.7.7-r6.ebuild 4679 SHA256 12586f26f50b20d40fbc147f8d5d8361afb8207a077d2f3d93b2e087990e15d0 SHA512 2f0154b17a78466f31b2bd4e5ad0c90a6a18ab46f2c2228fe9b6d7a2687004268fc3490b53f86e292c95cceea6fd2eb78b82954b36604ed7c2b475a32c038042 WHIRLPOOL 217a153d57d94d69e688c4f7a00afdaaf69cdde1a0d179a846589b49726bc30dfb5fac0e80598f8be1f39f51148e7122f06a6913999eb1de4b372bb2fbdfb8e2
-EBUILD antlr-3.1.3-r3.ebuild 3487 SHA256 fe3ebaafbd9e693c27d7da2edc81dde3ab514aa144da65b3707abe38c12d25f8 SHA512 a9dff23895c6ef1f0dbff61f96b84b2043548a8aa60d2e74b2c3b38608bde9b59824c70b6b5cdb924a04198a944caef96019a064579d9f404f2c600e893c68b2 WHIRLPOOL 3d91b9c6c49e8cc34b33424eac60e44cd630950c064fc70f77be9ac01e0f155dfdd6c39d12843052f9aa3e419e3ca8a18e553cad1adbbd58fdeab2fa560ba5e3
+EBUILD antlr-3.1.3-r3.ebuild 3534 SHA256 af8c5128f1dd6a8c7dfe91b7da7c572f0aeebf74d1cbe58c09bdd0bf8c04481a SHA512 190e260ba25855068348514443b4843ac03a7b2b5a2004057bcf4167d573d80e2171e36c6014fca6b036986386e0bc2b3efb6527a9331e5f6988f186683a1712 WHIRLPOOL 80fdda989b9742e60bf8e159d0a3bded81f39989f7f840a995302b18ad131c20bced13b5d5e4358d06d41ffe5776324399581249dc9877a2da39bd40418cfd0c
 EBUILD antlr-4.4.ebuild 1787 SHA256 848d19a6278b2b5656f7e387c71b41636a364417af24a82c891b925fc3388f7b SHA512 dc189bd5905a24212acabaa934fdeb522b820ee1f569bcd41018b1a96a41df1da13bd996784b2dfbce97ccc88ede24d896b66c206765123a0088f1b5378ec3d1 WHIRLPOOL 74717063b06f1188ef145f3c358ea0c0da39839fb828b05bf87e34e442db7db36cfa9fbf6dd1ffae723634603cb44b95873e6f5718e3b77a37b9097db0dc9913
-MISC ChangeLog 16774 SHA256 d2d8b30a1a68e8a3affc9c618992260987a41f60db2ff5e69729cb91fd9e2f51 SHA512 a0e71827770608782a53a9bcc610db89a2f3abaef8401ca4a69db82f99e0b43013fd30495d76d7f293dc0a78b73bd4b3f7bd9fe22be4bd31f1105eb42dd54c67 WHIRLPOOL 38ca9835b8a235e067f2fb370eb47087f34d96c1317c4222badd12ff60f32ab7d4501351358cba01630ccda82e9268be5807496fb580ace52a08f3c05089d295
+MISC ChangeLog 16936 SHA256 5dbbce05d4b62d117a5cf5672ab4ddb30c31ff3a961db968477271d8342eb7c0 SHA512 9b807d940667545f211673047baf5fca4452643575f2512fc8976d9560e718f5abe893fc65e3a03432a74fb81ba0312bb462f56834e547b04280108e2b567f65 WHIRLPOOL 0e912f06b0329ff076e0f92876d7f105bd9f43a63ef5929d21aac05e67bc9f920941674edb671f3f407fd5093368e3f0f373e7d45225832801e81270a13b9424
 MISC metadata.xml 438 SHA256 53da7504d04731d636c11eb110c72cfaf103c91a5a49893dc229079e1e1dcf59 SHA512 a796ca7fbfc418406fceffb89c84fdddf271998db33e81d734c52a109c985e50b0c013f97c1950debdd50bc4a1971e5b4dd72feb84b34ef72f5402d899e3511a WHIRLPOOL 125dc7bf89dc99eaf3cf00f12ca53dc9d6d64de7c747eeaba0692041539c7bc642360fa654967a721ea550c500144c9a37971260a28c56345704a10d140cc061
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVq2yNAAoJEJGRpfGTSRu4avkH/RFuLrJbRahNbBAEv87d7HAb
-rPedKZoQuUJgkTzy4vVA7MShr0K+X8L/YRKYm7lUjpxMun1P2yZ7M3zFLOCmZVdq
-84UqyW/iKBkM+uLOGf1OIO6UPsvKTE6cpRiGn3yowBRzAROQx57CTgnPhAwv3b5m
-1gdRR/uAUTl6shCpR04iuyTk+YX71aNfscXVNVr4D6pIeu0a54s7VhiHFTm4sQUt
-t5QTQhxzRsAX9eZaaC559zmuI2GiddA8wXqBrWvm5A9OoGz9MrLKbh+muwxauWjU
-IeC1qUbTuVEcYtNAGoM2jazfJ4B3ormEEgO2eGYBsB0hjyg2dwndcmUImpicTWE=
-=V5il
+iEYEAREIAAYFAlXFYZcACgkQsAvGakAaFgAOWgCeNbzxJzyrtgmanaF2pQ3mFynv
+pN0AoK66q/IqUKZsQI9EIjK4FgZjF3vR
+=62as
 -----END PGP SIGNATURE-----
diff --git a/dev-java/antlr/antlr-3.1.3-r3.ebuild b/dev-java/antlr/antlr-3.1.3-r3.ebuild
index aa28f33db1e3..8182f8579f04 100644
--- a/dev-java/antlr/antlr-3.1.3-r3.ebuild
+++ b/dev-java/antlr/antlr-3.1.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-3.1.3-r3.ebuild,v 1.2 2015/07/11 09:19:56 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-3.1.3-r3.ebuild,v 1.3 2015/08/08 01:55:34 sping Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="source"
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 	>=virtual/jdk-1.5"
 
 java_prepare() {
+	epatch "${FILESDIR}"/${P}-jdk-8.patch || die
+
 	rm -v lib/*.jar lib/.*.jar || die
 	rm -v runtime/ActionScript/project/lib/*.jar || die
 	# We must bundle this as we can't depend on ourselves
diff --git a/dev-java/antlr/files/antlr-3.1.3-jdk-8.patch b/dev-java/antlr/files/antlr-3.1.3-jdk-8.patch
new file mode 100644
index 000000000000..a40fc60b16e6
--- /dev/null
+++ b/dev-java/antlr/files/antlr-3.1.3-jdk-8.patch
@@ -0,0 +1,28 @@
+From 126414cf2731a3fe8a42393d0b41ce0060844b34 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 8 Aug 2015 03:46:00 +0200
+Subject: [PATCH] Fix CompositeGrammer.getIndirectDelegates for JDK 8
+
+https://github.com/antlr/antlr3/issues/151
+---
+ tool/src/main/java/org/antlr/tool/CompositeGrammar.java | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tool/src/main/java/org/antlr/tool/CompositeGrammar.java b/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
+index bb15723..fc16f01 100644
+--- a/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
++++ b/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
+@@ -219,7 +219,9 @@ public class CompositeGrammar {
+ 	public List<Grammar> getIndirectDelegates(Grammar g) {
+ 		List<Grammar> direct = getDirectDelegates(g);
+ 		List<Grammar> delegates = getDelegates(g);
+-		delegates.removeAll(direct);
++		if (direct != null) {
++			delegates.removeAll(direct);
++		}
+ 		return delegates;
+ 	}
+ 
+-- 
+2.5.0
+