diff --git a/dev-java/janino/Manifest b/dev-java/janino/Manifest index fb07b1534..b3e17fdaf 100644 --- a/dev-java/janino/Manifest +++ b/dev-java/janino/Manifest @@ -1 +1,2 @@ +DIST janino-3.1.10.tar.gz 1760609 BLAKE2B e6fd14e0ab9e7a10c061b17355a74adf76ec7d6b7e530197f7400f23fee626dcaffce58c8befd0ee1e8f21c3ae0505be7a8a7c90cb891a52484ff66cd6b1cdf9 SHA512 a6304f004c0596679ece32cc3dfc727d7f57b7e3bdc000cb9e0d41bd907bea39278456ccfe6b743c87e02e5cd145717e84e4be2d34a33ea9191acbb72cb8f4b6 DIST janino-3.1.7.tar.gz 1747439 BLAKE2B 6e42a9d5cc079c2cf17b76c1d76420ff3fa0027b54736f23e0aa2c5062f4dad19c1ac7efa678fa06cee369a01125a64a4ee32e4120e60ecd8a56d47aa4f69503 SHA512 541925fc10f5fbefde45e60cec1925e3d6f5b7244a6b9de251b5483224bee05c16182e2bf137a00349cbdb6c209ce18b2203ca066e5a7a1f146efa255f5f7799 diff --git a/dev-java/janino/janino-3.1.7.ebuild b/dev-java/janino/janino-3.1.10.ebuild similarity index 90% rename from dev-java/janino/janino-3.1.7.ebuild rename to dev-java/janino/janino-3.1.10.ebuild index b0fbd7ad8..419504054 100644 --- a/dev-java/janino/janino-3.1.7.ebuild +++ b/dev-java/janino/janino-3.1.10.ebuild @@ -2,7 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom janino/pom.xml --download-uri https://github.com/janino-compiler/janino/archive/refs/tags/v3.1.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild janino-3.1.7.ebuild +# java-ebuilder --generate-ebuild --workdir . --pom janino/pom.xml \ +# --download-uri https://github.com/janino-compiler/janino/archive/refs/tags/v3.1.7.tar.gz +# --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild janino-3.1.7.ebuild EAPI=8 @@ -15,6 +17,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="An embedded compiler for run-time compilation purposes" HOMEPAGE="https://janino-compiler.github.io/janino/" SRC_URI="https://github.com/janino-compiler/janino/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}/janino" LICENSE="BSD" SLOT="0" @@ -36,14 +39,12 @@ CDEPEND=" DEPEND=" >=virtual/jdk-1.8:* - dev-java/ant-core:0 + dev-java/ant " RDEPEND=" >=virtual/jre-1.8:*" -S="${WORKDIR}/${P}/janino" - src_prepare() { default java-pkg_clean @@ -56,7 +57,7 @@ src_compile() { JAVA_GENTOO_CLASSPATH_EXTRA+=":commons-compiler.jar" rm -r target || die - JAVA_CLASSPATH_EXTRA="ant-core" + JAVA_CLASSPATH_EXTRA="ant" JAVA_SRC_DIR="src/main/java" JAVA_RESOURCE_DIRS="src/main/resources" JAVA_JAR_FILENAME="janino.jar" diff --git a/dev-java/janino/janino-3.1.7-r1.ebuild b/dev-java/janino/janino-3.1.7-r1.ebuild new file mode 100644 index 000000000..419504054 --- /dev/null +++ b/dev-java/janino/janino-3.1.7-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom janino/pom.xml \ +# --download-uri https://github.com/janino-compiler/janino/archive/refs/tags/v3.1.7.tar.gz +# --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild janino-3.1.7.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.codehaus.janino:janino:3.1.7" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="An embedded compiler for run-time compilation purposes" +HOMEPAGE="https://janino-compiler.github.io/janino/" +SRC_URI="https://github.com/janino-compiler/janino/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}/janino" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +# Common dependencies +# POM: ${PN}/pom.xml +# org.codehaus.janino:commons-compiler:3.1.7 -> !!!artifactId-not-found!!! + +CDEPEND=" + !!!artifactId-not-found!!! +" + +# Compile dependencies +# POM: ${PN}/pom.xml +# org.apache.ant:ant:1.10.11 -> !!!suitable-mavenVersion-not-found!!! +# POM: ${PN}/pom.xml +# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4 + +DEPEND=" + >=virtual/jdk-1.8:* + dev-java/ant +" + +RDEPEND=" + >=virtual/jre-1.8:*" + +src_prepare() { + default + java-pkg_clean +} + +src_compile() { + JAVA_SRC_DIR="../commons-compiler/src/main/java" + JAVA_JAR_FILENAME="commons-compiler.jar" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":commons-compiler.jar" + rm -r target || die + + JAVA_CLASSPATH_EXTRA="ant" + JAVA_SRC_DIR="src/main/java" + JAVA_RESOURCE_DIRS="src/main/resources" + JAVA_JAR_FILENAME="janino.jar" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":janino.jar" + rm -r target || die + + if use doc; then + JAVA_SRC_DIR=( + "../commons-compiler/src/main/java" + "src/main/java" + ) + JAVA_JAR_FILENAME="ignoreme.jar" + java-pkg-simple_src_compile + fi +} + +src_test() { + JAVA_TEST_GENTOO_CLASSPATH="junit-4" + JAVA_TEST_SRC_DIR="../commons-compiler/src/test/java" + JAVA_TEST_RESOURCE_DIRS="../commons-compiler/src/test/resources" + java-pkg-simple_src_test + + JAVA_TEST_GENTOO_CLASSPATH="junit-4" + JAVA_TEST_SRC_DIR="src/test/java" + JAVA_TEST_RESOURCE_DIRS="src/test/resources" + java-pkg-simple_src_test +} + +src_install() { + default + + java-pkg_dojar "commons-compiler.jar" + java-pkg_dojar "janino.jar" + + if use doc; then + java-pkg_dojavadoc target/api + fi + + if use source; then + java-pkg_dosrc "../commons-compiler/src/main/java/*" + java-pkg_dosrc "src/main/java/*" + fi +} diff --git a/dev-java/jgraphx/metadata.xml b/dev-java/janino/metadata.xml similarity index 73% rename from dev-java/jgraphx/metadata.xml rename to dev-java/janino/metadata.xml index ace7c2d3a..51cfdd2cf 100644 --- a/dev-java/jgraphx/metadata.xml +++ b/dev-java/janino/metadata.xml @@ -5,4 +5,7 @@ unknown@pentoo.ch Author Unknown + + janino-compiler/janino + diff --git a/dev-java/jetty-http/Manifest b/dev-java/jetty-http/Manifest deleted file mode 100644 index 4ae9d939a..000000000 --- a/dev-java/jetty-http/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jetty-http-11.0.9-sources.jar 133697 BLAKE2B 38e8a805d769abf8e041c1191fd6f011742ca25a5084b177406835f92830014107b5cfbf50f11f89fe422069dc3525e612c4e785addebc2b81d061b5dbebb29f SHA512 00c53307040966200051deb4341286eb2493d49e5f4216f7d9b016f3f375642862b11110251233b6df171fb7961baf34d9659a45fe1f952f65ac19c04f7fb6ed diff --git a/dev-java/jetty-http/jetty-http-11.0.9.ebuild b/dev-java/jetty-http/jetty-http-11.0.9.ebuild deleted file mode 100644 index 382815d6f..000000000 --- a/dev-java/jetty-http/jetty-http-11.0.9.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2022 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="Jetty HTTP" -HOMEPAGE="http://www.eclipse.org/jetty/" -SRC_URI="https://repo1.maven.org/maven2/org/eclipse/jetty/${PN}/${PV}/${P}-sources.jar" -LICENSE="EPL-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" - -CDEPEND="dev-java/slf4j-api:0 - dev-java/jetty-util:0 - dev-java/jetty-io:0 -" -RDEPEND=">=virtual/jre-11:* - ${CDEPEND}" -DEPEND=">=virtual/jdk-11:* - ${CDEPEND}" - -JAVA_GENTOO_CLASSPATH="slf4j-api,jetty-util,jetty-io" - -#src_prepare(){ -# rm module-info.java -# eapply_user -#} diff --git a/dev-java/jetty-io/Manifest b/dev-java/jetty-io/Manifest deleted file mode 100644 index 34cb722ae..000000000 --- a/dev-java/jetty-io/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jetty-io-11.0.9-sources.jar 115544 BLAKE2B d41d8910116c1348fdb26e0eb6840146d71234f50b3a60ec49a31aa80d29e9ba66185ccd345d5d2d3fe882c3dea3ce1a82afaddb814e14d72ef979cad4437545 SHA512 f0b1fe74f8d3cea4e37ec1e96b2bfb0592160b4bd08783b6dc1dc0425f46ef3fbfb579fc39fb7a018a0d42e7ed6d41fa30f7a5b442fb1bc76a91afff89fb2da9 diff --git a/dev-java/jetty-io/jetty-io-11.0.9.ebuild b/dev-java/jetty-io/jetty-io-11.0.9.ebuild deleted file mode 100644 index 3c3b2902a..000000000 --- a/dev-java/jetty-io/jetty-io-11.0.9.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2022 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="IO Utility" -HOMEPAGE="http://www.eclipse.org/jetty/" -SRC_URI="https://repo1.maven.org/maven2/org/eclipse/jetty/${PN}/${PV}/${P}-sources.jar" -LICENSE="EPL-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" - -CDEPEND="dev-java/slf4j-api:0 - dev-java/jetty-util:0 - dev-java/jetty-jmx:0 -" -RDEPEND=">=virtual/jre-11:* - ${CDEPEND}" -DEPEND=">=virtual/jdk-11:* - ${CDEPEND}" - -JAVA_GENTOO_CLASSPATH="slf4j-api,jetty-util,jetty-jmx" - -#src_prepare(){ -# rm module-info.java -# eapply_user -#} diff --git a/dev-java/jetty-jmx/Manifest b/dev-java/jetty-jmx/Manifest deleted file mode 100644 index 75dd88ee1..000000000 --- a/dev-java/jetty-jmx/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jetty-jmx-11.0.9-sources.jar 26301 BLAKE2B 6c700101f7077877d055e699f8927ebc7c6085590debb77a27265c12497b1f97fce18327b92975e13f6f50694629c104ff51eb9d60b80b6b64695a37998306ab SHA512 bf020d19005ff6a1571cc6f28391c077df1eef5156a784ab53962547125bba2c11d525a403fde8ae46e670c0f943c6499962edab52394c2e4bb1f574b0004c76 diff --git a/dev-java/jetty-jmx/jetty-jmx-11.0.9.ebuild b/dev-java/jetty-jmx/jetty-jmx-11.0.9.ebuild deleted file mode 100644 index 32fae92d4..000000000 --- a/dev-java/jetty-jmx/jetty-jmx-11.0.9.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 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="Jetty IO Utility" -HOMEPAGE="http://www.eclipse.org/jetty/" -SRC_URI="https://repo1.maven.org/maven2/org/eclipse/jetty/${PN}/${PV}/${P}-sources.jar" -LICENSE="EPL-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" - -CDEPEND="dev-java/jetty-util:0" - -RDEPEND=">=virtual/jre-11:* - ${CDEPEND}" -DEPEND=">=virtual/jdk-11:* - ${CDEPEND}" - -JAVA_GENTOO_CLASSPATH="jetty-util" - -#src_prepare(){ -# rm module-info.java -# eapply_user -#} diff --git a/dev-java/jetty-server/Manifest b/dev-java/jetty-server/Manifest deleted file mode 100644 index c5863426f..000000000 --- a/dev-java/jetty-server/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jetty-server-11.0.9-sources.jar 441155 BLAKE2B edbaa251f0985099df6828d10e09296794dcfeee93506da88d05e090b4aae87aad77132ab051f8d506e43f1e8d5794dc25f1e245a397ae5f108eaa88e5ab2207 SHA512 569fa53afd388983f11f73af2c22a8a005989873bb0ede7c69a08488c2969fa355bbeb1da83fc06e4fd5cf35c71acebf41827d9ffc745913db1ed7350a6b8c40 diff --git a/dev-java/jetty-server/jetty-server-11.0.9.ebuild b/dev-java/jetty-server/jetty-server-11.0.9.ebuild deleted file mode 100644 index ee024bbfb..000000000 --- a/dev-java/jetty-server/jetty-server-11.0.9.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2023 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="The core jetty server artifact" -HOMEPAGE="http://www.eclipse.org/jetty/" -SRC_URI="https://repo1.maven.org/maven2/org/eclipse/jetty/${PN}/${PV}/${P}-sources.jar" -LICENSE="EPL-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" - -RDEPEND=">=virtual/jre-11:*" - -DEPEND="${RDEPEND} ->=virtual/jdk-11:* - app-arch/unzip - dev-java/jetty-io - dev-java/jetty-util - dev-java/jetty-http - dev-java/jetty-jmx - dev-java/jakarta-servlet-api:5 - " - -JAVA_GENTOO_CLASSPATH="jetty-io,jetty-util,jakarta-servlet-api:5,jetty-http,jetty-jmx" - -src_prepare(){ - rm module-info.java - eapply_user -} diff --git a/dev-java/jetty-util/Manifest b/dev-java/jetty-util/Manifest deleted file mode 100644 index e59c1fdbc..000000000 --- a/dev-java/jetty-util/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jetty-util-11.0.9-sources.jar 348025 BLAKE2B 4fdd453f0485c3bcb5f200a99df225c774b24cbf747c8dba84c3a07a02edfddefd0b627dd78bbc7c29fbefc22b95467b5bbc02ba9b4911ad9c5ae2d9f40f71c0 SHA512 bbe3bb26574faaa62ca43246b540b93979af22e5d36af96694c711aebac0341ba0aa34b7794f4d801e98757e079be833ed1af9d4769eccaf62137a0892e64ad7 diff --git a/dev-java/jetty-util/jetty-util-11.0.9.ebuild b/dev-java/jetty-util/jetty-util-11.0.9.ebuild deleted file mode 100644 index bef4cf31c..000000000 --- a/dev-java/jetty-util/jetty-util-11.0.9.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 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="Jetty IO Utility" -HOMEPAGE="http://www.eclipse.org/jetty/" -SRC_URI="https://repo1.maven.org/maven2/org/eclipse/jetty/${PN}/${PV}/${P}-sources.jar" -LICENSE="EPL-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" - -CDEPEND="dev-java/slf4j-api:0" -RDEPEND=">=virtual/jre-11:* - ${CDEPEND}" -DEPEND=">=virtual/jdk-11:* - ${CDEPEND}" - -JAVA_GENTOO_CLASSPATH="slf4j-api" - -#src_prepare(){ -# rm module-info.java -# eapply_user -#} diff --git a/dev-java/jgraphx/Manifest b/dev-java/jgraphx/Manifest deleted file mode 100644 index 1e4822b24..000000000 --- a/dev-java/jgraphx/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST jgraphx-2.1.1.2.tar.gz 3171911 BLAKE2B 145af29132620181c0255c458061672465efd99e0b804f5848977e2ecb787d87b32b57ddefbe086c79efea4ab5ba352846c5abe1043f9bff69fe779bf4e617f4 SHA512 842f124deab62fee4900314fa0cefb8b98f22125ee47499655752937e224624b62b852f5929f9d9a14e37741a48676ab74d2c43e698ebf66714ab657061cbb58 -DIST jgraphx-4.2.2.tar.gz 3525225 BLAKE2B a716df6d843fdc3b0ef32ba9549701d658f1daa104fd90df00137753d837756a2008129cb449771ec8dac3731b3033b429a7758f7f2e3ca58f27b93c88732b5c SHA512 767c0972100c8ed41561304367cba4574d1ba1bcd5c5d57fa869dd0a1bc1b2d6d70253577a4d2a2f03641afec5bd0d4e81e52a13529681737de7918c0c24cee7 diff --git a/dev-java/jgraphx/jgraphx-2.1.1.2.ebuild b/dev-java/jgraphx/jgraphx-2.1.1.2.ebuild deleted file mode 100644 index 36e877410..000000000 --- a/dev-java/jgraphx/jgraphx-2.1.1.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 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-ant-2 - -MY_PV=$(ver_rs '_') - -DESCRIPTION="Open-source graph component for Java" -SRC_URI="https://github.com/jgraph/jgraphx/archive/v${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE="http://www.jgraph.com" -IUSE="doc examples source" -DEPEND="virtual/jdk:1.8 - app-arch/unzip" -RDEPEND=">=virtual/jre-1.5" -LICENSE="BSD" -SLOT="$(ver_cut 1-2)" -KEYWORDS="amd64 x86" - -src_prepare() { - # don't do javadoc always - sed -i \ - -e 's/depends="doc"/depends="compile"/' \ - build.xml || die "sed failed" - rm -rf doc/api lib/jgraphx.jar || die - eapply_user -} - -EANT_BUILD_TARGET="build" -EANT_DOC_TARGET="doc" - -src_install() { - java-pkg_dojar lib/${PN}.jar - - use doc && java-pkg_dojavadoc docs/api - use source && java-pkg_dosrc src/org - use examples && java-pkg_doexamples examples -} diff --git a/dev-java/jgraphx/jgraphx-4.2.2.ebuild b/dev-java/jgraphx/jgraphx-4.2.2.ebuild deleted file mode 100644 index 1cb4b8134..000000000 --- a/dev-java/jgraphx/jgraphx-4.2.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# 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-ant-2 - -MY_PV=$(ver_rs '_') - -DESCRIPTION="Open-source graph component for Java" -SRC_URI="https://github.com/jgraph/jgraphx/archive/v${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE="http://www.jgraph.com" -IUSE="doc examples source" -DEPEND="virtual/jdk:11 - app-arch/unzip" -RDEPEND=">=virtual/jre-11" -LICENSE="BSD" -SLOT="$(ver_cut 1-2)" -KEYWORDS="amd64 x86" - -src_prepare() { - # don't do javadoc always - sed -i \ - -e 's/depends="doc"/depends="compile"/' \ - build.xml || die "sed failed" - rm -rf doc/api lib/jgraphx.jar || die - eapply_user -} - -EANT_BUILD_TARGET="build" -EANT_DOC_TARGET="doc" - -src_install() { - java-pkg_dojar lib/${PN}.jar - - use doc && java-pkg_dojavadoc docs/api - use source && java-pkg_dosrc src/org - use examples && java-pkg_doexamples examples -} diff --git a/dev-java/logback-classic/logback-classic-1.4.1.ebuild b/dev-java/logback-classic/logback-classic-1.4.1.ebuild index 433877ba0..a3d5fa8a6 100644 --- a/dev-java/logback-classic/logback-classic-1.4.1.ebuild +++ b/dev-java/logback-classic/logback-classic-1.4.1.ebuild @@ -31,7 +31,7 @@ KEYWORDS="amd64 arm64 x86" # org.slf4j:slf4j-api:2.0.1 -> >=dev-java/slf4j-api-2.0.3:0 CP_DEPEND=" - ~dev-java/janino-3.1.7:0 + dev-java/janino:0 dev-java/jakarta-mail-api:0 ~dev-java/logback-core-${PV}:0 >=dev-java/slf4j-api-2.0.0:0 diff --git a/dev-java/logback-core/logback-core-1.4.1.ebuild b/dev-java/logback-core/logback-core-1.4.1.ebuild index 568906863..ee5a46cc6 100644 --- a/dev-java/logback-core/logback-core-1.4.1.ebuild +++ b/dev-java/logback-core/logback-core-1.4.1.ebuild @@ -35,7 +35,7 @@ CP_DEPEND=" dev-java/jakarta-mail:0 dev-java/jakarta-mail-api:0 dev-java/jakarta-servlet-api:6 - ~dev-java/janino-3.1.7:0 + dev-java/janino:0 dev-java/jansi:2 "