Version bump to 1.6 courtesy of Martin Walch. Fix bug 532006.

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

2 files changed, 95 insertions, 2 deletions

diff --git a/dev-java/jflex/ChangeLog b/dev-java/jflex/ChangeLog
index 795d431db97d..b3a071a94b8c 100644
--- a/dev-java/jflex/ChangeLog
+++ b/dev-java/jflex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jflex
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.15 2014/04/30 15:27:11 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.16 2015/01/18 21:16:24 monsieurp Exp $
+
+*jflex-1.6.0 (18 Jan 2015)
+
+  18 Jan 2015; Patrice Clement <monsieurp@gentoo.org> +jflex-1.6.0.ebuild:
+  Version bump to 1.6 courtesy of Martin Walch. Fix bug 532006.
 
   30 Apr 2014; Tom Wijsman <TomWij@gentoo.org> jflex-1.5.1.ebuild:
   Fix up dodoc line; reported in bug #498874 by James Cloos, patch provided by
diff --git a/dev-java/jflex/jflex-1.6.0.ebuild b/dev-java/jflex/jflex-1.6.0.ebuild
new file mode 100644
index 000000000000..cd6240459ee7
--- /dev/null
+++ b/dev-java/jflex/jflex-1.6.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.6.0.ebuild,v 1.1 2015/01/18 21:16:24 monsieurp Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+HOMEPAGE="http://www.jflex.de/"
+SRC_URI="http://${PN}.de/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND=">=virtual/jre-1.5
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	>=dev-java/ant-core-1.7.0
+	>=dev-java/javacup-0.11a_beta20060608:0"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/junit:0
+	>=dev-java/javacup-0.11a_beta20060608:0"
+
+IUSE="${JAVA_PKG_IUSE} source vim-syntax"
+
+java_prepare() {
+	# use a more convenient version number
+	sed -i s:"\(name=\"version\" value=\"\)[^\"]*\"":"\1${PV}\"":g build.xml
+	# fix bootstrapping
+	sed -i s:"\(name=\"bootstrap.version\" value=\"\)[^\"]*\"":"\1${PV}\"":g \
+		build.xml
+	# add javadoc capability to build.xml
+	sed -i s,"\(</project>\)",\
+"\n  <target depends=\"compile\" name=\"javadoc\">\n    <javadoc \
+packagenames=\"jflex\" sourcepath=\"src/main/java:build/generated-\
+sources\" destdir=\"javadoc\" version=\"true\" />\n  </target>\n\1",g \
+		build.xml
+}
+
+# TODO: Try to avoid using bundled jar (See bug #498874)
+#
+# Currently, this package uses an included JFlex.jar file to bootstrap.
+# Upstream was contacted and this bootstrap is really needed. The only way to
+# avoid it would be to use a supplied pre-compiled .scanner file.
+
+EANT_GENTOO_CLASSPATH="ant-core"
+EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+WANT_ANT_TASKS="javacup"
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	# Compile another time, using our generated jar; for sanity.
+	cp build/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA}
+	java-pkg-2_src_compile
+}
+
+# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet.
+RESTRICT="test"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	java-pkg_dolauncher "${PN}" --main jflex.Main
+	java-pkg_register-ant-task
+
+	if use doc ; then
+		dodoc doc/manual.pdf changelog.md
+		dohtml -r doc/*
+		java-pkg_dojavadoc javadoc
+	fi
+
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/main
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}/lib/jflex.vim"
+	fi
+}