dev-java/javacup: 0.11b_beta20150326 (bug #512642)

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)

3 files changed, 101 insertions, 1 deletions

diff --git a/dev-java/javacup/ChangeLog b/dev-java/javacup/ChangeLog
index 531c7675fa42..f7d779400834 100644
--- a/dev-java/javacup/ChangeLog
+++ b/dev-java/javacup/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/javacup
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/ChangeLog,v 1.35 2015/07/11 09:20:21 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/ChangeLog,v 1.36 2015/08/07 19:58:56 sping Exp $
+
+*javacup-0.11b_beta20150326 (07 Aug 2015)
+
+  07 Aug 2015; Sebastian Pipping <sping@gentoo.org>
+  +javacup-0.11b_beta20150326.ebuild,
+  +files/javacup-0.11b_beta20150326-build-xml.patch:
+  Bump to 0.11b_beta20150326 (bug #512642)
 
   11 Jul 2015; James Le Cuirot <chewi@gentoo.org> -javacup-0.10k-r1.ebuild,
   javacup-0.11a_beta20060608.ebuild:
diff --git a/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml.patch b/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml.patch
new file mode 100644
index 000000000000..5aa346303dc0
--- /dev/null
+++ b/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml.patch
@@ -0,0 +1,26 @@
+From 1488926a5731b17a577a1fd161eb95b88458a09b Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 7 Aug 2015 21:42:29 +0200
+Subject: [PATCH] Bundled JFlex.jar also contains java_cup/runtime/Scanner, our
+ replacement does not
+
+---
+ build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index 33f0c60..89c9793 100644
+--- a/build.xml
++++ b/build.xml
+@@ -53,7 +53,7 @@
+   </target>
+ 
+   <taskdef name="cup" classname="java_cup.anttask.CUPTask" classpath="${bin}/java-cup-11.jar" />
+-  <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${bin}/JFlex.jar" />
++  <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${bin}/JFlex.jar:${bin}/java-cup-11.jar" />
+ 
+   <target name="cup" depends="init">
+     <cup srcfile="${cup}/parser.cup" interface="on" destdir="${java}" parser="parser" symbols="sym" quiet="false" nonterms="true"/>
+-- 
+2.5.0
+
diff --git a/dev-java/javacup/javacup-0.11b_beta20150326.ebuild b/dev-java/javacup/javacup-0.11b_beta20150326.ebuild
new file mode 100644
index 000000000000..8d10fc8806fa
--- /dev/null
+++ b/dev-java/javacup/javacup-0.11b_beta20150326.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild,v 1.1 2015/08/07 19:58:56 sping Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source doc"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="CUP Parser Generator for Java"
+
+HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
+
+# We cannot put the actual SRC_URI because it causes conflicts with Gentoo mirroring system
+# No better URI is available, waiting until it hits actual Gentoo mirrors
+
+MY_PV=${PV/_beta/-}
+MY_PV=${MY_PV##0.}
+SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="userland_BSD"
+
+# find for bug #214664
+DEPEND=">=virtual/jdk-1.5
+	dev-java/jflex:0
+	!userland_BSD? ( >=sys-apps/findutils-4.4 )"
+RDEPEND=">=virtual/jre-1.5
+		>=dev-java/ant-core-1.7.0"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build-xml.patch
+
+	find . -name '*.class' -delete || die
+
+	rm bin/JFlex.jar || die
+	java-pkg_jar-from --build-only jflex JFlex.jar bin/JFlex.jar
+
+	java-ant_rewrite-classpath
+}
+
+src_compile() {
+	eant -Dgentoo.classpath="$(java-pkg_getjars ant-core)"
+	rm bin/java-cup-11.jar || die
+	cp dist/java-cup-11b.jar bin/java-cup-11.jar || die
+	eant clean
+
+	einfo "Recompiling with newly generated javacup"
+	eant -Dgentoo.classpath="$(java-pkg_getjars ant-core)"
+	use doc && javadoc -sourcepath src/ java_cup -d javadoc
+}
+
+src_install() {
+	java-pkg_newjar dist/java-cup-11b.jar
+	java-pkg_newjar dist/java-cup-11b-runtime.jar ${PN}-runtime.jar
+	java-pkg_register-ant-task
+
+	dodoc changelog.txt || die
+	dohtml manual.html || die
+	use source && java-pkg_dosrc java/*
+	use doc && java-pkg_dojavadoc javadoc
+}