From 0029d15a96b5777f12503e7298a92bccfc8571ff Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sat, 5 Dec 2015 17:23:15 +0000 Subject: dev-java/antlr: Version bump for SLOT 3, should fix #567560 I initially wanted to add 3.3 but despite it being less disruptive than 3.4, I found compatibility issues with the revdeps. We will hopefully never need 3.3. This is a total rewrite from the previous version, which uses the new simplified antlr-2 ebuild and adds a very large test suite that is passing with a little patching. Package-Manager: portage-2.2.26 --- dev-java/antlr/files/3.2-java-8.patch | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 dev-java/antlr/files/3.2-java-8.patch (limited to 'dev-java/antlr/files/3.2-java-8.patch') diff --git a/dev-java/antlr/files/3.2-java-8.patch b/dev-java/antlr/files/3.2-java-8.patch new file mode 100644 index 000000000000..662abfe1e17f --- /dev/null +++ b/dev-java/antlr/files/3.2-java-8.patch @@ -0,0 +1,32 @@ +diff -Naur antlr-3.3.orig/tool/src/main/java/org/antlr/tool/CompositeGrammar.java antlr-3.3/tool/src/main/java/org/antlr/tool/CompositeGrammar.java +--- antlr-3.3.orig/tool/src/main/java/org/antlr/tool/CompositeGrammar.java 2010-11-30 01:54:04.000000000 +0000 ++++ antlr-3.3/tool/src/main/java/org/antlr/tool/CompositeGrammar.java 2015-10-03 14:28:50.063497181 +0100 +@@ -219,7 +219,9 @@ + public List getIndirectDelegates(Grammar g) { + List direct = getDirectDelegates(g); + List delegates = getDelegates(g); +- delegates.removeAll(direct); ++ if (direct != null) { ++ delegates.removeAll(direct); ++ } + return delegates; + } + +@@ -389,7 +391,7 @@ + Set localRuleDefs = new HashSet(); + Set overrides = new HashSet(); + // compute set of non-overridden rules for this delegate +- for (Rule r : p.grammar.getRules()) { ++ for (Rule r : (Collection) p.grammar.getRules()) { + if ( !ruleDefs.contains(r.name) ) { + localRuleDefs.add(r.name); + } +@@ -409,7 +411,7 @@ + + // pass larger set of defined rules to delegates + if ( p.children!=null ) { +- for (CompositeGrammarTree delegate : p.children) { ++ for (CompositeGrammarTree delegate : (List) p.children) { + _minimizeRuleSet(ruleDefs, delegate); + } + } -- cgit v1.2.3