[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Patrice Clement]

commit:     da91f19eda929dc5a67df10029474368e8b50535
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 09:59:04 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 09:59:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da91f19e

dev-java/jflex: raise {jre/jdk} reqs to 1.6 so that source/target flags get
adjusted accordingly. Fixes bug 557018.

Also add a couple of missing die statements and reorder dependencies by putting
common dependencies in CDEPEND variable.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/jflex/jflex-1.4.3-r3.ebuild | 82 ++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/dev-java/jflex/jflex-1.4.3-r3.ebuild b/dev-java/jflex/jflex-1.4.3-r3.ebuild
new file mode 100644
index 0000000..d6d3b27
--- /dev/null
+++ b/dev-java/jflex/jflex-1.4.3-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# 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.
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.jflex.de/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="dev-java/junit:0
+	dev-java/javacup:0
+	dev-java/ant-core:0"
+
+#RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.6
+	vim-syntax? (
+		|| (
+			app-editors/vim app-editors/gvim
+		)
+	)
+	${CDEPEND}"
+
+#DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+IUSE="doc source vim-syntax"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}/src" || die
+
+	mkdir "${S}/tools" || die
+
+	cp "${S}/lib/JFlex.jar" "${S}/tools/JFlex.jar" || die
+	rm -rf java_cup "${S}/lib/JFlex.jar" || die
+
+	java-ant_rewrite-classpath
+}
+
+src_compile() {
+	ANT_TASKS="javacup"
+	local jflex_cp="$(java-pkg_getjars --build-only junit):$(java-pkg_getjars ant-core,javacup)"
+	cd "${S}/src" || die
+	eant realclean || die
+	eant -Dgentoo.classpath="${jflex_cp}" jar || die
+
+	rm "${S}/tools/JFlex.jar" || die
+	cp "${S}/lib/JFlex.jar" "${S}/tools/" || die
+	rm "${S}/lib/JFlex.jar" || die
+
+	eant realclean || die
+	einfo "Recompiling using the newly generated JFlex library" || die
+	eant -Dgentoo.classpath="${jflex_cp}" jar || die
+}
+
+src_install() {
+	java-pkg_dojar lib/JFlex.jar
+	java-pkg_dolauncher "${PN}" --main JFlex.Main
+	java-pkg_register-ant-task
+
+	dodoc doc/manual.pdf doc/manual.ps.gz src/changelog
+	dohtml -r doc/*
+
+	use source && java-pkg_dosrc src/JFlex
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}/lib/jflex.vim"
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Patrice Clement]

commit:     972b7dc20eee540c55339267081591e60bc2a7eb
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 15:16:39 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 15:47:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972b7dc2

dev-java/jflex: reset SLOT to 0 and update dependency on dev-java/javacup to use the latest version. Fixes bug 557292.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.0-r1.ebuild | 90 ++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/dev-java/jflex/jflex-1.6.0-r1.ebuild b/dev-java/jflex/jflex-1.6.0-r1.ebuild
new file mode 100644
index 0000000..826102a
--- /dev/null
+++ b/dev-java/jflex/jflex-1.6.0-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="dev-java/ant-core:0
+	>=dev-java/javacup-0.11b_beta20150326:0
+	dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.6
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+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/${PN}.vim"
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Patrice Clement]

commit:     2eb3d7bd8bb99b79bd32779605daed5b9ef469a3
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 19:04:01 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 19:05:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb3d7bd

dev-java/jflex: Reset javacup dependency to get package to compile. Fixes bug 557494.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.0-r2.ebuild | 95 ++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)

diff --git a/dev-java/jflex/jflex-1.6.0-r2.ebuild b/dev-java/jflex/jflex-1.6.0-r2.ebuild
new file mode 100644
index 0000000..1ea7715
--- /dev/null
+++ b/dev-java/jflex/jflex-1.6.0-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="dev-java/ant-core:0
+	=dev-java/javacup-0.11a_beta20060608:0
+	dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.6
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+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)
+#
+
+EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar"
+
+# 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.
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+	ant-core
+	javacup
+"
+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/${PN}.vim"
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Patrice Clement]

commit:     82ce443a3e0b33747fbc423a34c1ca0300d27692
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  1 08:29:12 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Oct  1 08:29:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82ce443a

dev-java/jflex: Make use of ${PN} when installing the launcher.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.0-r2.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-java/jflex/jflex-1.6.0-r2.ebuild b/dev-java/jflex/jflex-1.6.0-r2.ebuild
index 1ea7715..0ceee0a 100644
--- a/dev-java/jflex/jflex-1.6.0-r2.ebuild
+++ b/dev-java/jflex/jflex-1.6.0-r2.ebuild
@@ -51,7 +51,6 @@ EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar"
 # 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.
-
 JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_GENTOO_CLASSPATH="
 	ant-core
@@ -76,7 +75,7 @@ src_test() {
 
 src_install() {
 	java-pkg_newjar build/${P}.jar ${PN}.jar
-	java-pkg_dolauncher "${PN}" --main jflex.Main
+	java-pkg_dolauncher "${PN}" --main "${PN}.Main"
 	java-pkg_register-ant-task
 
 	if use doc ; then

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Patrice Clement]

commit:     8b0076a725a96beb11f8f26043319084cb0a680c
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  1 08:31:32 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Oct  1 08:31:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b0076a7

dev-java/jflex: Stable for amd64+ppc+ppc64+x86.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jflex/jflex-1.6.0-r2.ebuild b/dev-java/jflex/jflex-1.6.0-r2.ebuild
index 0ceee0a..fe06e23 100644
--- a/dev-java/jflex/jflex-1.6.0-r2.ebuild
+++ b/dev-java/jflex/jflex-1.6.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.de/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 
 CDEPEND="dev-java/ant-core:0
 	=dev-java/javacup-0.11a_beta20060608:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[James Le Cuirot]

commit:     f09c5eaa1aaa96f083318b2bc3854ba737e7d84c
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 21:27:04 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 21:36:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f09c5eaa

dev-java/jflex: Add ~ppc64 keyword

Package-Manager: portage-2.2.25

 dev-java/jflex/jflex-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
index 50f314d..27d01cb 100644
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.jflex.de/"
 SRC_URI="http://${PN}.de/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples test vim-syntax"
 
 CDEPEND="dev-java/ant-core:0"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[James Le Cuirot]

commit:     c0361246500081701601f4f3f93b0f95c459cb2e
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 20:16:17 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 20:17:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0361246

dev-java/jflex: Remove old

Package-Manager: portage-2.2.28

 dev-java/jflex/Manifest              |  1 -
 dev-java/jflex/jflex-1.6.0-r2.ebuild | 94 ------------------------------------
 2 files changed, 95 deletions(-)

diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index b4c0417..42c18f3 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,2 +1 @@
-DIST jflex-1.6.0.tar.gz 3035885 SHA256 0774da0ee2d01fc9274179de4243e0d229c01b5cf0fbb78952fb7fdc4672190c SHA512 16ce4a89f75ce5f3da02433ff66d39ed4db567b4cf7469997dd2617b82e52d589bb17ec3a2f36b4d00a62233e48820bc2e043dcc9ae3c01f1eeca323c0166eba WHIRLPOOL 4d9e7e8c3a0da66d860b895699d5b50e29f781f1cf18cab436f545b1fb007297ca9433694ce3808452c5d9340eddc978c2b32019b5a8d5d8c6cb0558543ea18e
 DIST jflex-1.6.1.tar.gz 3027791 SHA256 9879fb4ea7b286af3c3439cf148f5739dfa722edbd978f2f798268b2e016f8c0 SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b WHIRLPOOL 27e2769b1b1dc720cee71718eca024905fd9e200c53771c2db293471b0190d9a3c9d2245fbbc5ab76a1f22e1496053d35d625a34c09819b1e367f78840152666

diff --git a/dev-java/jflex/jflex-1.6.0-r2.ebuild b/dev-java/jflex/jflex-1.6.0-r2.ebuild
deleted file mode 100644
index 7975464e..0000000
--- a/dev-java/jflex/jflex-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-
-CDEPEND="dev-java/ant-core:0
-	=dev-java/javacup-0.11a_beta20060608:0
-	dev-java/junit:0"
-
-RDEPEND=">=virtual/jre-1.6
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-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)
-#
-
-EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar"
-
-# 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.
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-	ant-core
-	javacup
-"
-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 "${PN}.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/${PN}.vim"
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[James Le Cuirot]

commit:     078a10e2489d65c354d076fed2901a61362d9d48
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 20:13:09 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 20:17:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=078a10e2

dev-java/jflex: Mark 1.6.1 stable on amd64, ppc64, x86 using ALLARCHES

Package-Manager: portage-2.2.28

 dev-java/jflex/jflex-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
index 6b50fe0..9b3cda6 100644
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.jflex.de/"
 SRC_URI="http://${PN}.de/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples test vim-syntax"
 
 CDEPEND="dev-java/ant-core:0"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Alexis Ballier]

commit:     83d1b5d8e71f6e334119ae3f7c882029ef0eb448
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 06:58:51 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 07:47:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d1b5d8

dev-java/jflex: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-java/jflex/jflex-1.6.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
index 611e40ed328..a9b7189a055 100644
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.jflex.de/"
 SRC_URI="http://${PN}.de/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples test vim-syntax"
 
 CDEPEND="dev-java/ant-core:0"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Aaron Bauman]

commit:     315b7fdfd152743c67817ded6ba3d58c946bc664
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 01:07:52 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat May 18 01:07:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315b7fdf

dev-java/jflex: arm64 stable

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"

 dev-java/jflex/jflex-1.6.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
index e5f745463c4..2990735567f 100644
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.jflex.de/"
 SRC_URI="http://${PN}.de/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples test vim-syntax"
 
 CDEPEND="dev-java/ant-core:0"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Aaron Bauman]

commit:     a4ea14c38e46cc0998f46073638a705da65e4d24
Author:     Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Fri May  8 14:20:30 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun May 17 16:55:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ea14c3

dev-java/jflex: update homepage

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexey Sokolov <sokolov <AT> google.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
index 21a082774ba..2fc529849fe 100644
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit eutils java-pkg-2 java-pkg-simple
 
 DESCRIPTION="JFlex is a lexical analyzer generator for Java"
-HOMEPAGE="http://www.jflex.de/"
-SRC_URI="http://${PN}.de/${P}.tar.gz"
+HOMEPAGE="https://www.jflex.de/"
+SRC_URI="https://${PN}.de/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Miroslav Šulc]

commit:     4646341ff87a562a08278240a3cb17df655e12d3
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Mar 15 21:33:41 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 10:18:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4646341f

dev-java/jflex: EAPI 7

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/19943
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.1-r1.ebuild | 123 +++++++++++++++++++++++++++++++++++
 1 file changed, 123 insertions(+)

diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild
new file mode 100644
index 00000000000..0306f5b6643
--- /dev/null
+++ b/dev-java/jflex/jflex-1.6.1-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+HOMEPAGE="https://www.jflex.de/"
+SRC_URI="https://${PN}.de/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+IUSE="examples test vim-syntax"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-java/ant-core:0"
+
+RDEPEND=">=virtual/jre-1.8:*
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	${CDEPEND}"
+
+DEPEND="dev-java/javacup:0
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/junit:4 )
+	${CDEPEND}"
+
+PDEPEND="dev-java/javacup:0"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	# See below for details.
+	eapply_user "${FILESDIR}/icedtea-arm.patch"
+
+	# We need the bundled jflex.jar.
+	rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die
+
+	# Remove the bundled java-cup.jar if unneeded.
+	if has_version ${PDEPEND}; then
+		rm -v lib/java-cup-*.jar || die
+	fi
+}
+
+src_configure() {
+	# javacup is a cyclic dependency. Use the package if we have it,
+	# otherwise use the bundled version and install the package later.
+	if has_version ${PDEPEND}; then
+		# Use PORTAGE_QUIET to suppress a QA warning that is spurious
+		# thanks to has_version above. This is Portage-specific but
+		# showing the warning elsewhere isn't the end of the world.
+		JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar)
+	else
+		JAVACUP=$(echo lib/java-cup-*.jar)
+	fi
+
+	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}"
+}
+
+jflex_compile() {
+	java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_compile() {
+	java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die
+
+	# The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running
+	# jflex. We have patched jflex to fix it but we have to run the
+	# bundled version first. -Xint works around the problem. See
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678.
+	use arm && local JFLEX_ARGS="-Xint"
+
+	# First compile (without doc/source) using the bundled jflex.
+	JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
+
+	# Then recompile using the fresh jflex.
+	jflex_compile -cp "${PN}.jar:${JAVACUP}"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main ${PN}.Main
+
+	java-pkg_register-dependency javacup javacup-runtime.jar
+	java-pkg_register-ant-task
+
+	use examples && java-pkg_doexamples examples
+	dodoc {changelog,README}.md
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto html
+		dodoc doc/*.{css,html,png} doc/COPYRIGHT
+	fi
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins lib/${PN}.vim
+	fi
+}
+
+src_test() {
+	if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then
+		# This results in a StackOverflowError as of 1.8.0.65 but works
+		# fine on icedtea:7. Don't know about icedtea:8 yet.
+		rm -v src/test/java/jflex/EmitterTest.java || die
+	fi
+
+	local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)"
+
+	local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" $(find src/test/java -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Sam James]

commit:     0c3d0633e401244cabe56e285da172418accec0d
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Mar 16 16:03:29 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 20:19:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c3d0633

dev-java/jflex: fix regression (circular dep)

Closes: https://bugs.gentoo.org/776736

Previous commit introduced circular dependency
( DEPEND="dev-java/javacup:0 )

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/19955
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.1-r1.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild
index 0306f5b6643..6c0b6396e1f 100644
--- a/dev-java/jflex/jflex-1.6.1-r1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r1.ebuild
@@ -23,8 +23,7 @@ RDEPEND=">=virtual/jre-1.8:*
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 	${CDEPEND}"
 
-DEPEND="dev-java/javacup:0
-	>=virtual/jdk-1.8:*
+DEPEND=">=virtual/jdk-1.8:*
 	test? ( dev-java/junit:4 )
 	${CDEPEND}"
 
@@ -35,7 +34,7 @@ JAVA_SRC_DIR="src/main/java"
 
 src_prepare() {
 	# See below for details.
-	eapply_user "${FILESDIR}/icedtea-arm.patch"
+	eapply "${FILESDIR}/icedtea-arm.patch"
 
 	# We need the bundled jflex.jar.
 	rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Sam James]

commit:     25823c6707322204bce2e413010e2429642ffb3b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 20:24:08 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 20:24:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25823c67

dev-java/jflex: call eapply_user

Closes: https://bugs.gentoo.org/776736
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.1-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild
index 6c0b6396e1f..d7bddcf955e 100644
--- a/dev-java/jflex/jflex-1.6.1-r1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r1.ebuild
@@ -33,6 +33,8 @@ S="${WORKDIR}/${P}"
 JAVA_SRC_DIR="src/main/java"
 
 src_prepare() {
+	eapply_user
+
 	# See below for details.
 	eapply "${FILESDIR}/icedtea-arm.patch"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Sam James]

commit:     0066ed88a2a99c2f92ac9f4ac4f94a130a9ea376
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 19:36:29 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 16 19:36:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0066ed88

dev-java/jflex: Stabilize 1.6.1-r1 arm64, #776886

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild
index 7df78eee922..80b924fcbda 100644
--- a/dev-java/jflex/jflex-1.6.1-r1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://${PN}.de/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
 IUSE="examples test vim-syntax"
 RESTRICT="!test? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Jakov Smolić]

commit:     e29ba64e1e628999e236036fad2857665fecbb67
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 11 10:56:52 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Nov 11 10:56:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e29ba64e

dev-java/jflex: Stabilize 1.6.1-r1 x86, #776886

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild
index 80b924fcbda..58580490d2f 100644
--- a/dev-java/jflex/jflex-1.6.1-r1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://${PN}.de/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 IUSE="examples test vim-syntax"
 RESTRICT="!test? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Miroslav Šulc]

commit:     d48317ec0a5b55fa96c6cfcf1db9ede8690a2a1e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 11 11:01:50 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Nov 11 11:01:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d48317ec

dev-java/jflex: dropped obsolete 1.6.1

Closes: https://bugs.gentoo.org/776886
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.1.ebuild | 121 --------------------------------------
 1 file changed, 121 deletions(-)

diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
deleted file mode 100644
index 32c5d341323..00000000000
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit epatch java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JFlex is a lexical analyzer generator for Java"
-HOMEPAGE="https://www.jflex.de/"
-SRC_URI="https://${PN}.de/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-IUSE="examples test vim-syntax"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/ant-core:0"
-
-RDEPEND=">=virtual/jre-1.6
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	test? ( dev-java/junit:4 )
-	${CDEPEND}"
-
-PDEPEND=">=dev-java/javacup-0.11b_p20151001:0"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	# See below for details.
-	epatch "${FILESDIR}/icedtea-arm.patch"
-
-	# We need the bundled jflex.jar.
-	rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die
-
-	# Remove the bundled java-cup.jar if unneeded.
-	if has_version ${PDEPEND}; then
-		rm -v lib/java-cup-*.jar || die
-	fi
-}
-
-src_configure() {
-	# javacup is a cyclic dependency. Use the package if we have it,
-	# otherwise use the bundled version and install the package later.
-	if has_version ${PDEPEND}; then
-		# Use PORTAGE_QUIET to suppress a QA warning that is spurious
-		# thanks to has_version above. This is Portage-specific but
-		# showing the warning elsewhere isn't the end of the world.
-		JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar)
-	else
-		JAVACUP=$(echo lib/java-cup-*.jar)
-	fi
-
-	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}"
-}
-
-jflex_compile() {
-	java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_compile() {
-	java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die
-
-	# The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running
-	# jflex. We have patched jflex to fix it but we have to run the
-	# bundled version first. -Xint works around the problem. See
-	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678.
-	use arm && local JFLEX_ARGS="-Xint"
-
-	# First compile (without doc/source) using the bundled jflex.
-	JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
-
-	# Then recompile using the fresh jflex.
-	jflex_compile -cp "${PN}.jar:${JAVACUP}"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main ${PN}.Main
-
-	java-pkg_register-dependency javacup javacup-runtime.jar
-	java-pkg_register-ant-task
-
-	use examples && java-pkg_doexamples examples
-	dodoc {changelog,README}.md
-
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto html
-		dodoc doc/*.{css,html,png} doc/COPYRIGHT
-	fi
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins lib/${PN}.vim
-	fi
-}
-
-src_test() {
-	if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then
-		# This results in a StackOverflowError as of 1.8.0.65 but works
-		# fine on icedtea:7. Don't know about icedtea:8 yet.
-		rm -v src/test/java/jflex/EmitterTest.java || die
-	fi
-
-	local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)"
-
-	local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find src/test/java -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Miroslav Šulc]

commit:     b883c87352b112a7148cdd881948aa1f96e05120
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Mar 14 11:46:09 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 09:12:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b883c873

dev-java/jflex: switch to dev-java/ant

also updates EAPI 7 -> 8

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35723/commits/4fbe65f45313f308d0f5a2630c2d4aad6e227dfc
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../{jflex-1.6.1-r1.ebuild => jflex-1.6.1-r2.ebuild} | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r2.ebuild
similarity index 86%
rename from dev-java/jflex/jflex-1.6.1-r1.ebuild
rename to dev-java/jflex/jflex-1.6.1-r2.ebuild
index 58580490d2fc..17d1b99fd468 100644
--- a/dev-java/jflex/jflex-1.6.1-r1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -10,6 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="JFlex is a lexical analyzer generator for Java"
 HOMEPAGE="https://www.jflex.de/"
 SRC_URI="https://${PN}.de/${P}.tar.gz"
+S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -17,7 +18,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 IUSE="examples test vim-syntax"
 RESTRICT="!test? ( test )"
 
-CDEPEND="dev-java/ant-core:0"
+CDEPEND=">=dev-java/ant-1.10.14:0"
 
 RDEPEND=">=virtual/jre-1.8:*
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
@@ -29,7 +30,6 @@ DEPEND=">=virtual/jdk-1.8:*
 
 PDEPEND="dev-java/javacup:0"
 
-S="${WORKDIR}/${P}"
 JAVA_SRC_DIR="src/main/java"
 
 src_prepare() {
@@ -59,17 +59,19 @@ src_configure() {
 		JAVACUP=$(echo lib/java-cup-*.jar)
 	fi
 
-	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjar --build-only ant ant.jar):${JAVACUP}"
 }
 
 jflex_compile() {
-	java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
+	java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} \
+		--skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
 	java-pkg-simple_src_compile
 	java-pkg_addres ${PN}.jar src/main/resources
 }
 
 src_compile() {
-	java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die
+	java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} \
+		-parser LexParse -interface src/main/cup/LexParse.cup || die
 
 	# The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running
 	# jflex. We have patched jflex to fix it but we have to run the
@@ -77,8 +79,8 @@ src_compile() {
 	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678.
 	use arm && local JFLEX_ARGS="-Xint"
 
-	# First compile (without doc/source) using the bundled jflex.
-	JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
+	# First compile using the bundled jflex.
+	jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
 
 	# Then recompile using the fresh jflex.
 	jflex_compile -cp "${PN}.jar:${JAVACUP}"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Miroslav Šulc]

commit:     dcdd14e6e3fce10f4d24f095d2cf2422d7c0a627
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu May 23 15:10:54 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat May 25 09:21:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcdd14e6

dev-java/jflex: revbump for >=dev-java/javacup-11b_p20160615

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.1-r3.ebuild | 126 +++++++++++++++++++++++++++++++++++
 1 file changed, 126 insertions(+)

diff --git a/dev-java/jflex/jflex-1.6.1-r3.ebuild b/dev-java/jflex/jflex-1.6.1-r3.ebuild
new file mode 100644
index 000000000000..4ce051add85d
--- /dev/null
+++ b/dev-java/jflex/jflex-1.6.1-r3.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+HOMEPAGE="https://www.jflex.de/"
+SRC_URI="https://${PN}.de/${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+IUSE="examples test vim-syntax"
+RESTRICT="!test? ( test )"
+
+CDEPEND=">=dev-java/ant-1.10.14:0"
+
+RDEPEND=">=virtual/jre-1.8:*
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/junit:4 )
+	${CDEPEND}"
+
+PDEPEND=">=dev-java/javacup-11b_p20160615:0"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	eapply_user
+
+	# See below for details.
+	eapply "${FILESDIR}/icedtea-arm.patch"
+
+	# We need the bundled jflex.jar.
+	rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die
+
+	# Remove the bundled java-cup.jar if unneeded.
+	if has_version ${PDEPEND}; then
+		rm -v lib/java-cup-*.jar || die
+	fi
+}
+
+src_configure() {
+	# javacup is a cyclic dependency. Use the package if we have it,
+	# otherwise use the bundled version and install the package later.
+	if has_version ${PDEPEND}; then
+		# Use PORTAGE_QUIET to suppress a QA warning that is spurious
+		# thanks to has_version above. This is Portage-specific but
+		# showing the warning elsewhere isn't the end of the world.
+		JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar)
+	else
+		JAVACUP=$(echo lib/java-cup-*.jar)
+	fi
+
+	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjar --build-only ant ant.jar):${JAVACUP}"
+}
+
+jflex_compile() {
+	java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} \
+		--skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_compile() {
+	java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} \
+		-parser LexParse -interface src/main/cup/LexParse.cup || die
+
+	# The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running
+	# jflex. We have patched jflex to fix it but we have to run the
+	# bundled version first. -Xint works around the problem. See
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678.
+	use arm && local JFLEX_ARGS="-Xint"
+
+	# First compile using the bundled jflex.
+	jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
+
+	# Then recompile using the fresh jflex.
+	jflex_compile -cp "${PN}.jar:${JAVACUP}"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main ${PN}.Main
+
+	java-pkg_register-dependency javacup javacup-runtime.jar
+	java-pkg_register-ant-task
+
+	use examples && java-pkg_doexamples examples
+	dodoc {changelog,README}.md
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto html
+		dodoc doc/*.{css,html,png} doc/COPYRIGHT
+	fi
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins lib/${PN}.vim
+	fi
+}
+
+src_test() {
+	if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then
+		# This results in a StackOverflowError as of 1.8.0.65 but works
+		# fine on icedtea:7. Don't know about icedtea:8 yet.
+		rm -v src/test/java/jflex/EmitterTest.java || die
+	fi
+
+	local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)"
+
+	local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" $(find src/test/java -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Miroslav Šulc]

commit:     fbe54646a8a951c872c49d51147d6f246af61409
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri May 24 10:10:46 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat May 25 09:21:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbe54646

dev-java/jflex: ant-task optional

- help to break circular dependency on dev-java/ant[junit]

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/32820
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.1-r3.ebuild | 27 ++++++++++++++++++---------
 dev-java/jflex/metadata.xml          | 11 +++++++----
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/dev-java/jflex/jflex-1.6.1-r3.ebuild b/dev-java/jflex/jflex-1.6.1-r3.ebuild
index 4ce051add85d..ae329e176675 100644
--- a/dev-java/jflex/jflex-1.6.1-r3.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r3.ebuild
@@ -15,18 +15,21 @@ S="${WORKDIR}/${P}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
-IUSE="examples test vim-syntax"
+IUSE="ant-task examples test vim-syntax"
 RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( ant-task )"
 
-CDEPEND=">=dev-java/ant-1.10.14:0"
-
-RDEPEND=">=virtual/jre-1.8:*
+RDEPEND="
+	>=virtual/jre-1.8:*
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	${CDEPEND}"
+"
 
-DEPEND=">=virtual/jdk-1.8:*
+DEPEND="
+	>=virtual/jdk-1.8:*
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )
 	test? ( dev-java/junit:4 )
-	${CDEPEND}"
+"
 
 PDEPEND=">=dev-java/javacup-11b_p20160615:0"
 
@@ -34,6 +37,7 @@ JAVA_SRC_DIR="src/main/java"
 
 src_prepare() {
 	eapply_user
+	java-pkg-2_src_prepare
 
 	# See below for details.
 	eapply "${FILESDIR}/icedtea-arm.patch"
@@ -59,7 +63,12 @@ src_configure() {
 		JAVACUP=$(echo lib/java-cup-*.jar)
 	fi
 
-	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjar --build-only ant ant.jar):${JAVACUP}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="${JAVACUP}"
+	if use ant-task; then
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant ant.jar)"
+	else
+		rm src/main/java/jflex/anttask/JFlexTask.java || die
+	fi
 }
 
 jflex_compile() {
@@ -91,7 +100,7 @@ src_install() {
 	java-pkg_dolauncher ${PN} --main ${PN}.Main
 
 	java-pkg_register-dependency javacup javacup-runtime.jar
-	java-pkg_register-ant-task
+	use ant-task && java-pkg_register-ant-task
 
 	use examples && java-pkg_doexamples examples
 	dodoc {changelog,README}.md

diff --git a/dev-java/jflex/metadata.xml b/dev-java/jflex/metadata.xml
index 6021501589e0..3c0e0377e098 100644
--- a/dev-java/jflex/metadata.xml
+++ b/dev-java/jflex/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<use>
+		<flag name="ant-task">Build and register the ant-task</flag>
+	</use>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Sam James]

commit:     05a3a3d38e550e041e770521db3d857e0baaa4e2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 04:46:09 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 04:46:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05a3a3d3

dev-java/jflex: Stabilize 1.6.1-r3 arm64, #933673

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jflex/jflex-1.6.1-r3.ebuild b/dev-java/jflex/jflex-1.6.1-r3.ebuild
index ae329e176675..21c43c501763 100644
--- a/dev-java/jflex/jflex-1.6.1-r3.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
 IUSE="ant-task examples test vim-syntax"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( ant-task )"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Sam James]

commit:     3510f9ddb9a4d4c407c062b95079a1ad3c96cebd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 04:46:13 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 04:46:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3510f9dd

dev-java/jflex: Stabilize 1.6.1-r3 amd64, #933673

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jflex/jflex-1.6.1-r3.ebuild b/dev-java/jflex/jflex-1.6.1-r3.ebuild
index 71d60ef104d5..c0083bb42fce 100644
--- a/dev-java/jflex/jflex-1.6.1-r3.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
 IUSE="ant-task examples test vim-syntax"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( ant-task )"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Sam James]

commit:     55dee13c678a53787528104c17bf8bd7e9e674b7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 04:46:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 04:46:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55dee13c

dev-java/jflex: Stabilize 1.6.1-r3 ppc64, #933673

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jflex/jflex-1.6.1-r3.ebuild b/dev-java/jflex/jflex-1.6.1-r3.ebuild
index 21c43c501763..71d60ef104d5 100644
--- a/dev-java/jflex/jflex-1.6.1-r3.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
 IUSE="ant-task examples test vim-syntax"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( ant-task )"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Arthur Zamarin]

commit:     753447a3696254959f2283c8b64966fb42e67d88
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Aug 25 07:45:28 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 11:05:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=753447a3

dev-java/jflex: unkeyword 1.6.1-r3 for ~x86

Closes: https://bugs.gentoo.org/778416
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jflex/jflex-1.6.1-r3.ebuild b/dev-java/jflex/jflex-1.6.1-r3.ebuild
index c0083bb42fce..79f141edeb94 100644
--- a/dev-java/jflex/jflex-1.6.1-r3.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~ppc-macos ~x64-macos"
 IUSE="ant-task examples test vim-syntax"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( ant-task )"

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Arthur Zamarin]

commit:     46de7a158718383cdd349222799b82a979e58f85
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Sep 28 12:58:22 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 14:03:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46de7a15

dev-java/jflex: drop 1.6.1-r2

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/jflex/jflex-1.6.1-r2.ebuild | 126 -----------------------------------
 1 file changed, 126 deletions(-)

diff --git a/dev-java/jflex/jflex-1.6.1-r2.ebuild b/dev-java/jflex/jflex-1.6.1-r2.ebuild
deleted file mode 100644
index 17d1b99fd468..000000000000
--- a/dev-java/jflex/jflex-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JFlex is a lexical analyzer generator for Java"
-HOMEPAGE="https://www.jflex.de/"
-SRC_URI="https://${PN}.de/${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-IUSE="examples test vim-syntax"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-java/ant-1.10.14:0"
-
-RDEPEND=">=virtual/jre-1.8:*
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.8:*
-	test? ( dev-java/junit:4 )
-	${CDEPEND}"
-
-PDEPEND="dev-java/javacup:0"
-
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
-	eapply_user
-
-	# See below for details.
-	eapply "${FILESDIR}/icedtea-arm.patch"
-
-	# We need the bundled jflex.jar.
-	rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die
-
-	# Remove the bundled java-cup.jar if unneeded.
-	if has_version ${PDEPEND}; then
-		rm -v lib/java-cup-*.jar || die
-	fi
-}
-
-src_configure() {
-	# javacup is a cyclic dependency. Use the package if we have it,
-	# otherwise use the bundled version and install the package later.
-	if has_version ${PDEPEND}; then
-		# Use PORTAGE_QUIET to suppress a QA warning that is spurious
-		# thanks to has_version above. This is Portage-specific but
-		# showing the warning elsewhere isn't the end of the world.
-		JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar)
-	else
-		JAVACUP=$(echo lib/java-cup-*.jar)
-	fi
-
-	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjar --build-only ant ant.jar):${JAVACUP}"
-}
-
-jflex_compile() {
-	java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} \
-		--skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_compile() {
-	java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} \
-		-parser LexParse -interface src/main/cup/LexParse.cup || die
-
-	# The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running
-	# jflex. We have patched jflex to fix it but we have to run the
-	# bundled version first. -Xint works around the problem. See
-	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678.
-	use arm && local JFLEX_ARGS="-Xint"
-
-	# First compile using the bundled jflex.
-	jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
-
-	# Then recompile using the fresh jflex.
-	jflex_compile -cp "${PN}.jar:${JAVACUP}"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main ${PN}.Main
-
-	java-pkg_register-dependency javacup javacup-runtime.jar
-	java-pkg_register-ant-task
-
-	use examples && java-pkg_doexamples examples
-	dodoc {changelog,README}.md
-
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto html
-		dodoc doc/*.{css,html,png} doc/COPYRIGHT
-	fi
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins lib/${PN}.vim
-	fi
-}
-
-src_test() {
-	if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then
-		# This results in a StackOverflowError as of 1.8.0.65 but works
-		# fine on icedtea:7. Don't know about icedtea:8 yet.
-		rm -v src/test/java/jflex/EmitterTest.java || die
-	fi
-
-	local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)"
-
-	local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find src/test/java -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Sam James]

commit:     ed3f79f845a092e3722737c1ffa748406f92a848
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Mar 13 09:30:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct  3 16:24:36 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed3f79f8

dev-java/jflex: add 1.9.1

- now DEPEND instead of PDEPEND on dev-java/javacup
  because upstream stops providing a bundled javacup

- builds with auto-value annotation processor
- keeps 'manual' selection of tests

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Part-of: https://github.com/gentoo/gentoo/pull/44017
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jflex/Manifest           |   1 +
 dev-java/jflex/jflex-1.9.1.ebuild | 144 ++++++++++++++++++++++++++++++++++++++
 dev-java/jflex/metadata.xml       |   6 ++
 3 files changed, 151 insertions(+)

diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index dc9f2fde4025..ff6b6d0feb28 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1 +1,2 @@
 DIST jflex-1.6.1.tar.gz 3027791 BLAKE2B 4262f75c16a847314db8cb175901658ff6b424469e66523b41564179fa30f0e64bcf2d7ad0e06ad918336e5a41e166a74d55f19f7451662d19fbcaa29f716dce SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b
+DIST jflex-1.9.1.tar.gz 4944916 BLAKE2B 7976e17c0a75f84fc09a431ae100ea5061694edeffb5a8bc14b8afbb93a07296b7826b4540634ea0cb4db761a600603925a4489e49ea9b8a1d948d4cad9919be SHA512 2f7dc057741fb76309cd83042301cfcd73ff1e9e2e5330cdd88d96b8aa45d66cbb73a2a3e1020613d717ccd8aece21afe98b92c6d718d73337baa28c142a031f

diff --git a/dev-java/jflex/jflex-1.9.1.ebuild b/dev-java/jflex/jflex-1.9.1.ebuild
new file mode 100644
index 000000000000..31acca3718ce
--- /dev/null
+++ b/dev-java/jflex/jflex-1.9.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+HOMEPAGE="https://www.jflex.de/"
+SRC_URI="https://github.com/jflex-de/jflex/releases/download/v${PV}/${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc-macos ~x64-macos"
+IUSE="ant-task examples test vim-syntax"
+REQUIRED_USE="test? ( ant-task )"
+
+# <dev-java/ognl-3.1.25:0 because of test failures with 3.1.25 or higher
+DEPEND="
+	>=virtual/jdk-1.8:*
+	dev-java/auto-value:0
+	dev-java/escapevelocity:0
+	dev-java/incap:0
+	>=dev-java/javacup-11b_p20160615-r2:0
+	dev-java/javapoet:0
+	dev-java/jsr305:0
+	ant-task? ( >=dev-java/ant-1.10.15:0 )
+	test? (
+		dev-java/antlr-runtime:3.5
+		dev-java/generics-resolver:0
+		>=dev-java/guava-33.4.8:0
+		dev-java/javaruntype:0
+		dev-java/junit-quickcheck:0
+		<dev-java/ognl-3.1.25:0
+		dev-java/slf4j-simple:0
+		dev-java/truth:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	ant-task? ( >=dev-java/ant-1.10.15:0 )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+DOCS=( {changelog,README}.md )
+JAVA_CLASSPATH_EXTRA="auto-value,javacup,jsr305"
+JAVA_MAIN_CLASS="jflex.Main"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+	ant
+	antlr-runtime-3.5
+	generics-resolver
+	guava
+	javaruntype
+	junit-4
+	junit-quickcheck
+	ognl
+	slf4j-simple
+	truth
+"
+
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# Keep pre-compiled jar for generating LexScan.java
+	# It includes java_cup/runtime
+	java-pkg_clean ! -path "./lib/jflex-full-${PV}.jar"
+
+	# No need for that stuff
+	rm -r src/generated || die "rm generated"
+
+	# Providing ant-task would require dev-java/ant in dependencies.
+	if use ant-task; then
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant ant.jar)"
+	else
+		rm src/main/java/jflex/anttask/JFlexTask.java || die
+	fi
+}
+
+jflex_compile() {
+	$(java-config -J) "${@}" jflex.Main \
+		-d src/main/java \
+		--skel src/main/jflex/skeleton.nested \
+		src/main/jflex/LexScan.flex || die
+	java-pkg-simple_src_compile
+}
+
+src_compile() {
+	# get processorpath
+	local pp="$(java-pkg_getjar --build-only auto-value auto-value.jar)"
+	pp="${pp}:$(java-pkg_getjar --build-only auto-value auto-common.jar)"
+	pp="${pp}:$(java-pkg_getjars --build-only escapevelocity,guava,incap,javapoet)"
+
+	JAVAC_ARGS="-processorpath ${pp} -s src/main/java"
+
+	JAVACUP=$(java-pkg_getjar --build-only javacup javacup.jar)
+	java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR} -package ${PN} \
+		-parser LexParse -interface src/main/cup/LexParse.cup || die
+
+	einfo "Generate LexScan.java using pre-compiled jar"
+	jflex_compile -cp "lib/jflex-full-${PV}.jar"
+
+	einfo "Remove and re-generate LexScan.java using the freshly built jar"
+	rm -v src/main/java/LexScan.java || die "rm LexScan.java"
+	rm -r target || die
+	jflex_compile -cp "${JAVACUP}:jflex.jar"
+}
+
+src_test() {
+	local TESTS=$(find src/test/java \( -name "*Test.java" -o -name "*Quickcheck.java" \) -printf "%P\n")
+	TESTS="${TESTS//.java}"
+	JAVA_TEST_RUN_ONLY="${TESTS//\//.}"
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	use ant-task && java-pkg_register-ant-task
+
+	use examples && java-pkg_doexamples examples
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto html
+		dodoc doc/*.{css,html,png} doc/COPYRIGHT
+	fi
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins lib/${PN}.vim
+	fi
+}

diff --git a/dev-java/jflex/metadata.xml b/dev-java/jflex/metadata.xml
index 3c0e0377e098..038f42e996dc 100644
--- a/dev-java/jflex/metadata.xml
+++ b/dev-java/jflex/metadata.xml
@@ -8,4 +8,10 @@
 	<use>
 		<flag name="ant-task">Build and register the ant-task</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">jflex-de/jflex</remote-id>
+		<changelog>https://jflex.de/changelog.html</changelog>
+		<bugs-to>https://github.com/jflex-de/jflex/issues/</bugs-to>
+		<doc>https://jflex.de/docu.html</doc>
+	</upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Arthur Zamarin]

commit:     cf98b245423dc6134767b9174d39e61407690446
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  3 17:46:16 2025 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Oct  3 17:46:16 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf98b245

dev-java/jflex: Keyword 1.9.1 arm64, #963731

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/jflex/jflex-1.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jflex/jflex-1.9.1.ebuild b/dev-java/jflex/jflex-1.9.1.ebuild
index 31acca3718ce..4824e42d5c81 100644
--- a/dev-java/jflex/jflex-1.9.1.ebuild
+++ b/dev-java/jflex/jflex-1.9.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc-macos ~x64-macos"
 IUSE="ant-task examples test vim-syntax"
 REQUIRED_USE="test? ( ant-task )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Sam James]

commit:     60f464210084f53762bfd7859bda358c6577d551
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Oct  4 20:46:42 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct  4 21:30:01 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60f46421

dev-java/jflex: min java 11

Closes: https://bugs.gentoo.org/963787
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Part-of: https://github.com/gentoo/gentoo/pull/44041
Closes: https://github.com/gentoo/gentoo/pull/44041
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jflex/{jflex-1.9.1.ebuild => jflex-1.9.1-r1.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-java/jflex/jflex-1.9.1.ebuild b/dev-java/jflex/jflex-1.9.1-r1.ebuild
similarity index 98%
rename from dev-java/jflex/jflex-1.9.1.ebuild
rename to dev-java/jflex/jflex-1.9.1-r1.ebuild
index 4824e42d5c81..b05e7bc9874d 100644
--- a/dev-java/jflex/jflex-1.9.1.ebuild
+++ b/dev-java/jflex/jflex-1.9.1-r1.ebuild
@@ -19,9 +19,10 @@ KEYWORDS="~amd64 ~arm64 ~ppc-macos ~x64-macos"
 IUSE="ant-task examples test vim-syntax"
 REQUIRED_USE="test? ( ant-task )"
 
+# jdk-11:* for bug #963787
 # <dev-java/ognl-3.1.25:0 because of test failures with 3.1.25 or higher
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	dev-java/auto-value:0
 	dev-java/escapevelocity:0
 	dev-java/incap:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Sam James]

commit:     4ad70a305b2879e2575f4d223cd26a7aded9250c
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Oct  5 09:49:19 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct  6 00:20:04 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad70a30

dev-java/jflex: do not forget to trigger ejavadoc

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Part-of: https://github.com/gentoo/gentoo/pull/44043
Closes: https://github.com/gentoo/gentoo/pull/44043
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jflex/jflex-1.9.1-r1.ebuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-java/jflex/jflex-1.9.1-r1.ebuild b/dev-java/jflex/jflex-1.9.1-r1.ebuild
index 6fb3f180db94..659f62783a79 100644
--- a/dev-java/jflex/jflex-1.9.1-r1.ebuild
+++ b/dev-java/jflex/jflex-1.9.1-r1.ebuild
@@ -93,7 +93,7 @@ jflex_compile() {
 		-d src/main/java \
 		--skel src/main/jflex/skeleton.nested \
 		src/main/jflex/LexScan.flex || die
-	java-pkg-simple_src_compile
+	use doc && java-pkg-simple_src_compile
 }
 
 src_compile() {
@@ -126,18 +126,18 @@ src_test() {
 }
 
 src_install() {
-	java-pkg-simple_src_install
-
-	use ant-task && java-pkg_register-ant-task
-
-	use examples && java-pkg_doexamples examples
-
 	if use doc; then
 		dodoc doc/*.pdf
 		docinto html
 		dodoc doc/*.{css,html} doc/COPYRIGHT
 	fi
 
+	java-pkg-simple_src_install
+
+	use ant-task && java-pkg_register-ant-task
+
+	use examples && java-pkg_doexamples examples
+
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
 		doins lib/${PN}.vim

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Sam James]

commit:     91dc2bba0c821a4e1b5e889d55e10b8f2c21543e
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Oct  5 09:47:45 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct  6 00:20:03 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91dc2bba

dev-java/jflex: do not attempt to install 'doc/*.png'

Closes: https://bugs.gentoo.org/963795
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Part-of: https://github.com/gentoo/gentoo/pull/44043
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jflex/jflex-1.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jflex/jflex-1.9.1-r1.ebuild b/dev-java/jflex/jflex-1.9.1-r1.ebuild
index b05e7bc9874d..6fb3f180db94 100644
--- a/dev-java/jflex/jflex-1.9.1-r1.ebuild
+++ b/dev-java/jflex/jflex-1.9.1-r1.ebuild
@@ -135,7 +135,7 @@ src_install() {
 	if use doc; then
 		dodoc doc/*.pdf
 		docinto html
-		dodoc doc/*.{css,html,png} doc/COPYRIGHT
+		dodoc doc/*.{css,html} doc/COPYRIGHT
 	fi
 
 	if use vim-syntax; then

[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/

[Sam James]

commit:     d7312c2b13bf47f17b9e10fccf17aae015123d79
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Oct  6 15:59:33 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct  6 16:47:05 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7312c2b

dev-java/jflex: Revert "dev-java/jflex: do not forget to trigger ejavadoc"

This reverts commit 4ad70a305b2879e2575f4d223cd26a7aded9250c.

Closes: https://bugs.gentoo.org/963844
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Part-of: https://github.com/gentoo/gentoo/pull/44067
Closes: https://github.com/gentoo/gentoo/pull/44067
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/jflex/jflex-1.9.1-r1.ebuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-java/jflex/jflex-1.9.1-r1.ebuild b/dev-java/jflex/jflex-1.9.1-r1.ebuild
index 659f62783a79..6fb3f180db94 100644
--- a/dev-java/jflex/jflex-1.9.1-r1.ebuild
+++ b/dev-java/jflex/jflex-1.9.1-r1.ebuild
@@ -93,7 +93,7 @@ jflex_compile() {
 		-d src/main/java \
 		--skel src/main/jflex/skeleton.nested \
 		src/main/jflex/LexScan.flex || die
-	use doc && java-pkg-simple_src_compile
+	java-pkg-simple_src_compile
 }
 
 src_compile() {
@@ -126,18 +126,18 @@ src_test() {
 }
 
 src_install() {
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto html
-		dodoc doc/*.{css,html} doc/COPYRIGHT
-	fi
-
 	java-pkg-simple_src_install
 
 	use ant-task && java-pkg_register-ant-task
 
 	use examples && java-pkg_doexamples examples
 
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto html
+		dodoc doc/*.{css,html} doc/COPYRIGHT
+	fi
+
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
 		doins lib/${PN}.vim