Disable jar files download via ant and let Portage fetch them instead. Fix bug 549962.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

3 files changed, 46 insertions, 3 deletions

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index d438cf5867d2..7611dd437982 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,11 @@
 # 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.113 2015/05/18 13:15:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.114 2015/05/20 20:32:44 monsieurp Exp $
+
+  20 May 2015; Patrice Clement <monsieurp@gentoo.org>
+  +files/antlr-4.4-build.xml.patch, antlr-4.4.ebuild:
+  Disable jar files download via ant and let Portage fetch them instead. Fix bug
+  549962.
 
   18 May 2015; Agostino Sarubbo <ago@gentoo.org> antlr-4.4.ebuild:
   Stable for amd64, wrt bug #549586
diff --git a/dev-java/antlr/antlr-4.4.ebuild b/dev-java/antlr/antlr-4.4.ebuild
index 267838c0db78..b7afee3d1feb 100644
--- a/dev-java/antlr/antlr-4.4.ebuild
+++ b/dev-java/antlr/antlr-4.4.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-4.4.ebuild,v 1.5 2015/05/18 13:15:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-4.4.ebuild,v 1.6 2015/05/20 20:32:44 monsieurp Exp $
 
 EAPI="5"
 
@@ -8,9 +8,14 @@ JAVA_PKG_IUSE="source"
 
 inherit java-pkg-2 java-ant-2
 
+# List of jar files we need to get from the Internets.
+JAR_LIST=(antlr-3.5.2-complete-no-st3.jar antlr-4.3-complete.jar)
+
 DESCRIPTION="A parser generator for C++, C#, Java, and Python"
 HOMEPAGE="http://www.antlr.org/"
-SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.zip"
+SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.zip
+http://www.antlr3.org/download/${JAR_LIST[0]}
+http://www.antlr.org/download/${JAR_LIST[1]}"
 LICENSE="BSD"
 SLOT="4"
 KEYWORDS="amd64 ~arm ~ia64 ~ppc ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -28,6 +33,19 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}4-${PV}"
 
+src_prepare() {
+	# Disable manual download + lib directory creation.
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+
+	# Create lib directory ourselves.
+	mkdir "${S}"/lib/
+
+	# Copy downloaded jars in lib directory.
+	for myjar in ${JAR_LIST[@]}; do
+		cp "${DISTDIR}"/${myjar} "${S}"/lib/
+	done
+}
+
 src_compile() {
 	eant -f build.xml
 }
diff --git a/dev-java/antlr/files/antlr-4.4-build.xml.patch b/dev-java/antlr/files/antlr-4.4-build.xml.patch
new file mode 100644
index 000000000000..1e64d30e9fc3
--- /dev/null
+++ b/dev-java/antlr/files/antlr-4.4-build.xml.patch
@@ -0,0 +1,20 @@
+--- build.xml.orig	2015-05-20 19:58:28.345000000 +0000
++++ build.xml	2015-05-20 19:58:44.809000000 +0000
+@@ -11,8 +11,6 @@
+         <property name="antlr3.version" value="3.5.2"/>
+         <property name="antlr3.jar.name" value="antlr-${antlr3.version}-complete-no-st3.jar"/>
+         <property name="antlr3.jar" value="${lib.dir}/${antlr3.jar.name}"/>
+-        <mkdir dir="${lib.dir}"/>
+-        <get src="http://www.antlr3.org/download/${antlr3.jar.name}" dest="${antlr3.jar}" skipexisting="true"/>
+         <path id="cp.antlr3" path="${antlr3.jar}"/>
+ 
+         <property name="build.antlr3.dir" value="${build.dir}/generated-sources/antlr3" />
+@@ -23,8 +21,6 @@
+         <property name="antlr4.version" value="4.3"/>
+         <property name="antlr4.jar.name" value="antlr-${antlr4.version}-complete.jar"/>
+         <property name="antlr4.jar" value="${lib.dir}/${antlr4.jar.name}"/>
+-        <mkdir dir="${lib.dir}"/>
+-        <get src="http://www.antlr.org/download/${antlr4.jar.name}" dest="${antlr4.jar}" skipexisting="true"/>
+         <path id="cp.antlr4" path="${antlr4.jar}"/>
+ 
+         <property name="build.antlr4.dir" value="${build.dir}/generated-sources/antlr4" />