[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/
commit: b883c87352b112a7148cdd881948aa1f96e05120
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu Mar 14 11:46:09 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Wed Apr 17 09:12:57 2024 +
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 pogatzki.net>
Closes:
https://github.com/gentoo/gentoo/pull/35723/commits/4fbe65f45313f308d0f5a2630c2d4aad6e227dfc
Signed-off-by: Miroslav Šulc 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/
commit: d48317ec0a5b55fa96c6cfcf1db9ede8690a2a1e
Author: Miroslav Šulc gentoo org>
AuthorDate: Thu Nov 11 11:01:50 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Nov 11 11:01:50 2021 +
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 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..000
--- 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/
commit: e29ba64e1e628999e236036fad2857665fecbb67
Author: Jakov Smolić gentoo org>
AuthorDate: Thu Nov 11 10:56:52 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Thu Nov 11 10:56:52 2021 +
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ć 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/
commit: 0066ed88a2a99c2f92ac9f4ac4f94a130a9ea376
Author: Sam James gentoo org>
AuthorDate: Sun May 16 19:36:29 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun May 16 19:36:29 2021 +
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 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/
commit: 25823c6707322204bce2e413010e2429642ffb3b
Author: Sam James gentoo org>
AuthorDate: Tue Mar 16 20:24:08 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 16 20:24:08 2021 +
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 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/
commit: 0c3d0633e401244cabe56e285da172418accec0d
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Mar 16 16:03:29 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 16 20:19:39 2021 +
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 pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/19955
Signed-off-by: Sam James 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/
commit: 4646341ff87a562a08278240a3cb17df655e12d3
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon Mar 15 21:33:41 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Mar 16 10:18:25 2021 +
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 pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/19943
Signed-off-by: Miroslav Šulc 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 000..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
[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/
commit: a4ea14c38e46cc0998f46073638a705da65e4d24
Author: Alexey Sokolov google com>
AuthorDate: Fri May 8 14:20:30 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Sun May 17 16:55:07 2020 +
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 google.com>
Signed-off-by: Aaron Bauman 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/
commit: 315b7fdfd152743c67817ded6ba3d58c946bc664
Author: Aaron Bauman gentoo org>
AuthorDate: Sat May 18 01:07:52 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Sat May 18 01:07:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315b7fdf
dev-java/jflex: arm64 stable
Signed-off-by: Aaron Bauman 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/
commit: 83d1b5d8e71f6e334119ae3f7c882029ef0eb448
Author: Alexis Ballier gentoo org>
AuthorDate: Thu Jul 13 06:58:51 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Thu Jul 13 07:47:48 2017 +
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/
commit: c0361246500081701601f4f3f93b0f95c459cb2e
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Apr 24 20:16:17 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Apr 24 20:17:35 2016 +
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..000
--- 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,"\(\)",\
-"\n \n\n \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/
commit: 078a10e2489d65c354d076fed2901a61362d9d48
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Apr 24 20:13:09 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Apr 24 20:17:28 2016 +
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/
commit: f09c5eaa1aaa96f083318b2bc3854ba737e7d84c
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Nov 22 21:27:04 2015 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Nov 22 21:36:48 2015 +
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/files/, dev-java/jflex/
commit: 35c081c398a95b522be2ae83ce52616fa6517aed
Author: James Le Cuirot gentoo org>
AuthorDate: Mon Nov 2 23:24:17 2015 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Nov 2 23:40:57 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c081c3
dev-java/jflex: Rewrite for version bump to 1.6.1
Rewritten using java-pkg-simple to give us more control over this
tricky package. javacup has become a PDEPEND, meaning that the bundled
version is automatically used on the first build instead of it having
a system-jflex USE flag.
~arm keyword added with workarounds for different problems encountered
with both IcedTea and Oracle.
~ppc64 keyword temporarily dropped until it gets Java 7, which the
newer javacup requires.
Please stabilise this at the same time as dev-java/qdox-1.12.1-r1.
Package-Manager: portage-2.2.20.1
dev-java/jflex/Manifest| 1 +
dev-java/jflex/files/icedtea-arm.patch | 18 +
dev-java/jflex/jflex-1.6.1.ebuild | 121 +
3 files changed, 140 insertions(+)
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 5a41a58..b4c0417 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1 +1,2 @@
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/files/icedtea-arm.patch
b/dev-java/jflex/files/icedtea-arm.patch
new file mode 100644
index 000..acefd9b
--- /dev/null
+++ b/dev-java/jflex/files/icedtea-arm.patch
@@ -0,0 +1,18 @@
+http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678
+
+diff -Naur jflex-1.6.1.orig/src/main/java/jflex/Emitter.java
jflex-1.6.1/src/main/java/jflex/Emitter.java
+--- jflex-1.6.1.orig/src/main/java/jflex/Emitter.java 2015-03-16
17:27:31.0 +
jflex-1.6.1/src/main/java/jflex/Emitter.java 2015-10-25
23:33:35.784487747 +
+@@ -1304,8 +1304,10 @@
+
+ for (int i = 0; i < dfa.numStates; i++) {
+ char j = 0;
+- while ( !isTransition[i] && j < dfa.numInput )
+-isTransition[i] = dfa.table[i][j++] != DFA.NO_TARGET;
++ while ( !isTransition[i] && j < dfa.numInput ) {
++isTransition[i] = dfa.table[i][j] != DFA.NO_TARGET;
++j++;
++ }
+ }
+ }
+
diff --git a/dev-java/jflex/jflex-1.6.1.ebuild
b/dev-java/jflex/jflex-1.6.1.ebuild
new file mode 100644
index 000..50f314d
--- /dev/null
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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;
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="examples test vim-syntax"
+
+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
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/, dev-java/jflex/files/
commit: 76235a1d7120c4570fa270a85173fb6ddaa8b38e Author: Patrice Clement gentoo org> AuthorDate: Thu Oct 1 08:30:39 2015 + Commit: Patrice Clement gentoo org> CommitDate: Thu Oct 1 08:30:39 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76235a1d dev-java/jflex: Clean up old. Package-Manager: portage-2.2.18 Signed-off-by: Patrice Clement gentoo.org> dev-java/jflex/Manifest | 3 - dev-java/jflex/files/jflex-1.4.1-build.xml.patch | 30 - dev-java/jflex/files/jflex-1.5.0-build.xml | 149 --- dev-java/jflex/jflex-1.4.3-r1.ebuild | 72 --- dev-java/jflex/jflex-1.4.3-r2.ebuild | 72 --- dev-java/jflex/jflex-1.4.3-r3.ebuild | 82 - dev-java/jflex/jflex-1.5.0.ebuild| 78 dev-java/jflex/jflex-1.5.1.ebuild| 88 - dev-java/jflex/jflex-1.6.0-r1.ebuild | 90 -- dev-java/jflex/jflex-1.6.0.ebuild| 90 -- 10 files changed, 754 deletions(-) diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest index 439770a..5a41a58 100644 --- a/dev-java/jflex/Manifest +++ b/dev-java/jflex/Manifest @@ -1,4 +1 @@ -DIST jflex-1.4.3.tar.gz 1214420 SHA256 6ccdcf15fe9f1d863d538e8b1cfd428b8628a645d247adc40071d1ae70ede2f2 SHA512 901106ea5a9108ba6016da55093801fbaee50f8f8fb45f290cae3bb989663838e83a4d8484bc633b9acf2c085c83304a47d9348255d106117dace3d5f44ea835 WHIRLPOOL 709c130037be6491ea1a9d6301dcc4acc643c9d1127d11a0dccb9d7339fda7fe06ba159100c3f4ad34d7b34c6b5336f2328f6bdf7ee8cdf87e752e371120ff8d -DIST jflex-1.5.0.tar.gz 2827866 SHA256 76b11d00fe94f79331a74045c7aaea292a80cb311a6840d0dd53209e81d4cb64 SHA512 5d46d3339a8e435228e8dab55ac52bbb40b4b39ea9c28963c5d02298f0ed8a7e8a66573003f165badb4c3939d6bd88852343d886d3b6c2bd78d17320201c3137 WHIRLPOOL 22d44cc90bf09666f0139c83cde2f9330ed12e2dd3313573d948527d2a0d420b71512a764c5579a94d4d30f4a573180bec2c08c37c3e3c81f079a018bee1a3b1 -DIST jflex-1.5.1.tar.gz 2764584 SHA256 3b24ed6ace401e70d71f82a65179a4eb958756f43ed4c647ce75f340f644becd SHA512 e0bb95fd70add73b662c34ff5821f9822bf1e982bd669bc4497bf210555ccd455b1d216391864e9983a4f90d430e0f8b57667c0f0623a8dfb0ff1ef97b2f5572 WHIRLPOOL 123668156410891a9a4c755cd7fbb4464c88b57c00d01ed4d4679c6b5b66e3d355b7006356937c54cc7a14a4b9bd7619912bd0186fc5b8a19294406fa432008b DIST jflex-1.6.0.tar.gz 3035885 SHA256 0774da0ee2d01fc9274179de4243e0d229c01b5cf0fbb78952fb7fdc4672190c SHA512 16ce4a89f75ce5f3da02433ff66d39ed4db567b4cf7469997dd2617b82e52d589bb17ec3a2f36b4d00a62233e48820bc2e043dcc9ae3c01f1eeca323c0166eba WHIRLPOOL 4d9e7e8c3a0da66d860b895699d5b50e29f781f1cf18cab436f545b1fb007297ca9433694ce3808452c5d9340eddc978c2b32019b5a8d5d8c6cb0558543ea18e diff --git a/dev-java/jflex/files/jflex-1.4.1-build.xml.patch b/dev-java/jflex/files/jflex-1.4.1-build.xml.patch deleted file mode 100644 index 8353cbe..000 --- a/dev-java/jflex/files/jflex-1.4.1-build.xml.patch +++ /dev/null @@ -1,30 +0,0 @@ build.xml 2009-01-31 16:14:57.0 +0200 -+++ build.xml.fixed2009-01-31 16:17:14.0 +0200 -@@ -35,7 +35,7 @@ - - - -- -+ - - - -@@ -69,7 +69,7 @@ - - - -- -+ - - - -@@ -79,7 +79,8 @@ - - - - diff --git a/dev-java/jflex/files/jflex-1.5.0-build.xml b/dev-java/jflex/files/jflex-1.5.0-build.xml deleted file mode 100644 index 9ac1be4..000 --- a/dev-java/jflex/files/jflex-1.5.0-build.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - http://central.maven.org/maven2; /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev-java/jflex/jflex-1.4.3-r1.ebuild b/dev-java/jflex/jflex-1.4.3-r1.ebuild deleted file mode 100644 index ef42be6..000 --- a/dev-java/jflex/jflex-1.4.3-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# 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
[gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/
commit: 82ce443a3e0b33747fbc423a34c1ca0300d27692
Author: Patrice Clement gentoo org>
AuthorDate: Thu Oct 1 08:29:12 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Oct 1 08:29:12 2015 +
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 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/
commit: 8b0076a725a96beb11f8f26043319084cb0a680c
Author: Patrice Clement gentoo org>
AuthorDate: Thu Oct 1 08:31:32 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Oct 1 08:31:32 2015 +
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 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/
commit: 972b7dc20eee540c55339267081591e60bc2a7eb
Author: Patrice Clement monsieurp AT gentoo DOT org
AuthorDate: Thu Aug 13 15:16:39 2015 +
Commit: Patrice Clement monsieurp AT gentoo DOT org
CommitDate: Thu Aug 13 15:47:04 2015 +
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 000..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\\njavadoc \
+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/
commit: 2eb3d7bd8bb99b79bd32779605daed5b9ef469a3
Author: Patrice Clement monsieurp AT gentoo DOT org
AuthorDate: Thu Aug 13 19:04:01 2015 +
Commit: Patrice Clement monsieurp AT gentoo DOT org
CommitDate: Thu Aug 13 19:05:06 2015 +
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 000..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\\njavadoc \
+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/
commit: da91f19eda929dc5a67df10029474368e8b50535
Author: Patrice Clement monsieurp AT gentoo DOT org
AuthorDate: Tue Aug 11 09:59:04 2015 +
Commit: Patrice Clement monsieurp AT gentoo DOT org
CommitDate: Tue Aug 11 09:59:04 2015 +
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 000..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
+}
