[gentoo-commits] gentoo-x86 commit in dev-java/antlr: antlr-4.4.ebuild ChangeLog

["Patrice Clement (monsieurp)" <monsieurp@gentoo.org>]

monsieurp    15/05/20 20:32:44

  Modified:             antlr-4.4.ebuild ChangeLog
  Log:
  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)

Revision  Changes    Path
1.6                  dev-java/antlr/antlr-4.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/antlr-4.4.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/antlr-4.4.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/antlr-4.4.ebuild?r1=1.5&r2=1.6

Index: antlr-4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-4.4.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- antlr-4.4.ebuild	18 May 2015 13:15:42 -0000	1.5
+++ antlr-4.4.ebuild	20 May 2015 20:32:44 -0000	1.6
@@ -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 @@
 
 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 @@
 
 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
 }



1.114                dev-java/antlr/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/ChangeLog?rev=1.114&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/ChangeLog?rev=1.114&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/ChangeLog?r1=1.113&r2=1.114

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- ChangeLog	18 May 2015 13:15:42 -0000	1.113
+++ ChangeLog	20 May 2015 20:32:44 -0000	1.114
@@ -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