diff options
Diffstat (limited to 'dev-java')
292 files changed, 4872 insertions, 2889 deletions
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild index 862088b18ee7..86295bc01b6a 100644 --- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild +++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ HOMEPAGE="https://www.eclipse.org/" SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar" LICENSE="EPL-1.0" -KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" SLOT="4.15" IUSE="" diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild index 6d6f07db4551..478ef5996a68 100644 --- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild +++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild @@ -11,10 +11,10 @@ DMF="R-${PV}-202211231800" DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler" HOMEPAGE="https://www.eclipse.org/" -SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar" +SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar" LICENSE="EPL-1.0" -KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" SLOT="4.26" IUSE="" diff --git a/dev-java/apache-rat/Manifest b/dev-java/apache-rat/Manifest new file mode 100644 index 000000000000..586027309acd --- /dev/null +++ b/dev-java/apache-rat/Manifest @@ -0,0 +1,2 @@ +DIST apache-rat-0.15-src.tar.bz2 203040 BLAKE2B 0727fb932cfbab7080eba5115bee69e5c46155a231509109a5c7aecf40ed539d4357f2d9b31342717306221891e4a411e01077ae55a0988abe4926e40f1fafc4 SHA512 7f9fb219a5ce0b95909f006140b20e7621d9f5ce583c42a57e2783ec40fd842e75b546843ab033a99bf5108d0d8369a0ab1aac80e33af9685f651fed3dd603ee +DIST apache-rat-0.15-src.tar.bz2.asc 833 BLAKE2B b87e059a5a83d3d728c28c25926129743fdfb6a5c7cf2e258892d86711e7f5890d140ca1cfa5fc1012d56b6321ec2c93903ec30854bd3536216c8f1fd269f504 SHA512 f5abcb3df5d23834deab8c3c1a476100324452cba88e9185fb398dd6118c3c8ff8dc00c4c9f8166245833d6e602c51bc8cdf20361813bbe1e720022766412b8d diff --git a/dev-java/apache-rat/apache-rat-0.15.ebuild b/dev-java/apache-rat/apache-rat-0.15.ebuild new file mode 100644 index 000000000000..278f8ba410cf --- /dev/null +++ b/dev-java/apache-rat/apache-rat-0.15.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# javadoc is broken for java 17, see https://bugs.gentoo.org/914458 +JAVA_PKG_IUSE="doc source test" +MAVEN_PROVIDES=" + org.apache.rat:apache-rat-core:${PV} + org.apache.rat:apache-rat-tasks:${PV} +" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Apache Rat is a release audit tool, focused on licenses" +HOMEPAGE="https://creadur.apache.org/rat/" +SRC_URI="mirror://apache//creadur/${P}/${P}-src.tar.bz2 + verify-sig? ( https://archive.apache.org/dist/creadur/${P}/${P}-src.tar.bz2.asc )" +S="${WORKDIR}/${P}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" + +CP_DEPEND=" + dev-java/ant-core:0 + dev-java/commons-cli:1 + dev-java/commons-collections:4 + dev-java/commons-compress:0 + dev-java/commons-io:1 + dev-java/commons-lang:3.6 +" + +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + test? ( dev-java/ant-testutil:0 )" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-creadur )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/creadur.apache.org.asc" + +DOCS=( NOTICE README.md README.txt RELEASE-NOTES.txt RELEASE_NOTES.txt ) + +PATCHES=( "${FILESDIR}/apache-rat-0.15-fix-tests.patch" ) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + +src_compile() { + einfo "Compiling apache-rat-core.jar" + JAVA_JAR_FILENAME="${PN}-core.jar" + JAVA_RESOURCE_DIRS="${PN}-core/src/main/resources" + JAVA_SRC_DIR="${PN}-core/src/main/java" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":${PN}-core.jar" + rm -r target || die + + einfo "Compiling apache-rat-tasks.jar" + JAVA_JAR_FILENAME="${PN}-tasks.jar" + JAVA_RESOURCE_DIRS="${PN}-tasks/src/main/resources" + JAVA_SRC_DIR="${PN}-tasks/src/main/java" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":${PN}-tasks.jar" + rm -r target || die + + # javadoc is broken for java 17, see https://bugs.gentoo.org/914458 + if use doc; then + einfo "Compiling javadocs" + ejavadoc \ + -verbose \ + -classpath "$(java-pkg_getjars \ + --build-only ant-core)":"$(java-pkg_getjars \ + --build-only commons-cli-1)":"$(java-pkg_getjars \ + --build-only commons-collections-4)":"$(java-pkg_getjars \ + --build-only commons-compress):$(java-pkg_getjars \ + --build-only commons-io-1):$(java-pkg_getjars \ + --build-only commons-lang-3.6)" \ + -sourcepath "${PN}-core/src/main/java:${PN}-tasks/src/main/java" \ + -d javadoc -subpackages org.apache.rat org.apache.rat.anttasks + fi +} + +src_test() { + JAVA_TEST_GENTOO_CLASSPATH="ant-testutil,junit-4" + + einfo "Testing apache-rat-core" + cp -r "${PN}"-core/src/{main,test} src || die + JAVA_TEST_RESOURCE_DIRS="src/test/resources" + JAVA_TEST_SRC_DIR="src/test/java" + java-pkg-simple_src_test + rm -r src/{main,test} || die + + einfo "Testing apache-rat-tasks" + cp -r "${PN}"-tasks/src/{main,test} src || die + mkdir -p target/it-sources || die + JAVA_TEST_RESOURCE_DIRS="src/test/resources" + JAVA_TEST_SRC_DIR="src/test/java" + java-pkg-simple_src_test +} + +src_install() { + java-pkg_dojar "${PN}-core.jar" + java-pkg_dojar "${PN}-tasks.jar" + java-pkg_dolauncher "${PN}" --main org.apache.rat.Report + + use doc && java-pkg_dojavadoc javadoc + + if use source; then + java-pkg_dosrc "${PN}-core/src/main/java/*" + java-pkg_dosrc "${PN}-tasks/src/main/java/*" + fi +} diff --git a/dev-java/apache-rat/files/apache-rat-0.15-fix-tests.patch b/dev-java/apache-rat/files/apache-rat-0.15-fix-tests.patch new file mode 100644 index 000000000000..b9cb73648008 --- /dev/null +++ b/dev-java/apache-rat/files/apache-rat-0.15-fix-tests.patch @@ -0,0 +1,39 @@ +--- a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml ++++ b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml +@@ -48,7 +48,7 @@ + <target name="all"/> + + <target name="testWithReportSentToFile"> +- <property name="report.file" location="${output.dir}/selftest.report"/> ++ <property name="report.file" location="../../../../target/anttasks/selftest.report"/> + <rat:report reportFile="${report.file}"> + <file file="${ant.file}"/> + </rat:report> +@@ -88,22 +88,22 @@ + <target name="testAddLicenseHeaders"> + <delete dir="${output.dir}/it-sources"/> + <mkdir dir="${output.dir}/it-sources"/> +- <copy file="src/test/resources/antunit/index.apt" tofile="${output.dir}/it-sources/index.apt"/> ++ <copy file="index.apt" tofile="../../../../target/anttasks/it-sources/index.apt"/> + <rat:report addLicenseHeaders="true"> +- <file file="${output.dir}/it-sources/index.apt"/> ++ <file file="../../../../target/anttasks/it-sources/index.apt"/> + </rat:report> + </target> + + <target name="testISO88591"> + <rat:report format="xml"> +- <file file="src/test/resources/org/example/iso-8859-1.html"/> ++ <file file="../../../../src/test/resources/org/example/iso-8859-1.html"/> + </rat:report> + </target> + + <target name="testISO88591WithReportFile"> +- <property name="report.file" location="${output.dir}/selftest.report"/> ++ <property name="report.file" location="../../../../target/anttasks/selftest.report"/> + <rat:report reportFile="${report.file}" format="xml"> +- <file file="src/test/resources/org/example/iso-8859-1.html"/> ++ <file file="../../../../src/test/resources/org/example/iso-8859-1.html"/> + </rat:report> + </target> + </project> diff --git a/dev-java/logback-classic/metadata.xml b/dev-java/apache-rat/metadata.xml index 36093b7d6d6d..7c36c1b69ae5 100644 --- a/dev-java/logback-classic/metadata.xml +++ b/dev-java/apache-rat/metadata.xml @@ -3,10 +3,9 @@ <pkgmetadata> <maintainer type="project"> <email>java@gentoo.org</email> + <name>Java</name> </maintainer> <upstream> - <bugs-to>https://logback.qos.ch/bugreport.html</bugs-to> - <changelog>https://logback.qos.ch/news.html</changelog> - <remote-id type="github">qos-ch/logback</remote-id> + <remote-id type="github">apache/creadur-rat</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest index b9140ee1a927..2ec40365fab3 100644 --- a/dev-java/asm/Manifest +++ b/dev-java/asm/Manifest @@ -1 +1 @@ -DIST asm-ASM_9_4.tar.bz2 1380417 BLAKE2B 612fc6669294f2926ec77522f642f2878a96a9c977579ceda9feb955041ff53fa698c75b26c27bae478a41dca59357d9cf824263df39d60ea5c6722e5f0efc75 SHA512 a59268808ac54a238bd6e117eb0164d28c5c3572c12d7ad42c2f3dbd32714c03056f330255756511db4f1ede8d66bf32c7347128b8ec179beba11cca27927687 +DIST asm-ASM_9_6.tar.bz2 1374579 BLAKE2B 621b19f1818ffdd451037af210ec7c3286e3dabdb1d6192157c2e6e8c101f599691cd4de57adf500f5413b4aaf4f808d6ac791e84626223a7be5672a17137670 SHA512 86b2db3e81c29c465d4128736f88ae3b73af8f312915921549d0acdb50a8d2c2c2beed5162af164b6e75278702af0c6f0a8d84b4133516eb4ac419520b7c764d diff --git a/dev-java/asm/asm-9.4.ebuild b/dev-java/asm/asm-9.6.ebuild index b7a5d43489a8..ac4e0a56d01f 100644 --- a/dev-java/asm/asm-9.4.ebuild +++ b/dev-java/asm/asm-9.6.ebuild @@ -3,11 +3,16 @@ EAPI=8 -# No tests because: -# package org.junit.jupiter.api does not exist -# package org.junit.jupiter.params does not exist +# tests not enabled because of missing eclass support of junit-jupiter JAVA_PKG_IUSE="doc source" -MAVEN_PROVIDES="org.ow2.asm:asm-bom:9.4 org.ow2.asm:asm:9.4" +MAVEN_PROVIDES=" + org.ow2.asm:asm-bom:${PV} + org.ow2.asm:asm:${PV} + org.ow2.asm:asm-analysis:${PV} + org.ow2.asm:asm-commons:${PV} + org.ow2.asm:asm-tree:${PV} + org.ow2.asm:asm-util:${PV} +" inherit java-pkg-2 java-pkg-simple @@ -15,6 +20,7 @@ DESCRIPTION="Bytecode manipulation framework for Java" HOMEPAGE="https://asm.ow2.io" MY_P="ASM_${PV//./_}" SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.bz2" +S="${WORKDIR}/asm-${MY_P}" LICENSE="BSD" SLOT="9" @@ -25,8 +31,6 @@ RDEPEND=">=virtual/jre-1.8:*" ASM_MODULES=( "asm" "asm-tree" "asm-analysis" "asm-commons" "asm-util" ) -S="${WORKDIR}/asm-${MY_P}" - src_prepare() { default local module diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest index 6392b059f106..38cde9303492 100644 --- a/dev-java/batik/Manifest +++ b/dev-java/batik/Manifest @@ -1,2 +1,2 @@ -DIST batik-src-1.16.tar.gz 13495722 BLAKE2B 041442b5485588a23b6e335cc46630b3c73fb8a36157e8bc77baa7b399bf7986549039f27e89727ebc98b8492095b957c8c6deb12b232a39784844e4c5edf6ab SHA512 024ab7a204d00b6c855e26c62a326dfcde5fb486a7635890c6fcb37d421c7195ae04b3d292daabc0fcb6564f55bfa93d6fef15cf4c2dad77e569ca17d1eeb250 -DIST batik-src-1.16.tar.gz.asc 833 BLAKE2B fdcfb26b9cc0d4fb0c37ce42d65628629ab0c27257ebe07715d5b2786500515125a240957c9ba76333aa54320905273031354cf09ee29e3a79fc7529640ebf03 SHA512 7fc3450d2b4d19e03528707fc20d6e18af926938ad24ad7460cc1c423c6c40507059fff2e2921d82fc582a4b486a75141fb407d450b043e2cc5007e0c2d486ea +DIST batik-src-1.17.tar.gz 13578640 BLAKE2B c77f994674dd8e8054ad6f753e53304ce6daad9b9eadceef053ede0c746872528ecd1caa6e87064d41892fed0c39f07936779851777208229f817bf84cb529b2 SHA512 0879f298142630e96931f429ade5e7107d2d981c6c3a99b8f2ddca8e26ea4fde1b7c717d06412c57d64759bed6c5f2d056970d59e19e66caafb926cb30078516 +DIST batik-src-1.17.tar.gz.asc 833 BLAKE2B 33836c8f0cbc878410ce8b2738dbbb4dc47d6067c5f58febb3460d836424b1c1d815f369bd7aeb15a8ed9371628e03731c1338aa6524c8a935c48b8092e3bb1e SHA512 513bd3d5c212ce4d98daa911f36e1b00e2f2b7a637e93ea116a2ebe848e20664d722ccf6c8928eac7170fa84d3b38eec86a71c8a0a7e21fd8622c8d475991c60 diff --git a/dev-java/batik/batik-1.16-r1.ebuild b/dev-java/batik/batik-1.17.ebuild index 244e640e9dd5..e86745d88df5 100644 --- a/dev-java/batik/batik-1.16-r1.ebuild +++ b/dev-java/batik/batik-1.17.ebuild @@ -37,8 +37,12 @@ RDEPEND=" >=virtual/jre-1.8:* " -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-batik )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/xmlgraphics-batik.apache.org.asc" +BDEPEND=" + app-arch/zip + verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-batik ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-batik.apache.org.asc" DOCS=( CHANGES NOTICE README ) @@ -141,7 +145,7 @@ src_compile() { else # Create the JAR file (not possible without adding at least one file). jar -cfe "${module}.jar" "${JAVA_MAIN_CLASS}" -C . README || die - zip -d "${module}.jar" "README" + zip -d "${module}.jar" "README" || die fi fi diff --git a/dev-java/bcel/bcel-6.6.0.ebuild b/dev-java/bcel/bcel-6.6.0.ebuild index 760c9fae827f..24751a65c002 100644 --- a/dev-java/bcel/bcel-6.6.0.ebuild +++ b/dev-java/bcel/bcel-6.6.0.ebuild @@ -49,7 +49,7 @@ RDEPEND=" BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-apache-commons ) " -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" DOCS=( NOTICE.txt RELEASE-NOTES.txt ) diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest index 11f3fa328c20..880e2012db6f 100644 --- a/dev-java/bcmail/Manifest +++ b/dev-java/bcmail/Manifest @@ -1 +1 @@ -DIST bc-java-r1rv72.tar.gz 380374879 BLAKE2B 53c593c1d97e9ee56388479dce7386d254f74a8bab9612e802ebe963df84d1a397fe0c5a7a0d0db2ac2cd3252ae43e79c67b9d3ba1b5ffc20cc8727c7e1a6994 SHA512 dbfdd9e4f30ab713584830a0fd0d7e4f89904366bf4953a9e722656cc4cd92c9d29238649efa7b4cdab64e2c08f4b3b3c96667d1ade569ade5a5a2c9ad9d5b5c +DIST bc-java-r1rv76.tar.gz 31256952 BLAKE2B b791ef3da7189bc6990935aaad7c331c1bf6a45af0cdfc72056ae0cf1723e57ce15a76060251f6de630b0729ffe22ba4718255c103a8ab66db61f2e46f1201c8 SHA512 7d408821408bbabd209d9507b061f3113822878c12b12a040c829f5a8c6bdf8450719aef60c423025824bec1fcb6c63d8478d1f84f3cb1d692fdbacde6d9ce6e diff --git a/dev-java/bcmail/bcmail-1.72.ebuild b/dev-java/bcmail/bcmail-1.76.ebuild index 3b3759f87cc6..478e8647dbd2 100644 --- a/dev-java/bcmail/bcmail-1.72.ebuild +++ b/dev-java/bcmail/bcmail-1.76.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.bouncycastle:bcmail-jdk18on:1.72" +MAVEN_ID="org.bouncycastle:bcmail-jdk18on:1.76" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple @@ -34,6 +34,7 @@ HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) S="${WORKDIR}/bc-java-r${PV/./rv}/mail" +JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.mail" JAVA_RESOURCE_DIRS="src/main/resources" JAVA_SRC_DIR=( "src/main/java" @@ -41,7 +42,7 @@ JAVA_SRC_DIR=( ) JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "../pkix/src/main/resources" ) JAVA_TEST_RUN_ONLY="org.bouncycastle.mail.smime.test.AllTests" JAVA_TEST_SRC_DIR="src/test/java" diff --git a/dev-java/bcmail/metadata.xml b/dev-java/bcmail/metadata.xml index 97fff009c2d8..d958ec9b5fa0 100644 --- a/dev-java/bcmail/metadata.xml +++ b/dev-java/bcmail/metadata.xml @@ -5,6 +5,9 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> + <upstream> + <remote-id type="github">bcgit/bc-java</remote-id> + </upstream> <longdescription> The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. This jar contains S/MIME APIs for JDK 1.8 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. The JavaMail API and the Java activation framework will also be needed. </longdescription> diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest index 11f3fa328c20..880e2012db6f 100644 --- a/dev-java/bcpg/Manifest +++ b/dev-java/bcpg/Manifest @@ -1 +1 @@ -DIST bc-java-r1rv72.tar.gz 380374879 BLAKE2B 53c593c1d97e9ee56388479dce7386d254f74a8bab9612e802ebe963df84d1a397fe0c5a7a0d0db2ac2cd3252ae43e79c67b9d3ba1b5ffc20cc8727c7e1a6994 SHA512 dbfdd9e4f30ab713584830a0fd0d7e4f89904366bf4953a9e722656cc4cd92c9d29238649efa7b4cdab64e2c08f4b3b3c96667d1ade569ade5a5a2c9ad9d5b5c +DIST bc-java-r1rv76.tar.gz 31256952 BLAKE2B b791ef3da7189bc6990935aaad7c331c1bf6a45af0cdfc72056ae0cf1723e57ce15a76060251f6de630b0729ffe22ba4718255c103a8ab66db61f2e46f1201c8 SHA512 7d408821408bbabd209d9507b061f3113822878c12b12a040c829f5a8c6bdf8450719aef60c423025824bec1fcb6c63d8478d1f84f3cb1d692fdbacde6d9ce6e diff --git a/dev-java/bcpg/bcpg-1.72.ebuild b/dev-java/bcpg/bcpg-1.76.ebuild index 6e870d522cd3..343650de4d43 100644 --- a/dev-java/bcpg/bcpg-1.72.ebuild +++ b/dev-java/bcpg/bcpg-1.76.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.bouncycastle:bcpg-jdk18on:1.72" +MAVEN_ID="org.bouncycastle:bcpg-jdk18on:1.76" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple @@ -33,6 +33,7 @@ JAVA_SRC_DIR=( "src/main/jdk1.9" ) +JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.pg" JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_RESOURCE_DIRS="src/test/resources" JAVA_TEST_SRC_DIR="src/test/java" diff --git a/dev-java/bcpg/metadata.xml b/dev-java/bcpg/metadata.xml index 3cbf364f100a..34cf5468297e 100644 --- a/dev-java/bcpg/metadata.xml +++ b/dev-java/bcpg/metadata.xml @@ -5,6 +5,9 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> + <upstream> + <remote-id type="github">bcgit/bc-java</remote-id> + </upstream> <longdescription> The Bouncy Castle Java API for handling the OpenPGP protocol. This jar contains the OpenPGP API for JDK 1.8 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. </longdescription> diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest index 11f3fa328c20..b8411158075e 100644 --- a/dev-java/bcpkix/Manifest +++ b/dev-java/bcpkix/Manifest @@ -1 +1,2 @@ -DIST bc-java-r1rv72.tar.gz 380374879 BLAKE2B 53c593c1d97e9ee56388479dce7386d254f74a8bab9612e802ebe963df84d1a397fe0c5a7a0d0db2ac2cd3252ae43e79c67b9d3ba1b5ffc20cc8727c7e1a6994 SHA512 dbfdd9e4f30ab713584830a0fd0d7e4f89904366bf4953a9e722656cc4cd92c9d29238649efa7b4cdab64e2c08f4b3b3c96667d1ade569ade5a5a2c9ad9d5b5c +DIST bc-java-r1rv76.tar.gz 31256952 BLAKE2B b791ef3da7189bc6990935aaad7c331c1bf6a45af0cdfc72056ae0cf1723e57ce15a76060251f6de630b0729ffe22ba4718255c103a8ab66db61f2e46f1201c8 SHA512 7d408821408bbabd209d9507b061f3113822878c12b12a040c829f5a8c6bdf8450719aef60c423025824bec1fcb6c63d8478d1f84f3cb1d692fdbacde6d9ce6e +DIST bc-test-data-r1rv76.tar.gz 2074813467 BLAKE2B 3d1bd122a907e4c46f3c8b84c4d27b3327b6c6deaded623e5bc9842d00c62bdeb521b1be3bdd495ffa10f2d1facc73d41176829eda4511827d24eb0f62fccef9 SHA512 3de068667ce9572530fa6422bdbc4455d7f1edd85e12166e7a266a447ed0ffab50c33cc5a99e668caf79156f87d86512a5507534469d3e6f479b908d4d2a1fb7 diff --git a/dev-java/bcpkix/bcpkix-1.72.ebuild b/dev-java/bcpkix/bcpkix-1.76.ebuild index 132cf1ab0140..f81d320078e6 100644 --- a/dev-java/bcpkix/bcpkix-1.72.ebuild +++ b/dev-java/bcpkix/bcpkix-1.76.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.bouncycastle:bcpkix-jdk18on:1.72" +MAVEN_ID="org.bouncycastle:bcpkix-jdk18on:1.76" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple check-reqs DESCRIPTION="Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation" HOMEPAGE="https://www.bouncycastle.org/java.html" -SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz" +SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz + test? ( https://github.com/bcgit/bc-test-data/archive/r${PV/./rv}.tar.gz -> bc-test-data-r${PV/./rv}.tar.gz )" LICENSE="BSD" SLOT="0" @@ -36,6 +37,7 @@ HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) S="${WORKDIR}/bc-java-r${PV/./rv}/pkix" +JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.pkix" JAVA_GENTOO_CLASSPATH="bcprov,bcutil" JAVA_SRC_DIR=( "src/main/java" @@ -67,13 +69,20 @@ pkg_setup() { java-pkg-2_pkg_setup } +src_unpack() { + unpack bc-java-r${PV/./rv}.tar.gz + use test && unpack bc-test-data-r${PV/./rv}.tar.gz +} + src_prepare() { - default + java-pkg-2_src_prepare java-pkg_clean .. } # https://bugs.gentoo.org/823347 src_test() { + mv ../../bc-test-data-r${PV/./rv} bc-test-data || die "cannot move bc-test-data" + JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}" pushd src/test/java || die local JAVA_TEST_RUN_ONLY=$(find * \ diff --git a/dev-java/bcpkix/metadata.xml b/dev-java/bcpkix/metadata.xml index 40c8ee28be10..3b63dd7f15eb 100644 --- a/dev-java/bcpkix/metadata.xml +++ b/dev-java/bcpkix/metadata.xml @@ -5,6 +5,9 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> + <upstream> + <remote-id type="github">bcgit/bc-java</remote-id> + </upstream> <longdescription> The Bouncy Castle Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation. This jar contains APIs for JDK 1.8 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. </longdescription> diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest index 11f3fa328c20..def9e26aa563 100644 --- a/dev-java/bcprov/Manifest +++ b/dev-java/bcprov/Manifest @@ -1 +1,4 @@ -DIST bc-java-r1rv72.tar.gz 380374879 BLAKE2B 53c593c1d97e9ee56388479dce7386d254f74a8bab9612e802ebe963df84d1a397fe0c5a7a0d0db2ac2cd3252ae43e79c67b9d3ba1b5ffc20cc8727c7e1a6994 SHA512 dbfdd9e4f30ab713584830a0fd0d7e4f89904366bf4953a9e722656cc4cd92c9d29238649efa7b4cdab64e2c08f4b3b3c96667d1ade569ade5a5a2c9ad9d5b5c +DIST bc-java-r1rv74.tar.gz 31236157 BLAKE2B ffdfe7aa34f361a559051f31fc57eeff39f7d080e4de4a94bdd0d79d92172b2646efa122edaf067633d6a840015e17271c186122598c18e3226622428fa9e1e7 SHA512 887183f825a8834ff512a66fa3f9075259b3266c2861e6e046990bd2dda80b896a8fd221ff2982a127de79fe998727ecc12cade4e6c381f2a152a72ee575d8a1 +DIST bc-java-r1rv76.tar.gz 31256952 BLAKE2B b791ef3da7189bc6990935aaad7c331c1bf6a45af0cdfc72056ae0cf1723e57ce15a76060251f6de630b0729ffe22ba4718255c103a8ab66db61f2e46f1201c8 SHA512 7d408821408bbabd209d9507b061f3113822878c12b12a040c829f5a8c6bdf8450719aef60c423025824bec1fcb6c63d8478d1f84f3cb1d692fdbacde6d9ce6e +DIST bc-test-data-r1rv74.tar.gz 2074813647 BLAKE2B 8060ee31fa45fbceecb3ed57bc5d8195c8ea72c732e56f2c5f5adf9f785e76934300fe2b07aabc4fa5672c2eb39b5b7aad1393a7ff47dd42a048fa110b9a1db6 SHA512 8a8aa2e372b533a8bca5dc81a94c08c50470446c1457a487b18a96620841b8035344148bcb46b4e211c287ca42b0ee2db29ea402967bf55b8bb0958eb5fbabae +DIST bc-test-data-r1rv76.tar.gz 2074813467 BLAKE2B 3d1bd122a907e4c46f3c8b84c4d27b3327b6c6deaded623e5bc9842d00c62bdeb521b1be3bdd495ffa10f2d1facc73d41176829eda4511827d24eb0f62fccef9 SHA512 3de068667ce9572530fa6422bdbc4455d7f1edd85e12166e7a266a447ed0ffab50c33cc5a99e668caf79156f87d86512a5507534469d3e6f479b908d4d2a1fb7 diff --git a/dev-java/bcprov/bcprov-1.74.ebuild b/dev-java/bcprov/bcprov-1.74.ebuild new file mode 100644 index 000000000000..6918c239c192 --- /dev/null +++ b/dev-java/bcprov/bcprov-1.74.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.bouncycastle:bcprov-jdk18on:1.74" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple check-reqs + +DESCRIPTION="Java cryptography APIs" +HOMEPAGE="https://www.bouncycastle.org/java.html" +SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz + test? ( https://github.com/bcgit/bc-test-data/archive/r${PV/./rv}.tar.gz -> bc-test-data-r${PV/./rv}.tar.gz )" + +LICENSE="BSD" +SLOT="1.74" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" + +DEPEND=">=virtual/jdk-11:*" +RDEPEND=">=virtual/jre-1.8:*" +BDEPEND="app-arch/zip" + +DOCS=( {README,SECURITY}.md ) +HTML_DOCS=( {CONTRIBUTORS,index}.html ) + +S="${WORKDIR}/bc-java-r${PV/./rv}" + +check_env() { + if use test; then + # this is needed only for tests + CHECKREQS_MEMORY="2048M" + check-reqs_pkg_pretend + fi +} + +pkg_pretend() { + check_env +} + +pkg_setup() { + check_env + java-pkg-2_pkg_setup +} + +src_unpack() { + unpack bc-java-r${PV/./rv}.tar.gz + use test && unpack bc-test-data-r${PV/./rv}.tar.gz +} + +src_prepare() { + java-pkg-2_src_prepare + # TBD: unboundid-ldapsdk should be packaged from source. + java-pkg_clean ! -path "./libs/unboundid-ldapsdk-6.0.8.jar" +} + +src_compile() { + JAVA_RESOURCE_DIRS=( + "core/src/main/resources" + "prov/src/main/resources" + ) + JAVA_SRC_DIR=( + "core/src/main/java" + "prov/src/main/java" + "prov/src/main/jdk1.9" + ) + java-pkg-simple_src_compile +} + +src_test() { + mv ../bc-test-data-r${PV/./rv} bc-test-data || die "cannot move bc-test-data" + + JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/core/src/test/data" + JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}" + JAVA_TEST_GENTOO_CLASSPATH="junit-4" + + einfo "Testing \"core\"" + JAVA_TEST_RESOURCE_DIRS="core/src/test/resources" + JAVA_TEST_SRC_DIR="core/src/test/java" + pushd core/src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -name "AllTests.java" ) + popd || die + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test + + einfo "Testing bcprov" + JAVA_GENTOO_CLASSPATH_EXTRA=":core.jar:libs/unboundid-ldapsdk-6.0.8.jar" + JAVA_TEST_RESOURCE_DIRS="prov/src/test/resources" + JAVA_TEST_SRC_DIR="prov/src/test/java" + pushd prov/src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -name "AllTests.java" ) + popd || die + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} + +src_install() { + docinto html + dodoc -r docs + java-pkg-simple_src_install +} diff --git a/dev-java/bcprov/bcprov-1.72.ebuild b/dev-java/bcprov/bcprov-1.76.ebuild index 73df193c6c67..765e01e1dfd4 100644 --- a/dev-java/bcprov/bcprov-1.72.ebuild +++ b/dev-java/bcprov/bcprov-1.76.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.bouncycastle:bcprov-jdk18on:1.72" +MAVEN_ID="org.bouncycastle:bcprov-jdk18on:1.76" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple check-reqs DESCRIPTION="Java cryptography APIs" HOMEPAGE="https://www.bouncycastle.org/java.html" -SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz" +SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz + test? ( https://github.com/bcgit/bc-test-data/archive/r${PV/./rv}.tar.gz -> bc-test-data-r${PV/./rv}.tar.gz )" LICENSE="BSD" SLOT="0" @@ -43,11 +44,15 @@ pkg_setup() { java-pkg-2_pkg_setup } +src_unpack() { + unpack bc-java-r${PV/./rv}.tar.gz + use test && unpack bc-test-data-r${PV/./rv}.tar.gz +} + src_prepare() { - default - java-pkg_clean .. - # 3 unsolved test failures # 873442 - rm -r core/src/test/java/org/bouncycastle/pqc/legacy/math/ntru || die + java-pkg-2_src_prepare + # TBD: unboundid-ldapsdk should be packaged from source. + java-pkg_clean ! -path "./libs/unboundid-ldapsdk-6.0.8.jar" } src_compile() { @@ -64,6 +69,8 @@ src_compile() { } src_test() { + mv ../bc-test-data-r${PV/./rv} bc-test-data || die "cannot move bc-test-data" + JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/core/src/test/data" JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}" JAVA_TEST_GENTOO_CLASSPATH="junit-4" @@ -80,7 +87,7 @@ src_test() { java-pkg-simple_src_test einfo "Testing bcprov" - JAVA_GENTOO_CLASSPATH_EXTRA=":core.jar" # other value needed than for compilation + JAVA_GENTOO_CLASSPATH_EXTRA=":core.jar:libs/unboundid-ldapsdk-6.0.8.jar" JAVA_TEST_RESOURCE_DIRS="prov/src/test/resources" JAVA_TEST_SRC_DIR="prov/src/test/java" pushd prov/src/test/java || die diff --git a/dev-java/bcprov/metadata.xml b/dev-java/bcprov/metadata.xml index 1a34130e2c63..e3ec23b6df50 100644 --- a/dev-java/bcprov/metadata.xml +++ b/dev-java/bcprov/metadata.xml @@ -5,6 +5,9 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> + <upstream> + <remote-id type="github">bcgit/bc-java</remote-id> + </upstream> <longdescription> The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.8 and up. </longdescription> diff --git a/dev-java/bcutil/Manifest b/dev-java/bcutil/Manifest index 11f3fa328c20..880e2012db6f 100644 --- a/dev-java/bcutil/Manifest +++ b/dev-java/bcutil/Manifest @@ -1 +1 @@ -DIST bc-java-r1rv72.tar.gz 380374879 BLAKE2B 53c593c1d97e9ee56388479dce7386d254f74a8bab9612e802ebe963df84d1a397fe0c5a7a0d0db2ac2cd3252ae43e79c67b9d3ba1b5ffc20cc8727c7e1a6994 SHA512 dbfdd9e4f30ab713584830a0fd0d7e4f89904366bf4953a9e722656cc4cd92c9d29238649efa7b4cdab64e2c08f4b3b3c96667d1ade569ade5a5a2c9ad9d5b5c +DIST bc-java-r1rv76.tar.gz 31256952 BLAKE2B b791ef3da7189bc6990935aaad7c331c1bf6a45af0cdfc72056ae0cf1723e57ce15a76060251f6de630b0729ffe22ba4718255c103a8ab66db61f2e46f1201c8 SHA512 7d408821408bbabd209d9507b061f3113822878c12b12a040c829f5a8c6bdf8450719aef60c423025824bec1fcb6c63d8478d1f84f3cb1d692fdbacde6d9ce6e diff --git a/dev-java/bcutil/bcutil-1.72.ebuild b/dev-java/bcutil/bcutil-1.76.ebuild index 1f86ad03e5d7..27836258fffc 100644 --- a/dev-java/bcutil/bcutil-1.72.ebuild +++ b/dev-java/bcutil/bcutil-1.76.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.bouncycastle:bcutil-jdk18on:1.72" +MAVEN_ID="org.bouncycastle:bcutil-jdk18on:1.76" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple @@ -28,6 +28,7 @@ HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) S="${WORKDIR}/bc-java-r${PV/./rv}/util" +JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.util" JAVA_GENTOO_CLASSPATH="bcprov" JAVA_SRC_DIR=( "src/main/java" diff --git a/dev-java/bcutil/metadata.xml b/dev-java/bcutil/metadata.xml index 8f66cc0abd4b..126e6e2a7798 100644 --- a/dev-java/bcutil/metadata.xml +++ b/dev-java/bcutil/metadata.xml @@ -4,6 +4,9 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">bcgit/bc-java</remote-id> + </upstream> <longdescription> The Bouncy Castle Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls. This jar contains APIs for JDK 1.8 and up. </longdescription> diff --git a/dev-java/aqute-bnd-annotation/Manifest b/dev-java/bnd-annotation/Manifest index 5b277a425cec..4a41f3f9f080 100644 --- a/dev-java/aqute-bnd-annotation/Manifest +++ b/dev-java/bnd-annotation/Manifest @@ -1 +1,2 @@ +DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c DIST biz.aQute.bnd.annotation-6.3.1-sources.jar 50600 BLAKE2B 6ace86a803c378be17b4ecfb658eb17e9c95f4f8797cdf22cbb9a5acb2a382fe0ee6791ad0280a2de9d9e85fbe2732487e693b2c93f08145b3633810f480f8b9 SHA512 751855a173e6d5f9d09f6d63775b97d971cebbfc019053988ec7fe144d0f49b4d09b9a2339d63bb43cea51d09d7d766554255f727cad8d73d9c196097e58d0fd diff --git a/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild b/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild index 0ec922b091fb..9522fc6820a9 100644 --- a/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild +++ b/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: diff --git a/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild b/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild new file mode 100644 index 000000000000..0c3d2aee53e1 --- /dev/null +++ b/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.annotation:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="bnd Annotations Library" +HOMEPAGE="https://bnd.bndtools.org/" +SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/bnd-${PV}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64" + +DEPEND=" + dev-java/osgi-cmpn:8 + >=virtual/jdk-11:* +" + +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.annotation" +JAVA_CLASSPATH_EXTRA="osgi-cmpn-8" +JAVA_SRC_DIR="biz.aQute.bnd.annotation/src" diff --git a/dev-java/logback-core/metadata.xml b/dev-java/bnd-annotation/metadata.xml index 36093b7d6d6d..cb6317e530db 100644 --- a/dev-java/logback-core/metadata.xml +++ b/dev-java/bnd-annotation/metadata.xml @@ -5,8 +5,6 @@ <email>java@gentoo.org</email> </maintainer> <upstream> - <bugs-to>https://logback.qos.ch/bugreport.html</bugs-to> - <changelog>https://logback.qos.ch/news.html</changelog> - <remote-id type="github">qos-ch/logback</remote-id> + <remote-id type="github">bndtools/bnd</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/bnd-util/Manifest b/dev-java/bnd-util/Manifest new file mode 100644 index 000000000000..a890570b45c8 --- /dev/null +++ b/dev-java/bnd-util/Manifest @@ -0,0 +1 @@ +DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c diff --git a/dev-java/bnd-util/bnd-util-7.0.0.ebuild b/dev-java/bnd-util/bnd-util-7.0.0.ebuild new file mode 100644 index 000000000000..73c6251737e2 --- /dev/null +++ b/dev-java/bnd-util/bnd-util-7.0.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.util:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="AQute Bnd Utilities" +HOMEPAGE="https://bnd.bndtools.org/" +SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/bnd-${PV}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64" + +CP_DEPEND="dev-java/osgi-annotation:0" + +DEPEND="${CP_DEPEND} + ~dev-java/bnd-annotation-${PV}:0 + ~dev-java/libg-${PV}:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + dev-java/slf4j-api:0 + >=virtual/jdk-17:* +" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-17:* +" + +JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.util" +JAVA_CLASSPATH_EXTRA=" + bnd-annotation + libg + osgi-cmpn-8 + osgi-core + slf4j-api +" +JAVA_SRC_DIR="biz.aQute.bnd.util/src" diff --git a/dev-java/bnd-util/metadata.xml b/dev-java/bnd-util/metadata.xml new file mode 100644 index 000000000000..cb6317e530db --- /dev/null +++ b/dev-java/bnd-util/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">bndtools/bnd</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/bndlib/Manifest b/dev-java/bndlib/Manifest index 068af0665527..8f4c666567aa 100644 --- a/dev-java/bndlib/Manifest +++ b/dev-java/bndlib/Manifest @@ -1 +1,2 @@ +DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e diff --git a/dev-java/bndlib/bndlib-7.0.0.ebuild b/dev-java/bndlib/bndlib-7.0.0.ebuild new file mode 100644 index 000000000000..5eedfb83dd3e --- /dev/null +++ b/dev-java/bndlib/bndlib-7.0.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="biz.aQute.bnd:biz.aQute.bndlib:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="bndlib: A Swiss Army Knife for OSGi" +HOMEPAGE="https://bnd.bndtools.org/" +SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/bnd-${PV}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64" + +CP_DEPEND=" + ~dev-java/bnd-annotation-${PV}:0 + ~dev-java/bnd-util-${PV}:0 + ~dev-java/libg-${PV}:0 + dev-java/osgi-annotation:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + dev-java/slf4j-api:0 +" + +DEPEND="${CP_DEPEND} + dev-java/osgi-service-log:0 + >=virtual/jdk-17:* +" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-17:* +" + +JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bndlib" +JAVA_CLASSPATH_EXTRA="osgi-service-log" +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR="biz.aQute.bndlib/src" + +src_prepare() { + java-pkg-2_src_prepare + mkdir res || die + + # java-pkg-simple wants resources in JAVA_RESOURCE_DIRS + mv biz.aQute.bndlib/img res || die + pushd biz.aQute.bndlib/src > /dev/null || die + find -type f \ + ! -name '*.java' \ + | xargs cp --parent -t ../../res || die + popd > /dev/null || die +} diff --git a/dev-java/bndlib/metadata.xml b/dev-java/bndlib/metadata.xml index 94feb65b0b18..cb6317e530db 100644 --- a/dev-java/bndlib/metadata.xml +++ b/dev-java/bndlib/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <upstream> - <remote-id type="github">bndtools/bnd</remote-id> - </upstream> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">bndtools/bnd</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild b/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild index 545e6b9fff42..acbd619b97b7 100644 --- a/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild +++ b/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ MAVEN_ID="org.brotli:dec:${PV}" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Brotli decompressor" -HOMEPAGE="https://github.com/google/brotli" +HOMEPAGE="https://brotli.org/ https://github.com/google/brotli" SRC_URI="https://repo1.maven.org/maven2/org/brotli/dec/${PV}/dec-${PV}-sources.jar -> ${P}-sources.jar" LICENSE="MIT" diff --git a/dev-java/brotli-dec/metadata.xml b/dev-java/brotli-dec/metadata.xml index 6021501589e0..44cc9d815d1f 100644 --- a/dev-java/brotli-dec/metadata.xml +++ b/dev-java/brotli-dec/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> + <maintainer type="project"> + <email>java@gentoo.org</email> + <name>Java</name> + </maintainer> + <upstream> + <remote-id type="github">google/brotli</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild index ab37f59be694..fe4312864b67 100644 --- a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild +++ b/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,8 +10,8 @@ inherit java-pkg-2 java-ant-2 DESCRIPTION="JDBC drivers with JNDI-bindable DataSources" HOMEPAGE="https://www.mchange.com/projects/c3p0/" +SRC_URI="mirror://sourceforge/project/c3p0/c3p0-src/c3p0-${PV}/${P}.src.tgz" -SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz" LICENSE="|| ( EPL-1.0 LGPL-2.1 )" SLOT="0" KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux" diff --git a/dev-java/c3p0/metadata.xml b/dev-java/c3p0/metadata.xml index c3cad36b9855..668db4bc7044 100644 --- a/dev-java/c3p0/metadata.xml +++ b/dev-java/c3p0/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">c3p0</remote-id> + <remote-id type="github">swaldman/c3p0</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/cache2k-api/cache2k-api-0.23.1.ebuild b/dev-java/cache2k-api/cache2k-api-0.23.1.ebuild index 3acd23e1f290..ac521a305cf9 100644 --- a/dev-java/cache2k-api/cache2k-api-0.23.1.ebuild +++ b/dev-java/cache2k-api/cache2k-api-0.23.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://cache2k.org" SRC_URI="https://github.com/cache2k/cache2k/archive/v${PV}.tar.gz -> cache2k-${PV}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest index ce66a8df6605..c9d10fb3e58a 100644 --- a/dev-java/commons-codec/Manifest +++ b/dev-java/commons-codec/Manifest @@ -1 +1,2 @@ -DIST commons-codec-1.15.tar.gz 423639 BLAKE2B 5d9d3dd44fda7eee77048eaa1e28f54f9baff7ad276f7e718f4a4d6c5b26605914809db538e9832bf06b1468a65432645ef9de74aec9f9af9973668a82bd996f SHA512 dcf0b86f269a96362dca5b36b9e764a07e390634804b359d4dbd1a0c50bfcc9f778e3797f196e1f553d76dd25b3c6fd016f0ffbbca856fa6c88d3d55791889ce +DIST commons-codec-1.16.0-src.tar.gz 447581 BLAKE2B 111151b4cf409dbc6f69106ed30f2cfd60a1ab3aa15eb0cfe80ff1c2a06875f6856e387f66751c26f58dc29907ae7a03b16f23f7860114839df298a6c37d9fdd SHA512 5212beae43a59d5a92c80f87640278913bf07d6527ead573710391a8b5c813af67f8086de5cd80f4b06845752652684d7c28f6236f5a8bd0bd6a8b89dc0d9532 +DIST commons-codec-1.16.0-src.tar.gz.asc 488 BLAKE2B 96ac95b5efbc812b5df0d002eeff874ff23e05e0229e4f49bf29aaf9c75b32845adeb803c9c8d4d3b190bf2bfab626c59cb2fa2b2439b5611b158d27b73d4c0c SHA512 03f9281e93cd4a1cf42878bd25045368bc72a50edace9b38a977658e7e83b45bfe835065e80e0838a5e57d16a8737624ab388cdcd3fee58ec2114ff4fc241816 diff --git a/dev-java/commons-codec/commons-codec-1.15-r1.ebuild b/dev-java/commons-codec/commons-codec-1.15-r1.ebuild deleted file mode 100644 index 95a9ec2ab516..000000000000 --- a/dev-java/commons-codec/commons-codec-1.15-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom commons-codec-1.15-src/pom.xml --download-uri https://apache.osuosl.org/commons/codec/source/commons-codec-1.15-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-codec-1.15.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="commons-codec:commons-codec:1.15" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Implementations of common encoders and decoders in Java" -HOMEPAGE="https://commons.apache.org/proper/commons-codec/" -SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux" - -# Compile dependencies -# POM: ${P}-src/pom.xml -# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4 -# test? org.apache.commons:commons-lang3:3.8 -> >=dev-java/commons-lang-3.11:3.6 - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - >=dev-java/commons-lang-3.11:3.6 - ) -" - -RDEPEND=">=virtual/jre-1.8:*" - -S="${WORKDIR}/${P}-src" - -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.codec" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" diff --git a/dev-java/commons-codec/commons-codec-1.16.0.ebuild b/dev-java/commons-codec/commons-codec-1.16.0.ebuild new file mode 100644 index 000000000000..3f139af22920 --- /dev/null +++ b/dev-java/commons-codec/commons-codec-1.16.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="commons-codec:commons-codec:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Implementations of common encoders and decoders in Java" +HOMEPAGE="https://commons.apache.org/proper/commons-codec/" +SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/codec/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/${P}-src" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux" +RESTRICT="test" #839681 + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/commons-lang:3.6 + dev-java/hamcrest:0 + dev-java/junit:5[migration-support] + ) +" +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.codec" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH=" + junit-4 + junit-5 + commons-lang-3.6 + hamcrest +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" diff --git a/dev-java/commons-codec/metadata.xml b/dev-java/commons-codec/metadata.xml index 05adc2eb44df..3a111ef6e0e6 100644 --- a/dev-java/commons-codec/metadata.xml +++ b/dev-java/commons-codec/metadata.xml @@ -5,6 +5,9 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> +<upstream> + <remote-id type="github">apache/commons-codec</remote-id> +</upstream> <longdescription> Codec was formed as an attempt to focus development effort on one diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest index 7038859c5ae2..ce4044f37b42 100644 --- a/dev-java/commons-collections/Manifest +++ b/dev-java/commons-collections/Manifest @@ -1,3 +1,4 @@ DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230 DIST commons-collections-3.2.2-src.tar.gz.asc 819 BLAKE2B a7d170b03613cddddc284908d95287fc092c01b125c5adffebfc493daf9119e0c9d82fdc7d8ce1865ef45a1e015072f5a09181abcba5b17c9c48d7c6333279da SHA512 c5d33518ed5343b38c10e317f677266858bd9614eff7fdc13a2e0131fe71836c3694f49898843e6978496d7dd2f976b82922230a44cde1eac5f6cdfdb822dcd0 -DIST commons-collections-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee +DIST commons-collections4-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee +DIST commons-collections4-4.4-src.tar.gz.asc 499 BLAKE2B 8217d8c8714d2c07a66eca22069b40e2d1012881385172bedd29d52f14ae5c6e287ce2f097f1bde77af06677c776e45c3e67dc6c885709f6c97f61155252131c SHA512 533c47ad2cb6b6926ea8e4aaf9072b6c7a0c9d4a6becb31163a33a6cba8a9888534b74701935a0f0e797c10cbc688331d9abefc3d4085edcd9a7d29260f735ae diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild index 843a9c53c215..77421d30330b 100644 --- a/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild +++ b/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild @@ -28,7 +28,7 @@ DEPEND=" RDEPEND=">=virtual/jre-1.8:*" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" S="${WORKDIR}/${P}-src" diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild new file mode 100644 index 000000000000..d5c0110ad865 --- /dev/null +++ b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="commons-collections:commons-collections:${PV}" +JAVA_TESTING_FRAMEWORKS="junit" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Jakarta-Commons Collections Component" +HOMEPAGE="https://commons.apache.org/collections/" +SRC_URI="https://archive.apache.org/dist/commons/collections/source/${P}-src.tar.gz + verify-sig? ( https://archive.apache.org/dist/commons/collections/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/${P}-src" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" +# broken with jdk:21 - https://bugs.gentoo.org/916445 +DEPEND=" + <=virtual/jdk-17:* + test? ( dev-java/junit:0 ) +" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {NOTICE,README,RELEASE-NOTES}.txt ) +HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html ) + +PATCHES=( "${FILESDIR}/${P}-fixes.patch" ) + +JAVA_SRC_DIR="src/java" +JAVA_TEST_GENTOO_CLASSPATH="junit" +JAVA_TEST_SRC_DIR="src/test" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + +src_test() { + if [[ "${ARCH}" = "ppc" ]]; then + einfo "tests are disabled on ppc" + else + java-pkg-simple_src_test + fi +} diff --git a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild deleted file mode 100644 index 5c4b6e0ebaee..000000000000 --- a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild commons-collections-4.4.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.commons:commons-collections4:4.4" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities" -HOMEPAGE="https://commons.apache.org/proper/commons-collections/" -SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> ${P}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Compile dependencies -# POM: pom.xml -# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4 -# test? org.apache.commons:commons-lang3:3.9 -> >=dev-java/commons-lang-3.12.0:3.6 -# test? org.easymock:easymock:4.0.2 -> !!!suitable-mavenVersion-not-found!!! - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/easymock:3.2 - dev-java/commons-lang:3.6 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* -" - -DOCS=( {CONTRIBUTING,README}.md {LICENSE,NOTICE,RELEASE-NOTES}.txt ) -HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html ) - -S="${WORKDIR}/commons-collections4-${PV}-src" - -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6,easymock-3.2" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.collections4" - -src_test() { - # https://github.com/apache/commons-collections/blob/cab58b3a8093a2f6b84f12783a3fb358747310f7/pom.xml#L542-L550 - pushd src/test/java || die - local TESTS=$(find * -name "*Test.java" ! -name "TestUtils.java" ! -name "Abstract*.java" ! -name "BulkTest.java") - TESTS="${TESTS//.java}" - TESTS="${TESTS//\//.}" - popd - - JAVA_TEST_RUN_ONLY=( "${TESTS}" ) - java-pkg-simple_src_test -} - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/commons-collections/commons-collections-4.4-r2.ebuild b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild new file mode 100644 index 000000000000..059e87b91233 --- /dev/null +++ b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.commons:commons-collections4:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities" +HOMEPAGE="https://commons.apache.org/proper/commons-collections/" +SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/collections/source/${PN}4-${PV}-src.tar.gz.asc )" +S="${WORKDIR}/commons-collections4-${PV}-src" + +LICENSE="Apache-2.0" +SLOT="4" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" +# broken with jdk:21 - https://bugs.gentoo.org/916445 +DEPEND=" + <=virtual/jdk-17:* + test? ( + dev-java/easymock:3.2 + dev-java/commons-lang:3.6 + ) +" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {CONTRIBUTING,README}.md {NOTICE,RELEASE-NOTES}.txt ) +HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html ) + +JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.collections4" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH=" + commons-lang-3.6 + easymock-3.2 + junit-4 +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +src_test() { + # https://github.com/apache/commons-collections/blob/commons-commons-collections-4.4/pom.xml#L542-L550 + pushd src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -name "*Test.java" \ + ! -name "TestUtils.java" \ + ! -name "Abstract*.java" \ + ! -name "BulkTest.java") + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + popd + java-pkg-simple_src_test +} diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml index 62a57c23950f..23e31dd764c3 100644 --- a/dev-java/commons-collections/metadata.xml +++ b/dev-java/commons-collections/metadata.xml @@ -5,6 +5,12 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> + <upstream> + <bugs-to>https://issues.apache.org/jira/projects/COLLECTIONS/issues</bugs-to> + <changelog>https://commons.apache.org/proper/commons-collections/changes-report.html</changelog> + <doc>https://commons.apache.org/proper/commons-collections/userguide.html</doc> + <remote-id type="github">apache/commons-collections</remote-id> + </upstream> <longdescription> The Apache Commons Collections package contains types that extend and augment the Java Collections Framework. </longdescription> diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest index 3559b9858634..2255e60c5501 100644 --- a/dev-java/commons-daemon/Manifest +++ b/dev-java/commons-daemon/Manifest @@ -1,2 +1,2 @@ -DIST commons-daemon-1.3.3-src.tar.gz 290415 BLAKE2B c9c175ba52cef25ce6d1b56c7466aa5e775ed1ac3ca7c710c3519574c35e8a66ff5846313de8da594511ad411e802b7e0b647cbfd66a50abaaa0d39574a4e103 SHA512 ec246e2c05d66408374ba56b3715b13f8f24f89af11fa00c2381dc19c188f1b6228f19351c97d5774808a804b83fdbdfb8f537d099db062c39ffd281c142ee77 -DIST commons-daemon-1.3.3-src.tar.gz.asc 873 BLAKE2B 01fc7ec60393f2077a2bbf80aacb1a03b821cb52f88d87010f26a5811e2695d08b7c01193d00c2fb1a28bb875b63a5a0a935feadf7c1f00c4799aafa32592804 SHA512 c42b36acd45665daeda06a59006f05fd9846817e4e1065ef89dfedef060216ecce0316d06400437e4fb5138cf41c2fe52790cd5da9306c64e3000a3765bad2a2 +DIST commons-daemon-1.3.4-src.tar.gz 290834 BLAKE2B be57fbf89cad23fb4108e97b8e75d8380ff5b286068edfed65cd3539971375949ec80fd5aeece50a6498642f60e26498eb37ea3778f503d7498662ae79ecd14e SHA512 bb36d88bc21a5777245012b2a73ee0e764b85715731f54cc4ff09343e95ccb18fc6c68b3ae9c680fb45a60c7ef5ed0f9e40991c2c03246dd7f8dd65031eddf24 +DIST commons-daemon-1.3.4-src.tar.gz.asc 873 BLAKE2B f7886e67e2cfb0211d3271d79c251d07e5b0d7f7819566891e838619021ab9e3f468e3647f2f901d41a6d00f12b30adfa2d16f828ac5ce526666caab30ab8001 SHA512 eae6b01844bf5c49a95a60f4b59e0b989488728edb209252779f83e33ea3eeb53900a5fdeee5d953b231b241ba14a27c77967bdd3fe5acf2d9c6da50c225c79b diff --git a/dev-java/commons-daemon/commons-daemon-1.3.3.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.4.ebuild index f4bbf1fb0a24..fcc845ad0c9a 100644 --- a/dev-java/commons-daemon/commons-daemon-1.3.3.ebuild +++ b/dev-java/commons-daemon/commons-daemon-1.3.4.ebuild @@ -1,14 +1,11 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/daemon/source/commons-daemon-1.3.3-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-daemon-1.3.3.ebuild - EAPI=8 -# No tests because "package org.junit.jupiter.api does not exist" -JAVA_PKG_IUSE="doc source" -MAVEN_ID="commons-daemon:commons-daemon:1.3.3" +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="commons-daemon:commons-daemon:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple toolchain-funcs verify-sig @@ -16,25 +13,27 @@ DESCRIPTION="Tools to allow Java programs to run as UNIX daemons" HOMEPAGE="https://commons.apache.org/proper/commons-daemon/" SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/daemon/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/${P}-src" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ppc64 x86" +RESTRICT="test" #839681 -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc" +DEPEND=">=virtual/jdk-1.8:* + test? ( dev-java/junit:5[migration-support] )" +RDEPEND=">=virtual/jre-1.8:*" DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,NOTICE,RELEASE-NOTES}.txt ) HTML_DOCS=( PROPOSAL.html ) PATCHES=( "${FILESDIR}/commons-daemon-1.3.1-Make.patch" ) -S="${WORKDIR}/${P}-src" - JAVA_ENCODING="iso-8859-1" JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH="junit-4 junit-5" +JAVA_TEST_SRC_DIR="src/test/java" src_prepare() { default #780585 diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest index c614da984589..070187d939f5 100644 --- a/dev-java/commons-lang/Manifest +++ b/dev-java/commons-lang/Manifest @@ -1,2 +1,2 @@ -DIST commons-lang-2.6-src.tar.gz 564032 BLAKE2B 9d72b0426f2146eaa8498a6601edf80dbf45a16ef5ee14cf4ed87130e6d3732d5c713f25f44c10435baa1357f61a271acb88483915968aaf645d1ceaa318c601 SHA512 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87 -DIST commons-lang-3.12.0-sources.tar.gz 1072858 BLAKE2B d6b7ee9ef165e60f61d8d0dfaaf38919877f2edc6742cd58b2b70d379e807e75d9dc24e19f23db1b174d1797d6ef0af7700d686dd835d7a40bf2b2a91346e215 SHA512 80d1b960ae0b02859be329ea60d68cef33f3c7be7ec19752b3c9cfef442adef480878317ce2cfa309a27e662e2c72cab22023eaa3702e27970a1e5d55ca43f57 +DIST commons-lang-3.13.0-sources.tar.gz 1133483 BLAKE2B bf2239b03129f3cc6104c8ff66ac9d0c2dc7367111e4a8c4d76b5e2773c56a17607e28b24f5d7283b2119c3421f1526dac4ef98ed16da9e8bf9d033fbb7a4b80 SHA512 6fca0ce86aea84458021360bac3f6775135a1a5c1826194921e2d4ead7c12f6ac560e7c3fc240112f862aaee24be8754c37dd867f45e9449cde4a388018d8691 +DIST commons-lang-3.13.0-sources.tar.gz.asc 488 BLAKE2B ecfc26f598b4a683a14803f5eee42f9b9ebfc7c02dac5b9fdc72ef97839e80ac648489da4e136f94044852fb09eff05bc08021cf1678ea9c19065a5b69c1375f SHA512 4d9dca040d9f06791f7f67ad7313e5a2c6bc19a07a62ae4dbcd10712afbcc51e926258938a54f0507d8cd1486041b46b29ed070b488b55833c30cbb6786c4145 diff --git a/dev-java/commons-lang/commons-lang-2.6-r2.ebuild b/dev-java/commons-lang/commons-lang-2.6-r2.ebuild deleted file mode 100644 index cdb5a083002e..000000000000 --- a/dev-java/commons-lang/commons-lang-2.6-r2.ebuild +++ /dev/null @@ -1,39 +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 test" -MAVEN_ID="commons-lang:commons-lang:2.6" -JAVA_PKG_WANT_SOURCE="1.4" -JAVA_PKG_WANT_TARGET="1.4" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Commons components to manipulate core java classes" -HOMEPAGE="https://commons.apache.org/proper/commons-lang/" -SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2.1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" - -DEPEND="virtual/jdk:1.8 - test? ( - dev-java/ant-junit:0 - )" - -RDEPEND="virtual/jre:1.8" - -S="${WORKDIR}/${P}-src" - -JAVA_ANT_ENCODING="ISO-8859-1" - -src_install() { - java-pkg_newjar "target/${P}.jar" "${PN}.jar" - dodoc RELEASE-NOTES.txt NOTICE.txt - docinto html - dodoc *.html - use doc && java-pkg_dojavadoc target/apidocs - use source && java-pkg_dosrc src/main/java/* -} diff --git a/dev-java/commons-lang/commons-lang-3.12.0.ebuild b/dev-java/commons-lang/commons-lang-3.12.0.ebuild deleted file mode 100644 index 4979efe4b1eb..000000000000 --- a/dev-java/commons-lang/commons-lang-3.12.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://mirror.checkdomain.de/apache//commons/lang/source/commons-lang3-3.12.0-src.tar.gz --slot 3.6 --keywords "~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" --ebuild commons-lang-3.12.0.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.commons:commons-lang3:3.12.0" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Commons components to manipulate core java classes" -HOMEPAGE="https://commons.apache.org/proper/commons-lang/" -SRC_URI="mirror://apache/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-sources.tar.gz" -LICENSE="Apache-2.0" -SLOT="3.6" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" - -DEPEND=" - >=virtual/jdk-1.8:* -" - -RDEPEND=" - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${PN}3-${PV}-src" - -JAVA_ENCODING="ISO-8859-1" - -JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/commons-lang/commons-lang-3.13.0.ebuild b/dev-java/commons-lang/commons-lang-3.13.0.ebuild new file mode 100644 index 000000000000..ebcca6edf83b --- /dev/null +++ b/dev-java/commons-lang/commons-lang-3.13.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.apache.commons:commons-lang3:3.13.0" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Commons components to manipulate core java classes" +HOMEPAGE="https://commons.apache.org/proper/commons-lang/" +SRC_URI="https://archive.apache.org/dist/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-sources.tar.gz + verify-sig? ( https://archive.apache.org/dist/commons/lang/source/${PN}3-${PV}-src.tar.gz.asc -> ${P}-sources.tar.gz.asc )" + +S="${WORKDIR}/${PN}3-${PV}-src" + +LICENSE="Apache-2.0" +SLOT="3.6" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" + +JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.lang3" +JAVA_ENCODING="ISO-8859-1" +JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/commons-lang/metadata.xml b/dev-java/commons-lang/metadata.xml index 6021501589e0..597bf973bf66 100644 --- a/dev-java/commons-lang/metadata.xml +++ b/dev-java/commons-lang/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> + <maintainer type="project"> + <email>java@gentoo.org</email> + <name>Java</name> + </maintainer> + <upstream> + <remote-id type="github">apache/commons-lang</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/commons-net/commons-net-3.9.0.ebuild b/dev-java/commons-net/commons-net-3.9.0.ebuild index 54e35b4ca5a0..fd0d7b728a57 100644 --- a/dev-java/commons-net/commons-net-3.9.0.ebuild +++ b/dev-java/commons-net/commons-net-3.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" DOCS=( CONTRIBUTING.md diff --git a/dev-java/concurrentlinkedhashmap-lru/Manifest b/dev-java/concurrentlinkedhashmap-lru/Manifest new file mode 100644 index 000000000000..1e9c38335e81 --- /dev/null +++ b/dev-java/concurrentlinkedhashmap-lru/Manifest @@ -0,0 +1 @@ +DIST concurrentlinkedhashmap-lru-1.4.2.tar.gz 245357 BLAKE2B ac743e2be30195f171154c179ac1b4a6bc6b563b080555c664cdd57fc30d083525f03a8367a891e1087623d455adef27c7ff7416b5c8523c01fc3d5ef775a185 SHA512 95f33cdeb2e3e65be0fa26a825339c4c60eb830e07895fbae731103ef14a9599137f8fad18f9b0a582ec2552ccc1391f5d0338837395e35c1d28de977614a199 diff --git a/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild b/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild new file mode 100644 index 000000000000..1cc5901e7454 --- /dev/null +++ b/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild @@ -0,0 +1,36 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A high performance version of java.util.LinkedHashMap for use as software cache" +HOMEPAGE="https://github.com/ben-manes/concurrentlinkedhashmap" +SRC_URI="https://github.com/ben-manes/concurrentlinkedhashmap/archive/${P}.tar.gz" +S="${WORKDIR}/${PN%lru}${P}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +CP_DEPEND="dev-java/jsr305:0" + +RDEPEND=">=virtual/jre-1.8:* + ${CP_DEPEND}" +DEPEND=">=virtual/jdk-1.8:* + ${CP_DEPEND}" + +JAVA_SRC_DIR="src/main/java" + +src_prepare() { + java-pkg-2_src_prepare + # https://github.com/ben-manes/concurrentlinkedhashmap/issues/46#issuecomment-160696203 + rm src/main/java/com/googlecode/concurrentlinkedhashmap/ConcurrentHashMapV8.java || die + sed \ + -e 's/ConcurrentHashMapV8/ConcurrentHashMap/' \ + -i src/main/java/com/googlecode/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java || die +} diff --git a/dev-java/concurrentlinkedhashmap-lru/metadata.xml b/dev-java/concurrentlinkedhashmap-lru/metadata.xml new file mode 100644 index 000000000000..fe2d156a4574 --- /dev/null +++ b/dev-java/concurrentlinkedhashmap-lru/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">ben-manes/concurrentlinkedhashmap</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/coursier-bin/Manifest b/dev-java/coursier-bin/Manifest index 0384c0fbe465..d8d59c15783b 100644 --- a/dev-java/coursier-bin/Manifest +++ b/dev-java/coursier-bin/Manifest @@ -1,3 +1,2 @@ -DIST coursier-bin-2.1.0.gz 20682614 BLAKE2B 16209943324466bc0e07b139bb17001f4490fde41dc683f4e534290e2394f1182493a63ec55235c42f3bd2fc5bd187c78c84386db3ab97c0c8bb03400f25b3d9 SHA512 f8e9e1cc972fe433ddab325c97d927beb70af0b81c4381e7bd96e10c12e996bc2060ce82406758e48a33f12fe22c086f9c21020afb6e8e99fe8e6d693124b59f -DIST coursier-bin-2.1.2.gz 20649289 BLAKE2B 85abbb1b0cdc5ee2fadea1b6520ef07d61335adaeab0c5768bb0ba109599b2483fb0c3ceea07f705bda4b206f64aaca3850b77b3a7e4fa3ebaddc73e44072b50 SHA512 ed2729abadbb6be535a28fd124f48f2901f47d6bd141d476d87d40b32b158b7d78d561748b038eec95ef5a1c185fce91aa9cd2a03213c328d65c20b3b687b6d3 -DIST coursier-bin-2.1.4.gz 20662315 BLAKE2B 33009be5bc0a8ee415bd08d5e13cace34011ab2733c5a0aff47e7e5eb4254b4e4205b0580d1df6bb6b38d66059ffab7f929fa83c50f1bd052d3c3dffffc73dd0 SHA512 9144309c437f29e7d57149b12dd5810612d7b624299c2e392d6e11aa3a15a71d33dfb131751da10345c15feaeeac3c4f1dd878777354c2d49a8c2fbb6d74da0e +DIST coursier-bin-2.1.5.gz 20679081 BLAKE2B 8ab0d971949b7a5527c82686fab9d62f6dc360ce7ff72bfc4d5a123401e577f17b2392e9a919aebe1c988a477a273d77cd3eb86dcb7b73c0c1a609cccac77eea SHA512 6397f13f82c91079575f58ccbd35e788a2760179cf5c11a986962e3bbe9c669b6e06730a6ff12e0aeb26198df4448e822e927a5d6bd031f67dab8072835979f6 +DIST coursier-bin-2.1.7.gz 20790038 BLAKE2B 6e362ae784fcb7007f0adc58604d72dba33cb37f0726883b69f9f298e38759e3acea0232edac30c7cb34c5b837598e6b2c0947345938bce196f7a326a4aa3f0e SHA512 b6df4d7ad89f735989dfb4bb8cacbdf1559dd5ea4f494b7e72df544bd24a3a208738cf37d1cfd7944bb6aebc0e1b6d32b1bfd48c9f333cf54919a055afd5348e diff --git a/dev-java/coursier-bin/coursier-bin-2.1.4.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.4.ebuild deleted file mode 100644 index 9bf4cb6eb641..000000000000 --- a/dev-java/coursier-bin/coursier-bin-2.1.4.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -get_orig_coursier_pv() { - local orig_pv=$(ver_rs 3 -) - orig_pv=${orig_pv/rc/RC} - orig_pv=${orig_pv/pre/M} - echo "${orig_pv}" -} - -DESCRIPTION="Java/Scala artifact fetching, bundling and deploying" -HOMEPAGE="https://get-coursier.io/" -SRC_URI="https://github.com/coursier/coursier/releases/download/v$(get_orig_coursier_pv)/cs-x86_64-pc-linux.gz -> ${P}.gz" - -KEYWORDS="~amd64" -LICENSE="Apache-2.0" -SLOT="0" - -S="${WORKDIR}" - -RDEPEND=">=virtual/jre-8" - -QA_FLAGS_IGNORED="usr/bin/coursier" -QA_TEXTRELS="usr/bin/coursier" - -src_install() { - newbin "${P}" coursier -} diff --git a/dev-java/coursier-bin/coursier-bin-2.1.0.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.5.ebuild index 4c77d05f1d13..4c77d05f1d13 100644 --- a/dev-java/coursier-bin/coursier-bin-2.1.0.ebuild +++ b/dev-java/coursier-bin/coursier-bin-2.1.5.ebuild diff --git a/dev-java/coursier-bin/coursier-bin-2.1.2.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.7.ebuild index 9bf4cb6eb641..4c77d05f1d13 100644 --- a/dev-java/coursier-bin/coursier-bin-2.1.2.ebuild +++ b/dev-java/coursier-bin/coursier-bin-2.1.7.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Java/Scala artifact fetching, bundling and deploying" HOMEPAGE="https://get-coursier.io/" SRC_URI="https://github.com/coursier/coursier/releases/download/v$(get_orig_coursier_pv)/cs-x86_64-pc-linux.gz -> ${P}.gz" -KEYWORDS="~amd64" +KEYWORDS="amd64" LICENSE="Apache-2.0" SLOT="0" diff --git a/dev-java/coursier-bin/metadata.xml b/dev-java/coursier-bin/metadata.xml index eb6b7081158b..17a908b541f0 100644 --- a/dev-java/coursier-bin/metadata.xml +++ b/dev-java/coursier-bin/metadata.xml @@ -7,5 +7,7 @@ </maintainer> <upstream> <remote-id type="github">coursier/coursier</remote-id> + <bugs-to>https://github.com/coursier/coursier/issues</bugs-to> + <changelog>https://github.com/coursier/coursier/releases</changelog> </upstream> </pkgmetadata> diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest index aa67f4731d80..b68a29378f06 100644 --- a/dev-java/eclipse-ecj/Manifest +++ b/dev-java/eclipse-ecj/Manifest @@ -1,2 +1,3 @@ DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f +DIST ecjsrc-4.30.jar 2330181 BLAKE2B 7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d255559bd376bf158b114e30a17d40 SHA512 ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23 diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild index f23b7003ab23..fbd6934fc695 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ HOMEPAGE="https://www.eclipse.org/" SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar" LICENSE="EPL-1.0" -KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" SLOT="4.15" IUSE="+ant" diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild index 5ff793c562b0..4ad6e3222bb1 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild @@ -12,10 +12,10 @@ DMF="R-${PV}-202211231800" DESCRIPTION="Eclipse Compiler for Java" HOMEPAGE="https://www.eclipse.org/" -SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar" +SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar" LICENSE="EPL-1.0" -KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" SLOT="4.26" IUSE="+ant" diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.30.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.30.ebuild new file mode 100644 index 000000000000..4dcc76c35f8f --- /dev/null +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.30.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +# 3.36.0 according to +# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_30/org.eclipse.jdt.core.compiler.batch/pom.xml#L20 +MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.36.0" + +inherit java-pkg-2 java-pkg-simple prefix + +DMF="R-${PV/_rc/RC}-202312010110" + +DESCRIPTION="Eclipse Compiler for Java" +HOMEPAGE="https://www.eclipse.org/" +SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar" +S="${WORKDIR}" + +LICENSE="EPL-1.0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +SLOT="4.30" + +BDEPEND=" + app-arch/unzip + app-arch/zip +" +COMMON_DEP="app-eselect/eselect-java" +# ElementsImpl9.java:206: error: +# method does not override or implement a method from a supertype +DEPEND="${COMMON_DEP} + dev-java/ant-core:0 + >=virtual/jdk-21:*" +# Parser.java:1095: error: +# pattern matching in instanceof is not supported in -source 11 +RDEPEND="${COMMON_DEP} + >=virtual/jre-17:*" + +DOCS=( org/eclipse/jdt/core/README.md ) + +JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch" +JAVA_CLASSPATH_EXTRA="ant-core" +JAVA_JAR_FILENAME="ecj.jar" +JAVA_LAUNCHER_FILENAME="ecj-${SLOT}" +JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main" +JAVA_RESOURCE_DIRS="res" + +src_prepare() { + java-pkg-2_src_prepare + + mkdir "${JAVA_RESOURCE_DIRS}" || die + find -type f \ + ! -name '*.java' \ + | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die +} + +src_compile() { + java-pkg-simple_src_compile + # Error: A JNI error has occurred, please check your installation and try again + # Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes + zip -d ecj.jar "META-INF/ECLIPSE_.RSA" || die "Failed to remove ECLIPSE_.RSA" + zip -d ecj.jar "META-INF/ECLIPSE_.SF" || die "Failed to remove ECLIPSE_.SF" +} + +src_install() { + java-pkg-simple_src_install + insinto /usr/share/java-config-2/compiler + doins "${FILESDIR}/ecj-${SLOT}" + eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT} +} + +pkg_postinst() { + einfo "To select between slots of ECJ..." + einfo " # eselect ecj" + + eselect ecj update ecj-${SLOT} +} + +pkg_postrm() { + eselect ecj update +} diff --git a/dev-java/eclipse-ecj/files/ecj-4.30 b/dev-java/eclipse-ecj/files/ecj-4.30 new file mode 100644 index 000000000000..65b04403b711 --- /dev/null +++ b/dev-java/eclipse-ecj/files/ecj-4.30 @@ -0,0 +1,7 @@ +JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.30" +PACKAGE="=dev-java/ant-eclipse-ecj-4.30*" +SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21" +SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21" +ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" +ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.30,ant-eclipse-ecj-4.30" +GENERATION="2" diff --git a/dev-java/eclipse-jdt-annotation/Manifest b/dev-java/eclipse-jdt-annotation/Manifest new file mode 100644 index 000000000000..4bcbba688975 --- /dev/null +++ b/dev-java/eclipse-jdt-annotation/Manifest @@ -0,0 +1 @@ +DIST eclipse.jdt.core-4.30.tar.gz 13729445 BLAKE2B 9458ec92e3561d42505a602bb637c678c99b1997e2ba530048298d587cad9861066233e7f8e4b1cb22fd30ce50159aabc4e12295fb8231cc8840cdaac4f967a7 SHA512 b51c3ccc098b9100ad653baec7bbff108344ff0402de1cbb7e0f75d97c7b5b64a9746bc7b7f2faee8126bbb5a5f421fe7c54c428cc6403662626f4a566a9ead5 diff --git a/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild b/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild new file mode 100644 index 000000000000..f21d16d11598 --- /dev/null +++ b/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild @@ -0,0 +1,24 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.800" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="JDT Annotations for Enhanced Null Analysis" +HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt" +SRC_URI="https://github.com/eclipse-jdt/eclipse.jdt.core/archive//R${PV//./_}.tar.gz -> eclipse.jdt.core-${PV}.tar.gz" +S="${WORKDIR}/eclipse.jdt.core-R${PV//./_}/org.eclipse.jdt.annotation" + +LICENSE="EPL-2.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=">=virtual/jre-1.8:*" +DEPEND=">=virtual/jdk-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.annotation" diff --git a/dev-java/eclipse-jdt-annotation/metadata.xml b/dev-java/eclipse-jdt-annotation/metadata.xml new file mode 100644 index 000000000000..7ac29f83dafb --- /dev/null +++ b/dev-java/eclipse-jdt-annotation/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">eclipse-jdt/eclipse.jdt.core</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/emma/emma-2.0.5312-r5.ebuild b/dev-java/emma/emma-2.0.5312-r5.ebuild new file mode 100644 index 000000000000..66d41e71a6ba --- /dev/null +++ b/dev-java/emma/emma-2.0.5312-r5.ebuild @@ -0,0 +1,84 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_PROVIDES=" + emma:emma:${PV} + emma:emma_ant:${PV} +" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Free Java code coverage tool" +HOMEPAGE="https://emma.sourceforge.net/" +SRC_URI="mirror://sourceforge/project/emma/emma-release/${PV}/${P}-src.zip" +S="${WORKDIR}/${P}" + +LICENSE="CPL-1.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +IUSE="+launcher" + +BDEPEND="app-arch/unzip" +CP_DEPEND="dev-java/ant-core:0" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:* + launcher? ( !sci-biology/emboss:0 )" + +PATCHES=( "${FILESDIR}/emma-2.0.5312-java15api.patch" ) + +src_prepare() { + default #780585 +} + +src_compile() { + einfo "Compiling emma.jar" + JAVA_JAR_FILENAME="emma.jar" + JAVA_MAIN_CLASS="emmarun" + JAVA_RESOURCE_DIRS=( core/res ) + JAVA_SRC_DIR=( core/data core/java1{2,3,4} ) + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":emma.jar" + rm -r target || die + + einfo "Compiling emma_ant.jar" + JAVA_JAR_FILENAME="emma_ant.jar" + JAVA_MAIN_CLASS="com.vladium.emma.ANTMain" + JAVA_RESOURCE_DIRS=() + JAVA_SRC_DIR=( ant/ant1{4,5} ) + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":emma_ant.jar" + rm -r target || die + + if use doc; then + einfo "Compiling javadocs" + JAVA_SRC_DIR=( + core/data core/java1{2,3,4} + ant/ant1{4,5} + ) + JAVA_JAR_FILENAME="ignoreme.jar" + java-pkg-simple_src_compile + fi +} + +src_install() { + java-pkg_dojar "emma.jar" "emma_ant.jar" + java-pkg_register-ant-task + + use launcher && java-pkg_dolauncher ${PN} --main emmarun + + if use doc; then + java-pkg_dojavadoc target/api + fi + + if use source; then + java-pkg_dosrc core/data/* + java-pkg_dosrc core/java1{2,3,4}/* + java-pkg_dosrc ant/ant1{4,5}* + fi +} diff --git a/dev-java/failureaccess/Manifest b/dev-java/failureaccess/Manifest index 6cdfcc4ae4a4..beb166188cf0 100644 --- a/dev-java/failureaccess/Manifest +++ b/dev-java/failureaccess/Manifest @@ -1 +1 @@ -DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2 +DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78 diff --git a/dev-java/failureaccess/failureaccess-30.1.1.ebuild b/dev-java/failureaccess/failureaccess-32.1.2.ebuild index 15e1ef59ea52..fff769f48fc7 100644 --- a/dev-java/failureaccess/failureaccess-30.1.1.ebuild +++ b/dev-java/failureaccess/failureaccess-32.1.2.ebuild @@ -1,10 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://codeload.github.com/google/guava/tar.gz/refs/tags/v30.1.1 --slot 0 --keywords "" --ebuild failureacess-30.1.1.ebuild - -EAPI=7 +EAPI=8 MY_P=guava-${PV} @@ -14,8 +11,10 @@ MAVEN_ID="com.google.guava:failureaccess:1.0.1" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Guava's InternalFutureFailureAccess and InternalFutures classes." -HOMEPAGE="https://github.com/google/guava/failureaccess" -SRC_URI="https://codeload.github.com/google/guava/tar.gz/refs/tags/v${PV} -> ${MY_P}.tar.gz" +HOMEPAGE="https://github.com/google/guava/" +SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz" +S="${WORKDIR}/${MY_P}" + LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" @@ -23,6 +22,4 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}/${MY_P}" - JAVA_SRC_DIR="futures/${PN}/src/com/google/common/util/concurrent/internal/" diff --git a/dev-java/felix-framework/Manifest b/dev-java/felix-framework/Manifest index 7c129e4b6fc7..61ae21b93439 100644 --- a/dev-java/felix-framework/Manifest +++ b/dev-java/felix-framework/Manifest @@ -1 +1,2 @@ -DIST felix-framework-7.0.5.tar.gz 505118 BLAKE2B 3652d46dfb4c9c5b43b159450b81ad896483fb2df40165d7e7b8bbd718c8e3297163065474bd10f3858ff7fc2646134ed470e34ede8eeb5efc05cec75f1a7aec SHA512 58fa96500fed827c348a47ac8672aeb4e5b94bfd681c4cde610b3a453fd2abfe2d631742281a192c76718ee83fc4c30980a5179926ff3bc7b8ea649ef07f34a3 +DIST org.apache.felix.framework-7.0.5-source-release.tar.gz 505118 BLAKE2B 3652d46dfb4c9c5b43b159450b81ad896483fb2df40165d7e7b8bbd718c8e3297163065474bd10f3858ff7fc2646134ed470e34ede8eeb5efc05cec75f1a7aec SHA512 58fa96500fed827c348a47ac8672aeb4e5b94bfd681c4cde610b3a453fd2abfe2d631742281a192c76718ee83fc4c30980a5179926ff3bc7b8ea649ef07f34a3 +DIST org.apache.felix.framework-7.0.5-source-release.tar.gz.asc 195 BLAKE2B 94d0afbb7f20119a3f75927e75dc10420caab1c6ce2c3cc5b2b8600a2fd6af4c9217df565cd922bd0017ec6ac54113cc2a894b60249978c87c61c7961d258dda SHA512 2b22f242b5d3ff6c38457908e801dc95abeca6c6427fe8eab4badae171692f9b8de6edf091dca78cc43c3a467a56aa85895cabdfa7eaa92faf6cb090e9fae8fa diff --git a/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild b/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild index 11539e0d1f65..2b2058c5acad 100644 --- a/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild +++ b/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild @@ -7,54 +7,41 @@ JAVA_PKG_IUSE="doc source test" MAVEN_ID="org.apache.felix:org.apache.felix.framework:7.0.5" JAVA_TESTING_FRAMEWORKS="junit-4" -inherit java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple verify-sig DESCRIPTION="Implementation of the OSGi R8 core framework specification" HOMEPAGE="https://felix.apache.org/documentation/subprojects/apache-felix-framework.html" -SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz" +SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz + verify-sig? ( https://downloads.apache.org/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz.asc )" S="${WORKDIR}/org.apache.felix.framework-${PV}" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -# Common dependencies -# POM: pom.xml -# org.codehaus.mojo:animal-sniffer-annotations:1.9 -> >=dev-java/animal-sniffer-annotations-1.15:0 - CP_DEPEND="dev-java/animal-sniffer-annotations:0" -# Compile dependencies -# POM: pom.xml -# org.apache.felix:org.apache.felix.resolver:2.0.4 -> >=dev-java/felix-resolver-2.0.4:0 -# org.osgi:org.osgi.annotation:6.0.0 -> !!!artifactId-not-found!!! -# POM: pom.xml -# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4 -# test? org.easymock:easymock:2.5.2 -> >=dev-java/easymock-2.5.2:2.5 -# test? org.mockito:mockito-all:1.10.19 -> !!!artifactId-not-found!!! -# test? org.ow2.asm:asm-all:5.2 -> !!!artifactId-not-found!!! - -DEPEND=" - >=virtual/jdk-11:* - ${CP_DEPEND} - dev-java/osgi-annotation:0 +DEPEND="${CP_DEPEND} dev-java/felix-resolver:0 + dev-java/osgi-annotation:0 + >=virtual/jdk-11:* test? ( dev-java/asm:9 dev-java/easymock:2.5 dev-java/mockito:0 - ) -" + )" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND}" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/felix.apache.org.asc" JAVA_CLASSPATH_EXTRA="felix-resolver,osgi-annotation" JAVA_SRC_DIR="src/main/java" JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_TEST_GENTOO_CLASSPATH="asm-4,junit-4,easymock-2.5,mockito" +JAVA_TEST_GENTOO_CLASSPATH="asm-9,junit-4,easymock-2.5,mockito" JAVA_TEST_SRC_DIR="src/test/java" src_prepare() { diff --git a/dev-java/felix-gogo-runtime/Manifest b/dev-java/felix-gogo-runtime/Manifest new file mode 100644 index 000000000000..a252dc474e84 --- /dev/null +++ b/dev-java/felix-gogo-runtime/Manifest @@ -0,0 +1,2 @@ +DIST felix-gogo-runtime-1.1.6.tar.gz 117060 BLAKE2B 5ffbc36688f7f69595c5087910e6b9007b57d4b60a6d18d9adee473987193b5fc478cf241229a32044abebf3e796394591e2626ad5560d1cbde0dfb572d62f7f SHA512 0cf431767506a0ca3f78a4e7c666bb9da7301d9968078653ef67deccc73da80e15e01e19ecd6e499215faa4236d46a4f4179b54798ba4d847cfe8a0d858e44ee +DIST felix-gogo-runtime-1.1.6.tar.gz.asc 833 BLAKE2B 12ef2c9bf4d5f6e5dee1a10b1d6afcd366805361181f2621ed98f3c4a36db155e7c1b493152e528cd3a8e46ca12e61bda140a2e4c13b133374bb10ec47c4554a SHA512 05b8247508c477ad374f18e7dc22faa9d116c3416b6390173366391b6f7a726cbb604adcaecc013faf51b03cbde57f09d95891a283045d35ed809e01ae7d5dae diff --git a/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild b/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild new file mode 100644 index 000000000000..ce4df3018c1d --- /dev/null +++ b/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild @@ -0,0 +1,55 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.felix:org.apache.felix.gogo.runtime:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Apache Felix Gogo Runtime" +HOMEPAGE="https://felix.apache.org/documentation/subprojects/apache-felix-gogo.html" +SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz + verify-sig? ( https://dlcdn.apache.org/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz.asc -> ${P}.tar.gz.asc )" +S="${WORKDIR}/org.apache.felix.gogo.runtime-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +CP_DEPEND=" + dev-java/osgi-annotation:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 +" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + test? ( + dev-java/mockito:2 + ) +" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:* +" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/felix.apache.org.asc" + +PATCHES=( "${FILESDIR}/${P}-skip-tests-non-java-8.patch" ) + +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_EXCLUDES=( + #Invalid test class No runnable methods + org.apache.felix.gogo.runtime.TestEvaluate +) +JAVA_TEST_GENTOO_CLASSPATH=" + junit-4 + mockito-2 +" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + default +} diff --git a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch new file mode 100644 index 000000000000..270b01be759a --- /dev/null +++ b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch @@ -0,0 +1,22 @@ +skip tests that fail with java > 1.8 if java > 1.8 is used + +we compare here just that the first part of the version is 1 +which is true only for version 1.8, other versions have first number +like 11, 17, 21 and those fail the condition hence the remaining tests +are skipped +we cannot use System.version() here as this is available only since java 9 + +--- a/src/test/java/org/apache/felix/gogo/runtime/TestParser.java ++++ b/src/test/java/org/apache/felix/gogo/runtime/TestParser.java +@@ -149,9 +149,10 @@ public class TestParser extends AbstractParserTest + assertEquals("def", c.execute("echo def|grep d.*|capture")); + assertEquals("def", c.execute("echoout def|grep d.*|capture")); + assertEquals("def", c.execute("myecho def|grep d.*|capture")); +- assertEquals("def", c.execute("(echoout abc; echoout def; echoout ghi)|grep d.*|capture")); + assertEquals("", c.execute("echoout def; echoout ghi | grep d.* | capture")); + assertEquals("hello world", c.execute("echo hello world|capture")); ++ org.junit.Assume.assumeTrue("1".equals(System.getProperty("java.version").split("\\.")[0])); ++ assertEquals("def", c.execute("(echoout abc; echoout def; echoout ghi)|grep d.*|capture")); + assertEquals("defghi", c.execute("(echoout abc; echoout def; echoout ghi)|grep 'def|ghi'|capture")); + } + diff --git a/dev-java/felix-gogo-runtime/metadata.xml b/dev-java/felix-gogo-runtime/metadata.xml new file mode 100644 index 000000000000..b2e227e0b6b2 --- /dev/null +++ b/dev-java/felix-gogo-runtime/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <bugs-to>https://issues.apache.org/jira/browse/FELIX</bugs-to> + <doc>https://felix.apache.org/documentation/subprojects/apache-felix-gogo.html</doc> + <remote-id type="github">apache/felix-dev</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/felix-main/Manifest b/dev-java/felix-main/Manifest index 91eadc1ce506..1535ea42b59a 100644 --- a/dev-java/felix-main/Manifest +++ b/dev-java/felix-main/Manifest @@ -1 +1,2 @@ -DIST felix-main-7.0.5.tar.gz 255198 BLAKE2B 289e2305b15c28f985bee1d8687db6ecb5098a2086da6fd32a7db8572f83a1ac37e49deeb89d657d48b943a626d400caccd8185ced565e8c65aa558395aeef05 SHA512 e06f6c330a73100a739575e92a6f0af263a98643bbd6fd6661e799c2a11c8c9d9589f1f5b8802799ffcae7007e8362c629055fa8b25a50a4fa736ed2ba2955b0 +DIST org.apache.felix.main-7.0.5-source-release.tar.gz 255198 BLAKE2B 289e2305b15c28f985bee1d8687db6ecb5098a2086da6fd32a7db8572f83a1ac37e49deeb89d657d48b943a626d400caccd8185ced565e8c65aa558395aeef05 SHA512 e06f6c330a73100a739575e92a6f0af263a98643bbd6fd6661e799c2a11c8c9d9589f1f5b8802799ffcae7007e8362c629055fa8b25a50a4fa736ed2ba2955b0 +DIST org.apache.felix.main-7.0.5-source-release.tar.gz.asc 195 BLAKE2B 24ba68ada20056364a559fea71b1596b07e0adc669c4ddbed89e2aa14fa1937b3d21af793148c057cd2bd9817a6f2c87b5e6465ea537fe7bac69215f82d9945f SHA512 428ba861bbd51b58f8e00226ac33c186e7e91ca5469c24328b65adcfb2631b09a50847870eff483e6569a69e3e01a1c939315747f3b338462bb0e7a7d2757216 diff --git a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild b/dev-java/felix-main/felix-main-7.0.5-r2.ebuild index 60e9162ace4a..92f6f1035d8c 100644 --- a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild +++ b/dev-java/felix-main/felix-main-7.0.5-r2.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.main-7.0.5-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-main-7.0.5.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source" MAVEN_ID="org.apache.felix:org.apache.felix.main:7.0.5" -inherit java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple verify-sig DESCRIPTION="Open source OSGi framework by Apache Software Foundation" HOMEPAGE="https://felix.apache.org/documentation/index.html" -SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz" +SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz + verify-sig? ( https://downloads.apache.org/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz.asc )" +S="${WORKDIR}/org.apache.felix.main-${PV}" LICENSE="Apache-2.0" SLOT="0" @@ -35,9 +34,10 @@ RDEPEND=" ${CP_DEPEND} " -DOCS=( DEPENDENCIES NOTICE ) +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/felix.apache.org.asc" -S="${WORKDIR}/org.apache.felix.main-${PV}" +DOCS=( DEPENDENCIES NOTICE ) JAVA_MAIN_CLASS="org.apache.felix.main.Main" JAVA_RESOURCE_DIRS="src/main/resources" diff --git a/dev-java/felix-resolver/Manifest b/dev-java/felix-resolver/Manifest index e66c365ab77e..81acaa68bcae 100644 --- a/dev-java/felix-resolver/Manifest +++ b/dev-java/felix-resolver/Manifest @@ -1 +1,2 @@ -DIST felix-resolver-2.0.4.tar.gz 164538 BLAKE2B 38d979557e484692bc6e47ce069bac5ca3c19f4b01b2d6222760708da571ca79166f4821c0b79c181a40c4228095dbe28f051e7d84d696cfddeef63f5a006ddd SHA512 bf4da4550b208dbe9e74cb4f66e9456fb0a3da66f6e60c08ebea88b68cc6f71200dcf324d22d85e6f5558e7f67335f8899e932de3b813a7fc7e9325eb8a31b61 +DIST org.apache.felix.resolver-2.0.4-source-release.tar.gz 164538 BLAKE2B 38d979557e484692bc6e47ce069bac5ca3c19f4b01b2d6222760708da571ca79166f4821c0b79c181a40c4228095dbe28f051e7d84d696cfddeef63f5a006ddd SHA512 bf4da4550b208dbe9e74cb4f66e9456fb0a3da66f6e60c08ebea88b68cc6f71200dcf324d22d85e6f5558e7f67335f8899e932de3b813a7fc7e9325eb8a31b61 +DIST org.apache.felix.resolver-2.0.4-source-release.tar.gz.asc 195 BLAKE2B feb81e5acb4a7dcc4f0b8d5e85e12739ab341f085925e3f6496a550571662b871e07c294d01f468a8cbb9e2314a2a6ec9ea1c313426dee606e70fa5bc7155be4 SHA512 dad0f1969176cbf3490a11221d37899f20e2f92e661ffa374fc4793f5064ffc8f8f9a6317b49911aafaeb96d582afe4c2660c29b3d907c092b89299b4e0720a8 diff --git a/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild b/dev-java/felix-resolver/felix-resolver-2.0.4-r1.ebuild index e70076614ec8..e95f1cbbf3ad 100644 --- a/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild +++ b/dev-java/felix-resolver/felix-resolver-2.0.4-r1.ebuild @@ -1,41 +1,28 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.resolver-2.0.4-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-resolver-2.0.4.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" MAVEN_ID="org.apache.felix:org.apache.felix.resolver:2.0.4" JAVA_TESTING_FRAMEWORKS="junit-4" -inherit java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple verify-sig DESCRIPTION="Provide OSGi resolver service." HOMEPAGE="https://felix.apache.org/documentation/index.html" -SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz" +SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz + verify-sig? ( https://downloads.apache.org/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz.asc )" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -# Common dependencies -# POM: pom.xml -# org.osgi:org.osgi.core:5.0.0 -> >=dev-java/osgi-core-api-5.0.0:0 -# org.osgi:osgi.annotation:6.0.1 -> >=dev-java/osgi-annotation-8.1.0:0 - CP_DEPEND=" dev-java/osgi-annotation:0 dev-java/osgi-core:0 " -# Compile dependencies -# POM: pom.xml -# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4 -# test? org.apache.felix:org.apache.felix.utils:1.8.0 -> >=dev-java/felix-utils-1.11.8:0 -# test? org.mockito:mockito-all:1.10.19 -> !!!artifactId-not-found!!! - DEPEND=" >=virtual/jdk-1.8:* ${CP_DEPEND} @@ -49,6 +36,9 @@ RDEPEND=" >=virtual/jre-1.8:* ${CP_DEPEND}" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/felix.apache.org.asc" + DOCS=( DEPENDENCIES NOTICE doc/changelog.txt ) S="${WORKDIR}/org.apache.felix.resolver-${PV}" diff --git a/dev-java/felix-utils/Manifest b/dev-java/felix-utils/Manifest index 5cdf8cb77b6b..7f59424e9061 100644 --- a/dev-java/felix-utils/Manifest +++ b/dev-java/felix-utils/Manifest @@ -1 +1,2 @@ -DIST felix-utils-1.11.8.tar.gz 90519 BLAKE2B 2fe6ce8101e8e4d9533a2decacc581d35babd3a26747598a196ade7cea787d6e379968208619dc9c4d89c8f670ccb98124223828c852347f859c4ae3a7f284c8 SHA512 cef0f05754857a5863869145b3c465a1fea0d41767637df904b0b041579af18e5b5e3c8e09dc89f0e2e3d252585e0765b6b6e34bf932df1ebdc62a7127ac8cfd +DIST org.apache.felix.utils-1.11.8-source-release.tar.gz 90519 BLAKE2B 2fe6ce8101e8e4d9533a2decacc581d35babd3a26747598a196ade7cea787d6e379968208619dc9c4d89c8f670ccb98124223828c852347f859c4ae3a7f284c8 SHA512 cef0f05754857a5863869145b3c465a1fea0d41767637df904b0b041579af18e5b5e3c8e09dc89f0e2e3d252585e0765b6b6e34bf932df1ebdc62a7127ac8cfd +DIST org.apache.felix.utils-1.11.8-source-release.tar.gz.asc 833 BLAKE2B 231acada5011f33a62460d027e76630fecbe15acd5dedc76673a80b6cd4de1ec7ae13a890cd02231a6e94a5555a33154c9144e514058733827841e98ab509d18 SHA512 06755950ed4d2d943c08d76c0abcfc8846f478e8a18543f551913ec7d74d1a946dc7c9f34444b4191186e41e7bd70594db8462c1bc7c895011696c03ada06921 diff --git a/dev-java/felix-utils/felix-utils-1.11.8.ebuild b/dev-java/felix-utils/felix-utils-1.11.8-r1.ebuild index 9c7ef0ca3fcd..7ddf0241d207 100644 --- a/dev-java/felix-utils/felix-utils-1.11.8.ebuild +++ b/dev-java/felix-utils/felix-utils-1.11.8-r1.ebuild @@ -1,33 +1,24 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.utils-1.11.8-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-utils-1.11.8.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" MAVEN_ID="org.apache.felix:org.apache.felix.utils:1.11.8" JAVA_TESTING_FRAMEWORKS="junit-4" -inherit java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple verify-sig DESCRIPTION="Utility classes for OSGi" HOMEPAGE="https://felix.apache.org/documentation/index.html" -SRC_URI="mirror://apache/felix/org.apache.felix.utils-${PV}-source-release.tar.gz -> ${P}.tar.gz" +SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz + verify-sig? ( https://downloads.apache.org/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz.asc )" +S="${WORKDIR}/org.apache.felix.utils-${PV}" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -# Compile dependencies -# POM: pom.xml -# org.osgi:osgi.cmpn:5.0.0 -> >=dev-java/osgi-cmpn-8.0.0:8 -# org.osgi:osgi.core:5.0.0 -> >=dev-java/osgi-core-8.0.0:0 -# POM: pom.xml -# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4 -# test? org.mockito:mockito-core:2.18.3 -> >=dev-java/mockito-4.7.0:4 - DEPEND=" >=virtual/jdk-1.8:* dev-java/osgi-cmpn:8 @@ -39,14 +30,15 @@ DEPEND=" RDEPEND=">=virtual/jre-1.8:*" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/felix.apache.org.asc" + PATCHES=( "${FILESDIR}/felix-utils-1.11.8-Port-to-osgi-cmpn.patch" ) DOCS=( DEPENDENCIES NOTICE doc/changelog.txt ) -S="${WORKDIR}/org.apache.felix.utils-${PV}" - JAVA_CLASSPATH_EXTRA="osgi-cmpn-8,osgi-core" JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest index 0d9b604c3ef6..5080bc909c93 100644 --- a/dev-java/fop/Manifest +++ b/dev-java/fop/Manifest @@ -1,4 +1,6 @@ DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c SHA512 71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6 DIST fop-2.8-src.tar.gz 22855369 BLAKE2B 183649f531068b8f7513613c89f9f66a48894ab97a659e110b91853d5dffc1664d3830a8ced9ba221e22ca02fc51aed991ddee0e927cab59b9160a504f6dab02 SHA512 22e1737b5cd87dc5e014838e2ad867ccf46bdc564fb5c231cc6b4c1f8a9862864679ea7ddf143126058553ed90045941fb07aa2657db9e3ed35660ce11169357 DIST fop-2.8-src.tar.gz.asc 833 BLAKE2B f761b427bac89249ab4ab5f2194468e44f997e28ed77392a785764fb60dd2fbbc716ef881e2009a3dbad416ef195fc8ae4d2ebdbd63c3fb3f47d355acab8389b SHA512 c25e94ac4a72c9ff9bfa487369ee1510ab5b19a6178f14f5076b9cf0548044e79eca707025e962c63d268d0f48661cc7110f604036957e447f8413cdb582d3de +DIST fop-2.9-src.tar.gz 20642865 BLAKE2B 6ab265ddfb1c07b9266687930af21ac4653438800772da836dbceb14de126333dcff50c2cea1352ad77988ec7f7a3d4eef91341983edc13684abf2531634eb0a SHA512 d346c8fffd0d3ff5e803bea4233ce171972ded39b0c475b367333e37247da8f9e823c7e2e75fab735bf9282654d67befa2fa473f53a199cbd96b0f7305b3c093 +DIST fop-2.9-src.tar.gz.asc 833 BLAKE2B 284f04d450bcfb6583d353ae21bbadad8da14b59d946e094453b564e700c8cfdcb448ed206a5a246b725b453a1b3feea69f96ff3b2a683320bce6743cc5a167f SHA512 404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc DIST fop-hyph-2.0.jar 6655933 BLAKE2B bfbefcc2ebd9a9a467c23a70d7cef256f83cf2335f6e17db6bbefceaf8a3cee78de0302f269d096eb3238b3f4883429e09cc640bed11a42da4ef67ab9f0cb164 SHA512 3d5f27623008c7beba5332387bd42c501b7ae1dddfc98014b3fb35273394ca5f0a4ce69e7726090ec468c9b4f7983fb8b1a5759f49e81ea342c81c61311d87b3 diff --git a/dev-java/fop/files/fop-2.9-FO2StructureTreeConverterTestCase.patch b/dev-java/fop/files/fop-2.9-FO2StructureTreeConverterTestCase.patch new file mode 100644 index 000000000000..87e36eb4b49c --- /dev/null +++ b/dev-java/fop/files/fop-2.9-FO2StructureTreeConverterTestCase.patch @@ -0,0 +1,45 @@ +There were 2 failures: +1) testRemoveBlocks(org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase) +org.junit.ComparisonFailure: expected:<....0" encoding="UTF-8"[ standalone="no"]?><structure-tree-se...> but was:<....0" encoding="UTF-8"[]?><structure-tree-se...> + at org.junit.Assert.assertEquals(Assert.java:117) + at org.junit.Assert.assertEquals(Assert.java:146) + at org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase.compare(FO2StructureTreeConverterTestCase.java:225) + at org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase.testRemoveBlocks(FO2StructureTreeConverterTestCase.java:150) +2) testRemoveTableHeader(org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase) +org.junit.ComparisonFailure: expected:<....0" encoding="UTF-8"[ standalone="no"]?><structure-tree-se...> but was:<....0" encoding="UTF-8"[]?><structure-tree-se...> + at org.junit.Assert.assertEquals(Assert.java:117) + at org.junit.Assert.assertEquals(Assert.java:146) + at org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase.compare(FO2StructureTreeConverterTestCase.java:225) + at org.apache.fop.accessibility.fo.FO2StructureTreeConverterTestCase.testRemoveTableHeader(FO2StructureTreeConverterTestCase.java:187) + +FAILURES!!! +Tests run: 11, Failures: 2 + +--- a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java ++++ b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java +@@ -43,6 +43,7 @@ import javax.xml.transform.stream.StreamSource; + + import org.custommonkey.xmlunit.Diff; + import org.junit.Test; ++import org.junit.Ignore; + import org.w3c.dom.Document; + import org.xml.sax.SAXException; + import org.xml.sax.helpers.AttributesImpl; +@@ -144,7 +145,7 @@ public class FO2StructureTreeConverterTestCase { + assertNull(d.getStructureTreeEventHandler().startNode("table-body", null, null)); + } + +- @Test ++ @Test @Ignore + public void testRemoveBlocks() throws Exception { + keepEmptyTags = false; + compare("<fo:root xmlns:fo=\"http://www.w3.org/1999/XSL/Format\">\n" +@@ -180,7 +181,7 @@ public class FO2StructureTreeConverterTestCase { + + "</structure-tree-sequence>\n"); + } + +- @Test ++ @Test @Ignore + public void testRemoveTableHeader() throws Exception { + keepEmptyTags = false; + String fo = IOUtils.toString(getResource("table-artifact.fo"), "utf8").replace("role=\"artifact\"", ""); diff --git a/dev-java/fop/files/fop-2.9-MissingLanguageWarningTestCase.patch b/dev-java/fop/files/fop-2.9-MissingLanguageWarningTestCase.patch new file mode 100644 index 000000000000..b3c70d33356c --- /dev/null +++ b/dev-java/fop/files/fop-2.9-MissingLanguageWarningTestCase.patch @@ -0,0 +1,88 @@ +There was 1 failure: +1) testMissingLanguage(org.apache.fop.accessibility.pdf.MissingLanguageWarningTestCase) +org.junit.ComparisonFailure: expected:<3[2:36]> but was:<3[0:37]> + at org.junit.Assert.assertEquals(Assert.java:117) + at org.junit.Assert.assertEquals(Assert.java:146) + at org.apache.fop.accessibility.pdf.MissingLanguageWarningTestCase$MissingLanguageEventChecker.processEvent(MissingLanguageWarningTestCase.java:65) + at org.apache.fop.events.CompositeEventListener.processEvent(CompositeEventListener.java:61) + at org.apache.fop.events.FOPEventListenerProxy.processEvent(FOPEventListenerProxy.java:70) + at org.apache.fop.apps.FOUserAgent$FOPEventBroadcaster.broadcastEvent(FOUserAgent.java:621) + at org.apache.fop.events.DefaultEventBroadcaster$1.invoke(DefaultEventBroadcaster.java:170) + at jdk.proxy2/jdk.proxy2.$Proxy12.unknownLanguage(Unknown Source) + at org.apache.fop.render.pdf.PDFPainter$LanguageAvailabilityChecker.checkLanguageAvailability(PDFPainter.java:106) + at org.apache.fop.render.pdf.PDFPainter$LanguageAvailabilityChecker.access$000(PDFPainter.java:90) + at org.apache.fop.render.pdf.PDFPainter.prepareImageMCID(PDFPainter.java:238) + at org.apache.fop.render.pdf.PDFPainter.drawImageUsingURI(PDFPainter.java:216) + at org.apache.fop.render.pdf.PDFPainter.drawImage(PDFPainter.java:182) + at org.apache.fop.render.intermediate.IFRenderer.drawImage(IFRenderer.java:1306) + at org.apache.fop.render.intermediate.IFRenderer.renderImage(IFRenderer.java:1293) + at org.apache.fop.render.AbstractRenderer.renderInlineViewport(AbstractRenderer.java:1030) + at org.apache.fop.render.AbstractPathOrientedRenderer.renderInlineViewport(AbstractPathOrientedRenderer.java:836) + at org.apache.fop.render.intermediate.IFRenderer.renderInlineViewport(IFRenderer.java:860) + at org.apache.fop.render.AbstractRenderer.renderInlineArea(AbstractRenderer.java:877) + at org.apache.fop.render.intermediate.IFRenderer.renderInlineArea(IFRenderer.java:924) + at org.apache.fop.render.AbstractRenderer.renderLineArea(AbstractRenderer.java:845) + at org.apache.fop.render.AbstractRenderer.renderBlocks(AbstractRenderer.java:704) + at org.apache.fop.render.AbstractRenderer.renderBlock(AbstractRenderer.java:758) + at org.apache.fop.render.intermediate.IFRenderer.renderBlock(IFRenderer.java:1004) + at org.apache.fop.render.AbstractRenderer.renderBlocks(AbstractRenderer.java:689) + at org.apache.fop.render.AbstractRenderer.renderFlow(AbstractRenderer.java:591) + at org.apache.fop.render.AbstractPathOrientedRenderer.renderFlow(AbstractPathOrientedRenderer.java:789) + at org.apache.fop.render.AbstractRenderer.renderMainReference(AbstractRenderer.java:568) + at org.apache.fop.render.AbstractRenderer.renderBodyRegion(AbstractRenderer.java:433) + at org.apache.fop.render.AbstractRenderer.renderRegionViewport(AbstractRenderer.java:380) + at org.apache.fop.render.intermediate.IFRenderer.renderRegionViewport(IFRenderer.java:735) + at org.apache.fop.render.AbstractRenderer.renderPageAreas(AbstractRenderer.java:345) + at org.apache.fop.render.AbstractRenderer.renderPage(AbstractRenderer.java:318) + at org.apache.fop.render.intermediate.IFRenderer.renderPage(IFRenderer.java:584) + at org.apache.fop.area.RenderPagesModel.renderPage(RenderPagesModel.java:193) + at org.apache.fop.area.RenderPagesModel.checkPreparedPages(RenderPagesModel.java:174) + at org.apache.fop.area.RenderPagesModel.addPage(RenderPagesModel.java:146) + at org.apache.fop.layoutmgr.AbstractPageSequenceLayoutManager.finishPage(AbstractPageSequenceLayoutManager.java:316) + at org.apache.fop.layoutmgr.PageSequenceLayoutManager.finishPage(PageSequenceLayoutManager.java:243) + at org.apache.fop.layoutmgr.PageSequenceLayoutManager.activateLayout(PageSequenceLayoutManager.java:147) + at org.apache.fop.area.AreaTreeHandler.endPageSequence(AreaTreeHandler.java:267) + at org.apache.fop.fo.DelegatingFOEventHandler.endPageSequence(DelegatingFOEventHandler.java:114) + at org.apache.fop.accessibility.fo.FO2StructureTreeConverter.endPageSequence(FO2StructureTreeConverter.java:184) + at org.apache.fop.fo.pagination.PageSequence.endOfNode(PageSequence.java:140) + at org.apache.fop.fo.FOTreeBuilder$MainFOHandler.endElement(FOTreeBuilder.java:390) + at org.apache.fop.fo.FOTreeBuilder$3.run(FOTreeBuilder.java:207) + at org.apache.fop.fo.FOTreeBuilder$3.run(FOTreeBuilder.java:204) + at java.base/java.security.AccessController.doPrivileged(AccessController.java:318) + at org.apache.fop.fo.FOTreeBuilder.endElement(FOTreeBuilder.java:203) + at org.apache.xalan.transformer.TransformerIdentityImpl.endElement(TransformerIdentityImpl.java:1102) + at java.xml/com.sun.org.apache.xerces.internal.parsers.AbstractSAXParser.endElement(AbstractSAXParser.java:618) + at java.xml/com.sun.org.apache.xerces.internal.impl.XMLDocumentFragmentScannerImpl.scanEndElement(XMLDocumentFragmentScannerImpl.java:1728) + at java.xml/com.sun.org.apache.xerces.internal.impl.XMLDocumentFragmentScannerImpl$FragmentContentDriver.next(XMLDocumentFragmentScannerImpl.java:2899) + at java.xml/com.sun.org.apache.xerces.internal.impl.XMLDocumentScannerImpl.next(XMLDocumentScannerImpl.java:605) + at java.xml/com.sun.org.apache.xerces.internal.impl.XMLNSDocumentScannerImpl.next(XMLNSDocumentScannerImpl.java:112) + at java.xml/com.sun.org.apache.xerces.internal.impl.XMLDocumentFragmentScannerImpl.scanDocument(XMLDocumentFragmentScannerImpl.java:542) + at java.xml/com.sun.org.apache.xerces.internal.parsers.XML11Configuration.parse(XML11Configuration.java:889) + at java.xml/com.sun.org.apache.xerces.internal.parsers.XML11Configuration.parse(XML11Configuration.java:825) + at java.xml/com.sun.org.apache.xerces.internal.parsers.XMLParser.parse(XMLParser.java:141) + at java.xml/com.sun.org.apache.xerces.internal.parsers.AbstractSAXParser.parse(AbstractSAXParser.java:1224) + at org.apache.xalan.transformer.TransformerIdentityImpl.transform(TransformerIdentityImpl.java:485) + at org.apache.fop.accessibility.pdf.MissingLanguageWarningTestCase.testMissingLanguage(MissingLanguageWarningTestCase.java:90) + +FAILURES!!! +Tests run: 10, Failures: 1 + +--- a/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java ++++ b/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java +@@ -31,6 +31,7 @@ import javax.xml.transform.stream.StreamSource; + + import org.junit.Before; + import org.junit.Test; ++import org.junit.Ignore; + + import static org.junit.Assert.assertEquals; + import static org.junit.Assert.assertFalse; +@@ -82,7 +83,7 @@ public class MissingLanguageWarningTestCase { + fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent, NullOutputStream.NULL_OUTPUT_STREAM); + } + +- @Test ++ @Test @Ignore + public void testMissingLanguage() throws Exception { + Source src = new StreamSource(getClass().getResourceAsStream("missing-language.fo")); + SAXResult res = new SAXResult(fop.getDefaultHandler()); diff --git a/dev-java/fop/files/fop-2.9-PDFEncodingTestCase.patch b/dev-java/fop/files/fop-2.9-PDFEncodingTestCase.patch new file mode 100644 index 000000000000..8508de962382 --- /dev/null +++ b/dev-java/fop/files/fop-2.9-PDFEncodingTestCase.patch @@ -0,0 +1,31 @@ +There was 1 failure: +1) testPDFEncodingWithStandardFont(org.apache.fop.render.pdf.PDFEncodingTestCase) +java.lang.AssertionError: line containing 'PDFE_TEST_MARK_2' must contain 'XX_é_XX' + at org.junit.Assert.fail(Assert.java:89) + at org.junit.Assert.assertTrue(Assert.java:42) + at org.apache.fop.render.pdf.PDFEncodingTestCase.checkEncoding(PDFEncodingTestCase.java:159) + at org.apache.fop.render.pdf.PDFEncodingTestCase.runTest(PDFEncodingTestCase.java:128) + at org.apache.fop.render.pdf.PDFEncodingTestCase.testPDFEncodingWithStandardFont(PDFEncodingTestCase.java:78) + +FAILURES!!! +Tests run: 3, Failures: 1 + +--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java ++++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java +@@ -25,6 +25,7 @@ import java.io.File; + import java.io.IOException; + + import org.junit.Test; ++import org.junit.Ignore; + import org.xml.sax.SAXException; + + import static org.junit.Assert.assertEquals; +@@ -61,7 +62,7 @@ public class PDFEncodingTestCase extends BasePDFTest { + * Test using a standard FOP font + * @throws Exception checkstyle wants a comment here, even a silly one + */ +- @Test ++ @Test @Ignore + public void testPDFEncodingWithStandardFont() throws Exception { + + /* If the PDF encoding is correct, a text dump of the generated PDF file contains this (excerpts) diff --git a/dev-java/fop/files/fop-2.9-PDFToUnicodeCMapTestCase.patch b/dev-java/fop/files/fop-2.9-PDFToUnicodeCMapTestCase.patch new file mode 100644 index 000000000000..f08052ac6483 --- /dev/null +++ b/dev-java/fop/files/fop-2.9-PDFToUnicodeCMapTestCase.patch @@ -0,0 +1,33 @@ +There was 1 failure: +1) unpairedHighSurrogateTest(org.apache.fop.pdf.PDFToUnicodeCMapTestCase) +java.lang.IllegalStateException: Event model isn't consistent with the EventProducer interface. Please rebuild FOP! Affected method: org.apache.fop.render.pdf.PDFEventProducer.unpairedSurrogate + at org.apache.fop.events.DefaultEventBroadcaster$1.invoke(DefaultEventBroadcaster.java:155) + at jdk.proxy2/jdk.proxy2.$Proxy11.unpairedSurrogate(Unknown Source) + at org.apache.fop.pdf.PDFToUnicodeCMap$ToUnicodeCMapBuilder.writeBFCharEntries(PDFToUnicodeCMap.java:160) + at org.apache.fop.pdf.PDFToUnicodeCMap$ToUnicodeCMapBuilder.writeBFEntries(PDFToUnicodeCMap.java:108) + at org.apache.fop.pdf.PDFToUnicodeCMap$ToUnicodeCMapBuilder.writeCMap(PDFToUnicodeCMap.java:99) + at org.apache.fop.pdf.PDFToUnicodeCMapTestCase.buildAndAssertLine(PDFToUnicodeCMapTestCase.java:100) + at org.apache.fop.pdf.PDFToUnicodeCMapTestCase.unpairedHighSurrogateTest(PDFToUnicodeCMapTestCase.java:307) + +FAILURES!!! +Tests run: 10, Failures: + +--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFToUnicodeCMapTestCase.java ++++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFToUnicodeCMapTestCase.java +@@ -29,6 +29,7 @@ import java.util.Set; + import org.junit.Assert; + import org.junit.Before; + import org.junit.Test; ++import org.junit.Ignore; + + import static org.junit.Assert.assertEquals; + import static org.junit.Assert.assertNotNull; +@@ -278,7 +279,7 @@ public class PDFToUnicodeCMapTestCase { + * Checks that an unpaired surrogate (a high-surrogate as the last code unit) is correctly handled. + * @throws IOException + */ +- @Test ++ @Test @Ignore + public void unpairedHighSurrogateTest() throws IOException { + final int charMapSize = 10; + diff --git a/dev-java/fop/fop-2.8-r1.ebuild b/dev-java/fop/fop-2.8-r1.ebuild index ddd660e61c1d..89f3be35d3bc 100644 --- a/dev-java/fop/fop-2.8-r1.ebuild +++ b/dev-java/fop/fop-2.8-r1.ebuild @@ -59,8 +59,9 @@ JAVA_CLASSPATH_EXTRA=" sun-jai-bin " -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc" +BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc" + src_unpack() { if use verify-sig; then verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc} diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9.ebuild new file mode 100644 index 000000000000..63bf4d2080f1 --- /dev/null +++ b/dev-java/fop/fop-2.9.ebuild @@ -0,0 +1,199 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.xmlgraphics:fop:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="XML Graphics Format Object Processor All-In-One" +HOMEPAGE="https://xmlgraphics.apache.org/fop/" +SRC_URI=" + mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz + https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz + verify-sig? ( https://www.apache.org/dist/xmlgraphics/fop/source/${P}-src.tar.gz.asc ) + test? ( https://repo1.maven.org/maven2/net/sf/offo/fop-hyph/2.0/fop-hyph-2.0.jar ) +" +S="${WORKDIR}/fop-${PV}" + +LICENSE="Apache-2.0" +SLOT="2.8" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + +CP_DEPEND=" + dev-java/batik:1.16 + dev-java/commons-io:1 + dev-java/commons-logging:0 + dev-java/fontbox:0 + dev-java/qdox:1.12 + dev-java/xmlgraphics-commons:2 +" + +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + dev-java/ant-core:0 + dev-java/javax-servlet-api:2.2 + dev-java/sun-jai-bin:0 + test? ( + dev-java/mockito:2 + dev-java/pdfbox:0 + dev-java/xmlunit:1 + ) +" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +BDEPEND="dev-java/xalan:0" + +DOCS=( NOTICE README ) + +PATCHES=( + "${FILESDIR}/fop-2.9-PDFEncodingTestCase.patch" + "${FILESDIR}/fop-2.9-PDFToUnicodeCMapTestCase.patch" + "${FILESDIR}/fop-2.9-MissingLanguageWarningTestCase.patch" + "${FILESDIR}/fop-2.9-FO2StructureTreeConverterTestCase.patch" +) + +JAVA_CLASSPATH_EXTRA=" + ant-core + javax-servlet-api-2.2 + sun-jai-bin +" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc" +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc} + fi + default +} + +src_prepare() { + java-pkg_clean + java-pkg-2_src_prepare + default +} + +src_compile() { + JAVA_JAR_FILENAME="fop-util.jar" + JAVA_SRC_DIR="fop-util/src/main/java" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar" + rm -r target || die + + JAVA_JAR_FILENAME="fop-events.jar" + JAVA_RESOURCE_DIRS="fop-events/src/main/resources" + JAVA_SRC_DIR="fop-events/src/main/java" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar" + rm -r target || die + + JAVA_JAR_FILENAME="fop-core.jar" + JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' fop-core/pom.xml ) + JAVA_RESOURCE_DIRS="fop-core/src/main/resources" + JAVA_SRC_DIR="fop-core/src/main/java" + # Code generation according to + # https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L156-L225 + pushd fop-core/src/main/codegen/fonts > /dev/null || die + local fonts=$(find . -name "Courier*.xml" \ + -o -name "Helvetica*.xml" \ + -o -name "Times*.xml" \ + -o -name "Symbol.xml" \ + -o -name "ZapfDingbats.xml" + ) + for font in ${fonts}; do \ + xalan -XSLTC \ + -IN $font \ + -XSL font-file.xsl \ + -OUT ../../java/org/apache/fop/fonts/base14/${font//.xml}.java || die + done + xalan -XSLTC \ + -IN encodings.xml \ + -XSL code-point-mapping.xsl \ + -OUT ../../java/org/apache/fop/fonts/base14/CodePointMapping.java || die + popd > /dev/null || die + java-pkg-simple_src_compile + + # Update "fop-core.jar" with "event-mode.xml" files produced manually + # by running "mvn package". + # Upstream does this with maven-antrun-plugin: + # https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L269-L290 + mkdir event-model && pushd $_ > /dev/null || die + jar -xf "${WORKDIR}/fop-2.7-core-event-models.jar" + popd > /dev/null || die + + jar -uf "fop-core.jar" -C event-model . || die + JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-core.jar" + rm -r target || die + + if use doc; then \ + JAVA_SRC_DIR=( + "fop-util/src/main/java" + "fop-events/src/main/java" + "fop-core/src/main/java" + ) + JAVA_JAR_FILENAME="ignoreme.jar" + java-pkg-simple_src_compile + fi +} + +src_test() { + JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-2,pdfbox,xmlunit-1" + + einfo "Testing fop-events" + JAVA_TEST_EXCLUDES="org.apache.fop.events.TestEventProducer" + JAVA_TEST_SRC_DIR="fop-events/src/test/java" + # This jar file was created manually from the output of "mvn test". + # Upstream does this with maven-antrun-plugin + jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die + java-pkg-simple_src_test + + einfo "Testing fop-core" + pushd fop-core/src/test/java > /dev/null || die + # Excluding one test, see https://bugs.gentoo.org/903880 + local JAVA_TEST_RUN_ONLY=$(find * -type f \ + -name "*TestCase.java" \ + ) + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + local vm_version="$(java-config -g PROVIDES_VERSION)" + # these tests would fail with java.lang.NoSuchMethodError if compiled with jdk-1.8 + if ver_test "${vm_version}" -eq "1.8"; then + JAVA_TEST_RUN_ONLY=${JAVA_TEST_RUN_ONLY//org.apache.fop.render.pdf.PDFEncodingTestCase} + JAVA_TEST_RUN_ONLY=${JAVA_TEST_RUN_ONLY//org.apache.fop.fonts.truetype.OTFToType1TestCase} +# org.apache.fop.render.pdf.PDFEncodingTestCase +# org.apache.fop.fonts.truetype.OTFToType1TestCase + fi + popd > /dev/null || die + # https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L297-L307 + # <workingDirectory>../fop</workingDirectory> + pushd fop > /dev/null || die + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/fop-hyph-2.0.jar" + JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-util.jar" + JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-events.jar" + JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-core.jar" + JAVA_TEST_RESOURCE_DIRS="../fop-core/src/test/resources" + JAVA_TEST_SRC_DIR="../fop-core/src/test/java" + java-pkg-simple_src_test + popd > /dev/null || die +} + +src_install() { + local module + for module in fop-util fop-events fop-core ; do + java-pkg_dojar "${module}.jar" + if use source; then + java-pkg_dosrc "${module}/src/main/java/*" + fi + done + if use doc; then + java-pkg_dojavadoc target/api + fi + java-pkg_dolauncher "fop-${SLOT}" --main "org.apache.fop.cli.Main" + einstalldocs +} diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest index 4a90531f140e..539c6ffe4fde 100644 --- a/dev-java/gradle-bin/Manifest +++ b/dev-java/gradle-bin/Manifest @@ -7,3 +7,6 @@ DIST gradle-bin-7.5.1.zip 166101707 BLAKE2B e018f8ae0e4cbe1fff2e3fb3029ef4c3f35e DIST gradle-bin-7.6.1.zip 165594858 BLAKE2B 623ed41b7e0dfbfa015578c6915ca382cb441082e181f96d00d058a1bd42b5e749b807f8c0444c4cd41de17a7f754960f55aa69e8dd4339bd64444432ad8748e SHA512 72d051d8cf348c13dda20eec56526a3c212e9a9635920b3260281e2f98cf113ffaf4efb8efbb96081c36b9fae847c291125e24d175d6fb832b8dd6e0e74779ae DIST gradle-bin-8.0.2.zip 167671533 BLAKE2B e5cb4bef61ea89cfbf42c72c14e739f049b4930521dabaeb88fa6e2fffec81d6ee6514b615a6c1732db3bad4539e72ebbbeeb37b2f22a72fd2d2e08f7bf8d1b8 SHA512 70f114e353ec3e114b003e733e21c47fd26d2777363d015872aa9eab73c68b3186f77698aa1d72d4f4eedb2c53b0cd47a98f26ef5f0a9b2c1e42c6c877cca80f DIST gradle-bin-8.1.1.zip 168381151 BLAKE2B 334727108ccfd374daaa91c363ebf10d8b13e00c61fe14e097b3baa5bb8bf0d2fdde509ef4ac0d90db1fd075c7552a0f7ba90b67d549e45a3c1cb37d036ae000 SHA512 185a831dc37b946e348f9d98ff88eefaad303cdb385d45a5f65c401dd51d4d0c1225d8d716e7345167e53d41cade2bf3008bbde1d66a18d9a4925a589853b598 +DIST gradle-bin-8.2.1.zip 193042584 BLAKE2B 10381d2601c707c6a391fb515e753d583eec0d7e89213fef690df4259aedbdde0ea8981e474eae5c7b21ff12d621897158271c5e2ee964190bca02bf6882c237 SHA512 a3d05873460c4045e2b43c41e39120b444ad5896c6561104ccf8cca4e58fa95bd512e356faa3a507b0e3c4212548002ff02845791dd42518635f4bc6ae67475b +DIST gradle-bin-8.3.zip 200258206 BLAKE2B f9909266e2887971f2f7480dbfe441c040fcd2ae12146bd9393d0836bca48f931124e60a1095d79ba6b172136ebb1734976e28d255aa3f16a22125a2662b80f1 SHA512 c328b597ff0c28b8071c050b6f1e57bf3eccca4d0eaeda0974700fc2d380667aca2e1a7b3548314519e99b7a823ede4c83a5786147a6a002d081920afa9c490b +DIST gradle-bin-8.4.zip 212870963 BLAKE2B da32c1010e85f6cded0c1b539b243db6d41fcd033266be3b03b389e6a2e317bea17ddbe65c597c7ea82628cc5bec913954ec998d018b68daa67d39f9a8958e7e SHA512 52d5f622b8ad0ab36ff84589733b47423b12f94211086a84eca9810690af29e396877f1155ee31279c4325e98cd1d55b32137d52efcf48eb1e258caeece08f22 diff --git a/dev-java/gradle-bin/gradle-bin-8.1.1.ebuild b/dev-java/gradle-bin/gradle-bin-8.1.1.ebuild index 6fceca3ae5c8..7d07ab9dc4b0 100644 --- a/dev-java/gradle-bin/gradle-bin-8.1.1.ebuild +++ b/dev-java/gradle-bin/gradle-bin-8.1.1.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/" LICENSE="Apache-2.0" SLOT="${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DEPEND="app-eselect/eselect-gradle" BDEPEND="app-arch/unzip" diff --git a/dev-java/gradle-bin/gradle-bin-8.2.1.ebuild b/dev-java/gradle-bin/gradle-bin-8.2.1.ebuild new file mode 100644 index 000000000000..afe46bd7d1c6 --- /dev/null +++ b/dev-java/gradle-bin/gradle-bin-8.2.1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +IUSE="doc" +JAVA_PKG_IUSE="source" + +inherit java-pkg-2 + +MY_PN=${PN%%-bin} +MY_P="${MY_PN}-${PV/_rc/-rc-}" + +DESCRIPTION="A project automation and build tool with a Groovy based DSL" +SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip" +HOMEPAGE="https://www.gradle.org/" + +LICENSE="Apache-2.0" +SLOT="${PV}" +KEYWORDS="amd64 ~x86" + +DEPEND="app-eselect/eselect-gradle" +BDEPEND="app-arch/unzip" +RDEPEND=" + ${DEPEND} + >=virtual/jre-1.8:* +" + +S="${WORKDIR}/${MY_P}" + +src_compile() { + : +} + +src_install() { + local gradle_dir="/usr/share/${PN}-${SLOT}" + + if use source; then + java-pkg_dosrc src + fi + + docinto html + dodoc -r docs/release-notes.html + if use doc; then + dodoc -r docs/{dsl,userguide} + java-pkg_dojavadoc docs/javadoc + fi + + insinto "${gradle_dir}" + doins -r bin/ lib/ + fperms 755 "${gradle_dir}/bin/gradle" + dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}" +} + +pkg_postinst() { + eselect gradle update ifunset +} + +pkg_postrm() { + eselect gradle update ifunset +} diff --git a/dev-java/gradle-bin/gradle-bin-8.3.ebuild b/dev-java/gradle-bin/gradle-bin-8.3.ebuild new file mode 100644 index 000000000000..afe46bd7d1c6 --- /dev/null +++ b/dev-java/gradle-bin/gradle-bin-8.3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +IUSE="doc" +JAVA_PKG_IUSE="source" + +inherit java-pkg-2 + +MY_PN=${PN%%-bin} +MY_P="${MY_PN}-${PV/_rc/-rc-}" + +DESCRIPTION="A project automation and build tool with a Groovy based DSL" +SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip" +HOMEPAGE="https://www.gradle.org/" + +LICENSE="Apache-2.0" +SLOT="${PV}" +KEYWORDS="amd64 ~x86" + +DEPEND="app-eselect/eselect-gradle" +BDEPEND="app-arch/unzip" +RDEPEND=" + ${DEPEND} + >=virtual/jre-1.8:* +" + +S="${WORKDIR}/${MY_P}" + +src_compile() { + : +} + +src_install() { + local gradle_dir="/usr/share/${PN}-${SLOT}" + + if use source; then + java-pkg_dosrc src + fi + + docinto html + dodoc -r docs/release-notes.html + if use doc; then + dodoc -r docs/{dsl,userguide} + java-pkg_dojavadoc docs/javadoc + fi + + insinto "${gradle_dir}" + doins -r bin/ lib/ + fperms 755 "${gradle_dir}/bin/gradle" + dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}" +} + +pkg_postinst() { + eselect gradle update ifunset +} + +pkg_postrm() { + eselect gradle update ifunset +} diff --git a/dev-java/gradle-bin/gradle-bin-8.4.ebuild b/dev-java/gradle-bin/gradle-bin-8.4.ebuild new file mode 100644 index 000000000000..6fceca3ae5c8 --- /dev/null +++ b/dev-java/gradle-bin/gradle-bin-8.4.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +IUSE="doc" +JAVA_PKG_IUSE="source" + +inherit java-pkg-2 + +MY_PN=${PN%%-bin} +MY_P="${MY_PN}-${PV/_rc/-rc-}" + +DESCRIPTION="A project automation and build tool with a Groovy based DSL" +SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip" +HOMEPAGE="https://www.gradle.org/" + +LICENSE="Apache-2.0" +SLOT="${PV}" +KEYWORDS="~amd64 ~x86" + +DEPEND="app-eselect/eselect-gradle" +BDEPEND="app-arch/unzip" +RDEPEND=" + ${DEPEND} + >=virtual/jre-1.8:* +" + +S="${WORKDIR}/${MY_P}" + +src_compile() { + : +} + +src_install() { + local gradle_dir="/usr/share/${PN}-${SLOT}" + + if use source; then + java-pkg_dosrc src + fi + + docinto html + dodoc -r docs/release-notes.html + if use doc; then + dodoc -r docs/{dsl,userguide} + java-pkg_dojavadoc docs/javadoc + fi + + insinto "${gradle_dir}" + doins -r bin/ lib/ + fperms 755 "${gradle_dir}/bin/gradle" + dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}" +} + +pkg_postinst() { + eselect gradle update ifunset +} + +pkg_postrm() { + eselect gradle update ifunset +} diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest index e307a1f87e40..2c2239d9e6bf 100644 --- a/dev-java/guava-testlib/Manifest +++ b/dev-java/guava-testlib/Manifest @@ -1 +1,2 @@ -DIST guava-31.1.tar.gz 5583483 BLAKE2B b430257b6a21e8cc85b11241be3abc463d13d29d85c6e7a3e4240977213428ec92af63afb66d0637f6b6dbbab1e3493cfc684a6be21ba4633cec7c6df5d0a8e7 SHA512 660b486d82d526ce722130f2968ea8ab9eb53f5915f80e53ef135a7bfcb6ced9b2f2a50ebdb8b316cc48a4f2553fa067a1d6fc0bc4498774a9f1990a535651b8 +DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78 +DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 diff --git a/dev-java/guava-testlib/guava-testlib-31.1.ebuild b/dev-java/guava-testlib/guava-testlib-31.1.ebuild deleted file mode 100644 index b4a05d3138f6..000000000000 --- a/dev-java/guava-testlib/guava-testlib-31.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom guava-testlib/pom.xml --download-uri https://github.com/google/guava/archive/v31.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild guava-testlib-31.1.ebuild - -EAPI=8 - -# No tests because "error: package com.google.common.truth does not exist" -JAVA_PKG_IUSE="doc source" -MAVEN_ID="com.google.guava:guava-testlib:31.1-jre" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A set of java classes to assist the tests for Guava itself" -HOMEPAGE="https://github.com/google/guava" -SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: ${PN}/pom.xml -# com.google.code.findbugs:jsr305:3.0.2 -> >=dev-java/jsr305-3.0.2:0 -# com.google.errorprone:error_prone_annotations:2.11.0 -> >=dev-java/error-prone-annotations-2.16:0 -# com.google.guava:guava:31.1-jre -> >=dev-java/guava-31.1:0 -# com.google.j2objc:j2objc-annotations:1.3 -> >=dev-java/j2objc-annotations-2.8:0 -# junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4 -# org.checkerframework:checker-qual:3.12.0 -> >=dev-java/checker-framework-qual-3.14.0:0 - -CP_DEPEND=" - dev-java/checker-framework-qual:0 - dev-java/error-prone-annotations:0 - ~dev-java/guava-${PV}:0 - dev-java/j2objc-annotations:0 - dev-java/jsr305:0 - dev-java/junit:4 -" - -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND}" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND}" - -S="${WORKDIR}/guava-${PV}" - -JAVA_SRC_DIR="${PN}/src" diff --git a/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild b/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild new file mode 100644 index 000000000000..f2a7f38e6762 --- /dev/null +++ b/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# No tests because "error: package com.google.common.truth does not exist" +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.guava:guava-testlib:${PV}-jre" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A set of java classes to assist the tests for Guava itself" +HOMEPAGE="https://github.com/google/guava" +# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. +SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" +S="${WORKDIR}/guava-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +CP_DEPEND=" + dev-java/checker-framework-qual:0 + dev-java/error-prone-annotations:0 + ~dev-java/guava-${PV}:0 + dev-java/j2objc-annotations:0 + dev-java/jsr305:0 + dev-java/junit:4 +" + +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:*" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +JAVA_SRC_DIR="${PN}/src" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="${PN}/test" + +src_test() { + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" + java-pkg-simple_src_test +} diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest index e307a1f87e40..beb166188cf0 100644 --- a/dev-java/guava/Manifest +++ b/dev-java/guava/Manifest @@ -1 +1 @@ -DIST guava-31.1.tar.gz 5583483 BLAKE2B b430257b6a21e8cc85b11241be3abc463d13d29d85c6e7a3e4240977213428ec92af63afb66d0637f6b6dbbab1e3493cfc684a6be21ba4633cec7c6df5d0a8e7 SHA512 660b486d82d526ce722130f2968ea8ab9eb53f5915f80e53ef135a7bfcb6ced9b2f2a50ebdb8b316cc48a4f2553fa067a1d6fc0bc4498774a9f1990a535651b8 +DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78 diff --git a/dev-java/guava/guava-31.1.ebuild b/dev-java/guava/guava-31.1.ebuild deleted file mode 100644 index 63da6851c481..000000000000 --- a/dev-java/guava/guava-31.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/google/guava/archive/refs/tags/v31.1.tar.gz --slot 0 --keywords "amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild guava-31.1.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="com.google.guava:guava:${PV}-jre" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A collection of Google's core Java libraries" -HOMEPAGE="https://github.com/google/guava" -SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# com.google.code.findbugs:jsr305:3.0.2 -> >=dev-java/jsr305-3.0.2:0 -# com.google.errorprone:error_prone_annotations:2.11.0 -> >=dev-java/error-prone-annotations-2.16:0 -# com.google.guava:failureaccess:1.0.1 -> >=dev-java/failureaccess-30.1.1:0 -# com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -> !!!artifactId-not-found!!! -# com.google.j2objc:j2objc-annotations:1.3 -> >=dev-java/j2objc-annotations-2.8:0 -# org.checkerframework:checker-qual:3.12.0 -> >=dev-java/checker-framework-qual-3.14.0:0 - -CP_DEPEND=" - >=dev-java/checker-framework-qual-3.14.0:0 - >=dev-java/error-prone-annotations-2.16:0 - >=dev-java/failureaccess-30.1.1:0 - >=dev-java/j2objc-annotations-2.8:0 - >=dev-java/jsr305-3.0.2:0 -" - -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND} -" - -S="${WORKDIR}/${P}" - -JAVA_AUTOMATIC_MODULE_NAME="com.google.common" -JAVA_SRC_DIR="guava/src" diff --git a/dev-java/guava/guava-32.1.2-r1.ebuild b/dev-java/guava/guava-32.1.2-r1.ebuild new file mode 100644 index 000000000000..dfa306985777 --- /dev/null +++ b/dev-java/guava/guava-32.1.2-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="com.google.guava:guava:${PV}-jre" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A collection of Google's core Java libraries" +HOMEPAGE="https://github.com/google/guava" +SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +CP_DEPEND=" + dev-java/checker-framework-qual:0 + dev-java/error-prone-annotations:0 + ~dev-java/failureaccess-${PV}:0 + dev-java/j2objc-annotations:0 + dev-java/jsr305:0 +" + +DEPEND=" + >=virtual/jdk-1.8:* + ${CP_DEPEND} +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CP_DEPEND} +" + +JAVA_AUTOMATIC_MODULE_NAME="com.google.common" +JAVA_SRC_DIR="guava/src" diff --git a/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch b/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch index 5e69341210cf..55d14fab15d3 100644 --- a/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch +++ b/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch @@ -1,6 +1,6 @@ # It's unclear how upstream gets their "dev.compile.test" target to compile # without this - it could be that their testing is done with the local tools/ -# dir, and that some assumptions are made somewhere in the bulid system that +# dir, and that some assumptions are made somewhere in the build system that # don't apply when the tools dir is elsewhere. Either way, this fixes it. # # a Pull Request (of sorts) has been issued with upstream to incorporate this diff --git a/dev-java/hashcash/hashcash-1.1.ebuild b/dev-java/hashcash/hashcash-1.1.ebuild index 155c3025dd1f..5c93c554d7e5 100644 --- a/dev-java/hashcash/hashcash-1.1.ebuild +++ b/dev-java/hashcash/hashcash-1.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://www.nettgryppa.com/code/HashCash.java" LICENSE="GregoryRubin" SLOT="1" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest index c055de4d6604..ee70232228bb 100644 --- a/dev-java/htmlcleaner/Manifest +++ b/dev-java/htmlcleaner/Manifest @@ -1 +1,2 @@ DIST htmlcleaner-2.26-src.zip 414195 BLAKE2B c73533054bf7a8a66a767e53cbafecca1f174cb3be16e116ddd0e025e627603e225323e9095ea40b38a06c661ebe9f2a9e1f53736bf74fd8a2e41d909381c4fb SHA512 df1f9ccc696d538289a0addd19f8d955a3bcb0da88640208c513b2f4f0c4a3ee516b459aa3aae25d36d6ec09c4082b96484df287fb422add2eb160072668af5a +DIST htmlcleaner-src-2.29.zip 394326 BLAKE2B 6317e5dd51facd901e7a5bdc72322c58deb5d3a2e2d0a784e6cd71b938c7b46b7a612d0610a1e5f96ac6c55714942e00ffa68f2259416fe1e6be8cb5ad96c0b3 SHA512 87c3884f56c01d4f34be71b5a016a839f949f03ea429a3c10cc5518fe954b09aa42d05fdf821e7b0bf2115787cffff6ae72dbe13e3d7e08537c4ffbf51d6b34f diff --git a/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild new file mode 100644 index 000000000000..39354c4424da --- /dev/null +++ b/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="net.sourceforge.htmlcleaner:htmlcleaner:2.29" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="HTML parser written in Java that can be used as a tool, library or Ant task" +HOMEPAGE="https://htmlcleaner.sourceforge.net/" +SRC_URI="mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${PV}/htmlcleaner-src-${PV}.zip" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND="app-arch/unzip" +CP_DEPEND="dev-java/jdom:2" +DEPEND="${CP_DEPEND} + dev-java/ant-core:0 + >=virtual/jdk-1.8:* + test? ( dev-java/junit:4 )" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +JAVA_CLASSPATH_EXTRA="ant-core" +JAVA_MAIN_CLASS="org.htmlcleaner.CommandLine" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" + +src_install() { + java-pkg-simple_src_install + java-pkg_register-ant-task + + insinto "${JAVA_PKG_SHAREPATH}" + newins example.xml default.xml +} diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest index 764b0abe0d37..654f43047d9e 100644 --- a/dev-java/icu4j/Manifest +++ b/dev-java/icu4j/Manifest @@ -1 +1 @@ -DIST icu-72.1.tar.gz 67092974 BLAKE2B 2261c7969ddbfdb4e75e405646cc9f29b1f8dd21f98641b9318457d3cd27694833a9181f4888d2cb243ba65191fe9216a508684c1dbd5a85f36e06ae8fac7d9e SHA512 fee1278f16528867da63d95feee6864a1f62befa9cc0b006439e1b47cf6f3f0e6581692432129e465208b5bd7fcc44e1175f124e83157547b3d9a78f3a4944ab +DIST icu-73.2.tar.gz 81522943 BLAKE2B 006d7ccab04385f0aa60e2e60b616be9598f448f27d9b0f6dba554874bfe1dd442ba0719a7677ba8aba7e4e0f05e5e50dca74855a900da1f496aad0cd54c3cdc SHA512 f234fb9c76af62dad59e159ef7f7792aca563d88f2988d3d1ecc8be6250837beb9a530ec121e0949f6925ee8e5171a0d04fa41a0c50d9993c4061fa55be6836e diff --git a/dev-java/icu4j/icu4j-72.1.ebuild b/dev-java/icu4j/icu4j-72.1.ebuild deleted file mode 100644 index 6c36773ab3b6..000000000000 --- a/dev-java/icu4j/icu4j-72.1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/unicode-org/icu/archive/release-72-1.tar.gz --slot 70 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild icu4j-72.1.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.ibm.icu:icu4j:72.1" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A set of Java libraries providing Unicode and Globalization support" -HOMEPAGE="https://icu.unicode.org" -SRC_URI="https://github.com/unicode-org/icu/archive/refs/tags/release-${PV/./-}.tar.gz -> icu-${PV}.tar.gz" - -LICENSE="icu" -SLOT="70" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=">=virtual/jdk-1.8:* - test? ( dev-java/junitparams:0 )" - -RDEPEND=">=virtual/jre-1.8:*" - -S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main" - -HTML_DOCS=( ../{APIChangeReport,license,readme}.html ) - -JAVA_GENTOO_CLASSPATH_EXTRA="icu4j.jar:icu4j-charset.jar:icu4j-localespi.jar:testdata.jar:framework.jar" -JAVA_TEST_GENTOO_CLASSPATH="junit-4,junitparams" -JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI" - -JAVA_TEST_SRC_DIR=( - tests/charset/src - tests/collate/src - tests/core/src -# tests/framework/src # we compile it in src_compile - tests/localespi/src - tests/packaging/src - tests/translit/src -) - -JAVA_TEST_RESOURCE_DIRS=( - tests/charset/resources - tests/collate/resources - tests/core/resources -# tests/framework/resources - tests/localespi/resources - tests/packaging/resources - tests/translit/resources -) - -JAVA_TEST_EXCLUDES=( - "com.ibm.icu.dev.data.TestDataElements_testtypes" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.data.resources.TestDataElements_en_Latn_US" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.data.resources.TestDataElements_en_US" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.data.resources.TestDataElements_fr_Latn_FR" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.data.resources.TestDataElements_te" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.data.resources.TestMessages" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.test.translit.TestUtility" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.test.localespi.TestUtil" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.test.stringprep.TestData" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.test.calendar.ChineseTestCase" # Invalid test class 1. Test class should have exactly one public zero-argument constructor - "com.ibm.icu.dev.test.calendar.TestCase" # java.lang.IllegalArgumentException: Test class can only have one constructor - "com.ibm.icu.dev.test.bidi.TestData" # Invalid test class 1. Test class should have exactly one public constructor - # following kills 98 tests and and avoids 9 test failures - # coverage tests fail because test handlers for the parametrized tests are not defined so the tests are broken and cannot succeed - "com.ibm.icu.dev.test.serializable.CoverageTest" -) - -src_prepare() { - default - - # create the resources directories - mkdir resources || die - cp -r classes/* resources || die - - # remove .java files from resources - find resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed" - - # this should not go in the jar files - mv shared/licenses/license.html .. || die - - # icudata and icutzdata for "icu4j.jar" - pushd resources/core/src || die - jar -xf "${S}"/shared/data/icudata.jar || die - jar -xf "${S}"/shared/data/icutzdata.jar || die - # move these resources to "icu4j-charset.jar" - mkdir -p "${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die - mv com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/{*.cnv,cnvalias.icu} \ - "${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die - - # create 9 files com/ibm/icu/impl/data/icudt69b/*/fullLocaleNames.lst - for dir in $(find com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/ -type d ! -name 'unit' -exec echo {} +); do - ls -1 $dir/*.res | sed -e 's%.*\/%%' -e 's%\..*$%%' -e '/pool/d' -e '/res_index/d' -e '/tzdbNames/d'\ - > $dir/'fullLocaleNames.lst'; - done || die "fullLocaleNames.lst failed" - popd - - # this test class was failing with "No runnable methods" - # but test_excluding it would kill tousands of other tests. - mkdir -p tests/framework/src/com/ibm/icu/dev/data/resources || die - mv tests/{core,framework}/src/com/ibm/icu/dev/data/resources/TestDataElements.java || die - - # testdata.jar needs to be on classpath - cp shared/data/testdata.jar . || die - - # clone tests src - for i in charset collate core framework localespi packaging translit; do - cp -r tests/$i/{src,resources}; - done || die "copying tests from src to resources failed" - cp -r ../tools/misc/{src,resources} || die - - # separate tests resources from tests src - find tests/*/resources -type f -name '*.java' -exec rm -rf {} + || die - find ../tools/misc/resources -type f -name '*.java' -exec rm -rf {} + || die -} - -src_compile() { - einfo "Compiling icu4j.jar" - JAVA_SRC_DIR=( - classes/collate/src - classes/core/src - classes/currdata/src - classes/langdata/src - classes/regiondata/src - classes/translit/src - ) - JAVA_RESOURCE_DIRS=( - resources/collate/src - resources/core/src - resources/currdata/src - resources/langdata/src - resources/regiondata/src - resources/translit/src - shared/licenses - ) - JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu" - JAVA_JAR_FILENAME="icu4j.jar" - JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo" - java-pkg-simple_src_compile - rm -r target || die - - einfo "Compiling icu4j-charset.jar" - JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.charset" - JAVA_JAR_FILENAME="icu4j-charset.jar" - JAVA_MAIN_CLASS="" - JAVA_RESOURCE_DIRS=( resources/charset/src shared/licenses ) - JAVA_SRC_DIR=( classes/charset/src ) - java-pkg-simple_src_compile - rm -r target || die - - einfo "Compiling icu4j-localespi.jar" - JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.localespi" - JAVA_JAR_FILENAME="icu4j-localespi.jar" - JAVA_RESOURCE_DIRS=( resources/localespi/src shared/licenses ) - JAVA_SRC_DIR=( classes/localespi/src ) - java-pkg-simple_src_compile - rm -r target || die - - # main/test/framework - # needed for compilicg the tests - # but "No runnable methods" ("Invalid test class") - if use test; then - JAVA_JAR_FILENAME="framework.jar" - JAVA_RESOURCE_DIRS=( tests/framework/resources ../tools/misc/resources ) - JAVA_SRC_DIR=( tests/framework/src ../tools/misc/src ) - java-pkg-simple_src_compile - rm -fr target || die - fi - - # javadocs - if use doc; then - JAVA_JAR_FILENAME="ignoreme.jar" - JAVA_SRC_DIR=( classes ) - java-pkg-simple_src_compile - fi -} - -src_test () { - # https://bugs.gentoo.org/827212 - local vm_version="$(java-config -g PROVIDES_VERSION)" - if [[ "${vm_version}" != "1.8" ]] ; then - java-pkg-simple_src_test - fi -} - -src_install() { - default - java-pkg_dojar "icu4j.jar" - java-pkg_dojar "icu4j-charset.jar" - java-pkg_dojar "icu4j-localespi.jar" - - if use doc; then - java-pkg_dojavadoc target/api - fi - if use source; then - java-pkg_dosrc "classes" - fi -} diff --git a/dev-java/icu4j/icu4j-73.2.ebuild b/dev-java/icu4j/icu4j-73.2.ebuild new file mode 100644 index 000000000000..bb57ea2829c9 --- /dev/null +++ b/dev-java/icu4j/icu4j-73.2.ebuild @@ -0,0 +1,240 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.ibm.icu:icu4j:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A set of Java libraries providing Unicode and Globalization support" +HOMEPAGE="https://icu.unicode.org" +SRC_URI="https://github.com/unicode-org/icu/archive/release-${PV/./-}.tar.gz -> icu-${PV}.tar.gz" +S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main" + +LICENSE="icu" +SLOT="70" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +DEPEND=">=virtual/jdk-1.8:* + test? ( dev-java/junitparams:0 )" + +RDEPEND=">=virtual/jre-1.8:*" + +HTML_DOCS=( ../{APIChangeReport,readme}.html ) + +JAVA_TEST_EXCLUDES=( + # Invalid tests, not run by maven + "com.ibm.icu.dev.data.TestDataElements_testtypes" + "com.ibm.icu.dev.data.resources.TestDataElements_en_Latn_US" + "com.ibm.icu.dev.data.resources.TestDataElements_en_US" + "com.ibm.icu.dev.data.resources.TestDataElements_fr_Latn_FR" + "com.ibm.icu.dev.data.resources.TestDataElements_te" + "com.ibm.icu.dev.data.resources.TestMessages" + "com.ibm.icu.dev.test.ModuleTest" + "com.ibm.icu.dev.test.TestBoilerplate" + "com.ibm.icu.dev.test.TestDataModule" + "com.ibm.icu.dev.test.bidi.TestData" + "com.ibm.icu.dev.test.calendar.ChineseTestCase" + "com.ibm.icu.dev.test.calendar.TestCase" + "com.ibm.icu.dev.test.format.ExhaustivePersonNameFormatterTest" + "com.ibm.icu.dev.test.localespi.TestUtil" + "com.ibm.icu.dev.test.message2.TestCase" + "com.ibm.icu.dev.test.stringprep.TestData" + "com.ibm.icu.dev.test.translit.TestUtility" + # Maven: [INFO] Tests run: 364, Failures: 0, Errors: 0, Skipped: 0 + "com.ibm.icu.dev.test.serializable.CompatibilityTest" # Tests run: 364, Failures: 4 + # Maven: [INFO] Tests run: 90, Failures: 0, Errors: 0, Skipped: 0 + "com.ibm.icu.dev.test.serializable.CoverageTest" # Tests run: 99, Failures: 9 + # Following tests need to run separately: + com.ibm.icu.dev.test.calendar.CalendarRegressionTest + com.ibm.icu.dev.test.calendar.CompatibilityTest + com.ibm.icu.dev.test.calendar.DataDrivenCalendarTest + com.ibm.icu.dev.test.calendar.HolidayTest + com.ibm.icu.dev.test.calendar.IndianTest + com.ibm.icu.dev.test.calendar.IslamicTest + com.ibm.icu.dev.test.calendar.JapaneseTest + com.ibm.icu.dev.test.format.DataDrivenFormatTest + com.ibm.icu.dev.test.format.DateFormatRegressionTest + com.ibm.icu.dev.test.format.DateFormatRoundTripTest + com.ibm.icu.dev.test.format.DateIntervalFormatTest + com.ibm.icu.dev.test.format.DateTimeGeneratorTest + com.ibm.icu.dev.test.format.TestMessageFormat + com.ibm.icu.dev.test.message2.MessageFormat2Test + com.ibm.icu.dev.test.message2.Mf2FeaturesTest + com.ibm.icu.dev.test.message2.Mf2IcuTest + com.ibm.icu.dev.test.timezone.TimeZoneBoundaryTest + com.ibm.icu.dev.test.util.CurrencyTest +) +JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI" +JAVA_TEST_GENTOO_CLASSPATH="junit-4,junitparams" +JAVA_TEST_RESOURCE_DIRS=( + tests/res/collate/src + tests/res/core/src + tests/res/translit/src +) +JAVA_TEST_SRC_DIR=( + tests/charset/src + tests/collate/src + tests/core/src + tests/localespi/src + tests/packaging/src + tests/translit/src +) + +src_prepare() { + java-pkg_clean ! -path "./shared/data/*" # keep icudata.jar, icutzdata.jar, testdata.jar + java-pkg-2_src_prepare + + # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS + mkdir -p resources || die + + pushd classes > /dev/null || die + find -type f \ + ! -name '*.java' \ + ! -name 'license.html' \ + | xargs cp --parent -t ../resources || die + popd > /dev/null || die + + pushd resources/core/src > /dev/null || die + # icudata and icutzdata for "icu4j.jar" + jar -xf "${S}"/shared/data/icudata.jar || die + jar -xf "${S}"/shared/data/icutzdata.jar || die + # move these resources to "icu4j-charset.jar" + mkdir -p "${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die + mv com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/{*.cnv,cnvalias.icu} \ + "${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die + + # create 9 files com/ibm/icu/impl/data/icudt69b/*/fullLocaleNames.lst + for dir in $(find com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/ -type d ! -name 'unit' -exec echo {} +); do + ls -1 $dir/*.res | sed -e 's%.*\/%%' -e 's%\..*$%%' -e '/pool/d' -e '/res_index/d' -e '/tzdbNames/d'\ + > $dir/'fullLocaleNames.lst'; + done || die "fullLocaleNames.lst failed" + popd > /dev/null || die + + if use test; then + # initializationError(com.ibm.icu.dev.data.resources.TestDataElements) + # but test_excluding it would kill tousands of other tests. + mkdir -p tests/framework/src/com/ibm/icu/dev/data/resources || die + mv tests/{core,framework}/src/com/ibm/icu/dev/data/resources/TestDataElements.java || die + + # Separate tests resources + mkdir tests/res || die + pushd tests > /dev/null || die + find -type f \ + ! -name '*.java' \ + | xargs cp --parent -t res || die + popd > /dev/null || die + + cp -r ../tools/misc/{src,resources} || die + find ../tools/misc/resources -type f -name '*.java' -exec rm -rf {} + || die + fi +} + +src_compile() { + einfo "Compiling icu4j.jar" + JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu" + JAVA_JAR_FILENAME="icu4j.jar" + JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo" + JAVA_RESOURCE_DIRS="resources/core/src" + JAVA_SRC_DIR=( + classes/collate/src + classes/core/src + classes/currdata/src + classes/langdata/src + classes/regiondata/src + classes/translit/src + ) + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":icu4j.jar" + rm -r target || die + + einfo "Compiling icu4j-charset.jar" + JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.charset" + JAVA_JAR_FILENAME="icu4j-charset.jar" + JAVA_MAIN_CLASS="" + JAVA_RESOURCE_DIRS="resources/charset/src" + JAVA_SRC_DIR=( classes/charset/src ) + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":icu4j-charset.jar" + rm -r target || die + + einfo "Compiling icu4j-localespi.jar" + JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.localespi" + JAVA_JAR_FILENAME="icu4j-localespi.jar" + JAVA_RESOURCE_DIRS="resources/localespi/src" + JAVA_SRC_DIR=( classes/localespi/src ) + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":icu4j-localespi.jar" + rm -r target || die + + # main/test/framework + # needed for compilicg the tests + # but "No runnable methods" ("Invalid test class") + if use test; then + JAVA_JAR_FILENAME="framework.jar" + JAVA_RESOURCE_DIRS=( tests/res/framework/src ../tools/misc/resources ) + JAVA_SRC_DIR=( tests/framework/src ../tools/misc/src ) + java-pkg-simple_src_compile + rm -fr target || die + fi + + # javadocs + if use doc; then + JAVA_JAR_FILENAME="ignoreme.jar" + JAVA_SRC_DIR=( classes ) + java-pkg-simple_src_compile + fi +} + +src_test () { + # TZ needed for some tests in com/ibm/icu/dev/test/format/DateFormatTest + export LC_ALL="en_US.UTF-8" TZ="US/Pacific" + JAVA_GENTOO_CLASSPATH_EXTRA+=":framework.jar:shared/data/testdata.jar" + + JAVA_TEST_RUN_ONLY=( + com.ibm.icu.dev.test.rbbi.AbstractBreakIteratorTests + com.ibm.icu.dev.test.calendar.CalendarRegressionTest + com.ibm.icu.dev.test.calendar.CompatibilityTest + com.ibm.icu.dev.test.calendar.DataDrivenCalendarTest + com.ibm.icu.dev.test.calendar.HolidayTest + com.ibm.icu.dev.test.calendar.IndianTest + com.ibm.icu.dev.test.calendar.IslamicTest + com.ibm.icu.dev.test.calendar.JapaneseTest + com.ibm.icu.dev.test.format.DataDrivenFormatTest + com.ibm.icu.dev.test.format.DateFormatRegressionTest + com.ibm.icu.dev.test.format.DateFormatRoundTripTest + com.ibm.icu.dev.test.format.DateIntervalFormatTest + com.ibm.icu.dev.test.format.DateTimeGeneratorTest + com.ibm.icu.dev.test.format.TestMessageFormat + com.ibm.icu.dev.test.message2.MessageFormat2Test + com.ibm.icu.dev.test.message2.Mf2FeaturesTest + com.ibm.icu.dev.test.message2.Mf2IcuTest + com.ibm.icu.dev.test.timezone.TimeZoneBoundaryTest + com.ibm.icu.dev.test.util.CurrencyTest + ) + java-pkg-simple_src_test + + JAVA_TEST_RUN_ONLY=() + # ../maven-build/maven-icu4j-localespi/pom.xml#L133-L143 + local vm_version="$(java-config -g PROVIDES_VERSION)" + if [[ "${vm_version}" != "1.8" ]] ; then + java-pkg-simple_src_test + fi +} + +src_install() { + default + java-pkg_dojar "icu4j.jar" + java-pkg_dojar "icu4j-charset.jar" + java-pkg_dojar "icu4j-localespi.jar" + + if use doc; then + java-pkg_dojavadoc target/api + fi + if use source; then + java-pkg_dosrc "classes" + fi +} diff --git a/dev-java/identicon/identicon-1.0.ebuild b/dev-java/identicon/identicon-1.0.ebuild index 3824db12a58a..b3db99166311 100644 --- a/dev-java/identicon/identicon-1.0.ebuild +++ b/dev-java/identicon/identicon-1.0.ebuild @@ -14,7 +14,7 @@ COMMIT="96902d3c7c9733d9da4cce9c5ed424557fc2ec3c" SRC_URI="https://github.com/PauloMigAlmeida/identicon/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="1" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" CP_DEPEND=" dev-java/cache2k-api:0 diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest index b392a5f7d49c..085e1f137a17 100644 --- a/dev-java/jakartaee-migration/Manifest +++ b/dev-java/jakartaee-migration/Manifest @@ -1,2 +1 @@ -DIST jakartaee-migration-1.0.6-sources.tar.gz 42167 BLAKE2B 9252078f3b31e07dab533ca9d1d32812f49571adf942a3f11bf074d2110b5fb0c2500dae244b10597f0d76c18bb153cd577528cb01ff01350abb46d32251293a SHA512 81ecfe561695e4e5cacaed0ef89e5759e357b332f2798ac6f3d89c43c9a5dfed1a684745b7fe3afe6d1e82ac9405fd2de68da599a53bfe5f67397b452753b572 DIST jakartaee-migration-1.0.7-sources.tar.gz 43381 BLAKE2B 9a1a6bfd217f77890940240c6c860e21e0b72c758a63426a0c63009213738a9322a758d4525a9a8a8c69883c490edf128d8b70a6120ede431da434c4d1408e19 SHA512 f7edd70b997b2ae2a93b14b93c5b6dcb80de04f554125729f89e62eddaecfbfea21b304226887edb029c8a7b255b50a55a38381d017c7d44859f2e56b912f25a diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild deleted file mode 100644 index 8e03edd54b96..000000000000 --- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.5/source/jakartaee-migration-1.0.5-src.tar.gz --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.5.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.6" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9" -HOMEPAGE="https://tomcat.apache.org" -SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64" - -# Common dependencies -# POM: pom.xml -# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1 -# org.apache.bcel:bcel:6.6.0 -> >=dev-java/bcel-6.6.0:0 -# org.apache.commons:commons-compress:1.22 -> !!!suitable-mavenVersion-not-found!!! - -CDEPEND=" - dev-java/ant-core:0 - >=dev-java/bcel-6.6.0:0 - >=dev-java/commons-compress-1.21:0 - >=dev-java/commons-io-2.11.0:1 -" - -# Compile dependencies -# POM: pom.xml -# org.apache.ant:ant:1.10.12 -> !!!suitable-mavenVersion-not-found!!! -# POM: pom.xml -# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4 - -DEPEND=" - >=virtual/jdk-1.8:* - ${CDEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND}" - -S="${WORKDIR}/${P}" - -JAVA_LAUNCHER_FILENAME="${PN}" - -JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1" -JAVA_SRC_DIR="src/main/java" -JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI" -JAVA_RESOURCE_DIRS=( - "src/main/resources" -) - -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS=( - "src/test/resources" -) -JAVA_TEST_EXCLUDES=( - "org.apache.tomcat.jakartaee.TesterConstants" -) - -src_prepare() { - default - sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties -} - -src_test() { - # we need to create jar files for the tests the same way as it's done using pom.xml - local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+") - mkdir -p target/test-classes/META-INF || die - pushd target/test-classes || die - echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF - ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die - jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die - ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die - jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die - for enc in rsa dsa ec; do - cp hellocgi.jar hellocgi-signed-${enc}.jar || die - jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die - done - popd - - java-pkg-simple_src_test -} diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild index 212872e15d9a..4308d151f1bf 100644 --- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild +++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://tomcat.apache.org" SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64 ~arm ~arm64" # Common dependencies # POM: pom.xml @@ -35,8 +35,13 @@ CDEPEND=" # POM: pom.xml # test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4 +# we need jdk-11 just for some tests as those need stuff from newer jdk, +# otherwise the package as of version 1.0.7 compiles fine with jdk 1.8 +# with tests disabled +# see bug https://bugs.gentoo.org/910499 + DEPEND=" - >=virtual/jdk-1.8:* + >=virtual/jdk-11:* ${CDEPEND} " diff --git a/dev-java/jal/jal-20031117-r6.ebuild b/dev-java/jal/jal-20031117-r6.ebuild index f8f5bb559e77..d8d008aab7b0 100644 --- a/dev-java/jal/jal-20031117-r6.ebuild +++ b/dev-java/jal/jal-20031117-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Partial port of the C++ Standard Template Library" -HOMEPAGE="http://vigna.dsi.unimi.it/jal" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz" LICENSE="HPND" diff --git a/dev-java/janino/Manifest b/dev-java/janino/Manifest deleted file mode 100644 index 98ab4e04aed5..000000000000 --- a/dev-java/janino/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST janino-3.1.7.tar.gz 1747439 BLAKE2B 6e42a9d5cc079c2cf17b76c1d76420ff3fa0027b54736f23e0aa2c5062f4dad19c1ac7efa678fa06cee369a01125a64a4ee32e4120e60ecd8a56d47aa4f69503 SHA512 541925fc10f5fbefde45e60cec1925e3d6f5b7244a6b9de251b5483224bee05c16182e2bf137a00349cbdb6c209ce18b2203ca066e5a7a1f146efa255f5f7799 -DIST janino-3.1.8.tar.gz 1753540 BLAKE2B 4fe3031133d9f4e9f20ffb559b9785399de8c5908abc97894eb63d7b16c197fc27763c274da7163e2bb3c5552bb5bbc9ae69da88d87da5b1c061baa2358d1441 SHA512 d79e68351f42069eb32974b0ba68e70a5510950ec04bfab49d4000310e487f3d4a3f50f0cc06d158830530d3cdb2cf9d68b291acea2218ad21f34c280604dad7 diff --git a/dev-java/janino/janino-3.1.7.ebuild b/dev-java/janino/janino-3.1.7.ebuild deleted file mode 100644 index b0fbd7ad85b3..000000000000 --- a/dev-java/janino/janino-3.1.7.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# 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" - -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-core:0 -" - -RDEPEND=" - >=virtual/jre-1.8:*" - -S="${WORKDIR}/${P}/janino" - -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-core" - 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/janino/janino-3.1.8.ebuild b/dev-java/janino/janino-3.1.8.ebuild deleted file mode 100644 index 02e053047e0f..000000000000 --- a/dev-java/janino/janino-3.1.8.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2023 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.8.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild janino-3.1.8.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.codehaus.janino:janino:3.1.8" -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" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Compile dependencies -# POM: ${PN}/pom.xml -# org.apache.ant:ant:1.10.11 -> !!!suitable-mavenVersion-not-found!!! -# POM: ${PN}/pom.xml -# test? de.unkrig.jdisasm:jdisasm:1.0.6 -> !!!groupId-not-found!!! -# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4 - -DEPEND=" - >=virtual/jdk-1.8:* - dev-java/ant-core:0 - test? ( - dev-java/jdisasm:0 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:*" - -S="${WORKDIR}/${P}/janino" - -src_prepare() { - default - java-pkg_clean -} - -src_compile() { - JAVA_JAR_FILENAME="commons-compiler.jar" - JAVA_SRC_DIR="../commons-compiler/src/main/java" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":commons-compiler.jar" - rm -r target || die - - JAVA_CLASSPATH_EXTRA="ant-core" - JAVA_JAR_FILENAME="janino.jar" - JAVA_RESOURCE_DIRS="src/main/resources" - JAVA_SRC_DIR="src/main/java" - 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() { - einfo "Testing commons-compiler" - JAVA_TEST_GENTOO_CLASSPATH="junit-4" - JAVA_TEST_RESOURCE_DIRS="../commons-compiler/src/test/resources" - JAVA_TEST_SRC_DIR="../commons-compiler/src/test/java" - java-pkg-simple_src_test - - einfo "Testing janino" - JAVA_TEST_GENTOO_CLASSPATH="jdisasm,junit-4" - JAVA_TEST_RESOURCE_DIRS="src/test/resources" - JAVA_TEST_SRC_DIR="src/test/java" - 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/janino/metadata.xml b/dev-java/janino/metadata.xml deleted file mode 100644 index 7ebc2576ac14..000000000000 --- a/dev-java/janino/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <longdescription> - The "JANINO" implementation of the "commons-compiler" API: Super-small, super-fast, independent from the JDK's "tools.jar". - </longdescription> - <upstream> - <remote-id type="github">janino-compiler/janino</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest index 9cc9cc4e6e3a..3bcc3e4b9642 100644 --- a/dev-java/java-config/Manifest +++ b/dev-java/java-config/Manifest @@ -1 +1,2 @@ DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4 +DIST java-config-2.3.3.tar.gz 33837 BLAKE2B dc522a61775272e520521a06c80ac33cbe40010a40051857df8abdbda72cc064969cb00dbf8f7d06efabd352d9cf2c711808205579c7cef73ce4bb7fe2845c8d SHA512 f999ccbdd47f2552913467d3b0c6704fc6511f2bc9d0a6f62d38a9c2e9899f11b239f2039b025f7fdee5e0713d2aaf13c1a9a9baf4f1551bb97d85b12d3f28e9 diff --git a/dev-java/java-config/java-config-2.3.3-r1.ebuild b/dev-java/java-config/java-config-2.3.3-r1.ebuild new file mode 100644 index 000000000000..b63dbff8d490 --- /dev/null +++ b/dev-java/java-config/java-config-2.3.3-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit meson python-r1 + +if [[ ${PV} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git" +else + SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="Java environment configuration query tool" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" + +LICENSE="GPL-2" +SLOT="2" +IUSE="test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )" + +# baselayout-java is added as a dep till it can be added to eclass. +RDEPEND=" + ${PYTHON_DEPS} + sys-apps/baselayout-java + sys-apps/portage[${PYTHON_USEDEP}] +" + +src_configure() { + local python_only=false + python_foreach_impl my_src_configure +} + +my_src_configure() { + local emesonargs=( + -Darch="${ARCH}" + -Dpython-only="${python_only}" + -Deprefix="${EPREFIX}" + ) + + meson_src_configure + python_only=true +} + +src_compile() { + python_foreach_impl meson_src_compile +} + +src_test() { + python_foreach_impl meson_src_test --no-rebuild --verbose +} + +src_install() { + python_foreach_impl my_src_install + + local scripts + mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/bin/* || die) + python_replicate_script "${scripts[@]}" + + # This replaces the file installed by java-config-wrapper. + dosym java-config-2 /usr/bin/java-config +} + +my_src_install() { + meson_src_install + + local pydirs=( + "${D}$(python_get_sitedir)" + ) + python_optimize "${pydirs[@]}" +} diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild index ee9dad46c7c3..1b124ce70a3a 100644 --- a/dev-java/java-config/java-config-9999.ebuild +++ b/dev-java/java-config/java-config-9999.ebuild @@ -1,15 +1,13 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -# jython depends on java-config, so don't add it or things will break -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 prefix +inherit meson python-r1 -if [[ ${PV} = *9999 ]]; then +if [[ ${PV} = 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git" else @@ -22,28 +20,61 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" LICENSE="GPL-2" SLOT="2" -IUSE="test" +IUSE="+compat test" RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )" # baselayout-java is added as a dep till it can be added to eclass. RDEPEND=" + ${PYTHON_DEPS} sys-apps/baselayout-java - sys-apps/portage[${PYTHON_USEDEP}]" + sys-apps/portage[${PYTHON_USEDEP}] +" -python_configure_all() { - # setup.py fails to update this file - eprefixify src/launcher.bash +src_configure() { + local python_only=false + python_foreach_impl my_src_configure } -python_install_all() { - distutils-r1_python_install_all +my_src_configure() { + local emesonargs=( + -Darch="${ARCH}" + -Dpython-only="${python_only}" + -Deprefix="${EPREFIX}" + ) - # This replaces the file installed by java-config-wrapper. - dosym java-config-2 /usr/bin/java-config + meson_src_configure + python_only=true } -python_test() { - esetup.py test +src_compile() { + python_foreach_impl meson_src_compile +} + +src_test() { + python_foreach_impl meson_src_test --no-rebuild --verbose +} + +src_install() { + python_foreach_impl my_src_install + + local scripts + mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/bin/* || die) + python_replicate_script "${scripts[@]}" + + if use compat; then + # Symlink java-config-2 to java-config for now. + dosym java-config /usr/bin/java-config-2 + fi +} + +my_src_install() { + meson_src_install + + local pydirs=( + "${D}$(python_get_sitedir)" + ) + python_optimize "${pydirs[@]}" } diff --git a/dev-java/java-config/metadata.xml b/dev-java/java-config/metadata.xml index bec9235101d9..faeac11b5e48 100644 --- a/dev-java/java-config/metadata.xml +++ b/dev-java/java-config/metadata.xml @@ -11,4 +11,11 @@ per-user default JVMs, construct classpath env vars from installed java packages and be used to query for the path to various JDK tools. </longdescription> + <use> + <flag name="compat">Install bin/java-config-2 symlink pointing to java-config</flag> + </use> + <upstream> + <remote-id type="gentoo">proj/java-config</remote-id> + <remote-id type="github">gentoo/java-config</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/java-diff-utils/Manifest b/dev-java/java-diff-utils/Manifest index 60048788afe8..4d0a48225dde 100644 --- a/dev-java/java-diff-utils/Manifest +++ b/dev-java/java-diff-utils/Manifest @@ -1 +1,2 @@ DIST java-diff-utils-1.3.0-sources.jar 35161 BLAKE2B 365b2b3a8701a7bf63b1fc8c34f8a54d7a5f67b3b485e91ea3489303de821d5ac08aac4e2b13d140b045b6b45393d293a825e92e800cd34c3b84a17442d548bc SHA512 16426c13fde20c606ac5dc01b4ee368d10360c45c4569879c94d30ac41aba372e9865a7b5db3a68067ea26bdade538eeea4e3e38900f8627beb21d7e48968e62 +DIST java-diff-utils-parent-4.12.tar.gz 2080632 BLAKE2B 36cb824bd00e946484dc62b3d5739620eeff6f509cdfa3f521144c21ea9d5de43ccc838700d3d9d116817dc1256d90fe1bdb552b02a2c7cff1e6b702b889f8d0 SHA512 0ac8f633e01f70b6c0f243b65c95716a1237142abde96eed3211a5ee5afb5bf721e936a67b4e2ce27e1df34a8402d0fbcb830e0557bd32cd24a7529d80e61e5c diff --git a/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild b/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild new file mode 100644 index 000000000000..bb67109d452d --- /dev/null +++ b/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="io.github.java-diff-utils:java-diff-utils:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Library for computing diffs, applying patches, generationg side-by-side view" +HOMEPAGE="https://java-diff-utils.github.io/java-diff-utils/" +SRC_URI="https://github.com/java-diff-utils/java-diff-utils/archive/java-diff-utils-parent-${PV}.tar.gz" +S="${WORKDIR}/java-diff-utils-java-diff-utils-parent-${PV}/java-diff-utils" + +LICENSE="Apache-2.0" +SLOT="4" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +RESTRICT="test" #839681 + +BDEPEND="app-arch/unzip" +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="io.github.javadiffutils" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH=" + assertj-core-3 + junit-5 +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" diff --git a/dev-java/java-diff-utils/metadata.xml b/dev-java/java-diff-utils/metadata.xml index 75321cfb5598..4df5c7c25054 100644 --- a/dev-java/java-diff-utils/metadata.xml +++ b/dev-java/java-diff-utils/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">java-diff-utils/java-diff-utils</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/java-getopt/java-getopt-1.0.14-r1.ebuild b/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild index 982f73ce8c98..44bec027d4f2 100644 --- a/dev-java/java-getopt/java-getopt-1.0.14-r1.ebuild +++ b/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source" +MAVEN_ID="gnu.getopt:java-getopt:§{PV}" -inherit java-pkg-2 java-ant-2 +inherit java-pkg-2 java-pkg-simple DESCRIPTION="Java command line option parser" HOMEPAGE="https://www.urbanophile.com/arenn/hacking/download.html" @@ -18,16 +19,14 @@ KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-ma DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}" +DOCS=( gnu/getopt/{COPYING.LIB,ChangeLog,LANGUAGES,README} ) -src_prepare() { - default - mv gnu/getopt/buildx.xml build.xml || die -} +JAVA_RESOURCE_DIRS="resources" +JAVA_SRC_DIR="gnu/getopt" -src_install() { - java-pkg_dojar build/lib/gnu.getopt.jar - dodoc gnu/getopt/COPYING.LIB gnu/getopt/ChangeLog gnu/getopt/README - use doc && java-pkg_dojavadoc build/api - use source && java-pkg_dosrc gnu +src_prepare() { + java-pkg-2_src_prepare + mkdir resources || die + find gnu/getopt -type f -name '*.properties' \ + | xargs cp --parent -t resources || die } diff --git a/dev-java/java-getopt/metadata.xml b/dev-java/java-getopt/metadata.xml index 6021501589e0..f44f7c814750 100644 --- a/dev-java/java-getopt/metadata.xml +++ b/dev-java/java-getopt/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> + <maintainer type="project"> + <email>java@gentoo.org</email> + <name>Java</name> + </maintainer> + <upstream> + <remote-id type="github">arenn/java-getopt</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch new file mode 100644 index 000000000000..135c5a1ae8bf --- /dev/null +++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch @@ -0,0 +1,25 @@ +|Original version of this patch by Ralph Sennhauser <sera@gentoo.org> +|Updated version for 3.5.25 by tomboy64 <tomboy64@sina.cn> +| +|Added in 3.5.4, make false default for Gentoo +| +|* Add a new wrapper.java.command.resolve property to control whether or not the +| Wrapper tries to resolve any symbolic links in the Java command, specified +| with the wrapper.java.command property. Historically, it has always done so, +| but some jvm started applications like run-java-tool on Gentoo will fail if +| it is run directly as they have a check to make sure it is launched via a +| symbolic link. +| +# https://bugs.gentoo.org/878869 +--- a/src/c/wrapper.c.old 2014-07-21 09:12:55.000000000 +0200 ++++ b/src/c/wrapper.c 2014-07-21 09:13:22.000000000 +0200 +@@ -4908,7 +4908,7 @@ + if (!path) { + log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para); + } else { +- replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), TRUE); ++ replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE); + if (replacePath == TRUE) { + free(*para); + *para = malloc((_tcslen(path) + 1) * sizeof(TCHAR)); + diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild index 261d3bf92668..8fdfe9ac2063 100644 --- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild +++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,6 +33,10 @@ JAVA_JAR_FILENAME="wrapper.jar" JAVA_TEST_SRC_DIR="src/test" JAVA_TEST_GENTOO_CLASSPATH="junit-4" +PATCHES=( + "${FILESDIR}"/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch +) + src_prepare() { default diff --git a/dev-java/javatoolkit/metadata.xml b/dev-java/javatoolkit/metadata.xml index 5aec4384f60a..01a22ce44f86 100644 --- a/dev-java/javatoolkit/metadata.xml +++ b/dev-java/javatoolkit/metadata.xml @@ -5,5 +5,9 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> + <upstream> + <remote-id type="gentoo">proj/javatoolkit</remote-id> + <remote-id type="github">gentoo/javatoolkit</remote-id> + </upstream> <stabilize-allarches/> </pkgmetadata> diff --git a/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild b/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild index c72608beb918..cb0feeaf01ef 100644 --- a/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild +++ b/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild @@ -1,9 +1,6 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom mail/pom.xml --download-uri https://github.com/eclipse-ee4j/mail/archive/refs/tags/1.6.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javax-mail-1.6.7.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" @@ -13,19 +10,16 @@ JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Jakarta Mail API" -HOMEPAGE="https://eclipse-ee4j.github.io/mail/" -SRC_URI="https://github.com/eclipse-ee4j/mail/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://jakartaee.github.io/mail-api/" +SRC_URI="https://github.com/jakartaee/mail-api/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/mail-${PV}/mail" LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -# Common dependencies -# POM: mail/pom.xml -# com.sun.activation:jakarta.activation:1.2.1 -> >=dev-java/jakarta-activation-1.2.2:1 - CDEPEND=" - >=dev-java/jakarta-activation-1.2.2:1 + dev-java/jakarta-activation:1 " DEPEND=" @@ -37,25 +31,22 @@ RDEPEND=" >=virtual/jre-1.8:* ${CDEPEND}" -DOCS=( ../{LICENSE,NOTICE,README}.md ) - -S="${WORKDIR}/mail-${PV}/mail" +DOCS=( ../{NOTICE,README}.md ) src_prepare() { - default + java-pkg-2_src_prepare mv src/main/{resources,java}/javax/mail/Version.java || die } JAVA_ENCODING="iso-8859-1" - JAVA_GENTOO_CLASSPATH="jakarta-activation-1" -JAVA_SRC_DIR="src/main/java" JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_EXTRA_ARGS=( -ea ) JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_EXTRA_ARGS=( -ea ) +JAVA_TEST_SRC_DIR="src/test/java" src_test() { pushd src/test/java || die @@ -72,8 +63,3 @@ src_test() { java-pkg-simple_src_test } - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/javax-mail/metadata.xml b/dev-java/javax-mail/metadata.xml index 75321cfb5598..53eb0003d9ca 100644 --- a/dev-java/javax-mail/metadata.xml +++ b/dev-java/javax-mail/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">jakartaee/mail-api</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/javax-persistence-api/Manifest b/dev-java/javax-persistence-api/Manifest new file mode 100644 index 000000000000..1860158b5d05 --- /dev/null +++ b/dev-java/javax-persistence-api/Manifest @@ -0,0 +1 @@ +DIST javax.persistence-api-2.2-sources.jar 257011 BLAKE2B 022d70134c8cd9cb8afd0f65f1530e8937dd3535ba533d98f59409f28a39b9238dc23e10b8f86378b1e817520839c25647aad4c01b9234dc65be4bd68bdc9bb6 SHA512 07a31f509fc7215e3f671579ce63161ac3e776171a240c9d087e8f47423d65f590026fe7c2fcd67365894ee906eb4b39e81f070d7f795346e18697775efdf428 diff --git a/dev-java/javax-persistence-api/javax-persistence-api-2.2.ebuild b/dev-java/javax-persistence-api/javax-persistence-api-2.2.ebuild new file mode 100644 index 000000000000..9350a857e77e --- /dev/null +++ b/dev-java/javax-persistence-api/javax-persistence-api-2.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="javax.persistence:javax.persistence-api:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Persistence API" +HOMEPAGE="https://www.jcp.org/en/jsr/detail?id=220" +SRC_URI="https://repo1.maven.org/maven2/javax/persistence/${PN/-/.}/${PV}/${PN/-/.}-${PV}-sources.jar" + +LICENSE="CDDL" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +BDEPEND="app-arch/unzip" +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_RESOURCE_DIRS="resources" + +src_prepare() { + java-pkg-2_src_prepare + + # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS + mkdir resources || die + find -type f \ + -name '*.xsd' \ + | xargs cp --parent -t resources || die +} diff --git a/dev-java/aqute-bnd-annotation/metadata.xml b/dev-java/javax-persistence-api/metadata.xml index 75321cfb5598..75321cfb5598 100644 --- a/dev-java/aqute-bnd-annotation/metadata.xml +++ b/dev-java/javax-persistence-api/metadata.xml diff --git a/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild b/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild index 1cf607758cc8..9d4fbbaaf082 100644 --- a/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild +++ b/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${P}" LICENSE="EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" # Common dependencies # POM: api/pom.xml diff --git a/dev-java/jbcrypt/jbcrypt-0.4.ebuild b/dev-java/jbcrypt/jbcrypt-0.4.ebuild index 49671984ecdb..67f22649a8e5 100644 --- a/dev-java/jbcrypt/jbcrypt-0.4.ebuild +++ b/dev-java/jbcrypt/jbcrypt-0.4.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://www.mindrot.org/projects/jBCrypt" SRC_URI="https://www.mindrot.org/files/jBCrypt/jBCrypt-${PV}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jcommander/Manifest b/dev-java/jcommander/Manifest index dea22c35f059..72fb13e70a45 100644 --- a/dev-java/jcommander/Manifest +++ b/dev-java/jcommander/Manifest @@ -1 +1,2 @@ +DIST jcommander-1.64.tar.gz 4404316 BLAKE2B 17ade214604de2ed8e85fd8b8043483f5b3c6d26b7a59afe2cc83dfa804fa298a2a1a4251ac65f66ad3a89002f532c29ee031b0a26293cbbd4f3df72e9a3a6ac SHA512 aaf7c323d9a829635847774b927d63cc35fbe479271029b8f3fdb94c6839dc26ac55f5c28fefbee6a0219e11c73f2c487c3660bf2f3a7f4033c0e2092d6f2fa4 DIST jcommander-1.82.tar.gz 4433079 BLAKE2B 08111ae7a85202dc3a082db58f42ef5183b05cae827bc304ba426a3d02bf7a4123f84500e6ec5694578a7aa29c631cca692fe71d67e12a1107c57e1858be4dcf SHA512 1abcb54cec21e95a3e5fc952320a7fca1d480f9900992e686f66df49749b6eee79e18dc670f10cc05b0d2a4f0a72fae302568a51ff193788897878aefc3ff67b diff --git a/dev-java/jcommander/files/jcommander-1.64-DynamicParameterTest.patch b/dev-java/jcommander/files/jcommander-1.64-DynamicParameterTest.patch new file mode 100644 index 000000000000..9867533bcf25 --- /dev/null +++ b/dev-java/jcommander/files/jcommander-1.64-DynamicParameterTest.patch @@ -0,0 +1,57 @@ +FAILED: usage +java.lang.NullPointerException: Cannot invoke "com.beust.jcommander.Parameter.order()" because "<local3>" is null + at com.beust.jcommander.JCommander$Options$1.compare(JCommander.java:144) + at com.beust.jcommander.JCommander$Options$1.compare(JCommander.java:139) + at java.base/java.util.TimSort.countRunAndMakeAscending(TimSort.java:355) + at java.base/java.util.TimSort.sort(TimSort.java:220) + at java.base/java.util.Arrays.sort(Arrays.java:1307) + at java.base/java.util.ArrayList.sort(ArrayList.java:1721) + at java.base/java.util.Collections.sort(Collections.java:179) + at com.beust.jcommander.JCommander.usage(JCommander.java:1158) + at com.beust.jcommander.JCommander.usage(JCommander.java:1113) + at com.beust.jcommander.dynamic.DynamicParameterTest.usage(DynamicParameterTest.java:40) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:568) + at org.testng.internal.MethodInvocationHelper.invokeMethod(MethodInvocationHelper.java:108) + at org.testng.internal.Invoker.invokeMethod(Invoker.java:661) + at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:869) + at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1193) + at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:129) + at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:112) + at org.testng.TestRunner.privateRun(TestRunner.java:756) + at org.testng.TestRunner.run(TestRunner.java:610) + at org.testng.SuiteRunner.runTest(SuiteRunner.java:380) + at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:375) + at org.testng.SuiteRunner.privateRun(SuiteRunner.java:340) + at org.testng.SuiteRunner.run(SuiteRunner.java:289) + at org.testng.SuiteRunnerWorker.runSuite(SuiteRunnerWorker.java:52) + at org.testng.SuiteRunnerWorker.run(SuiteRunnerWorker.java:86) + at org.testng.TestNG.runSuitesSequentially(TestNG.java:1306) + at org.testng.TestNG.runSuitesLocally(TestNG.java:1231) + at org.testng.TestNG.runSuites(TestNG.java:1146) + at org.testng.TestNG.run(TestNG.java:1117) + at org.testng.TestNG.privateMain(TestNG.java:1447) + at org.testng.TestNG.main(TestNG.java:1416) + + +=============================================== + JCommander tests + Tests run: 189, Failures: 1, Skips: 0 +=============================================== +--- a/src/test/java/com/beust/jcommander/dynamic/DynamicParameterTest.java ++++ b/src/test/java/com/beust/jcommander/dynamic/DynamicParameterTest.java +@@ -35,10 +35,12 @@ public class DynamicParameterTest { + simple("-Da=b", "-Dc=d"); + } + ++ /* + public void usage() { + DSimple ds = new DSimple(); + new JCommander(ds).usage(new StringBuilder()); + } ++ */ + + public void differentAssignment() { + DSimple ds = new DSimple(); diff --git a/dev-java/jcommander/jcommander-1.64-r1.ebuild b/dev-java/jcommander/jcommander-1.64-r1.ebuild new file mode 100644 index 000000000000..3fc26c3aa562 --- /dev/null +++ b/dev-java/jcommander/jcommander-1.64-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.beust:jcommander:${PV}" +JAVA_TESTING_FRAMEWORKS="testng" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Command line parsing framework for Java" +HOMEPAGE="https://jcommander.org/" +SRC_URI="https://github.com/cbeust/jcommander/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="Apache-2.0" +SLOT="1.64" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +PATCHES=( "${FILESDIR}/jcommander-1.64-DynamicParameterTest.patch" ) + +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="testng" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_RUN_ONLY="src/test/resources/testng.xml" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest index 726154aa6a4f..cce5c24db238 100644 --- a/dev-java/jctools-core/Manifest +++ b/dev-java/jctools-core/Manifest @@ -1 +1,2 @@ DIST jctools-4.0.1.tar.gz 4234647 BLAKE2B 652cfc70d92a37e04056e306050b156632ba92b2cacd9b759556ea92e1b9b6dda3d766e33936cdd92ec690abb6fb51a562305f82746f500f89d9d797e27f9c54 SHA512 9c8f55be4640f7b1315e7f93c20cf6b4b8d84c542103d69a2e34c0abe00c25fb362b6d8c4042feb4462559e5f6babd90ab0a59a66c3d407e13004ff02ce95c8f +DIST jctools-4.0.2.tar.gz 4237275 BLAKE2B 9bac4f8442f7a64aac47208ecf98799506244783d71a5444b6a3ff74ddca4e16232cf19dd5e7a9243dfcc3510674717982ef915759c8b6b2de74d4711d996302 SHA512 d19237929ab18360427efdf2844adc08589fc8ba2838b1f983118e1d6f1270bacad34477cb000e6bc85aeab38e7e337c397181b4351681f18977547c5b2e8f37 diff --git a/dev-java/jctools-core/jctools-core-4.0.2.ebuild b/dev-java/jctools-core/jctools-core-4.0.2.ebuild new file mode 100644 index 000000000000..7b344074414a --- /dev/null +++ b/dev-java/jctools-core/jctools-core-4.0.2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.jctools:jctools-core:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java Concurrency Tools Core Library" +HOMEPAGE="https://jctools.github.io/JCTools/" +SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz" +S="${WORKDIR}/JCTools-${PV}/jctools-core" + +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=" + dev-java/osgi-annotation:0 + >=virtual/jdk-1.8:* + test? ( + dev-java/guava-testlib:0 + dev-java/hamcrest:0 + )" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( ../{README,RELEASE-NOTES}.md ) + +JAVA_AUTOMATIC_MODULE_NAME="org.jctools.core" +JAVA_CLASSPATH_EXTRA="osgi-annotation" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest,junit-4" +JAVA_TEST_SRC_DIR="src/test/java" + +# Using the defaults of java-pkg-simple would skip more than half the number of tests. +src_test() { + # org.jetbrains.kotlinx.lincheck is not yet packaged + rm -r src/test/java/org/jctools/maps/linearizability_test || die + # These tests would fail and are not run by "mvn test". + # "org.jctools.queues.MpqSanityTest" + # "org.jctools.queues.QueueSanityTest" + # "org.jctools.queues.ScQueueRemoveTest" + # "org.jctools.util.TestUtil" + # Test timeout on arm64, https://bugs.gentoo.org/863977 + # "org.jctools.queues.atomic.AtomicMpqSanityTestMpscLinked" + # "org.jctools.queues.MpqSanityTestMpscLinked" + pushd src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + \( -name "*Test*.java" \ + -o -name "nbsi_tester.java" \ + -o -name "nbhs_tester.java" \)\ + ! -name "MpqSanityTest.java" \ + ! -name "QueueSanityTest.java" \ + ! -name "ScQueueRemoveTest.java" \ + ! -name "TestUtil.java" \ + ! -name "AtomicMpqSanityTestMpscLinked.java" \ + ! -name "MpqSanityTestMpscLinked.java" \ + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test + # OK (7226 tests) +} diff --git a/dev-java/jctools-core/metadata.xml b/dev-java/jctools-core/metadata.xml index a9affe0868c9..fad141505070 100644 --- a/dev-java/jctools-core/metadata.xml +++ b/dev-java/jctools-core/metadata.xml @@ -6,5 +6,6 @@ </maintainer> <upstream> <bugs-to>https://github.com/JCTools/JCTools/issues</bugs-to> + <remote-id type="github">JCTools/JCTools</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest index 0af98f2a0950..b39662917f89 100644 --- a/dev-java/jdbc-mysql/Manifest +++ b/dev-java/jdbc-mysql/Manifest @@ -1,2 +1,2 @@ -DIST mysql-connector-j-8.0.32.tar.gz 4229102 BLAKE2B bb4f89ac9eb4ebc5ed4a8f3d0b63a75d0dbb237e0c434c705d970ec20bbbbec89526d6b0cb11cbceb5e9e5bb485b9d7b17420407d7b01017c7531d5d531c30d8 SHA512 96d920cd137c8aadd7669d3bdc84893bb1dd2c76e81128356844c4321104fc6d2debf950ca1dfdfe958d848b16cd91ee475aad7d3d9b52478f8ac58dbf51922b +DIST mysql-connector-j-8.1.0.tar.gz 4241696 BLAKE2B 930257a876b1b512b598ebf8397125145bb9d1a438fe33bb55ca208dddfdd29bd436a365cc35b9128cdee6eee436da688dd53cc3ed6cd04efb22d1f5af731863 SHA512 f8a7c621397f49981dd7d19e880d92ee051015ad011c027380ac85760dc22ce2f4117fd27b8d72325c5e2bc40a1a9c22e9534f7200208916ee62bbf1e5ad0c75 DIST oci-java-sdk-common-2.47.0.jar 439209 BLAKE2B b3b28bb0cf4b8dbca37bb34df7bb48029901be5d9f7754a2ccce888a9af4a06b3348cd545d480127f942687b9b0d63336c37b5f95ecb9f96111c9388a4bc6053 SHA512 73e7376c92d47d81e0630e2ad2d510a483068664874ae31622629dad6dc016d746499c2d29682563e5cdee35ddb6e9e59a2e7557d32e1eeec5fb12206f9d1d6e diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.0.32.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild index 6b0870af39c9..09f0063500d1 100644 --- a/dev-java/jdbc-mysql/jdbc-mysql-8.0.32.ebuild +++ b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 # Tests disabled, see bug #902723 JAVA_PKG_IUSE="doc source" -MAVEN_ID="com.mysql:mysql-connector-j:8.0.32" +MAVEN_ID="com.mysql:mysql-connector-j:8.1.0" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple diff --git a/dev-java/jmc/Manifest b/dev-java/jmc/Manifest new file mode 100644 index 000000000000..fdfb3ebf3c28 --- /dev/null +++ b/dev-java/jmc/Manifest @@ -0,0 +1 @@ +DIST jmc-8.3.0.ga.tar.gz 40714977 BLAKE2B 7ec59a23a62ede30844cee71bd1c859974ee3112bb5cc1b31b65f63f0bbf1b2689a94180d0fba687858353d05b3d1046a7b98688f01312606332bfd9d99ac9e8 SHA512 e4fb9fe8fa0ebfd3dd550dfa3412a4a7f88cb46eedaba329c4fd1a693047377b5c57db8ef8751f5966bce7621d6d2eff52a8d1921c089e7b1c3104684918fde9 diff --git a/dev-java/jmc/jmc-8.3.0.ebuild b/dev-java/jmc/jmc-8.3.0.ebuild new file mode 100644 index 000000000000..49b64d2ec06b --- /dev/null +++ b/dev-java/jmc/jmc-8.3.0.ebuild @@ -0,0 +1,74 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_PROVIDES=" + org.openjdk.jmc:common:${PV} + org.openjdk.jmc:flightrecorder:${PV} +" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="JDK Mission Control" +HOMEPAGE="https://openjdk.org/projects/jmc/" +SRC_URI="https://github.com/openjdk/jmc/archive/${PV}-ga.tar.gz -> ${P}.ga.tar.gz" +S="${WORKDIR}/${P}-ga" + +LICENSE="UPL-1.0" +SLOT="0" +KEYWORDS="amd64" + +DEPEND=" + dev-java/lz4-java:0 + dev-java/owasp-java-encoder:0 + >=virtual/jdk-1.8:* +" +RDEPEND=">=virtual/jre-1.8:*" + +src_compile() { + einfo "Compiling jmc-common.jar" + JAVA_AUTOMATIC_MODULE_NAME="org.openjdk.jmc.common" + JAVA_CLASSPATH_EXTRA=" + lz4-java + owasp-java-encoder + " + JAVA_JAR_FILENAME="jmc-common.jar" + JAVA_RESOURCE_DIRS="core/org.openjdk.jmc.common/src/main/resources" + JAVA_SRC_DIR="core/org.openjdk.jmc.common/src/main/java" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":jmc-common.jar" + rm -r target || die + + einfo "Compiling jmc-flightrecorder.jar" + JAVA_AUTOMATIC_MODULE_NAME="org.openjdk.jmc.flightrecorder" + JAVA_JAR_FILENAME="jmc-flightrecorder.jar" + JAVA_RESOURCE_DIRS="core/org.openjdk.jmc.flightrecorder/src/main/resources" + JAVA_SRC_DIR="core/org.openjdk.jmc.flightrecorder/src/main/java" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":jmc-flightrecorder.jar" + rm -r target || die + + if use doc; then + JAVA_SRC_DIR=() + JAVA_SRC_DIR=( + "core/org.openjdk.jmc.common/src/main/java" + "core/org.openjdk.jmc.flightrecorder/src/main/java" + ) + JAVA_JAR_FILENAME="ignoreme.jar" + java-pkg-simple_src_compile + fi +} + +src_install() { + default + java-pkg_dojar jmc-common.jar jmc-flightrecorder.jar + if use doc; then + java-pkg_dojavadoc target/api + fi + if use source; then + java-pkg_dosrc "core/org.openjdk.jmc.common/src/main/java/*" + java-pkg_dosrc "core/org.openjdk.jmc.flightrecorder/src/main/java/*" + fi +} diff --git a/dev-java/jmc/metadata.xml b/dev-java/jmc/metadata.xml new file mode 100644 index 000000000000..13df86c0e8a8 --- /dev/null +++ b/dev-java/jmc/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">openjdk/jmc</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest index f60719c514f1..5a75b4046036 100644 --- a/dev-java/jna/Manifest +++ b/dev-java/jna/Manifest @@ -1,2 +1 @@ -DIST jna-5.11.0.tar.gz 107424072 BLAKE2B 9f79a0b0e643c8213c159785814dffaeee2dc3b332647c5c887aa5a6e707be5241d392e75730b803b21362fcbdcee82d7049bcdfb7956039f1534e3cd8e170cf SHA512 0122b56c24125e5dea541bee71b43f127df50c8f90b2c240271c677a8d598d9640bb920bd3390856124e8b1bc89a9bd41d2b6c569ae7275f68a13c08fd07027d DIST jna-5.13.0.tar.gz 116027625 BLAKE2B 1f2bc7ab28adefa0bbad122957ed2c6ef55ab88e79b30c05f0d2d88e0e05152f7bb5e28097906a7e24f78304dfa2b225587adb0ada205ca3c2ceac1cdbab3f04 SHA512 aefd0becc03bb7fd753e8c5cdcbcb20f6d590125a5fb03048bef0024e826ab0254b750e22a8bb26bea38cc89262ad45e5030b666cb2c857b01b15a6a55379a0f diff --git a/dev-java/jna/files/5.10.0-build.xml.patch b/dev-java/jna/files/5.10.0-build.xml.patch deleted file mode 100644 index 242845bfd356..000000000000 --- a/dev-java/jna/files/5.10.0-build.xml.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/build.xml b/build.xml -index ed104c2..cd8895c 100644 ---- a/build.xml -+++ b/build.xml -@@ -182,9 +182,9 @@ - - <target name="-prepare-anttools"> - <subant antfile="build-ant-tools.xml" buildpath="${basedir}"></subant> -- <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools:$lib/asm-8.0.1.jar" /> -- <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" /> -- <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" /> -+ <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools:${gentoo.classpath}" /> -+ <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${build}/ant-tools:${gentoo.classpath}" /> -+ <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${build}/ant-tools:${gentoo.classpath}" /> - </target> - - <target name="-dynamic-properties" depends="-prepare-anttools"> -@@ -385,7 +385,9 @@ - <pathelement path="${build}/${jar}"/> - <pathelement path="${test.classes}"/> - <pathelement path="${build}/${testjar}"/> -+ <!-- - <pathelement path="lib/clover.jar"/> -+ --> - <path refid="test.libs"/> - </path> - </target> -@@ -1265,8 +1267,10 @@ cd .. - <mkdir dir="${build}/jws"/> - <copy todir="${build}/jws" file="${build}/${jar}"/> - <copy todir="${build}/jws" file="${build}/${testjar}"/> -+ <!-- - <copy todir="${build}/jws" file="lib/junit.jar"/> - <copy todir="${build}/jws" file="lib/clover.jar"/> -+ --> - <jar jarfile="${build}/jws/jnidispatch.jar" createUnicodeExtraFields="never" encoding="UTF-8"> - <fileset dir="${build.native}" includes="*jnidispatch.*"/> - </jar> -diff --git a/contrib/platform/build.xml b/contrib/platform/build.xml -index 47fa8ed..a623ce6 100644 ---- a/contrib/platform/build.xml -+++ b/contrib/platform/build.xml -@@ -115,9 +115,9 @@ - - <target name="-prepare-anttools"> - <subant antfile="build-ant-tools.xml" buildpath="${basedir}/../../"></subant> -- <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" /> -- <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" /> -- <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" /> -+ <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" /> -+ <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" /> -+ <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" /> - </target> - - <macrodef name="build-manifest"> diff --git a/dev-java/jna/files/jna-5.13.0-LibCTest.patch b/dev-java/jna/files/jna-5.13.0-LibCTest.patch new file mode 100644 index 000000000000..8cc9da563ed3 --- /dev/null +++ b/dev-java/jna/files/jna-5.13.0-LibCTest.patch @@ -0,0 +1,12 @@ +Bug #906053 +--- a/contrib/platform/test/com/sun/jna/platform/linux/LibCTest.java ++++ b/contrib/platform/test/com/sun/jna/platform/linux/LibCTest.java +@@ -71,7 +71,7 @@ public class LibCTest extends TestCase { + } + + @Test +- public void testStatvfs() throws IOException, InterruptedException { ++ public void noTestStatvfs() throws IOException, InterruptedException { + Statvfs vfs = new Statvfs(); + + String testDirectory = "/"; diff --git a/dev-java/jna/jna-5.11.0-r1.ebuild b/dev-java/jna/jna-5.11.0-r1.ebuild deleted file mode 100644 index 3753bc815a3c..000000000000 --- a/dev-java/jna/jna-5.11.0-r1.ebuild +++ /dev/null @@ -1,96 +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 test" -MAVEN_ID="net.java.dev.jna:jna:5.11.0" - -inherit java-pkg-2 java-ant-2 toolchain-funcs - -DESCRIPTION="Java Native Access" -HOMEPAGE="https://github.com/java-native-access/jna" -SRC_URI="https://github.com/java-native-access/jna/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="|| ( Apache-2.0 LGPL-2.1+ )" -SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -BDEPEND=" - virtual/pkgconfig -" - -CDEPEND=" - >=dev-libs/libffi-3.4:= -" - -DEPEND=" - >=virtual/jdk-1.8:* - dev-java/animal-sniffer-annotations:0 - dev-java/ant-core:0 - dev-java/asm:9 - test? ( - dev-java/ant-junit4:0 - dev-java/junit:4 - dev-java/reflections:0 - ) - ${CDEPEND} - x11-libs/libXt -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND} -" - -DOCS=( README.md CHANGES.md OTHERS TODO ) -PATCHES=( - "${FILESDIR}/5.10.0-build.xml.patch" - "${FILESDIR}/5.11.0-makefile-flags.patch" - "${FILESDIR}/jna-5.11.0-no-Werror.patch" -) - -JAVA_ANT_REWRITE_CLASSPATH="true" -JAVA_PKG_BSFIX_NAME="build.xml build-ant-tools.xml" -EANT_BUILD_TARGET="jar contrib-jars" -EANT_EXTRA_ARGS="-Dbuild-native=true -Dcompatibility=1.8 -Ddynlink.native=true" -EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=\"${T}\"" -EANT_TEST_GENTOO_CLASSPATH="animal-sniffer-annotations,reflections" - -src_prepare() { - default - - EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only \ - animal-sniffer-annotations,ant-core,asm-9)" - - # Any spaces in paths returned by toolchain-funcs and options like MAKEOPTS - # could cause trouble in EANT_EXTRA_ARGS when Java eclasses process the - # variable's value, so define them in ANT_OPTS instead - ANT_OPTS="-DCC='$(tc-getCC)' -DSTRIP='$(tc-getSTRIP)'" - # Parallel build does not respect dependency relationships between objects - ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'" - - # Eliminate build.xml's dependency on bundled native JARs - sed -i -e '/zipfileset src="${lib.native}/,+2d' build.xml || - die "Failed to delete lines referencing bundled JARs in build.xml" - - # Clean up bundled JARs and libffi - java-pkg_clean - rm -r native/libffi || die "Failed to remove bundled libffi" - - java-pkg-2_src_prepare -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar "build/${PN}-min.jar" - java-pkg_dojar "contrib/platform/dist/${PN}-platform.jar" - java-pkg_doso build/native-*/libjnidispatch.so - einstalldocs - - use source && java-pkg_dosrc src/* - use doc && java-pkg_dojavadoc doc/javadoc -} diff --git a/dev-java/jna/jna-5.13.0-r1.ebuild b/dev-java/jna/jna-5.13.0-r1.ebuild index ab5471ed4157..a09e852950df 100644 --- a/dev-java/jna/jna-5.13.0-r1.ebuild +++ b/dev-java/jna/jna-5.13.0-r1.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/${P}" LICENSE="|| ( Apache-2.0 LGPL-2.1+ )" SLOT="4" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" BDEPEND=" virtual/pkgconfig @@ -48,6 +48,7 @@ PATCHES=( "${FILESDIR}/5.11.0-makefile-flags.patch" "${FILESDIR}/jna-5.11.0-no-Werror.patch" "${FILESDIR}/jna-5.13.0-testpath.patch" + "${FILESDIR}/jna-5.13.0-LibCTest.patch" ) src_prepare() { @@ -149,14 +150,15 @@ src_test() { # java.lang.UnsatisfiedLinkError: Unable to load library '/libtestlib-jar.so': # /libtestlib-jar.so: cannot open shared object file: No such file or directory jar cvf build/jna-test.jar \ - -C build/native libtestlib-jar.so || die + -C build/native libtestlib-jar.so \ + -C test com/sun/jna/data || die JAVA_GENTOO_CLASSPATH_EXTRA+=":build/jna-test.jar" JAVA_TEST_EXCLUDES=( com.sun.jna.CallbacksTest # Needs to run separately com.sun.jna.DirectTest # Needs to run separately - com.sun.jna.ELFAnalyserTest # NPE com.sun.jna.NativeTest # Needs to run separately + com.sun.jna.TypeMapperTest # Needs to run separately com.sun.jna.UnionTest # Needs to run separately com.sun.jna.VMCrashProtectionTest # Needs to run separately ) @@ -174,6 +176,9 @@ src_test() { JAVA_TEST_RUN_ONLY=( com.sun.jna.VMCrashProtectionTest ) java-pkg-simple_src_test + + JAVA_TEST_RUN_ONLY=( com.sun.jna.TypeMapperTest ) + java-pkg-simple_src_test } src_install() { diff --git a/dev-java/json-simple/json-simple-2.3.1.ebuild b/dev-java/json-simple/json-simple-2.3.1.ebuild index 1a2f835b8547..db1876d94be6 100644 --- a/dev-java/json-simple/json-simple-2.3.1.ebuild +++ b/dev-java/json-simple/json-simple-2.3.1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="Apache-2.0" SLOT="2.3" -KEYWORDS="amd64 ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/json-smart/Manifest b/dev-java/json-smart/Manifest index e20ab08d97bb..08a0756cd16f 100644 --- a/dev-java/json-smart/Manifest +++ b/dev-java/json-smart/Manifest @@ -1 +1,2 @@ DIST json-smart-1.3.3.tar.gz 49430 BLAKE2B 805e16e0de5321a2e8164468757e9b722849f0fe90fd6822cc99f7afffd9f4e480fc4e14c2bbd12b325a27abc8ca7e93b4a17ce56ac352117cef336e1ebb3fe9 SHA512 c6006c6a00a085ea8810e18889450d11240dc3671351f20602214db418107808df1f413fe67c199d6529e4c0087f2533601826666ac4fa493bcaf72d2c18ed83 +DIST json-smart-2.5.0.tar.gz 88839 BLAKE2B 25760bd9c9ddecfef2fc3e60fc28b83def2223c7fc1e52ef39b3e6d01e5f2f29f36a35bfd43fc4d6ce6d5df5fcb25f59b1c86e1864a3044c69a6d0010335280b SHA512 4bffadf68998da4b63b34bcc9dbf804fd2b21b8d9514de4e155127d5a2eb3db74c7e396959b54c61c08e169eeed85dff3ad2f1d899cfddca53e501c45cebae21 diff --git a/dev-java/json-smart/json-smart-1.3.3.ebuild b/dev-java/json-smart/json-smart-1.3.3.ebuild index 2249a996229c..c174d7e6acb7 100644 --- a/dev-java/json-smart/json-smart-1.3.3.ebuild +++ b/dev-java/json-smart/json-smart-1.3.3.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://urielch.github.io" SRC_URI="https://github.com/netplex/json-smart-v1/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/json-smart/json-smart-2.5.0.ebuild b/dev-java/json-smart/json-smart-2.5.0.ebuild new file mode 100644 index 000000000000..9b20d2f17507 --- /dev/null +++ b/dev-java/json-smart/json-smart-2.5.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_PROVIDES=" + net.minidev:accessors-smart:${PV} + net.minidev:json-smart:${PV} +" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="JSON Small and Fast Parser" +HOMEPAGE="https://urielch.github.io" +SRC_URI="https://github.com/netplex/json-smart-v2/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-v2-${PV}" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="amd64 ~arm ~arm64 ~x86" +RESTRICT="test" #839681 + +DEPEND=" + dev-java/asm:9 + >=virtual/jdk-1.8:* +" +RDEPEND=">=virtual/jre-1.8:*" + +src_compile() { + einfo "Compiling accessors-smart.jar" + JAVA_CLASSPATH_EXTRA="asm-9" + JAVA_JAR_FILENAME="accessors-smart.jar" + JAVA_SRC_DIR="accessors-smart/src/main/java" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":accessors-smart.jar" + rm -r target || die + + einfo "Compiling json-smart.jar" + JAVA_JAR_FILENAME="json-smart.jar" + JAVA_SRC_DIR="json-smart/src/main/java" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":json-smart.jar" + rm -r target || die + + if use doc; then + einfo "Compiling javadocs" + JAVA_SRC_DIR=( + accessors-smart/src/main/java + json-smart/src/main/java + ) + JAVA_JAR_FILENAME="ignoreme.jar" + java-pkg-simple_src_compile + fi +} + +src_install() { + einstalldocs + java-pkg_dojar "accessors-smart.jar" + java-pkg_dojar "json-smart.jar" + + if use doc; then + java-pkg_dojavadoc target/api + fi + + if use source; then + java-pkg_dosrc "accessors-smart/src/main/java/*" + java-pkg_dosrc "json-smart/src/main/java/*" + fi +} diff --git a/dev-java/json-smart/metadata.xml b/dev-java/json-smart/metadata.xml index 4edced72dcda..d5b2471c532c 100644 --- a/dev-java/json-smart/metadata.xml +++ b/dev-java/json-smart/metadata.xml @@ -15,5 +15,6 @@ </maintainer> <upstream> <remote-id type="github">netplex/json-smart-v1</remote-id> + <remote-id type="github">netplex/json-smart-v2</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest index c41dbd88dc04..549c5a166a89 100644 --- a/dev-java/json/Manifest +++ b/dev-java/json/Manifest @@ -1 +1,3 @@ DIST json-20220320.tar.gz 229462 BLAKE2B 9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2 SHA512 1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0 +DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183 +DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6 diff --git a/dev-java/json/json-20231013-r1.ebuild b/dev-java/json/json-20231013-r1.ebuild new file mode 100644 index 000000000000..ff26a6b1c443 --- /dev/null +++ b/dev-java/json/json-20231013-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.json:json:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A reference implementation of a JSON package in Java" +HOMEPAGE="https://github.com/stleary/JSON-java" +SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz + test? ( + https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/2.1.0/json-path-2.1.0.jar + )" +S="${WORKDIR}/JSON-java-${PV}" + +LICENSE="JSON" +SLOT="0" +KEYWORDS="amd64 ~x86" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/asm:9 + dev-java/json-smart:2 + dev-java/mockito:4 + dev-java/slf4j-api:0 + ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {CONTRIBUTING,README,SECURITY}.md ) + +JAVA_AUTOMATIC_MODULE_NAME="org.json" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH=" + asm-9 + json-smart-2 + junit-4 + mockito-4 + slf4j-api +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + +src_test() { + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-2.1.0.jar" # Test compile dependency + + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge 17; then + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED ) + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED ) + fi + java-pkg-simple_src_test +} diff --git a/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild b/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild index 31c82db3e4f2..239213069dcd 100644 --- a/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild +++ b/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://software.dzhuvinov.com/json-rpc-2.0-base.html" SRC_URI="https://bitbucket.org/thetransactioncompany/json-rpc-2.0-base/get/${PV}.tar.bz2 -> ${P}.tar.bz2" LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" CP_DEPEND="dev-java/json-smart:1" DEPEND=" diff --git a/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild b/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild index 32afeb51cd96..b54e6d257874 100644 --- a/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild +++ b/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://software.dzhuvinov.com/json-rpc-2.0-server.html" SRC_URI="https://bitbucket.org/thetransactioncompany/json-rpc-2.0-server/get/${PV}.tar.bz2 -> ${P}.tar.bz2" LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" PROPERTIES="test_network" RESTRICT="test" # single test, need access to google diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest index e09ee53ded98..bd28d25f9377 100644 --- a/dev-java/jtidy/Manifest +++ b/dev-java/jtidy/Manifest @@ -1 +1,2 @@ DIST jtidy-1.0.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a +DIST jtidy-r938-sources.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a diff --git a/dev-java/jtidy/jtidy-938.ebuild b/dev-java/jtidy/jtidy-938.ebuild new file mode 100644 index 000000000000..a358bb13a064 --- /dev/null +++ b/dev-java/jtidy/jtidy-938.ebuild @@ -0,0 +1,29 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="net.sf.jtidy:jtidy:r${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="a Java port of HTML Tidy, a HTML syntax checker and pretty printer" +HOMEPAGE="https://sourceforge.net/projects/jtidy/" +SRC_URI="https://master.dl.sourceforge.net/project/jtidy/JTidy/r${PV}/jtidy-r${PV}-sources.zip" + +LICENSE="HTML-Tidy W3C" +SLOT="9" +KEYWORDS="~amd64" + +BDEPEND="app-arch/unzip" +CP_DEPEND="dev-java/ant-core:0" + +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8 " +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8" + +JAVA_MAIN_CLASS="org.w3c.tidy.Tidy" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/jtwig-reflection/Manifest b/dev-java/jtwig-reflection/Manifest new file mode 100644 index 000000000000..abbce93fde11 --- /dev/null +++ b/dev-java/jtwig-reflection/Manifest @@ -0,0 +1 @@ +DIST jtwig-reflection-5.87.0.tar.gz 70500 BLAKE2B 526e009bfabd3ed5d9034285f28980a52fafeee635e07446f32533ea7f6e4546d164ddc577fa25aabdcd80f64b953752a8c48405858534739d52c19474273fcf SHA512 87e4129833951c5c2903d574a9c4986219c7eb61d7ca2c657ecdeb9890d79149ff610ad7ad0002119ba5db0953f342d648eb46d9553185794d7bb7cb0a79e3ab diff --git a/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild new file mode 100644 index 000000000000..4ce9372091fa --- /dev/null +++ b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.jtwig:jtwig-reflection:${PV}.RELEASE" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Jtwig Reflection Library" +HOMEPAGE="https://github.com/jtwig/jtwig-reflection" +SRC_URI="https://github.com/jtwig/jtwig-reflection/archive/${PV}.RELEASE.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}.RELEASE" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + dev-java/commons-lang:3.6 + dev-java/guava:0 + dev-java/slf4j-api:0 + >=virtual/jdk-1.8:* + test? ( + dev-java/commons-io:1 + dev-java/hamcrest:0 + dev-java/mockito:0 + ) +" + +RDEPEND=" + >=virtual/jre-1.8:* +" + +JAVA_CLASSPATH_EXTRA=" + commons-lang-3.6 + guava + slf4j-api +" + +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_EXCLUDES=( + # Invalid test class; No runnable methods + org.jtwig.reflection.integration.example.TestArgumentValueResolver + org.jtwig.reflection.integration.example.TestArgumentResolver + org.jtwig.reflection.integration.example.TestArgument +) +JAVA_TEST_GENTOO_CLASSPATH=" + commons-io-1 + hamcrest + junit-4 + mockito +" +JAVA_TEST_SRC_DIR="src/test/java" + +src_test() { + # Unable to make field private final byte[] java.lang.String.value accessible: + # module java.base does not "opens java.lang" to unnamed module @3bc9f433 + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge 17; then + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED ) + fi + java-pkg-simple_src_test +} diff --git a/dev-java/jtwig-reflection/metadata.xml b/dev-java/jtwig-reflection/metadata.xml new file mode 100644 index 000000000000..488c6bf7458e --- /dev/null +++ b/dev-java/jtwig-reflection/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">jtwig/jtwig</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/junit/junit-4.13.2-r1.ebuild b/dev-java/junit/junit-4.13.2-r1.ebuild new file mode 100644 index 000000000000..af5e4f424217 --- /dev/null +++ b/dev-java/junit/junit-4.13.2-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="junit:junit:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Simple framework to write repeatable tests" +HOMEPAGE="https://junit.org/junit4/" +SRC_URI="https://github.com/${PN}-team/${PN}4/archive/r${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}4-r${PV}" + +LICENSE="EPL-1.0" +SLOT="4" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +CP_DEPEND="dev-java/hamcrest-core:1.3" +# not suitable for jdk:21 #916398 +DEPEND="${CP_DEPEND} + <=virtual/jdk-17:* + test? ( dev-java/hamcrest-library:1.3 )" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="junit" +JAVA_ENCODING="ISO-8859-1" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" + +src_test() { + cd "${JAVA_TEST_SRC_DIR}" || die + + local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})" + + ejavac -cp "${CP}" -d . $(find * -name "*.java") + # pom.xml lines 264-268 + java -cp "${CP}" -Djava.awt.headless=true \ + org.junit.runner.JUnitCore org.junit.tests.AllTests || die "Running junit failed" +} diff --git a/dev-java/junit/junit-4.13.2.ebuild b/dev-java/junit/junit-4.13.2.ebuild deleted file mode 100644 index ead129bf0725..000000000000 --- a/dev-java/junit/junit-4.13.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom junit4-r4.13.2/pom.xml --download-uri https://github.com/junit-team/junit4/archive/refs/tags/r4.13.2.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild junit-4.13.2.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="junit:junit:4.13.2" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Simple framework to write repeatable tests" -HOMEPAGE="https://junit.org/junit4/" -SRC_URI="https://github.com/${PN}-team/${PN}4/archive/refs/tags/r${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="EPL-1.0" -SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -# Common dependencies -# POM: ${PN}4-r${PV}/pom.xml -# org.hamcrest:hamcrest-core:1.3 -> >=dev-java/hamcrest-core-1.3:1.3 - -CDEPEND=" - dev-java/hamcrest-core:1.3 -" - -# Compile dependencies -# POM: ${PN}4-r${PV}/pom.xml -# test? org.hamcrest:hamcrest-library:1.3 -> >=dev-java/hamcrest-library-1.3:1.3 - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/hamcrest-library:1.3 - ) - ${CDEPEND}" -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND}" -BDEPEND="app-arch/unzip" -S="${WORKDIR}" - -JAVA_ENCODING="ISO-8859-1" - -JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3" -JAVA_SRC_DIR="${PN}4-r${PV}/src/main/java" -JAVA_RESOURCE_DIRS="${PN}4-r${PV}/src/main/resources" - -JAVA_TEST_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3" -JAVA_TEST_SRC_DIR="${PN}4-r${PV}/src/test/java" -JAVA_TEST_RESOURCE_DIRS="${PN}4-r${PV}/src/test/resources" - -src_prepare() { - default - java-pkg_clean -} - -src_test() { - cd "${JAVA_TEST_SRC_DIR}" || die - - local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})" - - ejavac -cp "${CP}" -d . $(find * -name "*.java") - java -cp "${CP}" -Djava.awt.headless=true org.junit.runner.JUnitCore junit.tests.AllTests || die "Running junit failed" -} diff --git a/dev-java/libg/Manifest b/dev-java/libg/Manifest index 068af0665527..8f4c666567aa 100644 --- a/dev-java/libg/Manifest +++ b/dev-java/libg/Manifest @@ -1 +1,2 @@ +DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e diff --git a/dev-java/libg/libg-7.0.0.ebuild b/dev-java/libg/libg-7.0.0.ebuild new file mode 100644 index 000000000000..21d7e22cd82e --- /dev/null +++ b/dev-java/libg/libg-7.0.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="biz.aQute.bnd:aQute.libg:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A library to be statically linked. Contains many small utilities" +HOMEPAGE="https://bnd.bndtools.org/" +SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/bnd-${PV}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64" +# aQute.bnd.test.jupiter does not exist +# org.assertj.core.api.junit.jupiter does not exist +RESTRICT="test" #839681 + +CP_DEPEND=" + dev-java/slf4j-api:0 +" + +# compile error with jdk:21, restricting to jdk:17 +# aQute.libg/src/aQute/lib/collections/SortedList.java:31: error: types List<T> and SortedSet<T> are incompatible; +# public class SortedList<T> implements SortedSet<T>, List<T> { +# ^ +# both define reversed(), but with unrelated return types +# where T is a type-variable: +# T extends Object declared in class SortedList +DEPEND="${CP_DEPEND} + ~dev-java/bnd-annotation-${PV}:0 + dev-java/osgi-cmpn:8 + virtual/jdk:17 +" + +# aQute.libg/src/aQute/libg/uri/URIUtil.java:161: +# error: switch expressions are not supported in -source 11 +RDEPEND="${CP_DEPEND} + >=virtual/jre-17:* +" + +JAVA_AUTOMATIC_MODULE_NAME="aQute.libg" +JAVA_CLASSPATH_EXTRA=" + bnd-annotation + osgi-cmpn-8 +" +JAVA_SRC_DIR="aQute.libg/src" diff --git a/dev-java/libg/metadata.xml b/dev-java/libg/metadata.xml index 94feb65b0b18..cb6317e530db 100644 --- a/dev-java/libg/metadata.xml +++ b/dev-java/libg/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <upstream> - <remote-id type="github">bndtools/bnd</remote-id> - </upstream> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">bndtools/bnd</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/log4j-api/log4j-api-2.19.0.ebuild b/dev-java/log4j-api/log4j-api-2.19.0.ebuild index 61fcd0bec604..3175e9cecaea 100644 --- a/dev-java/log4j-api/log4j-api-2.19.0.ebuild +++ b/dev-java/log4j-api/log4j-api-2.19.0.ebuild @@ -59,7 +59,7 @@ RDEPEND=">=virtual/jre-1.8:*" BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-apache-logging ) " -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/logging.apache.org.asc" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/logging.apache.org.asc" DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md ) diff --git a/dev-java/logback-classic/Manifest b/dev-java/logback-classic/Manifest deleted file mode 100644 index 6e682bb8af44..000000000000 --- a/dev-java/logback-classic/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST logback-1.4.1.tar.gz 760510 BLAKE2B a01aab8b499059669e22a2ab51522b01765bb2802008058bf3ca1a9ddafa06d2827d4129e76dc6f91e960dea2e419087dbcbc6fbced6b560295cda7089ce4a12 SHA512 4e8b0cb7cd7f950d7b6a859bc40cc8a3ddc41e2c7ab1567dc29780f4f05a14fdf34dd569928e1425886226e45979d85587ddf5e1e61665929718336451a0802c diff --git a/dev-java/logback-classic/logback-classic-1.4.1.ebuild b/dev-java/logback-classic/logback-classic-1.4.1.ebuild deleted file mode 100644 index 3c1d932f9dc1..000000000000 --- a/dev-java/logback-classic/logback-classic-1.4.1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom logback-classic/pom.xml --download-uri https://github.com/qos-ch/logback/archive/v_1.4.1.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-classic-1.4.1.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="ch.qos.logback:logback-classic:1.4.1" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="logback-classic module" -HOMEPAGE="https://logback.qos.ch" -SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${PV}.tar.gz" - -LICENSE="EPL-1.0 LGPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: ${PN}/pom.xml -# ch.qos.logback:logback-core:1.4.1 -> >=dev-java/logback-core-1.4.1:0 -# jakarta.mail:jakarta.mail-api:2.0.1 -> >=dev-java/jakarta-mail-api-2.1.0:0 -# org.codehaus.janino:janino:3.1.7 -> >=dev-java/janino-3.1.7:0 -# 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/jakarta-mail-api:0 - ~dev-java/logback-core-${PV}:0 - >=dev-java/slf4j-api-2.0.0:0 -" - -# Compile dependencies -# POM: ${PN}/pom.xml -# jakarta.servlet:jakarta.servlet-api:5.0.0 -> >=dev-java/jakarta-servlet-api-6.0.0:6 -# POM: ${PN}/pom.xml -# test? ch.qos.logback:logback-core:1.4.1 -> >=dev-java/logback-core-1.4.1:0 -# test? ch.qos.reload4j:reload4j:1.2.18.4 -> >=dev-java/reload4j-1.2.22:0 -# test? com.icegreen:greenmail:2.0.0-alpha-1 -> >=dev-java/greenmail-2.0.0_alpha2:2 -# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4 -# test? org.apache.felix:org.apache.felix.main:5.6.10 -> >=dev-java/felix-main-7.0.5:0 -# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2 -# test? org.dom4j:dom4j:2.0.3 -> >=dev-java/dom4j-2.1.3:1 -# test? org.mockito:mockito-core:4.3.0 -> >=dev-java/mockito-4.8.0:4 -# test? org.slf4j:jul-to-slf4j:2.0.1 -> >=dev-java/jul-to-slf4j-2.0.3:0 -# test? org.slf4j:log4j-over-slf4j:2.0.1 -> >=dev-java/log4j-over-slf4j-2.0.3:0 -# test? org.slf4j:slf4j-api:2.0.1 -> >=dev-java/slf4j-api-2.0.3:0 - -DEPEND=" - >=virtual/jdk-11:* - ${CP_DEPEND} - dev-java/jakarta-servlet-api:6 - test? ( - dev-java/assertj-core:3 - dev-java/dom4j:1 - dev-java/felix-main:0 - dev-java/greenmail:2 - dev-java/jul-to-slf4j:0 - dev-java/log4j-over-slf4j:0 - dev-java/logback-core:0 - dev-java/mockito:4 - dev-java/osgi-core:0 - dev-java/reload4j:0 - ) -" - -# Runtime dependencies -# POM: ${PN}/pom.xml -# com.sun.mail:jakarta.mail:2.0.1 -> >=dev-java/jakarta-mail-2.0.1:0 - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND} - dev-java/jakarta-mail:0 -" - -S="${WORKDIR}/logback-v_${PV}/logback-classic" - -JAVA_CLASSPATH_EXTRA="jakarta-servlet-api-6" -JAVA_GENTOO_CLASSPATH+="jakarta-mail" -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH=" - assertj-core-3 - felix-main - greenmail-2 - jul-to-slf4j - junit-4 - log4j-over-slf4j - mockito-4 - reload4j -" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -JAVA_TEST_EXCLUDES=( - # Invalid test classes, "No runnable methods" - ch.qos.logback.core.testUtil.EnvUtilForTests - ch.qos.logback.core.rolling.testUtil.ScaffoldingForRollingTests - ch.qos.logback.classic.util.TestHelper - - # Test failures: - ch.qos.logback.classic.net.SMTPAppender_GreenTest # 14 tests - - # 1) versionTest(ch.qos.logback.classic.util.EnvUtilTest) - # java.lang.AssertionError - # at org.junit.Assert.fail(Assert.java:87) - # at org.junit.Assert.assertTrue(Assert.java:42) - # at org.junit.Assert.assertNotNull(Assert.java:713) - # at org.junit.Assert.assertNotNull(Assert.java:723) - # at ch.qos.logback.classic.util.EnvUtilTest.versionTest(EnvUtilTest.java:17) - ch.qos.logback.classic.util.EnvUtilTest - - # 2) testSmoke(org.slf4j.test_osgi.BundleTest) - # junit.framework.AssertionFailedError - # at junit.framework.Assert.fail(Assert.java:55) - # at junit.framework.Assert.assertTrue(Assert.java:22) - # at junit.framework.Assert.assertTrue(Assert.java:31) - # at junit.framework.TestCase.assertTrue(TestCase.java:200) - # at org.slf4j.test_osgi.BundleTest.testSmoke(BundleTest.java:41) - org.slf4j.test_osgi.BundleTest -) - -src_test() { - # Tests need dom4j:1 on classpath but without dependencies: - JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only dom4j-1)" - - # package ch.qos.logback.core.contention does not exist - JAVA_GENTOO_CLASSPATH_EXTRA+=":../logback-core/src/test/java/" - java-pkg-simple_src_test -} diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest deleted file mode 100644 index 6e682bb8af44..000000000000 --- a/dev-java/logback-core/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST logback-1.4.1.tar.gz 760510 BLAKE2B a01aab8b499059669e22a2ab51522b01765bb2802008058bf3ca1a9ddafa06d2827d4129e76dc6f91e960dea2e419087dbcbc6fbced6b560295cda7089ce4a12 SHA512 4e8b0cb7cd7f950d7b6a859bc40cc8a3ddc41e2c7ab1567dc29780f4f05a14fdf34dd569928e1425886226e45979d85587ddf5e1e61665929718336451a0802c diff --git a/dev-java/logback-core/logback-core-1.4.1.ebuild b/dev-java/logback-core/logback-core-1.4.1.ebuild deleted file mode 100644 index ab06f67e0f2f..000000000000 --- a/dev-java/logback-core/logback-core-1.4.1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom logback-core/pom.xml --download-uri https://github.com/qos-ch/logback/archive/v_1.4.1.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-core-1.4.1.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="ch.qos.logback:logback-core:1.4.1" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="logback-core module" -HOMEPAGE="https://logback.qos.ch" -SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${PV}.tar.gz" - -LICENSE="EPL-1.0 LGPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: ${PN}/pom.xml -# com.sun.mail:jakarta.mail:2.0.1 -> >=dev-java/jakarta-mail-2.0.1:0 -# jakarta.mail:jakarta.mail-api:2.0.1 -> >=dev-java/jakarta-mail-api-2.1.0:0 -# jakarta.servlet:jakarta.servlet-api:5.0.0 -> >=dev-java/jakarta-servlet-api-6.0.0:6 -# org.codehaus.janino:janino:3.1.7 -> >=dev-java/janino-3.1.7:0 -# org.fusesource.jansi:jansi:1.18 -> >=dev-java/jansi-2.4.0:2 - -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/jansi:2 -" - -# Compile dependencies -# POM: ${PN}/pom.xml -# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4 -# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2 -# test? org.mockito:mockito-core:4.3.0 -> >=dev-java/mockito-4.7.0:4 - -DEPEND=" - >=virtual/jdk-11:* - ${CP_DEPEND} - test? ( - dev-java/assertj-core:3 - dev-java/mockito:4 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND}" - -# DOCS=( ../README.md ) - -S="${WORKDIR}/logback-v_${PV}/logback-core" - -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4,assertj-core-3,mockito-4" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -src_test() { - # 83,88 logback-core/pom.xml - # <excludes> - # <exclude>**/All*Test.java</exclude> - # <exclude>**/PackageTest.java</exclude> - # <!-- ConsoleAppenderTest redirects System.out which is not well tolerated by Maven --> - # <exclude>**/ConsoleAppenderTest.java</exclude> - # </excludes> - rm src/test/java/ch/qos/logback/core/appender/ConsoleAppenderTest.java || die - pushd src/test/java || die - local JAVA_TEST_RUN_ONLY=$(find * \ - -name "*Test.java" \ - ! -wholename "**/All*Test.java" \ - ! -wholename "**/PackageTest.java" \ - ! -name "AbstractAppenderTest.java" \ - ! -name "AbstractPatternLayoutBaseTest.java" \ - ) - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - popd - - # accessible: module java.base does not "opens java.lang" to unnamed module @42bb2aee - local vm_version="$(java-config -g PROVIDES_VERSION)" - if [[ "${vm_version}" -ge 17 ]]; then - JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED ) - JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED ) - fi - java-pkg-simple_src_test -} diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-fix-load.patch b/dev-java/lz4-java/files/lz4-java-1.8.0-fix-load.patch new file mode 100644 index 000000000000..e6c15cc1dbc9 --- /dev/null +++ b/dev-java/lz4-java/files/lz4-java-1.8.0-fix-load.patch @@ -0,0 +1,32 @@ +--- a/src/java/net/jpountz/util/Native.java ++++ b/src/java/net/jpountz/util/Native.java +@@ -100,17 +100,18 @@ public enum Native { + return; + } + +- cleanupOldTempLibs(); ++// cleanupOldTempLibs(); + + // Try to load lz4-java (liblz4-java.so on Linux) from the java.library.path. ++ final File library = new File(System.mapLibraryName("lz4-java")); + try { +- System.loadLibrary("lz4-java"); ++ System.load(library.getAbsolutePath()); + loaded = true; + return; + } catch (UnsatisfiedLinkError ex) { + // Doesn't exist, so proceed to loading bundled library. + } +- ++/* + String resourceName = resourceName(); + InputStream is = Native.class.getResourceAsStream(resourceName); + if (is == null) { +@@ -158,6 +159,6 @@ public enum Native { + tempLib.deleteOnExit(); + tempLibLock.deleteOnExit(); + } +- } ++ }*/ + } + } diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild new file mode 100644 index 000000000000..76d25540b9e5 --- /dev/null +++ b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild @@ -0,0 +1,93 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.lz4:lz4-java:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple toolchain-funcs + +DESCRIPTION="LZ4 compression for Java" +HOMEPAGE="https://github.com/lz4/lz4-java" +SRC_URI="https://github.com/lz4/lz4-java/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=" + app-arch/lz4:= + dev-java/mvel:2.5 + dev-libs/xxhash:0 + >=virtual/jdk-1.8:* + test? ( dev-java/randomized-runner:0 )" +RDEPEND=" + app-arch/lz4:= + >=virtual/jre-1.8:*" + +PATCHES=( "${FILESDIR}/${P}-fix-load.patch" ) + +DOCS=( CHANGES.md README.md ) + +JAVA_AUTOMATIC_MODULE_NAME="org.lz4.java" +JAVA_SRC_DIR=( src/java{,-unsafe} ) +JAVA_TEST_GENTOO_CLASSPATH="junit-4 randomized-runner" +JAVA_TEST_RESOURCE_DIRS="src/test-resources" +JAVA_TEST_SRC_DIR="src/test" + +src_prepare() { + default +} + +src_compile() { + # remove precompiled native libraries + rm -r src/resources || die + + # cannot include template 'decompressor.template': file not found.] + cp src/build/source_templates/* . || die + + einfo "Code generation" + "$(java-config -J)" \ + -Dout.dir="src/java" \ + -cp "$(java-pkg_getjars --build-only mvel-2.5)" \ + org.mvel2.sh.Main \ + src/build/gen_sources.mvel \ + || die + + java-pkg-simple_src_compile + + einfo "Generate headers" # build.xml lines 194-204 + ejavac -h build/jni-headers -classpath "target/classes" \ + src/java/net/jpountz/xxhash/XXHashJNI.java \ + src/java/net/jpountz/lz4/LZ4JNI.java || die + + einfo "Generate native library" + # https://devmanual.gentoo.org/ebuild-writing/functions/src_compile/no-build-system + mkdir -p build/objects/src/jni + mkdir -p build/jni/net/jpountz/util/linux/amd64 + "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ + $(java-pkg_get-jni-cflags) \ + -Ibuild/jni-headers \ + -c -o build/objects/src/jni/net_jpountz_lz4_LZ4JNI.o \ + src/jni/net_jpountz_lz4_LZ4JNI.c + "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ + $(java-pkg_get-jni-cflags) \ + -Ibuild/jni-headers \ + -c -o build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o \ + src/jni/net_jpountz_xxhash_XXHashJNI.c + + "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ + -shared \ + -Wl,-soname,liblz4-java.so \ + -o liblz4-java.so \ + build/objects/src/jni/net_jpountz_lz4_LZ4JNI.o \ + build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o -llz4 +} + +src_install() { + java-pkg-simple_src_install + java-pkg_doso liblz4-java.so +} diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest index bce42470971a..113766add294 100644 --- a/dev-java/maven-bin/Manifest +++ b/dev-java/maven-bin/Manifest @@ -1,3 +1,3 @@ DIST apache-maven-3.8.8-bin.tar.gz 8296049 BLAKE2B af6353193365ed33e8f2f0a7e4d31933132751f142ebbdb68aab7a74ad2dda6593bf34cef9d8d56d6c93ff93293b75517a10a5c1c048733b8c911f4ac150bdf6 SHA512 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00 -DIST apache-maven-3.9.1-bin.tar.gz 9039409 BLAKE2B e1925202d8b5363f16cd734aca409091a1e7f56fa9220aa6060a79fae6dfd37772daf04bc15edc2918757ac718ea41e861583c86dff40b0e3172fa0a7cdfbcef SHA512 d3be5956712d1c2cf7a6e4c3a2db1841aa971c6097c7a67f59493a5873ccf8c8b889cf988e4e9801390a2b1ae5a0669de07673acb090a083232dbd3faf82f3e3 -DIST apache-maven-3.9.2-bin.tar.gz 9248920 BLAKE2B 4aef801d463c7a5e1fb3d9e97459c7dca5e09033727ca43821e5b7296e5eedc158859980ff9231130aecc8c1507ac497206f24393291b37c33a751d795dc443c SHA512 900bdeeeae550d2d2b3920fe0e00e41b0069f32c019d566465015bdd1b3866395cbe016e22d95d25d51d3a5e614af2c83ec9b282d73309f644859bbad08b63db +DIST apache-maven-3.9.5-bin.tar.gz 9359994 BLAKE2B d73d5bc7f5028068492ed7710897b370e4a97592bef0ff055ce2d7dea222bb348f5886b7b5e86ce2787296e90e1a35eab057208c1edbadd5c82447116a14f3f4 SHA512 4810523ba025104106567d8a15a8aa19db35068c8c8be19e30b219a1d7e83bcab96124bf86dc424b1cd3c5edba25d69ec0b31751c136f88975d15406cab3842b +DIST apache-maven-3.9.6-bin.tar.gz 9410508 BLAKE2B 2a99f002912e6c0fcf9f78f0553553898cf39c17bd7c8b58269c8a7d061c425c62a2f557a686fd2b1f114ef1f47aab6e9b318555235bb436e8c7e5c8b1a0dd9d SHA512 706f01b20dec0305a822ab614d51f32b07ee11d0218175e55450242e49d2156386483b506b3a4e8a03ac8611bae96395fd5eec15f50d3013d5deed6d1ee18224 diff --git a/dev-java/maven-bin/maven-bin-3.8.8.ebuild b/dev-java/maven-bin/maven-bin-3.8.8-r1.ebuild index 110c8ce5aeb0..731294052d5e 100644 --- a/dev-java/maven-bin/maven-bin-3.8.8.ebuild +++ b/dev-java/maven-bin/maven-bin-3.8.8-r1.ebuild @@ -48,7 +48,7 @@ src_install() { dodoc NOTICE README.txt dodir /usr/bin - dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} + dosym "${MAVEN_SHARE}/bin/mvn" "${EPREFIX}/usr/bin/mvn-${SLOT}" # See bug #342901. echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die diff --git a/dev-java/maven-bin/maven-bin-3.9.1.ebuild b/dev-java/maven-bin/maven-bin-3.9.5-r1.ebuild index 59bdf23384c1..12476315273c 100644 --- a/dev-java/maven-bin/maven-bin-3.9.1.ebuild +++ b/dev-java/maven-bin/maven-bin-3.9.5-r1.ebuild @@ -48,7 +48,7 @@ src_install() { dodoc NOTICE README.txt dodir /usr/bin - dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} + dosym "${MAVEN_SHARE}/bin/mvn" "${EPREFIX}/usr/bin/mvn-${SLOT}" # See bug #342901. echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die diff --git a/dev-java/maven-bin/maven-bin-3.9.2.ebuild b/dev-java/maven-bin/maven-bin-3.9.6.ebuild index 6748f5927604..8290d36836f5 100644 --- a/dev-java/maven-bin/maven-bin-3.9.2.ebuild +++ b/dev-java/maven-bin/maven-bin-3.9.6.ebuild @@ -48,7 +48,7 @@ src_install() { dodoc NOTICE README.txt dodir /usr/bin - dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} + dosym "${MAVEN_SHARE}/bin/mvn" "${EPREFIX}/usr/bin/mvn-${SLOT}" # See bug #342901. echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest index 4c9df9a2eb8a..958c591e5812 100644 --- a/dev-java/mill-bin/Manifest +++ b/dev-java/mill-bin/Manifest @@ -1 +1,2 @@ -DIST mill-bin-0.10.12 72992251 BLAKE2B 9ca6bddcc1e2bc013f1eb6fe60b7b844fa1f7ec0ba53afcabfceb1d3631d754de56167dda650859031c834d95b0a2bd2c6e8776116de6327c990efa23ea1db63 SHA512 4b4db9fe2f84ad5ecea7e00291fc3ac75b543ee48f517fadc2ed8d1671759e5f3a7af51f417f0912d28eddc92ab8e747a749c3f1a48ba691ba3f93fc3a09e54f +DIST mill-bin-0.11.4 61557418 BLAKE2B 712ad3df280f38b01a617fbefafad50c9c87af74ef618b8ab4e8fa8c066089087966230e005eaca55d56c1242e6380278a5fb63efc9d2438b9b0d549605dc17e SHA512 601eecf62f9f6651ccd874b02a16ff0f451b1b60861341a61e78e11d813cb1d5a938922f77942282f388b6497c6eadd4d972d1c237cdadb1b8aba3975e29050b +DIST mill-bin-0.11.5 52760276 BLAKE2B 1583403fba8782d759a5d56513e2d40cd81ffb68d4947b638052cc6108d6d6516f7fc16e9cf516fc7c2c60820d2d6fcb5c15179bcef715c6d75f25c6802fe711 SHA512 673d636fc64fff01289ad642f2f861f6da18d3e652cdd645e3d2487daf1baf4616515e31540a03f67dbc354efff4f48a6881e1ceecfb966eb24d7675abb6dff7 diff --git a/dev-java/mill-bin/mill-bin-0.10.12.ebuild b/dev-java/mill-bin/mill-bin-0.11.4.ebuild index 55bbda799eb5..b2461d64d37b 100644 --- a/dev-java/mill-bin/mill-bin-0.10.12.ebuild +++ b/dev-java/mill-bin/mill-bin-0.11.4.ebuild @@ -8,7 +8,7 @@ MY_PN=${PN%-bin} DESCRIPTION="A Java/Scala build tool" HOMEPAGE="https://com-lihaoyi.github.io/mill/" SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~x86" LICENSE="MIT" SLOT="0" diff --git a/dev-java/mill-bin/mill-bin-0.11.5.ebuild b/dev-java/mill-bin/mill-bin-0.11.5.ebuild new file mode 100644 index 000000000000..b2461d64d37b --- /dev/null +++ b/dev-java/mill-bin/mill-bin-0.11.5.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=${PN%-bin} + +DESCRIPTION="A Java/Scala build tool" +HOMEPAGE="https://com-lihaoyi.github.io/mill/" +SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}" +KEYWORDS="amd64 ~x86" + +LICENSE="MIT" +SLOT="0" + +RDEPEND=">=virtual/jre-1.8:*" + +S="${WORKDIR}" + +src_unpack() { + : +} + +src_install() { + newbin "${DISTDIR}"/${P} ${MY_PN} +} diff --git a/dev-java/minidns-core/minidns-core-1.0.4.ebuild b/dev-java/minidns-core/minidns-core-1.0.4.ebuild index 53eb84f6bb3f..3a9f492efae0 100644 --- a/dev-java/minidns-core/minidns-core-1.0.4.ebuild +++ b/dev-java/minidns-core/minidns-core-1.0.4.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/minidns/minidns" SRC_URI="https://github.com/MiniDNS/minidns/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/mvel/Manifest b/dev-java/mvel/Manifest index 4af3792b6c2f..63212e9bcedb 100644 --- a/dev-java/mvel/Manifest +++ b/dev-java/mvel/Manifest @@ -1 +1,2 @@ DIST mvel2-2.3.2.Final.tar.gz 2405839 BLAKE2B 5f12652a0f4375f6e24f18313d99a02bb86463cc1acc2f8845b815c9c7afcda410d67c9f1c30544f9ab1cd50a48ce0ab72e9cca94faafab776f3704b1d5fa087 SHA512 9d1c92bfe90aa4cfe5f4bbdd7eef2060bfaec3979c5c07a5baf3ddb4d84a00632dcaec266bab675b31d5b745bfa36a89dd5969ababeb64332069939a4df23dbc +DIST mvel2-2.5.0.Final.tar.gz 2182715 BLAKE2B 1e8dbde4b75e36ea4d285ab45c0040957b9af7b5819786daf6469ae509c9c1e16ba2b201a05f9f9cf1c694bac816afd2d613226a8eb3b06f9049a898c6586b85 SHA512 29ca1ef8fdc4cbb97b5847f59e7c3118e837022d7292b507869208da1798b55d0445c40214d72c159e610d7094df7002c091296b2b31775a1ad0606f622d12b5 diff --git a/dev-java/mvel/mvel-2.5.0.ebuild b/dev-java/mvel/mvel-2.5.0.ebuild new file mode 100644 index 000000000000..79dbf2350f51 --- /dev/null +++ b/dev-java/mvel/mvel-2.5.0.ebuild @@ -0,0 +1,66 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.mvel:mvel2:${PV}.Final" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="MVFLEX Expression Language" +HOMEPAGE="https://github.com/mvel/mvel" +SRC_URI="https://github.com/mvel/mvel/archive/mvel2-${PV}.Final.tar.gz" +S="${WORKDIR}/${PN}-${PN}2-${PV}.Final" + +LICENSE="Apache-2.0" +SLOT="2.5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=" + dev-java/asm:9 + >=virtual/jdk-1.8:* +" +RDEPEND=">=virtual/jre-1.8:*" + +# Required due to use of '_' as identifiers in source files +JAVADOC_ARGS="-source 8" +JAVA_CLASSPATH_EXTRA="asm-9" +JAVA_MAIN_CLASS="org.mvel2.sh.Main" +JAVA_SRC_DIR="src/main/java" + +# Significantly speed up test execution +# https://github.com/mvel/mvel/blob/mvel2-2.3.2.Final/pom.xml#L158-L171 +JAVA_TEST_EXTRA_ARGS=( + -Dfile.encoding=UTF-8 + -Dmvel.disable.jit=true + -Dmvel.tests.quick=true +) +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" ) +JAVA_TEST_SRC_DIR="src/test/java" + +src_test() { + # ${S}/pom.xml#201-214 + pushd src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + \( -name "*Test.java" \ + -o -name '*Tests.java' \ + -o -name 'UsageDemos.java' \)\ + ! -name "AbstractTest.java*" \ + ! -name "CompiledUnitTestEx.java" \ + ! -name "PerfTest.java" \ + ! -name "DroolsTest.java" \ + ! -name "FailureTests.java" \ + ! -name "PerformanceTest.java" \ + ! -name "CompiledPerformanceTests.java" \ + ! -name "MVELThreadTest.java*" \ + ! -name "SimpleTests.java*" \ + ! -name "BaseOperatorsTest.java*" \ + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} diff --git a/dev-java/netty/Manifest b/dev-java/netty/Manifest deleted file mode 100644 index 8338d35bb737..000000000000 --- a/dev-java/netty/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST netty-4.1.35.Final.tar.gz 2447958 BLAKE2B 133adc2b37d3e681d11ac2e0187c0f79bb7aeeb6c622a1bf6e66a35bb78cd5730eeeffccfb960948f2e1df5dfadaa44f62b6f354c03065493ae43e1399a5ba2e SHA512 c3ba4e34ae9d309118ff3517467ffc218136789b06287d747b57df08be84779dacf5e29b19157afecd759a3516bc346e434295291b3dd546f80c4ae7c3f0a3ca diff --git a/dev-java/netty/metadata.xml b/dev-java/netty/metadata.xml deleted file mode 100644 index aead41605905..000000000000 --- a/dev-java/netty/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <upstream> - <remote-id type="github">netty/netty</remote-id> - </upstream> - <longdescription> - Netty is an asynchronous event-driven network application framework for rapid development of maintainable high performance protocol servers and clients. - </longdescription> -</pkgmetadata> diff --git a/dev-java/netty/netty-4.1.35-r1.ebuild b/dev-java/netty/netty-4.1.35-r1.ebuild deleted file mode 100644 index 693bf87c6b51..000000000000 --- a/dev-java/netty/netty-4.1.35-r1.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom common/pom.xml --download-uri https://codeload.github.com/netty/netty/tar.gz/netty-4.1.35.Final --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild netty-4.1.35.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="io.netty:netty:4.1.35.Final" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Async event-driven framework for high performance network applications" -HOMEPAGE="https://netty.io/" -SRC_URI="https://github.com/netty/netty/archive/refs/tags/netty-${PV}.Final.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# We do not build the full range of modules provided by netty but only what -# was available before in netty-common, netty-buffer and netty-transport. -# Further modules might be added to the array. -NETTY_MODULES=( - "common" - "resolver" - "buffer" - "transport" -) - -# Common dependencies -# POM: common/pom.xml -# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 -# log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0 -# org.apache.logging.log4j:log4j-api:2.6.2 -> >=dev-java/log4j-api-2.17.1:2 -# org.jctools:jctools-core:2.1.1 -> !!!suitable-mavenVersion-not-found!!! -# org.slf4j:slf4j-api:1.7.21 -> >=dev-java/slf4j-api-1.7.32:0 - -# "Failed to load class org.slf4j.impl.StaticLoggerBinder" -# Using slf4j-simple instead of slf4j-api solves it. -# https://www.slf4j.org/codes.html -CP_DEPEND=" - dev-java/commons-logging:0 - dev-java/jctools-core:3 - dev-java/log4j-12-api:2 - dev-java/slf4j-simple:0 -" - -# Compile dependencies -# POM: common/pom.xml -# test? ch.qos.logback:logback-classic:1.1.7 -> !!!groupId-not-found!!! -# test? io.netty:netty-build:25 -> !!!artifactId-not-found!!! -# test? io.netty:netty-dev-tools:4.1.35.Final -> !!!artifactId-not-found!!! -# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4 -# test? org.apache.logging.log4j:log4j-core:2.6.2 -> >=dev-java/log4j-core-2.17.1:2 -# test? org.hamcrest:hamcrest-library:1.3 -> >=dev-java/hamcrest-library-1.3:1.3 -# test? org.javassist:javassist:3.20.0-GA -> !!!groupId-not-found!!! -# test? org.mockito:mockito-core:2.18.3 -> >=dev-java/mockito-4.4.0:4 - -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND} - test? ( - dev-java/javassist:3 - dev-java/hamcrest-library:1.3 - dev-java/logback-classic:0 - dev-java/log4j-core:2 - dev-java/mockito:4 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND} -" - -S="${WORKDIR}/netty-netty-${PV}.Final" - -JAVA_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,javassist-3,junit-4,logback-classic,log4j-core-2,mockito-4" - -# There were 12 failures: -# 1) testCompositeDirectBuffer(io.netty.buffer.ByteBufAllocatorTest) -# java.lang.InstantiationException -# at java.base/jdk.internal.reflect.InstantiationExceptionConstructorAccessorImpl.newInstance(InstantiationExceptionConstructorAccessorImpl.java:48) -# -# FAILURES!!! -# Tests run: 10015, Failures: 12 - -# There was 1 failure: -# 1) initializationError(io.netty.channel.BaseChannelTest) -# org.junit.runners.model.InvalidTestClassError: Invalid test class 'io.netty.channel.BaseChannelTest': -# 1. The class io.netty.channel.BaseChannelTest is not public. -# 2. Test class should have exactly one public constructor -# 3. No runnable methods -# -# FAILURES!!! -# Tests run: 10277, Failures: 1 - -JAVA_TEST_EXCLUDES=( - "io.netty.buffer.ByteBufAllocatorTest" - "io.netty.channel.BaseChannelTest" -) - -src_prepare() { - default - - sed \ - -e 's:verifyZeroInteractions:verifyNoInteractions:' \ - -i buffer/src/test/java/io/netty/buffer/UnpooledTest.java \ - -i transport/src/test/java/io/netty/channel/CompleteChannelFutureTest.java || die - - # transport/src/test/java/io/netty/channel/PendingWriteQueueTest.java:262: error: reference to assertEquals is ambiguous - # assertEquals(1L, channel.readOutbound()); - # ^ - # both method assertEquals(long,long) in Assert and method assertEquals(Object,Object) in Assert match - rm transport/src/test/java/io/netty/channel/PendingWriteQueueTest.java || die -} - -src_compile() { - local module - # We loop over the modules list and compile the jar files. - for module in "${NETTY_MODULES[@]}"; do - JAVA_SRC_DIR=() - JAVA_RESOURCE_DIRS=() - JAVA_MAIN_CLASS="" - - JAVA_SRC_DIR=( - "$module/src/main/java" - "$module/src/module" - ) - - # Not all of the modules have resources. - if [[ -d $module/src/main/resources ]]; then \ - JAVA_RESOURCE_DIRS="$module/src/main/resources" - fi - - JAVA_JAR_FILENAME="$module.jar" - - einfo "Compiling netty-${module}" - java-pkg-simple_src_compile - - JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar" - - rm -r target || die - - done - - if use doc; then - JAVA_SRC_DIR=() - JAVA_JAR_FILENAME="ignoreme.jar" - - for module in "${NETTY_MODULES[@]}" ; do - # Some modules don't have source code - if [[ -d $module/src/main/java/io ]]; then \ - JAVA_SRC_DIR+=( "$module/src/main/java" ) - fi - - done - - java-pkg-simple_src_compile - fi -} - -src_test() { - local module - for module in "${NETTY_MODULES[@]}"; do - JAVA_TEST_SRC_DIR="$module/src/test/java" - JAVA_TEST_RESOURCE_DIRS=() - - # Not all of the modules have test resources. - if [[ -d $module/src/test/resources ]]; then \ - JAVA_TEST_RESOURCE_DIRS="$module/src/test/resources" - fi - - einfo "Testing netty-${module}" - java-pkg-simple_src_test - done -} - -src_install() { - einstalldocs # https://bugs.gentoo.org/789582 - - local module - for module in "${NETTY_MODULES[@]}"; do - JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' $module/pom.xml ) - java-pkg_dojar $module.jar - - # Some modules don't have source code - if [[ -d $module/src/main/java/org ]]; then - if use source; then - java-pkg_dosrc "$module/src/main/java/*" - fi - fi - done - - if use doc; then - java-pkg_dojavadoc target/api - fi -} diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest index cd1557481180..b0ce2ae92307 100644 --- a/dev-java/openjdk-bin/Manifest +++ b/dev-java/openjdk-bin/Manifest @@ -1,19 +1,22 @@ -DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.18_10.tar.gz 190875193 BLAKE2B 117f56583c1a7f4aee8df9117c683ad205fa424a53a46fedad21bddd5c36ffcbd7031db468da09bdc840de65a19f5420d12a79612be48142181b8e691c959686 SHA512 e3fbcb65feda7bc59a2054deaaa255d5e4af479d4105ba8d1089fc00c1d80989d3f7a2ee1bb93a68fd98257cc98d6a1800e6de4539232a7110743264da033f0e -DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.18_10.tar.gz 181837466 BLAKE2B df9935b4a2b8255439a0691b06636c4c40cd6d15dbcdf6b722eb57219cf67f1a7e44bf1eee3d7f8b65ca854c83d61a942d8384add454384f5b0f0113767173c2 SHA512 0b8a7e7a856d310ead1fbae214473a11ce41fef00b19b4e5a9553d076d4d6f692852983ea6afc3fb06800c8478e79c510e60d7157e7b13a710663ee01939bfad -DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.18_10.tar.gz 176301953 BLAKE2B 8132410a2d7d56dc65877d66b64eeac1943315d83144b026e03fa5ce68ee688e4c47f96112d6ebee87353275d797ffad1d7b52ea90882755cd9825d4a1e251f0 SHA512 d530bb22118e643b04b97823b779e308952df443cf03c3a65727fd64e531006beada229742e89d93eb7fe693ac7687c0229cb9ebc28482841d4a2c03d451b317 -DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.18_10.tar.gz 193025321 BLAKE2B 7302e0be8681b34d65b7dc83fd7e4dc720710edfd5dc536cf94da61853cb8a9e65ca2d9fb0057129aaa18bce70dcaf41dd802a650ab9acb9e4f939c403c3c5f4 SHA512 ed3f06f35b046d811fcee5eaff196a035b706ba29f585748585bace1e9ffdb13f16fd1f23c44319760229c4fb1c3a2feb3ed540632f8da8541914c135f06eb74 -DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz 194100197 BLAKE2B 751034d006335d3c48f5394d797d963b13a1eb4f30688dbae2be29cdc4c21855a8dd5f1faac895e17c0a56c43bd64b0a73bad61b845dd1cc1b0ce0d62019bcb9 SHA512 8d3e285b850b6f5d81481d7d2ffa1951a28ad383eda6ecbede3f2653437bd7d978a4b8613d870613a0b97e76325ee03e97b3b89e0cd124ffdf3c9bd2e16426d2 -DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.18_10.tar.gz 187254949 BLAKE2B 063f437ae64b3b6e30dacca5c01b02118ec7752cc91ece1ddaef16994629a6f5e8912fc4c11fdb44d521929a620803f1c3906911a45f5cec67a705b62bb279a3 SHA512 d9ed4bc73965672752392fd2741372a92dff4d2262c45dff31d95e13970afd31f513bc3ad93071e568c3e9e8afbf9af89f758d80f4922dc364ff332df08e762c -DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz 190151132 BLAKE2B f602ebc908f111d6c3aceb5cf6fabdc0940bd3aafb840b78fdda64e98a247f0dfa7fc648827cc62cb46c16ce084ca1cf51274c9629b28580d028a9ac4b2be8a0 SHA512 f8a46cbc32160ebeee9c2047e6ac7837fbdc73549257c61d197486675fcb9420def98400779a0ec40a73652dc919daa5a9442bafe4f9129891527e24a109bb99 -DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.6_10.tar.gz 177369180 BLAKE2B c45592830d2a9d87871b324d6ee331013c7ac5c1a968edede6ebb639c611422c4d2ee507c8cac7b154abf2031c71f7248b5ab4795bf4e56fc89e75469cdce1a2 SHA512 3e63a9c5457ca82cae15058f86c06bafb9172f95669d24b43bb371d19eedb7afec8725fabe1104fb0f575c2bd7e7ac8f41c103d6f967f7b910663b1e51d05a4a -DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.6_10.tar.gz 188314167 BLAKE2B 71d8de8745dc5777cbec614f7ea254919b485d225e1eda0d43dde6c21bda20e5cb19c751af851471e5aa0d7399737df769758f7962932b63a85e00dabe746675 SHA512 7bd7a1a638088cf12b5722320c90504a661ab684dfd3f13fd87e24f12b94f5f2abcc98570d8939da9fe89d8f62e0de939db883b4d1e4f1262dae1e63610b4b6b -DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.6_10.tar.gz 190834846 BLAKE2B 9a14c48bc58221e510ca95ac6e24d5016114a40b4c7881ddf5138647f8d1b486ceb179a757145f713d252e5df3d4df71c36ac6129b6cea9ff2c6d38d91c005a6 SHA512 84cedd98b622c953e89d81a7e39a38e1aeb1d86d582a328e5cbd7c94eac9c39c01874327bd75ca0aa0c32aa0dc6a748f94d2f3252e84e042a0875b1f34f4d43a -DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.6_10.tar.gz 190844751 BLAKE2B 7dfe7dc8abb09cb32c626f75e668cbc9c40eb83ae3b8155cdd5656f3fbfd6bf971bb8142fb7749050d2f120385a35c99d70016f5afafc36cbbee12e0899f8056 SHA512 e26e653196ad7bbdff0551ff23581c23936e98f3b89fc6bcc4592edcc29eb59aae294ed043ac3febd60bbd268322d143e83a487ba73e530977fd4061ac67008c -DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz 191502157 BLAKE2B 7de684d2529e63e6e28f726c57c139c4890caa7f2f753199eb1a5ac623d2f554c22f43b4b32fd1030c29c0cb6b9ad74ca27b1c7c4bb422bb889d48ba597726ef SHA512 71f0f14647d672ceff9a53db7bd6a158c787a3fb3196498a57ccd94c7da46af2550c04ab7ba95a549fe4f3d6482ecd7c77c4b20057ec2b32beb9a2a46c9ad0a5 -DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.6_10.tar.gz 187219587 BLAKE2B dd8f19c7498bec3afcf464e38583ea769c14575d4fb2b4bc3102ded6731db934d85353863d46201e92dbf93b19ad8c2237f5e3c62cb1360da05cf56df8618362 SHA512 1e17bce0ae272dff9e788bc4d83e7a3a518aaab589448eb3139dba89e52e63ecaad9c991db99839ed7b22f1fd47820579a570271a5df01d37f595b72de89055e -DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u362b09.tar.gz 102042474 BLAKE2B 02a12a4fd6fd9a0be8627e86bdc69f2aa76b1b0a877e6f4deed9fd5499d09559c6fe3157b538e7b5c308ae862f33fb2caaeed6530cc055a1a289870843712673 SHA512 d45e20de4a51f1151ef0c83eb1ea3e338e00afaa5d19b677a03328e2a5282601c4845cefeae6ada528e56949d82dd8057422dca73e8711f858b9bc00bda33abc -DIST OpenJDK8U-jdk_arm_linux_hotspot_8u362b09.tar.gz 98287152 BLAKE2B c41343bda7383163ea125246616764c3aa528cd78936a653974685440945e27c259bd6f72bd8a126d6eb9ff8a92189824881bbbd44fa7b23f676a6ff4197d89f SHA512 5b9cb46932efe95e0beca73616d7f982ba398d597a33aff34429919675d8524304f38b17d86faea4701813d6a992f16384c2721993800291a3640961a2027823 -DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u362b09.tar.gz 100484333 BLAKE2B ecfc4473fec3120d68ea511f72b8e97d4d5e92098849a3f04853b5ad11c8f5ce61b49ec074ff739083f9e2e25d65a6e657ef1c0c9f275606e8b41fda3a8aec2c SHA512 dbe8002f45d1e0ff4dd980123a88ae160ad006de0ab656798fec8896d23905071d1c6f41cff618422cf37d9620ee10dbe6522e8266095eaff3244a7c36232e38 -DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u362b09.tar.gz 100860535 BLAKE2B 114aa536752f6f85fa80d26fd24d9579595c2a71e4dd3f3d048e773edbe86c39ce318caec7d6f883afeb9151350ee7819d544b1e4afbe7efc5e62b6a10c42036 SHA512 a15646dd1fb469d74dcafab8df4794ae2a9b34a32e80d4c0723ce510b5579ba5942e1c093ce4ccc764fc19191137f1d1d9b63ac935c8f21288b6f30046822e89 -DIST OpenJDK8U-jdk_x64_linux_hotspot_8u362b09.tar.gz 102949829 BLAKE2B 039d35113c156e929ca9b49a2a63ab326b9ed036f4cfe4facfcb88d4cd2984005e81a20c842f2abbd5dce8f9da864908de5379e68b72ef1e0f6f5ccfc241db1b SHA512 20bb587023cd5a6148ad06337cd5fc182275c3ebcaac95f65937e66b2bc75879a225e2fd2ef945ea45ba7886c983df3d24c2f01a1c1f9fce38f265dabed47ee9 -DIST OpenJDK8U-jdk_x64_mac_hotspot_8u362b09.tar.gz 107290360 BLAKE2B 03f4ef48266779a9117bc6164b50298a2f23dc66b1d90370da64cd6bff7670cae09340f08e3358d43a5c051bff831020b568994cf59b3ba5a1b6c7938f5db12c SHA512 9923fda6021d5bacd598b13460f4b0668d156e92d0b3972e3746b996e3ee6275269e2deab14f7fd9ce8183670648df936efa9133cbe9b908f67e38b7e907387d +DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.20.1_1.tar.gz 191278260 BLAKE2B e3ed7bb97a8b244f7aaa7ced808a55d632634d8c6422c44b7bb37d5e51ac1cc8b1e03f2b404a3654bd5cfeecdc1051cad57ef6617c908a52f04f5bcd8f55c545 SHA512 72db8438ec936d2594bc62cc02cfeca348cdf4854c162ea6cdb5ae6051120e771d48cb510d2c0145e5a243f544f8963e9210efa6f57edc6f667c5761b0088b5b +DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.20.1_1.tar.gz 182177832 BLAKE2B 404d628e2ad7392ad6ee5906a9ddccff82778fc1303a7877738b7646c4c50fc1eda4b98212d43b200c00ca49090216f9609608f2e1356a74d483e9ed1d90bda0 SHA512 802c39f52d941905997f5b975a69a74d937aaee14eb7ab3825d764e76d65681bdcea366fe2f34b581b6a96e9fa91bcf82164ead1fbbefe936f7e86ee7bcebd42 +DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.20.1_1.tar.gz 176708583 BLAKE2B b88652df8c51648243525f2f6a5f127a764ca9caf140eb3c8b70783acc4b8146418800bb239ffd34d5039daace3fef4930f605692bde7f96d43229f9cb802d9b SHA512 12c6c638456a7031138f8f8ca91b24dc400a6cb792ee47e2a0d526a193a030762b223cd1652a9363141219cac13df5cdf4b096f879f84f0ec59f2358d89809e2 +DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.20.1_1.tar.gz 193412811 BLAKE2B e790ad546350ae4a4c1b59dfe9641ce4ea2c89f71276f684d7535ad0d2cb0dfc2c42f21d420bf3c7b370bbbe9a342cd1cb073f3f051bcb082ecf310923914a33 SHA512 f39357c0c25e69241c67647ffddd143eb01979d332d6ec98d89ff8e0f19b0fed9e1cffa5155bb995441ae33bc50357fbf9381080bb652caea39d4166f491ae35 +DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.20.1_1.tar.gz 194530299 BLAKE2B 295c1e78cde1dbc18f906b9b355cd433bfa61e9f60fa9648ab3b58bc5fca2c19f6f64569eeb51f44066e21d0e39952773deb22d39011d79b8dda6490b6ba3a46 SHA512 2286aa5a26093bba55360e5fea14942bd2ddc1011f1db28529e7ddf2f879125b5c910aa14cc21b24dc1235b22f7052d912af7b6c4986834f813ec04c9e98c141 +DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.20.1_1.tar.gz 186910284 BLAKE2B 701e498de41831387cb1e72d08e4b50b63daa04a8bcaa81a928a67572c73dd9ace4aecf82eeb572463bb00a10b320ee539ef20418fde6252acfebf14eeccb973 SHA512 b47123db2480d5533da6231a808a66cf7f1844e9343d540152d60473675e43af01352d00fc396801a6221dfe6a4fa3a717ceb0df6d0fa2c03242878e53bb6804 +DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.8.1_1.tar.gz 190656874 BLAKE2B 43846cf6c7962e7e30a90d945db0c93835d38e51f5459b10a1adb291c7f7aa1e14f0b58997f0d146376260976713aa2dae2494eef3310d8c80978c4b02662bb9 SHA512 674a49bb0a52a6f880c829287ed80aa663e864a11586bf21ad3deef40755d1be0a711d6e26cc3d532d1cb4843cd091aeb4bd52d06fb6bef838e1f5be4d361114 +DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.8.1_1.tar.gz 177735753 BLAKE2B df5dba287781b84e67ae99345bc96dbd64bd85c6dda5317a7dd12f522111c80601492640f6ed4ac60b683e14ce23df625f7de49faf18e4d74344855a83d33545 SHA512 ab2fa97f8fe2b94fe3f91ffbe0f9a99bd6cca2a85d5d8434c80b0f3bf0cc5890e90c38591600cc0bd210400790be6b7fa118df4a8583ad349535886a7eee6ea0 +DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.8.1_1.tar.gz 188790162 BLAKE2B f3d69f13542a55aff361041539ef1a1d2eeda02ae8b37c94b377d5bed0fef2000e407fa02e7efb3e7fcf93e8716349d36f19d35ddbd8de2b54053d0687c3b356 SHA512 480f814d7ff517d6c970ee98dd99312eb9d2367e21bba788ca4ef3e1f7772419f4aa66bedce60e216e50a094c5d6bde8362613dd6ade86b1532daac38aea875a +DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.8.1_1.tar.gz 191404507 BLAKE2B 9fd93378c3a0e42b7af5e2d1c5af240aa2854a0e84ae4a66aad897686e90fda62a630a85d6765046a759f0ee8477d009937b6a6102317cc48a4c8d601f15b318 SHA512 7bb83ed8e9990413e363d8d62f9424b9057896220f820d7b71c95112a46a1f9cfba9c67eda3fb20082dc630acc0c139928d64534bc4ee34e9650caab1e81ef4b +DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.8.1_1.tar.gz 191374032 BLAKE2B f7f6eb577cc9cffd8e9326a7cf262adeb35e18bd4262973c81030c2fddb8077101968161a7d8239f8b78265925ba03fad393e60054a6e3651702d983c98e4f03 SHA512 c68d3ccacbe5d065b41948e3d02257185185679747d803e9c6387a8ce0e8e51a38757d1a43d15a19a27228b7b10629d64dfb274f882a0abca8781ac71ec4aae9 +DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.8.1_1.tar.gz 192053612 BLAKE2B bd59524805f7af5883b7fd20ff13b77594ec6841c28b028ff589419ff31cc7f152c6b177bc133b7749c413c22a7e8bdeab6e2f705ceb49617bb89dd6be6727a4 SHA512 3856cea7abfacfeda499200ff09427ce7f2e96f25eb556cb27eecc83f0f8c5b3fcb831a00dcf0202d6dbb191e2a23e2d0f928dcfc503dbfc582193245ecd2522 +DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.8.1_1.tar.gz 187618128 BLAKE2B 0413bb2bb928906f8aa09a6dae161fd91b4cc17a81ec822d4553322f1505f8141d10d308ddfb632c1678d2685dd95d999d09de5888aee056ca95847cca26b29e SHA512 b2ba614ca966acc6c03563a248638051abe0851b9b6932e8d93748307250f32b5fd8cef70c8c308aba4f97c02c4791cc7193b19f5b2f407f6c2d003fcf2416a6 +DIST OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.1_12.tar.gz 205976031 BLAKE2B 86b00c0c8da5c7ef97e993c1a863c715eca4384f892bf184e094ea4abdeac5e47a54159d1aadedd420e3c4e0d3644ce33589aa8bd1f83f5d67bd19c340951a8d SHA512 ed05b9733e8270fe73dab86fb9320689a6613dd2d6a5807a47a2e22f081feefd9729e39521c85f3f443687bd103918850a9bd3a27d1a64b8519bb37c7454e5e8 +DIST OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.1_12.tar.gz 206892255 BLAKE2B f51f7093e3c94c3ae766a36d2ab9da83e5789a6eb586b5ca2f6417c1b58134a1debe80a64fcd80ca7ec8605670bd73ba6cfca2e6a299b12423b7f8a5fcc46f22 SHA512 28dc24c8023c06f1ca765b81d06ea17a6ba2448ac0a2190633266211b82a78be03e3a0f27e52ee9a23919696b8c744ba9e2cf1a325f99b7a29fb276a9428735a +DIST OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz 207852818 BLAKE2B 294b849b8a0e851c034d63533fe844e528b05886a4803b3f5c73e0e9b5db1a79462963d0c90da2ae5967f1b7eac1521ddc199cdbff8fadd1875bace5a0f0d2f5 SHA512 496ed15dcba607cd1b9e6786932429f9d213d2ea22203bf8cbed61880655ee046bfc4c07b7b0d54285081ddf242fd8957ba34c8be75f5fb2ae0aac16f9b8ef3a +DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u382b05.tar.gz 102105707 BLAKE2B 5edec97bb60d983bcc299914c5bad8e89aef70f31ff1f5b26cbd430cbacc8b41c6d04906a9ea3a1eb6cf2601ae81279a871a1eb77c3297abb5454e213f2583b0 SHA512 11219c825f8ac0fcdd16120f89b2e7951c651595eb0be762cb511bad8cf44d3bc3136ba6f71b5ded8a9745fe5a143416b0ef4422c1cbbe62f110e4fa5f39c7ed +DIST OpenJDK8U-jdk_arm_linux_hotspot_8u382b05.tar.gz 98311130 BLAKE2B b2158aca6fef4e8a404b9dace05817f5fefd0b201281351126d422f35d66d733510943246c22a47f03e65d711f25d424935ae8788057722c71cbb30a4f7a4a1e SHA512 70d79c385ebb1cfe286781eb8da0d622a61140a0abc3b6bc559c8213ace93b9ce2a77aa55a3ef32936ee512b406044c1708624b4d040b62dd2462b4ea6e71572 +DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u382b05.tar.gz 100512595 BLAKE2B e2d0c97d0b68e649e11755fe258035a307ab8b96331ec0e6e431ec126857b60869d9c2bae966955a929fe87572b59e898603b32284bc76ce49c8086b06b838e6 SHA512 04a58d50c4fe0ced94b48e3018a6853c836a4f53cb4f310bad2ca7e913380a023655230ff5bb421f012cf2cdc037767f9e11aaa8f5b1b9f722b100c4417ccca4 +DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u382b05.tar.gz 100894343 BLAKE2B 78d7551652b10d71a3bfaf6639ab5cd6fc169d9cbb9010e93812d32863fc3556eaae93ccc8ad8c0bf1002feb0ae7715433dabeff62bbf91e1bd5a248b1204768 SHA512 ef82b9604994348ecf2a55c02e717af88beb616abd87482de9b9afc2ef832e29d1338839910bc64d0de07fb0b5b420eff9ce6718795c4abdf409475b17c01a3e +DIST OpenJDK8U-jdk_x64_linux_hotspot_8u382b05.tar.gz 102988783 BLAKE2B 3aa9b47e0e1dcf8fc67ebbb8d2bf70987fa7d527fbbd2cd15d43385922851d6144b96549e77b8060809a6eabf057353593e5efe9f5c02cc991bdf9c0dd734b01 SHA512 13c78f78d14856d58f692ad032664d363fb1063bdb0b16e19cd68587c9d16df152c5fc9d4ec15b53691c9146345936aab1a6c5b79a4c43740a418fa2c3871ca9 +DIST OpenJDK8U-jdk_x64_mac_hotspot_8u382b05.tar.gz 107309922 BLAKE2B 94a06fc998e57901b79396c47e4c1a4c82a7fb338d454267a1f8e4270665486ec259675458e24f7d2c3d55d1d206e91f46d1e4c5de7ef235f12aad93a32564c5 SHA512 5259772daa999e0668c380e8d436c3e99012b6c7c6ba09cff206efb54a102a30d9279ec6d4386927579b6e9d478fee74fc7f6266957ae4425aa29148eb5936e4 diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.18_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.20.1_p1.ebuild index dfe26d9c3c3a..dfe26d9c3c3a 100644 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.18_p10.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.20.1_p1.ebuild diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.6_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.8.1_p1.ebuild index b0024619e0fe..b0024619e0fe 100644 --- a/dev-java/openjdk-bin/openjdk-bin-17.0.6_p10.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-17.0.8.1_p1.ebuild diff --git a/dev-java/openjdk-bin/openjdk-bin-21.0.1_p12.ebuild b/dev-java/openjdk-bin/openjdk-bin-21.0.1_p12.ebuild new file mode 100644 index 000000000000..3d125fc60923 --- /dev/null +++ b/dev-java/openjdk-bin/openjdk-bin-21.0.1_p12.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 toolchain-funcs + +abi_uri() { + local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/" + local musl= + local os=linux + + case ${2} in + *-macos) os=mac ;; + *-solaris) os=solaris ;; + esac + + if [[ ${3} == musl ]]; then + os=alpine-linux + musl=true + fi + + echo "${2-$1}? ( + ${musl:+ elibc_musl? ( } + ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz + ${musl:+ ) } )" +} + +MY_PV=${PV/_p/+} +SLOT=$(ver_cut 1) + +SRC_URI=" + $(abi_uri aarch64 arm64) + $(abi_uri x64 amd64) + $(abi_uri x64 amd64 musl) +" + +DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptium.net" +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64 ~arm64" +IUSE="alsa cups headless-awt selinux source" + +RDEPEND=" + >=sys-apps/baselayout-java-0.1.0-r1 + kernel_linux? ( + media-libs/fontconfig:1.0 + media-libs/freetype:2 + media-libs/harfbuzz + elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) + elibc_musl? ( sys-libs/musl ) + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${MY_PV}" + +pkg_pretend() { + if [[ "$(tc-is-softfloat)" != "no" ]]; then + die "These binaries require a hardfloat system." + fi +} + +src_unpack() { + default + if [[ ${A} == *_mac_* ]] ; then + mv -v "${S}/Contents/Home/"* "${S}" || die + rm -Rf "${S}/Contents" # drop macOS executable + fi +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}/${dest#/}" + + # on macOS if they would exist they would be called .dylib, but most + # importantly, there are no different providers, so everything + # that's shipped works. + if [[ ${A} != *_mac_* ]] ; then + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # prefer system copy # https://bugs.gentoo.org/776676 + rm -vf lib/libharfbuzz.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if use headless-awt ; then + rm -v lib/lib*{[jx]awt,splashscreen}* || die + fi + fi + + if ! use source ; then + rm -v lib/src.zip || die + fi + + rm -v lib/security/cacerts || die + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + # provide stable symlink + dosym "${P}" "/opt/${PN}-${SLOT}" + + java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_set-pax-markings "${ddest}" + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter +} + +pkg_postinst() { + java-vm-2_pkg_postinst +} diff --git a/dev-java/openjdk-bin/openjdk-bin-8.362_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.382_p05.ebuild index 83dddfd00e50..83dddfd00e50 100644 --- a/dev-java/openjdk-bin/openjdk-bin-8.362_p09.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-8.382_p05.ebuild diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest index 0bde0b30094b..94d314d5a60d 100644 --- a/dev-java/openjdk-jre-bin/Manifest +++ b/dev-java/openjdk-jre-bin/Manifest @@ -1,3 +1,4 @@ -DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.18_10.tar.gz 42824761 BLAKE2B 481317f316bac10e098d706a04e94b57bad4388c94168da27403e18489f66d322177f7f9b59c5ebdfc6f3e70080550f6f5e5fc922e9b21a9a59dcc60116243be SHA512 07a0483b4536129974706ee79864e9fd737810b396a605170e68c74dacdb3c65e10ccde9073e8ec0c907709172dd2e08e7c454a5bd88cf0e92f879ace1eedbd0 -DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.6_10.tar.gz 46078462 BLAKE2B 2d0bc958f64da82e82b3a8a9d6bc686ecd2a09943e851f0f1a8efcec7cf0135b76a65abfa7f1175d09bc42583d151a4161d891a9861050751ae0c8aa4b1bbdc2 SHA512 253a030ab87e949091b24bacd638a91c673d775e76f3a83e8ab0c1824f697516405fe8fcf7d3b460bd25ddbb441685fa396b390e7ab8bc802294ea36b4700fac -DIST OpenJDK8U-jre_x64_linux_hotspot_8u362b09.tar.gz 41359704 BLAKE2B ae4238725544b03abdc32f82fcb1e13fe2aba460c13a48ccc8ccd608f1e8b0f5ac6036b06e941e89b936f01250a4fc3f6fb0f9d7eb5ae9129b8cd5de6c1da33a SHA512 6cb0bdc28596e23807f3e7f31c40f095d20395492bf30dae26a735686f82d9d216110403d59c769700a23dd3187a2603832bd84204051800d474af24c68c8cbc +DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.20.1_1.tar.gz 43033465 BLAKE2B 484ec2b8512e2c759840157608ae4b7cdd2729533589a8ad1ba718779e88319fa02da4c9f59b56dea93123646ca7a55e84675985679a25f5163d7511b8147f66 SHA512 4a962e2ee8c885753b7bc25c3a30af307bee2c8829438eb85b9a7b20abd72fa22b340cfb9b6a0721e8fb00379bd3a230653daa52f5f1e3e6d5ed028ea2066c99 +DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.8.1_1.tar.gz 46332104 BLAKE2B cd27d457ecb64a17cd86fb7f348e7868b6a5e4bb59a98971dabfcdc213e4afc70dc7c1c912dcf209c9a3931ce2abece961480cc06039b565e09f70e55269ceb9 SHA512 773f39ec8f66d1285df74706014c690f3ade9c960bc27c5032bd4c100b2e89c3d4a23150af548128bdf499d64ba1567aa065f4a39f5e583600d86414d283f66f +DIST OpenJDK21U-jre_x64_linux_hotspot_21.0.1_12.tar.gz 52453828 BLAKE2B d53bf2929431c9ce4026ae2fb9b950fedc9e756f52013a2ecdad804ccf28e33447f5278f159fb881791d1a0952d959232085549f2ef1b563979c3f15713a00e6 SHA512 568844305c490abbd9a20aa89b48b8ece4bb1b75145d6e6dc89220bdb6049bc70f8bd8c6a789983d7bbbdbc64d78129515443fe86c03064592354b455869e8af +DIST OpenJDK8U-jre_x64_linux_hotspot_8u382b05.tar.gz 41389960 BLAKE2B e79d0d6b08a0f2066c877b3f970742a209f1b56a46dd4e5bc3b3942b590ae4eb0e72ac9b909d2e0d9b61bee76d507d9df8def88c16ec87930152b8375c6272e5 SHA512 536e2b3f87907aa2d79938dae3f92efa5d6402ae252e147beb9ddc3f81b1001a8031e4eba7132b0640dad36652fb619b761e038a88246442fc8592d5fe8a9c41 diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.18_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.20.1_p1.ebuild index 7e2efc602026..7e2efc602026 100644 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.18_p10.ebuild +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.20.1_p1.ebuild diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.6_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.8.1_p1.ebuild index 7e2efc602026..7e2efc602026 100644 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.6_p10.ebuild +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.8.1_p1.ebuild diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.1_p12.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.1_p12.ebuild new file mode 100644 index 000000000000..1aba636df50a --- /dev/null +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.1_p12.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 + +abi_uri() { + echo "${2-$1}? ( + https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz + )" +} + +MY_PV=${PV/_p/+} +SLOT=${MY_PV%%[.+]*} + +SRC_URI=" + $(abi_uri x64 amd64) +" + +DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptopenjdk.net" +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64" +IUSE="alsa cups headless-awt selinux" + +RDEPEND=" + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >net-libs/libnet-1.1 + >=sys-apps/baselayout-java-0.1.0-r1 + >=sys-libs/glibc-2.2.5:* + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${MY_PV}-jre" + +src_install() { + local dest="/opt/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if use headless-awt ; then + rm -v lib/lib*{[jx]awt,splashscreen}* || die + fi + + rm -v lib/security/cacerts || die + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_set-pax-markings "${ddest}" + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter +} + +pkg_postinst() { + java-vm-2_pkg_postinst +} diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.362_p09.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.382_p05.ebuild index 1071fa2afe06..1071fa2afe06 100644 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.362_p09.ebuild +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.382_p05.ebuild diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index d5cc6cf9dc44..4bda6b86f359 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -1,8 +1,9 @@ DIST java17-riscv64.patch 2253475 BLAKE2B a10a257f0b8bf590cdc011cf0c5af4854d49d6bbdf68dd74b2f996b70e0ecdd2b87bc4a02394f67ded5e664efb41f8dd03bb312fbfcffd84c289afdcbf7868de SHA512 06230b121e1f28189877025a4eab99e6d8cba176a17c88f073498fec6c73ab26130ce1500ea4f83235cc6abbc1742e47b227d60b5ff77465740048abdc52d165 DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f2823772a5d9a18447a435f191daf78c5429a15c2e9ea64758dc9b26ee2a88275532b4f27714b2a7e4489f920c0ed2f5003b SHA512 c0426f243c5aa581d90366cb01ce811e34883a9d8a0298cab420378470e8eb427a56932ca1fbb5ed57e7430be2b38c6bc4491028ebaa25be0a938ba0bb2baf45 -DIST openjdk-11.0.18_p10.tar.gz 123369840 BLAKE2B 1fa6a147ac0685f51b82f7b958b81d4ac56dd0d94234dab54d4c3641d4d5b0905b4778fa73f2d8582249f251839dd3ff5b8835c2ff3eb24f402d1399cfc27ffe SHA512 10a48066ad1d2b627cc9be5c6e06a0deef7241f3b95b917b3bf86ffeb53ea043915e0eb7784ea244332d9c3941c8c5056c154e5aff4522b95aca8c8372c19474 -DIST openjdk-17.0.6_p10.tar.gz 105221267 BLAKE2B c885c10aea273e779bbee4463106598900790378e06012f0019bfbbba8987a99a6aad53aca39bdc5ffba5f610a84e6c4cfd98c697e46404d388d32186b2ccd6b SHA512 7fa47285fb1776802dc35352bfe64d6b376cbc73d7b72ef7d5c8ad41c181d8aa9dc6fb392fe3b1c799974765d40c03a6643ad6afeb3ddc9ab45e546b747ebb3c -DIST openjdk-8.362_p09.tar.gz 87939909 BLAKE2B cff08a04e2e0cf0af776d8ae8220cae86afb322a4dbb83df39444b08a23dd59fea761a0ee403d24d7fd639e1982eac7c77764920c7efcfeb877dc64763c9f672 SHA512 6579e881f36902db49db8d136f1cd9d2b2659705b216bfe014df99441d1984b4d7678998bb36edf78b77049bdd8315a8dcf22e6a598b485b972fee3784fe2ef7 +DIST openjdk-11.0.20.1_p1.tar.gz 116165519 BLAKE2B 3f3627d6535770c6654226ca2c188ac4aa0f332c7f66d79ab1991274e019ee4aee5194b285bace03175593543017a2ec75494e8e50b5488df82c7d437bf31398 SHA512 765f90a24629e5db5afb23b09edc38a3d460ba27d1de53980942e711783fe9fdf1c4ef29a75d2ffd6d93864611ffce60d515e032180917cd053967a0d4ecfc69 +DIST openjdk-17.0.8.1_p1.tar.gz 105878760 BLAKE2B e4d752dc87717855bfe4bd84c97056f0d93b554c67bdbb3e750e20479e2156628c85aea7b404577ea6ff40d49669d5f53aab06d0c4cf9aa926b060a0cd93cd03 SHA512 0d8e9e54173be855c15d121d4d6cd36996700e1e2fb194ad93ba8ad794a342c87b7d2f81a32d0bb215e45f1dc1f4efdfe1be5e8de99395730902d443ac773813 +DIST openjdk-21.0.1_p12.tar.gz 112241360 BLAKE2B 68a542a1dd65cf74b826e255d08350ec662c37337e45aec18d91e0dbdcce5c6e50172ad482cc21f1aacbf356722e009d4b6431aecf5a1d6b67b74a5007ca702a SHA512 def4b6688f063758235bc454bbbdb4caefa45d2724a9f2296af11d684801f05f1375f0be771b52d9235676e7f89dec816a34b3a1a1cc972662ee50de89600455 +DIST openjdk-8.382_p05.tar.gz 93105951 BLAKE2B 07e2961dbbd8de153650a1f92fd88960e6b1b39e7d212cc158bd943d35da5fdab0595583226ac12134eb176b1c550576e7aef5dfaf4a76ac0060daa42f4b4495 SHA512 5879cfbd5795f0260897c52fe2503754767faf1e229832e0c4c6dd9957055fd7105d14403d82ccf92eed0adfecc5bc858a89643e68d3c81d437fd543fbfce49a DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f DIST openjdk-bootstrap-11.0.14_p9-riscv.tar.xz 104601676 BLAKE2B 5f976e8a626a829fae70ad6c007f10bfeff79e29c85d6c75fb2f5ff8984fd2a2bd44ee6e07958dbbdaaed761c6839d375e1b5ba6cffc63b02ad9e2c9178310db SHA512 580dec81626553fe3e7afd0f6385a733ba80a0502cf0f9e8bdc973048887290c9ab6171267d61d8838c4ece4de58c9ca8b78540bd52b1757495a27175057ec64 @@ -10,3 +11,5 @@ DIST openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz 116557680 BLAKE2B d20e45a5a76e30e DIST openjdk-bootstrap-17.0.1_p12-x86.tar.xz 111479904 BLAKE2B 17d33f8ee81c2846f417d8e7cd1429eb611e916a6b375c76127179dc6afc55b0254248360c892ce37a178fd553934d952ec8955ff5d0613eb66678b8ecefe917 SHA512 094bcc960801e5fd7e1c966c8101c195ac7fa5e222d9c8e79ca64f8a3e6812613c17a0356211e7dd831325fa11af88cc22ed56c434d65504f18dd4f4ceaedfdf DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab078085f094bbcc65448458d98a0f521e3b754c5118b1b4f957cfa00c24e896c811c2a477822c469ffcfe0de1ad6a8d0b7db23b0b09ae3b459eaf8c4fc8 SHA512 e30acd6c64a0095f4203129ecf2cff4c6b4293bc017457465d3abb746d280a2f5d89028eed22f7f3d236890d047149c7aa257e3b49593d7a6ab4dd6b777a7c26 DIST openjdk-bootstrap-17.0.3_p7-riscv.tar.xz 113344052 BLAKE2B 69ae326c600ecf1840a0874b1e26545779434b979e195a3bc7975615f873cd9ffce324f291e56a2800edc304447845baec774b2a08964afde274bd8e0dd3f704 SHA512 4a483faa32b26758f6fae605fdb3d3b77814c627a3a560e91ca88e2d36a88543a53f019a59b5a6456b87ca671e8b7129d5766210bd5cd52125cb3a040ec2a23f +DIST openjdk-bootstrap-21.0.0_p35-ppc64.tar.xz 125375264 BLAKE2B 28802995f393dc76362dae766f8b598fd56085051418075d4c426293e6431b441ea38a2d2e4676fc89173d10324e3aafac52c97a5d9459bb0199168a07807e16 SHA512 cbd3992450c44764373c25313f6ce32f0c8a47abec557e4a10f7f8517435bf450ba5ac9fa9c8cdfb41f1536b55829d733426dc12dc2b5a2eebf5a94e9094752a +DIST openjdk-bootstrap-21.0.0_p35-x86.tar.xz 120906212 BLAKE2B c3a56f4e51a8aca1c318b9c32bebdb4c09e42d80416ce1843bc80077f09466b7f54627ab6992f9149fdabdb4d5557c3cad6b5e93b37ba3d89d84f736fc07a57a SHA512 40f0cf60adaebd0c6ae11badb6b71727a5cc64c89077731b0f7cc82f203297b9b780ae43ec74eca9dd5a64de1209f519c2ad0f9083c017cf474d1020206f762c diff --git a/dev-java/openjdk/files/openjdk-17.0.6-multihead-fix.patch b/dev-java/openjdk/files/openjdk-17.0.6-multihead-fix.patch deleted file mode 100644 index 46f503dd8e0b..000000000000 --- a/dev-java/openjdk/files/openjdk-17.0.6-multihead-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -From cfc9a881afd300bd7c1ce784287d1669308e89fc Mon Sep 17 00:00:00 2001 -From: Sergey Bylokhov <serb@openjdk.org> -Date: Sat, 2 Jul 2022 00:25:20 +0000 -Subject: [PATCH] 8288854: getLocalGraphicsEnvironment() on for multi-screen - setups throws exception NPE - -Reviewed-by: azvegint, aivanov ---- - .../unix/classes/sun/awt/X11GraphicsEnvironment.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java -index 5c9d2a1b695..93f5eaf6656 100644 ---- a/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java -+++ b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java -@@ -236,7 +236,7 @@ private synchronized void initDevices() { - throw new AWTError("no screen devices"); - } - int index = getDefaultScreenNum(); -- mainScreen = 0 < index && index < screens.length ? index : 0; -+ mainScreen = 0 < index && index < numScreens ? index : 0; - - for (int id = 0; id < numScreens; ++id) { - devices.put(id, old.containsKey(id) ? old.remove(id) : diff --git a/dev-java/openjdk/openjdk-11.0.18_p10.ebuild b/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild index 8f67061d2ac5..9c455e1a1a45 100644 --- a/dev-java/openjdk/openjdk-11.0.18_p10.ebuild +++ b/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild @@ -176,7 +176,7 @@ src_configure() { # Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt # https://bugs.gentoo.org/833097 # https://bugs.gentoo.org/833098 - filter-flags '-flto*' + filter-lto filter-flags -fdevirtualize-at-ltrans # Enabling full docs appears to break doc building. If not @@ -243,6 +243,10 @@ src_configure() { } src_compile() { + # Too brittle - gets confused by e.g. -Oline + export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)" + unset GNUMAKEFLAGS MAKEFLAGS + local myemakeargs=( JOBS=$(makeopts_jobs) LOG=debug diff --git a/dev-java/openjdk/openjdk-17.0.6_p10.ebuild b/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild index 328018b6e7c8..2d8881fa4e09 100644 --- a/dev-java/openjdk/openjdk-17.0.6_p10.ebuild +++ b/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild @@ -194,7 +194,7 @@ src_configure() { # Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt # https://bugs.gentoo.org/833097 # https://bugs.gentoo.org/833098 - filter-flags '-flto*' + filter-lto filter-flags -fdevirtualize-at-ltrans # Enabling full docs appears to break doc building. If not @@ -226,7 +226,7 @@ src_configure() { --with-version-string="${PV%_p*}" --with-version-build="${PV#*_p}" --with-zlib="${XPAK_BOOTSTRAP:-system}" - --enable-dtrace=$(usex systemtap yes no) + --enable-jvm-feature-dtrace=$(usex systemtap yes no) --enable-headless-only=$(usex headless-awt yes no) $(tc-is-clang && echo "--with-toolchain-type=clang") ) @@ -258,6 +258,10 @@ src_configure() { } src_compile() { + # Too brittle - gets confused by e.g. -Oline + export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)" + unset GNUMAKEFLAGS MAKEFLAGS + local myemakeargs=( JOBS=$(makeopts_jobs) LOG=debug diff --git a/dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild b/dev-java/openjdk/openjdk-21.0.1_p12.ebuild index 1a2fcdf2672e..7332163ebc89 100644 --- a/dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild +++ b/dev-java/openjdk/openjdk-21.0.1_p12.ebuild @@ -6,10 +6,8 @@ EAPI=7 inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs # variable name format: <UPPERCASE_KEYWORD>_XPAK -ARM64_XPAK="17.0.2_p8" # musl bootstrap install -PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball -RISCV_XPAK="17.0.3_p7" -X86_XPAK="17.0.1_p12" +PPC64_XPAK="21.0.0_p35" # big-endian bootstrap tarball +X86_XPAK="21.0.0_p35" # Usage: bootstrap_uri <keyword> <version> [extracond] # Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian) @@ -41,24 +39,20 @@ SRC_URI=" https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz -> ${P}.tar.gz !system-bootstrap? ( - $(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl) $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian) $(bootstrap_uri x86 ${X86_XPAK}) - $(bootstrap_uri riscv ${RISCV_XPAK}) ) - riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch ) " -# riscv patch origin: -# https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap" +IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source +system-bootstrap systemtap" REQUIRED_USE=" javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap ) + !system-bootstrap? ( || ( ppc64 x86 ) ) " COMMON_DEPEND=" @@ -115,8 +109,6 @@ DEPEND=" S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}" -PATCHES=( "${FILESDIR}/openjdk-17.0.6-multihead-fix.patch" ) - # The space required to build varies wildly depending on USE flags, # ranging from 2GB to 16GB. This function is certainly not exact but # should be close enough to be useful. @@ -165,7 +157,6 @@ pkg_setup() { } src_prepare() { - use riscv && eapply "${DISTDIR}"/java17-riscv64.patch default chmod +x configure || die } @@ -196,7 +187,7 @@ src_configure() { # Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt # https://bugs.gentoo.org/833097 # https://bugs.gentoo.org/833098 - filter-flags '-flto*' + filter-lto filter-flags -fdevirtualize-at-ltrans # Enabling full docs appears to break doc building. If not @@ -228,7 +219,7 @@ src_configure() { --with-version-string="${PV%_p*}" --with-version-build="${PV#*_p}" --with-zlib="${XPAK_BOOTSTRAP:-system}" - --enable-dtrace=$(usex systemtap yes no) + --enable-jvm-feature-dtrace=$(usex systemtap yes no) --enable-headless-only=$(usex headless-awt yes no) $(tc-is-clang && echo "--with-toolchain-type=clang") ) @@ -260,6 +251,10 @@ src_configure() { } src_compile() { + # Too brittle - gets confused by e.g. -Oline + export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)" + unset GNUMAKEFLAGS MAKEFLAGS + local myemakeargs=( JOBS=$(makeopts_jobs) LOG=debug diff --git a/dev-java/openjdk/openjdk-8.362_p09.ebuild b/dev-java/openjdk/openjdk-8.382_p05.ebuild index 2da4bca4fce1..9b1632baec83 100644 --- a/dev-java/openjdk/openjdk-8.362_p09.ebuild +++ b/dev-java/openjdk/openjdk-8.382_p05.ebuild @@ -135,7 +135,7 @@ src_configure() { # Strip lto related flags, no support in this version. # https://bugs.gentoo.org/833097 # https://bugs.gentoo.org/833098 - filter-flags '-flto*' + filter-lto filter-flags -fdevirtualize-at-ltrans tc-export_build_env CC CXX PKG_CONFIG STRIP @@ -178,6 +178,10 @@ src_configure() { } src_compile() { + # Too brittle - gets confused by e.g. -Oline + export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)" + unset GNUMAKEFLAGS MAKEFLAGS + local myemakeargs=( JOBS=$(makeopts_jobs) LOG=debug diff --git a/dev-java/openjfx/files/11/ffmpeg5.patch b/dev-java/openjfx/files/11/ffmpeg5.patch new file mode 100644 index 000000000000..ca0bd1fbecb5 --- /dev/null +++ b/dev-java/openjfx/files/11/ffmpeg5.patch @@ -0,0 +1,17 @@ +--- a/build.gradle ++++ b/build.gradle +@@ -3710,14 +3710,6 @@ + } + } + } +- } else { +- // Building fxavcodec plugin (libav plugin) +- exec { +- commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin") +- args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}", +- "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", +- "BASE_NAME=avplugin", IS_64 ? "ARCH=x64" : "ARCH=x32") +- } + } + } + } diff --git a/dev-java/openjfx/openjfx-11.0.11_p1.ebuild b/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild index 7d61ff67f2c2..34f91df33673 100644 --- a/dev-java/openjfx/openjfx-11.0.11_p1.ebuild +++ b/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MY_PV="${PV/_p/+}" SLOT="${MY_PV%%[.+]*}" @@ -24,20 +24,22 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.b https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar " +S="${WORKDIR}/rt-${MY_PV}" + LICENSE="GPL-2-with-classpath-exception" KEYWORDS="-* ~amd64 ~ppc64" - IUSE="cpu_flags_x86_sse2 debug doc source +media" +REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" RDEPEND=" + app-accessibility/at-spi2-core dev-java/swt:4.10[cairo,opengl] - dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 media-libs/fontconfig:1.0 - media-video/ffmpeg:0= + media-libs/libjpeg-turbo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtk+:3 @@ -46,7 +48,6 @@ RDEPEND=" x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango - virtual/jpeg virtual/opengl doc? ( dev-java/openjdk:${SLOT}[doc] ) !doc? ( @@ -69,8 +70,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" - PATCHES=( "${FILESDIR}"/11/disable-buildSrc-tests.patch "${FILESDIR}"/11/glibc-compatibility.patch @@ -80,10 +79,9 @@ PATCHES=( "${FILESDIR}"/11/don-t-force-msse-11.0.11.patch "${FILESDIR}"/11/disable-architecture-verification.patch "${FILESDIR}"/11/gstreamer-CVE-2021-3522.patch + "${FILESDIR}"/11/ffmpeg5.patch ) -S="${WORKDIR}/rt-${MY_PV}" - egradle() { local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}" local gradle="${GRADLE_HOME}/bin/gradle" @@ -128,14 +126,13 @@ pkg_setup() { fi done - if has_version --host-root dev-java/openjdk:${SLOT}; then + if has_version -b dev-java/openjdk:${SLOT}; then export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} export JDK_HOME="${JAVA_HOME}" export ANT_RESPECT_JAVA_HOME=true - else if [[ ${MERGE_TYPE} != "binary" ]]; then - JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) + JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT}) [[ -n ${JDK_HOME} ]] || die "Build VM not found!" JDK_HOME=${JDK_HOME#*/} JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} @@ -183,7 +180,7 @@ src_configure() { # build is very sensetive to doc presense, take extra steps if use doc; then local jdk_doc - if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then + if has_version -b dev-java/openjdk:${SLOT}[doc]; then jdk_doc="${EPREFIX}/usr/share/doc/openjdk-${SLOT}/html/api" fi [[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early" diff --git a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild index 489a905614c1..0f4c3e85b629 100644 --- a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild +++ b/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MY_PV="${PV/_p/+}" SLOT="${MY_PV%%[.+]*}" @@ -24,20 +24,22 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.b https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar " +S="${WORKDIR}/rt-${MY_PV}" + LICENSE="GPL-2-with-classpath-exception" KEYWORDS="-* ~amd64 ~ppc64" - IUSE="cpu_flags_x86_sse2 debug doc source +media" +REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" RDEPEND=" + app-accessibility/at-spi2-core dev-java/swt:4.10[cairo,opengl] - dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 media-libs/fontconfig:1.0 - media-video/ffmpeg:0= + media-libs/libjpeg-turbo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtk+:3 @@ -46,7 +48,6 @@ RDEPEND=" x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango - virtual/jpeg virtual/opengl doc? ( dev-java/openjdk:${SLOT}[doc] ) !doc? ( @@ -69,8 +70,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" - PATCHES=( "${FILESDIR}"/11/disable-buildSrc-tests.patch "${FILESDIR}"/11/glibc-compatibility.patch @@ -79,11 +78,10 @@ PATCHES=( "${FILESDIR}"/11/wno-error.patch "${FILESDIR}"/11/don-t-force-msse.patch "${FILESDIR}"/11/disable-architecture-verification.patch + "${FILESDIR}"/11/ffmpeg5.patch "${FILESDIR}/11/${PV}-version.patch" ) -S="${WORKDIR}/rt-${MY_PV}" - egradle() { local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}" local gradle="${GRADLE_HOME}/bin/gradle" @@ -128,14 +126,13 @@ pkg_setup() { fi done - if has_version --host-root dev-java/openjdk:${SLOT}; then + if has_version -b dev-java/openjdk:${SLOT}; then export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} export JDK_HOME="${JAVA_HOME}" export ANT_RESPECT_JAVA_HOME=true - else if [[ ${MERGE_TYPE} != "binary" ]]; then - JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) + JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT}) [[ -n ${JDK_HOME} ]] || die "Build VM not found!" JDK_HOME=${JDK_HOME#*/} JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} @@ -183,7 +180,7 @@ src_configure() { # build is very sensetive to doc presense, take extra steps if use doc; then local jdk_doc - if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then + if has_version -b dev-java/openjdk:${SLOT}[doc]; then jdk_doc="${EPREFIX}/usr/share/doc/openjdk-${SLOT}/html/api" fi [[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early" diff --git a/dev-java/openjfx/openjfx-8.1000.ebuild b/dev-java/openjfx/openjfx-8.1000-r1.ebuild index 0864b67b0de4..66e046c74241 100644 --- a/dev-java/openjfx/openjfx-8.1000.ebuild +++ b/dev-java/openjfx/openjfx-8.1000-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 JAVA_PKG_IUSE="doc source" -inherit eapi7-ver flag-o-matic java-pkg-2 java-pkg-simple multiprocessing toolchain-funcs +inherit flag-o-matic java-pkg-2 java-pkg-simple multiprocessing toolchain-funcs EGRADLE_VER="4.10.3" EHG_COMMIT="9f49e3b6147f" @@ -15,14 +15,17 @@ HOMEPAGE="https://openjfx.io" SRC_URI=" https://hg.openjdk.java.net/${PN}/8u-dev/rt/archive/${EHG_COMMIT}.tar.bz2 -> ${P}.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/${P}-backports.tar.bz2 - https://services.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip + https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip " +# eclass overrides it, set back to normal +S="${WORKDIR}/${P}" LICENSE="GPL-2-with-classpath-exception" SLOT="$(ver_cut 1)" KEYWORDS="~amd64 ~ppc64" - IUSE="debug doc media cpu_flags_x86_sse2" +REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" +RESTRICT="test" # needs junit version we don't have, fragile DEPEND=" app-arch/unzip @@ -43,13 +46,6 @@ RDEPEND=" virtual/jre:1.8 " -REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" - -RESTRICT="test" # needs junit version we don't have, fragile - -# eclass overrides it, set back to normal -S="${WORKDIR}/${P}" - # FIXME: majority of flags are honored, needs a bit more patching QA_FLAGS_IGNORED=".*" @@ -191,7 +187,7 @@ src_compile() { src_install() { local dest="/usr/$(get_libdir)/openjdk-${SLOT}" - local ddest="${ED%/}/${dest#/}" + local ddest="${ED}${dest}" dodir "${dest}" pushd build/export/sdk > /dev/null || die cp -pPRv * "${ddest}" || die diff --git a/dev-java/osgi-cmpn/osgi-cmpn-8.0.0.ebuild b/dev-java/osgi-cmpn/osgi-cmpn-8.0.0-r1.ebuild index a82fc2274850..e697776b3d95 100644 --- a/dev-java/osgi-cmpn/osgi-cmpn-8.0.0.ebuild +++ b/dev-java/osgi-cmpn/osgi-cmpn-8.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86" CP_DEPEND=" dev-java/cdi-api:0 - dev-java/glassfish-persistence:0 + dev-java/javax-persistence-api:0 dev-java/jakarta-servlet-api:4 dev-java/javax-inject:0 dev-java/jaxrs-api:0 diff --git a/dev-java/osgi-service-log/Manifest b/dev-java/osgi-service-log/Manifest new file mode 100644 index 000000000000..cd0e597315ba --- /dev/null +++ b/dev-java/osgi-service-log/Manifest @@ -0,0 +1 @@ +DIST org.osgi.service.log-1.3.0-sources.jar 12012 BLAKE2B 005f7e71b2a16bee5b097ffd207667d59a0743bb278669c59e6cf56c183a8dd063190ddff2071c2945c41410fbb86c4534ad7116fb56d4d621bbbbc0659b54ef SHA512 06757188027245690b0655105acd94534844d2e118b9ec4ab7ac0c910fcebb22dcf0fd53e20ad053b4c6e97461bfe4ffddf1b2b11045f2659518afec0baef105 diff --git a/dev-java/rat/metadata.xml b/dev-java/osgi-service-log/metadata.xml index 6ef2d50cf07e..75321cfb5598 100644 --- a/dev-java/rat/metadata.xml +++ b/dev-java/osgi-service-log/metadata.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> </pkgmetadata> diff --git a/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild b/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild new file mode 100644 index 000000000000..ae0a58a72d83 --- /dev/null +++ b/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.osgi:org.osgi.service.log:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="OSGi Companion Code for org.osgi.service.log" +HOMEPAGE="https://www.osgi.org/" +SRC_URI="https://repo1.maven.org/maven2/org/osgi/org.osgi.service.log/${PV}/org.osgi.service.log-${PV}-sources.jar" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64" + +CP_DEPEND="dev-java/osgi-core:0" + +DEPEND="${CP_DEPEND} + dev-java/osgi-annotation:0 + >=virtual/jdk-1.8:*" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +BDEPEND="app-arch/unzip" + +JAVA_AUTOMATIC_MODULE_NAME="org.osgi.service.log" +JAVA_CLASSPATH_EXTRA="osgi-annotation" diff --git a/dev-java/osgi-service-subsystem/Manifest b/dev-java/osgi-service-subsystem/Manifest new file mode 100644 index 000000000000..0b9e27d8c3c1 --- /dev/null +++ b/dev-java/osgi-service-subsystem/Manifest @@ -0,0 +1 @@ +DIST osgi-service-subsystem-1.1.0-sources.jar 24552 BLAKE2B a69fc49b88aa43baa5f56a94a4d8dc55f7ef596a4a39b86f68c652bf02f878c51a25a15cc0bad5f38b23f644137c2082011f8fd3658185ab068ea8bdd551a3d3 SHA512 d0ed0c99525d0860c24b3783902230fc05ccd830a22c16a355d7d6e851919caa64bd23082fcd5f9ebf939b4e1b86e8e52225343401552a89f1e6c1d5892fd162 diff --git a/dev-java/osgi-service-subsystem/metadata.xml b/dev-java/osgi-service-subsystem/metadata.xml new file mode 100644 index 000000000000..75321cfb5598 --- /dev/null +++ b/dev-java/osgi-service-subsystem/metadata.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> +</pkgmetadata> diff --git a/dev-java/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild b/dev-java/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild new file mode 100644 index 000000000000..31791787d08a --- /dev/null +++ b/dev-java/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.osgi:org.osgi.service.subsystem:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="OSGi Companion Code for org.osgi.service.subsystem" +HOMEPAGE="https://www.osgi.org/" +SRC_URI="https://repo1.maven.org/maven2/org/osgi/org.${PN//-/.}/${PV}/org.${PN//-/.}-${PV}-sources.jar -> ${P}-sources.jar" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="app-arch/unzip" + +CP_DEPEND=" + dev-java/osgi-annotation:0 + dev-java/osgi-core:0 +" + +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* +" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:* +" diff --git a/dev-java/owasp-java-encoder/Manifest b/dev-java/owasp-java-encoder/Manifest new file mode 100644 index 000000000000..9b143f96e63b --- /dev/null +++ b/dev-java/owasp-java-encoder/Manifest @@ -0,0 +1 @@ +DIST owasp-java-encoder-1.2.3.tar.gz 134303 BLAKE2B 76b9652863fcdfdce82bd26062fa500bb92b21ba6edff7b3f409a1375e135176f826dca4bb02b4dd48905112ae20a0af0a1f09cb4e21ea41c672a44c52fea209 SHA512 19c13894ce68325553bdbee41190cb113d698c79ec74885604fd9db4f083efe0fcdc4313b7191014bfd972d0ee52f0fbe0621d7bb407745bd1feeb2ac9e49783 diff --git a/dev-java/owasp-java-encoder/files/owasp-java-encoder-1.2.3-BenchmarkTest.patch b/dev-java/owasp-java-encoder/files/owasp-java-encoder-1.2.3-BenchmarkTest.patch new file mode 100644 index 000000000000..de988462ede7 --- /dev/null +++ b/dev-java/owasp-java-encoder/files/owasp-java-encoder-1.2.3-BenchmarkTest.patch @@ -0,0 +1,46 @@ +There were 2 failures: +1) Encode.forHtmlUnquotedAttribute(org.owasp.encoder.BenchmarkTest$1$3) +junit.framework.AssertionFailedError + at junit.framework.Assert.fail(Assert.java:55) + at junit.framework.Assert.assertTrue(Assert.java:22) + at junit.framework.Assert.assertTrue(Assert.java:31) + at junit.framework.TestCase.assertTrue(TestCase.java:200) + at org.owasp.encoder.BenchmarkTest$1$3.runTest(BenchmarkTest.java:115) +2) Encode.forUriComponent(org.owasp.encoder.BenchmarkTest$1$3) +junit.framework.AssertionFailedError + at junit.framework.Assert.fail(Assert.java:55) + at junit.framework.Assert.assertTrue(Assert.java:22) + at junit.framework.Assert.assertTrue(Assert.java:31) + at junit.framework.TestCase.assertTrue(TestCase.java:200) + at org.owasp.encoder.BenchmarkTest$1$3.runTest(BenchmarkTest.java:115) + +FAILURES!!! +Tests run: 962, Failures: 2 +--- a/src/test/java/org/owasp/encoder/BenchmarkTest.java ++++ b/src/test/java/org/owasp/encoder/BenchmarkTest.java +@@ -209,12 +209,6 @@ public class BenchmarkTest extends TestCase { + return Encode.forXml(input); + } + }, +- new Bench("Encode.forHtmlUnquotedAttribute") { +- @Override +- public String encode(String input) { +- return Encode.forHtmlUnquotedAttribute(input); +- } +- }, + new Bench("Encode.forJavaScript") { + @Override + public String encode(String input) { +@@ -227,12 +221,6 @@ public class BenchmarkTest extends TestCase { + return Encode.forCssString(input); + } + }, +- new Bench("Encode.forUriComponent") { +- @Override +- public String encode(String input) { +- return Encode.forUriComponent(input); +- } +- }, + new Bench("Encode.forCDATA") { + @Override + public String encode(String input) { diff --git a/dev-java/owasp-java-encoder/metadata.xml b/dev-java/owasp-java-encoder/metadata.xml new file mode 100644 index 000000000000..caf58d352146 --- /dev/null +++ b/dev-java/owasp-java-encoder/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">OWASP/owasp-java-encoder</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/owasp-java-encoder/owasp-java-encoder-1.2.3.ebuild b/dev-java/owasp-java-encoder/owasp-java-encoder-1.2.3.ebuild new file mode 100644 index 000000000000..482d2d258e37 --- /dev/null +++ b/dev-java/owasp-java-encoder/owasp-java-encoder-1.2.3.ebuild @@ -0,0 +1,34 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.owasp.encoder:encoder:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="OWASP Java Encoder" +HOMEPAGE="https://owasp.org/www-project-java-encoder/" +SRC_URI="https://github.com/OWASP/owasp-java-encoder/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}/core" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64" + +RDEPEND=">=virtual/jre-1.8:*" +DEPEND=">=virtual/jdk-1.8:*" + +PATCHES=( "${FILESDIR}/owasp-java-encoder-1.2.3-BenchmarkTest.patch" ) + +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} diff --git a/dev-java/parboiled/Manifest b/dev-java/parboiled/Manifest new file mode 100644 index 000000000000..ef31eb68bb3d --- /dev/null +++ b/dev-java/parboiled/Manifest @@ -0,0 +1 @@ +DIST parboiled-1.4.1.tar.gz 230536 BLAKE2B 99e8e99d9b1b5de7420491967213be94c5895ba6abfd797f4f681834b3773784fc94c5a7d000574cd65dd0dff46857cc19c9430691899f82edf324c764c193dd SHA512 3c502013168f76178398861e2b23089a5c3df0ec36f44830300dc935844026df9f6d5dd7c40babcd4c6a58bff84c0f2134930a19ef49bcd61efbdab3c093ef9c diff --git a/dev-java/parboiled/metadata.xml b/dev-java/parboiled/metadata.xml new file mode 100644 index 000000000000..c48f3cb552ec --- /dev/null +++ b/dev-java/parboiled/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <doc>https://github.com/sirthias/parboiled/wiki/</doc> + <remote-id type="github">sirthias/parboiled</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/parboiled/parboiled-1.4.1.ebuild b/dev-java/parboiled/parboiled-1.4.1.ebuild new file mode 100644 index 000000000000..cbb0bf538479 --- /dev/null +++ b/dev-java/parboiled/parboiled-1.4.1.ebuild @@ -0,0 +1,68 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_PROVIDES=" + org.parboiled:parboiled-core:${PV} + org.parboiled:parboiled-java:${PV} +" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful" +HOMEPAGE="https://github.com/sirthias/parboiled" +SRC_URI="https://github.com/sirthias/parboiled/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +CP_DEPEND="dev-java/asm:9" +DEPEND="${CP_DEPEND} + >=virtual/jdk-11:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +src_compile() { + einfo "Compiling parboiled-core" + JAVA_JAR_FILENAME="parboiled-core.jar" + JAVA_SRC_DIR="parboiled-core/src/main/java" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":parboiled-core.jar" + rm -r target || die + + einfo "Compiling parboiled-java" + JAVA_JAR_FILENAME="parboiled-java.jar" + JAVA_SRC_DIR="parboiled-java/src/main/java" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":parboiled-java.jar" + rm -r target || die + + if use doc; then + JAVA_SRC_DIR=( + "parboiled-core/src/main/java" + "parboiled-java/src/main/java" + ) + JAVA_JAR_FILENAME="ignoreme.jar" + java-pkg-simple_src_compile + fi +} + +src_install() { + default + + java-pkg_dojar "parboiled-core.jar" + java-pkg_dojar "parboiled-java.jar" + + if use doc; then + java-pkg_dojavadoc target/api + fi + + if use source; then + java-pkg_dosrc "parboiled-core/src/main/java/*" + java-pkg_dosrc "parboiled-java/src/main/java/*" + fi +} diff --git a/dev-java/plexus-classworlds/Manifest b/dev-java/plexus-classworlds/Manifest index 2136c99da805..444a9642dc6e 100644 --- a/dev-java/plexus-classworlds/Manifest +++ b/dev-java/plexus-classworlds/Manifest @@ -1 +1 @@ -DIST plexus-classworlds-2.6.0.tar.gz 57221 BLAKE2B 7cef274981101eab85247c1a19420ebbb626b671312579ea665fc3d82e9eb8caba55955ccbc38ccd54e19c55ec1683b6a99a2cd96b08bf7ace57355a8e958d1f SHA512 d6ef17a4651da99975bcfc04f89ba128d891efc9047dc9b8afa52bd092d07268d44a7424a3a3700209bb56452f035ac1071c58ae6dc961b7e991efee1c0e117e +DIST plexus-classworlds-2.7.0.tar.gz 60221 BLAKE2B 8adbad24c057982dd3da6ce221175cf0b3e6585316de02434214d7d470b24220edaa94f4191cb2febfc4e3006a78cd3be5cc0f793438a5009ee20ef8c602768b SHA512 625d83c1a08a15e0d85984518eaec36bf001e562c49df4d5028e9fec1a9fdc69faa88066441da3cedd803fc20932fcaef9f2e924a485e0a0dcde60a600b32c7f diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild index d5eca2023894..5d46ae9f6f12 100644 --- a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild +++ b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.codehaus.plexus:plexus-classworlds:2.6.0" +MAVEN_ID="org.codehaus.plexus:plexus-classworlds:${PV}" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple @@ -12,48 +12,36 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="The class loader framework of the Plexus project" HOMEPAGE="https://codehaus-plexus.github.io/plexus-classworlds/" SRC_URI="https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-${PV}.tar.gz" +S="${WORKDIR}/${PN}-${P}" LICENSE="Apache-2.0" - SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=" >=virtual/jdk-1.8:* test? ( - dev-java/commons-logging + dev-java/ant-core:0 + dev-java/commons-logging:0 dev-java/xml-commons-external:1.4 ) " RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}/${PN}-${P}" - JAVA_MAIN_CLASS="org.codehaus.plexus.classworlds.launcher.Launcher" JAVA_SRC_DIR="src/main/java/" +# Invalid test class, No runnable methods +JAVA_TEST_EXCLUDES="org.codehaus.plexus.classworlds.TestUtil" JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS="src/test/test-data" -JAVA_TEST_EXCLUDES="org.codehaus.plexus.classworlds.TestUtil" - -src_prepare() { - default - # Ignore one test case testing the presence of ant-core - sed \ - -e '/testConfigure_Valid/i @Ignore' \ - -e '/import org.junit.Test/a import org.junit.Ignore;' \ - -i src/test/java/org/codehaus/plexus/classworlds/launcher/ConfiguratorTest.java || die -} +JAVA_TEST_SRC_DIR="src/test/java" src_test(){ + # java.io.FileNotFoundException: target/test-lib/xml-apis-1.3.02.jar mkdir -p target/test-lib || die - # https://github.com/codehaus-plexus/plexus-classworlds/blob/plexus-classworlds-2.6.0/pom.xml#L159-L161 - ln -s "$(java-pkg_getjars --build-only xml-commons-external-1.4)" \ - target/test-lib/xml-apis-1.3.02.jar || die - # symlinking works only if java-pkg_getjars finds only one file - # but commons-logging has multiple jar files. - ln -s "${SYSROOT}"/usr/share/commons-logging/lib/commons-logging.jar \ - target/test-lib/commons-logging-1.0.3.jar || die + java-pkg_jar-from --into target/test-lib xml-commons-external-1.4 xml-commons-external.jar xml-apis-1.3.02.jar + java-pkg_jar-from --into target/test-lib ant-core ant.jar ant-1.9.0.jar + java-pkg_jar-from --into target/test-lib commons-logging commons-logging.jar commons-logging-1.0.3.jar java-pkg-simple_src_test } diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest index 1af6191837ab..60307769f3dc 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -1,2 +1,3 @@ -DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f82c42c70054d47d1899e6bb79f3fdde2666cad5b8eff6e1bc539c3b0cdf9f2b125ce7e5d3a459a69e84d67ab535e SHA512 2dc8f552388438268d8b9f7a9e84c6abf1736be3d5031438c789c317410c9f4b5cedd25bf7da6d67b3ba32ca890869f9ddaab2284d6ac0e734a5b135ffbb1346 +DIST protobuf-23.0.tar.gz 5039837 BLAKE2B 63e02590b03fd9206cdfc4a26edeb2fa55dac902f5365c33c9e9340a722f552e4a5c82d1a0b25b84fcb675d5d06b768fd92cf472743d2361295129ae9faa02f3 SHA512 46c263fab189fdc310c7310d1a3d9e76472e5d96f16228bc4b946d4211afc64188d563ec70250c11a3dd05d18158b72ccf173567bd59aa45310eff62cd5f194d +DIST protobuf-24.2.tar.gz 5179130 BLAKE2B a1e3da4e95072391fa4abf671a9eb77806f1b3864219e1e0c024156558e2ecd9e3cabee367efaf15626a199ae413dced3f29f601820611d37dd733c92ffc06c0 SHA512 fee9f5fc0e615e49347320e37b560112f43d13c63050701e25b3348e9d4aa59e80c7d810f7da12764b1b9eeee8efa35be7743c5ebbb0a12c78f5924f1544c356 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 diff --git a/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch b/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch new file mode 100644 index 000000000000..c838bf3cede2 --- /dev/null +++ b/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch @@ -0,0 +1,35 @@ +java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:68: error: cannot find symbol +import protobuf_unittest.UnittestRetention; + ^ + symbol: class UnittestRetention + location: package protobuf_unittest +java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:402: error: cannot find symbol + FileOptions options = UnittestRetention.getDescriptor().getOptions(); + ^ + symbol: variable UnittestRetention + location: class DescriptorsTest +java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:403: error: cannot find symbol + assertThat(options.hasExtension(UnittestRetention.plainOption)).isTrue(); + ^ + symbol: variable UnittestRetention + location: class DescriptorsTest +java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:404: error: cannot find symbol + assertThat(options.hasExtension(UnittestRetention.runtimeRetentionOption)).isTrue(); + ^ + symbol: variable UnittestRetention + location: class DescriptorsTest +java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:405: error: cannot find symbol + assertThat(options.hasExtension(UnittestRetention.sourceRetentionOption)).isFalse(); + ^ + symbol: variable UnittestRetention + location: class DescriptorsTest +--- a/java/core/generate-test-sources-build.xml ++++ b/java/core/generate-test-sources-build.xml +@@ -19,6 +19,7 @@ + <arg value="${protobuf.source.dir}/google/protobuf/unittest_optimize_for.proto"/> + <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3.proto"/> + <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3_optional.proto"/> ++ <arg value="${protobuf.source.dir}/google/protobuf/unittest_retention.proto"/> + <arg value="${protobuf.source.dir}/google/protobuf/unittest_well_known_types.proto"/> + <arg value="${test.proto.dir}/com/google/protobuf/any_test.proto"/> + <arg value="${test.proto.dir}/com/google/protobuf/cached_field_size_test.proto"/> diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml index 5fdb33c1c7c3..20b09444fc60 100644 --- a/dev-java/protobuf-java/metadata.xml +++ b/dev-java/protobuf-java/metadata.xml @@ -12,10 +12,12 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> - <slots> - <subslots>Soname version number of Protobuf</subslots> - </slots> <upstream> + <bugs-to>https://github.com/protocolbuffers/protobuf/issues</bugs-to> + <doc>https://protobuf.dev/getting-started/javatutorial/</doc> <remote-id type="github">protocolbuffers/protobuf</remote-id> </upstream> + <use> + <flag name="system-protoc">Use protoc provided by dev-libs/protobuf</flag> + </use> </pkgmetadata> diff --git a/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild deleted file mode 100644 index d9140d989305..000000000000 --- a/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 2008-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.google.protobuf:protobuf-java:3.21.12" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Google's Protocol Buffers - Java bindings" -HOMEPAGE="https://developers.google.com/protocol-buffers/" -# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. -# And we build artifact 3.21.11 from the 21.11 tarball in order to allow sharing the tarball with -# dev-libs/protobuf. -SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz - test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos" - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/guava:0 - dev-java/mockito:4 - ) -" -RDEPEND=">=virtual/jre-1.8:*" - -# Once =protobuf-${PV#3.} hits the tree use it -# BDEPEND="~dev-libs/protobuf-${PV#3.}:0" -BDEPEND="dev-libs/protobuf:0" - -S="${WORKDIR}/protobuf-${PV#3.}/java" - -JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" -JAVA_JAR_FILENAME="protobuf.jar" -JAVA_RESOURCE_DIRS="core/src/main/resources" -JAVA_SRC_DIR="core/src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" -JAVA_TEST_RESOURCE_DIRS="core/src/test/proto" -JAVA_TEST_SRC_DIR="core/src/test/java" - -src_prepare() { - default - - mkdir "${JAVA_RESOURCE_DIRS}" || die - # https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/pom.xml#L43-L62 - echo $(sed \ - -n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:-C ../../../../../src \1:p' \ - "${S}/core/pom.xml") > "${T}/core_proto" || die "echo to core_proto failed" - # Copy them from ../src/google/protobuf to JAVA_RESOURCE_DIRS - pushd "${JAVA_RESOURCE_DIRS}" || die - jar cv "@${T}/core_proto" | jar xv - assert "Copying protos failed" - popd || die - - # https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/generate-sources-build.xml - einfo "Replace variables in generate-sources-build.xml" - sed \ - -e 's:${generated.sources.dir}:core/src/main/java:' \ - -e 's:${protobuf.source.dir}:../src:' \ - -e 's:^.*value="::' -e 's:\"/>::' \ - -e '/project\|echo\|mkdir\|exec/d' \ - -i core/generate-sources-build.xml || die "sed to sources failed" - - einfo "Run protoc to generate sources" - protoc @core/generate-sources-build.xml || die "protoc sources failed" -} - -src_test() { - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar" - - # https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/generate-test-sources-build.xml - einfo "Replace variables in generate-test-sources-build.xml" - sed \ - -e 's:${generated.testsources.dir}:core/src/test/java:' \ - -e 's:${protobuf.source.dir}:../src:' \ - -e 's:${test.proto.dir}:core/src/test/proto:' \ - -e 's:^.*value="::' -e 's:\"/>::' \ - -e '/project\|mkdir\|exec\|Also generate/d' \ - -i core/generate-test-sources-build.xml || die "sed to test sources failed" - - # Remove second exec from the file. Makes trouble here. We run it separately. - sed '50,54d' -i core/generate-test-sources-build.xml || die "cannot remove lines" - - einfo "Running protoc to generate test-sources" - protoc @core/generate-test-sources-build.xml || die "protoc I failed" - - einfo "Running protoc on previously removed test-sources" - protoc --java_out=lite:core/src/test/java \ - --proto_path=../src \ - --proto_path=core/src/test/proto \ - core/src/test/proto/com/google/protobuf/nested_extension_lite.proto \ - core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto \ - || die "protoc II failed" - - # Ignore two failing test cases from CodedOutputStreamTest.java - sed \ - -e '/import org.junit.Test/a import org.junit.Ignore;' \ - -e '/testWriteWholeMessage/i @Ignore' \ - -e '/testWriteWholePackedFieldsMessage/i @Ignore' \ - -i core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java || die - - einfo "Running tests" - # Exclude MapInitializationOrderTest and CachedFieldSizeTest - pushd core/src/test/java || die - local JAVA_TEST_RUN_ONLY=$(find * \ - -wholename "**/*Test.java" \ - ! -wholename "**/Abstract*Test.java" \ - ! -name "MapInitializationOrderTest.java" \ - ! -name "CachedFieldSizeTest.java" \ - ) - popd - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - java-pkg-simple_src_test -} diff --git a/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild new file mode 100644 index 000000000000..abeb3464f5e4 --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild @@ -0,0 +1,165 @@ +# Copyright 2008-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.protobuf:protobuf-java:3.23.0" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple cmake + +DESCRIPTION="Core Protocol Buffers library" +HOMEPAGE="https://protobuf.dev" +# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. +# And we build artifact 3.23.0 from the 23.0 tarball in order to allow sharing the tarball with +# dev-libs/protobuf. +SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" +S="${WORKDIR}/protobuf-${PV#3.}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="system-protoc" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/guava:0 + dev-java/mockito:4 + ) +" +RDEPEND=">=virtual/jre-1.8:*" + +BDEPEND=" + system-protoc? ( ~dev-libs/protobuf-${PV#3.}:0 ) + !system-protoc? ( >=dev-cpp/abseil-cpp-20230125.2 ) +" + +PATCHES=( + "${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch" +) + +JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" +JAVA_JAR_FILENAME="protobuf.jar" +JAVA_RESOURCE_DIRS="java/core/src/main/resources" +JAVA_SRC_DIR="java/core/src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" +JAVA_TEST_SRC_DIR="java/core/src/test/java" + +run-protoc() { + if use system-protoc; then + protoc $1 + else + "${BUILD_DIR}"/protoc $1 + fi +} + +src_prepare() { + # If the corrsponding version of system-protoc is not available we build protoc locally + if use system-protoc; then + : + else + cmake_src_prepare + fi + java-pkg-2_src_prepare + + mkdir "${JAVA_RESOURCE_DIRS}" || die + # https://github.com/protocolbuffers/protobuf/blob/v23.0/java/core/pom.xml#L43-L62 + PROTOS=( $(sed \ + -n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \ + "${S}/java/core/pom.xml") ) || die + pushd src > /dev/null || die + cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die + popd > /dev/null || die + + # https://github.com/protocolbuffers/protobuf/blob/v23.0/java/core/generate-sources-build.xml + einfo "Replace variables in generate-sources-build.xml" + sed \ + -e 's:${generated.sources.dir}:java/core/src/main/java:' \ + -e 's:${protobuf.source.dir}:src:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|echo\|mkdir\|exec/d' \ + -i java/core/generate-sources-build.xml || die "sed to sources failed" + + # https://github.com/protocolbuffers/protobuf/blob/v23.0/java/core/generate-test-sources-build.xml + einfo "Replace variables in generate-test-sources-build.xml" + sed \ + -e 's:${generated.testsources.dir}:java/core/src/test/java:' \ + -e 's:${protobuf.source.dir}:src:' \ + -e 's:${test.proto.dir}:java/core/src/test/proto:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|mkdir\|exec\|Also generate/d' \ + -i java/core/generate-test-sources-build.xml || die "sed to test sources failed" + + # Split the file in two parts, one for each run-protoc call + awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \ + java/core/generate-test-sources-build.xml || die +} + +src_configure() { + local mycmakeargs=( + -Dprotobuf_BUILD_TESTS=OFF + -Dprotobuf_ABSL_PROVIDER=package + ) + if use system-protoc; then + : + else + cmake_src_configure + fi +} + +src_compile() { + if use system-protoc; then + : + else + cmake_src_compile + fi + + einfo "Run protoc to generate sources" + run-protoc \ + @java/core/generate-sources-build.xml \ + || die "protoc sources failed" + + java-pkg-simple_src_compile +} + +src_test() { + # https://github.com/protocolbuffers/protobuf/blob/v23.0/java/core/pom.xml#L63-L71 + jar cvf testdata.jar \ + -C src google/protobuf/testdata/golden_message_oneof_implemented \ + -C src google/protobuf/testdata/golden_packed_fields_message || die + + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" + + einfo "Running protoc on first part of generate-test-sources-build.xml" + run-protoc @test-sources-build-1 \ + || die "run-protoc test-sources-build-1 failed" + + einfo "Running protoc on second part of generate-test-sources-build.xml" + run-protoc @test-sources-build-2 \ + || die "run-protoc test-sources-build-2 failed" + + einfo "Running tests" + # Invalid test class 'map_test.MapInitializationOrderTest': + # 1. Test class should have exactly one public constructor + # Invalid test class 'protobuf_unittest.CachedFieldSizeTest': + # 1. Test class should have exactly one public constructor + pushd "${JAVA_TEST_SRC_DIR}" || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -path "**/*Test.java" \ + ! -path "**/Abstract*Test.java" \ + ! -name "MapInitializationOrderTest.java" \ + ! -path '*protobuf_unittest/CachedFieldSizeTest.java' + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install +} diff --git a/dev-java/protobuf-java/protobuf-java-3.24.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.24.2.ebuild new file mode 100644 index 000000000000..cbedc3f3e508 --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-3.24.2.ebuild @@ -0,0 +1,167 @@ +# Copyright 2008-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.protobuf:protobuf-java:3.24.2" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple cmake + +DESCRIPTION="Core Protocol Buffers library" +HOMEPAGE="https://protobuf.dev" +# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. +# And we build artifact 3.24.0 from the 24.0 tarball in order to allow sharing the tarball with +# dev-libs/protobuf. +MY_PV3="${PV#3.}" +MY_PV="${MY_PV3/_rc/-rc}" +SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" +S="${WORKDIR}/protobuf-${MY_PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="system-protoc" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/guava:0 + dev-java/mockito:4 + ) +" +RDEPEND=">=virtual/jre-1.8:*" + +BDEPEND=" + system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 ) + !system-protoc? ( >=dev-cpp/abseil-cpp-20230125.3 ) +" + +PATCHES=( + "${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch" +) + +JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" +JAVA_JAR_FILENAME="protobuf.jar" +JAVA_RESOURCE_DIRS="java/core/src/main/resources" +JAVA_SRC_DIR="java/core/src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" +JAVA_TEST_SRC_DIR="java/core/src/test/java" + +run-protoc() { + if use system-protoc; then + protoc $1 + else + "${BUILD_DIR}"/protoc $1 + fi +} + +src_prepare() { + # If the corrsponding version of system-protoc is not available we build protoc locally + if use system-protoc; then + default # apply patches + else + cmake_src_prepare + fi + java-pkg-2_src_prepare + + mkdir "${JAVA_RESOURCE_DIRS}" || die + # https://github.com/protocolbuffers/protobuf/blob/v24.2/java/core/pom.xml#L43-L62 + PROTOS=( $(sed \ + -n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \ + "${S}/java/core/pom.xml") ) || die + pushd src > /dev/null || die + cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die + popd > /dev/null || die + + # https://github.com/protocolbuffers/protobuf/blob/v24.2/java/core/generate-sources-build.xml + einfo "Replace variables in generate-sources-build.xml" + sed \ + -e 's:${generated.sources.dir}:java/core/src/main/java:' \ + -e 's:${protobuf.source.dir}:src:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|echo\|mkdir\|exec/d' \ + -i java/core/generate-sources-build.xml || die "sed to sources failed" + + # https://github.com/protocolbuffers/protobuf/blob/v24.2/java/core/generate-test-sources-build.xml + einfo "Replace variables in generate-test-sources-build.xml" + sed \ + -e 's:${generated.testsources.dir}:java/core/src/test/java:' \ + -e 's:${protobuf.source.dir}:src:' \ + -e 's:${test.proto.dir}:java/core/src/test/proto:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|mkdir\|exec\|Also generate/d' \ + -i java/core/generate-test-sources-build.xml || die "sed to test sources failed" + + # Split the file in two parts, one for each run-protoc call + awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \ + java/core/generate-test-sources-build.xml || die +} + +src_configure() { + local mycmakeargs=( + -Dprotobuf_BUILD_TESTS=OFF + -Dprotobuf_ABSL_PROVIDER=package + ) + if use system-protoc; then + : + else + cmake_src_configure + fi +} + +src_compile() { + if use system-protoc; then + : + else + cmake_src_compile + fi + + einfo "Run protoc to generate sources" + run-protoc \ + @java/core/generate-sources-build.xml \ + || die "protoc sources failed" + + java-pkg-simple_src_compile +} + +src_test() { + # https://github.com/protocolbuffers/protobuf/blob/v24.2/java/core/pom.xml#L63-L71 + jar cvf testdata.jar \ + -C src google/protobuf/testdata/golden_message_oneof_implemented \ + -C src google/protobuf/testdata/golden_packed_fields_message || die + + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" + + einfo "Running protoc on first part of generate-test-sources-build.xml" + run-protoc @test-sources-build-1 \ + || die "run-protoc test-sources-build-1 failed" + + einfo "Running protoc on second part of generate-test-sources-build.xml" + run-protoc @test-sources-build-2 \ + || die "run-protoc test-sources-build-2 failed" + + einfo "Running tests" + # Invalid test class 'map_test.MapInitializationOrderTest': + # 1. Test class should have exactly one public constructor + # Invalid test class 'protobuf_unittest.CachedFieldSizeTest': + # 1. Test class should have exactly one public constructor + pushd "${JAVA_TEST_SRC_DIR}" || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -path "**/*Test.java" \ + ! -path "**/Abstract*Test.java" \ + ! -name "MapInitializationOrderTest.java" \ + ! -path '*protobuf_unittest/CachedFieldSizeTest.java' + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install +} diff --git a/dev-java/rat/rat-0.13.ebuild b/dev-java/rat/rat-0.13.ebuild deleted file mode 100644 index 2d6facdeddae..000000000000 --- a/dev-java/rat/rat-0.13.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit java-pkg-2 - -DESCRIPTION="Apache Rat is a release audit tool, focused on licenses" -HOMEPAGE="https://creadur.apache.org/rat/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - ~dev-java/apache-rat-core-${PV}:0 - ~dev-java/apache-rat-tasks-${PV}:0 - >=virtual/jre-1.8:* -" - -S="${WORKDIR}" - -src_compile() { :; } - -src_install() { - default - java-pkg_register-dependency apache-rat-core,apache-rat-tasks - java-pkg_dolauncher "apache-${PN}" --jar $(java-pkg_getjar apache-rat-core apache-rat-core.jar) --main org.apache.rat.Report -} diff --git a/dev-java/saxon/saxon-6.5.5-r3.ebuild b/dev-java/saxon/saxon-6.5.5-r3.ebuild index f104b7ae35ad..3562e1307373 100644 --- a/dev-java/saxon/saxon-6.5.5-r3.ebuild +++ b/dev-java/saxon/saxon-6.5.5-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc examples source" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Set of tools for processing XML documents" -HOMEPAGE="http://saxon.sourceforge.net/" +HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/" SRC_URI="mirror://sourceforge/project/saxon/saxon6/${PV}/saxon${PV//./-}.zip" LICENSE="MPL-1.1" diff --git a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild index f2a12503a449..54b7feedaeb0 100644 --- a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild +++ b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 DESCRIPTION="A XSLT and XQuery Processor" -HOMEPAGE="http://saxon.sourceforge.net/" +HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/" SRC_URI="mirror://sourceforge/project/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV//./-}source.zip" LICENSE="MPL-1.0" diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest index 04896a8a25dc..eca9b100ba3d 100644 --- a/dev-java/scala-cli-bin/Manifest +++ b/dev-java/scala-cli-bin/Manifest @@ -1,12 +1,9 @@ -DIST scala-cli-amd64-0.2.1.gz 32642273 BLAKE2B f30dde2a5408032942e5676b0274473fe0db6ccab9e74830c33fa37a8283438cc848fda15d79f076be1eeb45f0463769acc4f82b2e0fc4a1c0e141c9df40d502 SHA512 773206656b35dea9312f8c8a2db6cd98e1a7c0d03840f661185f276b69dcc1dafe699e1db3cdfb9fd2891fec56cc6ad1cf03e7e53761afd9a1f3596fae31e05c -DIST scala-cli-amd64-1.0.0-RC1.gz 32431480 BLAKE2B 3ac9aa93a109493288397ca595c7364a79530a601baa2fdd11f6f0e618f9c1fb07068eb05a8242a5fcc00efc213b8225a60b8e2e75ef5dec782280665cad0cc8 SHA512 559fb6caa346e370b93778da5266b8d009cd4335e3a7baeee090c14110dcdf87fb45bee7c00eab50f3df875d88378dcfc0f6ef4a61cf8522918f9d49337e0767 -DIST scala-cli-amd64-1.0.0-RC2.gz 32605320 BLAKE2B bff2336256336676df72dbce8353dbc28028d55345ab5c22dc8129d020beb2f1f8e3ef4ea0cf60843ff5868c8bd701a839a235ea5211612ba21d160e8e99ad50 SHA512 c576443cf0ecf8ff048f3ade35fec0a6c6de417d0c86030e46fe0decc20d3c1a0dbd1e8377b39866c4eed3d4b4cb762d6d8de174831a011a2553d8d204a6f80c -DIST scala-cli-amd64-1.0.0.gz 33061895 BLAKE2B 9261617e7f9ed15ce8294eedcec2c81ad60d72b83663fb97559fa68b3578706637316e0e58966d690e64147743dcdf81e3e1f41d6bb9ebf55414e316370d7ec1 SHA512 6a37fae85faa2965ea816f2a72e89300e66bdd3ef741ba5bff575a8127255866822575b3708d2bd63d89f4a812d368bc7796494c90def8c2498f956e4b229264 -DIST scala-cli-arm64-0.2.1.gz 32498301 BLAKE2B 6ffd39f37bbcd33a59855e7226435dfea6ae99bc5cf30d182cd6920636e6b2e9ff627bd028b90f7cfbff4ed1829545697fe839290990d2938a24c64784f7e549 SHA512 b6609cb52bdfd4dffe4060343c652b477b5730c1f3f5f7267a39577c13e894b23982bfe80ae065472103bcbd1573675434e91128d31cbf3c83242f9aa60243b1 -DIST scala-cli-arm64-1.0.0-RC1.gz 32263782 BLAKE2B 4131187460fb9f4236d35ebe2e63913812eba85eb8a862f2f02b681a6914b1a21f1f426e6411cff14f6309d0a7e91e2ff7f61b0336245d178f38747d953473dc SHA512 c43ecaf1638c4aa092d2a823a931ceea77cebd940907a8c781caa7c526411a5c2c50a7468ef6efab816d9d26d6769c0df421abc60f099992b489478e804ec52e -DIST scala-cli-arm64-1.0.0-RC2.gz 32420806 BLAKE2B 689edebc42c6483d2167b7231018dadb07cd93838451aecea5405884a7e07625b373c3aafdb4618d1398038363f812720e7a88b117f6bc70c48273fe1446c5d9 SHA512 d4cff7f9e85f0b0f5205d7a3ceb383fd44e348eb6cd593c7a5ffd44d073653ecc63d607ff23010ffb8ddc51c4977074d6ad0aad6282d9c564b9f478f3ba61479 -DIST scala-cli-arm64-1.0.0.gz 32902399 BLAKE2B deff1fad9204572aafa8da88cb368d85e0ec39a51d71b00eed0a1933ea713cbeafd1cff3ec882eb32283770f1eb741e32969fa1e75aa46a6b6aab542a5d23447 SHA512 e6020c305d8ed06f8531994483079ee095f0d2bd9a0095ec417929620ee3e6a45507214a6f68756b70518af20d53e64b531793bb940872921302ad4f6566972c -DIST scala-cli-non-native-0.2.1 9468051 BLAKE2B 9a9b5694261b769fafa3f3747f5e83869324e341f264dbfa463382e217acd5a2c994fb6e67e9e36175d97520938a40add424f5e9a77c62056eec6a828d4ea61a SHA512 547e9786527b7e7d34f4f912a6b9ae0c8f15eca3aa90f11f704283c63e5105363464f1e81f6dbb363fa71fb17e3e48b4db86e70f3b37b5059c40c02cd47382f5 -DIST scala-cli-non-native-1.0.0 9540019 BLAKE2B fd7c920216fbba76be116cac2a2439ee0f983dbb1811e60a7095611b75bd1af86e8597f74dab4e994f3dd73694e2c93b910f9162e0fe8d4c8ada3f0012fb8b35 SHA512 6e09be3adf75f957a787b5cb5031824892d0606742ae12988b008d0fab1c743f2dff7169a547d77795af78679bde051a8f457284f339990bb343807e47005499 -DIST scala-cli-non-native-1.0.0-RC1 9560878 BLAKE2B a0e8a86f61c5d9baa9dd36fdd2abd974063bab40644cfafd6f93f917c10f3cae2b665a19058641f61f75f11b614415db5d624d1397c061fed299b32059919faf SHA512 9b8c2b0868ed38601c5f992fae425d486ca5ac026fa664a404ba0ef4813ea9351f196a694e111fe2bbf2ccaa17257982feee91a85444d778f6a3d20f6347a438 -DIST scala-cli-non-native-1.0.0-RC2 9405006 BLAKE2B e44e973a446601aa0f81a3df52769a60cd0c159f4bc903896e6f3352ef098a49ffa00a836fcd16a42d801b04a8bf9b2392144997bf4bd787a8bd913702a4a6d0 SHA512 11e7ab68b4321cb7feb4e51eb3fda4f4066a392d1aeddcfe32c942033f5d807fcd80793f4f0d4573684e3028cd5ea65ca790ca72b19e23834a8f8da2941e206b +DIST scala-cli-amd64-1.0.2.gz 33215510 BLAKE2B 288475cbd346260423188b4db038dd8cce2f5885bf0346e8a74b08cd02a2c44204fec37aaf6207ff6447beb4740df725bae6a0a129682ebedc1028ae5f0ec316 SHA512 ac18b43bd37717b2aab6b1056b727aba40f57eed33d1fc5f1903c3729f0344ed30ed595f2a60bff2c65ee3a6d4439e8ee4bcf95fc38baf059d4a66de9696cded +DIST scala-cli-amd64-1.0.4.gz 33291617 BLAKE2B bd97626e7e95fb6b2a82fd424673078b89f5f4270087c667193e4de1ceff614076e73b728ba1f0334d5f9d7aa6f52c660487d52bf8fb49a786f7fe4ce18a0428 SHA512 447acafd47041cd173a06b5d113cd30adee76a2c161b2efc98b8ece60082d5b98189fd9b3da1f048061d306343cacb9b67566daa78ce8fe54dc82dd90a1e34bc +DIST scala-cli-amd64-1.1.0.gz 33673708 BLAKE2B 332f5a974949af49914de8fdb3129b0937fbce842616d6fefe16f7aff89baf6be1ba536d0ee6ff9bc1dd2b5ebfa51943bd0c6279ef83b95bd25a337530fa1295 SHA512 ba7ebb321a27e95f786027257c3f50dac1d12e0cc33abde24dc7c5dffb2f57a11c3ea67d92ed487968c49ff9ec3eaf5d1d62065beda5b6fa373d09b9126f4529 +DIST scala-cli-arm64-1.0.2.gz 33058672 BLAKE2B a82b18eec6235100cbbd7ff1503283e5ef29ba0798f67b44f69b329aa0f1f525cc910a7b4a923f98c8b113d06bac6e1c5ba963d62204462635ef4eed3d0b7f85 SHA512 b1dc9de26d30336f283202aa23ba1c76baddcea21d4c8c4c0e5114de979c62ba3e2b483302d4f396c84e802497127a36d589dae2826f76e1d02760314f6f0765 +DIST scala-cli-arm64-1.0.4.gz 33185346 BLAKE2B 2b0131a56ed3f67fb5d5f25db6c511dc7d9e9128089e6826fa7d859b1457f03a99e290cc63f185820ea849a857f40d667d5db7a378dabcf545cdcdefded6a577 SHA512 3ff1c025a1035aa6a8550de17e85bc5c483007d5f07f03e0d792d6dc9ed1b18eb26909b3c7195fde12056a3b84ffa69dc53c01ec21b34187c1d7188a0a023aaa +DIST scala-cli-arm64-1.1.0.gz 33575885 BLAKE2B ebccbe86044b4708a356060a16f06bb94df01d261ab7dabe8eba8e644c121864cdee99debf95468d936cbff670413ec47e1ef903a9071b267a61c5fe46738c1a SHA512 6a85529be06a8d43d729c5a795bb0dcdb2680bd7ef3de471fee908e91249401262e8322019c640d4eb45d0a15ed0073ff51b24d61846228f46c36bfb48731408 +DIST scala-cli-non-native-1.0.2 9633113 BLAKE2B d63fe324533393158ac945c3070843787c844584c3f8bdc141f6106fa22adf244c2ca5e010801c549b0a56ecf500495c754ed9e6186f74359b373c4d776645ff SHA512 c6e6262af236a315960a3d16dfebc7adaf88f830d43e68f89220f2cf250d57d083bd2b9231fd13a0b3adc723ed17200592b55a2a17ccd582b9cc3ceebf52a29b +DIST scala-cli-non-native-1.0.4 7553232 BLAKE2B 9299b20dddec80d12e738af4b283e816de5bae23262510146cd33a9b175f2a343f52932fbd3254974bd4219d2903f32772409f234423d3a027b6b0f02268e584 SHA512 4e5281ef7f8a886ad79746477d852f485ccad317568a64ee513e691dcd9a9121c2aed51f6170b959f0226fb81efe9aa1f8ecf1d94a84a0b387c349adfb756762 +DIST scala-cli-non-native-1.1.0 7728727 BLAKE2B 05deb93b91029721a21bac729aa9b370e05909e67bbade921e00d09c3a37e851e519188bff73dc614c3f5768834ae56f94623347735e756a6bcb0c4c81c8713c SHA512 13e426915794df757b6eb029d2545316bd9f4b9ba6f58cf59a546227d6997741cf681ce0c5e721e8e95cb9e420702f2d28f004df1780637dc9b39fd3bc4c884a diff --git a/dev-java/scala-cli-bin/scala-cli-bin-0.2.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-0.2.1.ebuild deleted file mode 100644 index 12d0bf8270fd..000000000000 --- a/dev-java/scala-cli-bin/scala-cli-bin-0.2.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 - -DESCRIPTION="CLI to interact with Scala and Java" -HOMEPAGE="https://scala-cli.virtuslab.org/" -SRC_URI=" - !amd64? ( !arm64? ( https://github.com/VirtusLab/scala-cli/releases/download/v${PV}/scala-cli -> scala-cli-non-native-${PV} ) ) - amd64? ( https://github.com/VirtusLab/scala-cli/releases/download/v${PV}/scala-cli-x86_64-pc-linux.gz -> scala-cli-amd64-${PV}.gz ) - arm64? ( https://github.com/VirtusLab/scala-cli/releases/download/v${PV}/scala-cli-aarch64-pc-linux.gz -> scala-cli-arm64-${PV}.gz ) -" - -KEYWORDS="amd64 ~arm64" -LICENSE="Apache-2.0" -SLOT="0" - -S="${WORKDIR}" - -# A JRE is not strictly required if native images of scala-cli are used -# (amd64, arm64). However we may want a system JRE anways so that the -# chances are less reduced scala-cli needs to install a local one. -RDEPEND=" - >=virtual/jre-11 - sys-libs/zlib -" -BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )" - -QA_TEXTRELS="*" -QA_FLAGS_IGNORED="/usr/bin/scala-cli" - -src_prepare() { - default - - if use amd64; then - mv scala-cli-amd64-${PV} scala-cli || die - elif use arm64; then - mv scala-cli-arm64-${PV} scala-cli || die - else - mv scala-cli-non-native-${PV} scala-cli || die - fi - - chmod +x scala-cli || die -} - -src_compile() { - for shell in bash zsh; do - ./scala-cli install-completions \ - --shell ${shell} \ - --env \ - --output "${S}" \ - > ${shell}-completion || die - done -} - -src_install() { - dobin scala-cli - - newbashcomp bash-completion scala-cli - - insinto /usr/share/zsh/site-functions - doins zsh/_scala-cli -} diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.0.0_rc1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.0.2.ebuild index 10fc71222c73..67f4eefef2f4 100644 --- a/dev-java/scala-cli-bin/scala-cli-bin-1.0.0_rc1.ebuild +++ b/dev-java/scala-cli-bin/scala-cli-bin-1.0.2.ebuild @@ -25,7 +25,7 @@ SRC_URI=" ) " -KEYWORDS="~amd64 ~arm64" +KEYWORDS="amd64 ~arm64" LICENSE="Apache-2.0" SLOT="0" diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.0.0_rc2.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.0.4.ebuild index 10fc71222c73..67f4eefef2f4 100644 --- a/dev-java/scala-cli-bin/scala-cli-bin-1.0.0_rc2.ebuild +++ b/dev-java/scala-cli-bin/scala-cli-bin-1.0.4.ebuild @@ -25,7 +25,7 @@ SRC_URI=" ) " -KEYWORDS="~amd64 ~arm64" +KEYWORDS="amd64 ~arm64" LICENSE="Apache-2.0" SLOT="0" diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.0.0.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild index 10fc71222c73..10fc71222c73 100644 --- a/dev-java/scala-cli-bin/scala-cli-bin-1.0.0.ebuild +++ b/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest index 26534254a308..7f89f0c9d934 100644 --- a/dev-java/snappy/Manifest +++ b/dev-java/snappy/Manifest @@ -1 +1,2 @@ -DIST snappy-java-1.1.7.8.tar.gz 3558859 BLAKE2B 871f4190212399c5bd34a72766d7f3abca9a09608d9acddc126905bcdafc723613aa33d0cdb59419e6bfba46ff27e91f5ca5382073dd895d5601f6d84929ef96 SHA512 8129d4ae2abd78f967c07e7f13df8cb9043cc34bd8346be28625a3d2bea06674ce6dd09b521af2b7053b25d0132a0e822b78c06e09bacd0067ba8178bd167691 +DIST hadoop-common-3.3.5.jar 4535144 BLAKE2B 66582661a1832cc54493fc9dcea9076eb0e3f4e974a7d24d593e8fff2b9e2a3a82ed6eb4587f23523473aecc35d2a15de2ad81b2617c1bdac50847149cdeb6a8 SHA512 f1fb439a5853b04e9e771ec4e80e1ed078494ecfaa741abe065936fc1c26b5369fdd4e8082f4da59c1a3a7a5c025beaa14a68c38dc772e81499f83a3cb91717b +DIST snappy-1.1.10.5.tar.gz 3917442 BLAKE2B 0632fa7ba4d0a863801e88ced22098c3bc228c1f3e188c67cb9ff62807f9454b580b49fff15c7deee1e790db51f4664c50a6546259439eda18597097a5128329 SHA512 f84778f59635eb97c0072489766904a16208be4f41b28151b14eecd0fe84f3f04a44c18d452b9d79e752b22d5e5b9ab5b36064cc8aeec8de655d7635132093ea diff --git a/dev-java/snappy/files/1.1.7.8-remove-perl-usage.patch b/dev-java/snappy/files/1.1.7.8-remove-perl-usage.patch deleted file mode 100644 index 0c64240f12a3..000000000000 --- a/dev-java/snappy/files/1.1.7.8-remove-perl-usage.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1413a33ef00e722bacab2e17297b89bb55b2bd49 Mon Sep 17 00:00:00 2001 -From: Yuan Liao <liaoyuan@gmail.com> -Date: Tue, 21 Dec 2021 07:33:52 -0800 -Subject: [PATCH] Makefile: Eliminate usage of the `perl` command - -dev-lang/perl is not an implicit system dependency, so we cannot assume -its existence during build time. The Makefile uses the `perl` command -to generate the name of the JAR being built with it, but the ebuild uses -Ant and a custom build.xml to build the JAR, and it uses the Makefile to -build only the JNI part, thus the name of JAR in the Makefile will not -be used. For this reason, this package can still be built and installed -without dev-lang/perl. However, a QA notice for absent `perl` command -will appear in this case. Rather than declaring dev-lang/perl as a -dependency, it might be better to eliminate usage of the `perl` command -if it is never used in any meaningful way. - -Signed-off-by: Yuan Liao <liaoyuan@gmail.com> ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index a7bd87c..d1d3d32 100644 ---- a/Makefile -+++ b/Makefile -@@ -138,7 +138,8 @@ NATIVE_DIR:=src/main/resources/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH) - NATIVE_TARGET_DIR:=$(TARGET)/classes/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH) - NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME) - --snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d") -+#snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d") -+snappy-jar-version:=snappy - - native: jni-header snappy-header $(NATIVE_DLL) - native-nocmake: jni-header $(NATIVE_DLL) --- -2.32.0 - diff --git a/dev-java/snappy/files/1.x-build.xml b/dev-java/snappy/files/1.x-build.xml deleted file mode 100644 index 21d93bfcc1c6..000000000000 --- a/dev-java/snappy/files/1.x-build.xml +++ /dev/null @@ -1,185 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="snappy-java-from-maven" default="package" basedir="."> - - <property file="${user.home}/.m2/maven.properties" /> - <property file="maven-build.properties" /> - - <property name="maven.build.finalName" value="snappy" /> - <property name="maven.build.dir" value="target" /> - <property name="maven.build.outputDir" value="${maven.build.dir}/classes" /> - <property name="maven.build.srcDir.0" value="src/main/java" /> - <property name="maven.build.resourceDir.0" value="src/main/java" /> - <property name="maven.build.resourceDir.1" value="src/main/resources" /> - <property name="maven.build.resourceDir.2" value="." /> - <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" /> - <property name="maven.build.testDir.0" value="src/test/java" /> - <property name="maven.build.testResourceDir.0" value="src/test/java" /> - <property name="maven.build.testResourceDir.1" value="src/test/resources" /> - <property name="maven.test.reports" value="${maven.build.dir}/test-reports" /> - <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" /> - - <property name="maven.repo.local" value="${user.home}/.m2/repository" /> - <property name="maven.settings.offline" value="false" /> - <property name="maven.settings.interactiveMode" value="true" /> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - </path> - <path id="build.test.classpath"> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${maven.build.dir}" /> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" description="Compile the code"> - <mkdir dir="${maven.build.outputDir}" /> - <javac destdir="${maven.build.outputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6"> - <src> - <pathelement location="${maven.build.srcDir.0}" /> - </src> - <classpath refid="build.classpath" /> - </javac> - <copy todir="${maven.build.outputDir}"> - <fileset dir="${maven.build.resourceDir.0}"> - <include name="org/xerial/snappy/VERSION" /> - </fileset> - </copy> - <copy todir="${maven.build.outputDir}"> - <fileset dir="${maven.build.resourceDir.1}"> - <include name="org/xerial/snappy/*.bytecode" /> - <include name="org/xerial/snappy/native/**" /> - </fileset> - </copy> - <mkdir dir="${maven.build.outputDir}/META-INF/maven/org.xerial.snappy/snappy-java" /> - <copy todir="${maven.build.outputDir}/META-INF/maven/org.xerial.snappy/snappy-java"> - <fileset dir="${maven.build.resourceDir.2}"> - <include name="LICENSE*" /> - </fileset> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip"> - <mkdir dir="${maven.build.testOutputDir}" /> - <javac destdir="${maven.build.testOutputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6"> - <src> - <pathelement location="${maven.build.testDir.0}" /> - </src> - <classpath> - <path refid="build.test.classpath" /> - <pathelement location="${maven.build.outputDir}" /> - </classpath> - </javac> - <copy todir="${maven.build.testOutputDir}"> - <fileset dir="${maven.build.testResourceDir.0}"> - <exclude name="**/*.java" /> - </fileset> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" depends="compile-tests, junit-missing" unless="junit.skipped" description="Run the test cases"> - <mkdir dir="${maven.test.reports}" /> - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> - <sysproperty key="basedir" value="." /> - <formatter type="xml" /> - <formatter type="plain" usefile="false" /> - <classpath> - <path refid="build.test.classpath" /> - <pathelement location="${maven.build.outputDir}" /> - <pathelement location="${maven.build.testOutputDir}" /> - </classpath> - <batchtest todir="${maven.test.reports}" unless="test"> - <fileset dir="${maven.build.testDir.0}"> - <include name="**/Test*.java" /> - <include name="**/*Test.java" /> - <include name="**/*TestCase.java" /> - <exclude name="**/*Abstract*Test.java" /> - </fileset> - </batchtest> - <batchtest todir="${maven.test.reports}" if="test"> - <fileset dir="${maven.build.testDir.0}"> - <include name="**/${test}.java" /> - <exclude name="**/*Abstract*Test.java" /> - </fileset> - </batchtest> - </junit> - </target> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present" /> - </target> - - <target name="test-junit-status" depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}" /> - <isfalse value="${maven.test.skip}" /> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}" /> - <istrue value="${maven.test.skip}" /> - </or> - </condition> - </target> - - <target name="junit-missing" depends="test-junit-status" if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" access="public" old="false" verbose="false" locale="en_US" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="UTF-8" linksource="false" breakiterator="false" /> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="compile,test" description="Package the application"> - <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="true" basedir="${maven.build.outputDir}" excludes="**/package.html" /> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application" /> - - <!-- ====================================================================== --> - <!-- Download dependencies target --> - <!-- ====================================================================== --> - - <target name="test-offline"> - <condition property="maven.mode.offline"> - <equals arg1="${maven.settings.offline}" arg2="true" /> - </condition> - </target> - -</project> diff --git a/dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch b/dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch new file mode 100644 index 000000000000..064482eabb7f --- /dev/null +++ b/dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch @@ -0,0 +1,11 @@ +--- a/src/test/java/org/xerial/snappy/SnappyHadoopCompatibleOutputStreamTest.java ++++ b/src/test/java/org/xerial/snappy/SnappyHadoopCompatibleOutputStreamTest.java +@@ -2,7 +2,7 @@ package org.xerial.snappy; + + import org.apache.commons.io.FileUtils; + import org.apache.commons.io.IOUtils; +-import org.apache.commons.lang.SystemUtils; ++import org.apache.commons.lang3.SystemUtils; + import org.apache.hadoop.conf.Configuration; + import org.apache.hadoop.io.compress.SnappyCodec; + import org.junit.AfterClass; diff --git a/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch b/dev-java/snappy/files/snappy-1.1.10.1-unbundle-snappy.patch index 6113019be3ea..d516495bb6a7 100644 --- a/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch +++ b/dev-java/snappy/files/snappy-1.1.10.1-unbundle-snappy.patch @@ -1,18 +1,15 @@ -diff --git a/Makefile b/Makefile -index 0821c87..04f0435 100644 --- a/Makefile +++ b/Makefile -@@ -8,7 +8,8 @@ +@@ -10,7 +10,7 @@ all: snappy SNAPPY_OUT:=$(TARGET)/snappy-$(SNAPPY_VERSION)-$(os_arch) SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(SNAPPY_VERSION).tar.gz --SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc -+#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc +-SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy-c.cc snappy.cc +SNAPPY_CC:= SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(SNAPPY_VERSION) SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC)) SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy -@@ -100,7 +101,8 @@ +@@ -102,7 +102,8 @@ $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class: $(SRC)/org/xeria $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class @@ -22,7 +19,7 @@ index 0821c87..04f0435 100644 # aarch64 can use big-endian optimzied code ifeq ($(OS_ARCH),aarch64) -@@ -122,7 +124,7 @@ +@@ -124,7 +125,7 @@ $(SNAPPY_OUT)/BitShuffleNative.o: $(SRC)/org/xerial/snappy/BitShuffleNative.cpp $(CXX) $(CXXFLAGS) -c $< -o $@ $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) @@ -31,9 +28,9 @@ index 0821c87..04f0435 100644 # Workaround for strip Protocol error when using VirtualBox on Mac cp $@ /tmp/$(@F) $(STRIP) /tmp/$(@F) -@@ -140,9 +142,9 @@ - #snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d") - snappy-jar-version:=snappy +@@ -145,9 +146,9 @@ snappy-jar-version:=snappy-java-$(shell ./script/dynver.sh | cut -d'=' -f2 | sed + jar-version: + echo $(snappy-jar-version) -native: jni-header snappy-header $(NATIVE_DLL) -native-nocmake: jni-header $(NATIVE_DLL) @@ -42,9 +39,9 @@ index 0821c87..04f0435 100644 +native-nocmake: $(NATIVE_DLL) +snappy: native - native-all: native win32 win64 native-arm linux32 linux64 linux-ppc64le + native-all: native native-arm clean-docker mac64 win32 win64 linux32 linux64 linux-ppc64le linux-riscv64 linux-s390x -@@ -151,6 +153,7 @@ +@@ -166,6 +167,7 @@ $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) cp $(SNAPPY_OUT)/$(LIBNAME) $@ @mkdir -p $(NATIVE_TARGET_DIR) cp $(SNAPPY_OUT)/$(LIBNAME) $(NATIVE_TARGET_DIR)/$(LIBNAME) diff --git a/dev-java/snappy/files/snappy-1.1.10.5-SnappyOutputStreamTest.patch b/dev-java/snappy/files/snappy-1.1.10.5-SnappyOutputStreamTest.patch new file mode 100644 index 000000000000..43272e9d4a7f --- /dev/null +++ b/dev-java/snappy/files/snappy-1.1.10.5-SnappyOutputStreamTest.patch @@ -0,0 +1,30 @@ +There was 1 failure: +1) batchingOfWritesShouldNotAffectCompressedDataSize(org.xerial.snappy.SnappyOutputStreamTest) +java.lang.AssertionError: expected:<91080> but was:<91051> + at org.junit.Assert.fail(Assert.java:89) + at org.junit.Assert.failNotEquals(Assert.java:835) + at org.junit.Assert.assertEquals(Assert.java:647) + at org.junit.Assert.assertEquals(Assert.java:633) + at org.xerial.snappy.SnappyOutputStreamTest.batchingOfWritesShouldNotAffectCompressedDataSize(SnappyOutputStreamTest.java:183) + +FAILURES!!! +Tests run: 104, Failures: 1 +--- a/src/test/java/org/xerial/snappy/SnappyOutputStreamTest.java ++++ b/src/test/java/org/xerial/snappy/SnappyOutputStreamTest.java +@@ -34,6 +34,7 @@ import java.lang.ref.WeakReference; + import java.nio.ByteOrder; + + import org.junit.Test; ++import org.junit.Ignore; + import org.junit.Assert; + import org.xerial.snappy.buffer.BufferAllocatorFactory; + import org.xerial.snappy.buffer.CachedBufferAllocator; +@@ -165,7 +166,7 @@ public class SnappyOutputStreamTest + return b.toByteArray(); + } + +- @Test ++ @Test @Ignore + public void batchingOfWritesShouldNotAffectCompressedDataSize() + throws Exception + { diff --git a/dev-java/snappy/snappy-1.1.10.5.ebuild b/dev-java/snappy/snappy-1.1.10.5.ebuild new file mode 100644 index 000000000000..9f690d9c4df7 --- /dev/null +++ b/dev-java/snappy/snappy-1.1.10.5.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.xerial.snappy:snappy-java:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple toolchain-funcs check-reqs + +DESCRIPTION="Snappy compressor/decompressor for Java" +HOMEPAGE="https://github.com/xerial/snappy-java/" +# ::gentoo does not have hadoop-common packaged. Currently we bundle the binary version. +# It's used for testing only and does not get installed. +HCV="3.3.5" +SRC_URI="https://github.com/xerial/snappy-java/archive/v${PV}.tar.gz -> ${P}.tar.gz + test? ( https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/${HCV}/hadoop-common-${HCV}.jar )" +S="${WORKDIR}/snappy-java-${PV}" + +LICENSE="Apache-2.0" +SLOT="1.1" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +CP_DEPEND="dev-java/osgi-core:0" + +CDEPEND=" + app-arch/snappy + dev-libs/bitshuffle +" + +DEPEND=">=virtual/jdk-1.8:* + ${CP_DEPEND} + ${CDEPEND} + test? ( + dev-java/ant-junit4:0 + dev-java/commons-io:1 + dev-java/commons-lang:3.6 + dev-java/plexus-classworlds:0 + dev-java/xerial-core:0 + )" + +RDEPEND=">=virtual/jre-1.8:* + ${CP_DEPEND} + ${CDEPEND}" + +PATCHES=( + "${FILESDIR}/1.1.7.8-java-version-target.patch" + "${FILESDIR}/snappy-1.1.10.1-unbundle-snappy.patch" + "${FILESDIR}/1.1.7.8-unbundle-bitshuffle.patch" + "${FILESDIR}/1.1.7.8-gentoo.patch" + "${FILESDIR}/snappy-1.1.10.5-SnappyOutputStreamTest.patch" + "${FILESDIR}/snappy-1.1.10.1-commons-lang3.patch" +) + +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH=" + commons-io-1 + commons-lang-3.6 + junit-4 + plexus-classworlds + xerial-core +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +check_env() { + if use test; then + # this is needed only for tests + CHECKREQS_MEMORY="2560M" + check-reqs_pkg_pretend + fi +} + +pkg_pretend() { + check_env +} + +pkg_setup() { + check_env + java-pkg-2_pkg_setup +} + +src_prepare() { + default + java-pkg-2_src_prepare + # remove pre-compiled sofiles + rm -r src/main/resources/org/xerial/snappy/native || die + rm -r src/test/resources/lib || die +} + +src_compile() { + emake \ + CXX="$(tc-getCXX)" \ + JAVA_SOURCE="$(java-pkg_get-source)" \ + JAVA_TARGET="$(java-pkg_get-target)" + + java-pkg-simple_src_compile +} + +src_test() { + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/hadoop-common-${HCV}.jar" + JAVA_TEST_EXTRA_ARGS=( -Xmx${CHECKREQS_MEMORY} ) + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge 17; then + java-pkg-simple_src_test + else + einfo "Tests need jdk-17 to pass." + fi +} + +src_install() { + java-pkg-simple_src_install + + local jniext=.so + if [[ ${CHOST} == *-darwin* ]] ; then + jniext=.jnilib + # avoid install_name check failure + install_name_tool -id "@loader_path/libsnappyjava${jniext}" \ + "target/libsnappyjava${jniext}" + fi + java-pkg_doso "target/libsnappyjava${jniext}" +} diff --git a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild deleted file mode 100644 index 37b8dcf972f5..000000000000 --- a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild +++ /dev/null @@ -1,97 +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 test" -MAVEN_ID="org.xerial.snappy:snappy-java:1.1.7.8" - -inherit java-pkg-2 java-ant-2 toolchain-funcs - -MY_PN="${PN}-java" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Snappy compressor/decompressor for Java" -HOMEPAGE="https://github.com/xerial/snappy-java/" -SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1.1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Tests require org.apache.hadoop:hadoop-common:2.7.*, which is yet to be -# packaged. Some extra steps are required before running the tests: -# 1. Download hadoop-common 2.7.x from https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-common -# 2. Set EANT_GENTOO_CLASSPATH_EXTRA to the path to hadoop-common-2.7.*.jar -# 3. Set ALLOW_TEST="all" -RESTRICT="test" - -CDEPEND="dev-java/osgi-core:0 - app-arch/snappy - dev-libs/bitshuffle" - -DEPEND=">=virtual/jdk-1.8:* - ${CDEPEND} - test? ( - dev-java/ant-junit4:0 - dev-java/commons-io:1 - dev-java/commons-lang:2.1 - dev-java/plexus-classworlds:0 - dev-java/xerial-core:0 - )" - -RDEPEND=">=virtual/jre-1.8:* - ${CDEPEND}" - -S="${WORKDIR}/${MY_P}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -JAVA_ANT_CLASSPATH_TAGS="javac javadoc" -EANT_GENTOO_CLASSPATH="osgi-core" -EANT_TEST_GENTOO_CLASSPATH=" - ${EANT_GENTOO_CLASSPATH} - commons-io-1 - commons-lang-2.1 - plexus-classworlds - xerial-core -" - -src_prepare() { - cp "${FILESDIR}/1.x-build.xml" build.xml || die - rm -r src/main/resources/org/xerial/snappy/native || die - eapply "${FILESDIR}/${PV}-java-version-target.patch" - eapply "${FILESDIR}/${PV}-remove-perl-usage.patch" - eapply "${FILESDIR}/${PV}-unbundle-snappy.patch" - eapply "${FILESDIR}/${PV}-unbundle-bitshuffle.patch" - eapply "${FILESDIR}/${PV}-gentoo.patch" - java-pkg-2_src_prepare -} - -src_compile() { - emake \ - CXX="$(tc-getCXX)" \ - JAVA_SOURCE="$(java-pkg_get-source)" \ - JAVA_TARGET="$(java-pkg_get-target)" - java-pkg-2_src_compile -} - -src_test() { - cp -r src/test/resources/org/xerial/snappy/* \ - src/test/java/org/xerial/snappy || die - java-pkg-2_src_test -} - -src_install() { - local jniext=.so - if [[ ${CHOST} == *-darwin* ]] ; then - jniext=.jnilib - # avoid install_name check failure - install_name_tool -id "@loader_path/libsnappyjava${jniext}" \ - "target/libsnappyjava${jniext}" - fi - java-pkg_doso "target/libsnappyjava${jniext}" - java-pkg_dojar "target/${PN}.jar" - - use source && java-pkg_dosrc src/main/java/* - use doc && java-pkg_dojavadoc target/site/apidocs -} diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index 296f28fcfb56..75b83fcd9ee2 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -3,6 +3,9 @@ DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6 DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7 DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0 -DIST swt-4.27-gtk-linux-aarch64.zip 3849438 BLAKE2B b07daa4942c450d5cca5a323b0649a645fe9a283b272a73a9675f3bd07fbae859c41f451521231a93f4fb56ae4093d57474545611c4789c076abad2e9e1c911f SHA512 a3ba011258e5906beb15ffd5deaa73fc9a5ed5f7bce78a4a683ad8ad12a5cca1fa3a0d89fed6da9f4ade530ea3bda09093ad43202993b522a060a9dcd98746d3 -DIST swt-4.27-gtk-linux-ppc64le.zip 3872996 BLAKE2B 58ae779b7103da932719fe702674e211f8f0068c3b6094172b4c58e939de96d8d43ef80d40740c29f6fcd802a252a87ba850e9e6320d881c958b0161700e4e8c SHA512 6f8f1fce502e0980ced3f201dcdeb3397a583a9ba9ebe76d82c713c440d614c4ff38efe5f596a9da25940f931e3c651c36b18211faea4fab31872d25566b060a -DIST swt-4.27-gtk-linux-x86_64.zip 3869518 BLAKE2B d0eb7d1be59944cbffe5556c258043d084f7f1a8fa1d9ad9c3738896adc12aa015f85b675ba72af31de566ae451280bb83d82082b3f589c8da643631bf1f7bfb SHA512 efa89c1752340978e1aa1d2343a07df001fa952092aef959bdeedf53a31270d24ebe34ccb50e72ef2221da810ed08c53b188a80aab8a37e5932f85f6771ea1ef +DIST swt-4.29-gtk-linux-aarch64.zip 3836724 BLAKE2B 8c905df298688686ee22c9f2021560856f7ac7b6a92dad744b27cd30530c6ff76470fdcbb79b91ada01f28c43b8f694c334ff1337d692366ae9dc0319f7e46e2 SHA512 44ff572b57631b1b6a98192f60624758d90f54a2b2272c6bbb140ece39e65bb4086cf08fbc50c5f2e388e7b410b28fc014b87a8560062053b4c131970fa38b17 +DIST swt-4.29-gtk-linux-ppc64le.zip 3860955 BLAKE2B f24f8224581425dc86926a147f2f4c644f086cb7907e03bfca64df93ef5ce8341f519acc91e90c0af4eede65797ac019c17a410ff0312306714fa26ddb4234b4 SHA512 09326b5204970d9db2cede4aebf11c7f24a47c30b6bc49764dda1d0a33fa83c7c4755797cac387d1814a29ad2574e45244b994e5df0c7ef2fd1375fc7877814b +DIST swt-4.29-gtk-linux-x86_64.zip 3857122 BLAKE2B ac4416044f93eaed396ac10edb74eb5ebcbb967797109f57580bd0ac7c1e3752e8895c5ff1b315aa32b5d5b5ce8e1440badb8b9c3138a0eaeb4df63098919a8c SHA512 c92381e4d1479c219e174c027e54af781e674b266334a5e087f5821935e0a87696f40afbc9fe6f9ffaa00b5204165d9ff6476031b5e4e2df8aea1a54aeb2e65e +DIST swt-4.30-gtk-linux-aarch64.zip 3836637 BLAKE2B 4cedb6eae73e03c32f6c226560f8e7bcbde5b6fc57579255e793fd5d01a5ff80f8b673dd7035eb7f2693abadd98bd0cfdb2eec632c05995552a9a1f1b673b8cc SHA512 dfdddd12ba30373d3ee7f0337b42d3a4f55a55dc898be9c97fbcc3d841c082d00190a75513272076c5709ee626e8af3f77c7c2dc518aa9289e80e33f4b134907 +DIST swt-4.30-gtk-linux-ppc64le.zip 3860636 BLAKE2B a535c1bcc6c668905f4d4aaa8c5ae7f3b8f48fc95004522d09924ae54d5172b18f80169d78633e960ce0c5141e5b34492d1dd05188a0b1f48d9f79d286bd2982 SHA512 5a17bd7752343da638466ac28de460d9fa9f0e777d1e48625ddb6c5538704e36cd97439d1bf8f07ad34a32b7d5f27f19d8877e8a9bb9094b4a74bdbb1dc126f7 +DIST swt-4.30-gtk-linux-x86_64.zip 3856990 BLAKE2B 0ea29a5f286fb4bb362758629226bcd6f27716afae7abb80cb37e7d4b72f0c835d63a196384465d3bc74135c42454a74c75455c094204e6329229ad8ca1fda78 SHA512 3802bd1dc84c7d684dac6b0b21de6b4958dd0c736a6b42176cf734806f04ae9dfdb18515ec5249eeff5f6bb716bf327a7a10e79d68cc487a1ad02267394507a1 diff --git a/dev-java/swt/swt-4.27.ebuild b/dev-java/swt/swt-4.29.ebuild index 499b8e3841a0..08361076b0b5 100644 --- a/dev-java/swt/swt-4.27.ebuild +++ b/dev-java/swt/swt-4.29.ebuild @@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source" inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs MY_PV="${PV/_rc/RC}" -MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202303020300" +MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202309031000" MY_P="${PN}-${MY_PV}" DESCRIPTION="GTK based SWT Library" @@ -26,7 +26,7 @@ IUSE="cairo opengl webkit" COMMON_DEP=" app-accessibility/at-spi2-core:2 dev-libs/glib - x11-libs/gtk+:2 + x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( @@ -56,7 +56,7 @@ JAVA_RESOURCE_DIRS="resources" JAVA_SRC_DIR="src" PATCHES=( - "${FILESDIR}/${P}-as-needed-and-flag-fixes.patch" + "${FILESDIR}/swt-4.27-as-needed-and-flag-fixes.patch" ) src_unpack() { @@ -72,8 +72,12 @@ src_prepare() { java-pkg_clean mkdir src || die "mkdir failed" mv org src || die "moving java sources failed" - find src -type f ! -name '*.java' | xargs \ - cp --parent -t resources -v || die "copying resources failed" + pushd src > /dev/null || die + find -type f ! -name '*.java' \ + | xargs \ + cp --parent -t ../resources -v \ + || die "copying resources failed" + popd > /dev/null || die cp version.txt resources || die "adding version.txt failed" } @@ -108,6 +112,7 @@ src_compile() { local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" einfo "Building AWT library" + export SWT_JAVA_HOME="$(java-config -g JAVA_HOME)" ${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`" einfo "Building SWT library" diff --git a/dev-java/swt/swt-4.30.ebuild b/dev-java/swt/swt-4.30.ebuild new file mode 100644 index 000000000000..ca3db3c7eb76 --- /dev/null +++ b/dev-java/swt/swt-4.30.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs + +MY_PV="${PV/_rc/RC}" +MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202312010110" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="GTK based SWT Library" +HOMEPAGE="https://www.eclipse.org/swt/" +SRC_URI=" + amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) + arm64? ( ${MY_DMF}/${MY_P}-gtk-linux-aarch64.zip ) + ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" + +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +SLOT="4.27" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="cairo opengl webkit" + +COMMON_DEP=" + app-accessibility/at-spi2-core:2 + dev-libs/glib + x11-libs/gtk+:3 + x11-libs/libXtst + cairo? ( x11-libs/cairo ) + opengl? ( + virtual/glu + virtual/opengl + ) + webkit? ( + net-libs/webkit-gtk:4.1 + )" +DEPEND="${COMMON_DEP} + >=virtual/jdk-17:*[-headless-awt] + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst" +# error: pattern matching in instanceof is not supported in -source 11 +RDEPEND="${COMMON_DEP} + >=virtual/jre-17:*" +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" + +HTML_DOCS=( about.html ) + +JAVA_RESOURCE_DIRS="resources" +JAVA_SRC_DIR="src" + +PATCHES=( + "${FILESDIR}/swt-4.27-as-needed-and-flag-fixes.patch" +) + +src_unpack() { + default + unpack "./src.zip" +} + +src_prepare() { + default + java-pkg-2_src_prepare + # .css stuff is essential at least for running net-p2p/biglybt + unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d resources || die + java-pkg_clean + mkdir src || die "mkdir failed" + mv org src || die "moving java sources failed" + pushd src > /dev/null || die + find -type f ! -name '*.java' \ + | xargs \ + cp --parent -t ../resources -v \ + || die "copying resources failed" + popd > /dev/null || die + cp version.txt resources || die "adding version.txt failed" +} + +src_compile() { + append-cflags -fcommon # https://bugs.gentoo.org/707838 + + local JAWTSO="libjawt.so" + IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH) + + for libpath in "${ldpaths[@]}"; do + if [[ -f "${libpath}/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${libpath}" + break + # this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10 + elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${libpath}/$(tc-arch)" + break + fi + done + + if [[ -z "${AWT_LIB_PATH}" ]]; then + eerror "${JAWTSO} not found in the JDK being used for compilation!" + die "cannot build AWT library" + fi + + # Fix the pointer size for AMD64 + export SWT_PTR_CFLAGS=-DJNI64 + + # Bug #461784, g_thread_init is deprecated since glib-2.32. + append-cflags -DNO__1g_1thread_1init + + local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" + + einfo "Building AWT library" + export SWT_JAVA_HOME="$(java-config -g JAVA_HOME)" + ${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`" + + einfo "Building SWT library" + ${make} make_swt + + einfo "Building JAVA-AT-SPI bridge" + ${make} make_atk + + if use cairo ; then + einfo "Building CAIRO support" + ${make} make_cairo + fi + + if use opengl ; then + einfo "Building OpenGL component" + ${make} make_glx + fi + + if use webkit ; then + einfo "Building WebKit component" + ${make} make_webkit + fi + + java-pkg-simple_src_compile +} + +src_install() { + java-pkg-simple_src_install + + java-pkg_sointo "/usr/$(get_libdir)/swt" + java-pkg_doso *.so +} diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest index 310f28a1c68c..aaf68f18ad4d 100644 --- a/dev-java/testng/Manifest +++ b/dev-java/testng/Manifest @@ -1 +1,6 @@ +DIST apache-groovy-binary-2.4.21.zip 37467992 BLAKE2B e0f925bad53f0f8a7012f0bea420ec3e5986118cc23cd677a11f619284754eacc15c3012cf780063fef574053781bba924a86e5fa2ac284d86f349ad18173704 SHA512 e2f73405d7521b99e3ce5622cffcc505bbc039ccb1c35696fc895d648a9325937a136cf97a229f7ac1b90b63ad8603881350c4d41e514ad45233fb333d76d510 +DIST groovy-all-2.4.7.jar 7015434 BLAKE2B 23d22ddd78229c485ed9384169acee154258644249b856661e17d1d0efb5518e32473a26962b5d657a09b41d490813ed76254820ffdf39e83869209617b66c2d SHA512 4c26ff9f7137c0506c95f7ba1d4228ce57e16d87b77dd1d114390224207d71d3958460c7b5a239d5f41596ab87e7f4aa7aaea1dfce19a50badf8f9b818329c54 +DIST jquery-3.5.1.jar 313070 BLAKE2B 76abfbd21d83f72a3cfcb666f3a2fcfcf5975e723a462996bac9701caf6b59cb9998746af713ebb1f6bfe49cce91544216cc65dc6819e95e8a15930744685415 SHA512 9f560415b36875958ff1d3c6d37fa79d6d134c5f5fc7719dd21db36d1f24dec39787834b2a9ffb104ec6b56e725ccc524a8ff9b189ced3d68e24296b2daae720 +DIST spock-core-1.0-groovy-2.4.jar 588030 BLAKE2B 68d8fad8b6ffb45a18778797ea23d4f3b09256bf4e9f207ee666d07572399cd13522e6f1590219a80e23f6906a2e9eaf1f22c6a3c01717e8c1e99b5d37b89210 SHA512 078c0b16688eaa3134043e58ed4273981797ea92f08723b5508c7d7e4f635278dd5ca731fb294da2a1f35674623d969ee423d4344c2c822e1d4cb8d4f3383790 +DIST testng-6.11.tar.gz 677522 BLAKE2B 2e7bf30fcf805cce5a7ec42f22c39e9f4678642fcde9752c51d118e655189805661edeeff1a3db0e960c79e7542fe25ab8fa6995f142da12b3adc8753fd8a361 SHA512 996d7a18399e16626756b7a790182c7b6bf3453280209d0a09d4a509d698fcad1a80e58ec36702de95bd59c90c237463719ad44934c14390620fc9655d871252 DIST testng-6.9.10.tar.gz 6271781 BLAKE2B 5b77f4b1d9bfdca6749a1d33f465a30bcd9ab9dd9fc37abf8148301c24d6bf287224d9886c0f681deac54e12f9460139ce2a2058b3d160c05cf8fcb9f7808373 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e diff --git a/dev-java/testng/metadata.xml b/dev-java/testng/metadata.xml index 43f8b5d27805..f79c946be086 100644 --- a/dev-java/testng/metadata.xml +++ b/dev-java/testng/metadata.xml @@ -6,6 +6,6 @@ <name>Java</name> </maintainer> <upstream> - <remote-id type="github">cbeust/testng</remote-id> + <remote-id type="github">testng-team/testng</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/testng/testng-6.11.ebuild b/dev-java/testng/testng-6.11.ebuild new file mode 100644 index 000000000000..92baedcd8ee8 --- /dev/null +++ b/dev-java/testng/testng-6.11.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.testng:testng:6.11" +JAVA_TESTING_FRAMEWORKS="testng" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features" +HOMEPAGE="https://testng.org/" +# Presently we install the binary version of jquery since it is not packaged in ::gentoo. +JQV="3.5.1" +# Currently we bundle the binary versions of spock-core, groovy-all and apache-groovy-binary. +# These are used only for tests, we don't install them. +SCV="1.0-groovy-2.4" +GAV="2.4.7" +AGV="2.4.21" +SRC_URI="https://github.com/testng-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://repo1.maven.org/maven2/org/webjars/jquery/${JQV}/jquery-${JQV}.jar + test? ( + https://repo1.maven.org/maven2/org/spockframework/spock-core/${SCV}/spock-core-${SCV}.jar + https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-all/${GAV}/groovy-all-${GAV}.jar + https://downloads.apache.org/groovy/${AGV}/distribution/apache-groovy-binary-${AGV}.zip + )" +S="${WORKDIR}/${P}" + +LICENSE="Apache-2.0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" +SLOT="0" + +CP_DEPEND=" + dev-java/ant-core:0 + dev-java/bsh:0 + dev-java/guice:4 + dev-java/jcommander:1.64 + dev-java/junit:4 + dev-java/snakeyaml:0 +" + +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + test? ( + dev-java/assertj-core:3 + dev-java/guava:0 + )" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +BDEPEND="app-arch/unzip" + +DOCS=( README {ANNOUNCEMENT,CHANGES}.txt ) + +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_RUN_ONLY="src/test/resources/testng.xml" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + java-pkg-2_src_prepare + java-pkg_clean ! -path "./src/*" + + rm src/main/resources/META-INF/MANIFEST.MF || die +} + +src_test() { + # This contains the compiler groovyc + unzip "${DISTDIR}/apache-groovy-binary-${AGV}.zip" + + JAVA_GENTOO_CLASSPATH_EXTRA=":${DISTDIR}/spock-core-${SCV}.jar" + + ejavac -cp "${JAVA_TEST_SRC_DIR}:${PN}.jar:$(java-pkg_getjars guava)" \ + src/test/java/test/SimpleBaseTest.java || die + + # java-pkg-simple.eclass expects generated test classes in this + # directory and will copy them to target/test-classes + mkdir generated-test || die "cannot create generated-test directory" + "groovy-${AGV}/bin/groovyc" \ + -cp "${JAVA_TEST_SRC_DIR}:${DISTDIR}/spock-core-${SCV}.jar" \ + -d generated-test \ + src/test/groovy/test/groovy/* || die + + JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/groovy-all-${GAV}.jar" + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dolauncher ${PN} --main org.testng.TestNG + + java-pkg_newjar "${DISTDIR}/jquery-${JQV}.jar" jquery.jar + java-pkg_regjar "${ED}/usr/share/${PN}/lib/jquery.jar" + + java-pkg_register-ant-task +} diff --git a/dev-java/testng/testng-6.9.10-r1.ebuild b/dev-java/testng/testng-6.9.10-r1.ebuild index 03d59cd025a7..46111b7f50e8 100644 --- a/dev-java/testng/testng-6.9.10-r1.ebuild +++ b/dev-java/testng/testng-6.9.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features" HOMEPAGE="https://testng.org/" -SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/testng-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" SLOT="0" diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest index 0267c1a62bb7..e3f6abad11d7 100644 --- a/dev-java/tomcat-native/Manifest +++ b/dev-java/tomcat-native/Manifest @@ -1,6 +1,4 @@ -DIST tomcat-native-1.2.36-src.tar.gz 437622 BLAKE2B c553fee65bc9ff9eec099afde7516b3108ed4175915e853a720d188f684f39b9a8a040b9b9c28e64deecd0c1b0c61cd24e03a552f465c7646b0b6e47d9f12372 SHA512 ae89a872b8331035e01387665539a0c08096ae1abdb5dc7a25a197650a641ba3637f01437f1bee27b442c1c59c4d2fe2e5679d1595e8c5d121b9b219da2fb094 -DIST tomcat-native-1.2.37-src.tar.gz 438373 BLAKE2B 89ec571fea09b5ee0cf5f5ffec8f5547b08da301e713361687d7aad96f70b3b789a5f26061e2277b90b845f9df1c7c140fdee4c83f1ba05d168bcabf2cf1f549 SHA512 e845239f1b6a1dab22885d39f4fd131e464c38b0d52faca0d960f99fe3e8b7d732c0112f25e5eb81ff8dc71a5e3c6799bfdf867e617d8f934068ed107036fd0b -DIST tomcat-native-2.0.3-src.tar.gz 318403 BLAKE2B a9936ad951bd521c77b8a3fe3306cb1a7a78bdbb229f84fdf53e5bd71caa55bfcee049de406df0047341c6896e05e7da4e0e2a8524fdda91a24f007176f26503 SHA512 d80e6b76295bb253eaf6eab4d722f3ba2f683f33a96310838b4c44b99f0b47a49ed9c09bb53ed23698db057ce765e3fcbfcd4ac4b75d2bdbe691f916be3be339 -DIST tomcat-native-2.0.3-src.tar.gz.asc 873 BLAKE2B f9998b9b7c410ac7fe2c72207cec64dcd003142ede4f37abd4ebb04ee930a5d536169c84e24bc7fb328cead15da19c13a991f30bdcce80ffd5380114884ec5f6 SHA512 bc513239ccd2a4b4eb60d30513328bb008b926e702ece8ddb4a9a084d64fc7db02b894f741d7073e5f869e7df948b4539d849e8c602549bab91f7055e3c23222 -DIST tomcat-native-2.0.4-src.tar.gz 318845 BLAKE2B 44cd99ff52d5b402c2d8caa6819e2e420c84399f7f3cc0be38cd2a40985ddaaf89093005454527976ad2cf083c90d39c9c4d600671a8e5c7c07d0834b23d93e0 SHA512 276133e44ae9f9d3e853b66120937865c675eed6dd6b5b7d8a94ef741f037c0b3d99a6c065a1303c0ca42b65c109aef35b6bd370a2af0b7b2752eadf85b1d880 -DIST tomcat-native-2.0.4-src.tar.gz.asc 873 BLAKE2B 509c63dce69c767d3dd694d7994c8b2cbb4f84d40095ff89373a165d592449fc028402b17bf0e25c9ffe40d5ca8383cda50703054fcdfb2fd4cb36bdcecdff0c SHA512 80768307fd1d46ca822151977b3d9fecdb3121929e97338a78c39bc439f914694dedbfff087cd512f986532567734f04422b4764ea215ad5dbb0319380fa05d2 +DIST tomcat-native-1.2.39-src.tar.gz 438209 BLAKE2B 499e2221be7a3aac47950530b044242dd308e943cdffd4af29d35121b60bd9b7040a404e8a70320cc853d41e4a06b41cad66a87d665e3692791299a0f16658f4 SHA512 b90c72255406f48552025a2e78dbd8c30a3492be2c283875c86a0b4a0f1f71b0420d4f91fb5ba181ef29d528824b2d5dfc63f51ee68e8d04fe6e67bd89e397f7 +DIST tomcat-native-1.2.39-src.tar.gz.asc 873 BLAKE2B 59976744119c03771b597d3d4f5d84a5a9e5feb81c0efe351e827b5e06e84c8adde8407ef4d27ec3b201763806e74804a51e9a209641c127328d44b79e22351e SHA512 78144c9ce5d5acc9d051b6d41fff2016d37062a11011ecad8ba52569c910efe5bcd5f177e576601ab4e7f7e53ce9dfe54f6a2c42cb87651ca5c2fedcf284eb21 +DIST tomcat-native-2.0.6-src.tar.gz 539277 BLAKE2B 4a1ee7a87ff72b449a3638d38cdd40185e02ee09aa8ee9ea26ff6cfdc3f54b1e8aec6fb0296b51f8a72a72de7a9c504410d1df4d3547b709deebfb005ebbdd01 SHA512 d714fb96f880d0d565c58d25bb803fa9a144a6d87e825ad8d00aeac833b40a5512f888b94b3109853f8ee28b176b24fde95fb2d2a70ce65181a51ca7fc60cdab +DIST tomcat-native-2.0.6-src.tar.gz.asc 873 BLAKE2B f78fb9c67632fc6fd6768fb699fa4c875db0364537ef41f6aa8c099eb05260a43ed7e2dd7b0f501c6814aff3b7d0928f318473ba78bfac7bcac3092952c08edc SHA512 6601bb1f731ad3b8ef1dbd6d2522952223d794568d42cce363ed95e05e641b2c742ed696ce65d546fcb3d0f80b362befc9cdaa060d1bd77beb90749c3a417a08 diff --git a/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch b/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch deleted file mode 100644 index cd090afb9854..000000000000 --- a/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-PR: https://github.com/apache/tomcat-native/pull/14 -Upstream-Commit: -https://github.com/apache/tomcat-native/commit/4f7fb7f442de3d9a9bb2f72b5dabc2f4bc8e3384 - -From 54dccd3a4dc01801d9311b3160808305ec9fc2cf Mon Sep 17 00:00:00 2001 -From: orbea <orbea@riseup.net> -Date: Thu, 21 Jul 2022 17:59:14 -0700 -Subject: [PATCH] native: Fix the build with rlibtool - -When building tomcat-native with slibtool using the rlibtool symlink the -build will fail. This is because rlibtool requires the generated libtool -script to determine if the build is shared, static or both. - -Gentoo bug: https://bugs.gentoo.org/778914 ---- - native/configure.in | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/native/configure.in b/native/configure.in -index 567894b10..e082ae6d2 100644 ---- a/configure.in -+++ b/configure.in -@@ -50,6 +50,9 @@ AC_SUBST(TCN_CONFIG_LOCATION) - AC_CANONICAL_TARGET - AC_PROG_INSTALL - -+dnl Generate the libtool script which is needed for rlibtool -+LT_INIT -+ - dnl - dnl compute the top directory of the build - dnl note: this is needed for LIBTOOL and exporting the bundled Expat diff --git a/dev-java/tomcat-native/tomcat-native-1.2.36.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.36.ebuild deleted file mode 100644 index e2093e095560..000000000000 --- a/dev-java/tomcat-native/tomcat-native-1.2.36.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Allows Tomcat to use certain native resources for better performance" -HOMEPAGE="https://tomcat.apache.org/native-doc/" -SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz" - -KEYWORDS="amd64 ~x86" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/apr:1= - dev-libs/openssl:0= - >=virtual/jre-1.8:*" - -DEPEND=">=virtual/jdk-1.8:* - test? ( dev-java/ant-junit:0 )" - -S=${WORKDIR}/${P}-src - -JAVA_ANT_REWRITE_CLASSPATH="yes" - -src_configure() { - local myeconfargs=( - --with-apr="${EPREFIX}"/usr/bin/apr-1-config - --with-ssl="${EPREFIX}"/usr - ) - - cd native || die - econf "${myeconfargs[@]}" -} - -src_compile() { - eant jar - - cd native || die - default -} - -src_install() { - java-pkg_newjar "dist/${P}.jar" "${PN}.jar" - - cd native || die - default - - ! use static-libs && find "${D}" -name '*.la' -delete || die -} - -src_test() { - java-pkg-2_src_test -} - -pkg_postinst() { - elog "For more information, please visit" - elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html" -} diff --git a/dev-java/tomcat-native/tomcat-native-1.2.37.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.37.ebuild deleted file mode 100644 index 5098a6d937b5..000000000000 --- a/dev-java/tomcat-native/tomcat-native-1.2.37.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Allows Tomcat to use certain native resources for better performance" -HOMEPAGE="https://tomcat.apache.org/native-doc/" -SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz" - -KEYWORDS="~amd64 ~x86" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/apr:1= - dev-libs/openssl:0= - >=virtual/jre-1.8:*" - -DEPEND=">=virtual/jdk-1.8:* - test? ( dev-java/ant-junit:0 )" - -S=${WORKDIR}/${P}-src - -JAVA_ANT_REWRITE_CLASSPATH="yes" - -src_configure() { - local myeconfargs=( - --with-apr="${EPREFIX}"/usr/bin/apr-1-config - --with-ssl="${EPREFIX}"/usr - ) - - cd native || die - econf "${myeconfargs[@]}" -} - -src_compile() { - eant jar - - cd native || die - default -} - -src_install() { - java-pkg_newjar "dist/${P}.jar" "${PN}.jar" - - cd native || die - default - - ! use static-libs && find "${D}" -name '*.la' -delete || die -} - -src_test() { - java-pkg-2_src_test -} - -pkg_postinst() { - elog "For more information, please visit" - elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html" -} diff --git a/dev-java/tomcat-native/tomcat-native-2.0.3-r1.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild index e5d555c68e08..5d246c6ecdab 100644 --- a/dev-java/tomcat-native/tomcat-native-2.0.3-r1.ebuild +++ b/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild @@ -6,7 +6,7 @@ EAPI=8 JAVA_PKG_IUSE="doc source test" JAVA_TESTING_FRAMEWORKS="junit-4" -inherit autotools java-pkg-2 java-pkg-simple verify-sig +inherit java-pkg-2 java-pkg-simple verify-sig DESCRIPTION="Allows Tomcat to use certain native resources for better performance" HOMEPAGE="https://tomcat.apache.org/native-doc/" @@ -16,9 +16,9 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t )" S=${WORKDIR}/${P}-src/native -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" LICENSE="Apache-2.0" -SLOT="2" +SLOT="0" IUSE="static-libs" DEPEND=" @@ -30,17 +30,13 @@ RDEPEND=" >=virtual/jre-1.8:* " BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc" JAVA_RESOURCE_DIRS="../resources" JAVA_SRC_DIR="../java" JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_SRC_DIR="../test" -PATCHES=( - "${FILESDIR}"/tomcat-native-2.0.3-slibtool.patch #778914 -) - DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} ) src_prepare() { @@ -50,11 +46,6 @@ src_prepare() { ../build.xml \ | sed "s:\${version}:${PV}:" \ > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die - default - - # Needed for the slibtool patch - sed -i 's/configure.in/configure.ac/' configure.in || die - eautoreconf } src_configure() { @@ -71,6 +62,11 @@ src_compile() { } src_test() { + # Adjusting "String testFile =" path in TestFile.java:29 to match ${S} + sed \ + -e '/String testFile =/s&test/&../test/&' \ + -i ../test/org/apache/tomcat/jni/TestFile.java || die + JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" ) java-pkg-simple_src_test } diff --git a/dev-java/tomcat-native/tomcat-native-2.0.4.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild index e5d555c68e08..be927b30c60d 100644 --- a/dev-java/tomcat-native/tomcat-native-2.0.4.ebuild +++ b/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild @@ -6,7 +6,7 @@ EAPI=8 JAVA_PKG_IUSE="doc source test" JAVA_TESTING_FRAMEWORKS="junit-4" -inherit autotools java-pkg-2 java-pkg-simple verify-sig +inherit java-pkg-2 java-pkg-simple verify-sig DESCRIPTION="Allows Tomcat to use certain native resources for better performance" HOMEPAGE="https://tomcat.apache.org/native-doc/" @@ -16,7 +16,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t )" S=${WORKDIR}/${P}-src/native -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" LICENSE="Apache-2.0" SLOT="2" IUSE="static-libs" @@ -30,17 +30,13 @@ RDEPEND=" >=virtual/jre-1.8:* " BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc" JAVA_RESOURCE_DIRS="../resources" JAVA_SRC_DIR="../java" JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_SRC_DIR="../test" -PATCHES=( - "${FILESDIR}"/tomcat-native-2.0.3-slibtool.patch #778914 -) - DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} ) src_prepare() { @@ -50,11 +46,6 @@ src_prepare() { ../build.xml \ | sed "s:\${version}:${PV}:" \ > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die - default - - # Needed for the slibtool patch - sed -i 's/configure.in/configure.ac/' configure.in || die - eautoreconf } src_configure() { diff --git a/dev-java/validation-api/Manifest b/dev-java/validation-api/Manifest index 30458ba26cd4..dcac63ba7efc 100644 --- a/dev-java/validation-api/Manifest +++ b/dev-java/validation-api/Manifest @@ -1,2 +1 @@ -DIST validation-api-1.0.0.GA-sources.jar 65220 BLAKE2B cee01d9979671bc2d64a22f21d608d50ddf6eca730a7c0d1fee3c4c05fab0af200153a48491b8d54a5a29b84a220f841c85264446117e25e89bd306bdd764843 SHA512 88bcde2fc9446b09cb24e73137cd16ed54953a6d93f33e8500ca196e4cec07ac03ebc446f4629291e6437d2f3757802236e56974cd3023bb25886e69e2330fc0 DIST validation-api-1.1.0.jar 94671 BLAKE2B c28f6b2ca52094f33e82d2e7c71e52ef57c503c5d50f34646ee28a9f61ea7e4da7f494f41b5f8a34ce6108ca1b75fa2d0f08eb9aab15cf033e825afc2eefdf19 SHA512 aa15184ff004357f1cdee693008587a3aa180a8f24392847258672c4a2e5a537cf189049ef95febb1a87968a42223f7736e22e00fe9307678c117f7ab6b944a8 diff --git a/dev-java/validation-api/metadata.xml b/dev-java/validation-api/metadata.xml index 8d626a41d89c..535a0cd95681 100644 --- a/dev-java/validation-api/metadata.xml +++ b/dev-java/validation-api/metadata.xml @@ -6,6 +6,6 @@ <name>Java</name> </maintainer> <upstream> - <remote-id type="github">eclipse-ee4j/beanvalidation-api</remote-id> + <remote-id type="github">jakartaee/validation</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/validation-api/validation-api-1.0.0-r1.ebuild b/dev-java/validation-api/validation-api-1.0.0-r1.ebuild deleted file mode 100644 index 316ac36886b4..000000000000 --- a/dev-java/validation-api/validation-api-1.0.0-r1.ebuild +++ /dev/null @@ -1,20 +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="Bean Validation (JSR-303) API" -HOMEPAGE="https://beanvalidation.org/" -SRC_URI="https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/${PN}/${PV}.GA/${P}.GA-sources.jar" - -LICENSE="Apache-2.0" -SLOT="1.0" -KEYWORDS="~amd64 ~x86" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" -BDEPEND="app-arch/unzip" diff --git a/dev-java/validation-api/validation-api-1.1.0-r1.ebuild b/dev-java/validation-api/validation-api-1.1.0-r2.ebuild index 1f63794e937b..fe8bd82bedc9 100644 --- a/dev-java/validation-api/validation-api-1.1.0-r1.ebuild +++ b/dev-java/validation-api/validation-api-1.1.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source" @@ -15,8 +15,6 @@ LICENSE="Apache-2.0" SLOT="1.0" KEYWORDS="amd64 x86" -IUSE="" - BDEPEND="app-arch/unzip" RDEPEND=">=virtual/jre-1.8" DEPEND=">=virtual/jdk-1.8" diff --git a/dev-java/woodstox-core/woodstox-core-6.4.0.ebuild b/dev-java/woodstox-core/woodstox-core-6.4.0-r1.ebuild index e3ac3d714258..f709dc1853a1 100644 --- a/dev-java/woodstox-core/woodstox-core-6.4.0.ebuild +++ b/dev-java/woodstox-core/woodstox-core-6.4.0-r1.ebuild @@ -43,7 +43,7 @@ CP_DEPEND=" DEPEND="${CP_DEPEND} >=virtual/jdk-11:* - dev-java/aqute-bnd-annotation:0 + dev-java/bnd-annotation:0 dev-java/osgi-core:0" RDEPEND="${CP_DEPEND} @@ -53,7 +53,7 @@ DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION} ) S="${WORKDIR}/woodstox-${P}" -JAVA_CLASSPATH_EXTRA="aqute-bnd-annotation,osgi-core" +JAVA_CLASSPATH_EXTRA="bnd-annotation,osgi-core" JAVA_SRC_DIR=( "src/main/java" "src/moditect" ) JAVA_RESOURCE_DIRS="src/main/resources" diff --git a/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild index 6d6021edc701..bcb97bf3f850 100644 --- a/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild +++ b/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/wsdl4j/WSDL4J/${PV}/wsdl4j-src-${PV}.zip" LICENSE="CPL-1.0" SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/xalan-serializer/Manifest b/dev-java/xalan-serializer/Manifest index b226e35697c6..47e6dc2239af 100644 --- a/dev-java/xalan-serializer/Manifest +++ b/dev-java/xalan-serializer/Manifest @@ -1 +1,2 @@ -DIST xalan-j_2_7_2-src.tar.gz 8416261 BLAKE2B be67c9f2f7ec1140965dc148aea94347e60a2969deb1fac5834c1458d10b3dca91b448a44ed6ebbbb227e4f04780ce0142e812cd99d8862a4cbbf5e8e2af4cb3 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8 +DIST xalan-j_2_7_3-src.tar.gz 13686458 BLAKE2B e19373aa22dad13945917d8f041f56e6ff9cc434a70e88b96764e0547a0a122a9197eeb23bb7757a5483beead334f4af62e7e1b70531b23c31199ec4733756ef SHA512 fe4b2b9471f95a2cd3607550a6c97b46b7d2576d1e814305f4564df88aaf4fdc9f88ba43dad4a5741521b2c2f5137e3e70d2d4e31b232d403a66dc1e889c8b6b +DIST xalan-j_2_7_3-src.tar.gz.asc 849 BLAKE2B 623fefefa3ab88bfdef5376101f26a9c6602c30a34c0db369159bdb7af34ccb2602011071dd3e79304e6dd4e8b8a198729347f5dbee9a06ae12af12d351de82a SHA512 5c7ed7e71f8a0c2739a64f9ba34edb28d749924d1a581b9963bed3376151a090c2c1af2b1111612822cf20d27a814e22917660f034912e8e5fa913b434e66bf2 diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.2-r1.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.2-r1.ebuild deleted file mode 100644 index 559185ec0734..000000000000 --- a/dev-java/xalan-serializer/xalan-serializer-2.7.2-r1.ebuild +++ /dev/null @@ -1,41 +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-pkg-simple - -MY_PV="$(ver_rs 1- '_')" -MY_P="xalan-j_${MY_PV}" - -DESCRIPTION="DOM Level 3 serializer from Apache Xalan, shared by Xalan and Xerces" -HOMEPAGE="https://xalan.apache.org/" -SRC_URI="mirror://apache/xalan/xalan-j/source/${MY_P}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -RDEPEND=">=virtual/jre-1.8:*" -DEPEND=">=virtual/jdk-1.8:*" - -JAVA_SRC_DIR="src" -JAVA_RESOURCE_DIRS="resources" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - # kill all non-serializer sources to ease javadocs and dosrc - find src/org/ -type f ! -path "src/org/apache/xml/serializer/*" -delete || die - - # remove bundled jars - find -name "*.jar" -delete || die - rm src/*.tar.gz || die - - # move resources elsewhere - mkdir -p resources/org/apache/xml/serializer || die - mv src/org/apache/xml/serializer/*.properties resources/org/apache/xml/serializer/ || die -} diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild new file mode 100644 index 000000000000..ac8cfa2b4bc9 --- /dev/null +++ b/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="xalan:serializer:2.7.3" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Transforming XML documents into HTML, text, or other XML document types" +HOMEPAGE="https://xalan.apache.org/" +SRC_URI="mirror://apache/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz + verify-sig? ( https://downloads.apache.org/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz.asc )" + +S="${WORKDIR}/xalan-j_${PV//./_}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +DEPEND="virtual/jdk:1.8" +RDEPEND=">=virtual/jre-1.8:*" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xalan-j )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xalan-j.apache.org.asc" + +JAVA_MAIN_CLASS="org.apache.xml.serializer.Version" +JAVA_RESOURCE_DIRS="resources" +JAVA_SRC_DIR="src" + +src_prepare() { + java-pkg-2_src_prepare + # kill all non-serializer sources to ease javadocs and dosrc + find src/org/ -type f ! -path "src/org/apache/xml/serializer/*" -delete || die + + # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS + mkdir -p resources || die + pushd src > /dev/null || die + find org -type f \ + ! -name '*.java' \ + ! -name 'Version.src' \ + ! -name 'package.html' \ + | xargs cp --parent -t ../resources || die + popd > /dev/null || die +} diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest index 927b4c4864aa..47e6dc2239af 100644 --- a/dev-java/xalan/Manifest +++ b/dev-java/xalan/Manifest @@ -1,2 +1,2 @@ -DIST xalan-j_2_7_2-bin.zip 17740075 BLAKE2B 244fd71011fa957ff1988dbbb58e40af4ad218aafbd92f2a6ec305d59ec0fb221a283442b24e4290f6d2e853cfad39d689c1397b4d18f34f4c94403610079328 SHA512 ae2be0bfc5e794b159c2d16718275a6ce6e8f63d681e2d13875f233d334a37aba872206c6c1f70565698ceaf4c66261c7df6db6c524e6e8da5dafe2f17cefddf -DIST xalan-j_2_7_2-src.tar.gz 8416261 BLAKE2B be67c9f2f7ec1140965dc148aea94347e60a2969deb1fac5834c1458d10b3dca91b448a44ed6ebbbb227e4f04780ce0142e812cd99d8862a4cbbf5e8e2af4cb3 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8 +DIST xalan-j_2_7_3-src.tar.gz 13686458 BLAKE2B e19373aa22dad13945917d8f041f56e6ff9cc434a70e88b96764e0547a0a122a9197eeb23bb7757a5483beead334f4af62e7e1b70531b23c31199ec4733756ef SHA512 fe4b2b9471f95a2cd3607550a6c97b46b7d2576d1e814305f4564df88aaf4fdc9f88ba43dad4a5741521b2c2f5137e3e70d2d4e31b232d403a66dc1e889c8b6b +DIST xalan-j_2_7_3-src.tar.gz.asc 849 BLAKE2B 623fefefa3ab88bfdef5376101f26a9c6602c30a34c0db369159bdb7af34ccb2602011071dd3e79304e6dd4e8b8a198729347f5dbee9a06ae12af12d351de82a SHA512 5c7ed7e71f8a0c2739a64f9ba34edb28d749924d1a581b9963bed3376151a090c2c1af2b1111612822cf20d27a814e22917660f034912e8e5fa913b434e66bf2 diff --git a/dev-java/xalan/xalan-2.7.2-r1.ebuild b/dev-java/xalan/xalan-2.7.2-r1.ebuild deleted file mode 100644 index 898db61934e7..000000000000 --- a/dev-java/xalan/xalan-2.7.2-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# NOTE: Building the docs is much more hassle than it's worth. It -# requires com.sun.image.codec, which has long gone from JDKs, and -# Apache StyleBook, which is long dead though it is bundled here. - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="xalan:xalan:2.7.2" - -inherit java-pkg-2 java-ant-2 - -MY_PN="${PN}-j" -MY_PV="$(ver_rs 1- _)" -MY_P="${MY_PN}_${MY_PV}" -SRC_DIST="${MY_P}-src.tar.gz" -BIN_DIST="${MY_P}-bin.zip" - -DESCRIPTION="Transforming XML documents into HTML, text, or other XML document types" -HOMEPAGE="https://xalan.apache.org/" -SRC_URI="mirror://apache/${PN}/${MY_PN}/source/${SRC_DIST} - doc? ( mirror://apache/${PN}/${MY_PN}/binaries/${BIN_DIST} )" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -CDEPEND="dev-java/javacup:0 - dev-java/bcel:0" - -BDEPEND="doc? ( app-arch/unzip )" -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:* - ~dev-java/xalan-serializer-${PV}:${SLOT}" - -DEPEND="${CDEPEND} - virtual/jdk:1.8" - -EANT_GENTOO_CLASSPATH="bcel,javacup" -EANT_BUILD_TARGET="unbundledjar" -EANT_DOC_TARGET="" - -JAVA_ANT_REWRITE_CLASSPATH="true" -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # disable building of serializer.jar - sed -i -e 's/depends="prepare,serializer.jar"/depends="prepare"/' \ - build.xml || die "sed build.xml failed" - - # remove bundled jars - find -name "*.jar" -delete || die - rm src/*.tar.gz || die -} - -src_install() { - java-pkg_newjar build/${PN}-unbundled.jar - java-pkg_dolauncher ${PN} --main org.apache.xalan.xslt.Process - java-pkg_register-dependency ${PN}-serializer - - dodoc NOTICE.txt readme.html - use doc && java-pkg_dohtml -r docs/* - use source && java-pkg_dosrc src/org -} diff --git a/dev-java/xalan/xalan-2.7.3.ebuild b/dev-java/xalan/xalan-2.7.3.ebuild new file mode 100644 index 000000000000..523e44d542b7 --- /dev/null +++ b/dev-java/xalan/xalan-2.7.3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="xalan:xalan:2.7.3" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Transforming XML documents into HTML, text, or other XML document types" +HOMEPAGE="https://xalan.apache.org/" +SRC_URI="mirror://apache/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz + verify-sig? ( https://downloads.apache.org/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz.asc )" + +S="${WORKDIR}/xalan-j_${PV//./_}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +CP_DEPEND=" + dev-java/bcel:0 + dev-java/javacup:0 + ~dev-java/xalan-serializer-${PV}:${SLOT} + dev-java/xerces:2 +" + +DEPEND="${CP_DEPEND} + virtual/jdk:1.8" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xalan-j )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xalan-j.apache.org.asc" + +JAVA_MAIN_CLASS="org.apache.xalan.xslt.Process" +JAVA_SRC_DIR="src" + +src_prepare() { + java-pkg-2_src_prepare + # serializer is packaged separately + rm -r src/org/apache/xml/serializer || die "cannot remove serializer" +} diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest index a536128f8645..768ed441fa44 100644 --- a/dev-java/xerces/Manifest +++ b/dev-java/xerces/Manifest @@ -1 +1,2 @@ DIST Xerces-J-src.2.12.2.tar.gz 1812583 BLAKE2B f1b5928abe2852acc4d554c47aa7cbd81a568e15c8a1fd5ea98dc526c52838b0a50920d2ed807e607b01c875676e54578f1493856b06de5a7ba8784591f7f06f SHA512 e71a692212a974ebfa39af5ffd023b433ece34425b12aceeffe89cebe04f28dd8fa46a131a56f30295dca36de115128a6d7e05172c82f5b85d914cd991f34056 +DIST Xerces-J-src.2.12.2.tar.gz.asc 849 BLAKE2B 58faca219413b5b13ded6bedb16acca5ffe53a6890c2ea6ec6f5b2b19b46b179bd74b225e608b936b0d6abad24b947930da24339256137a291e5bc863a11c416 SHA512 77cc480b9eff693ab7b5fe4c8a8963cbd53e895dd130bc0ef3fbaebce6d64e59c068806f10bbf650f51a4fb132a49d24c869c8a01e9922bf792bb479602b9846 diff --git a/dev-java/xerces/xerces-2.12.2.ebuild b/dev-java/xerces/xerces-2.12.2-r1.ebuild index 74142d24ba0b..c74ab4cdedaa 100644 --- a/dev-java/xerces/xerces-2.12.2.ebuild +++ b/dev-java/xerces/xerces-2.12.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,11 +6,12 @@ EAPI=8 JAVA_PKG_IUSE="doc source" MAVEN_ID="xerces:xercesImpl:2.12.2" -inherit java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple verify-sig DESCRIPTION="Xerces Java XML parser" HOMEPAGE="https://xerces.apache.org/xerces2-j/index.html" -SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz" +SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz + verify-sig? ( https://downloads.apache.org/xerces/j/source/Xerces-J-src.${PV}.tar.gz.asc )" LICENSE="Apache-2.0" SLOT="2" @@ -35,6 +36,9 @@ RDEPEND=" ${CP_DEPEND} >=virtual/jre-1.8:*" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xerces-j )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xerces-j.apache.org.asc" + DOCS=( LICENSE NOTICE README {LICENSE.resolver,LICENSE.serializer,NOTICE.resolver,NOTICE.serializer}.txt ) HTML_DOCS=( {LICENSE.DOM-documentation,LICENSE.DOM-software,LICENSE-SAX,Readme}.html ) @@ -44,14 +48,21 @@ JAVA_SRC_DIR="src" JAVA_RESOURCE_DIRS="resources" src_prepare() { - default - mkdir "${JAVA_RESOURCE_DIRS}" || die - cp -r "${JAVA_SRC_DIR}/org" "${JAVA_RESOURCE_DIRS}" || die - find "${JAVA_RESOURCE_DIRS}" -type f -name '*.java' -exec rm -rf {} + || die - rm "${JAVA_RESOURCE_DIRS}"/org/apache/xerces/{dom/org.apache.xerces.dom.DOMImplementationSourceImpl,xs/datatypes/package.html,parsers/org*} || die -} - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install + java-pkg-2_src_prepare + # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS + mkdir -p "resources/META-INF/services"|| die + pushd "src" > /dev/null || die + find -type f \ + \( -name 'javax.xml.*Factory' \ + -or -name '*DOMImplementationSourceList' \ + -or -name 'org.xml.sax.driver' \) \ + | xargs mv -t ../resources/META-INF/services || die + find -type f \ + ! -name '*.java' \ + ! -name 'manifest.xerces' \ + ! -name 'package.html' \ + ! -name '*Configuration' \ + ! -name '*DOMImplementationSourceImpl' \ + | xargs cp --parent -t ../resources || die + popd > /dev/null || die } diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest index 321305027c64..2abe373cdc3b 100644 --- a/dev-java/xmlgraphics-commons/Manifest +++ b/dev-java/xmlgraphics-commons/Manifest @@ -1,2 +1,2 @@ -DIST xmlgraphics-commons-2.8-src.tar.gz 2243271 BLAKE2B 86456adf4b9610e580b3b4f87c362dc1259c2f2bb4d4abb0dc3d765ee2cc5fb3df54597f5a5fa620a813dee83cd7549771d2b4116d20077103e389f1942903a0 SHA512 3e6c397a7444c4ce1d1aeda96a7c9abfd3d8d57a0997d7d6ae2be36303dd17550b7b92fd86eac832566bbeefccdd06619e31c0d907cd6b953a8eb934d7fa618b -DIST xmlgraphics-commons-2.8-src.tar.gz.asc 833 BLAKE2B d68b6fe36b44764c44b67baca02a50f01644aaf2e8ed6571caeffd7724b6284860bd81d5a2ddcbefde6411bd5c9ed072f853cd178f862541f9f49aea3e023e21 SHA512 6e17a628ddd253c44d62a7f08d615f5a484bb6433482e6e217e794620396150b327f2e89836f62aafde3050ac0677432e0b12b645c57ae74cc11e093d86ac43c +DIST xmlgraphics-commons-2.9-src.tar.gz 2236891 BLAKE2B 5071418eb2773ade7d48faa00a45834ee392603adb7844ce7b7ffc6ab41f0d655ce29265fc56326093b06b7e2cb1b1f4b95ab5e0f339c05cca4e0eb71d59f368 SHA512 896a5fe41277783021075df0de1aa109a7f05416af6b0141301a2452197d85df0daef28f5c2a71802644cbff3bfe79579a1544000a4c1b5cec4c211d8effd521 +DIST xmlgraphics-commons-2.9-src.tar.gz.asc 833 BLAKE2B e85533d2509dc49f42346e373a416c8215600ff84a393ca6de545fce6e73d704a8146a257522e66a254248ebdbc6770e0040658223582184e0d8fd71f95bd941 SHA512 e52f02efba535192455b47a4adbb903426e51163083297eb7be83146e2c7ead913f4c0a51345681123afa64fbb3bffcea982a81fd2b92be2aa4c135082ed8e17 diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild index da56f76c0b4e..2c0a190b489a 100644 --- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild +++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild @@ -1,13 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/xmlgraphics/commons/source/2.8-src.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmlgraphics-commons-2.8.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.xmlgraphics:xmlgraphics-commons:2.8" +MAVEN_ID="org.apache.xmlgraphics:xmlgraphics-commons:2.9" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple verify-sig @@ -17,26 +14,17 @@ HOMEPAGE="https://xmlgraphics.apache.org/commons/" SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-${PV}-src.tar.gz.asc )" +S="${WORKDIR}/${P}" + LICENSE="Apache-2.0" SLOT="2" KEYWORDS="amd64 arm64 ppc64 x86" -# Common dependencies -# POM: pom.xml -# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1 -# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 - CP_DEPEND=" dev-java/commons-io:1 dev-java/commons-logging:0 " -# Compile dependencies -# POM: pom.xml -# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4 -# test? org.mockito:mockito-core:2.28.2 -> >=dev-java/mockito-4.8.0:4 -# test? xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0 - DEPEND="${CP_DEPEND} >=virtual/jdk-1.8:* test? ( @@ -48,25 +36,15 @@ RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-commons )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/xmlgraphics-commons.apache.org.asc" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-commons.apache.org.asc" DOCS=( NOTICE README ) -S="${WORKDIR}/${P}" - JAVA_RESOURCE_DIRS="src/main/resources" JAVA_SRC_DIR="src/main/java" JAVA_TEST_EXTRA_ARGS=( -ea ) JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4,xml-commons-resolver" -# Some *.{png,tiff,txt,xmp} are misplaced in "src/main/java". +# Some *.{png,tiff,txt,xmp} are misplaced in "src/test/java". JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "src/test/java" ) JAVA_TEST_SRC_DIR="src/test/java" - -src_test() { - local vm_version="$(java-config -g PROVIDES_VERSION)" - if ver_test "${vm_version}" -ge 11; then - JAVA_TEST_EXCLUDES="org.apache.xmlgraphics.image.loader.CorruptImagesTestCase" - fi - java-pkg-simple_src_test -} diff --git a/dev-java/xmlunit/xmlunit-1.6-r1.ebuild b/dev-java/xmlunit/xmlunit-1.6-r1.ebuild index d3c83446d281..5f464a7ad02a 100644 --- a/dev-java/xmlunit/xmlunit-1.6-r1.ebuild +++ b/dev-java/xmlunit/xmlunit-1.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,8 +9,8 @@ MAVEN_ID="xmlunit:xmlunit:1.6" inherit java-pkg-2 java-ant-2 DESCRIPTION="XMLUnit extends JUnit and NUnit to enable unit testing of XML" -SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip" -HOMEPAGE="http://xmlunit.sourceforge.net/" +HOMEPAGE="https://sourceforge.net/projects/xmlunit/ https://www.xmlunit.org" +SRC_URI="mirror://sourceforge/project/xmlunit/xmlunit%20for%20Java/XMLUnit%20for%20Java%20${PV}/${P}-src.zip" LICENSE="BSD" SLOT="1" diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest index 624ff54095fb..56fcf0e06d10 100644 --- a/dev-java/xz-java/Manifest +++ b/dev-java/xz-java/Manifest @@ -1 +1,2 @@ DIST xz-java-1.9.zip 155868 BLAKE2B e1e355e75b3d14cae9a12dd00105ff38e25ab9c270cecafc83f27a7a03b36aa7a33647b40b7458b3592319a2b574e10cef9786413f0a12af585199a8f00731de SHA512 743f81ac715d7ac2760af8cee4c62d8fbeef156c0d3e0e85e4605ae08d6a71d1e6f6675e0558e7906a92d5fb3ca1feab9db015a1d42b5df73de2dec770a339cb +DIST xz-java-1.9.zip.sig 566 BLAKE2B 9702fa3021c4274aacc74ef84903429ed5301eac11cae6bf79014a5bad590c51b169c35f64add85c964cb815129acf920a014e5601acfcd075147f5fb8e9df1e SHA512 5f511260da0f5a9338106ac56511b7a105996852103a3f40cc4a44a7e4e03dc39a645bb0a57ae99bcde8267d5a2d514a7c956a8bfe226c0472e1fa3c7d28e3d5 diff --git a/dev-java/xz-java/xz-java-1.9.ebuild b/dev-java/xz-java/xz-java-1.9-r1.ebuild index 0a65a660b650..0b7ed480b07a 100644 --- a/dev-java/xz-java/xz-java-1.9.ebuild +++ b/dev-java/xz-java/xz-java-1.9-r1.ebuild @@ -1,29 +1,32 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc examples source" MAVEN_ID="org.tukaani:xz:1.9" -inherit java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple verify-sig DESCRIPTION="Implementation of xz data compression in pure java" HOMEPAGE="https://tukaani.org/xz/java.html" -SRC_URI="https://tukaani.org/xz/${P}.zip" +SRC_URI="https://tukaani.org/xz/${P}.zip + verify-sig? ( https://tukaani.org/xz/${P}.zip.sig )" +S="${WORKDIR}" LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -RDEPEND=" - >=virtual/jre-1.8:*" +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" -DEPEND=" +BDEPEND=" app-arch/unzip - >=virtual/jdk-1.8:*" + verify-sig? ( sec-keys/openpgp-keys-lassecollin ) +" -S="${WORKDIR}" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lassecollin.asc" JAVA_SRC_DIR="src/org" diff --git a/dev-java/zxing-core/zxing-core-3.5.1.ebuild b/dev-java/zxing-core/zxing-core-3.5.1.ebuild index c7971ce79170..b819019f170b 100644 --- a/dev-java/zxing-core/zxing-core-3.5.1.ebuild +++ b/dev-java/zxing-core/zxing-core-3.5.1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/zxing/zxing/core" SRC_URI="https://github.com/zxing/zxing/archive/zxing-${PV}.tar.gz" LICENSE="Apache-2.0" SLOT="3" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/zxing-javase/files/3.5.1-test-available-formats.patch b/dev-java/zxing-javase/files/3.5.1-test-available-formats.patch new file mode 100644 index 000000000000..62e154f0dad4 --- /dev/null +++ b/dev-java/zxing-javase/files/3.5.1-test-available-formats.patch @@ -0,0 +1,31 @@ +https://github.com/zxing/zxing/pull/1668 +https://bugs.gentoo.org/910497 +--- a/src/test/java/com/google/zxing/client/j2se/MatrixToImageWriterTestCase.java ++++ b/src/test/java/com/google/zxing/client/j2se/MatrixToImageWriterTestCase.java +@@ -17,7 +17,9 @@ + package com.google.zxing.client.j2se; + + import com.google.zxing.common.BitMatrix; ++import static org.hamcrest.CoreMatchers.hasItem; + import org.junit.Assert; ++import static org.junit.Assume.assumeThat; + import org.junit.Test; + + import javax.imageio.ImageIO; +@@ -25,6 +27,7 @@ + import java.io.IOException; + import java.nio.file.Files; + import java.nio.file.Path; ++import java.util.Arrays; + + /** + * Tests {@link MatrixToImageWriter}. +@@ -52,6 +55,8 @@ private static void doTest(MatrixToImageConfig config) throws IOException { + } + + private static void doTestFormat(String format, MatrixToImageConfig config) throws IOException { ++ assumeThat(Arrays.asList(ImageIO.getWriterFormatNames()), hasItem(format)); ++ + int width = 2; + int height = 3; + BitMatrix matrix = new BitMatrix(width, height); diff --git a/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild index 71d865b48108..ef015da75c4b 100644 --- a/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild +++ b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild @@ -10,11 +10,11 @@ JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Core barcode encoding/decoding library" -HOMEPAGE="https://github.com/zxing/zxing/core" +HOMEPAGE="https://github.com/zxing/zxing" SRC_URI="https://github.com/zxing/zxing/archive/zxing-${PV}.tar.gz" LICENSE="Apache-2.0" SLOT="3" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" CP_DEPEND=" dev-java/jcommander:0 @@ -31,7 +31,16 @@ RDEPEND=" S="${WORKDIR}/zxing-zxing-${PV}/javase" +PATCHES=( + "${FILESDIR}/${PV}-test-available-formats.patch" +) + JAVA_AUTOMATIC_MODULE_NAME="com.google.zxing.javase" JAVA_SRC_DIR="src/main/java" JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + default # apply PATCHES + java-pkg-2_src_prepare +} |