* [gentoo-commits] repo/gentoo:master commit in: dev-java/javacc/files/, dev-java/javacc/
@ 2024-07-23 18:21 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2024-07-23 18:21 UTC (permalink / raw
To: gentoo-commits
commit: 192e24ec75e39c4ca17efabea7588665d084bcce
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Jun 10 14:35:04 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 18:18:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=192e24ec
dev-java/javacc: slot 0 build without rewrite-xml, drop java-ant-2
Bug: https://bugs.gentoo.org/936530
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/javacc/files/javacc-4.1-javadoc.patch | 16 +++
dev-java/javacc/files/javacc-4.1-source8.patch | 134 +++++++++++++++++++++++++
dev-java/javacc/javacc-4.1-r1.ebuild | 72 +++++++++++++
3 files changed, 222 insertions(+)
diff --git a/dev-java/javacc/files/javacc-4.1-javadoc.patch b/dev-java/javacc/files/javacc-4.1-javadoc.patch
new file mode 100644
index 000000000000..134aaa35abc9
--- /dev/null
+++ b/dev-java/javacc/files/javacc-4.1-javadoc.patch
@@ -0,0 +1,16 @@
+--- a/build.xml
++++ b/build.xml
+@@ -150,5 +150,13 @@
+ <arg line="${version}" />
+ </exec>
+ </target>
++ <target name="javadoc" depends="compile">
++ <javadoc destdir="doc/api" source="8">
++ <packageset dir="src"/>
++ <classpath>
++ <pathelement path="lib/junit3.8.1/junit.jar" />
++ </classpath>
++ </javadoc>
++ </target>
+
+ </project>
diff --git a/dev-java/javacc/files/javacc-4.1-source8.patch b/dev-java/javacc/files/javacc-4.1-source8.patch
new file mode 100644
index 000000000000..6dfc3e47382d
--- /dev/null
+++ b/dev-java/javacc/files/javacc-4.1-source8.patch
@@ -0,0 +1,134 @@
+--- a/build.xml
++++ b/build.xml
+@@ -112,6 +112,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <junit printsummary="yes" haltonfailure="yes">
+ <classpath>
+ <pathelement path="classes" />
++ <pathelement path="lib/junit3.8.1/junit.jar" />
+ </classpath>
+ <batchtest fork="no" todir=".">
+ <fileset dir="classes">
+--- a/src/org/javacc/jjdoc/build.xml
++++ b/src/org/javacc/jjdoc/build.xml
+@@ -46,7 +46,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <javac srcdir="${javacc.root}/src"
+ destdir="${javacc.root}/classes"
+ debug="${build.compiler.debug}"
+- source="1.4"
++ source="8"
++ target="8"
+ classpath="${javacc.root}/classes">
+ </javac>
+ </target>
+--- a/src/org/javacc/jjtree/build.xml
++++ b/src/org/javacc/jjtree/build.xml
+@@ -54,7 +54,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <javac srcdir="${javacc.root}/src"
+ destdir="${javacc.root}/classes"
+ debug="${build.compiler.debug}"
+- source="1.4"
++ source="8"
++ target="8"
+ classpath="${javacc.root}/classes">
+ </javac>
+ </target>
+--- a/src/org/javacc/parser/build.xml
++++ b/src/org/javacc/parser/build.xml
+@@ -52,7 +52,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <javac srcdir="${javacc.root}/src"
+ destdir="${javacc.root}/classes"
+ debug="${build.compiler.debug}"
+- source="1.4"
++ source="8"
++ target="8"
+ classpath="${javacc.root}/classes:${junit.jar}">
+ </javac>
+ </target>
+--- a/test/imports/build.xml
++++ b/test/imports/build.xml
+@@ -41,7 +41,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
+--- a/test/javaFiles/build.xml
++++ b/test/javaFiles/build.xml
+@@ -52,7 +52,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir/static"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
+@@ -74,7 +75,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir/non-static"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
+@@ -99,7 +101,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir/non-static"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
+@@ -126,7 +129,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir/non-static"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
+@@ -152,7 +156,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir/non-static"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
+--- a/test/javacodeLA/build.xml
++++ b/test/javacodeLA/build.xml
+@@ -40,7 +40,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
+--- a/test/lom/build.xml
++++ b/test/lom/build.xml
+@@ -40,7 +40,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
diff --git a/dev-java/javacc/javacc-4.1-r1.ebuild b/dev-java/javacc/javacc-4.1-r1.ebuild
new file mode 100644
index 000000000000..2e24904099d6
--- /dev/null
+++ b/dev-java/javacc/javacc-4.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source test"
+MAVEN_ID="net.java.dev.javacc:javacc:${PV}"
+
+inherit java-pkg-2
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.github.io/javacc/"
+SRC_URI="https://github.com/javacc/javacc/archive/release_${PV//./}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/javacc-release_${PV//./}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND=">=dev-java/ant-1.10.14:0"
+
+DEPEND="
+ dev-java/junit:0
+ >=virtual/jdk-1.8:*
+ test? ( >=dev-java/ant-1.10.14:0[junit] )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.1-javadoc.patch"
+ "${FILESDIR}/javacc-4.1-source8.patch"
+)
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ java-pkg_clean ! -path "./bootstrap/*"
+ java-pkg_jar-from --into lib/junit3.8.1 junit
+}
+
+src_compile() {
+ eant
+ use doc && eant javadoc
+}
+
+src_test() {
+ eant test
+}
+
+src_install() {
+ java-pkg_dojar bin/lib/"${PN}".jar
+
+ if use doc; then
+ java-pkg_dohtml -r www/*
+ java-pkg_dojavadoc doc/api
+ fi
+
+ use examples && java-pkg_doexamples examples
+ use source && java-pkg_dosrc src/*
+
+ echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die
+ doenvd "${T}"/22javacc-${SLOT}
+
+ echo "export VERSION=${PV}" > "${T}"/pre || die
+
+ local launcher
+ for launcher in javacc jjdoc jjtree; do
+ java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
+ done
+
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javacc/files/, dev-java/javacc/
@ 2024-07-23 18:21 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2024-07-23 18:21 UTC (permalink / raw
To: gentoo-commits
commit: bf13cec19b5b29704b91174e832d6f7b0acc94f6
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Jun 11 08:34:23 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 18:18:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf13cec1
dev-java/javacc: slot 7.0.13 build without rewrite-xml, drop java-ant-2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/37685
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/javacc/files/javacc-7.0.13-javadoc.patch | 14 +++
dev-java/javacc/files/javacc-7.0.13-source8.patch | 100 ++++++++++++++++++++++
dev-java/javacc/javacc-7.0.13-r1.ebuild | 69 +++++++++++++++
3 files changed, 183 insertions(+)
diff --git a/dev-java/javacc/files/javacc-7.0.13-javadoc.patch b/dev-java/javacc/files/javacc-7.0.13-javadoc.patch
new file mode 100644
index 000000000000..2849ced4340f
--- /dev/null
+++ b/dev-java/javacc/files/javacc-7.0.13-javadoc.patch
@@ -0,0 +1,14 @@
+diff --git a/build.xml b/build.xml
+index bddc709..52f3626 100644
+--- a/build.xml
++++ b/build.xml
+@@ -202,9 +202,6 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <fileset dir="${java-src}" />
+ </javadoc>
+
+- <zip destfile="${install-name}-javadoc.jar" basedir="${target-folder}/javadoc">
+- </zip>
+-
+ </target>
+
+
diff --git a/dev-java/javacc/files/javacc-7.0.13-source8.patch b/dev-java/javacc/files/javacc-7.0.13-source8.patch
new file mode 100644
index 000000000000..544da8197eca
--- /dev/null
+++ b/dev-java/javacc/files/javacc-7.0.13-source8.patch
@@ -0,0 +1,100 @@
+--- a/test/exceptions/build.xml
++++ b/test/exceptions/build.xml
+@@ -40,7 +40,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
+@@ -83,7 +83,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.7" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" includeantruntime='false'
+ debug="true"
+ classpath="../../target/javacc.jar">
+ </javac>
+--- a/test/imports/build.xml
++++ b/test/imports/build.xml
+@@ -39,7 +39,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
+--- a/test/javaFiles/build.xml
++++ b/test/javaFiles/build.xml
+@@ -50,7 +50,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </condition>
+ </fail>
+
+- <javac srcdir="out-dir" destdir="out-dir/static" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java fork="true" classname="Parser" classpath="out-dir/static" inputstring="A" failonerror="true"> </java>
+@@ -69,7 +69,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </condition>
+ </fail>
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -91,7 +91,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </condition>
+ </fail>
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -115,7 +115,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </fail>
+
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -138,7 +138,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </fail>
+
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+--- a/test/javacodeLA/build.xml
++++ b/test/javacodeLA/build.xml
+@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="javacode.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
+--- a/test/lom/build.xml
++++ b/test/lom/build.xml
+@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
diff --git a/dev-java/javacc/javacc-7.0.13-r1.ebuild b/dev-java/javacc/javacc-7.0.13-r1.ebuild
new file mode 100644
index 000000000000..83edc96db3e2
--- /dev/null
+++ b/dev-java/javacc/javacc-7.0.13-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source test"
+MAVEN_ID="net.java.dev.javacc:javacc:${PV}"
+
+inherit java-pkg-2
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.github.io/javacc/"
+SRC_URI="https://github.com/javacc/javacc/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD-2"
+SLOT="7.0.13"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND=">=dev-java/ant-1.10.14:0[junit]"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=(
+ README.md
+ docs/faq.md
+ docs/release-notes.md
+)
+
+PATCHES=(
+ "${FILESDIR}/javacc-7.0.13-javadoc.patch"
+ "${FILESDIR}/javacc-7.0.13-source8.patch"
+)
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ java-pkg_clean ! -path "./bootstrap/*"
+}
+
+src_compile() {
+ eant -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+ use doc && eant javadoc -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+}
+
+src_test() {
+ eant test -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+}
+
+src_install() {
+ java-pkg_dojar "target/${PN}.jar"
+
+ use doc && java-pkg_dojavadoc target/javadoc
+
+ use examples && java-pkg_doexamples examples
+ use source && java-pkg_dosrc src/*
+
+ echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die
+ doenvd "${T}"/22javacc-${SLOT}
+
+ echo "export VERSION=${PV}" > "${T}"/pre || die
+
+ local launcher
+ for launcher in javacc jjdoc jjtree; do
+ java-pkg_dolauncher ${launcher}-${SLOT} -pre "${T}"/pre --main ${launcher}
+ done
+
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javacc/files/, dev-java/javacc/
@ 2024-07-23 18:21 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2024-07-23 18:21 UTC (permalink / raw
To: gentoo-commits
commit: 7ae73e5e1ee735153a8ccb043ead9b3ca2cc45e1
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Jun 11 08:31:07 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 18:18:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ae73e5e
dev-java/javacc: slot 7.0.4 build without rewrite-xml, drop java-ant-2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/javacc/files/javacc-7.0.4-javadoc.patch | 12 +++
dev-java/javacc/files/javacc-7.0.4-source8.patch | 100 +++++++++++++++++++++++
dev-java/javacc/javacc-7.0.4-r1.ebuild | 77 +++++++++++++++++
3 files changed, 189 insertions(+)
diff --git a/dev-java/javacc/files/javacc-7.0.4-javadoc.patch b/dev-java/javacc/files/javacc-7.0.4-javadoc.patch
new file mode 100644
index 000000000000..57699b5249d5
--- /dev/null
+++ b/dev-java/javacc/files/javacc-7.0.4-javadoc.patch
@@ -0,0 +1,12 @@
+--- a/build.xml
++++ b/build.xml
+@@ -201,9 +201,6 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <fileset dir="${generated-src}" />
+ <fileset dir="${java-src}" />
+ </javadoc>
+-
+- <zip destfile="${install-name}-javadoc.jar" basedir="${target-folder}/javadoc">
+- </zip>
+ </target>
+
+ <target name="unittest" depends="jar" description="run JUnit unit test cases" unless="true">
diff --git a/dev-java/javacc/files/javacc-7.0.4-source8.patch b/dev-java/javacc/files/javacc-7.0.4-source8.patch
new file mode 100644
index 000000000000..620b1c03f78b
--- /dev/null
+++ b/dev-java/javacc/files/javacc-7.0.4-source8.patch
@@ -0,0 +1,100 @@
+--- a/test/exceptions/build.xml
++++ b/test/exceptions/build.xml
+@@ -40,7 +40,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
+@@ -83,7 +83,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.5" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" includeantruntime='false'
+ debug="true"
+ classpath="../../target/javacc.jar">
+ </javac>
+--- a/test/imports/build.xml
++++ b/test/imports/build.xml
+@@ -39,7 +39,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
+--- a/test/javaFiles/build.xml
++++ b/test/javaFiles/build.xml
+@@ -50,7 +50,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </condition>
+ </fail>
+
+- <javac srcdir="out-dir" destdir="out-dir/static" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java classname="Parser" classpath="out-dir/static" inputstring="A" failonerror="true"> </java>
+@@ -69,7 +69,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </condition>
+ </fail>
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -91,7 +91,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </condition>
+ </fail>
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -115,7 +115,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </fail>
+
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -138,7 +138,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </fail>
+
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+--- a/test/javacodeLA/build.xml
++++ b/test/javacodeLA/build.xml
+@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="javacode.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
+--- a/test/lom/build.xml
++++ b/test/lom/build.xml
+@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
diff --git a/dev-java/javacc/javacc-7.0.4-r1.ebuild b/dev-java/javacc/javacc-7.0.4-r1.ebuild
new file mode 100644
index 000000000000..41b912eee734
--- /dev/null
+++ b/dev-java/javacc/javacc-7.0.4-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source test"
+MAVEN_ID="net.java.dev.javacc:javacc:${PV}"
+
+inherit java-pkg-2
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.github.io/javacc/"
+SRC_URI="https://github.com/javacc/javacc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="7.0.4"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND=">=dev-java/ant-1.10.14-r3:0"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? ( >=dev-java/ant-1.10.14:0[junit] )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=(
+ README
+ javacc-releases.notes
+ jjdoc-releases.notes
+ jjtree-releases.notes
+ release.notes
+)
+
+PATCHES=(
+ "${FILESDIR}/javacc-7.0.4-javadoc.patch"
+ "${FILESDIR}/javacc-7.0.4-source8.patch"
+)
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ java-pkg_clean ! -path "./bootstrap/*"
+}
+
+src_compile() {
+ eant -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+ use doc && eant javadoc -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+}
+
+src_test() {
+ eant test -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+}
+
+src_install() {
+ java-pkg_dojar "target/${PN}.jar"
+
+ if use doc; then
+ java-pkg_dohtml -r www/*
+ java-pkg_dojavadoc target/javadoc
+ fi
+
+ use examples && java-pkg_doexamples examples
+ use source && java-pkg_dosrc src/*
+
+ echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die
+ doenvd "${T}"/22javacc-${SLOT}
+
+ echo "export VERSION=${PV}" > "${T}"/pre || die
+
+ local launcher
+ for launcher in javacc jjdoc jjtree; do
+ java-pkg_dolauncher ${launcher}-${SLOT} -pre "${T}"/pre --main ${launcher}
+ done
+
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javacc/files/, dev-java/javacc/
@ 2024-08-23 9:01 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2024-08-23 9:01 UTC (permalink / raw
To: gentoo-commits
commit: 49dc18401cf13b5cc3434300122806a2cbe6cd84
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Aug 22 07:02:27 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 09:00:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49dc1840
dev-java/javacc: drop 4.1, 7.0.4, 7.0.13
Closes: https://bugs.gentoo.org/936530
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/38203/commits/974636989f93815327c91d8668e4ae56b61deab4
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/javacc/files/javacc-4.0-javadoc.patch | 14 ------
dev-java/javacc/javacc-4.1.ebuild | 66 --------------------------
dev-java/javacc/javacc-7.0.13.ebuild | 54 ---------------------
dev-java/javacc/javacc-7.0.4.ebuild | 66 --------------------------
4 files changed, 200 deletions(-)
diff --git a/dev-java/javacc/files/javacc-4.0-javadoc.patch b/dev-java/javacc/files/javacc-4.0-javadoc.patch
deleted file mode 100644
index 41093de26566..000000000000
--- a/dev-java/javacc/files/javacc-4.0-javadoc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru javacc/build.xml javacc-patched/build.xml
---- javacc/build.xml 2003-08-11 15:16:01.000000000 -0400
-+++ javacc-patched/build.xml 2005-06-25 00:37:53.000000000 -0400
-@@ -150,5 +150,10 @@
- <arg line="${version}" />
- </exec>
- </target>
-+ <target name="javadoc" depends="compile">
-+ <javadoc destdir="doc/api" source="1.4">
-+ <packageset dir="src"/>
-+ </javadoc>
-+ </target>
-
- </project>
diff --git a/dev-java/javacc/javacc-4.1.ebuild b/dev-java/javacc/javacc-4.1.ebuild
deleted file mode 100644
index f74f36d4eb2f..000000000000
--- a/dev-java/javacc/javacc-4.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc examples source test"
-MAVAN_ID="net.java.dev.javacc:javacc:${PV}"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
-HOMEPAGE="https://javacc.github.io/javacc/"
-SRC_URI="https://github.com/javacc/javacc/archive/release_${PV//./}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/javacc-release_${PV//./}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="dev-java/junit:0"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- test? ( >=dev-java/ant-1.10.14:0[junit] )"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0-javadoc.patch
-)
-
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
- java-pkg-2_src_prepare
- java-pkg_clean ! -path "./bootstrap/*"
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar bin/lib/"${PN}".jar
-
- if use doc; then
- java-pkg_dohtml -r www/*
- java-pkg_dojavadoc target/javadoc
- fi
-
- use examples && java-pkg_doexamples examples
- use source && java-pkg_dosrc src/*
-
- echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die
- doenvd "${T}"/22javacc-${SLOT}
-
- echo "export VERSION=${PV}" > "${T}"/pre || die
-
- local launcher
- for launcher in javacc jjdoc jjtree; do
- java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
- done
-
- einstalldocs
-}
diff --git a/dev-java/javacc/javacc-7.0.13.ebuild b/dev-java/javacc/javacc-7.0.13.ebuild
deleted file mode 100644
index 3a111cb197bb..000000000000
--- a/dev-java/javacc/javacc-7.0.13.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc examples source test"
-MAVAN_ID="net.java.dev.javacc:javacc:${PV}"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
-HOMEPAGE="https://javacc.github.io/javacc/"
-SRC_URI="https://github.com/javacc/javacc/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="BSD-2"
-SLOT="7.0.13"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? ( >=dev-java/ant-1.10.14:0[junit] )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-src_prepare() {
- java-pkg-2_src_prepare
- java-pkg_clean ! -path "./bootstrap/*"
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar "target/${PN}.jar"
-
- use doc && java-pkg_dojavadoc target/javadoc
-
- use examples && java-pkg_doexamples examples
- use source && java-pkg_dosrc src/*
-
- echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die
- doenvd "${T}"/22javacc-${SLOT}
-
- echo "export VERSION=${PV}" > "${T}"/pre || die
-
- local launcher
- for launcher in javacc jjdoc jjtree; do
- java-pkg_dolauncher ${launcher}-${SLOT} -pre "${T}"/pre --main ${launcher}
- done
-
- einstalldocs
-}
diff --git a/dev-java/javacc/javacc-7.0.4.ebuild b/dev-java/javacc/javacc-7.0.4.ebuild
deleted file mode 100644
index 58d0ccdccbcb..000000000000
--- a/dev-java/javacc/javacc-7.0.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc examples source test"
-MAVAN_ID="net.java.dev.javacc:javacc:${PV}"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
-HOMEPAGE="https://javacc.github.io/javacc/"
-SRC_URI="https://github.com/javacc/javacc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="7.0.4"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? ( >=dev-java/ant-1.10.14:0[junit] )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=(
- README
- javacc-releases.notes
- jjdoc-releases.notes
- jjtree-releases.notes
- release.notes
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
- java-pkg-2_src_prepare
- java-pkg_clean ! -path "./bootstrap/*"
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar "target/${PN}.jar"
-
- if use doc; then
- java-pkg_dohtml -r www/*
- java-pkg_dojavadoc target/javadoc
- fi
-
- use examples && java-pkg_doexamples examples
- use source && java-pkg_dosrc src/*
-
- echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die
- doenvd "${T}"/22javacc-${SLOT}
-
- echo "export VERSION=${PV}" > "${T}"/pre || die
-
- local launcher
- for launcher in javacc jjdoc jjtree; do
- java-pkg_dolauncher ${launcher}-${SLOT} -pre "${T}"/pre --main ${launcher}
- done
-
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-23 9:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-23 18:21 [gentoo-commits] repo/gentoo:master commit in: dev-java/javacc/files/, dev-java/javacc/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2024-08-23 9:01 Miroslav Šulc
2024-07-23 18:21 Miroslav Šulc
2024-07-23 18:21 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox