summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-java/antlr/ChangeLog6
-rw-r--r--dev-java/antlr/antlr-3.1.3-r3.ebuild4
-rw-r--r--dev-java/antlr/files/antlr-3.1.3-jdk-8.patch28
3 files changed, 36 insertions, 2 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/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
+