* [gentoo-commits] gentoo-x86 commit in dev-java/jflex: jflex-1.5.1.ebuild ChangeLog
@ 2014-04-17 22:20 Tom Wijsman (tomwij)
0 siblings, 0 replies; 3+ messages in thread
From: Tom Wijsman (tomwij) @ 2014-04-17 22:20 UTC (permalink / raw
To: gentoo-commits
tomwij 14/04/17 22:20:12
Modified: ChangeLog
Added: jflex-1.5.1.ebuild
Log:
Version bump to 1.5.1; fixes bug #507944, filed by Mr. Anderson (walch.martin).
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path
1.14 dev-java/jflex/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?r1=1.13&r2=1.14
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog 8 Mar 2014 16:17:17 -0000 1.13
+++ ChangeLog 17 Apr 2014 22:20:12 -0000 1.14
@@ -1,6 +1,12 @@
# 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.13 2014/03/08 16:17:17 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.14 2014/04/17 22:20:12 tomwij Exp $
+
+*jflex-1.5.1 (17 Apr 2014)
+
+ 17 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +jflex-1.5.1.ebuild:
+ Version bump to 1.5.1; fixes bug #507944, filed by Mr. Anderson
+ (walch.martin).
*jflex-1.5.0 (08 Mar 2014)
1.1 dev-java/jflex/jflex-1.5.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?rev=1.1&content-type=text/plain
Index: jflex-1.5.1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild,v 1.1 2014/04/17 22:20:12 tomwij 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.5"
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() {
cp "${FILESDIR}"/${PN}-1.5.0-build.xml build.xml || die
}
# 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"
ANT_TASKS="javacup"
src_compile() {
java-pkg-2_src_compile
# Compile another time, using our generated jar; for sanity.
cp target/${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 target/${PN}-*.jar ${PN}.jar
java-pkg_dolauncher "${PN}" --main jflex.Main
java-pkg_register-ant-task
if use doc ; then
dodoc doc/manual.pdf doc/manual.ps.gz src/changelog
dohtml -r doc/*
java-pkg_dojavadoc target/site/apidocs
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
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/jflex: jflex-1.5.1.ebuild ChangeLog
@ 2014-04-30 15:27 Tom Wijsman (tomwij)
0 siblings, 0 replies; 3+ messages in thread
From: Tom Wijsman (tomwij) @ 2014-04-30 15:27 UTC (permalink / raw
To: gentoo-commits
tomwij 14/04/30 15:27:11
Modified: jflex-1.5.1.ebuild ChangeLog
Log:
Fix up dodoc line; reported in bug #498874 by James Cloos, patch provided by Martin Walch.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path
1.2 dev-java/jflex/jflex-1.5.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?r1=1.1&r2=1.2
Index: jflex-1.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jflex-1.5.1.ebuild 17 Apr 2014 22:20:12 -0000 1.1
+++ jflex-1.5.1.ebuild 30 Apr 2014 15:27:11 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild,v 1.1 2014/04/17 22:20:12 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild,v 1.2 2014/04/30 15:27:11 tomwij Exp $
EAPI="5"
@@ -63,7 +63,7 @@
java-pkg_register-ant-task
if use doc ; then
- dodoc doc/manual.pdf doc/manual.ps.gz src/changelog
+ dodoc doc/manual.pdf changelog.md
dohtml -r doc/*
java-pkg_dojavadoc target/site/apidocs
fi
1.15 dev-java/jflex/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?r1=1.14&r2=1.15
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog 17 Apr 2014 22:20:12 -0000 1.14
+++ ChangeLog 30 Apr 2014 15:27:11 -0000 1.15
@@ -1,6 +1,10 @@
# 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.14 2014/04/17 22:20:12 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.15 2014/04/30 15:27:11 tomwij Exp $
+
+ 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
+ Martin Walch.
*jflex-1.5.1 (17 Apr 2014)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/jflex: jflex-1.5.1.ebuild ChangeLog
@ 2015-01-31 19:34 Patrice Clement (monsieurp)
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-01-31 19:34 UTC (permalink / raw
To: gentoo-commits
monsieurp 15/01/31 19:34:36
Modified: jflex-1.5.1.ebuild ChangeLog
Log:
Patch to fix jflex-1.5.1 (bug 505498) courtesy of Martin Walch <walch.martin@web.de>.
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.3 dev-java/jflex/jflex-1.5.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?r1=1.2&r2=1.3
Index: jflex-1.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jflex-1.5.1.ebuild 30 Apr 2014 15:27:11 -0000 1.2
+++ jflex-1.5.1.ebuild 31 Jan 2015 19:34:36 -0000 1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.5.1.ebuild,v 1.2 2014/04/30 15:27:11 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild,v 1.3 2015/01/31 19:34:36 monsieurp Exp $
EAPI="5"
@@ -28,7 +28,17 @@
IUSE="${JAVA_PKG_IUSE} source vim-syntax"
java_prepare() {
- cp "${FILESDIR}"/${PN}-1.5.0-build.xml build.xml || die
+ # 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)
@@ -40,17 +50,17 @@
EANT_GENTOO_CLASSPATH="ant-core"
EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar"
JAVA_ANT_REWRITE_CLASSPATH="true"
-ANT_TASKS="javacup"
+WANT_ANT_TASKS="javacup"
src_compile() {
java-pkg-2_src_compile
# Compile another time, using our generated jar; for sanity.
- cp target/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA}
+ 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.
+# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet.
RESTRICT="test"
src_test() {
@@ -58,14 +68,14 @@
}
src_install() {
- java-pkg_newjar target/${PN}-*.jar ${PN}.jar
+ 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 target/site/apidocs
+ java-pkg_dojavadoc javadoc
fi
use examples && java-pkg_doexamples examples
1.17 dev-java/jflex/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?r1=1.16&r2=1.17
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog 18 Jan 2015 21:16:24 -0000 1.16
+++ ChangeLog 31 Jan 2015 19:34:36 -0000 1.17
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/jflex
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.17 2015/01/31 19:34:36 monsieurp Exp $
+
+ 31 Jan 2015; Patrice Clement <monsieurp@gentoo.org> jflex-1.5.1.ebuild:
+ Patch to fix jflex-1.5.1 (bug 505498) courtesy of Martin Walch
+ <walch.martin@web.de>.
*jflex-1.6.0 (18 Jan 2015)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-31 19:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-30 15:27 [gentoo-commits] gentoo-x86 commit in dev-java/jflex: jflex-1.5.1.ebuild ChangeLog Tom Wijsman (tomwij)
-- strict thread matches above, loose matches on Subject: below --
2015-01-31 19:34 Patrice Clement (monsieurp)
2014-04-17 22:20 Tom Wijsman (tomwij)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox