diff options
Diffstat (limited to 'dev-java')
286 files changed, 3836 insertions, 5213 deletions
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild index 172467ec6ed4..120a631bc481 100644 --- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild +++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild @@ -33,7 +33,7 @@ RESTRICT="test" CDEPEND=" >=dev-java/ant-1.10.14-r3:0 - dev-java/ant-ivy:2 + dev-java/ant-ivy:0 dev-java/bcel:0 dev-java/commons-httpclient:3 dev-java/xerces:2 @@ -54,7 +54,7 @@ RDEPEND="${CDEPEND} >=virtual/jre-1.8:*" # JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2" -JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant,bcel,ant-ivy-2,xerces-2" +JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant,bcel,ant-ivy,xerces-2" JAVA_SRC_DIR="src/main/java" JAVA_RESOURCE_DIRS="src/main/resources" diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild index 0158c70768f5..32e0a711eb11 100644 --- a/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild +++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild @@ -12,9 +12,10 @@ inherit java-pkg-2 java-pkg-simple java-osgi DESCRIPTION="Ivy is a free java based dependency manager" HOMEPAGE="https://ant.apache.org/ivy/" SRC_URI="https://archive.apache.org/dist/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz" +S="${WORKDIR}/apache-ivy-${PV}" LICENSE="Apache-2.0" -SLOT="2" +SLOT="0" KEYWORDS="amd64 ppc64 x86" PROPERTIES="test_network" @@ -24,7 +25,7 @@ CDEPEND=" >=dev-java/ant-1.10.14-r3:0 dev-java/bcpg:0 dev-java/bcprov:0 - dev-java/httpcomponents-client + dev-java/httpcomponents-client:4 dev-java/commons-vfs:2 dev-java/httpcore:0 dev-java/jakarta-oro:2.0 @@ -45,8 +46,6 @@ RDEPEND="${CDEPEND} DOCS=( LICENSE NOTICE README.adoc ) -S="${WORKDIR}/apache-ivy-${PV}" - JAVA_GENTOO_CLASSPATH=" ant bcpg diff --git a/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild index 1997ce8c081f..2bb054ab64c1 100644 --- a/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild +++ b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild @@ -48,7 +48,6 @@ RDEPEND=" ${CP_DEPEND} " -S="${WORKDIR}" TARBALL_S="${S}/${MY_PN}3-${PV}" JAVA_SRC_DIR="org" diff --git a/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild b/dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild index 2891b009c53f..c45261fa0f91 100644 --- a/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild +++ b/dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild @@ -23,6 +23,7 @@ SRC_URI=" https://github.com/antlr/antlr4/archive/${PV}.tar.gz -> ${MY_P}.tar.gz https://repo1.maven.org/maven2/org/antlr/antlr4/${PV}/antlr4-${PV}-sources.jar -> ${P}-sources.jar " +S="${WORKDIR}/${MY_PN}4-${PV}" LICENSE="BSD" SLOT="4" @@ -51,8 +52,6 @@ RDEPEND=" ${CP_DEPEND} " -S="${WORKDIR}/${MY_PN}4-${PV}" - JAVA_SRC_DIR=( tool/src ../src/org # For UnicodeData.java @@ -103,7 +102,7 @@ src_test() { ) local CP="${S}/${JAVA_JAR_FILENAME}" for test_dep in "${test_deps[@]}"; do - CP+=":$(java-pkg_getjars --with-dependencies "${test_dep}")" + CP+=":$(java-pkg_getjars --build-only --with-dependencies "${test_dep}")" done for res_dir in "${JAVA_TEST_RESOURCE_DIRS[@]}"; do CP+=":${res_dir}" diff --git a/dev-java/apache-rat/apache-rat-0.15-r1.ebuild b/dev-java/apache-rat/apache-rat-0.15-r2.ebuild index 330f4023ee7a..57fff834a4f4 100644 --- a/dev-java/apache-rat/apache-rat-0.15-r1.ebuild +++ b/dev-java/apache-rat/apache-rat-0.15-r2.ebuild @@ -25,7 +25,7 @@ KEYWORDS="amd64 x86" CP_DEPEND=" >=dev-java/ant-1.10.14:0 - dev-java/commons-cli:1 + dev-java/commons-cli:0 dev-java/commons-collections:4 dev-java/commons-compress:0 dev-java/commons-io:1 diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest index 2ec40365fab3..18b5f35167c0 100644 --- a/dev-java/asm/Manifest +++ b/dev-java/asm/Manifest @@ -1 +1,2 @@ DIST asm-ASM_9_6.tar.bz2 1374579 BLAKE2B 621b19f1818ffdd451037af210ec7c3286e3dabdb1d6192157c2e6e8c101f599691cd4de57adf500f5413b4aaf4f808d6ac791e84626223a7be5672a17137670 SHA512 86b2db3e81c29c465d4128736f88ae3b73af8f312915921549d0acdb50a8d2c2c2beed5162af164b6e75278702af0c6f0a8d84b4133516eb4ac419520b7c764d +DIST asm-ASM_9_7.tar.bz2 1376322 BLAKE2B 397a884b257edfd61f67909390c8fe07880d5a295b51dd3982ebbe9b6f8fbac200c46913e6c18e4efdcc80f0e1f0b8463ca9d912484b466ca174b55919a1c259 SHA512 9b7f2d4895f105f75e2c42d8882b176dba32defb17d8da4bdedb2bfe4e5413b03c05a9694114d171aa9623e86a65a677a24ab16a47aef774342d56224400274f diff --git a/dev-java/asm/asm-9.7.ebuild b/dev-java/asm/asm-9.7.ebuild new file mode 100644 index 000000000000..eb1994183f55 --- /dev/null +++ b/dev-java/asm/asm-9.7.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# tests not enabled because of missing eclass support of junit-jupiter +JAVA_PKG_IUSE="doc source" +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 + +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" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" + +DEPEND=">=virtual/jdk-11:*" +RDEPEND=">=virtual/jre-1.8:*" + +ASM_MODULES=( "asm" "asm-tree" "asm-analysis" "asm-commons" "asm-util" ) +JAVADOC_SRC_DIRS=( + asm/src/main/java + asm-tree/src/main/java + asm-analysis/src/main/java + asm-commons/src/main/java + asm-util/src/main/java +) + +src_prepare() { + default + local module + touch asm.module || die + for module in "${ASM_MODULES[@]}"; do + module=${module/-/.} + cat > ${module/./-}/src/main/java/module-info.java <<-EOF || die + open module org.objectweb.${module/analysis/tree.analysis} { + $(cat asm.module) + requires java.base; + exports org.objectweb.${module/analysis/tree.analysis}; + } + EOF + echo "requires transitive org.objectweb.${module/analysis/tree.analysis};" \ + >> asm.module || die + done + sed -e '/^$/d' \ + -e '/asm;/p;s:\(asm\)\(;\):\1.signature\2:' \ + -i asm/src/main/java/module-info.java || die + sed -e '/analysis/d' \ + -i asm-commons/src/main/java/module-info.java || die + sed -e '/commons/d' \ + -i asm-util/src/main/java/module-info.java || die +} + +src_compile() { + local module + for module in "${ASM_MODULES[@]}"; do + einfo "Compiling ${module}" + JAVA_JAR_FILENAME="${module}.jar" + JAVA_SRC_DIR="${module}/src/main/java" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar" + rm -r target || die + done + + if use doc; then + einfo "Compiling javadocs" + for module in "${ASM_MODULES[@]}"; do + rm "${module}/src/main/java/module-info.java" || die + JAVA_SRC_DIR+=("${module}/src/main/java") + done + ejavadoc + fi +} + +src_install() { + JAVA_JAR_FILENAME="asm.jar" + java-pkg-simple_src_install + local module + for module in asm-{analysis,commons,tree,util}; do + java-pkg_dojar ${module}.jar + if use source; then + java-pkg_dosrc "${module}/src/main/java/*" + fi + done +} diff --git a/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild b/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild index cd4ffebed4b2..4cc72084bcfb 100644 --- a/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild +++ b/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/auto-auto-service-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest index 387e9e378b12..b8234664e4eb 100644 --- a/dev-java/bcel/Manifest +++ b/dev-java/bcel/Manifest @@ -1,2 +1,4 @@ +DIST bcel-6.10.0-src.tar.gz 1085294 BLAKE2B d2d3a0824ec45a5f47282a7255915ba0c891d5fc20ee37f4bba3b8ca5e8b61f6bdf47ed8903e60dbb96d253b8df1d79761888227880d44444f8b7fe24dca0853 SHA512 7ea129a048bf510ed15212a17680dfa37fe8c4adcc75504fa9a6ff35ef97d25f267547ad019fe146cd2fea9a3ef0eaca432d4c9cac7570ba5e68897f21c29a14 +DIST bcel-6.10.0-src.tar.gz.asc 488 BLAKE2B c575c3f68f06538dc8d34dccf6dd157824b6ecf8b7a1f0a220fe1828a1546ecfb46699f1374c9dd90bf89d9b311ce48f8d4b9e45818764d5f078817a17573557 SHA512 a19a5a6702c9d8d38733af6d983da6c60dac910f8ef3f4c6daae8e6ebe7bdd0ccc9029bad7af78984979e62cdc63d50e6f3a4ef02f409212fde1479465901863 DIST bcel-6.6.0-src.tar.gz 1009654 BLAKE2B 9043cc077773383aebf9b56e8c67de9ffb9e278db1737eefb5966b32cbe36131bd6ec14454361daaf424a8114de21e804dadaebfbee6d11493026b8a98135668 SHA512 13f361be498625c3276860ae14c225c49135687f4ba69de4afaac2d135df4e5c6b51277e3cd4c05bac27156e4fab5316c102a25a67d8abb6c640499917d01917 DIST bcel-6.6.0-src.tar.gz.asc 488 BLAKE2B b3d07f9d6f8f2b92215173d390281cab03b98dea2e926f5fe7f3ced74610c56dfa2915c5bfeeca360cd3904773cb66f8d9042062e6b3821f707853ef5c82fc73 SHA512 65830fcd5f5adb1deb92edd0b9181b9aeaf3d5357858a348606416dcfb416f58420ceb6c8ea58a550d5d7b4d1909dcff125b31496c00a9107ae211936c1d6e1d diff --git a/dev-java/bcel/bcel-6.10.0-r1.ebuild b/dev-java/bcel/bcel-6.10.0-r1.ebuild new file mode 100644 index 000000000000..8c3d2a18b744 --- /dev/null +++ b/dev-java/bcel/bcel-6.10.0-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# No tests, #839681 +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.apache.bcel:bcel:6.10.0" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Apache Commons Bytecode Engineering Library" +HOMEPAGE="https://commons.apache.org/proper/commons-bcel/" +SRC_URI="https://downloads.apache.org/commons/bcel/source/${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/bcel/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 ~ppc-macos ~x64-macos ~x64-solaris" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" +CP_DEPEND="dev-java/commons-lang:3.6" +DEPEND="${CP_DEPEND} + >=virtual/jdk-11:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +DOCS=( NOTICE.txt RELEASE-NOTES.txt ) + +JAVA_SRC_DIR="src/main/java" + +src_compile() { + JAVA_JAR_FILENAME="org.apache.${PN}.jar" + java-pkg-simple_src_compile # creates a legacy jar file without module-info + + jdeps \ + --module-path "$(java-pkg_getjars commons-lang-3.6)" \ + --add-modules org.apache.commons.lang \ + --generate-module-info \ + src/main/java \ + --multi-release 9 \ + "${JAVA_JAR_FILENAME}" || die + + JAVA_JAR_FILENAME="${PN}.jar" + java-pkg-simple_src_compile # creates the final jar file including module-info +} diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest index a9a299b3af1d..34f73ef00305 100644 --- a/dev-java/bcprov/Manifest +++ b/dev-java/bcprov/Manifest @@ -1,4 +1,2 @@ -DIST bc-java-r1rv74.tar.gz 31236157 BLAKE2B ffdfe7aa34f361a559051f31fc57eeff39f7d080e4de4a94bdd0d79d92172b2646efa122edaf067633d6a840015e17271c186122598c18e3226622428fa9e1e7 SHA512 887183f825a8834ff512a66fa3f9075259b3266c2861e6e046990bd2dda80b896a8fd221ff2982a127de79fe998727ecc12cade4e6c381f2a152a72ee575d8a1 DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4 -DIST bc-test-data-r1rv74.tar.gz 2074813647 BLAKE2B 8060ee31fa45fbceecb3ed57bc5d8195c8ea72c732e56f2c5f5adf9f785e76934300fe2b07aabc4fa5672c2eb39b5b7aad1393a7ff47dd42a048fa110b9a1db6 SHA512 8a8aa2e372b533a8bca5dc81a94c08c50470446c1457a487b18a96620841b8035344148bcb46b4e211c287ca42b0ee2db29ea402967bf55b8bb0958eb5fbabae DIST bc-test-data-r1rv77.tar.gz 2074825965 BLAKE2B b797821719ba0dcdd091e0fd4f14c79058a15702973978a055bcc998ff541a8c5e96feb757647a9696e4bbfa28bf80a317066a51fd4daac7b2508111d0d217b1 SHA512 c8701a270ddcfde353b480caa62e2237776b50b0937ac015ee3e5221a74d0817de9bc67f1fa9f53f5e48d861dbf94339cb45a08cb4dad37f1340f754cb1d910e diff --git a/dev-java/bcprov/bcprov-1.74.ebuild b/dev-java/bcprov/bcprov-1.74.ebuild deleted file mode 100644 index 6918c239c192..000000000000 --- a/dev-java/bcprov/bcprov-1.74.ebuild +++ /dev/null @@ -1,106 +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="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/c3p0/c3p0-0.9.5.5-r1.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild index 4111832765af..e41111b8469c 100644 --- a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild +++ b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild @@ -6,15 +6,16 @@ EAPI=8 # Tests require an existing running SQL server and 'junit.jar.file' property JAVA_PKG_IUSE="doc examples source" -inherit java-pkg-2 java-ant-2 +inherit java-pkg-2 DESCRIPTION="JDBC drivers with JNDI-bindable DataSources" HOMEPAGE="https://www.mchange.com/projects/c3p0/" SRC_URI="https://downloads.sourceforge.net/project/c3p0/c3p0-src/c3p0-${PV}/${P}.src.tgz" +S="${WORKDIR}/${P}.src" LICENSE="|| ( EPL-1.0 LGPL-2.1 )" SLOT="0" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux" CP_DEPEND=" dev-java/log4j-12-api:2 @@ -31,12 +32,11 @@ RDEPEND=" ${CP_DEPEND} " -S="${WORKDIR}/${P}.src" - -JAVA_ANT_REWRITE_CLASSPATH="yes" +PATCHES=( "${FILESDIR}/c3p0-0.9.5.5-source-target.patch" ) src_prepare() { java-pkg_clean + default #780585 java-pkg-2_src_prepare java-pkg_jar-from --into lib/ log4j-12-api-2 java-pkg_jar-from --into lib/ mchange-commons @@ -47,6 +47,12 @@ src_prepare() { die "Failed to remove unused test sources" } +src_compile() { + eant jar $(usev doc javadoc) \ + -Dant.build.javac.source="$(java-pkg_get-source)" \ + -Dant.build.javac.target="$(java-pkg_get-target)" +} + src_install() { java-pkg_newjar "build/${P}.jar" einstalldocs diff --git a/dev-java/c3p0/files/c3p0-0.9.5.5-source-target.patch b/dev-java/c3p0/files/c3p0-0.9.5.5-source-target.patch new file mode 100644 index 000000000000..d066a59fde1b --- /dev/null +++ b/dev-java/c3p0/files/c3p0-0.9.5.5-source-target.patch @@ -0,0 +1,49 @@ +diff --git a/build.xml b/build.xml +index 47a0f2a..47f8f2b 100644 +--- a/build.xml ++++ b/build.xml +@@ -180,8 +180,6 @@ + <target name="init-codegen" depends="debuggen,subst"> + <javac destdir="${build.classes.dir}" + classpathref="codegen-classpath" +- source="${jvm.target.version}" +- target="${jvm.target.version}" + debug="true"> + <src> + <pathelement location="${build.codegen.dir}" /> +@@ -224,8 +222,6 @@ + <target name="compile-common" depends="codegen"> + <javac destdir="${build.classes.dir}" + classpathref="build-classpath" +- source="${jvm.target.version}" +- target="${jvm.target.version}" + debug="on"> + <sourcepath> + <pathelement location="${build.codegen.dir}" /> +@@ -246,8 +242,6 @@ + <target name="compile-subst" depends="codegen"> + <javac destdir="${build.classes.dir}" + classpathref="build-classpath" +- source="${jvm.target.version}" +- target="${jvm.target.version}" + debug="on"> + <sourcepath> + <pathelement location="${build.codegen.dir}" /> +@@ -262,8 +256,6 @@ + <target name="compile-mgmt" depends="codegen" unless="no-mgmt"> + <javac destdir="${build.classes.dir}" + classpathref="build-classpath" +- source="${jvm.target.version}" +- target="${jvm.target.version}" + debug="on"> + <sourcepath> + <pathelement location="${java.src.dir}" /> +@@ -318,8 +310,6 @@ + <target name="compile-junit" depends="compile"> + <javac destdir="${test.classes.dir}" + classpathref="test-classpath" +- source="${jvm.target.version}" +- target="${jvm.target.version}" + debug="on"> + <sourcepath> + <pathelement location="${java.src.dir}" /> diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest index a520abac15a6..f0802ea1f788 100644 --- a/dev-java/checker-framework-qual/Manifest +++ b/dev-java/checker-framework-qual/Manifest @@ -1 +1,2 @@ -DIST checker-framework-3.42.0.tar.gz 8280060 BLAKE2B c2f7c192eb9a7a26b66e46f0c22c18a05ec8cc3c4c01d444e7f14e41c89db83b5d2738f78e3b16eea9cd9ebf3138171bbc6fabb195bdd9776defa06d75e516d6 SHA512 310578593509674b2d36353b2044009ac98b50906d715f1168a96490a1b87aa8227c1713f64adeabd98e370fb1a6a25dd148a5700ff6f4f28ba6b69ba505c149 +DIST checker-framework-3.43.0.tar.gz 8306595 BLAKE2B bcabe8e5a0de20615980048780528b6fcb1946f8793b9cd7c3b12afeb4688c6eb91724fd111419a243801b1456537cd40994d062f2ac341e904c93c285c530ad SHA512 73f6d6d45cf926b23160fc6089596f27b33b1ae6b8489aa3a2c2e0d8330331c331ce87d0826de8f512432d469f96330e77a4323082b3db4af5f5abf81ba06295 +DIST checker-framework-3.47.0.tar.gz 8335232 BLAKE2B 4b6d8f5bb055402e6b368640eb42e4e13173dc847a4b8145e7c306856cab2151c17bfbd2c3a645708e9b7525a1e3f73d4c28c3ae24d038ac0c3119d8fcf671df SHA512 17188ab83ee8c91fb112ed0f750611c7fb5fc17f80a0bbd9b19f1514902770c2a227cf879fb581c8c915fa9827febaa8e67a0188c70df625268118344a281fbd diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.42.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild index 5831dfb7010b..5831dfb7010b 100644 --- a/dev-java/checker-framework-qual/checker-framework-qual-3.42.0.ebuild +++ b/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild new file mode 100644 index 000000000000..026febee0f73 --- /dev/null +++ b/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.checkerframework:checker-qual:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Annotations for type-checking by the Checker Framework" +HOMEPAGE="https://checkerframework.org/" +SRC_URI="https://github.com/typetools/checker-framework/archive/checker-framework-${PV}.tar.gz" +S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=">=virtual/jdk-11:*" # module-info +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest index 5defc51942de..6e506677c4d4 100644 --- a/dev-java/commons-cli/Manifest +++ b/dev-java/commons-cli/Manifest @@ -1 +1,3 @@ DIST commons-cli-1.5.0-src.tar.gz 156731 BLAKE2B b3bc3c7426f4564187f6b2fecf2977a8d307277cb244bb51064f32e6d2fc0ddb08c539b3bae68bba5ccc2319d0e483f01f6765ae3e86ebfe99eb775564fd7c8f SHA512 aa2165695177c3e4561f68585cafb5434758138d8a863f3db1860477f660cf78664d2afb07cc3bc767bc8fa87befc7eaa5bdead423ee8b883c62ff00aec7cdda +DIST commons-cli-1.9.0-src.tar.gz 187533 BLAKE2B d38f6602e065059521a052e2a9bfe7b05f9cd7da26537b3237868e583d7ca904e36cd58ffe04b9ea5feae81594cdc2bcbab7c16d2c95f2888f5ffd35c78c485c SHA512 d20df809e8e0ebed79c57af9c9b447b0068347ba0edfcdec3652cb00bd9575b24fc77093d735e827d9d02a6fe2681bf239fd01df5f7c682ae34ade0781c53e35 +DIST commons-cli-1.9.0-src.tar.gz.asc 488 BLAKE2B 22992f7fe15617c0422061447f9bae8ff5ab5804514b48bb277cfad0483e932694048159b82f1782369bdf1f25f5a9387f63ea2d83f147ea80f9ef21d1b772c5 SHA512 27f46b143efef09c6ec84382b2c7ca3877441190f3201ed167560572e741c23d641c3c534b1c25df399445957353285bed7913f113db8489c097b2057ed70571 diff --git a/dev-java/commons-cli/commons-cli-1.5.0.ebuild b/dev-java/commons-cli/commons-cli-1.5.0-r1.ebuild index 576a7661f095..d3b9d7264d64 100644 --- a/dev-java/commons-cli/commons-cli-1.5.0.ebuild +++ b/dev-java/commons-cli/commons-cli-1.5.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-cli/" SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz" LICENSE="Apache-2.0" -SLOT="1" +SLOT="0" KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/commons-cli/commons-cli-1.9.0.ebuild b/dev-java/commons-cli/commons-cli-1.9.0.ebuild new file mode 100644 index 000000000000..c25fd62d91e9 --- /dev/null +++ b/dev-java/commons-cli/commons-cli-1.9.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# No tests, #839681 +JAVA_PKG_IUSE="doc source" +MAVEN_ID="commons-cli:commons-cli:1.9.0" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="A Java library for working with the command line arguments and options" +HOMEPAGE="https://commons.apache.org/proper/commons-cli/" +SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/cli/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/${P}-src" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +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-11:*" # module-info +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_SRC_DIR="src/main/java" + +src_compile() { + JAVA_JAR_FILENAME="org.apache.${PN}.jar" + java-pkg-simple_src_compile # creates a legacy jar file without module-info + + jdeps --generate-module-info \ + src/main/java \ + --multi-release 9 \ + "${JAVA_JAR_FILENAME}" || die + + JAVA_JAR_FILENAME="${PN}.jar" + java-pkg-simple_src_compile # creates the final jar file including module-info + +} 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 index 7ec6cb15cb8c..a292cac71fb2 100644 --- a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild +++ b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild @@ -19,7 +19,7 @@ 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" +VERIFY_SIG_OPENPGP_KEY_PATH="/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=" @@ -41,11 +41,3 @@ 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-daemon/Manifest b/dev-java/commons-daemon/Manifest index 2255e60c5501..46a5084819ff 100644 --- a/dev-java/commons-daemon/Manifest +++ b/dev-java/commons-daemon/Manifest @@ -1,2 +1,4 @@ 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 +DIST commons-daemon-1.4.0-src.tar.gz 291610 BLAKE2B 3a13a00e209ad501a34ebef32a5e5bf9bd25de309434249d81a5ba96bad2e922a6cdae42624a7a8da64555838c9bb12cb54de4da59193f16d91f4869ff72a9eb SHA512 285f33ce36e2591f49b6067da16612ec1b49b23a8637d077618aefaae4452993dc2a31660665551ea761857390d940100e162e205fe7c0fad9c72374f2d15bb8 +DIST commons-daemon-1.4.0-src.tar.gz.asc 833 BLAKE2B ac97dd01c02b4a52e2c3cdf4047504cc10b7b4bbfe70f86d442e301af48520c51513f2dae37eaa08648ac9a29e6212abb153b2e36cf85baf03245d8e528166b8 SHA512 8144068c97e76ca358850455d7b867ae106f04083223b43229cc1e05f21c99150c6734174e1b77e89eee93f94ec198831df57f3f53217f3416584509ca289fe1 diff --git a/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild b/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild new file mode 100644 index 000000000000..148d6bb0b68d --- /dev/null +++ b/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# No tests #839681 +JAVA_PKG_IUSE="doc source" +MAVEN_ID="commons-daemon:commons-daemon:${PV}" + +inherit java-pkg-2 java-pkg-simple toolchain-funcs verify-sig + +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" + +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-11:*" # module-info +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" ) + +JAVA_ENCODING="iso-8859-1" +JAVA_SRC_DIR="src/main/java" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + +src_compile() { + JAVA_JAR_FILENAME="org.apache.${PN}.jar" + java-pkg-simple_src_compile # creates a legacy jar file without module-info + + jdeps --generate-module-info \ + src/main/java \ + --multi-release 9 \ + "${JAVA_JAR_FILENAME}" || die + + JAVA_JAR_FILENAME="${PN}.jar" + java-pkg-simple_src_compile # creates the final jar file including module-info + + pushd src/native/unix || die + ./configure + emake AR="$(tc-getAR)" + popd +} + +src_install() { + java-pkg-simple_src_install + dobin src/native/unix/jsvc +} diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest index 10661d3ab0c6..5bc8aa94144d 100644 --- a/dev-java/commons-io/Manifest +++ b/dev-java/commons-io/Manifest @@ -1,2 +1,4 @@ DIST commons-io-2.15.1-src.tar.gz 618534 BLAKE2B 6fc539f28ce610e9947bf529154c79f6924d74872d6f03561d477feba6013e48d74cb5097c851173b690b27052d59c38a9ca4048c1ed54736d29d962746182d6 SHA512 809c7aa66354f2e35fd23f295c4e2f325596ee7f842b7f63f6acc3bd9377c17d4dd276ce62c477fff8d51d0d660e9addbc068270a876097cbecfe3e64f57f385 DIST commons-io-2.15.1-src.tar.gz.asc 488 BLAKE2B 5fb3128a63d2fbc74cd96bf00919cca0fbf7b0a2cbd48287c8495c0fdb78c9df53dcc06a443b626b52ff3f9c32c55425ba619a4f61de542f3dd912916f3b2469 SHA512 1d358d3acd88816fb4d95746d8e4bd4351062cf35caad8c6f4d2da42c7974a4a583db4f7d98d8768ca7fcb4900172b869c6d6f714b8df71bb214634f83c7a55a +DIST commons-io-2.16.1-src.tar.gz 634766 BLAKE2B 5bdc09ec07666ae513944040aae730a8bd5fe4fe65f05aa1f8295b6687f99c588ac4071113b5fa3bdc8f2e4fe0d8b40677c3afba18f332e283f28b5270d5f41c SHA512 07298e3af85726f2ec07a660fbb743f82cd88f8043a57e2e1063b758c81429dfafd77a024e2cdd48efe5d403299c20e898f5b3dd729f52bd55b8a6fb50c9a13a +DIST commons-io-2.16.1-src.tar.gz.asc 488 BLAKE2B e42af1fe9cbb50371c981737e7899b30d99b8e7045485562614a72307068942b433614e4a1c3cdb17261917a1a5382c5828e290e50f3f3a12a3ed297be53cace SHA512 74e22fd7bf5daf58611537f6c21bd41e10942e3051785e13d771e5fd50e5403144a8d2ed9472de13263da5cbf579911a1aafaa7e43dea9f99fe6ad4011ecb74a diff --git a/dev-java/commons-io/commons-io-2.16.1.ebuild b/dev-java/commons-io/commons-io-2.16.1.ebuild new file mode 100644 index 000000000000..35be4d805df0 --- /dev/null +++ b/dev-java/commons-io/commons-io-2.16.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# No tests, #839681 +JAVA_PKG_IUSE="doc source" +MAVEN_ID="commons-io:commons-io:${PV}" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Utility classes, stream implementations, file filters, and much more" +HOMEPAGE="https://commons.apache.org/proper/commons-io/" +SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz + verify-sig? ( https://archive.apache.org/dist/commons/io/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/${P}-src" + +LICENSE="Apache-2.0" +SLOT="1" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +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-11:*" # module-info +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_ENCODING="iso-8859-1" +JAVA_SRC_DIR="src/main/java" + +src_compile() { + JAVA_JAR_FILENAME="org.apache.${PN}.jar" + java-pkg-simple_src_compile # creates a legacy jar file without module-info + + jdeps --generate-module-info \ + src/main/java \ + --multi-release 9 \ + "${JAVA_JAR_FILENAME}" || die + + JAVA_JAR_FILENAME="${PN}.jar" + java-pkg-simple_src_compile # creates the final jar file including module-info + +} diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest index 32bc9f65cb7e..5a5b27266678 100644 --- a/dev-java/commons-lang/Manifest +++ b/dev-java/commons-lang/Manifest @@ -1,2 +1,4 @@ DIST commons-lang-3.14.0-src.tar.gz 1153353 BLAKE2B 78d116864e488baf5c0c241b2304244f207c7b56b2f72006648de217d407d7c577a43ed89d78b0c868a2842eb1985c842e214078cc8e55bc5d93fac5553fa2ed SHA512 1ee4176c3588c11594a79f416a1f34b063cddb10c2124a37640fee48e5d8135091573002b6bf1eda5a60a324c1125665dadc93f9bfda32c9270c35113b6e1bea DIST commons-lang-3.14.0-src.tar.gz.asc 488 BLAKE2B 3ef9b7529a1681e2687f533bf8d45a8394f6633e0a56e8e17ae63b2f8631f94c854b35e50b0f780908ffdcd0f8a8d99d8132aaa1ade5e932ee1ff56181b1ce77 SHA512 025673c12587970de5ebb62aad0d2d34cdbd57c575ebb6c83359b975b3d1ec50ff3caa544395ad04aecd59df454a12a769025635aa55d860195e39086ddcf47e +DIST commons-lang-3.17.0-src.tar.gz 1195408 BLAKE2B 1f612b8e5ef3ecc820ae040090633fd1a145298f0abdcc404e344adf9fb8c3632d144d1ee1cea4009ec32932b5b49a767abf77c45ff110129b98bdb0a7ba4557 SHA512 e633b0caeb9556c68384c2bf20e374fbac910b9979b25774c632e50c1bec41e97c14362978dc092c8b5859291e54fe51e76ad7a61c9b2efbe1e4538f46c1e3ee +DIST commons-lang-3.17.0-src.tar.gz.asc 488 BLAKE2B ad6bbd5658a4fcdd56f830d55abef4a387fc8f42f4e3cc19d4700033acef8b02e30df4d6774014ae2b0a4f6811bdcc97a5c1a0c154705aa37724325850218beb SHA512 34f48ab6080c5730821bbf32f3715672c9f916d69985940f1dd17f9ab2c2ec04d1907426ee1dac1bd3654f7f50c65730042ebbffde1c12aa758f9a1e5634fcd0 diff --git a/dev-java/commons-lang/commons-lang-3.17.0.ebuild b/dev-java/commons-lang/commons-lang-3.17.0.ebuild new file mode 100644 index 000000000000..39a3dddf56a5 --- /dev/null +++ b/dev-java/commons-lang/commons-lang-3.17.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# No tests, #839681 +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.apache.commons:commons-lang3:${PV}" + +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}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/lang/source/${PN}3-${PV}-src.tar.gz.asc -> ${P}-src.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" + +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-11:*" # module-info +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_SRC_DIR="src/main/java" + +src_compile() { + JAVA_JAR_FILENAME="org.apache.${PN}.jar" + java-pkg-simple_src_compile # creates a legacy jar file without module-info + + jdeps --generate-module-info \ + src/main/java \ + --multi-release 9 \ + "${JAVA_JAR_FILENAME}" || die + + JAVA_JAR_FILENAME="${PN}.jar" + java-pkg-simple_src_compile # creates the final jar file including module-info + +} diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest index 9f2bae1c3096..e45becaca4a5 100644 --- a/dev-java/commons-logging/Manifest +++ b/dev-java/commons-logging/Manifest @@ -1,3 +1,2 @@ -DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e DIST commons-logging-1.3.1-src.tar.gz 189156 BLAKE2B 23308b2bff6ea67620b0f07f49a63ffdbd07833fc0d9a6654386f4c17c9125abef5ad2afb6d8c798dcb98bc3e99bd8d94d35b9deec569c3aec1dde20f69e1a1d SHA512 ffda970d086601df4b476caf8bd01d1bdc22dd7f8846a22287036f7f000ce6cf0a757d16621910f041f8d90aa6066819454b3977dd005ca66817bec59e91e91f DIST commons-logging-1.3.1-src.tar.gz.asc 488 BLAKE2B 3225a62f6269224f1b52907631be03d97cde65d1c7a76c06b6a23b9e30b1cee08b048eb4fdaa41b0a6b5bcf090b54c9dc54307fb1629b039b786fd426572a4d1 SHA512 6f13f85a5aeab1099ebfca38a6173384050b1f1c2e7eac93d978587c92751ddd24d583e39bc5a949f0caec66ca141d265147e63e9e2afea2094bda4667936a86 diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild deleted file mode 100644 index e7ce766be362..000000000000 --- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild +++ /dev/null @@ -1,121 +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="commons-logging:commons-logging:1.3.0" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems" -HOMEPAGE="https://commons.apache.org/proper/commons-logging/" -MY_COMMIT="d376d3128663e53de4af948e161291e7ec0c6ec1" -SRC_URI="https://github.com/apache/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_COMMIT}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="log4j" - -CDEPEND=" - log4j? ( - dev-java/log4j-12-api:2 - dev-java/log4j-api:2 - dev-java/log4j-core:2 - ) -" - -DEPEND="${CDEPEND} - dev-java/javax-servlet-api:2.5 - >=virtual/jdk-1.8:* -" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" - -DOCS=( README.md src/changes/changes.xml ) - -JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.logging" -JAVA_ENCODING="iso-8859-1" -JAVA_CLASSPATH_EXTRA="javax-servlet-api-2.5" -JAVA_SRC_DIR="src/main/java" - -src_prepare() { - java-pkg-2_src_prepare - # https://avalon.apache.org/closed.html Apache Avalon has closed. - rm src/main/java/org/apache/commons/logging/impl/{Avalon,LogKit}Logger.java || die - rm src/test/java/org/apache/commons/logging/{avalon/AvalonLogger,logkit/Standard}TestCase.java || die - - if use !log4j; then - rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die - fi -} - -src_compile() { - if use log4j; then - JAVA_GENTOO_CLASSPATH="log4j-12-api-2,log4j-api-2,log4j-core-2" - fi - java-pkg-simple_src_compile - - pushd target/classes > /dev/null || die - - # Need Automatic-Module-Name also for the other JAR files - jar xvf ../../commons-logging.jar META-INF/MANIFEST.MF || die - - # https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L215-L236 - jar -cvfm ../../commons-logging-api.jar META-INF/MANIFEST.MF \ - $(find . -type f -name '*.class' \ - ! -name 'Jdk13LumberjackLogger.class' \ - ! -name 'ServletContextCleaner.class' \ - ) || die - - # https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L240-L257 - jar -cvfm ../../commons-logging-adapters.jar META-INF/MANIFEST.MF \ - $(find . -type f -path './org/apache/commons/logging/impl/**.class' \ - ! -name 'WeakHashtable*.class' \ - ! -name 'LogFactoryImpl*.class' \ - ) || die - - popd > /dev/null || die -} - -src_test() { - # Do not run Log4j tests because these tests use an Appender to verify - # logging correctness. The log4j-12-api bridge no longer supports using an - # Appender for verifications since the methods for adding an Appender in - # the bridge "are largely no-ops". This means an Appender's state would - # never be changed by log4j-12-api after new messages are logged. The test - # cases, however, expect changes to the Appender's state in such an event, - # so they would fail with log4j-12-api. - # https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html - rm src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java || die # Log4JLogger - rm src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java || die # Log4JLogger - rm -r src/test/java/org/apache/commons/logging/log4j || die - - JAVA_TEST_EXCLUDES=( - org.apache.commons.logging.security.SecurityForbiddenTestCase # 2 tests 1 failing - org.apache.commons.logging.jdk14.TestHandler # No runnable methods - ) - JAVA_TEST_EXTRA_ARGS=( - -Dservlet-api="$(java-pkg_getjars javax-servlet-api-2.5)" - -Dcommons-logging="commons-logging.jar" - -Dcommons-logging-api="commons-logging-api.jar" - -Dcommons-logging-adapters="commons-logging-adapters.jar" - -Dtestclasses="target/test-classes" - ) - if use log4j; then - JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)" - fi - JAVA_TEST_GENTOO_CLASSPATH="junit-4" - JAVA_TEST_RESOURCE_DIRS="src/test/resources" - JAVA_TEST_SRC_DIR="src/test/java" - java-pkg-simple_src_test -} - -src_install() { - java-pkg-simple_src_install - java-pkg_dojar commons-logging-api.jar commons-logging-adapters.jar -} diff --git a/dev-java/commons-logging/commons-logging-1.3.1.ebuild b/dev-java/commons-logging/commons-logging-1.3.1.ebuild index 1f9180268241..d070c40f2dee 100644 --- a/dev-java/commons-logging/commons-logging-1.3.1.ebuild +++ b/dev-java/commons-logging/commons-logging-1.3.1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="log4j" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest index ff3a88cde8b6..06cd5df4828f 100644 --- a/dev-java/commons-net/Manifest +++ b/dev-java/commons-net/Manifest @@ -1,2 +1,4 @@ DIST commons-net-3.10.0-src.tar.gz 450082 BLAKE2B 0df46b21ca298393500494e41d918b3fc6e700485c4d9dfb2bab61d8f834a4f44dd881c464c4008731deec9fc82ca36e0442022f0942b3e59e384a2b44329660 SHA512 d9d80255feddfb434d3baa629aa9e6d8feffd530c5e3172106fec55bbc986f6423a46dc9e737a1bb7020c62447229e6b83d0b7f9582d041e1def423536cc92dd DIST commons-net-3.10.0-src.tar.gz.asc 488 BLAKE2B 31a15e952c55079e595f33be1730126b85c669b481c649e401cb4617a5489fc3e3025e8c172f8193b190b16fe55d9c78c171d16d4adf7fa1a8e71648e295bc77 SHA512 ab27b1fa2c02d79eff26f93697fafc54f22a7368db631bb6f7173b8702cda10836ac8b656df987135fe5c1d39a557840fefb0355d8d52f0e4815808d4938de18 +DIST commons-net-3.11.1-src.tar.gz 460104 BLAKE2B 5542a7d9d3d8f2f07a90b3ab21e4e8a66bceecfef8f1ae8ec378003e4c3906414435b095cc0c0016f24d3e174a5e16da52cf4c5503209c08d5e550ef25a7bbdc SHA512 0999067cc73cb0e0ab4940302180a0afa998b37c51f93c1c744bf1d346d14c89283166a665283d98200e98f0b8c39854f17493890d49ddad5769c4deb49de37e +DIST commons-net-3.11.1-src.tar.gz.asc 488 BLAKE2B ea6ba15b7b6800b1c249cb82d784057f701fb13775fc9838e5247e1e8ead9360a7c5381083fa0c0e2b783e339b6e4ebb8ff66cb8c8924b3c00c9b28ee696e7a3 SHA512 c9e4c896d2f514996aa50c8af20bab6564d574db4fef69832fe2391beefabfed74a727faf7fe9227b037e943cdba5b2ac143164d5c0df3140b9b7c44ca316e53 diff --git a/dev-java/commons-net/commons-net-3.11.1.ebuild b/dev-java/commons-net/commons-net-3.11.1.ebuild new file mode 100644 index 000000000000..2563be67f5d0 --- /dev/null +++ b/dev-java/commons-net/commons-net-3.11.1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# No tests, #839681 +JAVA_PKG_IUSE="doc examples source" +MAVEN_ID="commons-net:commons-net:${PV}" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Client-oriented Java library to implement many Internet protocols" +HOMEPAGE="https://commons.apache.org/proper/commons-net/" +SRC_URI="mirror://apache/commons/net/source/${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/net/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 ~ppc-macos ~x64-macos ~x64-solaris" + +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-11:*" # module-info +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( + CONTRIBUTING.md + NOTICE.txt + README.md + RELEASE-NOTES.txt +) + +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" + +src_prepare() { + java-pkg-2_src_prepare + rm -r src/main/{java,resources}/org/apache/commons/net/examples || die +} + +src_compile() { + JAVA_JAR_FILENAME="org.apache.${PN}.jar" + java-pkg-simple_src_compile # creates a legacy jar file without module-info + + jdeps --generate-module-info \ + src/main/java \ + --multi-release 9 \ + "${JAVA_JAR_FILENAME}" || die + + JAVA_JAR_FILENAME="${PN}.jar" + java-pkg-simple_src_compile # creates the final jar file including module-info + +} diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r3.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r3.ebuild deleted file mode 100644 index 418ad23cc41f..000000000000 --- a/dev-java/commons-vfs/commons-vfs-2.0-r3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="A single API for accessing various different file systems" -HOMEPAGE="https://commons.apache.org/vfs/" -SRC_URI="https://archive.apache.org/dist/commons/vfs/source/${P}-src.tar.gz" -S="${WORKDIR}/${P}/core" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux" - -CDEPEND=" - dev-java/ant:0 - dev-java/commons-collections:0 - dev-java/commons-logging:0 - dev-java/commons-net:0 - dev-java/commons-httpclient:3 - dev-java/jackrabbit-webdav:0 - dev-java/jsch:0" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.8:*" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" - -PATCHES=( - "${FILESDIR}"/${P}-incompatibility.patch -) - -EANT_GENTOO_CLASSPATH=" - ant - commons-collections - commons-logging - commons-net - commons-httpclient-3 - jackrabbit-webdav - jsch -" -EANT_EXTRA_ARGS="-Dlibdir=${T}" - -# The build.xml is generated from maven and can't run the tests properly -# Use maven test to execute these manually but that means downloading deps from -# the internet. Also the tests need to login to some ftp servers and samba -# shares so I doubt they work for everyone. -#src_test() { -# ANT_TASKS="ant-junit" eant test -#} - -src_prepare() { - default - cp "${FILESDIR}"/${P}-build.xml build.xml || die - - java-ant_rewrite-classpath - java-ant_ignore-system-classes -} - -src_install() { - java-pkg_newjar target/*.jar - - # [javadoc] No javadoc created, no need to post-process anything -# use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java -} diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild index f2cbfd6d3ba5..00e0b245b14b 100644 --- a/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild +++ b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/core" LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux" CP_DEPEND=" >=dev-java/ant-1.10.14-r3:0 diff --git a/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml b/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml deleted file mode 100644 index 753e93d669f2..000000000000 --- a/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml +++ /dev/null @@ -1,298 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> -<!-- ====================================================================== --> - -<!-- ====================================================================== --> -<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== --> -<!-- ====================================================================== --> -<!-- --> -<!-- Any modifications will be overwritten. --> -<!-- --> -<!-- Generated by Maven Ant Plugin on 5/29/13 3:05 PM --> -<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ --> -<!-- --> -<!-- ====================================================================== --> - -<project name="commons-vfs2-from-maven" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Build environment properties --> - <!-- ====================================================================== --> - - <property file="${user.home}/.m2/maven.properties"/> - <property file="maven-build.properties"/> - - <property name="maven.build.finalName" value="commons-vfs2-2.0"/> - <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=".."/> - <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/resources"/> - <property name="maven.build.testResourceDir.1" value=".."/> - <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"> - <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> - <pathelement location="${maven.repo.local}/ant/ant/1.6.2/ant-1.6.2.jar"/> - <pathelement location="${maven.repo.local}/commons-net/commons-net/2.2/commons-net-2.2.jar"/> - <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> - <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> - <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/> - <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-webdav/1.5.2/jackrabbit-webdav-1.5.2.jar"/> - <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-jcr-commons/1.5.2/jackrabbit-jcr-commons-1.5.2.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.5.3/slf4j-api-1.5.3.jar"/> - <pathelement location="${maven.repo.local}/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar"/> - <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-api/1.4/maven-scm-api-1.4.jar"/> - <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar"/> - <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svnexe/1.4/maven-scm-provider-svnexe-1.4.jar"/> - <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svn-commons/1.4/maven-scm-provider-svn-commons-1.4.jar"/> - <pathelement location="${maven.repo.local}/regexp/regexp/1.3/regexp-1.3.jar"/> - </path> - <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> - <pathelement location="${maven.repo.local}/ant/ant/1.6.2/ant-1.6.2.jar"/> - <pathelement location="${maven.repo.local}/commons-net/commons-net/2.2/commons-net-2.2.jar"/> - <pathelement location="${maven.repo.local}/org/apache/commons/commons-compress/1.1/commons-compress-1.1.jar"/> - <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> - <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> - <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/> - <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-webdav/1.5.2/jackrabbit-webdav-1.5.2.jar"/> - <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-jcr-commons/1.5.2/jackrabbit-jcr-commons-1.5.2.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.5.3/slf4j-api-1.5.3.jar"/> - <pathelement location="${maven.repo.local}/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar"/> - <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/> - <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-api/1.4/maven-scm-api-1.4.jar"/> - <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar"/> - <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svnexe/1.4/maven-scm-provider-svnexe-1.4.jar"/> - <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svn-commons/1.4/maven-scm-provider-svn-commons-1.4.jar"/> - <pathelement location="${maven.repo.local}/regexp/regexp/1.3/regexp-1.3.jar"/> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${maven.build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" depends="get-deps" description="Compile the code"> - <mkdir dir="${maven.build.outputDir}"/> - <javac destdir="${maven.build.outputDir}" - encoding="iso-8859-1" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="1.5" - verbose="false" - fork="false" - source="1.5"> - <src> - <pathelement location="${maven.build.srcDir.0}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <copy todir="${maven.build.outputDir}"> - <fileset dir="${maven.build.resourceDir.0}"> - <exclude name="**/*.java"/> - </fileset> - </copy> - <mkdir dir="${maven.build.outputDir}/META-INF"/> - <copy todir="${maven.build.outputDir}/META-INF"> - <fileset dir="${maven.build.resourceDir.1}"> - <include name="NOTICE.txt"/> - <include name="LICENSE.txt"/> - </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}" - encoding="iso-8859-1" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="1.5" - verbose="false" - fork="false" - source="1.5"> - <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}"/> - </copy> - <mkdir dir="${maven.build.testOutputDir}/META-INF"/> - <copy todir="${maven.build.testOutputDir}/META-INF"> - <fileset dir="${maven.build.testResourceDir.1}"> - <include name="NOTICE.txt"/> - <include name="LICENSE.txt"/> - </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="**/RunTest.java"/> - <exclude name="**/*$*"/> - </fileset> - </batchtest> - <batchtest todir="${maven.test.reports}" if="test"> - <fileset dir="${maven.build.testDir.0}"> - <include name="**/${test}.java"/> - <exclude name="**/RunTest.java"/> - <exclude name="**/*$*"/> - </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="protected" - old="false" - verbose="false" - encoding="iso-8859-1" - version="true" - use="true" - author="true" - splitindex="false" - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - charset="ISO-8859-1" - source="1.5" - linksource="true" - breakiterator="false"> - <link href="http://download.oracle.com/javase/6/docs/api/"/> - </javadoc> - </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="false" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> - </jar> - </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> - - <target name="get-deps" - depends="test-offline" - description="Download all dependencies" - unless="maven.mode.offline"> - </target> - -</project> diff --git a/dev-java/cortado/Manifest b/dev-java/cortado/Manifest index df5b340e6078..3ddb27a53bab 100644 --- a/dev-java/cortado/Manifest +++ b/dev-java/cortado/Manifest @@ -1 +1,2 @@ DIST cortado-0.6.0.tar.gz 233854 BLAKE2B 54ace339a6038b46bbf2d993eb911f1845f8717dcf4eeaae0fcd807488a0293bb6618fe72ffa5bc425dc9f7d47f5362ff55168191aab15dbed59547f7c1d72dd SHA512 56113259da05a73f4d4e7aca92d031fa934987ad3607a69b31666c9e452330a95728e7780c45d825ddeb9c0815ace479d7a55df0e68a50e63a76ddf5602c76da +DIST cortado-sun.audio-Java-9.patch 1653 BLAKE2B aa365d4c8746cb69aba3c78c1db37560808c99b73a1a0a4b8170e6df630faf526b793f4aaf5bdbaa28ecb9cf63cd97986400c6bc0acf59c9ddd9f12a9022e1be SHA512 e78468ee40b4eaae7da49de0d820a66c0ccb23a75974499de7e7cb9c8c6870521c4c5587b5d791e45c9d2316354dae422ff41ac0c6128381aa820d57f74a5527 diff --git a/dev-java/cortado/cortado-0.6.0-r2.ebuild b/dev-java/cortado/cortado-0.6.0-r2.ebuild deleted file mode 100644 index 903bdfbfd5bf..000000000000 --- a/dev-java/cortado/cortado-0.6.0-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Multimedia framework for Java written by Fluendo" -HOMEPAGE="https://www.theora.org/cortado/" -SRC_URI="https://downloads.xiph.org/releases/cortado/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -# Package 'sun.audio' seems to have moved to 'javax.sound'. -# More work would be needed. Presently we restrict to jdk:1.8 -DEPEND="virtual/jdk:1.8" -RDEPEND=">=virtual/jre-1.8:*" - -EANT_BUILD_TARGET="stripped" - -src_prepare() { - default - cat > scripts/get-revision <<-EOF || die - #!/bin/sh - echo ${PV} - EOF - -# sed -e '/import/s/sun.audio/javax.sound/' \ -# -i src/com/fluendo/plugin/AudioSinkSA.java || die -} - -src_install() { - java-pkg_newjar "output/dist/applet/${PN}-ovt-stripped-${PV}.jar" - dodoc ChangeLog HACKING NEWS README RELEASE TODO -} diff --git a/dev-java/cortado/cortado-0.6.0-r3.ebuild b/dev-java/cortado/cortado-0.6.0-r3.ebuild new file mode 100644 index 000000000000..5334a3b56737 --- /dev/null +++ b/dev-java/cortado/cortado-0.6.0-r3.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Multimedia framework for Java written by Fluendo" +HOMEPAGE="https://www.theora.org/cortado/" +SRC_URI="https://downloads.xiph.org/releases/cortado/${P}.tar.gz + https://sources.debian.org/data/main/c/cortado/0.6.0-5/debian/patches/sun.audio-Java-9.patch + -> cortado-sun.audio-Java-9.patch" +S="${WORKDIR}/${P}" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="amd64 ppc64 x86" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( ChangeLog HACKING NEWS README RELEASE TODO ) + +PATCHES=( "${DISTDIR}/cortado-sun.audio-Java-9.patch" ) + +JAVA_SRC_DIR="src" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + cat > scripts/get-revision <<-EOF || die + #!/bin/sh + echo ${PV} + EOF +} diff --git a/dev-java/coursier-bin/Manifest b/dev-java/coursier-bin/Manifest index 0876b79d106f..8b9e1af98159 100644 --- a/dev-java/coursier-bin/Manifest +++ b/dev-java/coursier-bin/Manifest @@ -1,3 +1,2 @@ -DIST coursier-bin-2.1.7.gz 20790038 BLAKE2B 6e362ae784fcb7007f0adc58604d72dba33cb37f0726883b69f9f298e38759e3acea0232edac30c7cb34c5b837598e6b2c0947345938bce196f7a326a4aa3f0e SHA512 b6df4d7ad89f735989dfb4bb8cacbdf1559dd5ea4f494b7e72df544bd24a3a208738cf37d1cfd7944bb6aebc0e1b6d32b1bfd48c9f333cf54919a055afd5348e DIST coursier-bin-2.1.8.gz 20863902 BLAKE2B 13ce0a1aa6dd2c1272567a76f3a762e31d9d6794e034e033d5d5accd0b6c534702fc62b5cab83070bb1081c7072ad7a04be86c38b4929d75f2d1f050f320820d SHA512 9cc8f13ecd0c166d46aaeeedb9279eb2885a7edac24c5b106ca30968c4c6fc5f47efe3a38e7aa6864dee517a7bc2cfba71fdd32741d295887bdb62594832bb9e DIST coursier-bin-2.1.9.gz 20870390 BLAKE2B 720698e6c55a8c070d02f01ec528bab06f397b3c580fa3e533a45cf0073d8b9caf506cfff10d1b68eb9348c8b0da9abab9e7fb183f0561b62a82a96d21d35f5e SHA512 102c351aa0647fe5cd9d00ee164c1cebbcd6bd133a11bdfd653f70a5347da02e32ba74d5b51ea425e9189bb7113ef16c3902219bfa1ef0172bac7955712031c6 diff --git a/dev-java/coursier-bin/coursier-bin-2.1.7.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.7.ebuild deleted file mode 100644 index 4c77d05f1d13..000000000000 --- a/dev-java/coursier-bin/coursier-bin-2.1.7.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.9.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.9.ebuild index af4c8329d0bf..536fb0da7de1 100644 --- a/dev-java/coursier-bin/coursier-bin-2.1.9.ebuild +++ b/dev-java/coursier-bin/coursier-bin-2.1.9.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/cpptasks/cpptasks-1.0_beta5-r2.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild index 4908c223c0ce..22c0fbb9f05f 100644 --- a/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild +++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild @@ -4,11 +4,12 @@ EAPI=8 JAVA_PKG_IUSE="doc examples source test" +JAVA_TESTING_FRAMEWORKS="junit" -inherit java-pkg-2 java-ant-2 +inherit java-pkg-2 java-pkg-simple DESCRIPTION="Ant-tasks to compile various source languages and produce executables" -HOMEPAGE="https://ant-contrib.sourceforge.net/" +HOMEPAGE="https://ant-contrib.sourceforge.net" SRC_URI="https://downloads.sourceforge.net/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz" S="${WORKDIR}/${P/_beta/b}" @@ -21,44 +22,29 @@ CP_DEPEND=" dev-java/xerces:2 " -DEPEND=" +DEPEND="${CP_DEPEND} >=virtual/jdk-1.8:* - ${CP_DEPEND} test? ( >=dev-java/ant-1.10.14:0[junit] dev-java/junit:0 ) " -RDEPEND=" +RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:* - ${CP_DEPEND} " -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_CLASSPATH_TAGS="javac javadoc" +DOCS=( NOTICE ) -EANT_BUILD_TARGET="jars" -EANT_TEST_TARGET="run-tests -Djunit-available=true" -EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api" - -src_prepare() { - java-pkg_clean - use test && eapply "${FILESDIR}/${P}-test-classpath.patch" - java-pkg-2_src_prepare -} - -src_test() { - java-pkg-2_src_test -} +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH="junit" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_RUN_ONLY=( net.sf.antcontrib.cpptasks.TestAllClasses ) +JAVA_TEST_SRC_DIR="src/test/java" src_install() { - java-pkg_dojar target/lib/${PN}.jar - + java-pkg-simple_src_install java-pkg_register-ant-task - - dodoc NOTICE - use doc && java-pkg_dojavadoc build/api use examples && java-pkg_doexamples src/samples/* - use source && java-pkg_dosrc src/main/java/* } diff --git a/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch b/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch deleted file mode 100644 index 02754ce7f1ed..000000000000 --- a/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 732e296e780633e3dce1bace28a4abae04f506c7 Mon Sep 17 00:00:00 2001 -From: Yuan Liao <liaoyuan@gmail.com> -Date: Sat, 15 Jan 2022 10:58:28 -0800 -Subject: [PATCH] Prevent test classpath from being overwritten by - java-ant-2.eclass - -Signed-off-by: Yuan Liao <liaoyuan@gmail.com> ---- - build.xml | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/build.xml b/build.xml -index ed3a0f7..24a3114 100644 ---- a/build.xml -+++ b/build.xml -@@ -176,8 +176,12 @@ - deprecation="false" - target="${javac.target}" - source="${javac.source}" -- optimize="false" -- classpath="${build.lib}/${name}.jar;${java.class.path}"/> -+ optimize="false"> -+ <classpath> -+ <pathelement location="${build.lib}/${name}.jar" /> -+ <pathelement location="${java.class.path}" /> -+ </classpath> -+ </javac> - <jar jarfile="${tests.build.lib}/${name}_test.jar"> - <fileset dir="." includes="NOTICE LICENSE"/> - <fileset dir="${tests.build.classes}"/> --- -2.34.1 - diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest index 3f8812e6ada6..007a22f402d1 100644 --- a/dev-java/eclipse-ecj/Manifest +++ b/dev-java/eclipse-ecj/Manifest @@ -1,6 +1,7 @@ -DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d DIST ecjsrc-4.20.jar 2255761 BLAKE2B 42e16e1bd3d90b8d9bf3e57f83b3e06f2857a20db3e3ac065ce39e95fc47e75de33186115c36dede691bc37fd55fa8123f2220d13f3d5819404f5de702b10fd2 SHA512 fb27c0a37ed5cdfdcdbc904d067bfdd0477ddfd873a6cd8477d3b473734fd0e37329f0e9ab85dc5f89994d68d9886a488bd88568bc00e25f54c1a5a468dc1384 DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f DIST ecjsrc-4.27.jar 2301849 BLAKE2B 77f35d1a9f36086e8515dc9437894b84c88fd440bd48b5248b141191bc04babfcf1af288643ed21e41cb054bdcfa94125a7eb139cbec9ead97e366c65c1dbe95 SHA512 689fe9ed2327f1d0e89fd13c3543369e0e13d7f15f521fc7667352e7f8d7f0b48107bc180ac16cfad375449cc2b61de74bc8ca56c95cab9ef172260a9d3a530b DIST ecjsrc-4.30.jar 2330181 BLAKE2B 7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d255559bd376bf158b114e30a17d40 SHA512 ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23 DIST ecjsrc-4.31.jar 2347993 BLAKE2B edb1a525646fc3152661a6583ab5c50a1dd7f06dac0b7cdae0913843e0ed6ef2c9862889351557857140c79c479505aeca154958b649d05ace6a5b83f6ccac45 SHA512 3e72ae5e5209dd80f7b3f208aeb0a6eece28ab416c56eedd590c67724c6a905b39b8f27a41394e3cf6a96acc16a9c7dd91d12df9651bc289839648036ac2d430 +DIST ecjsrc-4.32.jar 2357386 BLAKE2B f6c440b13eb3cd014f317d9232a7db713621b3bcb902bc385561fc4ce68711c9fde021920b535fafb4db7e93d515e23c9d57ac3506539915e1ba33ce37a4570a SHA512 e45cfe0df73f5ec83efeeb12785c2efab9977e927de8766507668f104fea4fefeaa59695988d977734fee4ccd43da43da798976177bb3b15a87ca2966e448d9e +DIST ecjsrc-4.33.jar 2361539 BLAKE2B 1bfd2f7d8e9f79bceebec337ddff651a42d133015be8749076d6a67f60d7fbf8e56e658b1535f52fe7f736b6e59eff6187ee94c6c260b399145c1018ae388e35 SHA512 48823264ff18b666b6d350c58e8b3b7d0429d2c5de061cee4c88894da2d44049bf0fcf13ca20d848797ef0591fccd028ac687ec072b8eb02deb5f57b7e560677 diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild index b892008977f0..612bc76ff406 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild @@ -14,8 +14,8 @@ HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt" SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar" LICENSE="EPL-1.0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" SLOT="4.20" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" BDEPEND="app-arch/unzip" COMMON_DEP="app-eselect/eselect-java" diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild index 0a750385f6ab..beb7971b8347 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild @@ -15,8 +15,8 @@ SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV S="${WORKDIR}" LICENSE="EPL-1.0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" SLOT="4.26" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" BDEPEND=" app-arch/unzip diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild index 590dc3324bcb..6042718d196f 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild @@ -17,14 +17,15 @@ HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt" SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar" LICENSE="EPL-1.0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" SLOT="4.27" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" BDEPEND="app-arch/unzip" COMMON_DEP="app-eselect/eselect-java" +# jdk-21 for https://bugs.gentoo.org/931195 DEPEND="${COMMON_DEP} dev-java/ant:0 - >=virtual/jdk-17:*" + >=virtual/jdk-21:*" RDEPEND="${COMMON_DEP} >=virtual/jre-11:*" diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild index b87cee1c3b1a..fb20056ada16 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild @@ -14,12 +14,12 @@ DMF="R-${PV/_rc/RC}-202312010110" DESCRIPTION="Eclipse Compiler for Java" HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt" -SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar" +SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar" S="${WORKDIR}" LICENSE="EPL-1.0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" SLOT="4.30" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" BDEPEND=" app-arch/unzip diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild index 44e5c0c826be..d7601e8396e0 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild @@ -18,8 +18,8 @@ SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${P S="${WORKDIR}" LICENSE="EPL-1.0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" SLOT="4.31" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" BDEPEND="app-arch/unzip" COMMON_DEP="app-eselect/eselect-java" diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild index 63723662da43..1b686c4f4bff 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild @@ -4,31 +4,36 @@ EAPI=8 JAVA_PKG_IUSE="doc source" +# 3.38.0 according to +# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_32/org.eclipse.jdt.core.compiler.batch/pom.xml#L20 +MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.38.0" inherit java-pkg-2 java-pkg-simple prefix -DMF="R-${PV}-202003050155" +DMF="R-${PV/_rc/RC}-202406010610" DESCRIPTION="Eclipse Compiler for Java" HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt" -SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar" +SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar" S="${WORKDIR}" LICENSE="EPL-1.0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" -SLOT="4.15" +SLOT="4.32" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -BDEPEND=" - app-arch/unzip - app-arch/zip -" +BDEPEND="app-arch/unzip" 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-1.10.14:0 - >=virtual/jdk-11:*" + >=dev-java/ant-1.10.14-r3:0 + >=virtual/jdk-21:*" +# Parser.java:1095: error: +# pattern matching in instanceof is not supported in -source 11 RDEPEND="${COMMON_DEP} - !dev-java/ant-eclipse-ecj:4.15 - >=virtual/jre-1.8:*" + >=virtual/jre-17:*" + +DOCS=( org/eclipse/jdt/core/README.md ) JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch" JAVA_CLASSPATH_EXTRA="ant" @@ -40,8 +45,11 @@ JAVA_RESOURCE_DIRS="res" src_prepare() { java-pkg-2_src_prepare + # Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes + rm META-INF/ECLIPSE_* || die + mkdir "${JAVA_RESOURCE_DIRS}" || die - find org META-INF -type f \ + find -type f \ ! -name '*.java' \ | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die } diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild new file mode 100644 index 000000000000..3aec5546ba39 --- /dev/null +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +# 3.38.0 according to +# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_32/org.eclipse.jdt.core.compiler.batch/pom.xml#L20 +MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.38.0" + +inherit java-pkg-2 java-pkg-simple + +DMF="R-${PV/_rc/RC}-202409030240" + +DESCRIPTION="Eclipse Compiler for Java" +HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt" +SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar" +S="${WORKDIR}" + +LICENSE="EPL-1.0" +SLOT="4.33" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + +BDEPEND="app-arch/unzip" +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-1.10.14-r3: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" +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 + + # Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes + rm META-INF/ECLIPSE_* || die + + mkdir "${JAVA_RESOURCE_DIRS}" || die + find -type f \ + ! -name '*.java' \ + | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die +} diff --git a/dev-java/eclipse-ecj/files/ecj-4.15 b/dev-java/eclipse-ecj/files/ecj-4.15 deleted file mode 100644 index f943dedcc19b..000000000000 --- a/dev-java/eclipse-ecj/files/ecj-4.15 +++ /dev/null @@ -1,7 +0,0 @@ -JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.15" -PACKAGE="=dev-java/ant-eclipse-ecj-4.15*" -SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13" -SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13" -ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" -ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.15,ant-eclipse-ecj-4.15" -GENERATION="2" diff --git a/dev-java/eclipse-ecj/files/ecj-4.32 b/dev-java/eclipse-ecj/files/ecj-4.32 new file mode 100644 index 000000000000..8f4574ac16e1 --- /dev/null +++ b/dev-java/eclipse-ecj/files/ecj-4.32 @@ -0,0 +1,7 @@ +JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.32" +PACKAGE="=dev-java/eclipse-ecj-4.32*" +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 22" +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 22" +ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" +ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.32" +GENERATION="2" diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest index 4a467474141e..d5fc2fa612b3 100644 --- a/dev-java/error-prone-annotations/Manifest +++ b/dev-java/error-prone-annotations/Manifest @@ -1 +1,2 @@ -DIST error-prone-2.24.0.tar.gz 2808121 BLAKE2B a112cb2c2699b2522321c89f7875cf5978748f653225db2ce89dbca16eacb357689db79c1d584c034f987178e523baa07cedd43ecb96a53941cb2ebd3c26fe63 SHA512 9c3626c7d9e05a3dacf190c6e463b66ef5cb7b0de3b049884e243502ef7bb325c92433f2ac65dfcd72ddc0edada88dde0822c4fe91043de552d69f3b06611c26 +DIST error-prone-2.27.1.tar.gz 2826681 BLAKE2B 8f848a89e97ea939dc4b81751a40d7b6bec64807ddca0d078bc02599bb663fa8a8d10d566536c33c4d50b3af21cf613bb282ac3403fe5345a20361627e116e5a SHA512 54d288dd5d5f23ae052eacc92ce304b2743aa56a524ad1b235ecd35cc4ecd72b44ec0c3fee319076466b8e90c20095fd5191d59b9c48cbe5bd940e189b1a073e +DIST error-prone-2.32.0.tar.gz 2856245 BLAKE2B 129347be0a1e9ae450c03b47c088962efd7f156dfd5f7343fc17837cb4b64e1787c325ea4d6021570559a09310688a378555c5ab0e1df4996f21e88a73487212 SHA512 ae6286f9cd4d75fb0165d9788a7a2c588a05eef5a4f714a6deb9623d6d8cf4a2173bb44a8faee058f2496dd31124b40570a91a359a8f735a88abf59eea05f39e diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.24.0.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild index 0c56d4a3fbca..ee798f4c460f 100644 --- a/dev-java/error-prone-annotations/error-prone-annotations-2.24.0.ebuild +++ b/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild @@ -17,7 +17,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -DEPEND=">=virtual/jdk-1.8:*" +DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" JAVA_AUTOMATIC_MODULE_NAME="com.google.errorprone.annotations" diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild new file mode 100644 index 000000000000..4f6b1d2395ad --- /dev/null +++ b/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="com.google.errorprone:error_prone_annotations:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java annotations for the Error Prone static analysis tool" +HOMEPAGE="https://errorprone.info" +SRC_URI="https://github.com/google/error-prone/archive/v${PV}.tar.gz -> error-prone-${PV}.tar.gz" +S="${WORKDIR}/error-prone-${PV}/annotations" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=">=virtual/jdk-11:*" # module-info +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/fec/fec-1.0.4-r4.ebuild b/dev-java/fec/fec-1.0.4-r5.ebuild index 62b81cfdee9d..65c72bd07d18 100644 --- a/dev-java/fec/fec-1.0.4-r4.ebuild +++ b/dev-java/fec/fec-1.0.4-r5.ebuild @@ -1,27 +1,27 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 + JAVA_PKG_IUSE="doc source" -inherit flag-o-matic toolchain-funcs java-pkg-2 java-ant-2 +inherit flag-o-matic toolchain-funcs java-pkg-2 java-pkg-simple DESCRIPTION="Forward Error Correction library in Java" HOMEPAGE="https://github.com/hyphanet/contrib/blob/master/README" SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz" +S="${WORKDIR}/${P}" LICENSE="BSD-2" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 x86" -CDEPEND="dev-java/log4j-12-api:2" +CP_DEPEND="dev-java/log4j-12-api:2" -RDEPEND=" - ${CDEPEND} +RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" -DEPEND=" - ${CDEPEND} +DEPEND="${CP_DEPEND} >=virtual/jdk-1.8:*" PATCHES=( @@ -31,27 +31,25 @@ PATCHES=( "${FILESDIR}"/"${P}-remove-concurrent-util-imports.patch" ) -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_CLASSPATH_TAGS="javac javadoc" -EANT_GENTOO_CLASSPATH="log4j-12-api-2" -EANT_BUILD_TARGET="jars" - -# There seems to be unit tests, but they are in such a state. -RESTRICT="test" +JAVA_RESOURCE_DIRS="bin" +JAVA_SRC_DIR="src" src_prepare() { - # Apply patches. - default + default #780585 + java-pkg-2_src_prepare + java-pkg_clean - # In fact, we'll wipe tests altogether. + # tests have never been enabled on this package. anyway, keeping this + # package with sources hosted in dev-space is only a workaround until + # we have a solution for bug #936539. the time for bothering with tests + # should be saved for that part. + # + # for the time being we keep removing the tests like before. rm -rf tests || die - - # Get rid of bundled jars. - java-pkg_clean } src_compile() { - java-pkg-2_src_compile + java-pkg-simple_src_compile einfo "Sucessfully compiled Java classes!" cd "${S}"/src/csrc || die @@ -61,8 +59,6 @@ src_compile() { } src_install() { - java-pkg_newjar "lib/onion-${PN}.jar" "${PN}.jar" - use doc && java-pkg_dojavadoc javadoc - use source && java-pkg_dosrc src/com + java-pkg-simple_src_install dolib.so src/csrc/libfec{8,16}.so } diff --git a/dev-java/freenet-ext/freenet-ext-29.ebuild b/dev-java/freenet-ext/freenet-ext-29-r1.ebuild index 9cac638d5835..afdb83a3f7f7 100644 --- a/dev-java/freenet-ext/freenet-ext-29.ebuild +++ b/dev-java/freenet-ext/freenet-ext-29-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,10 @@ DEPEND=" dev-libs/gmp:0= >=virtual/jdk-1.8:* " -RDEPEND=">=virtual/jre-1.8:*" +RDEPEND=" + dev-libs/gmp + >=virtual/jre-1.8:* +" PATCHES=( "${FILESDIR}/freenet-ext-29-convert-jcpuid.patch" diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest index 98941f07f28e..338f92146a7b 100644 --- a/dev-java/gradle-bin/Manifest +++ b/dev-java/gradle-bin/Manifest @@ -1,3 +1,4 @@ +DIST gradle-bin-8.10.zip 227843671 BLAKE2B fefa993dcceb31e6e864c08b67f922c7e797d9c847f286bd549dd181ef129c9d7f1268c9d806d0eb6ca7115be3063b44bdb05b9589eebfc69a4f4e4b60a98bf6 SHA512 b0888ba212c82306de2bef79d8fa091dabfeb5eeebd8f5075b3f9657df81d7263c496a35dd9a8e4d06476cad6879ae5176750e60951cd6900893dc6590739ab8 DIST gradle-bin-8.4.zip 212870963 BLAKE2B da32c1010e85f6cded0c1b539b243db6d41fcd033266be3b03b389e6a2e317bea17ddbe65c597c7ea82628cc5bec913954ec998d018b68daa67d39f9a8958e7e SHA512 52d5f622b8ad0ab36ff84589733b47423b12f94211086a84eca9810690af29e396877f1155ee31279c4325e98cd1d55b32137d52efcf48eb1e258caeece08f22 DIST gradle-bin-8.5.zip 218636663 BLAKE2B 0360f240f6183abec540f7755a966767a8dc175ca0ea047273e05c4b2219fd80cb92e62e9b961481d646157418cc91ea211eb83530cc6ec815ea790f6ad8380a SHA512 37a1c2989c46dad0f843565d05fd29010df10ac199d81f0ccddf56ffd490642039046d43a320ba04d1f87cbbc6d4cebf20ff66ce45ec005931cfc85aee2e0180 DIST gradle-bin-8.7.zip 224435312 BLAKE2B 1926765aea8931b25a9f0b7b9a224dd70756cfd337eecb364c6d288486187dd6311f888c7e1c36b1fc81b454c3514d2807884343e7782f1be45fce03e611496b SHA512 fc18863654cbe8dd2357f388c0fc5f699ca2d40ffd32c283f00cfd5bda94e1711ab7b7a3b154e7da66c17468f00c3c72fe6b6603c4a29617b33b0f292cbac3de diff --git a/dev-java/gradle-bin/gradle-bin-8.10.ebuild b/dev-java/gradle-bin/gradle-bin-8.10.ebuild new file mode 100644 index 000000000000..d02f8b44ef4f --- /dev/null +++ b/dev-java/gradle-bin/gradle-bin-8.10.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 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" +HOMEPAGE="https://gradle.org" +SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip" + +S="${WORKDIR}/${MY_P}" +LICENSE="Apache-2.0" +SLOT="${PV}" +KEYWORDS="~amd64 ~x86" + +DEPEND="app-eselect/eselect-gradle" +BDEPEND="app-arch/unzip" +RDEPEND=" + ${DEPEND} + >=virtual/jre-1.8:* +" + +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.7.ebuild b/dev-java/gradle-bin/gradle-bin-8.7.ebuild index 61b08c49be55..1d63ca89fe19 100644 --- a/dev-java/gradle-bin/gradle-bin-8.7.ebuild +++ b/dev-java/gradle-bin/gradle-bin-8.7.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/gson/Manifest b/dev-java/gson/Manifest index be2124b47485..e21ed0c2effb 100644 --- a/dev-java/gson/Manifest +++ b/dev-java/gson/Manifest @@ -1,2 +1,2 @@ -DIST gson-2.10.2_pre20231128.tar.gz 451312 BLAKE2B d16e0510e0806fd33e8d49b5a8fb73e969b89acb2598ca34a43faa97a09debc99466ab472176d60d617aa20b2190884def25881f0bf651e96be2c1bb9a976d70 SHA512 37f2073e5eee2cb85626040552ac750f4917abd05e3b7944c30a2d5ace6888424870a95a0ceba89bf2dadf9ab33e6bbae1591509b84f35aba4521780764c0877 +DIST gson-parent-2.11.0.tar.gz 458360 BLAKE2B 88d242c725b054ac5e7e3ef31f312f77dd03aea29f6604770253564d80f84cd752b43d74dd416785836d08884e462275f8ec924a00e2ffee195c0237bc2bac0b SHA512 1834b7c95f0a40ff1bcf8088f3ffdb8332ae38d452bab4ad2c9271421e75a9236645d1ee0fdb58c2f32eac86cf503afa3de19f08eb422cc91c4d32e370c36eac DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 diff --git a/dev-java/gson/gson-2.10.2_pre20231128.ebuild b/dev-java/gson/gson-2.11.0-r2.ebuild index 4247c08c2190..0284eb26ee8b 100644 --- a/dev-java/gson/gson-2.10.2_pre20231128.ebuild +++ b/dev-java/gson/gson-2.11.0-r2.ebuild @@ -11,12 +11,9 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Gson JSON library" HOMEPAGE="https://github.com/google/gson" -# SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz" -# S="${WORKDIR}/gson-gson-parent-${PV}/gson" -MY_COMMIT="b17b1a0e98dcaf4b61823e1f0c29dda44c0ea3d5" -SRC_URI="https://github.com/google/gson/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz +SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" -S="${WORKDIR}/gson-${MY_COMMIT}/gson" +S="${WORKDIR}/gson-gson-parent-${PV}/gson" LICENSE="Apache-2.0" SLOT="0" @@ -24,14 +21,14 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=" dev-java/error-prone-annotations:0 - >=virtual/jdk-17:* + >=virtual/jdk-11:* test? ( dev-java/guava:0 dev-java/guava-testlib:0 - )" -# src/test/java/com/google/gson/functional/Java17RecordTest.java:78: -# error: records are not supported in -source 11 -RDEPEND=">=virtual/jre-17:*" + ) +" + +RDEPEND=">=virtual/jre-1.8:*" DOCS=( ../CHANGELOG.md @@ -53,9 +50,6 @@ JAVA_SRC_DIR=( JAVA_TEST_EXCLUDES=( # requires the test class to be obfuscated using proguard which we do not have atm "com.google.gson.functional.EnumWithObfuscatedTest" - # testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest) - # junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest - "com.google.gson.regression.OSGiTest" ) JAVA_TEST_GENTOO_CLASSPATH=" guava @@ -71,17 +65,15 @@ src_prepare() { sed -e "s/\${project.version}/${PV}/g" \ -i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \ || die "Failed to set version" -} - -src_compile() { - if ! use test; then - JAVA_PKG_WANT_SOURCE="1.8" - JAVA_PKG_WANT_TARGET="1.8" - fi - java-pkg-simple_src_compile + grep ^Bundle bnd.bnd > src/main/resources/META-INF/MANIFEST.MF || die + echo "Import-Package: sun.misc;resolution:=optional, com.google.gson.annotations" \ + >> src/main/resources/META-INF/MANIFEST.MF || die } src_test() { JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" - java-pkg-simple_src_test + + # src/test/java/com/google/gson/functional/Java17RecordTest.java:78: + # error: records are not supported in -source 11 + JAVAC_ARGS="--source 17 --target 17" java-pkg-simple_src_test } diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest index 9e4363a3129a..85db383245eb 100644 --- a/dev-java/guava-testlib/Manifest +++ b/dev-java/guava-testlib/Manifest @@ -1,2 +1,3 @@ -DIST guava-33.0.0.tar.gz 5779322 BLAKE2B b7790f4207e2061b364f3dfac8d3f6f0de180f33f1f1c24078c40b6e69d3a372fc7f681bdd51a670a4b913c0e537731ecbff849a08411c250de4dc6b255e70cf SHA512 4f97aca4621a703b69535c1d56c0b09b3b4ed893e3f136ae5622fe727ce43f920dcdf39a6e8c9667d4f51eccc7f8297c088bc3c34e1f8d6e84a0b7164855ce7c -DIST truth-1.1.5.jar 244558 BLAKE2B c6a0889c9b50334d16cedff3974a1526b190b56a082d986dbcfce40c902a1d0e8689e387edc5b5f54f6b1ae079f2efd1e785398711b7b9363ed4dc6c1fe297f8 SHA512 b840a4ff9bd44189b0ada2770e53669b6368ad06b40a182d7ddb497866df872892f8ee5139f707f53b83cf0b860073f9d24a0f711dfb15b2f64b63e3f5013749 +DIST guava-33.2.0.tar.gz 5812764 BLAKE2B ebfc20be079385e1bf4822b1402323d468c49604f585b514c1e6d40c64803df2f9848b73c63961976908ea8e6250f5e706add1619fc0ee0befaeacab02da075f SHA512 8807dd320af652cffc83ac930e6191b36c8942bc8bfe16cec5503e0721e2fe8a36d6636eb45d650c0ccd60c67fafe4f5aa8595ad454a822fd6888d4e1f22d466 +DIST guava-33.3.0.tar.gz 5819234 BLAKE2B 26c5f97b927f4afeb8c5d68714a54ef62bfc3995da8cf98d2022edd93054bb7e0bd38598adcefc209d04a246e3da50346e213ad49152e1fc0c91463cd8f0dea3 SHA512 122a10c98820443cbfc5769e1aaa5843becfc0e2e7119d0f2544d86bd265da1fc48c4113cb706f92d84ab896fc58583b80e7dc91b6cd13f9ee9996ae8457f02c +DIST truth-1.4.2.jar 275487 BLAKE2B 9c0dce92648f734ab88a0faf1a1e5328d747efffd29aa8f12b7ed2b2c87036ce18bf3195348f9ffce848842a240179fa60e9625c6997439a4cedce6aac6c2b77 SHA512 5f29cb259f2cf63e8a908061d2a58b28ecf12366a03564c8e63c33cdbdb21935ac95ed7b68437b015a2bd055732c88ec8ca1e55b45b99a2cb3e9dd53cb0b87cc diff --git a/dev-java/guava-testlib/guava-testlib-33.0.0.ebuild b/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild index dfe7882178a8..ca8893700df5 100644 --- a/dev-java/guava-testlib/guava-testlib-33.0.0.ebuild +++ b/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild @@ -7,13 +7,13 @@ 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 +inherit java-pkg-2 java-pkg-simple check-reqs 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.5/truth-1.1.5.jar )" + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.jar )" S="${WORKDIR}/guava-${PV}" LICENSE="Apache-2.0" @@ -21,7 +21,7 @@ SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" CP_DEPEND=" - >=dev-java/error-prone-annotations-2.24.0:0 + >=dev-java/error-prone-annotations-2.27.1:0 ~dev-java/guava-${PV}:0 dev-java/jsr305:0 dev-java/junit:4 @@ -40,7 +40,25 @@ JAVA_SRC_DIR="${PN}/src" JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_SRC_DIR="${PN}/test" +check_env() { + if use test; then + # this is needed only for tests + CHECKREQS_MEMORY="1024M" + check-reqs_pkg_pretend + fi +} + +pkg_pretend() { + check_env +} + +pkg_setup() { + check_env + java-pkg-2_pkg_setup +} + src_test() { - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.5.jar:testdata.jar" + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.4.2.jar:testdata.jar" + JAVA_TEST_EXTRA_ARGS="-Xmx${CHECKREQS_MEMORY}" java-pkg-simple_src_test } diff --git a/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild b/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild new file mode 100644 index 000000000000..c005039e87d3 --- /dev/null +++ b/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 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.guava:guava-testlib:${PV}-jre" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple check-reqs + +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.4.2/truth-1.4.2.jar )" +S="${WORKDIR}/guava-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +CP_DEPEND=" + >=dev-java/error-prone-annotations-2.32.0:0 + ~dev-java/guava-${PV}:0 + dev-java/jsr305:0 + dev-java/junit:4 +" + +DEPEND="${CP_DEPEND} + >=dev-java/checker-framework-qual-3.47.0:0 + dev-java/j2objc-annotations:0 + >=virtual/jdk-1.8:*" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +JAVA_CLASSPATH_EXTRA="checker-framework-qual j2objc-annotations" +JAVA_SRC_DIR="${PN}/src" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="${PN}/test" + +check_env() { + if use test; then + # this is needed only for tests + CHECKREQS_MEMORY="1024M" + check-reqs_pkg_pretend + fi +} + +pkg_pretend() { + check_env +} + +pkg_setup() { + check_env + java-pkg-2_pkg_setup +} + +src_test() { + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.4.2.jar:testdata.jar" + JAVA_TEST_EXTRA_ARGS="-Xmx${CHECKREQS_MEMORY}" + java-pkg-simple_src_test +} diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest index 044968475684..a0da1bd1de4a 100644 --- a/dev-java/guava/Manifest +++ b/dev-java/guava/Manifest @@ -1 +1,2 @@ -DIST guava-33.0.0.tar.gz 5779322 BLAKE2B b7790f4207e2061b364f3dfac8d3f6f0de180f33f1f1c24078c40b6e69d3a372fc7f681bdd51a670a4b913c0e537731ecbff849a08411c250de4dc6b255e70cf SHA512 4f97aca4621a703b69535c1d56c0b09b3b4ed893e3f136ae5622fe727ce43f920dcdf39a6e8c9667d4f51eccc7f8297c088bc3c34e1f8d6e84a0b7164855ce7c +DIST guava-33.2.0.tar.gz 5812764 BLAKE2B ebfc20be079385e1bf4822b1402323d468c49604f585b514c1e6d40c64803df2f9848b73c63961976908ea8e6250f5e706add1619fc0ee0befaeacab02da075f SHA512 8807dd320af652cffc83ac930e6191b36c8942bc8bfe16cec5503e0721e2fe8a36d6636eb45d650c0ccd60c67fafe4f5aa8595ad454a822fd6888d4e1f22d466 +DIST guava-33.3.0.tar.gz 5819234 BLAKE2B 26c5f97b927f4afeb8c5d68714a54ef62bfc3995da8cf98d2022edd93054bb7e0bd38598adcefc209d04a246e3da50346e213ad49152e1fc0c91463cd8f0dea3 SHA512 122a10c98820443cbfc5769e1aaa5843becfc0e2e7119d0f2544d86bd265da1fc48c4113cb706f92d84ab896fc58583b80e7dc91b6cd13f9ee9996ae8457f02c diff --git a/dev-java/guava/guava-33.0.0.ebuild b/dev-java/guava/guava-33.2.0.ebuild index b47d69abc5a9..052a43b0fdd5 100644 --- a/dev-java/guava/guava-33.0.0.ebuild +++ b/dev-java/guava/guava-33.2.0.ebuild @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" CP_DEPEND=" - >=dev-java/error-prone-annotations-2.24.0:0 + >=dev-java/error-prone-annotations-2.27.1:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 " diff --git a/dev-java/guava/guava-33.3.0.ebuild b/dev-java/guava/guava-33.3.0.ebuild new file mode 100644 index 000000000000..c24a36ec75a2 --- /dev/null +++ b/dev-java/guava/guava-33.3.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 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/error-prone-annotations-2.32.0:0 + dev-java/j2objc-annotations:0 + dev-java/jsr305:0 +" + +DEPEND="${CP_DEPEND} + >=dev-java/checker-framework-qual-3.47.0:0 + >=virtual/jdk-1.8:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="com.google.common" +JAVA_CLASSPATH_EXTRA="checker-framework-qual" +JAVA_GENTOO_CLASSPATH_EXTRA=":futures/failureaccess/src" +JAVA_SRC_DIR="guava/src" diff --git a/dev-java/hamcrest/Manifest b/dev-java/hamcrest/Manifest index db8fb161eae4..f19c6fe1c13e 100644 --- a/dev-java/hamcrest/Manifest +++ b/dev-java/hamcrest/Manifest @@ -1 +1,2 @@ DIST hamcrest-2.2.tar.gz 603615 BLAKE2B b367fcb13be3314655e29e9196f3ae202200335801ea5bd8f97b5cd845bf7ecb39c4910b10e49938a373aa7897b62bc0935780490386bde1993add5b943b1eaf SHA512 8120e4f4ad83ff41b8b8ede1fe0817eb8fce6f13072e932aff7fc8c9f64689698753ae47b9f024922d5ab0a5bf7bb88b9e1998064d69a58b8c418ab89200e66a +DIST hamcrest-3.0.tar.gz 880513 BLAKE2B f2240a08d6d54e14a8e5441311127fc09f78c8a38a7dcf56d888827f716090cbf15e4a4a563ee56d5afc22574ca1d081276d0173e9361effd20ea3f5389e37a7 SHA512 7997afbc414d7ace3f150eb3ce775c10de4beb595deba02dd41f195e3d885e11dec9af1df4b92d36140217503aebb8c4b97192ed6f925f92287f72b0c2b1b6f5 diff --git a/dev-java/hamcrest/hamcrest-3.0.ebuild b/dev-java/hamcrest/hamcrest-3.0.ebuild new file mode 100644 index 000000000000..ff3a7d92fbcb --- /dev/null +++ b/dev-java/hamcrest/hamcrest-3.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.hamcrest:hamcrest:3.0" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Core API and libraries of hamcrest matcher framework." +HOMEPAGE="https://hamcrest.org/JavaHamcrest/" +SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/JavaHamcrest-${PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {CHANGES,README}.md ) + +JAVA_AUTOMATIC_MODULE_NAME="org.hamcrest" +JAVA_SRC_DIR="hamcrest/src/main/java" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="hamcrest/src/test/java" diff --git a/dev-java/httpcomponents-client/Manifest b/dev-java/httpcomponents-client/Manifest index 9706b591e796..66ff2b793020 100644 --- a/dev-java/httpcomponents-client/Manifest +++ b/dev-java/httpcomponents-client/Manifest @@ -1 +1,2 @@ DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05 +DIST httpcomponents-client-4.5.13-src.tar.gz.asc 183 BLAKE2B 76b19170412672c8f4f30bcf96e1512ada5c6217a62ac1937d53c99223d687b363dc276365f2b0b6cd57abfd9d7d3a829e58f9c634081d84f05b558a61806402 SHA512 2af6ec691f0ebe6ceec4ca462e12638c8cfdb238fb4120195db1d9faca255b41119b6ddf34734ae29333256c91e1a0f1805192c0a2f1206093226e56e846cfc9 diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild deleted file mode 100644 index 5c35d1fb5ad7..000000000000 --- a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild +++ /dev/null @@ -1,74 +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 httpcomponents-client-4.5.13/httpclient/pom.xml --download-uri https://github.com/apache/httpcomponents-client/archive/refs/tags/rel/v4.5.13.tar.gz --slot 4 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-httpclient-4.5.13.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.httpcomponents:httpclient:4.5.13" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Apache HttpComponents Client" -HOMEPAGE="https://hc.apache.org/httpcomponents-client" -SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-${PV}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: httpcomponents-client-${PV}/httpclient/pom.xml -# commons-codec:commons-codec:1.11 -> >=dev-java/commons-codec-1.15:0 -# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 -# org.apache.httpcomponents:httpcore:4.4.13 -> >=dev-java/httpcore-4.4.14:0 - -CDEPEND=" - dev-java/commons-codec:0 - dev-java/commons-logging:0 - dev-java/httpcore:0 -" - -# Compile dependencies -# POM: httpcomponents-client-${PV}/httpclient/pom.xml -# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4 -# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0 - -DEPEND="${CDEPEND} - >=virtual/jdk-1.8:* - test? ( - dev-java/hamcrest-core:1.3 - dev-java/mockito:0 - )" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" - -DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt ) - -S="${WORKDIR}/httpcomponents-client-${PV}/httpclient" - -JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore" -JAVA_SRC_DIR=( - "src/main/java" - "src/main/java-deprecated" -) -JAVA_RESOURCE_DIRS="src/main/resources" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,hamcrest-core-1.3" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" - -JAVA_TEST_EXCLUDES=( - # Tests run: 929, Failures: 1 - # javax.net.ssl.SSLHandshakeException: Remote host terminated the handshake - "org.apache.http.conn.ssl.TestSSLSocketFactory" -) - -src_install() { - default - java-pkg-simple_src_install -} diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild new file mode 100644 index 000000000000..2b074d240ff4 --- /dev/null +++ b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.httpcomponents:httpclient:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Apache HttpComponents Client" +HOMEPAGE="https://hc.apache.org/httpcomponents-client-5.2.x/" +SRC_URI="mirror://apache/httpcomponents/httpclient/source/${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/httpcomponents/httpclient/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/httpcomponents-client-${PV}/httpclient" + +LICENSE="Apache-2.0" +SLOT="4" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpcomponents-client.hc.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-httpcomponents-client )" + +CDEPEND=" + dev-java/commons-codec:0 + dev-java/commons-logging:0 + dev-java/httpcore:0 +" + +DEPEND="${CDEPEND} + >=virtual/jdk-1.8:* + test? ( + dev-java/hamcrest-core:1.3 + dev-java/mockito:0 + )" + +RDEPEND="${CDEPEND} + >=virtual/jre-1.8:*" + +DOCS=( ../{NOTICE,README,RELEASE_NOTES}.txt ) + +JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore" +JAVA_SRC_DIR=( + "src/main/java" + "src/main/java-deprecated" +) +JAVA_RESOURCE_DIRS="src/main/resources" + +JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,hamcrest-core-1.3" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" + +JAVA_TEST_EXCLUDES=( + # Tests run: 929, Failures: 1 + # javax.net.ssl.SSLHandshakeException: Remote host terminated the handshake + "org.apache.http.conn.ssl.TestSSLSocketFactory" +) + +src_test() { + # https://bugs.gentoo.org/923602 + 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.net=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/httpcore/Manifest b/dev-java/httpcore/Manifest index 58259b00cd12..719bf090c35f 100644 --- a/dev-java/httpcore/Manifest +++ b/dev-java/httpcore/Manifest @@ -1 +1,2 @@ DIST httpcomponents-core-4.4.14-src.tar.gz 591869 BLAKE2B d6f4900d8781cf7189edb2dfa9c1157b02584e8c66cde02dc261b0e29cdfb971e0323ce4478966b8e125df475ab1014fbee5b4bdf411eb118647f47f95c8f1a7 SHA512 9c713c7ea4e966a35ed391bc2a3aa10a0963cd21978c028dbd0790c9c2a6592385c7b2f135ea2836e6c495d9faea1bdcc65aa994bd5548bc2d84db38d5dbb713 +DIST httpcomponents-core-4.4.14-src.tar.gz.asc 215 BLAKE2B 52aae4a503ff720f87538283c9215b7a8be9d5d2744c5ad6e86c7d44924ba18e8ef8d55af570543c2d52f20ce8a3918266773c274382e2c495087cd3e247232a SHA512 0824d3adecc5d1cbaf19dbb8674fd192b9d04cff9091475e5e55a18f6012ef11c2d0829d643e1003e8e18f9d2f0964ee0402a7b0e2e3f21b34dcb0676e1392e9 diff --git a/dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch b/dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch new file mode 100644 index 000000000000..5c722c5e714d --- /dev/null +++ b/dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch @@ -0,0 +1,55 @@ +There was 1 failure: +1) testRequestTargetHostFallback(org.apache.http.protocol.TestStandardInterceptors) +org.mockito.exceptions.base.MockitoException: +Mockito cannot mock this class: class java.net.InetAddress +Mockito can only mock visible & non-final classes. +If you're not sure why you're getting this error, please report to the mailing list. + at org.apache.http.protocol.TestStandardInterceptors.testRequestTargetHostFallback(TestStandardInterceptors.java:372) + ... 31 trimmed +Caused by: org.mockito.cglib.core.CodeGenerationException: java.lang.reflect.InvocationTargetException-->null + at org.mockito.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:238) + at org.mockito.cglib.proxy.Enhancer.createHelper(Enhancer.java:378) + at org.mockito.cglib.proxy.Enhancer.createClass(Enhancer.java:318) + at org.mockito.internal.creation.jmock.ClassImposterizer.createProxyClass(ClassImposterizer.java:110) + at org.mockito.internal.creation.jmock.ClassImposterizer.imposterise(ClassImposterizer.java:62) + at org.mockito.internal.creation.jmock.ClassImposterizer.imposterise(ClassImposterizer.java:56) + at org.mockito.internal.creation.CglibMockMaker.createMock(CglibMockMaker.java:23) + at org.mockito.internal.util.MockUtil.createMock(MockUtil.java:26) + at org.mockito.internal.MockitoCore.mock(MockitoCore.java:51) + at org.mockito.Mockito.mock(Mockito.java:1243) + at org.mockito.Mockito.mock(Mockito.java:1120) + ... 33 more +Caused by: java.lang.reflect.InvocationTargetException + at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:118) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at org.mockito.cglib.core.ReflectUtils.defineClass(ReflectUtils.java:385) + at org.mockito.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:220) + ... 43 more +Caused by: java.lang.IncompatibleClassChangeError: class $java.net.InetAddress$$EnhancerByMockitoWithCGLIB$$d2bd6316 cannot inherit from sealed class java.net.InetAddress + at java.base/java.lang.ClassLoader.defineClass1(Native Method) + at java.base/java.lang.ClassLoader.defineClass(ClassLoader.java:1027) + at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103) + ... 46 more + +FAILURES!!! +Tests run: 665, Failures: 1 + +--- a/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java ++++ b/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java +@@ -44,6 +44,7 @@ import org.apache.http.message.BasicHttpRequest; + import org.apache.http.message.BasicHttpResponse; + import org.junit.Assert; + import org.junit.Test; ++import org.junit.Ignore; + import org.mockito.Mockito; + + public class TestStandardInterceptors { +@@ -365,7 +366,7 @@ public class TestStandardInterceptors { + Assert.assertEquals("somehost:8080", header.getValue()); + } + +- @Test ++ @Test @Ignore + public void testRequestTargetHostFallback() throws Exception { + final HttpContext context = new BasicHttpContext(null); + final BasicHttpRequest request = new BasicHttpRequest("GET", "/"); diff --git a/dev-java/httpcore/httpcore-4.4.14-r1.ebuild b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild new file mode 100644 index 000000000000..f554a2b55b78 --- /dev/null +++ b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 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.httpcomponents:httpcore:4.4.14" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Apache HttpComponents Core (blocking I/O)" +HOMEPAGE="https://hc.apache.org/httpcomponents-core-5.2.x/" +SRC_URI="https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz + verify-sig? ( + https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz.asc + )" +S="${WORKDIR}/httpcore" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpcomponents-core.hc.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-httpcomponents-httpcore )" +DEPEND=">=virtual/jdk-1.8:* + test? ( + dev-java/commons-logging:0 + dev-java/mockito:0 + )" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt ) + +JAVA_SRC_DIR=( + "src/main/java" + "src/main/java-deprecated" +) +JAVA_RESOURCE_DIRS="src/main/resources" + +JAVA_TEST_GENTOO_CLASSPATH="commons-logging,junit-4,mockito" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" + +src_test() { + # https://bugs.gentoo.org/923603 + 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.net=ALL-UNNAMED ) + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED ) + eapply "${FILESDIR}/httpcore-4.4.14-skipFailingTest.patch" + fi + java-pkg-simple_src_test +} diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild deleted file mode 100644 index ff51d1ba0fdb..000000000000 --- a/dev-java/httpcore/httpcore-4.4.14.ebuild +++ /dev/null @@ -1,54 +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 httpcore/pom.xml --download-uri https://mirror.netcologne.de/apache.org//httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild httpcomponents-core-4.4.14.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.httpcomponents:httpcore:4.4.14" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Apache HttpComponents Core (blocking I/O)" -HOMEPAGE="https://hc.apache.org/httpcomponents-core-ga" -SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Compile dependencies -# POM: httpcore/pom.xml -# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 -# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4 -# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0 - -DEPEND=">=virtual/jdk-1.8:* - test? ( - dev-java/commons-logging:0 - dev-java/mockito:0 - )" - -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt ) - -S="${WORKDIR}/httpcore" - -JAVA_SRC_DIR=( - "src/main/java" - "src/main/java-deprecated" -) -JAVA_RESOURCE_DIRS="src/main/resources" - -JAVA_TEST_GENTOO_CLASSPATH="commons-logging,junit-4,mockito" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" - -src_install() { - default - java-pkg-simple_src_install -} diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest index 052b7f5e2744..95e67ccfac14 100644 --- a/dev-java/icu4j/Manifest +++ b/dev-java/icu4j/Manifest @@ -1,2 +1 @@ -DIST icu-74.2.tar.gz 65888936 BLAKE2B 81d5acddbfc58a859906cb61660b6f230b88f4a1b1cfd56838843e9445b5858d3dd4888707026340581322143f6a4b7b81f53b6431fd5d4cc3fb90531c4d82fb SHA512 728ae0f09ffc802d675bcf5b849e3081472de8417736bf8b7df0f4db9d1fb8073779be76536764c9111f7cb0e5ab2d2af6c644cc24be432b9eeae9063802ad6c DIST icu4j-75.1.tar.gz 65866291 BLAKE2B ae9a2a8f9bf6f38a08c46c4c3695fa4096c831beab1af5b654e86c9d681eb32be727930aeb1fd866fe9f93a96abe807fd353d108b5fe7a4d8203ee33cc16d971 SHA512 08f8fce8a4dd85706d9f7c57fd021ba15c403ab2da33d9a122d7cb441e0e148deebf245a661e4ef53a30bfa8b7622c63035946fd8966be3927af322275b87ca3 diff --git a/dev-java/icu4j/icu4j-74.2-r1.ebuild b/dev-java/icu4j/icu4j-74.2-r1.ebuild deleted file mode 100644 index df2c5aa4daba..000000000000 --- a/dev-java/icu4j/icu4j-74.2-r1.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_PROVIDES=" - com.ibm.icu:icu4j:${PV} - com.ibm.icu:icu4j-charset:${PV} - com.ibm.icu:icu4j-localespi:${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="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( dev-java/junitparams:0 ) -" - -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( ../../{CONTRIBUTING,README,SECURITY}.md ) -HTML_DOCS=( ../{APIChangeReport,readme}.html ) - -src_compile() { - JAVA_GENTOO_CLASSPATH_EXTRA="icu4j.jar:icu4j-charset.jar:icu4j-localespi.jar" - - 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=( - collate/src/main/resources - core/src/main/resources - currdata/src/main/resources - langdata/src/main/resources - regiondata/src/main/resources - translit/src/main/resources - ) - JAVA_SRC_DIR=( - collate/src/main/java - core/src/main/java - currdata/src/main/java - langdata/src/main/java - regiondata/src/main/java - translit/src/main/java - ) - 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=( charset/src/main/resources ) - JAVA_SRC_DIR=( charset/src/main/java ) - 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=( localespi/src/main/resources ) - JAVA_SRC_DIR=( localespi/src/main/java ) - java-pkg-simple_src_compile - rm -r target || die - - # javadocs - if use doc; then - einfo "Compiling javadocs" - JAVA_JAR_FILENAME="ignoreme.jar" - JAVA_SRC_DIR=( - collate/src/main/java - core/src/main/java - currdata/src/main/java - langdata/src/main/java - regiondata/src/main/java - translit/src/main/java - charset/src/main/java - localespi/src/main/java - ) - 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_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI" - JAVA_TEST_GENTOO_CLASSPATH="junit-4,junitparams" - - einfo "Compiling framework-tests.jar" - JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.framework" - JAVA_JAR_FILENAME="framework-tests.jar" - JAVA_MAIN_CLASS="com.ibm.icu.dev.test.TestAll" - JAVA_RESOURCE_DIRS=( framework/src/test/resources ) - JAVA_SRC_DIR=( framework/src/test/java ) - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":framework-tests.jar" - - einfo "Testing core aka icu4j.jar" - JAVA_TEST_RESOURCE_DIRS="core/src/test/resources" - JAVA_TEST_SRC_DIR="core/src/test/java" - pushd "${JAVA_TEST_SRC_DIR}" || die - # exclude invalid tests, not run by "mvn test" - local JAVA_TEST_RUN_ONLY=$(find * \ - -name "*Test*.java" \ - ! -name "ChineseTestCase.java" \ - ! -name "DataDrivenNumberFormatTestUtility.java" \ - ! -name "*Helper.java" \ - ! -name "ModuleTest.java" \ - ! -name "*Sample.java" \ - ! -name "TestCase.java" \ - ! -name "*TestData*.java" \ - ! -name "*TestFmwk.java" \ - ! -name "TestMessages.java" \ - ! -name "TestUtils.java" \ - ) - popd - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - java-pkg-simple_src_test - - einfo "Creating core-tests.jar" - jar cvf core-tests.jar -C target/test-classes . - JAVA_GENTOO_CLASSPATH_EXTRA+=":core-tests.jar" - JAVA_TEST_RUN_ONLY="" - - einfo "Testing collate" - JAVA_TEST_RESOURCE_DIRS="collate/src/test/resources" - JAVA_TEST_SRC_DIR="collate/src/test/java" - java-pkg-simple_src_test - - einfo "Testing translit" - JAVA_TEST_EXCLUDES=( - # Invalid test classes, No runnable methods - com.ibm.icu.dev.test.TestBoilerplate - com.ibm.icu.dev.test.translit.TestUtility - ) - JAVA_TEST_RESOURCE_DIRS="translit/src/test/resources" - JAVA_TEST_SRC_DIR="translit/src/test/java" - java-pkg-simple_src_test - - einfo "Testing charset" - JAVA_TEST_RESOURCE_DIRS="" - JAVA_TEST_SRC_DIR="charset/src/test/java" - java-pkg-simple_src_test - - einfo "Testing common_tests" - # "mvn test" runs only 90 tests here, Gentoo runs 99 but 9 of them fail. - # coverage tests fail because test handlers for the parametrized tests - # are not defined so the tests are broken and cannot succeed - JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.serializable.CoverageTest ) - JAVA_TEST_RESOURCE_DIRS="" - JAVA_TEST_SRC_DIR="common_tests/src/test/java" - java-pkg-simple_src_test - - einfo "Testing localespi" - JAVA_TEST_RESOURCE_DIRS="" - JAVA_TEST_SRC_DIR="localespi/src/test/java" - # Invalid test classes, No runnable methods - JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.localespi.TestUtil ) - # https://bugs.gentoo.org/827212, "mvn test" does not run it at all - 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-75.1.ebuild b/dev-java/icu4j/icu4j-75.1.ebuild index b7830c3dc842..bae11e47634a 100644 --- a/dev-java/icu4j/icu4j-75.1.ebuild +++ b/dev-java/icu4j/icu4j-75.1.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main" LICENSE="icu" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/injection-api/Manifest b/dev-java/injection-api/Manifest index f27cd5678a48..f6acbb6d3577 100644 --- a/dev-java/injection-api/Manifest +++ b/dev-java/injection-api/Manifest @@ -1 +1 @@ -DIST injection-api-2.0.1.tar.gz 15277 BLAKE2B e1a575ce9705636e0e176e63684c3c4ddd3e7932f2fcf36af86e00e4ebb9888151d64019dea8339c80951d40d3f588bcb6857943c2e3a501e68ad7702a73c643 SHA512 21037c1b9b9687210663ee32b40c7ab897a27812591e38af2f840421488029d1b90f0528570940499142a7ec21ebd1f0fc4506872d9667a066b4ce84d38428e5 +DIST injection-api-2.0.1.tar.gz 15280 BLAKE2B 786c4748eb58bb3f37ed2c8189ec44eb76a77d5e6d6cbb6c54da0ecfd6bbd757b138567dfd4c64d8a5caa69e34ea630e457d84dbfbd3de5ccc58dae7fdef810a SHA512 2d1e182a6520819235c2c8b193b3af916a6533e899f42ea2040977d841f32b3cec256b7566862483c6bee3f727136219d54a025c3dea026c906668e5b9fb3517 diff --git a/dev-java/injection-api/injection-api-2.0.1.ebuild b/dev-java/injection-api/injection-api-2.0.1.ebuild index 149141f12301..58a262fd17cc 100644 --- a/dev-java/injection-api/injection-api-2.0.1.ebuild +++ b/dev-java/injection-api/injection-api-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -13,7 +13,8 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Jakarta Dependency Injection" HOMEPAGE="https://jakarta.ee/specifications/dependency-injection/" -SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/jakartaee/inject/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/inject-${PV}" LICENSE="Apache-2.0" SLOT="0" @@ -24,6 +25,4 @@ RDEPEND=">=virtual/jre-1.8:*" DOCS=( {CONTRIBUTING,NOTICE}.md ) -S="${WORKDIR}/${P}" - JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/injection-api/metadata.xml b/dev-java/injection-api/metadata.xml index 4c37da7799c7..2139e80c1616 100644 --- a/dev-java/injection-api/metadata.xml +++ b/dev-java/injection-api/metadata.xml @@ -5,6 +5,6 @@ <email>java@gentoo.org</email> </maintainer> <upstream> - <remote-id type="github">eclipse-ee4j/injection-api</remote-id> + <remote-id type="github">jakartaee/inject</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/iso-relax/iso-relax-20050331-r6.ebuild b/dev-java/iso-relax/iso-relax-20050331-r7.ebuild index 6359c5cb8203..de9ed0e1d7b9 100644 --- a/dev-java/iso-relax/iso-relax-20050331-r6.ebuild +++ b/dev-java/iso-relax/iso-relax-20050331-r7.ebuild @@ -19,7 +19,8 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-sol CP_DEPEND=">=dev-java/ant-1.10.14-r3:0" DEPEND="${CP_DEPEND} >=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" JAVA_SRC_DIR="src" diff --git a/dev-java/j2objc-annotations/Manifest b/dev-java/j2objc-annotations/Manifest index 1c40e9bd5e29..f3cf7f8491c0 100644 --- a/dev-java/j2objc-annotations/Manifest +++ b/dev-java/j2objc-annotations/Manifest @@ -1,2 +1 @@ -DIST j2objc-2.8.tar.gz 29383083 BLAKE2B a2d288b95fac5d5fafbf5e3c8c7c862e41ba9562f6a3f367ee03574db0f07e030f7812de7d0cf63c97acdbbf8ddd8128fe14e89e97623d6d3cf7b85071e160b3 SHA512 f93a77db3a672691666de317010e455aceb20313a40217270cf4cfd082a0443f7f5cf6f53f06a1006d0a2788c199685a574b0acb435dccdc4e419a2340451860 DIST j2objc-3.0.0.tar.gz 29562144 BLAKE2B b0dc9aeef148ee29154062228049b4db86648fb66b93d224d536a3c0b7e56eb4850d38761b59c6728b005e1520a7a3c07ef3bdb3662d9cad52794ec3ce533426 SHA512 b7e295e448caa61d03c12cde77266ab397f27a5632ab01944571736a79860fa0375279f27fcb1870d0452bde4d8b50ee453a88a23e5b92c1ef0411d4212f3779 diff --git a/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild deleted file mode 100644 index 3d69f0171861..000000000000 --- a/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild +++ /dev/null @@ -1,33 +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" -# Yes. version is "2.2" regardless ${PV} being "2.8". -# See https://github.com/google/j2objc/blob/2.8/annotations/pom.xml#L32-L35 -MAVEN_ID="com.google.j2objc:j2objc-annotations:2.2" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Annotations for the J2ObjC Java to Objective-C translator" -HOMEPAGE="https://developers.google.com/j2objc/" -SRC_URI="https://github.com/google/j2objc/archive/${PV}.tar.gz -> j2objc-${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND="virtual/jdk:1.8" -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( ../{CONTRIBUTING,README}.md ) - -S="${WORKDIR}/j2objc-${PV}/annotations" - -JAVA_SRC_DIR="src/main/java" - -src_prepare() { - default - rm Makefile || die -} diff --git a/dev-java/j2objc-annotations/j2objc-annotations-3.0.0.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild index ef37166a0b5c..7b1be4f994d1 100644 --- a/dev-java/j2objc-annotations/j2objc-annotations-3.0.0.ebuild +++ b/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild @@ -15,9 +15,9 @@ S="${WORKDIR}/j2objc-${PV}/annotations" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" -DEPEND=">=virtual/jdk-1.8:*" +DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" DOCS=( ../{CONTRIBUTING,README}.md ) diff --git a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild index 7b2fc15669ec..4eae70ab60e3 100644 --- a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild +++ b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,8 +17,8 @@ LICENSE="EPL-1.0" SLOT="2" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -DEPEND=">=virtual/jdk-11:* " -RDEPEND=">=virtual/jre-1.8:* " +DEPEND=">=virtual/jdk-11:*" +RDEPEND=">=virtual/jre-1.8:*" JAVA_SRC_DIR="src/main/java" JAVA_RESOURCE_DIRS="src/main/resources" diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest index 3bcc3e4b9642..b2a3450eed9c 100644 --- a/dev-java/java-config/Manifest +++ b/dev-java/java-config/Manifest @@ -1,2 +1 @@ -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 +DIST java-config-2.3.4.tar.gz 33833 BLAKE2B 36cb628375a05530f515d886d819bc99a7ed233bec2956db3562349ae845be57363a2b6629ab5536be15c5f64387d0760cca7959b76a5685918732ee7bf62300 SHA512 9df42a70aceb400a9fab73668151da783e98e767fa6289c13427095d7a3268bd4bb15de9ef980b82692e7c1cb0eaf5326c19a632679419d78a419294579fb29e diff --git a/dev-java/java-config/java-config-2.3.1-r1.ebuild b/dev-java/java-config/java-config-2.3.1-r1.ebuild deleted file mode 100644 index 13f2ded5c0e8..000000000000 --- a/dev-java/java-config/java-config-2.3.1-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# jython depends on java-config, so don't add it or things will break -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 prefix - -DESCRIPTION="Java environment configuration query tool" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" -SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )" - -# baselayout-java is added as a dep till it can be added to eclass. -RDEPEND=" - sys-apps/baselayout-java - sys-apps/portage[${PYTHON_USEDEP}]" - -python_configure_all() { - # setup.py fails to update this file - eprefixify src/launcher.bash -} - -python_install_all() { - distutils-r1_python_install_all - - # This replaces the file installed by java-config-wrapper. - dosym java-config-2 /usr/bin/java-config -} - -python_test() { - esetup.py test -} diff --git a/dev-java/java-config/java-config-2.3.3-r1.ebuild b/dev-java/java-config/java-config-2.3.4.ebuild index ab1cb1b890e9..5e3221048e7a 100644 --- a/dev-java/java-config/java-config-2.3.3-r1.ebuild +++ b/dev-java/java-config/java-config-2.3.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ 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}" @@ -64,8 +64,10 @@ src_install() { 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 + 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() { diff --git a/dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild b/dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild index 0ab6c71728ef..4133d7e336de 100644 --- a/dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild +++ b/dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="amd64 x86" CP_DEPEND=" - dev-java/commons-cli:1 + dev-java/commons-cli:0 dev-java/asm:9" RDEPEND=">=virtual/jre-1.8:* ${CP_DEPEND}" diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild index 8fdfe9ac2063..2576ab85e550 100644 --- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild +++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild @@ -1,15 +1,17 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -inherit java-pkg-2 java-pkg-simple toolchain-funcs java-ant-2 JAVA_TESTING_FRAMEWORKS="junit-4" +inherit java-pkg-2 java-pkg-simple toolchain-funcs + DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon" HOMEPAGE="https://wrapper.tanukisoftware.com" SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar.gz" +S="${WORKDIR}/wrapper_${PV}_src" LICENSE="tanuki-community" SLOT="0" @@ -24,9 +26,7 @@ DEPEND=" dev-util/cunit ) " -BDEPEND="virtual/jdk" - -S="${WORKDIR}/wrapper_${PV}_src" +BDEPEND=">=dev-java/ant-1.10.14-r3:0" JAVA_SRC_DIR="src/java/" JAVA_JAR_FILENAME="wrapper.jar" @@ -38,7 +38,7 @@ PATCHES=( ) src_prepare() { - default + default #780585 # replaces as-needed.patch sed -i \ diff --git a/dev-java/javacc/files/javacc-4.0-javadoc.patch b/dev-java/javacc/files/javacc-4.0-javadoc.patch deleted file mode 100644 index 41093de26566..000000000000 --- a/dev-java/javacc/files/javacc-4.0-javadoc.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru javacc/build.xml javacc-patched/build.xml ---- javacc/build.xml 2003-08-11 15:16:01.000000000 -0400 -+++ javacc-patched/build.xml 2005-06-25 00:37:53.000000000 -0400 -@@ -150,5 +150,10 @@ - <arg line="${version}" /> - </exec> - </target> -+ <target name="javadoc" depends="compile"> -+ <javadoc destdir="doc/api" source="1.4"> -+ <packageset dir="src"/> -+ </javadoc> -+ </target> - - </project> diff --git a/dev-java/javacc/files/javacc-4.1-javadoc.patch b/dev-java/javacc/files/javacc-4.1-javadoc.patch new file mode 100644 index 000000000000..134aaa35abc9 --- /dev/null +++ b/dev-java/javacc/files/javacc-4.1-javadoc.patch @@ -0,0 +1,16 @@ +--- a/build.xml ++++ b/build.xml +@@ -150,5 +150,13 @@ + <arg line="${version}" /> + </exec> + </target> ++ <target name="javadoc" depends="compile"> ++ <javadoc destdir="doc/api" source="8"> ++ <packageset dir="src"/> ++ <classpath> ++ <pathelement path="lib/junit3.8.1/junit.jar" /> ++ </classpath> ++ </javadoc> ++ </target> + + </project> diff --git a/dev-java/javacc/files/javacc-4.1-source8.patch b/dev-java/javacc/files/javacc-4.1-source8.patch new file mode 100644 index 000000000000..6dfc3e47382d --- /dev/null +++ b/dev-java/javacc/files/javacc-4.1-source8.patch @@ -0,0 +1,134 @@ +--- a/build.xml ++++ b/build.xml +@@ -112,6 +112,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <junit printsummary="yes" haltonfailure="yes"> + <classpath> + <pathelement path="classes" /> ++ <pathelement path="lib/junit3.8.1/junit.jar" /> + </classpath> + <batchtest fork="no" todir="."> + <fileset dir="classes"> +--- a/src/org/javacc/jjdoc/build.xml ++++ b/src/org/javacc/jjdoc/build.xml +@@ -46,7 +46,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + <javac srcdir="${javacc.root}/src" + destdir="${javacc.root}/classes" + debug="${build.compiler.debug}" +- source="1.4" ++ source="8" ++ target="8" + classpath="${javacc.root}/classes"> + </javac> + </target> +--- a/src/org/javacc/jjtree/build.xml ++++ b/src/org/javacc/jjtree/build.xml +@@ -54,7 +54,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + <javac srcdir="${javacc.root}/src" + destdir="${javacc.root}/classes" + debug="${build.compiler.debug}" +- source="1.4" ++ source="8" ++ target="8" + classpath="${javacc.root}/classes"> + </javac> + </target> +--- a/src/org/javacc/parser/build.xml ++++ b/src/org/javacc/parser/build.xml +@@ -52,7 +52,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + <javac srcdir="${javacc.root}/src" + destdir="${javacc.root}/classes" + debug="${build.compiler.debug}" +- source="1.4" ++ source="8" ++ target="8" + classpath="${javacc.root}/classes:${junit.jar}"> + </javac> + </target> +--- a/test/imports/build.xml ++++ b/test/imports/build.xml +@@ -41,7 +41,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> +--- a/test/javaFiles/build.xml ++++ b/test/javaFiles/build.xml +@@ -52,7 +52,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir/static" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> +@@ -74,7 +75,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir/non-static" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> +@@ -99,7 +101,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir/non-static" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> +@@ -126,7 +129,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir/non-static" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> +@@ -152,7 +156,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir/non-static" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> +--- a/test/javacodeLA/build.xml ++++ b/test/javacodeLA/build.xml +@@ -40,7 +40,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> +--- a/test/lom/build.xml ++++ b/test/lom/build.xml +@@ -40,7 +40,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> diff --git a/dev-java/javacc/files/javacc-7.0.13-javadoc.patch b/dev-java/javacc/files/javacc-7.0.13-javadoc.patch new file mode 100644 index 000000000000..2849ced4340f --- /dev/null +++ b/dev-java/javacc/files/javacc-7.0.13-javadoc.patch @@ -0,0 +1,14 @@ +diff --git a/build.xml b/build.xml +index bddc709..52f3626 100644 +--- a/build.xml ++++ b/build.xml +@@ -202,9 +202,6 @@ THE POSSIBILITY OF SUCH DAMAGE. + <fileset dir="${java-src}" /> + </javadoc> + +- <zip destfile="${install-name}-javadoc.jar" basedir="${target-folder}/javadoc"> +- </zip> +- + </target> + + diff --git a/dev-java/javacc/files/javacc-7.0.13-source8.patch b/dev-java/javacc/files/javacc-7.0.13-source8.patch new file mode 100644 index 000000000000..544da8197eca --- /dev/null +++ b/dev-java/javacc/files/javacc-7.0.13-source8.patch @@ -0,0 +1,100 @@ +--- a/test/exceptions/build.xml ++++ b/test/exceptions/build.xml +@@ -40,7 +40,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + +@@ -83,7 +83,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.7" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" includeantruntime='false' + debug="true" + classpath="../../target/javacc.jar"> + </javac> +--- a/test/imports/build.xml ++++ b/test/imports/build.xml +@@ -39,7 +39,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + +--- a/test/javaFiles/build.xml ++++ b/test/javaFiles/build.xml +@@ -50,7 +50,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </condition> + </fail> + +- <javac srcdir="out-dir" destdir="out-dir/static" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java fork="true" classname="Parser" classpath="out-dir/static" inputstring="A" failonerror="true"> </java> +@@ -69,7 +69,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </condition> + </fail> + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +@@ -91,7 +91,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </condition> + </fail> + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +@@ -115,7 +115,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </fail> + + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +@@ -138,7 +138,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </fail> + + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +--- a/test/javacodeLA/build.xml ++++ b/test/javacodeLA/build.xml +@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="javacode.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + +--- a/test/lom/build.xml ++++ b/test/lom/build.xml +@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + diff --git a/dev-java/javacc/files/javacc-7.0.4-javadoc.patch b/dev-java/javacc/files/javacc-7.0.4-javadoc.patch new file mode 100644 index 000000000000..57699b5249d5 --- /dev/null +++ b/dev-java/javacc/files/javacc-7.0.4-javadoc.patch @@ -0,0 +1,12 @@ +--- a/build.xml ++++ b/build.xml +@@ -201,9 +201,6 @@ THE POSSIBILITY OF SUCH DAMAGE. + <fileset dir="${generated-src}" /> + <fileset dir="${java-src}" /> + </javadoc> +- +- <zip destfile="${install-name}-javadoc.jar" basedir="${target-folder}/javadoc"> +- </zip> + </target> + + <target name="unittest" depends="jar" description="run JUnit unit test cases" unless="true"> diff --git a/dev-java/javacc/files/javacc-7.0.4-source8.patch b/dev-java/javacc/files/javacc-7.0.4-source8.patch new file mode 100644 index 000000000000..620b1c03f78b --- /dev/null +++ b/dev-java/javacc/files/javacc-7.0.4-source8.patch @@ -0,0 +1,100 @@ +--- a/test/exceptions/build.xml ++++ b/test/exceptions/build.xml +@@ -40,7 +40,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + +@@ -83,7 +83,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.5" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" includeantruntime='false' + debug="true" + classpath="../../target/javacc.jar"> + </javac> +--- a/test/imports/build.xml ++++ b/test/imports/build.xml +@@ -39,7 +39,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + +--- a/test/javaFiles/build.xml ++++ b/test/javaFiles/build.xml +@@ -50,7 +50,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </condition> + </fail> + +- <javac srcdir="out-dir" destdir="out-dir/static" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java classname="Parser" classpath="out-dir/static" inputstring="A" failonerror="true"> </java> +@@ -69,7 +69,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </condition> + </fail> + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +@@ -91,7 +91,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </condition> + </fail> + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +@@ -115,7 +115,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </fail> + + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +@@ -138,7 +138,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </fail> + + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +--- a/test/javacodeLA/build.xml ++++ b/test/javacodeLA/build.xml +@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="javacode.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + +--- a/test/lom/build.xml ++++ b/test/lom/build.xml +@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + diff --git a/dev-java/javacc/javacc-4.1.ebuild b/dev-java/javacc/javacc-4.1-r1.ebuild index f74f36d4eb2f..5f0196671842 100644 --- a/dev-java/javacc/javacc-4.1.ebuild +++ b/dev-java/javacc/javacc-4.1-r1.ebuild @@ -4,9 +4,9 @@ EAPI=8 JAVA_PKG_IUSE="doc examples source test" -MAVAN_ID="net.java.dev.javacc:javacc:${PV}" +MAVEN_ID="net.java.dev.javacc:javacc:${PV}" -inherit java-pkg-2 java-ant-2 +inherit java-pkg-2 DESCRIPTION="Java Compiler Compiler - The Java Parser Generator" HOMEPAGE="https://javacc.github.io/javacc/" @@ -17,28 +17,34 @@ LICENSE="BSD-2" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -CP_DEPEND="dev-java/junit:0" +BDEPEND=">=dev-java/ant-1.10.14:0" -DEPEND="${CP_DEPEND} +DEPEND=" + dev-java/junit:0 >=virtual/jdk-1.8:* - test? ( >=dev-java/ant-1.10.14:0[junit] )" -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" + test? ( >=dev-java/ant-1.10.14:0[junit] ) +" +RDEPEND=">=virtual/jre-1.8:*" PATCHES=( - "${FILESDIR}"/${PN}-4.0-javadoc.patch + "${FILESDIR}/${PN}-4.1-javadoc.patch" + "${FILESDIR}/javacc-4.1-source8.patch" ) -JAVA_ANT_CLASSPATH_TAGS+=" javadoc" -JAVA_ANT_REWRITE_CLASSPATH="yes" - src_prepare() { + default #780585 java-pkg-2_src_prepare java-pkg_clean ! -path "./bootstrap/*" + java-pkg_jar-from --build-only --into lib/junit3.8.1 junit +} + +src_compile() { + eant + use doc && eant javadoc } src_test() { - java-pkg-2_src_test + eant test } src_install() { @@ -46,7 +52,7 @@ src_install() { if use doc; then java-pkg_dohtml -r www/* - java-pkg_dojavadoc target/javadoc + java-pkg_dojavadoc doc/api fi use examples && java-pkg_doexamples examples diff --git a/dev-java/javacc/javacc-7.0.13.ebuild b/dev-java/javacc/javacc-7.0.13-r1.ebuild index 426250e1ea05..d8dfbc20ebc3 100644 --- a/dev-java/javacc/javacc-7.0.13.ebuild +++ b/dev-java/javacc/javacc-7.0.13-r1.ebuild @@ -4,9 +4,9 @@ EAPI=8 JAVA_PKG_IUSE="doc examples source test" -MAVAN_ID="net.java.dev.javacc:javacc:${PV}" +MAVEN_ID="net.java.dev.javacc:javacc:${PV}" -inherit java-pkg-2 java-ant-2 +inherit java-pkg-2 DESCRIPTION="Java Compiler Compiler - The Java Parser Generator" HOMEPAGE="https://javacc.github.io/javacc/" @@ -15,21 +15,36 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="BSD-2" SLOT="7.0.13" -KEYWORDS="amd64 ~arm arm64 ppc64" - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( >=dev-java/ant-1.10.14:0[junit] )" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" +BDEPEND=">=dev-java/ant-1.10.14:0[junit]" +DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" +DOCS=( + README.md + docs/faq.md + docs/release-notes.md +) + +PATCHES=( + "${FILESDIR}/javacc-7.0.13-javadoc.patch" + "${FILESDIR}/javacc-7.0.13-source8.patch" +) + src_prepare() { + default #780585 java-pkg-2_src_prepare java-pkg_clean ! -path "./bootstrap/*" } +src_compile() { + eant -Dant.build.javac.source="8" -Dant.build.javac.target="8" + use doc && eant javadoc -Dant.build.javac.source="8" -Dant.build.javac.target="8" +} + src_test() { - java-pkg-2_src_test + eant test -Dant.build.javac.source="8" -Dant.build.javac.target="8" } src_install() { diff --git a/dev-java/javacc/javacc-7.0.4.ebuild b/dev-java/javacc/javacc-7.0.4-r1.ebuild index 58d0ccdccbcb..09d1ce85e478 100644 --- a/dev-java/javacc/javacc-7.0.4.ebuild +++ b/dev-java/javacc/javacc-7.0.4-r1.ebuild @@ -4,9 +4,9 @@ EAPI=8 JAVA_PKG_IUSE="doc examples source test" -MAVAN_ID="net.java.dev.javacc:javacc:${PV}" +MAVEN_ID="net.java.dev.javacc:javacc:${PV}" -inherit java-pkg-2 java-ant-2 +inherit java-pkg-2 DESCRIPTION="Java Compiler Compiler - The Java Parser Generator" HOMEPAGE="https://javacc.github.io/javacc/" @@ -14,7 +14,9 @@ SRC_URI="https://github.com/javacc/javacc/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD-2" SLOT="7.0.4" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm arm64 x86" + +BDEPEND=">=dev-java/ant-1.10.14-r3:0" DEPEND=" >=virtual/jdk-1.8:* @@ -30,15 +32,24 @@ DOCS=( release.notes ) -JAVA_ANT_REWRITE_CLASSPATH="yes" +PATCHES=( + "${FILESDIR}/javacc-7.0.4-javadoc.patch" + "${FILESDIR}/javacc-7.0.4-source8.patch" +) src_prepare() { + default #780585 java-pkg-2_src_prepare java-pkg_clean ! -path "./bootstrap/*" } +src_compile() { + eant -Dant.build.javac.source="8" -Dant.build.javac.target="8" + use doc && eant javadoc -Dant.build.javac.source="8" -Dant.build.javac.target="8" +} + src_test() { - java-pkg-2_src_test + eant test -Dant.build.javac.source="8" -Dant.build.javac.target="8" } src_install() { diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest index e86cdb7e2e96..5bb555f43821 100644 --- a/dev-java/javacup/Manifest +++ b/dev-java/javacup/Manifest @@ -1 +1,2 @@ DIST java-cup-src-11b-20151001.tar.gz 313405 BLAKE2B 126944916d120dd2150e4a665fea6d216f3d55e002a72b581621df726e4bf0e0664f9ff925189c97162582277c08a4f121e056299ea5a3f5c10cc31d7c0feb9c SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e +DIST java-cup-src-11b-20160615.tar.gz 313847 BLAKE2B 0031cdb73471512162f69fff6ed47e91d78769c5162f37d4fdcef1c4b4be17ec9e950eda973a8842ae95423840be6c43a335180584b81c4618ea43cbfa926972 SHA512 532a8169f8e1ed2c637c66e7e21cc90eea363732870fbf4e3d66acbff03de3ba0583cefb7b4e7b8f8cb0c9bf1ca92dd5a59111860612bc7544e8beab87f5fbda diff --git a/dev-java/javacup/javacup-11b_p20160615.ebuild b/dev-java/javacup/javacup-11b_p20160615.ebuild new file mode 100644 index 000000000000..e2ce20b6b312 --- /dev/null +++ b/dev-java/javacup/javacup-11b_p20160615.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="CUP Parser Generator for Java" +HOMEPAGE="https://www2.cs.tum.edu/projects/cup/" +SRC_URI="https://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${PV/_p/-}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="ant-task" + +DEPEND="${CP_DEPEND} + >=dev-java/jflex-1.6.1-r3:0 + >=virtual/jdk-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 )" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 )" + +DOCS=( changelog.txt ) +HTML_DOCS=( manual.html ) + +JAVA_MAIN_CLASS="java_cup/Main" +JAVA_SRC_DIR=( "src" "java" ) + +src_prepare() { + java-pkg-2_src_prepare + if use ant-task; then + JAVA_GENTOO_CLASSPATH+="ant" + else + rm src/java_cup/anttask/CUPTask.java || die + fi +} + +src_compile() { + if has_version \>=${CATEGORY}/${PN}-11b:${SLOT}; then + einfo "Get path of installed JAVACUP" + CP_CUP="$(java-pkg_getjar --build-only javacup javacup.jar)" + else + einfo "Get path of bundled JAVACUP" + CP_CUP="$(echo bin/java-cup-*.jar)" + fi + einfo "Path to JAVACUP is ${CP_CUP}" + + einfo "Get path to jflex" + CP_FLEX="$(java-pkg_getjars --build-only jflex)" + einfo "Path to jflex is ${CP_FLEX}" + + einfo "Generate parser with: ${CP_CUP}" + "$(java-config -J)" -jar "${CP_CUP}" \ + -interface -destdir "java" -parser "parser" -symbols "sym" \ + cup/parser.cup || die + + einfo "Generate lexer" + # https://jflex.de/manual.html#running-jflex + $(java-config -J) -cp "${CP_CUP}:${CP_FLEX}" jflex.Main \ + flex/Lexer.jflex -d java/javacup || die + + einfo "Build intermediate jar" + JAVA_JAR_FILENAME="seco.jar" + java-pkg-simple_src_compile + + einfo "Remove classes and generated code" + rm -rv java/* target/classes/ || die + + einfo "Regenerate parser with intermediate jar file" + "$(java-config -J)" -jar ./seco.jar \ + -interface -destdir "java" -parser "parser" -symbols "sym" \ + cup/parser.cup || die + + einfo "Regenerate lexer with intermediate jar file" + $(java-config -J) -cp "$(echo ./seco.jar):${CP_FLEX}" jflex.Main \ + flex/Lexer.jflex -d java/javacup || die + + einfo "Build final jar with regenerated parser and lexer" + JAVA_JAR_FILENAME="${PN}.jar" + java-pkg-simple_src_compile + "$(java-config --jar)" cvf "${PN}-runtime.jar" -C target/classes java_cup/runtime || die +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dojar "${PN}.jar" "${PN}-runtime.jar" + use ant-task && java-pkg_register-ant-task +} diff --git a/dev-java/javacup/metadata.xml b/dev-java/javacup/metadata.xml index 4221e170cbc0..565315fe27ec 100644 --- a/dev-java/javacup/metadata.xml +++ b/dev-java/javacup/metadata.xml @@ -5,4 +5,10 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> + <upstream> + <remote-id type="github">ultimate-pa/javacup</remote-id> + </upstream> + <use> + <flag name="ant-task">Build and register the ant-task</flag> + </use> </pkgmetadata> diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild deleted file mode 100644 index 73a927bee381..000000000000 --- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -COMMIT="3ca862d8626096770598a3a256886d205246f4a4" -JAVA_PKG_IUSE="examples source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="The JavaHelp system online help system" -HOMEPAGE="https://javaee.github.io/javahelp/" -SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2-with-linking-exception" -SLOT="0" -KEYWORDS="amd64 x86" - -CDEPEND=" - dev-java/javax-jsp-api:2.0 - dev-java/javax-servlet-api:2.5 -" - -RDEPEND=">=virtual/jre-1.8:* - ${CDEPEND}" - -DEPEND="virtual/jdk:1.8 - ${CDEPEND}" - -JAVA_PKG_NV_DEPEND="virtual/jdk:1.8" - -S="${WORKDIR}/${PN}-${COMMIT}" - -_eant() { - local \ - servlet_jar=$(java-pkg_getjars javax-servlet-api-2.5) \ - jsp_jar=$(java-pkg_getjars javax-jsp-api-2.0) - - eant \ - -f javahelp_nbproject/build.xml \ - -Dfile.reference.servlet-api.jar="${servlet_jar}" \ - -Dfile.reference.jsp-api.jar="${jsp_jar}" \ - -Dservlet-jar="${servlet_jar}" \ - -Djsp-jar="${jsp_jar}" \ - -Dservlet-jar-present=true \ - -Djsp-jar-present=true \ - -Dtomcat-zip-present=true \ - ${@} -} - -src_compile() { - _eant release -} - -#Does not actually run anything -#src_test() { -# _eant test -#} - -src_install() { - java-pkg_dojar javahelp_nbproject/dist/lib/*.jar - - java-pkg_dolauncher jhsearch \ - --main com.sun.java.help.search.QueryEngine - java-pkg_dolauncher jhindexer \ - --main com.sun.java.help.search.Indexer - - use source && java-pkg_dosrc \ - jhMaster/JSearch/*/com \ - jhMaster/JavaHelp/src/*/{javax,com} - - use examples && java-pkg_doexamples jhMaster/JavaHelp/demos -} diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild new file mode 100644 index 000000000000..fdebeaa445de --- /dev/null +++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc examples source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="The JavaHelp system online help system" +HOMEPAGE="https://javaee.github.io/javahelp/" +COMMIT="3ca862d8626096770598a3a256886d205246f4a4" +SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="GPL-2-with-linking-exception" +SLOT="0" +KEYWORDS="amd64 x86" + +CP_DEPEND=" + dev-java/javax-jsp-api:2.0 + dev-java/javax-servlet-api:2.5 +" + +DEPEND="${CP_DEPEND} + virtual/jdk:1.8" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +JAVA_JAR_FILENAME="jhall.jar" +JAVA_GENTOO_CLASSPATH_EXTRA="javahelp_nbproject/lib/jdic-stub.jar" +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR=( + jhMaster/JavaHelp/src/{new,impl} + jhMaster/JSearch/{client,indexer} +) + +src_prepare() { + java-pkg-2_src_prepare + mkdir res || die + pushd jhMaster/JavaHelp/src/new >> /dev/null || die + find -type f ! -name '*.java' | xargs cp --parents -t ../../../../res || die + popd >> /dev/null || die +} + +src_install() { + java-pkg-simple_src_install + + java-pkg_dolauncher jhsearch \ + --main com.sun.java.help.search.QueryEngine + java-pkg_dolauncher jhindexer \ + --main com.sun.java.help.search.Indexer + + use examples && java-pkg_doexamples jhMaster/JavaHelp/demos +} diff --git a/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild index e0d6e70346ee..c1e3431b5381 100644 --- a/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild +++ b/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="xml(+)" DISTUTILS_USE_SETUPTOOLS=no @@ -17,6 +17,8 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + python_prepare_all() { hprefixify src/py/buildparser src/py/findclass setup.py distutils-r1_python_prepare_all 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-r1.ebuild index 9350a857e77e..6526ed970920 100644 --- a/dev-java/javax-persistence-api/javax-persistence-api-2.2.ebuild +++ b/dev-java/javax-persistence-api/javax-persistence-api-2.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ 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" +LICENSE="EPL-1.0 BSD" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" diff --git a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild index 0c66fbeb2e50..a72404f111ad 100644 --- a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild +++ b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild @@ -1,19 +1,19 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source" MY_PN="jBitcollider" MY_P="${MY_PN}-${PV}" -JAVA_SRC_DIR="plugins/org.bitpedia.collider.core/src" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Core classes of jBitcollider: org.bitpedia.collider.core" -HOMEPAGE="http://bitcollider.sourceforge.net/" +HOMEPAGE="https://bitcollider.sourceforge.net" SRC_URI="https://downloads.sourceforge.net/project/bitcollider/jBitcollider%20%28Java%29/${PV}/${MY_P}.zip" +S="${WORKDIR}/${MY_P}" LICENSE="public-domain" SLOT="0" @@ -23,14 +23,9 @@ DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" BDEPEND="app-arch/unzip" -S="${WORKDIR}/${MY_P}" +JAVA_SRC_DIR="plugins/org.bitpedia.collider.core/src" src_prepare() { - default - - rm -v lib/*.jar || die - rm -v plugins/*/lib/*.jar || die - rm -v plugins/org.bitpedia.collider.*/bin/org/bitpedia/collider/*/*.class || die - rm -v plugins/org.bitpedia.collider.core/bin/org/bitpedia/util/*.class || die java-pkg-2_src_prepare + java-pkg_clean } diff --git a/dev-java/jcalendar/jcalendar-1.4-r1.ebuild b/dev-java/jcalendar/jcalendar-1.4-r1.ebuild deleted file mode 100644 index c0de4b6cfb3e..000000000000 --- a/dev-java/jcalendar/jcalendar-1.4-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java date chooser bean for graphically picking a date" -HOMEPAGE="https://www.toedter.com/en/jcalendar/" -SRC_URI="https://www.toedter.com/download/${P}.zip" - -LICENSE="LGPL-2.1" -SLOT="1.2" -KEYWORDS="amd64 x86" - -CDEPEND="dev-java/jgoodies-looks:2.6" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.8:*" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}" - -RESTRICT="test" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="jgoodies-looks-2.6" -EANT_BUILD_XML="src/build.xml" -EANT_BUILD_TARGET="jar" -EANT_DOC_TARGET="" - -src_prepare() { - default - java-pkg_clean -} - -src_install() { - java-pkg_newjar lib/${P}.jar - - dodoc readme.txt - - use doc && java-pkg_dohtml -r doc/* - use source && java-pkg_dosrc src/com -} diff --git a/dev-java/jcalendar/jcalendar-1.4-r2.ebuild b/dev-java/jcalendar/jcalendar-1.4-r2.ebuild new file mode 100644 index 000000000000..2985f2ad4db0 --- /dev/null +++ b/dev-java/jcalendar/jcalendar-1.4-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java date chooser bean for graphically picking a date" +HOMEPAGE="https://toedter.com/jcalendar/" +SRC_URI="https://www.toedter.com/download/${P}.zip" + +LICENSE="LGPL-2.1" +SLOT="1.2" +KEYWORDS="amd64 x86" + +BDEPEND="app-arch/unzip" + +CP_DEPEND="dev-java/jgoodies-looks:2.6" + +DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-1.8:*" + +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:*" + +JAVA_MAIN_CLASS="com.toedter.calendar.demo.JCalendarDemo" +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR="src" + +src_prepare() { + java-pkg-2_src_prepare + java-pkg_clean + mkdir -p res/META-INF || die + mv src/jcalendar.manifest res/META-INF/MANIFEST.MF || die + pushd src > /dev/null || die + find com -type f ! -name '*.java' \ + | xargs cp --parents -t ../res || die + popd > /dev/null || die +} diff --git a/dev-java/jclasslib/Manifest b/dev-java/jclasslib/Manifest index 8417d7402607..36a9daaf4143 100644 --- a/dev-java/jclasslib/Manifest +++ b/dev-java/jclasslib/Manifest @@ -1 +1,2 @@ -DIST jclasslib-3.1.tar.gz 4630493 BLAKE2B 2dbede05833a6f7ff0f32194ea91aeb071615ee8562541d1b5abc2fc61c3f393bd93f5e444110a6a72df161d488cf21551af8208b1f391951b5ae7002ceb6ef3 SHA512 5c44043eb30ab32110097ef6b52f459bf4d512db71efc79aae99fdb6b9db740a7be1e6a59f6e3a233a3b303933ed90fe482c6b9c81d76de93af6c9724aad41dc +DIST annotations-24.1.0.jar 30570 BLAKE2B 55120bf8969384048e0fd438fc96dc6769d6974b96e0e492636351c15466401da623341fe526685e51cd63378fa54c6485fa5dca83b2fc853b85ed4a75dc5d7d SHA512 663395a885561cc97eed411c67b496c06ec9a54906185a871de8743bf53e92152f4bc7c2a0118b7f3cfe85cc0a6c408ac6d589839b8d25c851637f85880331f2 +DIST jclasslib-4.3.1.tar.gz 1396903 BLAKE2B 2f070186f75e40be7cb7122e34d3a00688691cb9da49b6c161beaff7da3170b8ddf3e805467b7ecfbd820ca4bd0b335dee765d7318d0f487f2242e5f8bf4ae76 SHA512 25e35b39a39eb09fe7730d70abb4f6f500522f755801f80ece9357a1a90429254eb3bf57ea7a6cd638fcac77b0d04a62e0df9336c8184738acc74901ed4516e9 diff --git a/dev-java/jclasslib/jclasslib-3.1-r1.ebuild b/dev-java/jclasslib/jclasslib-3.1-r1.ebuild deleted file mode 100644 index 49ed3261956c..000000000000 --- a/dev-java/jclasslib/jclasslib-3.1-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java bytecode viewer" -HOMEPAGE="https://github.com/ingokegel/jclasslib" -SRC_URI="https://github.com/ingokegel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -src_install() { - java-pkg_dojar "build/${PN}.jar" - - java-pkg_dolauncher "${PN}" \ - --main org.gjt.jclasslib.browser.BrowserApplication - - use doc && java-pkg_dohtml -r doc/* - use source && java-pkg_dosrc src/* -} - -pkg_postinst() { - elog "jclasslib uses Firefox by default." - elog "Set the BROWSER environment at your discretion." -} diff --git a/dev-java/jclasslib/jclasslib-4.3.1.ebuild b/dev-java/jclasslib/jclasslib-4.3.1.ebuild new file mode 100644 index 000000000000..65b964da4d76 --- /dev/null +++ b/dev-java/jclasslib/jclasslib-4.3.1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java bytecode viewer" +HOMEPAGE="https://github.com/ingokegel/jclasslib" +JAV="24.1.0" +SRC_URI="https://github.com/ingokegel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://repo1.maven.org/maven2/org/jetbrains/annotations/${JAV}/annotations-${JAV}.jar" +S="${WORKDIR}/${P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_GENTOO_CLASSPATH_EXTRA="lib-compile/i4jruntime.jar" +JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/annotations-${JAV}.jar" +JAVA_MAIN_CLASS="org.gjt.jclasslib.browser.BrowserApplication" +JAVA_RESOURCE_DIRS=( modules/browser/src/main/resources ) +JAVA_SRC_DIR=( modules/{data,browser}/src/main/java ) + +src_install() { + java-pkg-simple_src_install + java-pkg_dojar lib-compile/i4jruntime.jar +} + +pkg_postinst() { + elog "jclasslib uses Firefox by default." + elog "Set the BROWSER environment at your discretion." +} diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest index dc7d15805cb7..19c388c630ec 100644 --- a/dev-java/jctools-core/Manifest +++ b/dev-java/jctools-core/Manifest @@ -1 +1,2 @@ DIST jctools-4.0.3.tar.gz 4237279 BLAKE2B be74c2b0997ec68b90249c8d2b841737fffa4e09724a25b5f5e15b8c4bbf811215023358bc674ed20f81d06a10db3ac2428b29d159ac99ef6dff7e6c36bf7fe2 SHA512 3d7cede6beba54871365cc2f49dc30f014a6f36a5e1f66e9cebd523d202806d49f24c23dbfd6bef0c25cbea0ca230b5d1afefd2b83b0150d335e8e99b6cec90f +DIST jctools-4.0.5.tar.gz 4259231 BLAKE2B 33088bdb9f9d0030127990fadcef13295ea446ac54788c7d330c123af7e73626a7214481f8e10c5885e2026da281188c4c606965c8281f62c3fe2427e3754b79 SHA512 13069fb1b5c1275557e2343e6b8008ce549f948c185824a3e6a254fa0c1dc105e59de707d6b5b7bdb81120372a63026334cbd7a244d4e76b1de65d475cf02cd4 diff --git a/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch b/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch index 6eccce942b62..f573170ee482 100644 --- a/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch +++ b/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch @@ -1,5 +1,7 @@ https://bugs.gentoo.org/863977 https://bugs.gentoo.org/924135 +https://bugs.gentoo.org/939725 for 120000 + --- a/src/test/java/org/jctools/util/TestUtil.java +++ b/src/test/java/org/jctools/util/TestUtil.java @@ -19,7 +19,7 @@ import static org.jctools.util.UnpaddedQueueFactory.newUnpaddedQueue; @@ -7,7 +9,7 @@ https://bugs.gentoo.org/924135 public static final int CONCURRENT_TEST_DURATION = Integer.getInteger("org.jctools.concTestDurationMs", 500); public static final int CONCURRENT_TEST_THREADS = Integer.getInteger("org.jctools.concTestThreads", Math.min(4, Runtime.getRuntime().availableProcessors())); - public static final int TEST_TIMEOUT = 30000; -+ public static final int TEST_TIMEOUT = 60000; ++ public static final int TEST_TIMEOUT = 120000; private static final AtomicInteger threadIndex = new AtomicInteger(); public static void sleepQuietly(long timeMs) { LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(timeMs)); diff --git a/dev-java/jctools-core/jctools-core-4.0.3.ebuild b/dev-java/jctools-core/jctools-core-4.0.3-r1.ebuild index 5b54f3488a28..a32f97d770ab 100644 --- a/dev-java/jctools-core/jctools-core-4.0.3.ebuild +++ b/dev-java/jctools-core/jctools-core-4.0.3-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${P S="${WORKDIR}/JCTools-${PV}/jctools-core" LICENSE="Apache-2.0" -SLOT="3" +SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=" diff --git a/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild b/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild new file mode 100644 index 000000000000..164d974b5ed5 --- /dev/null +++ b/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 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="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=" + dev-java/osgi-annotation:0 + >=virtual/jdk-11:* + test? ( + dev-java/guava-testlib:0 + dev-java/hamcrest:0 + )" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( ../{README,RELEASE-NOTES}.md ) +PATCHES=( "${FILESDIR}/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch" ) + +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" + +src_compile() { + JAVA_JAR_FILENAME="org.${PN}.jar" + java-pkg-simple_src_compile # creates a legacy jar file without module-info + + jdeps --generate-module-info \ + src/main/java \ + --multi-release 9 \ + "${JAVA_JAR_FILENAME}" || die + + JAVA_JAR_FILENAME="${PN}.jar" + java-pkg-simple_src_compile # creates the final jar file including module-info +} + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + +# 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" + 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" \ + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test + # OK (8746 tests) +} diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest index 27c5a47904df..52f0d34a093a 100644 --- a/dev-java/jdbc-mysql/Manifest +++ b/dev-java/jdbc-mysql/Manifest @@ -1,4 +1,5 @@ -DIST mysql-connector-j-8.1.0.tar.gz 4241696 BLAKE2B 930257a876b1b512b598ebf8397125145bb9d1a438fe33bb55ca208dddfdd29bd436a365cc35b9128cdee6eee436da688dd53cc3ed6cd04efb22d1f5af731863 SHA512 f8a7c621397f49981dd7d19e880d92ee051015ad011c027380ac85760dc22ce2f4117fd27b8d72325c5e2bc40a1a9c22e9534f7200208916ee62bbf1e5ad0c75 DIST mysql-connector-j-8.3.0.tar.gz 4255433 BLAKE2B b5cd437e4ab87052c0fd8e4da6a2612d4c068193a4fe2d207505b2f42d664a414c8a0f3131f34b471a30bfa6b6bb9e76ad0dd4779abbecb46ea014ab5d06e36d SHA512 0849ff13f4adc4ae2d2b9f64ff192435dd9560763a50c7df117a171ae1d90fc97bc36dc89097472d0a2c182492a45ca14ffcf577a9c54267be79e5b3f147dc41 -DIST oci-java-sdk-common-2.47.0.jar 439209 BLAKE2B b3b28bb0cf4b8dbca37bb34df7bb48029901be5d9f7754a2ccce888a9af4a06b3348cd545d480127f942687b9b0d63336c37b5f95ecb9f96111c9388a4bc6053 SHA512 73e7376c92d47d81e0630e2ad2d510a483068664874ae31622629dad6dc016d746499c2d29682563e5cdee35ddb6e9e59a2e7557d32e1eeec5fb12206f9d1d6e +DIST mysql-connector-j-9.0.0.tar.gz 4469329 BLAKE2B 3248d43654c56a2b566bbf515de996ab43f845beb2104f69c3c3c837b8b527d8e9851fe849bcf55fd7eafb061e4780dfaa19b42583a7d12b72367d0a36a61ab3 SHA512 40028f528e8bff686fcd700d165785194e1732a8c2c29efb2ffe67623f8915caaac4d2a9e548b0e9cda4328e25cfd6fe4e008cca1491117e38a4c79af0231475 DIST oci-java-sdk-common-3.29.0.jar 453619 BLAKE2B 41a68344a9cf4733c642e3a6e4254f3991f19c13edf57b3c61352b1e6ffdfabfe29cd8dccaa9b128fae618a492fb342007d14ad65b06cd614da572c787cf35ab SHA512 b6def960e114b69d3f34706d5e293f0a05b30c31a1443a92e454631712bb633eaea3795beeeabe4eb1303b8ad42ef2b73d69880b73d360e193f8f1b532bc3430 +DIST opentelemetry-api-1.40.0.jar 141734 BLAKE2B 1f14ca7caadd0a3eed615da7ee528e5df72474d9a4eabcf5a820996830cf76c8fa3402de7d283598f1e4bb44b1a15c488b81863c4b5c0685ea35fe65f3fb12c2 SHA512 d4a1af66075b5f147ba297a8133a707716e323800d8aa2debcdace2bbe10046b2fee8a47d87fa9b6f1f11ad30f4da688670c546841990ad8daa7c8c0535498f2 +DIST opentelemetry-context-1.40.0.jar 47251 BLAKE2B 7effcc63ec6695184467518686ec8165118cae1e7a4f1a7db273a3cbd1ff0b1e98c2a83252291db9536121e1e2999d1d77734acd7ddb5b272264138af4e6af74 SHA512 14ebc39edce8b603fe9f13d304faf54d7362abe3b1ae574aa84d5bbe37c43b133c8131976efd2bfedc94c646b2487054f7b3cce04e1f09efbce0f4ce5a6d5921 diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild deleted file mode 100644 index 649d226c823b..000000000000 --- a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Tests disabled, see bug #902723 -JAVA_PKG_IUSE="doc source" -MAVEN_ID="com.mysql:mysql-connector-j:8.1.0" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -# Bundling a binary version of oci-java-sdk-common -# https://github.com/oracle/oci-java-sdk/blob/v2.47.0/bmc-common/pom.xml -OSC="2.47.0" - -DESCRIPTION="JDBC Type 4 driver for MySQL" -HOMEPAGE="https://dev.mysql.com/doc/connector-j/en/" -SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${PV}.tar.gz - https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/${OSC}/oci-java-sdk-common-${OSC}.jar" - -S="${WORKDIR}/mysql-connector-j-${PV}" - -LICENSE="GPL-2-with-MySQL-FLOSS-exception" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -CP_DEPEND=" - dev-java/c3p0:0 - <dev-java/protobuf-java-3.26.0:0 - dev-java/slf4j-api:0 -" -DEPEND=" ${CP_DEPEND} - >=virtual/jdk-1.8:* -" -RDEPEND=" ${CP_DEPEND} - >=virtual/jre-1.8:* -" - -DOCS=( CHANGES README ) - -JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/oci-java-sdk-common-${OSC}.jar" -JAVA_JAR_FILENAME="mysql-connector-j.jar" -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_SRC_DIR=( - "src/generated" - "src/legacy/java" - "src/main/core-api/java" - "src/main/core-impl/java" - "src/main/protocol-impl/java" - "src/main/user-api/java" - "src/main/user-impl/java" -) -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_RESOURCE_DIRS="src/test/config" -JAVA_TEST_SRC_DIR="src/test/java" diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild index b1f06a0b4fbd..fa5c0981ca39 100644 --- a/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild +++ b/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild @@ -23,7 +23,7 @@ S="${WORKDIR}/mysql-connector-j-${PV}" LICENSE="GPL-2-with-MySQL-FLOSS-exception" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 ~x86" CP_DEPEND=" dev-java/c3p0:0 diff --git a/dev-java/jdbc-mysql/jdbc-mysql-9.0.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-9.0.0.ebuild new file mode 100644 index 000000000000..30b2d925ac61 --- /dev/null +++ b/dev-java/jdbc-mysql/jdbc-mysql-9.0.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# No tests, see bug #902723 +JAVA_PKG_IUSE="doc source" +MAVEN_ID="com.mysql:mysql-connector-j:9.0.0" +# JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +# Bundling binary versions of oci-java-sdk-common and opentelemetry +# https://github.com/oracle/oci-java-sdk/blob/v2.47.0/bmc-common/pom.xml +OSC="3.29.0" +OAV="1.40.0" + +DESCRIPTION="JDBC Type 4 driver for MySQL" +HOMEPAGE="https://dev.mysql.com/doc/connector-j/en/" +SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${PV}.tar.gz + https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/${OSC}/oci-java-sdk-common-${OSC}.jar + https://repo1.maven.org/maven2/io/opentelemetry/opentelemetry-context/${OAV}/opentelemetry-context-${OAV}.jar + https://repo1.maven.org/maven2/io/opentelemetry/opentelemetry-api/${OAV}/opentelemetry-api-${OAV}.jar" + +S="${WORKDIR}/mysql-connector-j-${PV}" + +LICENSE="GPL-2-with-MySQL-FLOSS-exception" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" + +CP_DEPEND=" + dev-java/c3p0:0 + >=dev-java/protobuf-java-4.27.2:0 + dev-java/slf4j-api:0 +" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +DOCS=( CHANGES README ) + +JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/oci-java-sdk-common-${OSC}.jar" +JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/opentelemetry-context-${OAV}.jar" +JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/opentelemetry-api-${OAV}.jar" +JAVA_JAR_FILENAME="mysql-connector-j.jar" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR=( + "src/generated" + "src/legacy/java" + "src/main/core-api/java" + "src/main/core-impl/java" + "src/main/protocol-impl/java" + "src/main/user-api/java" + "src/main/user-impl/java" +) + +src_install() { + java-pkg-simple_src_install + java-pkg_newjar "${DISTDIR}/oci-java-sdk-common-${OSC}.jar" oci-java-sdk-common.jar + java-pkg_newjar "${DISTDIR}/opentelemetry-context-${OAV}.jar" opentelemetry-context.jar + java-pkg_newjar "${DISTDIR}/opentelemetry-api-${OAV}.jar" opentelemetry-api.jar + java-pkg_regjar "${ED}/usr/share/jdbc-mysql/lib/oci-java-sdk-common.jar" +} diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest index ac27a538f20a..d4e40c50cee0 100644 --- a/dev-java/jdbc-postgresql/Manifest +++ b/dev-java/jdbc-postgresql/Manifest @@ -1 +1 @@ -DIST postgresql-jdbc-42.7.1.src.tar.gz 1000212 BLAKE2B 9c09931f15dc0a6dd72fec5148d6eea48226bc2af0de44111c8ea6c3ed798357139aa25c65cc3e6aea33e55201c86864c0e30f5c9b5eadbc980399fbc2f68e36 SHA512 a722415cb29551a59a830c6287873e9ba0cb75e1aa456175b8678caa96be871f42b9294c25a532a67109c7a7e48e3d6d7d5773e99ffb124019b1895430b213ef +DIST postgresql-jdbc-42.7.3.src.tar.gz 1005966 BLAKE2B 1c9aeae572fc983d6b86f8b552a78d1bd11cf439ca863ea4856ad470f60b6a9b4c0ae5ece60f3bc19718f288b9ce93572b522b5f5953a9b4b12558044d630959 SHA512 354e71a6da0f6b4b5282de4dd949f1824f1cd17a8dd73fbd218ff5adebd08e078fa7d59ee149cbe4133a7a149e39e71c5e075b58d72bfedd3e4b47680e86fa4b diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.1.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild index ab85f684bb07..ab85f684bb07 100644 --- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.1.ebuild +++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild diff --git a/dev-java/jdom/jdom-1.1.3-r1.ebuild b/dev-java/jdom/jdom-1.1.3-r1.ebuild deleted file mode 100644 index f176d2284a81..000000000000 --- a/dev-java/jdom/jdom-1.1.3-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc examples source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java API to manipulate XML data" -SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz" -HOMEPAGE="http://www.jdom.org" - -LICENSE="JDOM" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -RDEPEND=">=virtual/jre-1.8:*" -DEPEND=">=virtual/jdk-1.8:*" - -S="${WORKDIR}/${PN}" - -src_prepare() { - default - java-pkg_clean - - rm -r build/apidocs || die - - rm -v src/java/org/jdom/xpath/JaxenXPath.java \ - || die "Unable to remove Jaxen Binding class." - - sed -i -e 's|${name}-${version.impl}|${name}|g' \ - -e 's|<jar jarfile="${build.dir}/${name}-sources|<!-- <jar jarfile="${build.dir}/${name}-sources|' \ - -e 's|build.javadocs}" />|build.javadocs}" /> -->|' \ - "${S}"/build.xml || die - - if ! use doc; then - sed -i -e 's|depends="compile,javadoc"|depends="compile"|' \ - "${S}"/build.xml || die - fi -} - -EANT_BUILD_TARGET="package" - -src_install() { - java-pkg_dojar build/*.jar - dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt - use doc && java-pkg_dojavadoc build/apidocs - use examples && java-pkg_doexamples samples - use source && java-pkg_dosrc src/java/org -} diff --git a/dev-java/jdom/jdom-1.1.3-r2.ebuild b/dev-java/jdom/jdom-1.1.3-r2.ebuild new file mode 100644 index 000000000000..e4c3088a799d --- /dev/null +++ b/dev-java/jdom/jdom-1.1.3-r2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc examples source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java API to manipulate XML data" +HOMEPAGE="http://jdom.org" +SRC_URI="http://jdom.org/dist/binary/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="JDOM" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {CHANGES,COMMITTERS,README,TODO}.txt ) + +JAVA_SRC_DIR="src" + +src_prepare() { + java-pkg-2_src_prepare + java-pkg_clean + + # circular dependency with jaxen-1.2[jdom] + rm -v src/java/org/jdom/xpath/JaxenXPath.java \ + || die "Unable to remove Jaxen Binding class." +} + +src_install() { + java-pkg-simple_src_install + use examples && java-pkg_doexamples samples +} diff --git a/dev-java/jeromq/Manifest b/dev-java/jeromq/Manifest index 015d1b539992..cecc2a3c6361 100644 --- a/dev-java/jeromq/Manifest +++ b/dev-java/jeromq/Manifest @@ -1 +1,2 @@ DIST jeromq-0.5.2.tar.gz 422673 BLAKE2B f244ef95bff70de8eb184e6eda8e292c54488435b8c9e000dbff5f1d6cb7b2b3066061bcb1fa678d2756117a52c39df795dae84071b544b0f577a331aecc8516 SHA512 49a3e9f7ff6b54dcde03958a84e72b8d4b44fb150fc980e9f1ea4ba9e258dcb0a0730d006550a3eb33e9f241e6d89cdc0ee2155213ddd309e255d606d1fa567b +DIST jeromq-0.6.0.tar.gz 467854 BLAKE2B 65b5b8cf676965a07d4bc26898a6db6739a1b5431678c16c0c182eee5d0c69c86a01b17ad1055caacec78149816ddc0c9468fec577f2ab82c681b7822858ee17 SHA512 2e140d456bf6a7f566b3cd563a7697d08c96b004ae70cdc37e427e4526cf8db83e5df6a492e63887f3dba639e3c29384fc46ee9e9e4a6a800e3c2c2446a65695 diff --git a/dev-java/jeromq/jeromq-0.6.0-r1.ebuild b/dev-java/jeromq/jeromq-0.6.0-r1.ebuild new file mode 100644 index 000000000000..30abb471818b --- /dev/null +++ b/dev-java/jeromq/jeromq-0.6.0-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.zeromq:jeromq:0.6.0" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Pure Java implementation of libzmq" +HOMEPAGE="https://github.com/zeromq/jeromq" +SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +PROPERTIES="test_network" +RESTRICT="test" + +DEPEND=" + >=dev-java/jnacl-1.0-r1:0 + >=virtual/jdk-11:* +" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( AUTHORS {CHANGELOG,CONTRIBUTING,README}.md ) + +JAVA_CLASSPATH_EXTRA="jnacl" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="src/test/java" + +src_compile() { + JAVA_JAR_FILENAME="org.zeromq.${PN}.jar" + java-pkg-simple_src_compile # creates a legacy jar file without module-info + + # maven does it with jnacl not providing module-info + # need to figure out how jdeps could do so - we simply add one to jnacl + jdeps \ + --module-path "$(java-pkg_getjars --build-only jnacl)" \ + --add-modules com.neilalexander.jnacl \ + --generate-module-info \ + src/main/java \ + --multi-release 9 \ + "${JAVA_JAR_FILENAME}" || die + + JAVA_JAR_FILENAME="${PN}.jar" + java-pkg-simple_src_compile # creates the final jar file including module-info +} diff --git a/dev-java/jflex/jflex-1.6.1-r3.ebuild b/dev-java/jflex/jflex-1.6.1-r3.ebuild new file mode 100644 index 000000000000..79f141edeb94 --- /dev/null +++ b/dev-java/jflex/jflex-1.6.1-r3.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="JFlex is a lexical analyzer generator for Java" +HOMEPAGE="https://www.jflex.de/" +SRC_URI="https://${PN}.de/${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 ~ppc-macos ~x64-macos" +IUSE="ant-task examples test vim-syntax" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( ant-task )" + +RDEPEND=" + >=virtual/jre-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) +" + +DEPEND=" + >=virtual/jdk-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) + test? ( dev-java/junit:4 ) +" + +PDEPEND=">=dev-java/javacup-11b_p20160615:0" + +JAVA_SRC_DIR="src/main/java" + +src_prepare() { + eapply_user + java-pkg-2_src_prepare + + # See below for details. + eapply "${FILESDIR}/icedtea-arm.patch" + + # We need the bundled jflex.jar. + rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die + + # Remove the bundled java-cup.jar if unneeded. + if has_version ${PDEPEND}; then + rm -v lib/java-cup-*.jar || die + fi +} + +src_configure() { + # javacup is a cyclic dependency. Use the package if we have it, + # otherwise use the bundled version and install the package later. + if has_version ${PDEPEND}; then + # Use PORTAGE_QUIET to suppress a QA warning that is spurious + # thanks to has_version above. This is Portage-specific but + # showing the warning elsewhere isn't the end of the world. + JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar) + else + JAVACUP=$(echo lib/java-cup-*.jar) + fi + + JAVA_GENTOO_CLASSPATH_EXTRA="${JAVACUP}" + if use ant-task; then + JAVA_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant ant.jar)" + else + rm src/main/java/jflex/anttask/JFlexTask.java || die + fi +} + +jflex_compile() { + java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} \ + --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die + java-pkg-simple_src_compile + java-pkg_addres ${PN}.jar src/main/resources +} + +src_compile() { + java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} \ + -parser LexParse -interface src/main/cup/LexParse.cup || die + + # The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running + # jflex. We have patched jflex to fix it but we have to run the + # bundled version first. -Xint works around the problem. See + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678. + use arm && local JFLEX_ARGS="-Xint" + + # First compile using the bundled jflex. + jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS} + + # Then recompile using the fresh jflex. + jflex_compile -cp "${PN}.jar:${JAVACUP}" +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dolauncher ${PN} --main ${PN}.Main + + java-pkg_register-dependency javacup javacup-runtime.jar + use ant-task && java-pkg_register-ant-task + + use examples && java-pkg_doexamples examples + dodoc {changelog,README}.md + + if use doc; then + dodoc doc/*.pdf + docinto html + dodoc doc/*.{css,html,png} doc/COPYRIGHT + fi + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins lib/${PN}.vim + fi +} + +src_test() { + if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then + # This results in a StackOverflowError as of 1.8.0.65 but works + # fine on icedtea:7. Don't know about icedtea:8 yet. + rm -v src/test/java/jflex/EmitterTest.java || die + fi + + local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)" + + local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n") + TESTS="${TESTS//.java}" + TESTS="${TESTS//\//.}" + + ejavac -classpath "${CP}" $(find src/test/java -name "*.java") + ejunit4 -classpath "${CP}" ${TESTS} +} diff --git a/dev-java/jflex/metadata.xml b/dev-java/jflex/metadata.xml index 6021501589e0..3c0e0377e098 100644 --- a/dev-java/jflex/metadata.xml +++ b/dev-java/jflex/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> + <maintainer type="project"> + <email>java@gentoo.org</email> + <name>Java</name> + </maintainer> + <use> + <flag name="ant-task">Build and register the ant-task</flag> + </use> </pkgmetadata> diff --git a/dev-java/jide-oss/jide-oss-3.7.12.ebuild b/dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild index 6445ab563a08..c25d8ee7fdcc 100644 --- a/dev-java/jide-oss/jide-oss-3.7.12.ebuild +++ b/dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -17,7 +17,7 @@ DESCRIPTION="JIDE Common Layer (Professional Swing Components)" HOMEPAGE="https://github.com/jidesoft/jide-oss" SRC_URI="https://github.com/jidesoft/jide-oss/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2-with-exceptions" +LICENSE="GPL-2-with-classpath-exception" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/dev-java/jimfs/jimfs-1.3.0.ebuild b/dev-java/jimfs/jimfs-1.3.0.ebuild index 0a3b6d598134..bb73a2d2a856 100644 --- a/dev-java/jimfs/jimfs-1.3.0.ebuild +++ b/dev-java/jimfs/jimfs-1.3.0.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${P}/jimfs" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" CP_DEPEND=" dev-java/auto-service-annotations:0 diff --git a/dev-java/jnacl/jnacl-1.0-r1.ebuild b/dev-java/jnacl/jnacl-1.0-r1.ebuild new file mode 100644 index 000000000000..2b78a0000a35 --- /dev/null +++ b/dev-java/jnacl/jnacl-1.0-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.neilalexander:jnacl:1.0" +# JAVA_TESTING_FRAMEWORKS="testng" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Pure Java implementation of NaCl: Networking and Cryptography library" +HOMEPAGE="https://github.com/neilalexander/jnacl" +SRC_URI="https://github.com/neilalexander/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +# We don't have fest-assert +RESTRICT="test" + +DEPEND=">=virtual/jdk-11:*" # module-info +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_SRC_DIR="src/main/java" + +src_compile() { + JAVA_JAR_FILENAME="com.neilalexander.${PN}.jar" + java-pkg-simple_src_compile # creates a legacy jar file without module-info + + jdeps --generate-module-info \ + src/main/java \ + --multi-release 9 \ + "${JAVA_JAR_FILENAME}" || die + + JAVA_JAR_FILENAME="${PN}.jar" + java-pkg-simple_src_compile # creates the final jar file including module-info +} diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest index 05f94127628e..b2d756b94a7f 100644 --- a/dev-java/json/Manifest +++ b/dev-java/json/Manifest @@ -1,4 +1,2 @@ -DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183 -DIST json-20240205.tar.gz 245788 BLAKE2B 2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df SHA512 55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284 -DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6 +DIST json-20240303.tar.gz 245665 BLAKE2B 3462398895ab6da9610dac8851f2aa4528359e255015fd59a160fe99443819fa5bb57eb30ce177238d06abe95aaae9847cc85e4eee59c90edf7732bd823d9b89 SHA512 22465216eca7e4721aacca7b519d0bf1b0fe20b2de68ef0b6c62feae811e11203bfc733d8e9c97e2aa5b6ed30c74eefc601025b31807e51d496666412516afc9 DIST json-path-2.9.0.jar 276633 BLAKE2B bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862 SHA512 9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a diff --git a/dev-java/json/json-20231013-r1.ebuild b/dev-java/json/json-20231013-r1.ebuild deleted file mode 100644 index 33b11fb0702e..000000000000 --- a/dev-java/json/json-20231013-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source 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/json/json-20240205-r1.ebuild b/dev-java/json/json-20240303.ebuild index 49f6e727afd8..b039a3797e52 100644 --- a/dev-java/json/json-20240205-r1.ebuild +++ b/dev-java/json/json-20240303.ebuild @@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test" MAVEN_ID="org.json:json:${PV}" JAVA_TESTING_FRAMEWORKS="junit-4" -inherit java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple check-reqs DESCRIPTION="A reference implementation of a JSON package in Java" HOMEPAGE="https://github.com/stleary/JSON-java" @@ -20,7 +20,7 @@ S="${WORKDIR}/JSON-java-${PV}" LICENSE="JSON" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64" DEPEND=" >=virtual/jdk-1.8:* @@ -49,8 +49,27 @@ JAVA_TEST_GENTOO_CLASSPATH=" 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="2048M" + check-reqs_pkg_pretend + fi +} + +pkg_pretend() { + check_env +} + +pkg_setup() { + check_env + java-pkg-2_pkg_setup +} + src_test() { - JAVA_TEST_EXTRA_ARGS=( -Xss2M ) + # setting Xms for bug #930723 + # gradlew: DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m" + JAVA_TEST_EXTRA_ARGS=" -Xmx${CHECKREQS_MEMORY}" JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency local vm_version="$(java-config -g PROVIDES_VERSION)" diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest index 88d8a813f89d..014914194795 100644 --- a/dev-java/junit/Manifest +++ b/dev-java/junit/Manifest @@ -1,6 +1,5 @@ -DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb DIST junit-4.13.2_p20240222.tar.gz 1007781 BLAKE2B 4eeab59aa7ff3cc65c73318acb562523e6ba781da6a0baf28f8fa82042f1affddb583d188c550207a7e267b3475f4a546e8e25eba61d5ba36d13bd7e277ad156 SHA512 89506413b7aca7c2d0b41c8297dde48c1b90a44133bfb3ebf300247c7837839a3aff2d785d891ddb8762427d718eacf016a1d67e2e24edda05f4eae36ca311f1 DIST junit-5.10.2.tar.gz 2942035 BLAKE2B 4880df74b7cbf23acd34c716f9fce26edd28b31c14d720e129e9e1f06aa35b70c447a0d87904e083a54663fba17e0b2b470678dc32480e0a11c5ebf46d5fe38e SHA512 c36ff7c2bd21f9a64c93b836fc1017a8a96ebcc0079cf1d95b09f5b764435178c2dc2336f2493e7e4df561013693dce4f08dfe0cf3bd76cc9b820313f64d064f -DIST junit-5.9.2.tar.gz 2882173 BLAKE2B 6baf8768654b399d64237a110dcb6a821ab7dc8964254a5d00f7ffb65c789818aed51ad7042a963a47669042baaeec87b5d0453643a2b0eeeaf6393a42c75fd6 SHA512 5673577f773042b4e253241d27298a60dbac239502788e1d999fbe0d3ffe76b29c90d4fb43660f2e2e00e3e9b8d4c1b6b909ff95dc6e87ccb6f7b009ae6b0e78 +DIST junit-5.10.3.tar.gz 2944861 BLAKE2B 38ca01363ecd1a2bb1b66d93bbc8a6e34c94ee574fd44857239223f6253051c355572ac8ecece21610ea8afeabdc62df30caab1994ae9bbfa9fa9c71097ac956 SHA512 8d3621b6da6e70017957e280fd2848fdc77136497bf4399a1690f2db0f53b1b079f85ec19b6d3115cc01fe24454e118548944d45e1c23f2a404b640e587b0771 DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930 DIST junit5-java18-compatibility.patch 742 BLAKE2B 89bfa36330278cdee2f7f66ed5527895e650a7b490d3f3695772a27541be1d8383c1742bab4e8494f3a84c29f93f553880a3bd5cd4d84792cf662fbc33a6e594 SHA512 5a9a562eb61a875764da369ff40da6ff95c6de8b3b3ecb612634112076741d75d6eab385743843b4fe7ca8a1827960e06550f6e90c8b7ef75b55006b41c416cd diff --git a/dev-java/junit/files/junit5-java18-compatibility.patch b/dev-java/junit/files/junit5-java18-compatibility.patch new file mode 100644 index 000000000000..8015d4658b7b --- /dev/null +++ b/dev-java/junit/files/junit5-java18-compatibility.patch @@ -0,0 +1,14 @@ +Description: Fixes the compatibility with the latest version of Java +Author: Emmanuel Bourg <ebourg@apache.org> +Forwarded: no +--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java ++++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java +@@ -316,7 +316,7 @@ + } + + @SuppressWarnings("unchecked") +- private SerializedForm(ObjectInputStream.GetField fields) throws IOException { ++ private SerializedForm(ObjectInputStream.GetField fields) throws ClassNotFoundException, IOException { + this.uniqueId = (String) fields.get("uniqueId", null); + this.parentId = (String) fields.get("parentId", null); + this.displayName = (String) fields.get("displayName", null); diff --git a/dev-java/junit/junit-4.13.2-r1.ebuild b/dev-java/junit/junit-4.13.2-r1.ebuild deleted file mode 100644 index 0fa825c0272c..000000000000 --- a/dev-java/junit/junit-4.13.2-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source 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_p20240222.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild index 6a2ce43fc405..50aa3c3c6763 100644 --- a/dev-java/junit/junit-4.13.2_p20240222.ebuild +++ b/dev-java/junit/junit-4.13.2_p20240222.ebuild @@ -44,7 +44,8 @@ src_prepare() { src_test() { cd "${JAVA_TEST_SRC_DIR}" || die - local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})" + local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars \ + --build-only ${JAVA_TEST_GENTOO_CLASSPATH})" ejavac -cp "${CP}" -d . $(find * -name "*.java") # pom.xml lines 264-268 diff --git a/dev-java/junit/junit-5.10.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild index 77e7c892d6be..9429d37e25d6 100644 --- a/dev-java/junit/junit-5.10.2.ebuild +++ b/dev-java/junit/junit-5.10.2.ebuild @@ -24,7 +24,7 @@ S="${WORKDIR}/junit5-r${PV}" LICENSE="EPL-2.0" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" IUSE="doc migration-support suite vintage" CP_DEPEND=" diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.10.3.ebuild index 46efd8fcf0d8..ed6b7657fa56 100644 --- a/dev-java/junit/junit-5.9.2.ebuild +++ b/dev-java/junit/junit-5.10.3.ebuild @@ -10,18 +10,19 @@ EAPI=8 # multiple times to build multiple modules, but the eclass always # installs each module's Javadoc to the same directory, which would # trigger an error when the second module's Javadoc is installed. -JAVA_PKG_IUSE="source" +JAVA_PKG_IUSE="source test" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Simple framework to write repeatable tests" HOMEPAGE="https://junit.org/junit5/" +DEB="5.10.1-1" SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/junit5-r${PV}" -LICENSE="EPL-2.0" +LICENSE="EPL-2.0" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="doc migration-support suite vintage" CP_DEPEND=" @@ -45,6 +46,7 @@ DEPEND=" >=virtual/jdk-11:* ${CP_DEPEND} ${COND_DEPEND} + test? ( dev-java/jimfs:0 ) " RDEPEND=" @@ -53,6 +55,15 @@ RDEPEND=" ${COND_DEPEND} " +PATCHES=( + "${FILESDIR}/junit5-java18-compatibility.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + src_configure() { # Please make sure to declare a module's dependencies before the module itself. # Useful upstream documentation regarding modules and dependencies: @@ -297,6 +308,7 @@ src_test() { "@${example_sources}" local test_cp="${example_classes}:${JUNIT5_TEST_RESOURCE_DIR}:$(junit5_gen_cp)" + test_cp="${test_cp}:$(java-pkg_getjars --build-only --with-dependencies jimfs)" ejavac -d "${test_classes}" -encoding "${JAVA_ENCODING}" \ -classpath "${test_cp}" ${JAVAC_ARGS} \ "@${test_sources}" diff --git a/dev-java/log4j-core/log4j-core-2.19.0.ebuild b/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild index 1ef9298c2298..23f8b39d5371 100644 --- a/dev-java/log4j-core/log4j-core-2.19.0.ebuild +++ b/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -51,7 +51,7 @@ CP_DEPEND=" dev-java/jackson-dataformat-yaml:0 dev-java/jansi:2 dev-java/javax-mail:0 - dev-java/jctools-core:3 + >=dev-java/jctools-core-4.0.3-r1:0 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest index 32bc29febef6..8c052711ebb3 100644 --- a/dev-java/lucene/Manifest +++ b/dev-java/lucene/Manifest @@ -1 +1,2 @@ -DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e +DIST lucene-2.4.1-src.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e +DIST lucene-2.4.1-src.tar.gz.asc 189 BLAKE2B 614fc428936d49caac1072e5c4fe5a31d86545220483f1e60fee6560b3bf1d661eb718013c8211ff701758aff37ebe3ffe18bb0a94d90b75962d1e74b8005f6b SHA512 38eee5a062ca11c638b3a0e131ffe133b49e9c759216d854f2be99e27a8445408b1097df28436e6155f551df0ddf9ca16a286652c9ce12dc114228bbd125dba2 diff --git a/dev-java/lucene/files/lucene-2.4.1-javacc.home.patch b/dev-java/lucene/files/lucene-2.4.1-javacc.home.patch new file mode 100644 index 000000000000..9668b6de1ff4 --- /dev/null +++ b/dev-java/lucene/files/lucene-2.4.1-javacc.home.patch @@ -0,0 +1,13 @@ +diff --git a/common-build.xml b/common-build.xml +index 3fa75d1..1e695cf 100644 +--- a/common-build.xml ++++ b/common-build.xml +@@ -110,7 +110,7 @@ + <available + property="javacc.present" + classname="org.javacc.parser.Main" +- classpath="${javacc.home}/bin/lib/javacc.jar" ++ classpath="${javacc.home}/javacc.jar" + /> + + <available diff --git a/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch b/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch new file mode 100644 index 000000000000..d8e3611539aa --- /dev/null +++ b/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch @@ -0,0 +1,25 @@ +[junit] +[junit] Testsuite: org.apache.lucene.index.TestIndexInput +[junit] Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.069 sec +[junit] +[junit] Testcase: testRead(org.apache.lucene.index.TestIndexInput): FAILED +[junit] expected:<[]> but was:<[��]> +[junit] junit.framework.ComparisonFailure: expected:<[]> but was:<[��]> +[junit] at org.apache.lucene.index.TestIndexInput.testRead(TestIndexInput.java:89) +[junit] +[junit] +[junit] Test org.apache.lucene.index.TestIndexInput FAILED + +https://bugs.gentoo.org/312437 + +--- a/src/test/org/apache/lucene/index/TestIndexInput.java ++++ b/src/test/org/apache/lucene/index/TestIndexInput.java +@@ -23,7 +23,7 @@ import org.apache.lucene.store.IndexInput; + import java.io.IOException; + + public class TestIndexInput extends LuceneTestCase { +- public void testRead() throws IOException { ++ public void noTestRead() throws IOException { + IndexInput is = new MockIndexInput(new byte[] { + (byte) 0x80, 0x01, + (byte) 0xFF, 0x7F, diff --git a/dev-java/lucene/lucene-2.4.1-r3.ebuild b/dev-java/lucene/lucene-2.4.1-r3.ebuild deleted file mode 100644 index 01cdd2a220ea..000000000000 --- a/dev-java/lucene/lucene-2.4.1-r3.ebuild +++ /dev/null @@ -1,83 +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" -JAVA_PKG_BSFIX_ALL="no" -JAVA_PKG_BSFIX_NAME="build.xml common-build.xml" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="High-performance, full-featured text search engine written entirely in Java" -HOMEPAGE="https://lucene.apache.org" -SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2.4" -KEYWORDS="amd64 x86" - -CDEPEND=" - dev-java/javacc:0" - -# Restricting to jdk:1.8 since it fails to build with openjdk-17 -# BUILD FAILED -# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: rmic does not exist under Java 15 and higher, -# use rmic of an older JDK and explicitly set the executable attribute -DEPEND=" - ${CDEPEND} - virtual/jdk:1.8 - test? ( - dev-java/junit:0 - dev-java/ant-core:0 - )" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -src_prepare() { - default - java-pkg_clean - sed -i -e '/-Xmax/ d' common-build.xml || die - - # Portage marks shese files as bogus for some reason. - find . -type f -name instruction_arrow.png -exec rm -v {} \; || die -} - -src_compile() { - # regenerate javacc files just because we can - # put javacc.jar on ant's classpath here even when <javacc> task - # doesn't use it - it's to fool the <available> test, first time - # it's useful not to have ignoresystemclasses=true... - ANT_TASKS="ant-core javacc" \ - eant \ - -Djavacc.home="${EPREFIX}"/usr/share/javacc/lib \ - javacc - ANT_TASKS="none" \ - eant \ - -Dversion=${PV} \ - jar-core \ - jar-demo \ - $(use_doc javadocs-core javadocs-demo) -} - -src_test() { - java-ant_rewrite-classpath common-build.xml - EANT_GENTOO_CLASSPATH="junit ant-core" \ - ANT_TASKS="ant-junit" \ - eant \ - test-core -} - -src_install() { - einstalldocs - java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar" - java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar" - - if use doc; then - dodoc -r docs - java-pkg_dohtml -r build/docs/api - fi - use source && java-pkg_dosrc src/java/org -} diff --git a/dev-java/lucene/lucene-2.4.1-r5.ebuild b/dev-java/lucene/lucene-2.4.1-r5.ebuild new file mode 100644 index 000000000000..2a1641800238 --- /dev/null +++ b/dev-java/lucene/lucene-2.4.1-r5.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 verify-sig + +DESCRIPTION="High-performance, full-featured text search engine written entirely in Java" +HOMEPAGE="https://lucene.apache.org" +SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz + verify-sig? ( https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz.asc )" + +LICENSE="Apache-2.0" +SLOT="2.4" +KEYWORDS="~amd64 ~x86" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lucene.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-lucene )" + +# Restricting to jdk:1.8 since it fails to build with openjdk-17 +# BUILD FAILED +# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: \ +# rmic does not exist under Java 15 and higher, +# use rmic of an older JDK and explicitly set the executable attribute +DEPEND=" + dev-java/javacc:0 + virtual/jdk:1.8 + test? ( + >=dev-java/ant-1.10.14-r3:0[junit] + dev-java/junit:0 + )" + +RDEPEND=">=virtual/jre-1.8:*" + +PATCHES=( + "${FILESDIR}/lucene-2.4.1-skipFailingTest.patch" + "${FILESDIR}/lucene-2.4.1-javacc.home.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean + + cat > build.properties <<-EOF || die + ant.build.javac.source=$(java-pkg_get-source) + ant.build.javac.target=$(java-pkg_get-target) + javac.source=$(java-pkg_get-source) + javac.target=$(java-pkg_get-target) + javacc.home=${EPREFIX}/usr/share/javacc/lib/ + junit-location.jar=$(java-pkg_getjars --build-only junit) + EOF + + rm docs/skin/images/instruction_arrow.png || die #: broken IDAT window length + rm docs/images/instruction_arrow.png || die #: broken IDAT window length +} + +src_compile() { + eant javacc + + eant -Dversion=${PV} jar-core jar-demo + use doc && eant -Dversion=${PV} javadocs-core javadocs-demo +} + +src_test() { + # we found that running tests with eant creates completely different output than + # runnning with ant. no idea what exactly is causing that difference, + ant test-core +} + +src_install() { + einstalldocs + java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar" + java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar" + + if use doc; then + dodoc -r docs + java-pkg_dohtml -r build/docs/api + fi + use source && java-pkg_dosrc src/java/org +} diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild index 9e2b264421f8..1eca00a9a589 100644 --- a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild +++ b/dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild @@ -84,7 +84,7 @@ src_compile() { -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 + build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o -llz4 -lxxhash } src_install() { diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest index 7158eea18442..4fb9d99fa973 100644 --- a/dev-java/maven-bin/Manifest +++ b/dev-java/maven-bin/Manifest @@ -1,2 +1,2 @@ DIST apache-maven-3.8.8-bin.tar.gz 8296049 BLAKE2B af6353193365ed33e8f2f0a7e4d31933132751f142ebbdb68aab7a74ad2dda6593bf34cef9d8d56d6c93ff93293b75517a10a5c1c048733b8c911f4ac150bdf6 SHA512 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00 -DIST apache-maven-3.9.6-bin.tar.gz 9410508 BLAKE2B 2a99f002912e6c0fcf9f78f0553553898cf39c17bd7c8b58269c8a7d061c425c62a2f557a686fd2b1f114ef1f47aab6e9b318555235bb436e8c7e5c8b1a0dd9d SHA512 706f01b20dec0305a822ab614d51f32b07ee11d0218175e55450242e49d2156386483b506b3a4e8a03ac8611bae96395fd5eec15f50d3013d5deed6d1ee18224 +DIST apache-maven-3.9.9-bin.tar.gz 9102945 BLAKE2B a705f18a1e7bdfd5d9ba8c38da02245ed5754fe749416ccc715dcdae21d8a41026778dfb912e3ea3e89e8358aede13d29ce3081ac71b16191e53d5cac557e643 SHA512 a555254d6b53d267965a3404ecb14e53c3827c09c3b94b5678835887ab404556bfaf78dcfe03ba76fa2508649dca8531c74bca4d5846513522404d48e8c4ac8b diff --git a/dev-java/maven-bin/maven-bin-3.9.6.ebuild b/dev-java/maven-bin/maven-bin-3.9.9.ebuild index 99a723fc7721..16060561ede9 100644 --- a/dev-java/maven-bin/maven-bin-3.9.6.ebuild +++ b/dev-java/maven-bin/maven-bin-3.9.9.ebuild @@ -11,8 +11,9 @@ MY_P="${MY_PN}-${MY_PV}" MY_MV="${PV%%.*}" DESCRIPTION="Project Management and Comprehension Tool for Java" -SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" HOMEPAGE="https://maven.apache.org/" +SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0" SLOT="3.9" @@ -25,8 +26,6 @@ DEPEND=" RDEPEND=" >=virtual/jre-1.8:*" -S="${WORKDIR}/${MY_P}" - MAVEN="${PN}-${SLOT}" MAVEN_SHARE="/usr/share/${MAVEN}" diff --git a/dev-java/metainf-services/Manifest b/dev-java/metainf-services/Manifest index 9f645d5aee76..69a4f55fe8b4 100644 --- a/dev-java/metainf-services/Manifest +++ b/dev-java/metainf-services/Manifest @@ -1 +1,2 @@ +DIST metainf-services-1.11.tar.gz 5364 BLAKE2B 35c02791b4874a4806b9886c5d1d25e68ea0fbbd2e2e34c716e87e5043b56416c00e32e53f31e5ede0a4c9d466a64bb1e882ec9fff1ca0771ac9ae534c666394 SHA512 ccbe31a061c29ce45d1f86efee40675b89d328ad40b717abf28b9b7b62c678b584281b2d99848ff41992c7ff38941e5f9b93aac8e967605e2221d4bd02019490 DIST metainf-services-1.9.tar.gz 5353 BLAKE2B a2d72b886169f6697033c56fa581e4fed9f69236a335397b0480111959e87e1d25ee16b96c6449b37b467aa68f0b4997873346416d8a09e3b14b911ffe37ffd4 SHA512 6d666c2582944e824cc66dd58c09474775e475146af7f8edcb4abce45eff6573481f550d8c37b854addd81825201207be7855b9bbc21f539559395a63e9fa261 diff --git a/dev-java/metainf-services/metainf-services-1.11.ebuild b/dev-java/metainf-services/metainf-services-1.11.ebuild new file mode 100644 index 000000000000..d03e2e80adf5 --- /dev/null +++ b/dev-java/metainf-services/metainf-services-1.11.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Generates META-INF/services files automatically" +HOMEPAGE="https://metainf-services.kohsuke.org/" +SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=virtual/jre-1.8:*" +DEPEND=">=virtual/jdk-1.8:*" + +JAVA_SRC_DIR="src/main/java" +JAVA_RESOURCE_DIRS="src/main/resources" diff --git a/dev-java/miglayout/metadata.xml b/dev-java/miglayout/metadata.xml index 457503f62795..69fdbc631122 100644 --- a/dev-java/miglayout/metadata.xml +++ b/dev-java/miglayout/metadata.xml @@ -9,6 +9,6 @@ For Java developers writing GUI layouts by hand that wants simplicity, power and automatic per platform fidelity, that are dissatisfied with the current layout managers in Swing, JavaFX and SWT, MigLayout solves your layout problems. User interfaces created with MigLayout is easy to maintain, you will understand how the layout will look like just by looking at the source code. </longdescription> <upstream> - <remote-id type="github">mikaelgrev/miglayout</remote-id> + <remote-id type="github">mikaelgrev/miglayout</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest index 6513dd221b48..5340ebc92a15 100644 --- a/dev-java/mill-bin/Manifest +++ b/dev-java/mill-bin/Manifest @@ -1,3 +1,3 @@ -DIST mill-bin-0.11.5 52760276 BLAKE2B 1583403fba8782d759a5d56513e2d40cd81ffb68d4947b638052cc6108d6d6516f7fc16e9cf516fc7c2c60820d2d6fcb5c15179bcef715c6d75f25c6802fe711 SHA512 673d636fc64fff01289ad642f2f861f6da18d3e652cdd645e3d2487daf1baf4616515e31540a03f67dbc354efff4f48a6881e1ceecfb966eb24d7675abb6dff7 +DIST mill-bin-0.11.12 62116087 BLAKE2B e64e2ec1a2c89e780ada3b779104826398e9ab12801aea937302d71be190dd6caea6c64045e878f202b631c7647d8897054fd120c11f576ed301ffc02e8f7c8e SHA512 920de40ca5d8178d33ce439cc6a48ad4ec5665fa248af24122f7869ef5ddfa21f643fbf9a4bfa0dda40b8c994e088b7e4089c534d809a7a31cd6ca764fb5e741 DIST mill-bin-0.11.6 52778046 BLAKE2B 5f05b14cafba4e6b40b89572310a2b06ddbf1839a2da0dbdfe73a63606c9b1262fed686f7ffb17dc178072242136a4b334a2ae89b2fdc7274bffee928ff3c5fe SHA512 9f187b00d37f8d0bb97b7cd08c57e59e081c835e25f83e6c65bf2ca425f4325a6c641f7082ef700dac30ab6d4f59da5492136eeab21c898f11a259b89d55e9b8 DIST mill-bin-0.11.7 59806165 BLAKE2B bc97d64a692a33a482752828a703cb22d44bafeeb3aa329136d601058b56bf94703f97047be416bcbcfeb9633288f31e5715646aad359be59deffc957fc15b7c SHA512 c7c2cecd5cec6aab735e36182fade4e7360684795af42b528c1a7e5b0a0dc89dc4c68d47400d46121854c455f72e47f51c73ac4f8e70339ce5a7d18ae8b088de diff --git a/dev-java/mill-bin/mill-bin-0.11.5.ebuild b/dev-java/mill-bin/mill-bin-0.11.12.ebuild index b2461d64d37b..3534e0b8c898 100644 --- a/dev-java/mill-bin/mill-bin-0.11.5.ebuild +++ b/dev-java/mill-bin/mill-bin-0.11.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,17 +6,16 @@ EAPI=8 MY_PN=${PN%-bin} DESCRIPTION="A Java/Scala build tool" -HOMEPAGE="https://com-lihaoyi.github.io/mill/" +HOMEPAGE="https://mill-build.org/" SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}" -KEYWORDS="amd64 ~x86" +S="${WORKDIR}" LICENSE="MIT" SLOT="0" +KEYWORDS="~amd64 ~x86" RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}" - src_unpack() { : } diff --git a/dev-java/mill-bin/mill-bin-0.11.7.ebuild b/dev-java/mill-bin/mill-bin-0.11.7.ebuild index 5b24c097e25e..95f583ce077d 100644 --- a/dev-java/mill-bin/mill-bin-0.11.7.ebuild +++ b/dev-java/mill-bin/mill-bin-0.11.7.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/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest index 706e0d6d8ec1..b7c6f2420178 100644 --- a/dev-java/openjdk-bin/Manifest +++ b/dev-java/openjdk-bin/Manifest @@ -1,42 +1,37 @@ -DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.22_7.tar.gz 191713436 BLAKE2B 2d0381ca8dc4bdc07330f79c7e290bdb60a28fe21122d4db1810dc036e7213071d327470b20361db1435fe2d5492e7d3815f3e244597d3d76a9f7894b515783f SHA512 a0772607ede5642051446dc742180fd4e42fbe78602eb3b874b00930ea4ba19eefdcf6a130f378b6cc7dde414a3db2259edb1ad570da4a7951a73bebc5a90b9b -DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.23_9.tar.gz 192013902 BLAKE2B 6a4b47b9a3397d3436bd55a16a459a3cab3f8a2a7dc3285b3bde8db13f0e66d5e094803df0c5901a17272e6378161caada6f27845184e2efd17a6761661299c8 SHA512 90e53418efc7c34d7cf0691d566f07a84f02bd2d34cdee0c9c343e27c8d9bfd4d1bf86f104ae33a47274932ab8ba6ec8071a35e7d613129d03e439ae3382452c -DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.22_7.tar.gz 182591395 BLAKE2B 858c6033c161dfe6c1475037bce5d538ca7b95b95b65a75edff03d0292e64d1ac2e3c2ed008b52938d9811e35a94ed694df2801605b55d6732c6c1c1b68b547b SHA512 aa0be475706f6cca490ff81389e131fb512efaa948d722b108a7060355af77134210c2509711f9c8bf4d32130cba813dc460c093d831ac8de539571ab3d08f20 -DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.23_9.tar.gz 182785851 BLAKE2B 453ca29859e749a9050f8b6627696ab6d38ee5e83ab69b1d159eb3b7c0bae68104cf68ca21b87123b4fc61059e528ba4ed0ee29fa4759f33a3cf46182f52a48a SHA512 af8ed3659f8ff07f5e5c135d96a7368d326f5b19e3d73077a3fa701716f6e415d4a784ff6c5f81267eb1b3d2e171a688126253f1c3197fc80ea260826ebad5a0 -DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.22_7.tar.gz 177146946 BLAKE2B 2e285abcde91eb578c88e81c6a737d6c6e00d58001325eaed7fd332d4d42588779192ae73f3de598cf725c9cd08860ff3a0db29f7fae54a6a404cbdf0db0b2ad SHA512 6288e599a54f1e2e02dd0eef5f0aae051ae8b15ed30e924c7018ac52d2eeb2572934557b7e722df7f704568656c8a8f93797dd2e86fdc3f0f32ffd004f803419 -DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.23_9.tar.gz 177453532 BLAKE2B aa98f381f2ac4f208ced4dac4f4b01d20cfd27c8ccc75a0c41db6a57b67ca11d87b8133cb0af96283f646e5e90612f9ad69db5129e6f50518ad2eb0a53c86db1 SHA512 c590fa032593db48531d49977c95d1f884fe751472d927d0d0bc15f36ec35f71ea53c9acafa3dc00c4b25e88d4c18ab590b42f8057a277e16947c3ce31362381 -DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.22_7.tar.gz 193744131 BLAKE2B 2cdbf676ecc860dd8ec13d959f9f63537e4b14feb0627cc360602a377c8a7193a2db67cb71f462939ab252f2ff3be1b46a15c25a7c1c1f1632254b1ea09eeef9 SHA512 81dabded0d6cee459ade96992d4002910448aa5fa091fd1b6c376a585c382d449bc63f5e51ba0c21e5fdd81f3e1d58e1d27f0b6016daca775644610087f3b090 -DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.23_9.tar.gz 193956832 BLAKE2B bc334b59bbb021812ee7064b1915b6106923d41a74a3acf5b5d8fbcf50f6e0d467a96da22f996252422b08f5c7864418c552a102a18f3bd9cb14e5b4904656e5 SHA512 f0992a7fdb1acadf8cb19a94822e7a75f7453033cc0a3432f9efface7827b4a7ebb1ff67a81774da83844afdb046461415f50ddf11192863e88ab06889c86836 -DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.22_7.tar.gz 195002045 BLAKE2B 1898bcc1c1d97668238a13c70226b14f325a7c5be55f393ce2e6373fa0764a38633511a485257d05e173670e20b8c0195fb63d7143f41a1296556e5d59a8fe00 SHA512 00d75269a88c3d879907408f76ca1ee5a1ed48914e1ac27fa4faadf66a12fbccd6235d23be6c0d096a508c6ed996884ff2fe206290c061c2542835050476cfa5 -DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.23_9.tar.gz 195220527 BLAKE2B b2f024fdd2d72e78c86f562fbd37684c9d9639472d66e15b4b882c35241c500c09467e97440249bf69f4e63ef99d3f057b0e79852b67d55c5518d041cba2d657 SHA512 ccccb5003b78cff0cbf471d9b885ebd5805b5a21dd71afdb03a0d447cd6715e781dbf01f11970f7632b8181147fe0090f7fe8fc46c8732d2b17f0978f01934a4 -DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.22_7.tar.gz 187409838 BLAKE2B edbbb534fad7d6b50c79253d7c8bc1369f413fd1748a4f160003db2e01d8b907c115a5a3815de85e25a16c74bf0d316cccf7e0a508a488c51c476511876d5d54 SHA512 3371785f6bcc27dea59b074798795c91f3a0fc2241ea24d9e04bdb98fd77ebc1ccb058d1b34ea56660a7bac92e60192396a9d8b85b8983f1617bddf50d118276 -DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.23_9.tar.gz 187689918 BLAKE2B c1ccebd2bfeccdf64f1ab0c781e4ba5f2701f6c70de81486c6b4d91bb1d1df367f58fa66bf8f073ed47413649905a306ad3f75c6696e1d0510ce02fe3453d255 SHA512 93974938c10d58b182a7bda49e21e26806a01a03fe72915ca559df3e02c694b3b88ed11c49987bc2ca7c1acabda0892d8c22a4ab19ed8b796dd02f29c44dbff0 -DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.10_7.tar.gz 190867185 BLAKE2B dfac2c4383af080b8101e73d141f6ecaf38f44a0b8e88fddf8e33eb0454fccb22075e00a8eb3031c33a0d63a079da634b128766f4ab4fed70c8da999c8f8a568 SHA512 74447bacae664b5a1a420605d1c3b68a7be8deb230cc08700b23bb159ef10acb613595505f711906aa132aec2a25d5151f178cd9982d0d254a4d31a7396b4aef -DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.11_9.tar.gz 191052267 BLAKE2B 837cd3f3e9cdff7b66d1a8e10e2e8ebb9db1168fad2982fd523eb8067ca017efdc05e577b93af74623558d04a8458dc1d790c9626e7ed2d6568bf7fc22a44925 SHA512 eeeacbd0f8daa1d62663f7ec95fb7dd3ff855a0187347e3c1ddb4a5d13e494c1a940b43b5fdf75480963d65dd4d94330570b751fa7cde540124ed2164c176870 -DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.10_7.tar.gz 178168341 BLAKE2B 425cac786cd7bd758d40ad76bdfc96969e2ca2b1ecf20c449a7e42b77020881f7c7414099b7ff9df482ce4698c680af4d819a928efb4e4608c54266412fcb2f5 SHA512 006773423fa46d61d1111a74bf1a41d50cb419d4a2855d0257a11282f9ab966a59e6bf22044b46d3a29041c37942f2f69780ee38002e8443da2bd40543ce0948 -DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.11_9.tar.gz 178367345 BLAKE2B 7f1c8f77ab8ce9ce401947e51cc3051491df1579409f7ecb73107f091b58d6e7fce2004604951dfad019cd60e8da84fd4ee9f8987f92c9363889b310ee098e54 SHA512 0283452e56b3fbd85af33a7939ec8ae69624241ef07224152de55c5aafb1a5cb8423b8a211b5fadf8f5ea50aa0e5ed8211d02abf1398473ddf3ef13f2ba3f1c4 -DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.10_7.tar.gz 189087918 BLAKE2B e8c70966cd362ac26e748c4efb16bbe3816d27bbec5d3b2448b77bc07f8f17b6c77dd7cddcccd1256e621db93653e3aed2ebf1f895606023b00fdf3a98232b57 SHA512 17d540bfa9fd458fb214dc550df4bd1bd563630712b23549d61182d3c5dcf39cf016510b2318655e9bff594e40b960d7754200ba6184ea23bab40ed2d8e9c06f -DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.11_9.tar.gz 189349607 BLAKE2B 2508ca965c27b1cf6457a595418ee9cd0450f9633a2fb80605a58a4bb7546cebb95b04c0d66bb14107c75fdff9fb678d78cdb879316929a3da6863579d4df9dd SHA512 bb76dcc65f65bbd3a256a54cea00eddb25312f1a1e2ed30fd3088bd44e9f8db7bb2ff3a6776b5ff6733ea7afc02928ef9e2bae296325fb1b8eb9b66b4e6f4a87 -DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.10_7.tar.gz 191584458 BLAKE2B 77ad2b213ee0957afdf6c204b2c987f568f62071ef282b8eb44d041980e44d5b964e4403324555f98caccd8736278ede2b486a4647ffbe669d4a285d19bf6507 SHA512 f808ad1d20ec025925653f6fe4566d6075c242b0f60f3dca3d0b46ec309ff3dd30637b9d2d2937b0fd2dff5a3ffd9e675766ea56a6bccc00a991266101d63db0 -DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.11_9.tar.gz 191737628 BLAKE2B d78a0a64bf936bf85a4f9fe1c9299d1db4773e10cd308afa5167d61ce35ea7415d2a94a1dc160345fa5aa3d3a7b730235801789db147d62dae621572ca060fe7 SHA512 9ae308f12b5c74b48aed4ef2312d7e0b23e9fa73b7d78eb3576037b0fcbcfc3a5381ebc448fb41279e770d5994c46bdda6822b97181fa3d3365da63c8b0ecadf -DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.10_7.tar.gz 191453728 BLAKE2B 61e54448c7540f43c11ec55ffffe07ba43bbb60bcbc2acd07a3a06562ffbf7bd5b25c2a91540ead82978c43ef30ac2adbae1554d0718156b28bb34d46882020a SHA512 b7eded9bef2bbfa38b6350914df472e10daf82600af8090b59ce01cd0d2e6efd02f0bf28920cbcd3f7da2018e5642d8e5a282337ad969c8b9a8c35c0ae4890d3 -DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.11_9.tar.gz 191615499 BLAKE2B 4b342ebf3da0cf49d448b95dec6b04819d2ab2e31327b793b9d9aef86b4e78ce33a54995a5d0608d14214f3d0fde73d0ad334c9b0e3c5d2cbb6d40c4bb22637f SHA512 7773843e3b2a02ccb70c3ea49639c723f5da715dcb3e27ed85dbd2182648621a5822c49728436377c8e8af4d20231ba5b861e45be17efe44a5a81a92c225a851 -DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.10_7.tar.gz 192205930 BLAKE2B 1c1ae9515a273ff7d7d4ef806fcb6d101e127f224912626982fbe848375f240bfca69815173b65c8c3ecc7019bb681ef43665bf3fe82d5c4333da057a35c976d SHA512 fcbb1bc62d484a8b851ea22d725921f72a4ce7ace33c1db737e7294aac17b74cd7ae9a366cac09d328be66e742916f0191fafaf531641610e652d24390df591a -DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz 192396023 BLAKE2B 1e5f12041d9c17195f242d7d36edf6995b1f71cb52ca211773faaa0cca6af983ec8c7885d58d4b87b38a0a26f71d088c104cdbcb84fdfffd97643f2a09a2a4ed SHA512 f11e61d91ad27ca31196ded87d06b5e379e4e652c09ffdd5c3d73cdc9fe6c46cd7785838c70514897645213ff6c6948227be27d7fd773949f1055338966ba275 -DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.10_7.tar.gz 180364858 BLAKE2B ded64698ee98c051b4f2bdbf7d30eb27bbc5418742306bd07fe87b0cf7cc579adc553bc2a16f8b15d2fe1950b463195ca3f3d414494491435fca052faedb8bf8 SHA512 4c199bbf2584d4a360caced88bb6f297417469334d3a3007f5a172f2fd3a41a492968fc0ad32a4f8424e4d6712d01060aef2531957edccc100f6cb58bbfce000 -DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.11_9.tar.gz 180563846 BLAKE2B f9bf368e39d95cce40413caeb98192f88f90cad7dcb486ef5e1d7369cfc346603d37de88c049930b958043621e44c103e020354eb80faff0cf83fac8dc7497a7 SHA512 999ad1fb7c822e9000e734c86e70e73aa572ec1a75d14219b391e9d358d1dba1fd0d9d568df4c28d8ca88fd4341e24feee2f840b6c35c4c530d2cd174dd797b1 -DIST OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz 205794447 BLAKE2B 4d6ac1fa90b81be10cd32be76665dc26bae59a5c288d1b1f87e396ea356bf46f73b58db06b5b09417714f4638550d7ade55792f276f39dabc100345efd18c28f SHA512 b9cea7a7f4405c66722b3562e0ded7362475146753b1fcc4ad0d068264e9f228b8547dae704c6ce2be9c4a879902c2fbd93524176ffa02ddcb3edc4d4f6759cb -DIST OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.3_9.tar.gz 207595331 BLAKE2B 7358f61aaee85fc5ac584307f1d5372de17aa06676aa823de157236e4332184b9212e74cc4214845a9e834ebac88d41ba185d1823257254174a960db88cb0574 SHA512 dafe0f31867f2ef817f188fe1222adefae72fe4443ec95eba8f18d60c141bdca0f63c2591c834c470c7b15d011618c97c45bbc65e746cdc47ba9be9a2f2ce523 -DIST OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.3_9.tar.gz 207940807 BLAKE2B 331e80062987c1932c24c8ecee8456240261ab43da04df2e5782f28c9683226e74116b2d8b5dac7047ce62e1ccaa5020fb9d94b98c515e9c94445ac8165f9692 SHA512 149dc0e7f058443787e99641b0c996ea7ac15d171abcf03778ca6a44769583cae5e507415b16fd8de5015d2acfef4705910cd43289cdfe624d07280e7b7ad961 -DIST OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz 207698369 BLAKE2B 27dbfba74a3dc46ff98c982208e10c1c40940cfb90db0d756e8038cbb1c5f45e30ac3ca07b408a3593c471d0f5ea75bb652902d49786490e9ad5ba290ca91162 SHA512 cd9e6054989a838004490f6162f6831397e5498033777d90da224f0aa4809e0f5c8a14459e6f30d441fa1238371d7db9718e2c606c38862b803dda824bbdba1f -DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u402b06.tar.gz 102121884 BLAKE2B 78d6cb02f1c264eeb47f0ed7c6ea63cb0923119fb718be4f493423e9ef16546d810fadae82321fd1465528375383f0a65c6fe1a0bb091829ad14a9fc1f91296c SHA512 3a1bb7f684032d6130006597d1665ff063490a155bcbe720bb9cb94ff0368df1d86646923dad8965e6cecc12d05618e348f1b9d260a9fab3b9fb275c3350cf91 -DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u412b08.tar.gz 102116126 BLAKE2B 19f8deee04fe5521323ead5193ff7b383979afa32c4375bdef7ce53b868dd7cb317bcd208b94d373c353f5480433cb3a28beeacbb7f42b501058acdfe6917079 SHA512 e2c5e17eda6a25b8f12c8fe5a50b5c58a9b52bf9cdac7213e2b0eb7ea0c99ba0d3c31ecbaea834443fac12adacfe506ecbe3a487abd16846c6619678ac24c4ee -DIST OpenJDK8U-jdk_arm_linux_hotspot_8u402b06.tar.gz 98319479 BLAKE2B 6b59e92767566e8abf7bd360f6b0b543ceb514c3b1677ef1610596998390dba74e54cd673cff764677c11316f88ab05fe0080549ab063eec5bf42ac6f97343af SHA512 6595b35a5d883d17de56fcac638a4936397e01c2a132269ce66e325a8cb0fc6b437ab16062c1decaf5a93b6597e72034e2aef1ddbe5442f23575f31504a3767c -DIST OpenJDK8U-jdk_arm_linux_hotspot_8u412b08.tar.gz 98318417 BLAKE2B 11ec1cb2e793da8252511dee62ad193b67b3bc5c8aa91dbd6b1e8aa2d2f7e2e342528d145e0eb9e26b17b7e81c9ff17586f068b4d146f6789b157026aff67099 SHA512 84eab7b032fb55e02870013f9a87d0898ece12c52c560c0600d8d2ecb4901cc64e6e5cd44375ec6785a5c8f139263e8b6b32d348149e22200c962438fabea9fe -DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u402b06.tar.gz 100525497 BLAKE2B b3ca75fd946ea70dd8fcbc444b361e02b3249144795b0d2786892e6ec668802ae3b2f082fabe1d9e91e5db5877d6774f5c56f5fc382b38e739070e54e95bdca5 SHA512 e00df5042f7f813153689e33e7e64b23efbe2b64d8a11e60072f50f0ba38a61cf66214c535d75175f9ed99f67c22857ccc36d62c9c34962a7385e4b9c880c5d0 -DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u412b08.tar.gz 100529230 BLAKE2B 1498ff1c4d89f65a41a565cf3d6949f715bc8783a33b70e6cf7b44e513ddf7ade1242e2a0a95b582813ab212fb2367a5f17f794f54b5e458f0e23dd22e74123d SHA512 cf80eb66063559d4fbe062d8a198490468e4936c9e0b27ffe04912b4468a2d1f4d12fffe5df5fede38b44870b65a7f0cd85545f7031957b12a7d1a368a7770c6 -DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u402b06.tar.gz 100908305 BLAKE2B 3beb70ed7c99f80fb338fd8580f6b6ee9a4af0d7034abff59c0f8d42255fe83a3e9b9847d82dd4bb793439a64dc9d5fcc2d407f4bfd09625bf8be3ad92bf0e5f SHA512 e5563646a505923c1f2342a884c94e24c06de14dd6da21c3cb010bcf1e4c481ff7cdbae8cecfb70bf52a4c5d23a9fa87e38b1c7b8b84f99b0a8b3e8ca25242aa -DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u412b08.tar.gz 100923084 BLAKE2B 9c9b0d7f95983a44f040efa83c69100163b1450d04102000d4f75361e9164024697380c055fdb31bac2ef4dabc05df592bbf342e716d8f438954b89236ff0986 SHA512 07b721e57225165d3dbc51c1d8f79f269e75fa3fe946ab76e933d1d3645dd19b3e7e8ea924d4f510382b5bcebbf073e262010c0e4655e0282379cce9d411eeab -DIST OpenJDK8U-jdk_x64_linux_hotspot_8u402b06.tar.gz 103003119 BLAKE2B c97a924fe236ec0ad30eb70fb9ad2bea19065a22622d68dabb86be02eccdb30707bc00af98f46246fc8242f0bff4be8d5becfd32bf6cb015dd443d94e2722489 SHA512 22259ee3d98ed49e38f7c78efc200f72ee1fe5c02830e79061d16cc634df3276d1e17a113354bfd3d575ebf3b56e128848d03ae3dd5c06cc1954e33ad395b9e9 -DIST OpenJDK8U-jdk_x64_linux_hotspot_8u412b08.tar.gz 103005511 BLAKE2B f3df80c160d723df67700363ed6f40f3308a7625635b5afcb1656c77c9f78cc2796c5878aac0bda6cbde8d6551371ed15223de6aa8e75c01ba3e4848285a88eb SHA512 6f7df3fbb34c5971b7bbc4bafbe0179983abfa0aee212cc810e2656697cf0a7f4736cbbf6755cc88cc885d7beb5c15482a21d5287c52bae560988cf80908ca05 -DIST OpenJDK8U-jdk_x64_mac_hotspot_8u402b06.tar.gz 109474943 BLAKE2B e277cf06d893aa75f9aee91894fa6177c52fa556128614b80755af3c1bb16036daf972b4267c5c02d6e187c6bd52713eeeffd93e23f8d7a2897ad01149e8545c SHA512 718a120a1c6a861cba900ad267f646177e1b56d9646068121341ae9ce52a9ae9a20afa173d85c4870d539105f94b75685108c019da84bd23e973ce80e2356841 -DIST OpenJDK8U-jdk_x64_mac_hotspot_8u412b08.tar.gz 109506799 BLAKE2B bdf043df0df0f0fe100e80a464a0fe8c60e7c80ab7ca5e7481c8f7458b793a24b0f2d93ec482b5f0de7a65b3d068322b7b3a9e9c9ec5c5b61342cb85232db847 SHA512 4d774c3f0794d7403dfbf953e7e9d635b71c463bb193ffb4cc98e98455ff7a448f0bbf290a28c9290e3d9affc7390eeb4be88ad48cbfb60d9f605e57158f5058 +DIST OpenJDK-jdk_aarch64_alpine-linux_hotspot_24_15-ea.tar.gz 212878116 BLAKE2B 1e5768eb0d900c7234049173dd2f76a9d1bd1661f8c5a2070400bf26fcb3d4550803b7e91b851152375b7344f164e86d6f33a82c28ee2e8bc4497029030c2281 SHA512 c8646b3f727ca48f7950327c621a8625931965b0a0b1ed4c5811a77d8b189f5295060d51ce3d7b3fa5fee714f44e6513d6fad69ae5cdf9fee314f1d8ee7397d8 +DIST OpenJDK-jdk_aarch64_linux_hotspot_24_15-ea.tar.gz 212847823 BLAKE2B b3986bd7038734c713a85177c2c87870b58c82f721a3b7328c80fdaba764589b6561d1b0ce7ca8d67a744b6e5acd15a9f51c206db0e06ab789005d44463cd511 SHA512 ece9e3cd2c88bb5455f67bbc185ff5e17f3b2f00c10ab7206a4062baa7852bf8b43abe6bc71f5eb797e87db25c3f4e199e6fd612c5f77c8ef9f58f167ce468da +DIST OpenJDK-jdk_ppc64le_linux_hotspot_24_15-ea.tar.gz 214453128 BLAKE2B 4a99153ca3bcdf94ef8d4fc96b66a80307f09626f63fe0f70451208362d4e4ae6759e0769528041d6c5d629057c10dfb3a173eed8f6ee289fadbd52587163e9c SHA512 80ccf9398534d025e42c44d21a9c3dfb389c6b376c96724e6b086b361fdda1e20880e00ad3f74715068ec69add527f9f2ba363759ac9edb25997096316ddd128 +DIST OpenJDK-jdk_riscv64_linux_hotspot_24_15-ea.tar.gz 210831983 BLAKE2B a8603cdc69b8a6608e06dd92d233db8867c633403f976ec62be3bf9d04296e56d89910a38ccae1a130abceedb1122a03eda03f7432abdc2f0f64cc1deeeb72ea SHA512 61e25536620880c5d39df44f740e349ff96075f9208bf6ccde5b4905cddbb0bda793cbcac4875b75e8116a7e443dd28fe9cde2de3d18367a10860a0d5bb55d20 +DIST OpenJDK-jdk_x64_alpine-linux_hotspot_24_15-ea.tar.gz 215189640 BLAKE2B 9eb9f839f7e581ed54647c9a2542c36495b0ba8357422a128e57655ee59518d67f28986889a654a41d50bfc2470e2ef14a91b5aff14c34197c0ee669f1919199 SHA512 3d41bbf1bdef408244eb953463c8f3758700edbd2c348af4cf5f2b854116452d70fffaff4d6cb7195764b6d07a429c0daf125b2761d0069a571fb084eb814bf3 +DIST OpenJDK-jdk_x64_linux_hotspot_24_15-ea.tar.gz 214963834 BLAKE2B 67ef16f4f8471dc307dfa4ad6a1ac6fa4a22d6f643804be928d134202db9196a1cba78bf44cd3bbd872421520c4a96b0df0ee838b9404418cc82e115443e9ffd SHA512 7eb11bc44260e0a6f807593b1c16eff8088c4329ccb9e2a72c5face45383540f59644363c3f9840325eacf23aed7b3ee2a6a4d5998adf92200df0d1912ba2136 +DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.24_8.tar.gz 192087968 BLAKE2B 12659ef10cf2728ca5eba2b4eed5f592a5bbff5065f33309498e7a465661957e0e8191bb691a89934a8221e26ae7265f0aca059ba59731b5d9a80e7f6cc55206 SHA512 84dbb810134199cb2f0278ccbcfca2d1abe32bf65bbb399e99c2ea9a027e21c2ace5685adae98930be4a185970640626b5bbbf822d499f815d803fa4485134f7 +DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz 182800065 BLAKE2B 50158e8e84637ab841226da590f53ef3d0f18aa2dc4ce5c2fabc2260d864a1de65a3021e380fa9a1af1aec92177c2618790ced8c7f12f449fd7ab4851bf37ac0 SHA512 893ab22f39f102724e7b77b7a06e09b33ee0551b166c0154ce19d4e6abd7e346d0a8314fe2e675e102febf93e001679a1c7c665f6b131c04a453cfbfbabb5003 +DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.24_8.tar.gz 177494491 BLAKE2B acc6c4893a57250284b7be0fe98d6ea3b44f42227174050ac3d035ff68e482a61aeb32b38f1404f597c47dc3090fa49aa27401c6903367cc938b1f4041cb714b SHA512 88d8e3eee4af1f3578ee001516fd9a2a71af6317af404e39b64365ac780f89455dbbac1eccf50aa6d09cb879a79da88e720c344cc527d7313d6abfb8b148c3ae +DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.24_8.tar.gz 193983794 BLAKE2B 1e2c87450db7dc12c634ae5d12f3a5c0ca9406d85c01e4b5953921b54a144d868b4f5b8fda17865ee42c7ad082177770286367b8ca38e7faaf30a80f438caab1 SHA512 1e55b979254f2ca7c1b53496471a089538fc6c31bb9a40dc1cab5e09f42b0ae23b383f768c2614421868d16d8eb2f3fcb5768fa24a944a8296439fbc31d7f841 +DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.24_8.tar.gz 195251808 BLAKE2B 920459ebe96477e79fa3e933958c3fdfac476231dbcd7473ef9fdcab0691e807e67bd94b92fe43dfcd66c401b62da0a450892d5561530c17c5f159d44f537f3f SHA512 91e20884152a5d670c05e83e0b2b875b324af2683bbfb063015cfef4956e1ef4f3051955222f854753ea4144d99b30f3f9bd1b5220204f9a9bdc51ef461a1590 +DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.24_8.tar.gz 187710109 BLAKE2B 7565adb6e64d2c53ffed1d64b8e23ac02b82f4feeb9315327c9825d1b134cd476d3331f64def991b23b5b568379c9e31dfdfd97fe87b6caad7eea039a47b652a SHA512 91d8da2812f8f709916de9f2fd90afbe2caec38c1ca0da2d3ed50d79663aa274126c010c1c19f841845b493c7efb57307b74b28e2f89789ba52c0dd80dd54e04 +DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.12_7.tar.gz 191121494 BLAKE2B 92b72ef8fc0ecc6bd4fa785baf6b799db48de5e82e12a09ec630de854b19a0b17ad2408a7cf8d1cea9a663ddd062e88026bb91ca1d7cbaf51c261e189ece697e SHA512 662ffbeb67238612d56ad5e53abfc11738aef595f96bb8775819c7d78cbcc6888755baeafa9695c1673c1833ea328de67d6d0e4c6736c7e3006b0a886108de9d +DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.12_7.tar.gz 178427485 BLAKE2B a2ceda0b6b2abd5643517f53bf8e89c7ccbaf1c29d784e8dc4de568a534fff8564561fc48ca64183205754ae453b5fe2027c7881c8904a126f420cb76745bec2 SHA512 2ddb35fa6214f29c254e0f27f401bd7da1f85ff7bb171b12fa477321883b0c31ce6a6f0713c76df2ced18884a0b8261b8772d9c7f6382cb08625aea36e8a3824 +DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.12_7.tar.gz 189408363 BLAKE2B c6569c14d010262b29c1d4b879f9384028c6a6be71fb29fb2cff1407fdd3bace0f22e20af0cec7fbf1277ad4d75000d32a0357776a32ed4166de64630847c59c SHA512 85368a3c6f60847dc1c55f29c8d465e87ec64a690198f68ae9022cf897671fbb2c5f0b509adf90d541ac7ce48f2f7d8159070b64bc5bc7b652e52c95cf20f10a +DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.12_7.tar.gz 191814558 BLAKE2B 326e3bea419e404be9b8c33640355d7f94e07068779edcebdc59370410e1944d0e4681fc3966b4bc4871989900c296149d82b331061424223f9fbf0c08616f75 SHA512 bcd5a53f82a6dc84aa069651228cf7be3de69195f58954230b34e575be62fe3ed403d57a7870b88ae930fadeda6e29d6af27e3ec7e5bf862e434df0c627985cf +DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.12_7.tar.gz 191681951 BLAKE2B 40548a12e485b36700726d7fe0826d716feca2d7db9bed403a6b61a13ee929a4ded93d85acdc2cc2170b8d01daf616a9ac7faa7e673ca37484b1f408b201af48 SHA512 28720148b92c7dd0649921a46dcb81aa05203e309ea851bcd41990fe59bc3566cbedb07ef08d7aff5f7399f063a05d56048798b99bb60a6a7b69533a44ca152f +DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz 192452655 BLAKE2B 1b38d3aa527b585f931235b737e0628fc74e0f1b996dc64b9c3cb84598c66f28d908ca550786f691912ecd03473d43bc87309a479442d4c4de85a67298a69fcd SHA512 59db63a7b25f851153bdf3aef81acae6b7de88eff14d481f14c346d894bd7e3899c40224e51049047687330e1c43a8c23c45bd375966ad9992d4ab538a08aeb1 +DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.12_7.tar.gz 180640890 BLAKE2B 23b97b0bae054210155663e5d92fe6868827d353aa9ee6a0fa46cc53d41e43ba5378ac7901dfa4a323a2aad541a45ecbb2dbf7e4ac367cf58908203c7b216c5b SHA512 06ee1f7d0d3b346cc5c72534f7d00f53d02260d8d41672a94228de805eb0c38b1afa8947504ebf740dea2646f45c5868983c82a6ddb800a577d305a56200d13a +DIST OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.4_7.tar.gz 205835448 BLAKE2B 12aecce2bde9d78c721a378554de5132a5e4fcd3bf95edf7178b7ad837cf4873717a7c8fc9611a811840f32fb4b2a794c4ad80fe19ed42a55f94430240fc19f9 SHA512 d349ea6ca15f8be8818283ebb11c4eddef57a7d1cc98bcfbaf885366ea44ecf520d2deaef43c7d9443a00dc8eb8b3d0821c1dbf4eff886199ad9f484c3b2fc04 +DIST OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.4_7.tar.gz 205880079 BLAKE2B 995b78580e88b922852d3f3ef59e40d11e4c7666790a1590f3672f1fb22f8b58e3a2965507cdd85d75b3bbe03e4daa603519e5d00933b86abbeeddffd5c2475d SHA512 e5f263007f3aa10fb6f4c80ccec503ca08e62bf220d5c90a206edba99e8b9d2c4585dbef7f7a84c3abeeef80a964ac171f11eaa40e5eb9b06310974dd57c42cc +DIST OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz 207691025 BLAKE2B 5413063795dff4ba6a6c865eeed02c45c3abfe63ca08b91ded278e2da46db721aaa50a4b6cb658600454efb3eceb1178f2759277d2ae0ebc9e1a1f2476ce7059 SHA512 cdcc9546c99edd72c71c7003f04e08919748794ba2f3175254f2d02e9006a3e4eee79592c84f51b115e8dd56ee321b1c078e6173dc75790a6a3b5a1aa7900fe1 +DIST OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz 203854772 BLAKE2B acecfba0619cd5856f2e2c835240729f5d70a1f4fc373c99e7dec2aadc701d5779c8b42b804337653d6e8b99089fcd1622f48232a9a36bd25b4e4b7016ce68e6 SHA512 92a12dad45b80ee25b555b26456a592db65e5cf2373984e7102ee0527a923cc1d015fba0a75177f3f0063c5d1843f4999fb6627b506cd506571b9625871dc892 +DIST OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.4_7.tar.gz 208015131 BLAKE2B b143b83ff40affffd0be90cc19fec59777a80f783c6a4d9d1161d5205dee9a50f88d89fc21e402a14a1849d2dfefb780935acb47b7366b8fb07a3cd10f9ca65b SHA512 9cf65b7ea2cc4e7a21c5832c3522211c53b55fb6f0d4ec4deecb94744dafbf1412c17508ed1c21cb06b03c5bcf8212a0e5d6f2804663833735a1ac2f77dae7a2 +DIST OpenJDK21U-jdk_x64_linux_hotspot_21.0.4_7.tar.gz 207789015 BLAKE2B da61c96f082f18bbb64e543b96972d0cf812cbd64ac970a45000506e41f9f54628453d4a24b4090271dc267e21bfe285a04173c106259e67dc72246c43edbe32 SHA512 7675079ac1ed0c0428f806908b21c58549df7fc18043d26c011e063b58772ddb1c1c9648a46ab7d5204d47c2af5d3f08eace30028113d64e09cadc69c4fd0def +DIST OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23_37-ea.tar.gz 212329941 BLAKE2B c323d26d43f7d629a45098739e7a3ae32a7391c7246f818dcfb9db3c49ecc1e1a4ef1e60873a76e7dcfcc74e9e6310f4d29ecaf9aa3a1a1863e374e8b23f0d4e SHA512 692b818864b4c3c91e850b77b711d5fc1548f2c75630016689ac33fe25fe8602f89d52b046e3c213f9fdb66215e74dba4422b3e1d24133d991e7563c05dcd4cd +DIST OpenJDK23U-jdk_aarch64_linux_hotspot_23_37-ea.tar.gz 212322868 BLAKE2B 10b4c3a135ae8e92faf0f1137a502660632f4fda3a85ca4d69fd15c7b380a483adf2d97ba35501fa75550f4afedf0a59531cc72fef558c71fc495aa90f1d09bb SHA512 e66dbccd7e90b2282805a27478f72f3c9e62f1f25be57569a40c2a8b3a99f1cdd1b994ee58b83b20e6ad3a30c218082e845466457fc659cc742d8bfc6594e564 +DIST OpenJDK23U-jdk_ppc64le_linux_hotspot_23_37-ea.tar.gz 213924750 BLAKE2B b6d7158d2fac60a7187edaae129b986ad1977766731c89823ffe222803281adc8980f42dba6c7502403ed39fe0d5e178c858ff252c16bbbd7b05803edc6bf978 SHA512 f05c593681fc5c8048fa5e452a10ecae10aae06ee405c82db99748ecc252d9ec2ef553649765d4c01255f87039209d4dee26c25f9885531327477d95a5b4081c +DIST OpenJDK23U-jdk_riscv64_linux_hotspot_23_37-ea.tar.gz 210224273 BLAKE2B 027e55a567d75f596d1e53c0cf010d44ad025b03344292169003b09f070a2885be0e8d0df24130d8a6da49ac8617ea17f644ebde0dcbc70c9410d0a01260ab41 SHA512 82bcd987bace91ee57fbbb6ebf92b111ffbc3e524d3a76b9e716ea7469bfa40f5ba26e9a842a7676f1c93b0947296b10240a053039dfe04f01362bfb1f9564af +DIST OpenJDK23U-jdk_x64_alpine-linux_hotspot_23_37-ea.tar.gz 214601112 BLAKE2B f5413519769574e39cec93228dcdb21d003ecebf9a7b03bf19356bd151809b1e4541174292622d03a829510c5e937be9f21f64315fa3ac7618fac75c003362de SHA512 9894d9bd787b8ba4d5ed70cdf467b0c07bffec28d6d6149733eb7bafe9cef62fcb612fb94d1b90682ae4152c8cab2e403502f874ca9013df0c2c498da33c93e6 +DIST OpenJDK23U-jdk_x64_linux_hotspot_23_37-ea.tar.gz 214424735 BLAKE2B 667c76acff5c9980aeb1e0eb5cc6915961327d51a15c529a9a973c0e75c0eebedb877cec8678cc60d0859f21589b887c1bddd400c36470684eb5509b1ae34f74 SHA512 7dbb7d7dc391323287fb0a010735153b70b42f31755a4dee27de45c7fea170cf692e8cce98e9637dc57bba0bca1aa003e1bc1b896e1e48d3039ecaa87fc85c0f +DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u422b05.tar.gz 102132553 BLAKE2B b59a2d99f9999f86eac2ab15617ee7c58d179a7db2e3606b3296b4bee8bbfaaee2f3cd1f441d90b7462ef9a502f4f351bdb4acc8e723d6b16f208827b813e8a7 SHA512 3856d2e711fd0f93f5efb73ffe5dc115d03dbd0cd015e903b7c2d02b6a3940b10793243edd6a372d7f84306f10c7a41cf13d7b787a33d525f1e86e9975453d06 +DIST OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz 98342561 BLAKE2B e34d6c959a2100b7c1817ad0fa213331e1cca75229edccf68ed4fcbd3b9bdeb0852dfdf59dac3e9cdae0179af38edc64ff7329af9f44fadcfaa7cf301f8f4e13 SHA512 a667d531b3318e7f75d3d4d9a32248c5c9ae7c1d4bd9bfcbcb5f11418016c1faa179ed748c3eae09c8693885a9401a80de8f3530891883b9f6e9de0b50002ed5 +DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u422b05.tar.gz 100533202 BLAKE2B b83b926e5bf0fe45bce9a79489422b96c6ab321227a56d8b3c683a26e5b71cbf9ec80a4dc2706aa4853095a4ee3174591cba8725b9e1b645f4c275137a97abee SHA512 e345de1325f9807d1cc3e4b043d650d655ad8a3672edec304023af54c7dd1d8fea0e671781ed46e6d7459909afedb2458c1b45966b55957389ec62449aec6469 +DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u422b05.tar.gz 100948020 BLAKE2B db92e2d9ef5bd15816d2fb3cd6a6dc0accd250fa16ec9b3eea9b23a72e73a32be43527d8f520f39aea1b7a84723e07d24e3de136b6888b869d8e75e446fc04cd SHA512 20b47a527c1b19d6f2779e619507a250316ee3d95d7ad7b5fa45c86e26e90515cace468a0ec6fd37be108f473f92d70eadd0a61ee901594ff0309272af4f61e5 +DIST OpenJDK8U-jdk_x64_linux_hotspot_8u422b05.tar.gz 103022651 BLAKE2B e144aee88326b4ed539324d8dfa35db461a3595c23a3bfdf0af557b4402ac4dd65d9000fa875b6570d7475ca7fef90d2e7021938f04918d40a04c04029e2e1bf SHA512 d44bdb72e616771d6b465abb66228f08968afdc0e8e40f73e892ea5c5c441f554d793f1e1643f1f682e0c0f4e25d24ee3f9ddec8c6191c43e77a3820c9f3d2a1 +DIST OpenJDK8U-jdk_x64_mac_hotspot_8u422b05.tar.gz 109522911 BLAKE2B 37472be9a5f061ade8e27318ef2a7782f0fd4aa38362c2d19eae47cf18ac0d4085a84aab4630b97e0162d6b8288e3bcce2b1fb1a8f1bc25e8a129137f5407657 SHA512 e6718c635d42d2662a404ac71f5c4cae45714f7e1e7f92af28191dfb5f01ac3c4c9c5335073386a7cf7a0c628d9dd0ae211fc4e9c0bc953e3827362f1fc39344 diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml index 7adf9448bc9e..0c01c4d5dd44 100644 --- a/dev-java/openjdk-bin/metadata.xml +++ b/dev-java/openjdk-bin/metadata.xml @@ -14,4 +14,10 @@ <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> <flag name="source">Install JVM sources</flag> </use> + <upstream> + <remote-id type="github">adoptium/temurin8-binaries</remote-id> + <remote-id type="github">adoptium/temurin11-binaries</remote-id> + <remote-id type="github">adoptium/temurin17-binaries</remote-id> + <remote-id type="github">adoptium/temurin21-binaries</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.22_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.24_p8.ebuild index 879465da18c0..2602fad82147 100644 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.22_p7.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.24_p8.ebuild @@ -6,7 +6,7 @@ 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 baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV}/" local musl= local os=linux @@ -22,13 +22,14 @@ abi_uri() { echo "${2-$1}? ( ${musl:+ elibc_musl? ( } - ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz + ${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz ${musl:+ ) } )" } MY_PV=${PV/_p/+} -SLOT=$(ver_cut 1) +DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptium.net" SRC_URI=" $(abi_uri aarch64 arm64) $(abi_uri arm) @@ -37,10 +38,10 @@ SRC_URI=" $(abi_uri x64 x64-macos) $(abi_uri x64 amd64 musl) " +S="${WORKDIR}/jdk-${MY_PV}" -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptium.net" LICENSE="GPL-2-with-classpath-exception" +SLOT=$(ver_cut 1) KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos" IUSE="alsa cups headless-awt selinux source" @@ -68,8 +69,6 @@ RDEPEND=" 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." diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.10_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.12_p7.ebuild index 43345bca275a..beedcb4f53a4 100644 --- a/dev-java/openjdk-bin/openjdk-bin-17.0.10_p7.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-17.0.12_p7.ebuild @@ -6,7 +6,7 @@ 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 baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV}/" local musl= local os=linux @@ -22,13 +22,14 @@ abi_uri() { echo "${2-$1}? ( ${musl:+ elibc_musl? ( } - ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz + ${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz ${musl:+ ) } )" } MY_PV=${PV/_p/+} -SLOT=$(ver_cut 1) +DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptium.net" SRC_URI=" $(abi_uri aarch64 arm64) $(abi_uri aarch64 arm64-macos) @@ -38,10 +39,10 @@ SRC_URI=" $(abi_uri x64 amd64 musl) $(abi_uri x64 x64-macos) " +S="${WORKDIR}/jdk-${MY_PV}" -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptium.net" LICENSE="GPL-2-with-classpath-exception" +SLOT=$(ver_cut 1) KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos" IUSE="alsa cups headless-awt selinux source" @@ -69,8 +70,6 @@ RDEPEND=" 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." diff --git a/dev-java/openjdk-bin/openjdk-bin-21.0.3_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-21.0.3_p9.ebuild deleted file mode 100644 index c45432f5aea4..000000000000 --- a/dev-java/openjdk-bin/openjdk-bin-21.0.3_p9.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2024 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 ppc64le ppc64) - $(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 ~ppc64" -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-17.0.11_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-21.0.4_p7.ebuild index 1e59953a44c8..7fc34d184029 100644 --- a/dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-21.0.4_p7.ebuild @@ -6,7 +6,7 @@ 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 baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV}/" local musl= local os=linux @@ -22,27 +22,27 @@ abi_uri() { echo "${2-$1}? ( ${musl:+ elibc_musl? ( } - ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz + ${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz ${musl:+ ) } )" } MY_PV=${PV/_p/+} -SLOT=$(ver_cut 1) +DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptium.net" SRC_URI=" $(abi_uri aarch64 arm64) - $(abi_uri aarch64 arm64-macos) - $(abi_uri arm) + $(abi_uri aarch64 arm64 musl) $(abi_uri ppc64le ppc64) $(abi_uri x64 amd64) $(abi_uri x64 amd64 musl) - $(abi_uri x64 x64-macos) + $(abi_uri riscv64 riscv) " +S="${WORKDIR}/jdk-${MY_PV}" -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptium.net" LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos" +SLOT=$(ver_cut 1) +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" IUSE="alsa cups headless-awt selinux source" RDEPEND=" @@ -69,8 +69,6 @@ RDEPEND=" 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." @@ -108,7 +106,8 @@ src_install() { fi if use headless-awt ; then - rm -v lib/lib*{[jx]awt,splashscreen}* || die + # do not die if not available, -f for bug #934974 + rm -fv lib/lib*{[jx]awt,splashscreen}* || die fi fi diff --git a/dev-java/openjdk-bin/openjdk-bin-23_p37_beta.ebuild b/dev-java/openjdk-bin/openjdk-bin-23_p37_beta.ebuild new file mode 100644 index 000000000000..2d005d919140 --- /dev/null +++ b/dev-java/openjdk-bin/openjdk-bin-23_p37_beta.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2024 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$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV1}/" + 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$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV2//+/_}.tar.gz + ${musl:+ ) } )" +} + +MY_PV=${PV/_p/+} +MY_PV1=${MY_PV/_beta/-ea-beta} +MY_PV2=${MY_PV1/-beta/} + +DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptium.net" +SRC_URI=" + $(abi_uri aarch64 arm64) + $(abi_uri aarch64 arm64 musl) + $(abi_uri ppc64le ppc64) + $(abi_uri x64 amd64) + $(abi_uri x64 amd64 musl) + $(abi_uri riscv64 riscv) +" +S="${WORKDIR}/jdk-${MY_PV%_beta}" + +LICENSE="GPL-2-with-classpath-exception" +# SLOT=$(ver_cut 1) +SLOT="23" +# KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +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="*" + +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-11.0.23_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-24_p15_beta.ebuild index 5016ef81aadf..0d6bc9a78d7a 100644 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.23_p9.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-24_p15_beta.ebuild @@ -6,7 +6,7 @@ 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 baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV1}/" local musl= local os=linux @@ -22,26 +22,29 @@ abi_uri() { echo "${2-$1}? ( ${musl:+ elibc_musl? ( } - ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz + ${baseuri}/OpenJDK-jdk_${1}_${os}_hotspot_${MY_PV2//+/_}.tar.gz ${musl:+ ) } )" } MY_PV=${PV/_p/+} -SLOT=$(ver_cut 1) +MY_PV1=${MY_PV/_beta/-ea-beta} +MY_PV2=${MY_PV1/-beta/} +DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptium.net" SRC_URI=" $(abi_uri aarch64 arm64) - $(abi_uri arm) + $(abi_uri aarch64 arm64 musl) $(abi_uri ppc64le ppc64) $(abi_uri x64 amd64) - $(abi_uri x64 x64-macos) $(abi_uri x64 amd64 musl) + $(abi_uri riscv64 riscv) " +S="${WORKDIR}/jdk-${MY_PV%_beta}" -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptium.net" LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos" +SLOT=$(ver_cut 1) +# KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" IUSE="alsa cups headless-awt selinux source" RDEPEND=" @@ -68,8 +71,6 @@ RDEPEND=" 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." diff --git a/dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild deleted file mode 100644 index ffff2917ded0..000000000000 --- a/dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-vm-2 - -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=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) -SLOT=$(ver_cut 1) - -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptium.net" -SRC_URI=" - $(abi_uri aarch64 arm64) - $(abi_uri arm) - $(abi_uri ppc64le ppc64) - $(abi_uri x64 amd64) - $(abi_uri x64 amd64 musl) - $(abi_uri x64 x64-macos) -" - -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos" - -IUSE="alsa cups examples headless-awt selinux source" - -RDEPEND=" - >=sys-apps/baselayout-java-0.1.0-r1 - kernel_linux? ( - media-libs/fontconfig:1.0 - media-libs/freetype:2 - elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) - elibc_musl? ( sys-libs/musl ) - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - arm? ( dev-libs/libffi-compat:6 ) - 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 strip" -QA_PREBUILT="*" - -S="${WORKDIR}/jdk${MY_PV}" - -src_unpack() { - default - # 753575 - if use arm; then - mv -v "${S}"* "${S}" || die - elif [[ ${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#/}" - - rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die - - # 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 - # this does not exist on arm64 hence -f - rm -fv jre/lib/*/libfreetype.so* || die - - if ! use alsa ; then - rm -v jre/lib/*/libjsoundalsa.so* || die - fi - - if ! use examples ; then - rm -vr sample || die - fi - - if use headless-awt ; then - rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \ - {,jre/}bin/policytool bin/appletviewer || die - fi - fi - - if ! use source ; then - rm -v src.zip || die - fi - - rm -v jre/lib/security/cacerts || die - dosym ../../../../../etc/ssl/certs/java/cacerts \ - "${dest}"/jre/lib/security/cacerts - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - # provide stable symlink - dosym "${P}" "/opt/${PN}-${SLOT}" - - java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh - java-vm_set-pax-markings "${ddest}" - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} diff --git a/dev-java/openjdk-bin/openjdk-bin-8.402_p06.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.422_p05.ebuild index f93a2a4afad5..b8735214d026 100644 --- a/dev-java/openjdk-bin/openjdk-bin-8.402_p06.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-8.422_p05.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit java-vm-2 abi_uri() { - local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}" + local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk${MY_PV}" local musl= local os=linux @@ -22,12 +22,11 @@ abi_uri() { echo "${2-$1}? ( ${musl:+ elibc_musl? ( } - ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//-/}.tar.gz + ${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//-/}.tar.gz ${musl:+ ) } )" } MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) -SLOT=$(ver_cut 1) DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" HOMEPAGE="https://adoptium.net" @@ -39,8 +38,10 @@ SRC_URI=" $(abi_uri x64 amd64 musl) $(abi_uri x64 x64-macos) " +S="${WORKDIR}/jdk${MY_PV}" LICENSE="GPL-2-with-classpath-exception" +SLOT=$(ver_cut 1) KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos" IUSE="alsa cups examples headless-awt selinux source" @@ -70,8 +71,6 @@ RDEPEND=" RESTRICT="preserve-libs strip" QA_PREBUILT="*" -S="${WORKDIR}/jdk${MY_PV}" - src_unpack() { default # 753575 diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest index a550f6c7ebc3..0fdfd5362f70 100644 --- a/dev-java/openjdk-jre-bin/Manifest +++ b/dev-java/openjdk-jre-bin/Manifest @@ -1,7 +1,4 @@ -DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.20.1_1.tar.gz 43033465 BLAKE2B 484ec2b8512e2c759840157608ae4b7cdd2729533589a8ad1ba718779e88319fa02da4c9f59b56dea93123646ca7a55e84675985679a25f5163d7511b8147f66 SHA512 4a962e2ee8c885753b7bc25c3a30af307bee2c8829438eb85b9a7b20abd72fa22b340cfb9b6a0721e8fb00379bd3a230653daa52f5f1e3e6d5ed028ea2066c99 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.23_9.tar.gz 43361001 BLAKE2B 7f5fe24de2f0967ceeaee783430fc1aa9d8c510d955eff2e10c9d94058a2985308e99a57f1dffb3adb3cee9d90d0a553abcb5438a41a0cda054b0a260e435f31 SHA512 82b4b021b7fb136a9016623cd6ab7b4ac1f5fc3bff69594b74c8b2b0305d6b0c7d20d12759062826dc27ce0b50ea176bcec76960d3d458549e11a5452b7df014 DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz 46382823 BLAKE2B 79612a8a73cee7a8ac022779a12077fa613ff7b18d8d5d198c42ae886cba21c46a1919422249696a74b5e5491542b88b57244eaa74f3b1bc8ae63ae851d10d40 SHA512 a98534b49a71a1bb6488aff4f1d2fc4fdcadfbaa17ef1ca3003568aed8498b3d3618c065334dd6bd9cffab0af15b6cbc980353e09da66c5ac69f0c96f9b0a889 -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.3_9.tar.gz 52430722 BLAKE2B 32a969bfd1a6e334db34db6f12317810a81b60b0f6c4c978aee3fb588ed30daca0b54089feba7721a51f71d2ebb89d453aba8e7ded29f524d5923a3804828d88 SHA512 2fefc61c36f4cf4bbe722aef93aced8dc4b76d2fddeb91ad8687dc54f7afd9dff03df25ff12214bbd66fcbd637ff0ca5a21a1d839e60da9622904284bc2abfee -DIST OpenJDK8U-jre_x64_linux_hotspot_8u382b05.tar.gz 41389960 BLAKE2B e79d0d6b08a0f2066c877b3f970742a209f1b56a46dd4e5bc3b3942b590ae4eb0e72ac9b909d2e0d9b61bee76d507d9df8def88c16ec87930152b8375c6272e5 SHA512 536e2b3f87907aa2d79938dae3f92efa5d6402ae252e147beb9ddc3f81b1001a8031e4eba7132b0640dad36652fb619b761e038a88246442fc8592d5fe8a9c41 DIST OpenJDK8U-jre_x64_linux_hotspot_8u412b08.tar.gz 41415973 BLAKE2B 1372ef4f608eaecd4a82c8e5598e67b91d4b200818a896c2977f40d7c228377ad033187e5afda7cd812b37950b998bc764c155d952a62b7bf7c625299b9477d9 SHA512 f1e3a168724fd9826262d1f4e895d0809618414231e246750f96522bc89fb4f27fed83f83dd548ddd859b519512ac7a080c6a3482a9d129275102aed973eab28 diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.20.1_p1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.20.1_p1.ebuild deleted file mode 100644 index 7e2efc602026..000000000000 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.20.1_p1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# 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-11.0.23_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.23_p9.ebuild index 9fe0d3158b43..4bac8986b66a 100644 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.23_p9.ebuild +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.23_p9.ebuild @@ -21,7 +21,7 @@ SRC_URI=" DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" HOMEPAGE="https://adoptium.net/" LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="alsa cups headless-awt selinux" RDEPEND=" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.11_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.11_p9.ebuild index 9fe0d3158b43..4bac8986b66a 100644 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.11_p9.ebuild +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.11_p9.ebuild @@ -21,7 +21,7 @@ SRC_URI=" DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" HOMEPAGE="https://adoptium.net/" LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="alsa cups headless-awt selinux" RDEPEND=" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.8.1_p1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.8.1_p1.ebuild deleted file mode 100644 index 7e2efc602026..000000000000 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.8.1_p1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# 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.382_p05.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.382_p05.ebuild deleted file mode 100644 index 1071fa2afe06..000000000000 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.382_p05.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# 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}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz - )" -} - -MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) -SLOT="$(ver_cut 1)" - -DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptium.net" -SRC_URI=" - $(abi_uri x64 amd64) -" - -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/${P}" - local ddest="${ED}/${dest#/}" - - rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die - - # this does not exist on arm64 hence -f - rm -fv lib/*/libfreetype.so* || die - - if ! use alsa ; then - rm -v lib/*/libjsoundalsa.so* || die - fi - - if use headless-awt ; then - rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \ - bin/policytool || 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}-${SLOT}.env.sh - java-vm_set-pax-markings "${ddest}" - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.ebuild index 04fb01a2b751..30f0a4d988c1 100644 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.ebuild +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.ebuild @@ -21,7 +21,7 @@ SRC_URI=" " LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="alsa cups headless-awt selinux" diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index f132a4ccb269..f4853c22935b 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -1,11 +1,8 @@ DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f2823772a5d9a18447a435f191daf78c5429a15c2e9ea64758dc9b26ee2a88275532b4f27714b2a7e4489f920c0ed2f5003b SHA512 c0426f243c5aa581d90366cb01ce811e34883a9d8a0298cab420378470e8eb427a56932ca1fbb5ed57e7430be2b38c6bc4491028ebaa25be0a938ba0bb2baf45 -DIST openjdk-11.0.22_p7.tar.gz 116235391 BLAKE2B 50b845b8f1e316da37e45c94a1890939659b554a314a1a455903e8cc58465cd69cd485548b6b42c445150187e37df5cf946d52bca754236a198f6aa10d7de37e SHA512 b88d0db9750d8201dfb4b027045de4023be766e42cca7a3ff5e0cb28db4c6da3f146a57819a6b81cb33e5837726986bcc3780ecf88bf525f445c2cd35a3993d8 -DIST openjdk-11.0.23_p9.tar.gz 116316363 BLAKE2B a3745b2afe9d2529daf89aceed43025aca72a353210b0987aacb32af971262077411e9a2b6cfd938ca9d0c93c8762759b9207a13cee0808288674671164e3a36 SHA512 3851063289042ed467a9cb636eba7170a0feeaa3e5d19bda6c30a186ea624e4ae1b308006652acb9c9820c2065382bd719ee130b7a1a0524fe25ecd639f8a51d -DIST openjdk-17.0.10_p7.tar.gz 106398664 BLAKE2B 48cb2bc7d063da25a62834734ba4a887d26a27a8d84c535255df67419bf4f6d8b060c48ef37bd7324e14e957a141791380d4d9e42335a90f72dc34bc7b1d12fe SHA512 c2dfd66debdce488de044efcfc3f57cc9eb07ead2cfb7dd6e28e5748d48ec89f0c326a4c3f4a5c740019b8e5a02b858d93dd74a0c6626de445144b9840d3a426 -DIST openjdk-17.0.11_p9.tar.gz 106574173 BLAKE2B 3db4763527d1acb83a2d492c3e94dc571065b844cf2ac56b7377a821cf2cb48af405b9fef73f477502bedc2c119ac57a115315140af04d51dbab5a78dfa6c789 SHA512 77baa3ec3ff2d06b28121342357311d1d5ca2ddd9ac7982b1aa5fc745b49519d2f95d14226ad4ac413d9a0ecf0e49d15078cabbba0b2897d0c6883b92ef0b5e9 -DIST openjdk-21.0.3_p9.tar.gz 112404688 BLAKE2B e73688fdd2e4f4da144f66058e4ff68da4a557d9c7693c7854ba6c7e1a12155abec4aa0fcd724f62333060c4b4f7488f827c1b5499fe5667743516101f7f2fa6 SHA512 efc2d03a7e7afed62a2cdc9f7707d056ed62d63f513394d7e3c6bbe11980ac492a2cad144021cea4180f4c93f1a481bdd65cb61156023a3f14ba596fd9c0eb60 -DIST openjdk-8.402_p06.tar.gz 93136112 BLAKE2B 023422ca2b4dfc08fd3642e3cb3ec0503d57d09dbcb54841e4a04f67a6cd118712cba90b7760eaf9135f9f001f7c15221c4bcb19986547fb2b6b3fb852bb8af4 SHA512 476d195ef500d8dd2013b17de0669a77ef8076b55c2753eb88b1a13f7a48526b1be7a1befabd284eb9ee8411df19ab1f39c81287ab659984d2d67e8aa7192d79 -DIST openjdk-8.412_p08.tar.gz 93003614 BLAKE2B 71a3825bf69bb196ae219f5125e8452f634be2ff7b9f42a4829f6581f0a143bfec95013971c6f6b8f402c11efa34443f55a7f89d4133eac0b05a6d1cd6e0324d SHA512 d198f26474a4bd0b5e09c3c3aa53fbf77f217b8cd23499f7e661224048e925e0e020b28264b6ce7401baf83f8ffd8e3247788e2f5e7188509dea8b06f9fa0572 +DIST openjdk-11.0.24_p8.tar.gz 116418943 BLAKE2B cb768b202b42f426f4edaead16ba09800d86c10da4a664176842ee396332284d410191a55dbb35d7604272231e5b3daf8a75ddc03bb819d670622b7682eec7f6 SHA512 ce45efd934b9bacc56c468d92083a85de311b4436a519ae1d6038aff025c2fa8a811abca4cdd99aeb8c09455effff53500f96c287976cd2ae90d4e11da2385a3 +DIST openjdk-17.0.12_p7.tar.gz 106597045 BLAKE2B f0e9baec472ecefbf28359abfc10757dc7cb2a6ddf8428086a6565831f1c13ee1a7cdb87b67d6b3840860ddbf2c74e80ece55f09238fddc2cb8fa77208695b9b SHA512 cc99e9742123f7d8ac7ad78abab0fbe5cff37999b9c06ad14851009a95c9868968e97dd0f3e4dea8bfa8578f8f903fccaa37134466a778375cdf24344138f1fc +DIST openjdk-21.0.4_p7.tar.gz 112506384 BLAKE2B d58636bc9221d56afcf118a91e41326d2e086c9fe22675429ec50d0b62fefd9e2040140a9d99682547e8bf0d40fa4ca2cbcdf8be55b9a0556b95c90fc0a08d56 SHA512 507524d842fb7c371cf7d3163cdce87e9266d613998b797f2828178b35c087354ae30941384d5afd1d6e3982eddf5c9067553bc2b918a9e223b93893f7f27e76 +DIST openjdk-8.422_p05.tar.gz 93034877 BLAKE2B 2489fea62fbc5a7e3735055656ae89c67caf63e5bc6d5385ee811d0707d056bc3d10dd83f7eae5a5a86b7f57b8da47a9c1a77405f127b6f506bbf3b310ecd2ae SHA512 706db67f9be7509380e96ae2187bdb928e40c4382fd7073dd310da2981eeff324a5871702b087d4466911dbbea8376d5f9fed7029562ca62c9a1a193d931833e 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 diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml index 543587cc5399..095cbbb07ad6 100644 --- a/dev-java/openjdk/metadata.xml +++ b/dev-java/openjdk/metadata.xml @@ -21,7 +21,7 @@ <flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag> <flag name="source">Install JVM sources</flag> <flag name="system-bootstrap">Bootstrap using installed openjdk</flag> - <flag name="systemtap" restrict=">=dev-java/openjdk-11">Enable SystemTAP/DTrace tracing</flag> + <flag name="systemtap" restrict=">=dev-java/openjdk-11">Enable SystemTap/DTrace tracing</flag> </use> <upstream> <remote-id type="github">openjdk/jdk8u</remote-id> diff --git a/dev-java/openjdk/openjdk-11.0.22_p7.ebuild b/dev-java/openjdk/openjdk-11.0.22_p7.ebuild deleted file mode 100644 index a5a6cc2d4a63..000000000000 --- a/dev-java/openjdk/openjdk-11.0.22_p7.ebuild +++ /dev/null @@ -1,312 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs - -# don't change versioning scheme -# to find correct _p number, look at -# https://github.com/openjdk/jdk${SLOT}u/tags -# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point -# to exact same commit sha. we should always use the full version. -# -ga tag is just for humans to easily identify General Availability release tag. -# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to -# set build version properly -MY_PV="${PV%_p*}-ga" -SLOT="${MY_PV%%[.+]*}" - -# variable name format: <UPPERCASE_KEYWORD>_XPAK -PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball -RISCV_XPAK="11.0.14_p9" # lp64d bootstrap tarball -X86_XPAK="11.0.13_p8" - -# Usage: bootstrap_uri <keyword> <version> [extracond] -# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian) -# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) ) -bootstrap_uri() { - local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap" - local suff="tar.xz" - local kw="${1:?${FUNCNAME[0]}: keyword not specified}" - local ver="${2:?${FUNCNAME[0]}: version not specified}" - local cond="${3-}" - - # here be dragons - echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })" -} - -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.org" -SRC_URI=" - https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz - -> ${P}.tar.gz - !system-bootstrap? ( - $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian) - $(bootstrap_uri riscv ${RISCV_XPAK}) - $(bootstrap_uri x86 ${X86_XPAK}) - ) - riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.18-riscv.patch.xz ) -" - -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86" - -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 ) -" - -COMMON_DEPEND=" - media-libs/freetype:2= - media-libs/giflib:0/7 - media-libs/harfbuzz:= - media-libs/libpng:0= - media-libs/lcms:2= - sys-libs/zlib - media-libs/libjpeg-turbo:0= - systemtap? ( dev-debug/systemtap ) -" - -# Many libs are required to build, but not to run, make is possible to remove -# by listing conditionally in RDEPEND unconditionally in DEPEND -RDEPEND=" - ${COMMON_DEPEND} - >=sys-apps/baselayout-java-0.1.0-r1 - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) -" - -DEPEND=" - ${COMMON_DEPEND} - app-arch/zip - media-libs/alsa-lib - net-print/cups - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - javafx? ( dev-java/openjfx:${SLOT}= ) - system-bootstrap? ( - || ( - dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openjdk:${SLOT}[gentoo-vm(+)] - ) - ) -" - -S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" - -# 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. -openjdk_check_requirements() { - local M - M=2048 - M=$(( $(usex jbootstrap 2 1) * $M )) - M=$(( $(usex debug 3 1) * $M )) - M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) - - CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - openjdk_check_requirements - if [[ ${MERGE_TYPE} != binary ]]; then - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" - fi -} - -pkg_setup() { - openjdk_check_requirements - java-vm-2_pkg_setup - - [[ ${MERGE_TYPE} == "binary" ]] && return - - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" - JAVA_PKG_WANT_SOURCE="${SLOT}" - JAVA_PKG_WANT_TARGET="${SLOT}" - - if use system-bootstrap; then - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then - java-pkg-2_pkg_setup - return - fi - done - fi -} - -src_prepare() { - use riscv && eapply "${WORKDIR}"/openjdk-11.0.18-riscv.patch - default - chmod +x configure || die -} - -src_configure() { - if ! use system-bootstrap; then - local xpakvar="${ARCH^^}_XPAK" - export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" - fi - - # Work around stack alignment issue, bug #647954. - use x86 && append-flags -mincoming-stack-boundary=2 - - # bug 906987; append-cppflags doesnt work - use elibc_musl && append-flags -D_LARGEFILE64_SOURCE - - # Strip some flags users may set, but should not. #818502 - filter-flags -fexceptions - - # 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-lto - filter-flags -fdevirtualize-at-ltrans - - # Enabling full docs appears to break doc building. If not - # explicitly disabled, the flag will get auto-enabled if pandoc and - # graphviz are detected. pandoc has loads of dependencies anyway. - - local myconf=( - --disable-ccache - --disable-precompiled-headers - --enable-full-docs=no - --with-boot-jdk="${JDK_HOME}" - --with-extra-cflags="${CFLAGS}" - --with-extra-cxxflags="${CXXFLAGS}" - --with-extra-ldflags="${LDFLAGS}" - --with-freetype="${XPAK_BOOTSTRAP:-system}" - --with-giflib="${XPAK_BOOTSTRAP:-system}" - --with-harfbuzz="${XPAK_BOOTSTRAP:-system}" - --with-lcms="${XPAK_BOOTSTRAP:-system}" - --with-libjpeg="${XPAK_BOOTSTRAP:-system}" - --with-libpng="${XPAK_BOOTSTRAP:-system}" - --with-native-debug-symbols=$(usex debug internal none) - --with-vendor-name="Gentoo" - --with-vendor-url="https://gentoo.org" - --with-vendor-bug-url="https://bugs.gentoo.org" - --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" - --with-vendor-version-string="${PVR}" - --with-version-pre="" - --with-version-string="${PV%_p*}" - --with-version-build="${PV#*_p}" - --with-zlib="${XPAK_BOOTSTRAP:-system}" - --enable-dtrace=$(usex systemtap yes no) - --enable-headless-only=$(usex headless-awt yes no) - $(tc-is-clang && echo "--with-toolchain-type=clang") - ) - ! use riscv && myconf+=( --with-jvm-features=shenandoahgc ) - - use lto && myconf+=( --with-jvm-features=link-time-opt ) - - if use javafx; then - # this is not useful for users, just for upstream developers - # build system compares mesa version in md file - # https://bugs.gentoo.org/822612 - export LEGAL_EXCLUDES=mesa3d.md - - local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" - if [[ -r ${zip} ]]; then - myconf+=( --with-import-modules="${zip}" ) - else - die "${zip} not found or not readable" - fi - fi - - if use !system-bootstrap ; then - addpredict /dev/random - addpredict /proc/self/coredump_filter - fi - - ( - unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS - CFLAGS= CXXFLAGS= LDFLAGS= \ - CONFIG_SITE=/dev/null \ - econf "${myconf[@]}" - ) -} - -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 - CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror - NICE= # Use PORTAGE_NICENESS, don't adjust further down - $(usex doc docs '') - $(usex jbootstrap bootcycle-images product-images) - ) - emake "${myemakeargs[@]}" -j1 -} - -src_install() { - local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}/${dest#/}" - - cd "${S}"/build/*-release/images/jdk || die - - # Create files used as storage for system preferences. - mkdir .systemPrefs || die - touch .systemPrefs/.system.lock || die - touch .systemPrefs/.systemRootModFile || die - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but OpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if ! use examples ; then - rm -vr demo/ || die - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts - - # must be done before running itself - java-vm_set-pax-markings "${ddest}" - - einfo "Creating the Class Data Sharing archives and disabling usage tracking" - "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die - - java-vm_install-env "${FILESDIR}"/${PN}.env.sh - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter - - if use doc ; then - docinto html - dodoc -r "${S}"/build/*-release/images/docs/* - dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" - fi -} - -pkg_postinst() { - java-vm-2_pkg_postinst -} diff --git a/dev-java/openjdk/openjdk-11.0.23_p9.ebuild b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild index 7a2574c2b65e..777fecd885e4 100644 --- a/dev-java/openjdk/openjdk-11.0.23_p9.ebuild +++ b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild @@ -50,7 +50,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" LICENSE="GPL-2-with-classpath-exception" SLOT="${MY_PV%%[.+]*}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86" IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap" @@ -228,6 +228,11 @@ src_configure() { fi fi + # Workaround for bug #938302 + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace ) + fi + if use !system-bootstrap ; then addpredict /dev/random addpredict /proc/self/coredump_filter @@ -302,7 +307,7 @@ src_install() { if use doc ; then docinto html dodoc -r "${S}"/build/*-release/images/docs/* - dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" + dosym -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" fi } diff --git a/dev-java/openjdk/openjdk-17.0.10_p7.ebuild b/dev-java/openjdk/openjdk-17.0.10_p7.ebuild deleted file mode 100644 index 0b834a1a41a4..000000000000 --- a/dev-java/openjdk/openjdk-17.0.10_p7.ebuild +++ /dev/null @@ -1,321 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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" - -# Usage: bootstrap_uri <keyword> <version> [extracond] -# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian) -# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) ) -bootstrap_uri() { - local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap" - local suff="tar.xz" - local kw="${1:?${FUNCNAME[0]}: keyword not specified}" - local ver="${2:?${FUNCNAME[0]}: version not specified}" - local cond="${3-}" - [[ ${cond} == elibc_musl* ]] && local musl=yes - - # here be dragons - echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })" -} - -# don't change versioning scheme -# to find correct _p number, look at -# https://github.com/openjdk/jdk${SLOT}u/tags -# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point -# to exact same commit sha. we should always use the full version. -# -ga tag is just for humans to easily identify General Availability release tag. -MY_PV="${PV%_p*}-ga" -SLOT="${MY_PV%%[.+]*}" - -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.org" -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}) - ) -" - -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86" - -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 ) -" - -COMMON_DEPEND=" - media-libs/freetype:2= - media-libs/giflib:0/7 - media-libs/harfbuzz:= - media-libs/libpng:0= - media-libs/lcms:2= - sys-libs/zlib - media-libs/libjpeg-turbo:0= - systemtap? ( dev-debug/systemtap ) -" - -# Many libs are required to build, but not to run, make is possible to remove -# by listing conditionally in RDEPEND unconditionally in DEPEND -RDEPEND=" - ${COMMON_DEPEND} - >=sys-apps/baselayout-java-0.1.0-r1 - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) -" - -DEPEND=" - ${COMMON_DEPEND} - app-arch/zip - media-libs/alsa-lib - net-print/cups - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - javafx? ( dev-java/openjfx:${SLOT}= ) - system-bootstrap? ( - || ( - dev-java/openjdk-bin:${SLOT} - dev-java/openjdk:${SLOT} - ) - ) -" - -S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}" - -# 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. -openjdk_check_requirements() { - local M - M=2048 - M=$(( $(usex jbootstrap 2 1) * $M )) - M=$(( $(usex debug 3 1) * $M )) - M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) - - CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - openjdk_check_requirements - if [[ ${MERGE_TYPE} != binary ]]; then - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" - fi -} - -pkg_setup() { - openjdk_check_requirements - java-vm-2_pkg_setup - - [[ ${MERGE_TYPE} == "binary" ]] && return - - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" - JAVA_PKG_WANT_SOURCE="${SLOT}" - JAVA_PKG_WANT_TARGET="${SLOT}" - - # The nastiness below is necessary while the gentoo-vm USE flag is - # masked. First we call java-pkg-2_pkg_setup if it looks like the - # flag was unmasked against one of the possible build VMs. If not, - # we try finding one of them in their expected locations. This would - # have been slightly less messy if openjdk-bin had been installed to - # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env - # file but disable it so that it would not normally be selectable. - - local vm - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then - java-pkg-2_pkg_setup - return - fi - done -} - -src_prepare() { - default - chmod +x configure || die -} - -src_configure() { - if has_version dev-java/openjdk:${SLOT}; then - export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT} - elif use !system-bootstrap ; then - local xpakvar="${ARCH^^}_XPAK" - export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" - else - JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT}) - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" - JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*} - export JDK_HOME - fi - - # Work around stack alignment issue, bug #647954. in case we ever have x86 - use x86 && append-flags -mincoming-stack-boundary=2 - - # bug 906987; append-cppflags doesnt work - use elibc_musl && append-flags -D_LARGEFILE64_SOURCE - - # Strip some flags users may set, but should not. #818502 - filter-flags -fexceptions - - # 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-lto - filter-flags -fdevirtualize-at-ltrans - - # Enabling full docs appears to break doc building. If not - # explicitly disabled, the flag will get auto-enabled if pandoc and - # graphviz are detected. pandoc has loads of dependencies anyway. - - local myconf=( - --disable-ccache - --disable-precompiled-headers - --disable-warnings-as-errors - --enable-full-docs=no - --with-boot-jdk="${JDK_HOME}" - --with-extra-cflags="${CFLAGS}" - --with-extra-cxxflags="${CXXFLAGS}" - --with-extra-ldflags="${LDFLAGS}" - --with-freetype="${XPAK_BOOTSTRAP:-system}" - --with-giflib="${XPAK_BOOTSTRAP:-system}" - --with-harfbuzz="${XPAK_BOOTSTRAP:-system}" - --with-lcms="${XPAK_BOOTSTRAP:-system}" - --with-libjpeg="${XPAK_BOOTSTRAP:-system}" - --with-libpng="${XPAK_BOOTSTRAP:-system}" - --with-native-debug-symbols=$(usex debug internal none) - --with-vendor-name="Gentoo" - --with-vendor-url="https://gentoo.org" - --with-vendor-bug-url="https://bugs.gentoo.org" - --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" - --with-vendor-version-string="${PVR}" - --with-version-pre="" - --with-version-string="${PV%_p*}" - --with-version-build="${PV#*_p}" - --with-zlib="${XPAK_BOOTSTRAP:-system}" - --enable-jvm-feature-dtrace=$(usex systemtap yes no) - --enable-headless-only=$(usex headless-awt yes no) - $(tc-is-clang && echo "--with-toolchain-type=clang") - ) - - use lto && myconf+=( --with-jvm-features=link-time-opt ) - - if use javafx; then - local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" - if [[ -r ${zip} ]]; then - myconf+=( --with-import-modules="${zip}" ) - else - die "${zip} not found or not readable" - fi - fi - - if use !system-bootstrap ; then - addpredict /dev/random - addpredict /proc/self/coredump_filter - fi - - ( - unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS - CFLAGS= CXXFLAGS= LDFLAGS= \ - CONFIG_SITE=/dev/null \ - econf "${myconf[@]}" - ) -} - -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 - CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror - NICE= # Use PORTAGE_NICENESS, don't adjust further down - $(usex doc docs '') - $(usex jbootstrap bootcycle-images product-images) - ) - emake "${myemakeargs[@]}" -j1 -} - -src_install() { - local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}/${dest#/}" - - cd "${S}"/build/*-release/images/jdk || die - - # Create files used as storage for system preferences. - mkdir .systemPrefs || die - touch .systemPrefs/.system.lock || die - touch .systemPrefs/.systemRootModFile || die - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but OpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if ! use examples ; then - rm -vr demo/ || die - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts - - # must be done before running itself - java-vm_set-pax-markings "${ddest}" - - einfo "Creating the Class Data Sharing archives and disabling usage tracking" - "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die - - java-vm_install-env "${FILESDIR}"/${PN}.env.sh - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter - - if use doc ; then - docinto html - dodoc -r "${S}"/build/*-release/images/docs/* - dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" - fi -} - -pkg_postinst() { - java-vm-2_pkg_postinst -} diff --git a/dev-java/openjdk/openjdk-17.0.11_p9.ebuild b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild index 1c4f51f66acd..90f9a664d446 100644 --- a/dev-java/openjdk/openjdk-17.0.11_p9.ebuild +++ b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild @@ -50,7 +50,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}" LICENSE="GPL-2-with-classpath-exception" SLOT="${MY_PV%%[.+]*}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86" IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap" @@ -237,6 +237,11 @@ src_configure() { fi fi + # Workaround for bug #938302 + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace ) + fi + if use !system-bootstrap ; then addpredict /dev/random addpredict /proc/self/coredump_filter diff --git a/dev-java/openjdk/openjdk-21.0.3_p9.ebuild b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild index 943ac23576da..bb3ad26ff08a 100644 --- a/dev-java/openjdk/openjdk-21.0.3_p9.ebuild +++ b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild @@ -46,9 +46,10 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}" LICENSE="GPL-2-with-classpath-exception" SLOT="${MY_PV%%[.+]*}" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source +system-bootstrap systemtap" +# lto temporarily disabled due to https://bugs.gentoo.org/916735 +IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source +system-bootstrap systemtap" REQUIRED_USE=" javafx? ( alsa !headless-awt ) @@ -225,7 +226,11 @@ src_configure() { use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" ) - use lto && myconf+=( --with-jvm-features=link-time-opt ) + # Werror=odr + # https://bugs.gentoo.org/916735 + # + # Disable it for now. + #use lto && myconf+=( --with-jvm-features=link-time-opt ) if use javafx; then local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" @@ -236,6 +241,11 @@ src_configure() { fi fi + # Workaround for bug #938302 + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace ) + fi + if use !system-bootstrap ; then addpredict /dev/random addpredict /proc/self/coredump_filter diff --git a/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild b/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild deleted file mode 100644 index 84a8a1eeb9d6..000000000000 --- a/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild +++ /dev/null @@ -1,284 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs - -# don't change versioning scheme -# to find correct _p number, look at -# https://github.com/openjdk/jdk${SLOT}u/tags -# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point -# to exact same commit sha. we should always use the full version. -# -ga tag is just for humans to easily identify General Availability release tag. -# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to -# set build version properly -MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)" -SLOT="${PV%%[.+]*}" - -# variable name format: <UPPERCASE_KEYWORD>_XPAK -X86_XPAK="8.402_p06" -PPC64_XPAK="8.402_p06" - -# Usage: bootstrap_uri <keyword> <version> [extracond] -# Example: $(bootstrap_uri x86 8.402_p06) -# Output: ppc64? ( big-endian? ( https://...8.402_p06-x86.tar.xz ) ) -bootstrap_uri() { - local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap" - local suff="tar.xz" - local kw="${1:?${FUNCNAME[0]}: keyword not specified}" - local ver="${2:?${FUNCNAME[0]}: version not specified}" - local cond="${3-}" - - # here be dragons - echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })" -} - -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.org" -SRC_URI=" - https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz - -> ${P}.tar.gz - !system-bootstrap? ( - $(bootstrap_uri x86 ${X86_XPAK}) - $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian) - ) -" - -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="amd64 arm64 ppc64 x86" -IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source" - -COMMON_DEPEND=" - media-libs/freetype:2= - media-libs/giflib:0/7 - sys-libs/zlib -" -# Many libs are required to build, but not to run, make is possible to remove -# by listing conditionally in RDEPEND unconditionally in DEPEND -RDEPEND=" - ${COMMON_DEPEND} - >=sys-apps/baselayout-java-0.1.0-r1 - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) -" - -DEPEND=" - ${COMMON_DEPEND} - app-arch/zip - media-libs/alsa-lib - net-print/cups - virtual/pkgconfig - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - system-bootstrap? ( - || ( - dev-java/openjdk-bin:${SLOT} - dev-java/openjdk:${SLOT} - ) - ) -" - -BDEPEND=" - virtual/pkgconfig -" - -PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )" - -S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" - -PATCHES=( - "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" - "${FILESDIR}/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch" - "${FILESDIR}/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch" - "${FILESDIR}/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch" - "${FILESDIR}/openjdk-8.402_p06-0004-Fix-misc.-warnings.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. -openjdk_check_requirements() { - local M - M=2048 - M=$(( $(usex debug 3 1) * $M )) - M=$(( $(usex jbootstrap 2 1) * $M )) - M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) - - CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - openjdk_check_requirements - if [[ ${MERGE_TYPE} != binary ]]; then - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" - fi -} - -pkg_setup() { - openjdk_check_requirements - java-vm-2_pkg_setup - - [[ ${MERGE_TYPE} == "binary" ]] && return - - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" - JAVA_PKG_WANT_SOURCE="${SLOT}" - JAVA_PKG_WANT_TARGET="${SLOT}" - - if use system-bootstrap; then - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then - java-pkg-2_pkg_setup - return - fi - done - fi -} - -src_prepare() { - default - - # new warnings in new gcc https://bugs.gentoo.org/685426 - sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \ - hotspot/make/linux/makefiles/gcc.make || die - - chmod +x configure || die -} - -src_configure() { - if ! use system-bootstrap; then - local xpakvar="${ARCH^^}_XPAK" - export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" - fi - - # general build info found here: - # https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html - - # -Wregister use (bug #918655) - append-cxxflags -std=gnu++14 - - # Work around stack alignment issue, bug #647954. - use x86 && append-flags -mincoming-stack-boundary=2 - - # Strip some flags users may set, but should not. #818502 - filter-flags -fexceptions - - # Strip lto related flags, no support in this version. - # https://bugs.gentoo.org/833097 - # https://bugs.gentoo.org/833098 - filter-lto - filter-flags -fdevirtualize-at-ltrans - - tc-export_build_env CC CXX PKG_CONFIG STRIP - - local myconf=( - --disable-ccache - --disable-freetype-bundling - --disable-precompiled-headers - --enable-unlimited-crypto - --with-boot-jdk="${JDK_HOME}" - --with-extra-cflags="${CFLAGS}" - --with-extra-cxxflags="${CXXFLAGS}" - --with-extra-ldflags="${LDFLAGS}" - --with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )" - --with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2" - --with-giflib="${XPAK_BOOTSTRAP:-system}" - --with-jtreg=no - --with-jobs=1 - --with-num-cores=1 - --with-update-version="$(ver_cut 2)" - --with-build-number="b$(ver_cut 4)" - --with-milestone="fcs" # magic variable that means "release version" - --with-vendor-name="Gentoo" - --with-vendor-url="https://gentoo.org" - --with-vendor-bug-url="https://bugs.gentoo.org" - --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" - --with-zlib="${XPAK_BOOTSTRAP:-system}" - --with-native-debug-symbols=$(usex debug internal none) - $(usex headless-awt --disable-headful '') - $(tc-is-clang && echo "--with-toolchain-type=clang") - ) - - ( - unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS - CFLAGS= CXXFLAGS= LDFLAGS= \ - CONFIG_SITE=/dev/null \ - CONFIG_SHELL="${BROOT}/bin/bash" - econf "${myconf[@]}" - ) -} - -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 - CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror - NICE= # Use PORTAGE_NICENESS, don't adjust further down - $(usex doc docs '') - $(usex jbootstrap bootcycle-images images) - ) - emake "${myemakeargs[@]}" -j1 -} - -src_install() { - local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}/${dest#/}" - - cd "${S}"/build/*-release/images/j2sdk-image || die - - if ! use alsa; then - rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die - fi - - # build system does not remove that - if use headless-awt ; then - rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \ - {,jre/}bin/policytool bin/appletviewer || die - fi - - if ! use examples ; then - rm -vr demo/ || die - fi - - if ! use source ; then - rm -v src.zip || die - fi - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts - - java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh - java-vm_set-pax-markings "${ddest}" - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter - - if use doc ; then - docinto html - dodoc -r "${S}"/build/*-release/docs/* - fi -} - -pkg_postinst() { - java-vm-2_pkg_postinst - einfo "JavaWebStart functionality provided by icedtea-web package" -} diff --git a/dev-java/openjdk/openjdk-8.412_p08.ebuild b/dev-java/openjdk/openjdk-8.422_p05.ebuild index 6280651782d6..d006b5c56f80 100644 --- a/dev-java/openjdk/openjdk-8.412_p08.ebuild +++ b/dev-java/openjdk/openjdk-8.422_p05.ebuild @@ -47,7 +47,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" LICENSE="GPL-2-with-classpath-exception" SLOT="${PV%%[.+]*}" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ppc64 x86" IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source" COMMON_DEPEND=" diff --git a/dev-java/openjfx/files/11/11.0.9_p0-version.patch b/dev-java/openjfx/files/11/11.0.9_p0-version.patch index fbcbb3890499..558423e3ab6d 100644 --- a/dev-java/openjfx/files/11/11.0.9_p0-version.patch +++ b/dev-java/openjfx/files/11/11.0.9_p0-version.patch @@ -7,9 +7,8 @@ 8252067: Change JavaFX release version in 11-dev to 11.0.9 Reviewed-by: kcr -diff -r 38425dc30b9a -r c0fe72db97a8 build.properties ---- a/build.properties Thu Aug 20 10:24:03 2020 +0200 -+++ b/build.properties Thu Aug 20 14:48:02 2020 +0200 +--- a/build.properties ++++ b/build.properties @@ -41,7 +41,7 @@ # UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE jfx.release.major.version=11 diff --git a/dev-java/openjfx/files/11/disable-architecture-verification.patch b/dev-java/openjfx/files/11/disable-architecture-verification.patch index 9e5a3fc3b750..3cddae50595c 100644 --- a/dev-java/openjfx/files/11/disable-architecture-verification.patch +++ b/dev-java/openjfx/files/11/disable-architecture-verification.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 19 Sep 2020 18:38:05 -0700 Subject: [PATCH] disable architecture verification ---- - build.gradle | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/build.gradle b/build.gradle -index 66a4b3c..f66ee01 100644 --- a/build.gradle +++ b/build.gradle @@ -302,6 +302,7 @@ ext.MAVEN_GROUP_ID = "org.openjfx" diff --git a/dev-java/openjfx/files/11/don-t-force-msse-11.0.11.patch b/dev-java/openjfx/files/11/don-t-force-msse-11.0.11.patch index aa04c15aa778..be635a2d6367 100644 --- a/dev-java/openjfx/files/11/don-t-force-msse-11.0.11.patch +++ b/dev-java/openjfx/files/11/don-t-force-msse-11.0.11.patch @@ -3,17 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 19 Sep 2020 18:30:58 -0700 Subject: [PATCH] don't force -msse ---- - .../src/main/native/gstreamer/projects/linux/avplugin/Makefile | 1 - - .../main/native/gstreamer/projects/linux/fxplugins/Makefile | 1 - - .../src/main/native/gstreamer/projects/mac/fxplugins/Makefile | 3 +-- - .../main/native/gstreamer/projects/mac/gstreamer-lite/Makefile | 3 +-- - .../src/main/native/jfxmedia/projects/linux/Makefile | 1 - - .../src/main/native/jfxmedia/projects/mac/Makefile | 3 +-- - 6 files changed, 3 insertions(+), 9 deletions(-) - -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index 682f1da..6222e29 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -24,7 +24,6 @@ CFLAGS = -fPIC \ @@ -24,8 +13,6 @@ index 682f1da..6222e29 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index c2cd04d..bb815fe 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -21,7 +21,6 @@ CFLAGS = -fPIC \ @@ -36,8 +23,6 @@ index c2cd04d..bb815fe 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile -index 9f80434..659ab1c 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile @@ -30,8 +30,7 @@ CFLAGS += -fPIC \ @@ -50,8 +35,6 @@ index 9f80434..659ab1c 100644 ifeq ($(BUILD_TYPE), Release) CFLAGS += -Os -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile -index 2020404..34bdf42 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile @@ -51,8 +51,7 @@ CFLAGS += -fPIC \ @@ -64,8 +47,6 @@ index 2020404..34bdf42 100644 ifeq ($(BUILD_TYPE), Release) CFLAGS += -Os -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile -index aaef98e..f5b06c6 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile @@ -42,7 +42,6 @@ ifdef HOST_COMPILE @@ -76,8 +57,6 @@ index aaef98e..f5b06c6 100644 -DGSTREAMER_LITE PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile -index 5ffd9ea..a7b3ddb 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile @@ -30,8 +30,7 @@ CFLAGS += -pipe \ diff --git a/dev-java/openjfx/files/11/don-t-force-msse.patch b/dev-java/openjfx/files/11/don-t-force-msse.patch index f3d62c8e26f2..b3f1e4fee774 100644 --- a/dev-java/openjfx/files/11/don-t-force-msse.patch +++ b/dev-java/openjfx/files/11/don-t-force-msse.patch @@ -3,17 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 19 Sep 2020 18:30:58 -0700 Subject: [PATCH] don't force -msse ---- - .../src/main/native/gstreamer/projects/linux/avplugin/Makefile | 1 - - .../main/native/gstreamer/projects/linux/fxplugins/Makefile | 1 - - .../src/main/native/gstreamer/projects/mac/fxplugins/Makefile | 3 +-- - .../main/native/gstreamer/projects/mac/gstreamer-lite/Makefile | 3 +-- - .../src/main/native/jfxmedia/projects/linux/Makefile | 1 - - .../src/main/native/jfxmedia/projects/mac/Makefile | 3 +-- - 6 files changed, 3 insertions(+), 9 deletions(-) - -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index f27b9479..4e229f20 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -23,7 +23,6 @@ CFLAGS := -fPIC \ @@ -24,8 +13,6 @@ index f27b9479..4e229f20 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index 627865f9..a4d99299 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -20,7 +20,6 @@ CFLAGS := -fPIC \ @@ -36,8 +23,6 @@ index 627865f9..a4d99299 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile -index 9f80434d..659ab1c1 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile @@ -30,8 +30,7 @@ CFLAGS += -fPIC \ @@ -50,8 +35,6 @@ index 9f80434d..659ab1c1 100644 ifeq ($(BUILD_TYPE), Release) CFLAGS += -Os -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile -index 2020404c..34bdf42c 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile @@ -51,8 +51,7 @@ CFLAGS += -fPIC \ @@ -64,8 +47,6 @@ index 2020404c..34bdf42c 100644 ifeq ($(BUILD_TYPE), Release) CFLAGS += -Os -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile -index c9500236..175be13e 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile @@ -43,7 +43,6 @@ ifdef HOST_COMPILE @@ -76,8 +57,6 @@ index c9500236..175be13e 100644 -DGSTREAMER_LITE PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile -index 5ffd9eac..a7b3ddbb 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile @@ -30,8 +30,7 @@ CFLAGS += -pipe \ diff --git a/dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch b/dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch index 600f1cb84640..ffcc0cb10f20 100644 --- a/dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch +++ b/dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch @@ -9,12 +9,6 @@ enough data left to read the frame size. Closes https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/876 Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1066> ---- - gst-libs/gst/tag/id3v2frames.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst-libs/gst/tag/id3v2frames.c b/gst-libs/gst/tag/id3v2frames.c -index 8e9f78254..f39659bf7 100644 --- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/id3v2frames.c +++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/id3v2frames.c @@ -109,7 +109,7 @@ id3v2_parse_frame (ID3TagsWorking * work) diff --git a/dev-java/openjfx/files/11/missing-casts.patch b/dev-java/openjfx/files/11/missing-casts.patch new file mode 100644 index 000000000000..82e3f3b4f78b --- /dev/null +++ b/dev-java/openjfx/files/11/missing-casts.patch @@ -0,0 +1,31 @@ +--- a/modules/javafx.graphics/src/main/native-font/pango.c ++++ b/modules/javafx.graphics/src/main/native-font/pango.c +@@ -243,7 +243,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(FcConfigAppFontAddFile) + if (text) { + // rc = (jboolean)FcConfigAppFontAddFile(arg0, text); + if (fp) { +- rc = (jboolean)((jboolean (*)(void *, const char *))fp)(arg0, text); ++ rc = (jboolean)((jboolean (*)(void *, const char *))fp)((void *)(intptr_t)arg0, text); + } + (*env)->ReleaseStringUTFChars(env, arg1, text); + } +@@ -402,7 +402,7 @@ JNIEXPORT jlong JNICALL OS_NATIVE(g_1utf8_1strlen) + (JNIEnv *env, jclass that, jlong str, jlong pos) + { + if (!str) return 0; +- return (jlong)g_utf8_strlen((const gchar *)str, (const gchar *)pos); ++ return (jlong)g_utf8_strlen((const gchar *)str, (gssize)(const gchar *)pos); + } + + JNIEXPORT jlong JNICALL OS_NATIVE(g_1utf16_1to_1utf8) +--- a/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLContext.c ++++ b/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLContext.c +@@ -275,7 +275,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_X11GLContext_nInitialize + dlsym(RTLD_DEFAULT, "glXSwapIntervalSGI"); + + if (ctxInfo->glXSwapIntervalSGI == NULL) { +- ctxInfo->glXSwapIntervalSGI = glXGetProcAddress("glXSwapIntervalSGI"); ++ ctxInfo->glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)glXGetProcAddress("glXSwapIntervalSGI"); + } + + } diff --git a/dev-java/openjfx/files/11/respect-cc.patch b/dev-java/openjfx/files/11/respect-cc.patch index 85b742f3a630..a1b9bf106e24 100644 --- a/dev-java/openjfx/files/11/respect-cc.patch +++ b/dev-java/openjfx/files/11/respect-cc.patch @@ -1,5 +1,3 @@ -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index 2295566..ce54c3f 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -214,8 +214,8 @@ setupTools("linux_freetype_tools", diff --git a/dev-java/openjfx/files/11/respect-user-cflags-11.0.11.patch b/dev-java/openjfx/files/11/respect-user-cflags-11.0.11.patch index 458305608903..4564a0502cd3 100644 --- a/dev-java/openjfx/files/11/respect-user-cflags-11.0.11.patch +++ b/dev-java/openjfx/files/11/respect-user-cflags-11.0.11.patch @@ -3,16 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 1 Jun 2019 00:12:55 -0700 Subject: [PATCH] respect user cflags ---- - buildSrc/linux.gradle | 7 ++++++- - .../gstreamer/projects/linux/avplugin/Makefile | 16 ++++++---------- - .../gstreamer/projects/linux/fxplugins/Makefile | 17 ++++++----------- - .../projects/linux/gstreamer-lite/Makefile | 16 ++++++---------- - .../native/jfxmedia/projects/linux/Makefile | 16 ++++++---------- - 5 files changed, 30 insertions(+), 42 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index 7a7cbc72..6705a0f3 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${name}.so" as String } @@ -45,8 +35,6 @@ index 7a7cbc72..6705a0f3 100644 LINUX.iio.lib = "javafx_iio" LINUX.prismES2 = [:] -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index 450b55d3..f27b9479 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -17,7 +17,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so @@ -89,8 +77,6 @@ index 450b55d3..f27b9479 100644 ifneq ($(strip $(LIBAV_DIR)),) INCLUDES += -I$(LIBAV_DIR)/include -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index 1e58d4d3..627865f9 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -14,7 +14,7 @@ DIRLIST = progressbuffer \ @@ -132,8 +118,6 @@ index 1e58d4d3..627865f9 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile -index 5baa30a1..ddf0e521 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile @@ -37,7 +37,7 @@ DIRLIST = gstreamer/gst \ @@ -174,8 +158,6 @@ index 5baa30a1..ddf0e521 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile -index ecbd859f..5881cf53 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile @@ -17,7 +17,7 @@ DIRLIST = jni \ diff --git a/dev-java/openjfx/files/11/respect-user-cflags.patch b/dev-java/openjfx/files/11/respect-user-cflags.patch index 6ffb039467c3..d1483a2a1303 100644 --- a/dev-java/openjfx/files/11/respect-user-cflags.patch +++ b/dev-java/openjfx/files/11/respect-user-cflags.patch @@ -3,16 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 1 Jun 2019 00:12:55 -0700 Subject: [PATCH] respect user cflags ---- - buildSrc/linux.gradle | 7 ++++++- - .../gstreamer/projects/linux/avplugin/Makefile | 16 ++++++---------- - .../gstreamer/projects/linux/fxplugins/Makefile | 17 ++++++----------- - .../projects/linux/gstreamer-lite/Makefile | 16 ++++++---------- - .../native/jfxmedia/projects/linux/Makefile | 16 ++++++---------- - 5 files changed, 30 insertions(+), 42 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index 7a7cbc72..6705a0f3 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${name}.so" as String } @@ -45,8 +35,6 @@ index 7a7cbc72..6705a0f3 100644 LINUX.iio.lib = "javafx_iio" LINUX.prismES2 = [:] -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index 450b55d3..f27b9479 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -17,7 +17,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so @@ -89,8 +77,6 @@ index 450b55d3..f27b9479 100644 ifneq ($(strip $(LIBAV_DIR)),) INCLUDES += -I$(LIBAV_DIR)/include -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index 1e58d4d3..627865f9 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -14,7 +14,7 @@ DIRLIST = progressbuffer \ @@ -132,8 +118,6 @@ index 1e58d4d3..627865f9 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile -index 5baa30a1..ddf0e521 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile @@ -37,7 +37,7 @@ DIRLIST = gstreamer/gst \ @@ -174,8 +158,6 @@ index 5baa30a1..ddf0e521 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile -index ecbd859f..5881cf53 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile @@ -17,7 +17,7 @@ DIRLIST = jni \ diff --git a/dev-java/openjfx/files/11/use-system-swt-jar.patch b/dev-java/openjfx/files/11/use-system-swt-jar.patch index 34b4245bf0a0..39e2980f0147 100644 --- a/dev-java/openjfx/files/11/use-system-swt-jar.patch +++ b/dev-java/openjfx/files/11/use-system-swt-jar.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 1 Jun 2019 00:36:04 -0700 Subject: [PATCH] use system swt jar ---- - build.gradle | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build.gradle b/build.gradle -index 1e414b7..3d967bb 100644 --- a/build.gradle +++ b/build.gradle @@ -2477,7 +2477,7 @@ project(":swt") { diff --git a/dev-java/openjfx/files/11/wno-error-11.0.11.patch b/dev-java/openjfx/files/11/wno-error-11.0.11.patch index 639b3c117889..184f8775a5f6 100644 --- a/dev-java/openjfx/files/11/wno-error-11.0.11.patch +++ b/dev-java/openjfx/files/11/wno-error-11.0.11.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Wed, 17 Nov 2021 19:52:13 -0800 Subject: [PATCH] no -Werror ---- - buildSrc/linux.gradle | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index 00a3bca..2295566 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -231,7 +231,7 @@ FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-g diff --git a/dev-java/openjfx/files/11/wno-error.patch b/dev-java/openjfx/files/11/wno-error.patch index eb354c6f9fad..4c8dd6e8f247 100644 --- a/dev-java/openjfx/files/11/wno-error.patch +++ b/dev-java/openjfx/files/11/wno-error.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Thu, 19 Mar 2020 09:50:22 -0700 Subject: [PATCH] remove werror ---- - buildSrc/linux.gradle | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index 7a7cbc7..6955155 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -223,7 +223,7 @@ FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-g diff --git a/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch b/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch index fee211fd8770..4a482240dc6b 100644 --- a/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch +++ b/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch @@ -1,5 +1,5 @@ ---- rt-8u202-b02/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp 2018-10-29 16:26:04.000000000 +0100 -+++ rt-8u202-b02-patched/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp 2018-11-27 15:34:52.170181958 +0100 +--- rt-8u202-b02/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp ++++ rt-8u202-b02-patched/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp @@ -232,10 +232,7 @@ pid_t wpid = 0; diff --git a/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch b/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch index 011e952b9440..7095841498a1 100644 --- a/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch +++ b/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch @@ -3,13 +3,6 @@ From: Mat Booth <mat.booth@redhat.com> Date: Thu, 21 Jun 2018 15:57:01 +0100 Subject: [PATCH 4/4] fix cast between incompatible function types ---- - modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp | 8 ++++++-- - .../src/main/native-glass/gtk/glass_window_ime.cpp | 9 +++------ - 2 files changed, 9 insertions(+), 8 deletions(-) - -diff --git a/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp b/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp -index f85b1dae..3b9225f7 100644 --- a/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp +++ b/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp @@ -556,7 +556,7 @@ static GdkDragContext *get_drag_context() { @@ -41,8 +34,6 @@ index f85b1dae..3b9225f7 100644 } } } -diff --git a/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp b/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp -index 82e54d11..51af2a6a 100644 --- a/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp +++ b/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp @@ -122,15 +122,12 @@ bool WindowContextBase::filterIME(GdkEvent * event) { diff --git a/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch b/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch index 883c3da57e72..cabb36eefe54 100644 --- a/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch +++ b/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Thu, 30 May 2019 12:07:30 -0700 Subject: [PATCH] don't include xlocale.h ---- - .../gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c -index 72dc1301..32669789 100644 --- a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c +++ b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c @@ -39,7 +39,7 @@ diff --git a/dev-java/openjfx/files/8/99-sysdeps.patch b/dev-java/openjfx/files/8/99-sysdeps.patch index 367d9392d95e..abcdbab67ef3 100644 --- a/dev-java/openjfx/files/8/99-sysdeps.patch +++ b/dev-java/openjfx/files/8/99-sysdeps.patch @@ -1,5 +1,3 @@ -diff --git a/build.gradle b/build.gradle -index 0914d7d..6bd9e78 100644 --- a/build.gradle +++ b/build.gradle @@ -1309,6 +1309,7 @@ project(":graphics") { @@ -10,8 +8,6 @@ index 0914d7d..6bd9e78 100644 } // Create a single "native" task which will depend on all the individual native tasks for graphics -diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle -index 25f88d1..642450d 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -82,10 +82,13 @@ getConfigurations().create("antlr3"); diff --git a/dev-java/openjfx/files/8/Wno-error.patch b/dev-java/openjfx/files/8/Wno-error.patch index edc9389ee9ce..771da0707088 100644 --- a/dev-java/openjfx/files/8/Wno-error.patch +++ b/dev-java/openjfx/files/8/Wno-error.patch @@ -3,18 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sun, 26 Apr 2020 21:15:36 -0700 Subject: [PATCH] Wno-error ---- - buildSrc/armv5sf.gradle | 1 - - buildSrc/armv6hf.gradle | 1 - - buildSrc/armv6sf.gradle | 1 - - buildSrc/armv7hf.gradle | 1 - - buildSrc/armv7sf.gradle | 1 - - buildSrc/linux.gradle | 6 +++--- - buildSrc/x86egl.gradle | 1 - - 7 files changed, 3 insertions(+), 9 deletions(-) - -diff --git a/buildSrc/armv5sf.gradle b/buildSrc/armv5sf.gradle -index ee154182..bee6003e 100644 --- a/buildSrc/armv5sf.gradle +++ b/buildSrc/armv5sf.gradle @@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"] @@ -25,8 +13,6 @@ index ee154182..bee6003e 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() def glassCFlags = ["-ffast-math"] -diff --git a/buildSrc/armv6hf.gradle b/buildSrc/armv6hf.gradle -index dfdff237..0f090f23 100644 --- a/buildSrc/armv6hf.gradle +++ b/buildSrc/armv6hf.gradle @@ -131,7 +131,6 @@ def extraLFlags = [ @@ -37,8 +23,6 @@ index dfdff237..0f090f23 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() -diff --git a/buildSrc/armv6sf.gradle b/buildSrc/armv6sf.gradle -index ee6615f0..6ebbdd90 100644 --- a/buildSrc/armv6sf.gradle +++ b/buildSrc/armv6sf.gradle @@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"] @@ -49,8 +33,6 @@ index ee6615f0..6ebbdd90 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() def glassCFlags = ["-ffast-math"] -diff --git a/buildSrc/armv7hf.gradle b/buildSrc/armv7hf.gradle -index e75bf8a9..092be817 100644 --- a/buildSrc/armv7hf.gradle +++ b/buildSrc/armv7hf.gradle @@ -131,7 +131,6 @@ def extraLFlags = [ @@ -61,8 +43,6 @@ index e75bf8a9..092be817 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() -diff --git a/buildSrc/armv7sf.gradle b/buildSrc/armv7sf.gradle -index 0bb8a530..38e98303 100644 --- a/buildSrc/armv7sf.gradle +++ b/buildSrc/armv7sf.gradle @@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"] @@ -73,8 +53,6 @@ index 0bb8a530..38e98303 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() def glassCFlags = ["-ffast-math"] -diff --git a/buildSrc/x86egl.gradle b/buildSrc/x86egl.gradle -index 6bf6196b..ff24207d 100644 --- a/buildSrc/x86egl.gradle +++ b/buildSrc/x86egl.gradle @@ -118,7 +118,6 @@ def extraLFlags = [ diff --git a/dev-java/openjfx/files/8/disable-online-repos.patch b/dev-java/openjfx/files/8/disable-online-repos.patch index 6b0afe4bf070..6dd2db128e90 100644 --- a/dev-java/openjfx/files/8/disable-online-repos.patch +++ b/dev-java/openjfx/files/8/disable-online-repos.patch @@ -1,5 +1,3 @@ -diff --git a/build.gradle b/build.gradle -index df82f63..3f920b6 100644 --- a/build.gradle +++ b/build.gradle @@ -1135,17 +1135,17 @@ allprojects { diff --git a/dev-java/openjfx/files/8/don-t-force-msse.patch b/dev-java/openjfx/files/8/don-t-force-msse.patch index 2f5d56718cca..6cdb19e5a002 100644 --- a/dev-java/openjfx/files/8/don-t-force-msse.patch +++ b/dev-java/openjfx/files/8/don-t-force-msse.patch @@ -3,15 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sun, 26 Apr 2020 20:57:39 -0700 Subject: [PATCH] don't force msse ---- - .../main/native/gstreamer/projects/linux/avplugin/Makefile | 1 - - .../native/gstreamer/projects/linux/fxplugins/Makefile | 1 - - .../media/src/main/native/jfxmedia/projects/linux/Makefile | 1 - - modules/web/src/main/native/Tools/Scripts/webkitdirs.pm | 7 ------- - 4 files changed, 10 deletions(-) - -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index df9f7f21..f82f0537 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -28,7 +28,6 @@ CFLAGS = -fPIC \ @@ -22,8 +13,6 @@ index df9f7f21..f82f0537 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index fd3847d0..3887ac6d 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -25,7 +25,6 @@ CFLAGS = -fPIC \ @@ -34,8 +23,6 @@ index fd3847d0..3887ac6d 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile -index 3d089501..10fad68f 100644 --- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile @@ -44,7 +44,6 @@ ifdef HOST_COMPILE diff --git a/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch b/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch index a01dd05494fe..6fd0a9852012 100644 --- a/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch +++ b/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Fri, 18 Sep 2020 21:43:57 -0700 Subject: [PATCH] fxpackager: don't include obsolete sys/sysctl.h ---- - .../fxpackager/src/main/native/library/common/PosixPlatform.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp -index 5ea3bc6..b5d167b 100644 --- a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp +++ b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp @@ -43,7 +43,6 @@ diff --git a/dev-java/openjfx/files/8/missing-casts.patch b/dev-java/openjfx/files/8/missing-casts.patch new file mode 100644 index 000000000000..c3d45f4f07df --- /dev/null +++ b/dev-java/openjfx/files/8/missing-casts.patch @@ -0,0 +1,22 @@ +--- a/modules/graphics/src/main/native-font/pango.c ++++ b/modules/graphics/src/main/native-font/pango.c +@@ -225,7 +225,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(FcConfigAppFontAddFile) + if (text) { + // rc = (jboolean)FcConfigAppFontAddFile(arg0, text); + if (fp) { +- rc = (jboolean)((jboolean (*)(void *, const char *))fp)(arg0, text); ++ rc = (jboolean)((jboolean (*)(void *, const char *))fp)((void *)(intptr_t)arg0, text); + } + (*env)->ReleaseStringUTFChars(env, arg1, text); + } +--- a/modules/graphics/src/main/native-prism-es2/x11/X11GLContext.c ++++ b/modules/graphics/src/main/native-prism-es2/x11/X11GLContext.c +@@ -275,7 +275,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_X11GLContext_nInitialize + dlsym(RTLD_DEFAULT, "glXSwapIntervalSGI"); + + if (ctxInfo->glXSwapIntervalSGI == NULL) { +- ctxInfo->glXSwapIntervalSGI = glXGetProcAddress("glXSwapIntervalSGI"); ++ ctxInfo->glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)glXGetProcAddress("glXSwapIntervalSGI"); + } + + } diff --git a/dev-java/openjfx/files/8/respect_flags.patch b/dev-java/openjfx/files/8/respect_flags.patch index 2a1b7701b9c4..b8a0975965a8 100644 --- a/dev-java/openjfx/files/8/respect_flags.patch +++ b/dev-java/openjfx/files/8/respect_flags.patch @@ -3,17 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Thu, 25 Mar 2021 10:06:49 -0700 Subject: [PATCH] respect flags ---- - buildSrc/linux.gradle | 4 ++++ - .../gstreamer/projects/linux/avplugin/Makefile | 16 ++++++---------- - .../gstreamer/projects/linux/fxplugins/Makefile | 17 ++++++----------- - .../gstreamer/projects/linux/glib-lite/Makefile | 11 +++-------- - .../projects/linux/gstreamer-lite/Makefile | 16 ++++++---------- - .../gstreamer/projects/linux/libffi/Makefile | 6 ------ - 6 files changed, 25 insertions(+), 45 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index a8886c16..e2397a54 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -46,6 +46,9 @@ def commonFlags = [ @@ -34,8 +23,6 @@ index a8886c16..e2397a54 100644 def toolchainDir if (hasProperty('toolchainDir')) { -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index f82f0537..01e069b1 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -22,7 +22,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so @@ -78,8 +65,6 @@ index f82f0537..01e069b1 100644 ifneq ($(strip $(LIBAV_DIR)),) INCLUDES += -I$(LIBAV_DIR)/include -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index 3887ac6d..99c82718 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -19,7 +19,7 @@ DIRLIST = progressbuffer \ @@ -121,8 +106,6 @@ index 3887ac6d..99c82718 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile -index c5b4b0a6..b0e6d6f9 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile @@ -40,20 +40,15 @@ CFLAGS += -fPIC \ @@ -149,8 +132,6 @@ index c5b4b0a6..b0e6d6f9 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile -index 8634b559..109375f5 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile @@ -41,7 +41,7 @@ DIRLIST = gstreamer/gst \ @@ -191,8 +172,6 @@ index 8634b559..109375f5 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile -index 62f1b802..54e0a63b 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile @@ -20,12 +20,6 @@ CFLAGS += -c \ diff --git a/dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild b/dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild index 55962035a564..7f64ad304cdd 100644 --- a/dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild +++ b/dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild @@ -83,6 +83,7 @@ PATCHES=( "${FILESDIR}"/11/ffmpeg5.patch "${FILESDIR}"/11/respect-cc.patch "${FILESDIR}"/11/strip-blank-elements-flags.patch + "${FILESDIR}"/11/missing-casts.patch ) egradle() { diff --git a/dev-java/openjfx/openjfx-8.1000-r2.ebuild b/dev-java/openjfx/openjfx-8.1000-r2.ebuild index ef27aefdb985..303971b7904b 100644 --- a/dev-java/openjfx/openjfx-8.1000-r2.ebuild +++ b/dev-java/openjfx/openjfx-8.1000-r2.ebuild @@ -67,6 +67,7 @@ PATCHES=( "${FILESDIR}"/8/Wno-error.patch "${FILESDIR}"/8/don-t-force-msse.patch "${FILESDIR}"/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch + "${FILESDIR}"/8/missing-casts.patch ) egradle() { diff --git a/dev-java/opentest4j/Manifest b/dev-java/opentest4j/Manifest index dd48bd1c2464..8d2641eca5a8 100644 --- a/dev-java/opentest4j/Manifest +++ b/dev-java/opentest4j/Manifest @@ -1 +1,2 @@ DIST opentest4j-1.2.0.tar.gz 77616 BLAKE2B a331cc5e97d1e50b3b57e6aac926278d16f4d75067b4e4b25acb5ee25d4d4cd9d1f75c115155303ec63f5cb22b09ad1cbaa01d62620b350dd2c1d61541657b78 SHA512 cd98d976935de97d259ec4c04510334f2b56f8a32db2c97e0f20a2e3b99f119ffeb390589eb42d4594808d96194067871d5eaad6a40dd58af30b9f995b13ef08 +DIST opentest4j-1.3.0.tar.gz 89527 BLAKE2B f8ac763c3ec1b1617c38c3744a8fac82e0d93ff4ff409a00e3e22d343fc873aa4129bee3d906de0e13cc78450a1c67cdcffebed91d00c9758f20113a68a76dc7 SHA512 6141fed5230d1195eee137031fc6cf8e3df0b857f2fd341ba823d5aeb92d86e56262b57b93a901a4e00f6000920b67f28e02e04f404df7df8e62be9d60c3e79d diff --git a/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild b/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild new file mode 100644 index 000000000000..1fd5072d0edf --- /dev/null +++ b/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.opentest4j:opentest4j:1.3.0" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Open Test Alliance for the JVM" +HOMEPAGE="https://github.com/ota4j-team/opentest4j" +SRC_URI="https://github.com/ota4j-team/opentest4j/archive/r${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-r${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=">=virtual/jdk-11:*" # module-info +RDEPEND=">=virtual/jre-1.8:*" #939580 + +JAVA_SRC_DIR=( src/{main,module}/java ) + +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR=( src/test/java ) +JAVA_TEST_RESOURCE_DIRS=( src/test/resources ) + +src_test() { + # src/test/java/org/opentest4j/FileInfoTests.java:52: error: cannot find symbol + # var out = new ByteArrayOutputStream(); + # ^ + # symbol: class var + # location: class FileInfoTests + # src/test/java/org/opentest4j/FileInfoTests.java:55: error: cannot find symbol + # var deserialized = (AssertionFailedError) new ObjectInputStream( + # ^ + # symbol: class var + # location: class FileInfoTests + # src/test/java/org/opentest4j/FileInfoTests.java:64: error: cannot find symbol + # var contents = "contents".getBytes(UTF_8); + # ^ + # symbol: class var + # location: class FileInfoTests + # src/test/java/org/opentest4j/FileInfoTests.java:65: error: cannot find symbol + # var fileInfo = new FileInfo("path", contents); + # ^ + # symbol: class var + # location: class FileInfoTests + JAVAC_ARGS="--source 11 --target 11" java-pkg-simple_src_test +} diff --git a/dev-java/owasp-java-encoder/Manifest b/dev-java/owasp-java-encoder/Manifest index 9b143f96e63b..d809ac37efab 100644 --- a/dev-java/owasp-java-encoder/Manifest +++ b/dev-java/owasp-java-encoder/Manifest @@ -1 +1,2 @@ -DIST owasp-java-encoder-1.2.3.tar.gz 134303 BLAKE2B 76b9652863fcdfdce82bd26062fa500bb92b21ba6edff7b3f409a1375e135176f826dca4bb02b4dd48905112ae20a0af0a1f09cb4e21ea41c672a44c52fea209 SHA512 19c13894ce68325553bdbee41190cb113d698c79ec74885604fd9db4f083efe0fcdc4313b7191014bfd972d0ee52f0fbe0621d7bb407745bd1feeb2ac9e49783 +DIST owasp-java-encoder-1.3.0.tar.gz 150029 BLAKE2B 31e350f02a7374f809e435d90ee9b4b1424cd9cb2da7d4062dfe0fc5898e02623496e464483bafd550b82b926260ab4df918f9be776e47f66587c6bc3829ebba SHA512 0ccdd6ae63e657ee28a4d9de7664269eff57802bddb03c7163fdb27326668256573d995b0111dc83cc1e5a6acc247e03da443f4b34c08cf99b085ec0a383a439 +DIST owasp-java-encoder-1.3.1.tar.gz 150103 BLAKE2B 6fc372364a13df497b1f5380d1d9b1c90e0981bfa059c31f2d138a3d0db3210105d0055b2a39a341cb3374b8149c5d61e1f967677e1159e843bb0143713e58b2 SHA512 9a75dea53e2859a4a213e2a511440c1bcbaea6c7a13fece674d155bc859f049fd45bbbd83fd6869a792af3b0e3f447e90ab450545684aa5ccc5b88a051114cdc 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.3.0.ebuild index 482d2d258e37..d97245755a5f 100644 --- a/dev-java/owasp-java-encoder/owasp-java-encoder-1.2.3.ebuild +++ b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,17 +18,17 @@ LICENSE="BSD" SLOT="0" KEYWORDS="amd64" -RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" -PATCHES=( "${FILESDIR}/owasp-java-encoder-1.2.3-BenchmarkTest.patch" ) - +# skipping 10 tests because they seem to be unreliable depending on hardware used +# as some of them fail on some setups because the benchmark results don't align +# with the hardcoded value 200 for the expected results. here are some examples: +# Benchmarked Encode.forJavaScript: 442,382250 ns/op (+253,85% on baseline) +# Benchmarked Encode.forCssString: 446,929231 ns/op (+257,49% on baseline) +# Benchmarked Encode.forJava: 409,038065 ns/op (+227,18% on baseline) +JAVA_RM_FILES=( src/test/java/org/owasp/encoder/BenchmarkTest.java ) 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/owasp-java-encoder/owasp-java-encoder-1.3.1.ebuild b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.1.ebuild new file mode 100644 index 000000000000..84640fdb1e59 --- /dev/null +++ b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 2023-2024 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" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +# skipping 10 tests because they seem to be unreliable depending on hardware used +# as some of them fail on some setups because the benchmark results don't align +# with the hardcoded value 200 for the expected results. here are some examples: +# Benchmarked Encode.forJavaScript: 442,382250 ns/op (+253,85% on baseline) +# Benchmarked Encode.forCssString: 446,929231 ns/op (+257,49% on baseline) +# Benchmarked Encode.forJava: 409,038065 ns/op (+227,18% on baseline) +JAVA_RM_FILES=( src/test/java/org/owasp/encoder/BenchmarkTest.java ) +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" diff --git a/dev-java/pebble/Manifest b/dev-java/pebble/Manifest new file mode 100644 index 000000000000..608e4bf90e0a --- /dev/null +++ b/dev-java/pebble/Manifest @@ -0,0 +1 @@ +DIST pebble-3.1.6.tar.gz 222475 BLAKE2B 783e999f463820af9ac1c43610e2a257f7921fa46d274a3898496662119f74336e4bf78b42a92847359f8ee4efde7a074cbc57274ec6fb8475eb9c6c1ba9455e SHA512 0963e4c04dd67cb0069aa0b3e0ac33b4bdc524e07cec4074493d56232e31360d629b5f2c2fcbf663a26fd3df97d0e973e842d30edb547ec83b7335818417c9f0 diff --git a/dev-java/pebble/metadata.xml b/dev-java/pebble/metadata.xml new file mode 100644 index 000000000000..8c10ed8322e7 --- /dev/null +++ b/dev-java/pebble/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">PebbleTemplates/pebble</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/pebble/pebble-3.1.6.ebuild b/dev-java/pebble/pebble-3.1.6.ebuild new file mode 100644 index 000000000000..aedaa41b9a98 --- /dev/null +++ b/dev-java/pebble/pebble-3.1.6.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# No tests due to missing eclass suppoert for junit-jupiter, bug #839681 +JAVA_PKG_IUSE="doc source" +MAVEN_ID="io.pebbletemplates:pebble:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Templating engine for Java" +HOMEPAGE="https://pebbletemplates.io" +SRC_URI="https://github.com/PebbleTemplates/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}/${PN}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +CP_DEPEND=" + dev-java/caffeine:0 + dev-java/jakarta-servlet-api:6 + dev-java/javax-servlet-api:2.5 + dev-java/slf4j-api:0 + dev-java/unbescape:0 +" +DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-1.8:* +" +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" + +JAVA_AUTOMATIC_MODULE_NAME="io.pebbletemplates" +JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest index 9057f75a73c0..d98aa33f1abc 100644 --- a/dev-java/poi/Manifest +++ b/dev-java/poi/Manifest @@ -1 +1,3 @@ DIST poi-src-5.2.3-20220909.tgz 117839114 BLAKE2B 8b62f212dbbb6c7c20900dad97eaee20d416129d1529f42d3f3d15c42dd737af389f3d46c0891f733ba6ce143fa30c73aa921a2f007e68ecbfcd2a61da27baec SHA512 15d1d9387a3003fa30dc77cb42721daefb07a0f8ef1a69873107fd2266d66ae5c0138f47f2867d49154bbde4f28939ac1aa1b49e367230408e67c05099addc1c +DIST poi-src-5.2.5-20231118.tgz 120325373 BLAKE2B a998b874040ac2fb136b9ffa59d30cf5939434efe59d51fc2e79c63f6fd1f3ad1679b532840f0e1975aa0fe79368951ecf2ddc0259e3dfce9fc2c34d95cb7216 SHA512 d46e94cfadc3a843d8e06033a618098dde738830f20146c6e39abd8f467aa88987719363ee2b91ecf6812e604cdc72a5c0a799676e264a6f9d3799aa4639a6c9 +DIST poi-src-5.2.5-20231118.tgz.asc 488 BLAKE2B 634ed5e3bacd71213a96b9da147348deb3dd2837f6cf47f4d76c254442504815e41b1d9a3facfaa27c927f11f1ba552acf4dc94c4ffbfd11cc70eefd054a1523 SHA512 3588d60ad1c5e59540f19e345f2cfd6600a592fda313ab53bfd280599906e9d3c44aedae8fb72409ebae67c0285b257290bdca9128a632379db894143585dd1e diff --git a/dev-java/poi/poi-5.2.5.ebuild b/dev-java/poi/poi-5.2.5.ebuild new file mode 100644 index 000000000000..7320886dbe8a --- /dev/null +++ b/dev-java/poi/poi-5.2.5.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# No tests, #839681 +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.apache.poi:poi-main:${PV}" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Maven build of Apache POI for Sonar checks" +HOMEPAGE="https://poi.apache.org/" +RELEASE_DATE="20231118" +SRC_URI="https://archive.apache.org/dist/poi/release/src/poi-src-${PV}-${RELEASE_DATE}.tgz + verify-sig? ( https://archive.apache.org/dist/poi/release/src/poi-src-${PV}-${RELEASE_DATE}.tgz.asc )" +S="${WORKDIR}/poi-src-${PV}-${RELEASE_DATE}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/poi.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-poi )" +DEPEND=" + dev-java/commons-codec:0 + dev-java/commons-collections:4 + dev-java/commons-io:1 + dev-java/commons-math:3 + dev-java/log4j-api:2 + >=dev-java/sparsebitset-1.3:0 + >=virtual/jdk-11:* +" + +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="org.apache.poi.poi" +JAVA_CLASSPATH_EXTRA=" + commons-codec + commons-collections-4 + commons-io-1 + commons-math-3 + log4j-api-2 + sparsebitset +" +JAVA_RESOURCE_DIRS="poi/src/main/resources" +JAVA_SRC_DIR=( poi/src/main/java{,9} ) + +src_prepare() { + java-pkg-2_src_prepare + sed \ + -e "s:@VERSION@:${PV}:g" \ + -e "s:@DSTAMP@:${RELEASE_DATE}:g" \ + poi/src/main/version/Version.java.template \ + > poi/src/main/java/org/apache/poi/Version.java || die + # log4j-api does not provide Automatic-Module + sed \ + -e '/org.apache.logging.log4j/d' \ + -i poi/src/main/java9/module-info.java || die +} diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest index c07e7249e188..7882f7aa572a 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -1,7 +1,4 @@ -DIST protobuf-23.0.tar.gz 5039837 BLAKE2B 63e02590b03fd9206cdfc4a26edeb2fa55dac902f5365c33c9e9340a722f552e4a5c82d1a0b25b84fcb675d5d06b768fd92cf472743d2361295129ae9faa02f3 SHA512 46c263fab189fdc310c7310d1a3d9e76472e5d96f16228bc4b946d4211afc64188d563ec70250c11a3dd05d18158b72ccf173567bd59aa45310eff62cd5f194d -DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b -DIST protobuf-25.1.tar.gz 5878124 BLAKE2B a0b917e4518b07b221afd01e801e45b5b6fa35c7ccf8c21120d6a63f7174e53cc37d0516b1802d9243f8bb37b72b7f460a36dcbf0fffb09e011b05315c53efc3 SHA512 d2fad2188118ced2cd951bdb472d72cc9e9b2158c88eeca652c76332a884b5b5b4b58628f7777272fa693140753823584ea9c7924f1655b1d5a363f59bdf7a4c -DIST protobuf-25.2.tar.gz 5878387 BLAKE2B 1ee7a48d3a481f523ff240c79e8cacb39b6a7e2c671279812cbffd5ce9be595034461fba41f03bed363133118c1b92bd14bcfd8c4e46ac6368e6407a23fb02ea SHA512 66f0b177eae0e2e40b8b17c8f411cd9dec5355dcfc145b8a79426e6367babcc28b9a8078bbe4ba2de47a82811a2e1a89d36955d6fa0c8d391cfeada4eb160fdb DIST protobuf-25.3.tar.gz 5878962 BLAKE2B 9268f9bd993a1cfd6d3937a2ad56ba4cfe3d84923756513841cbf13039d4a07acb260468745cb1294f30334cb34b45c6fde272f5c40d9de63ac6a4ce5c263077 SHA512 1f73e237c919082e5423ae9e2ea8813dccf672c059051d1531fe89ffaa45872d3cf3052b8c3af26f674296ec17d7dc861c67b8f0834ed80261ce4a6a14ed7115 -DIST protobuf-26.0.tar.gz 5957426 BLAKE2B 246b81a2c037047c10aeb004bbc4836d1d1cd73eadd0780060bf7fe60cee2cfa4e14afdb07c2a6fa2381e4656a47a148cf77315f1caa8c1bf6c137e06b0de168 SHA512 b350e0be51e4977865bfcc086506e1d85421da5d9386d2b10dada98a9a1a32a7b44e2ace866e605b42f1e2b6a702e6eca7fa9f5346819b55dd7d09f5ded3628c +DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397 +DIST protobuf-28.1.tar.gz 9258233 BLAKE2B 908dd074cc4ef632efdf123fdc76e6d78fd0db13d580584f00fd6afd3b5e1b6d3b6b52e49c528d4095905c802dcf0f391b01d2edf872738ed11a70c1123258a9 SHA512 769ef61206e39336d93df786a25c08cdf1acb12f2f5818ae31afb268aad8b02076eeba15c41c68aadbf140c6e1653c0aaefc2a637278c7695ded1b5d72888d81 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 diff --git a/dev-java/protobuf-java/files/protobuf-java-3.26.0-unittest.protos.patch b/dev-java/protobuf-java/files/protobuf-java-3.26.0-unittest.protos.patch deleted file mode 100644 index 76b227a4e71a..000000000000 --- a/dev-java/protobuf-java/files/protobuf-java-3.26.0-unittest.protos.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/java/core/generate-test-sources-build.xml -+++ b/java/core/generate-test-sources-build.xml -@@ -8,10 +8,12 @@ - <arg value="${protobuf.source.dir}/google/protobuf/unittest.proto"/> - <arg value="${protobuf.source.dir}/google/protobuf/unittest_custom_options.proto"/> - <arg value="${protobuf.source.dir}/google/protobuf/unittest_enormous_descriptor.proto"/> -+ <arg value="${protobuf.source.dir}/google/protobuf/unittest_features.proto"/> - <arg value="${protobuf.source.dir}/google/protobuf/unittest_import.proto"/> - <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_lite.proto"/> - <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_public.proto"/> - <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_public_lite.proto"/> -+ <arg value="${protobuf.source.dir}/google/protobuf/unittest_legacy_features.proto"/> - <arg value="${protobuf.source.dir}/google/protobuf/unittest_lite.proto"/> - <arg value="${protobuf.source.dir}/google/protobuf/unittest_mset.proto"/> - <arg value="${protobuf.source.dir}/google/protobuf/unittest_mset_wire_format.proto"/> -@@ -19,6 +21,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 20b09444fc60..8b9311211599 100644 --- a/dev-java/protobuf-java/metadata.xml +++ b/dev-java/protobuf-java/metadata.xml @@ -1,14 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arfrever.fta@gmail.com</email> - <name>Arfrever Frehtes Taifersar Arahesis</name> - </maintainer> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> diff --git a/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild deleted file mode 100644 index abeb3464f5e4..000000000000 --- a/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild +++ /dev/null @@ -1,165 +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.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.23.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild deleted file mode 100644 index 484bbc788521..000000000000 --- a/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild +++ /dev/null @@ -1,164 +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.23.3" -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.3 from the 23.3 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" - -BDEPEND=" - system-protoc? ( ~dev-libs/protobuf-${PV#3.}:0 ) - !system-protoc? ( >=dev-cpp/abseil-cpp-20230125.3 ) -" -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/guava:0 - dev-java/mockito:4 - ) -" -RDEPEND=">=virtual/jre-1.8:*" - -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/v23.3/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.3/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.3/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.3/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.25.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.25.1.ebuild deleted file mode 100644 index 2c2fc51fb3b6..000000000000 --- a/dev-java/protobuf-java/protobuf-java-3.25.1.ebuild +++ /dev/null @@ -1,166 +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:${PV}" -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.25.1 from the 25.1 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" - -BDEPEND=" - system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 ) - !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 ) -" -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/guava:0 - dev-java/mockito:4 - ) -" -RDEPEND=">=virtual/jre-1.8:*" - -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/v25.1/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/v25.1/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/v25.1/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/v25.1/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.25.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild index 5415eb83ec8c..f1f4647303c7 100644 --- a/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild +++ b/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild @@ -22,7 +22,7 @@ S="${WORKDIR}/protobuf-${MY_PV}" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="system-protoc" BDEPEND=" diff --git a/dev-java/protobuf-java/protobuf-java-3.25.2.ebuild b/dev-java/protobuf-java/protobuf-java-4.27.2.ebuild index 5276064d1543..039b497e7f28 100644 --- a/dev-java/protobuf-java/protobuf-java-3.25.2.ebuild +++ b/dev-java/protobuf-java/protobuf-java-4.27.2.ebuild @@ -12,10 +12,10 @@ 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.25.2 from the 25.2 tarball in order to allow sharing the tarball with +# And we build artifact 4.27.2 from the 27.2 tarball in order to allow sharing the tarball with # dev-libs/protobuf. -MY_PV3="${PV#3.}" -MY_PV="${MY_PV3/_rc/-rc}" +MY_PV4="${PV#4.}" +MY_PV="${MY_PV4/_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}" @@ -26,7 +26,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="system-protoc" BDEPEND=" - system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 ) + system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0 ) !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 ) " DEPEND=" @@ -38,10 +38,6 @@ DEPEND=" " RDEPEND=">=virtual/jre-1.8:*" -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" @@ -67,25 +63,17 @@ src_prepare() { fi java-pkg-2_src_prepare - mkdir "${JAVA_RESOURCE_DIRS}" || die - # https://github.com/protocolbuffers/protobuf/blob/v25.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/v25.2/java/core/generate-sources-build.xml + # https://github.com/protocolbuffers/protobuf/blob/v27.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.java_source.dir}:java/core/src/main/resources:' \ -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/v25.2/java/core/generate-test-sources-build.xml + # https://github.com/protocolbuffers/protobuf/blob/v27.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:' \ @@ -128,13 +116,16 @@ src_compile() { } src_test() { - # https://github.com/protocolbuffers/protobuf/blob/v25.2/java/core/pom.xml#L63-L71 + # https://github.com/protocolbuffers/protobuf/blob/v27.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" + # google/protobuf/java_features.proto: File not found. + cp {java/core/src/main/resources,src}/google/protobuf/java_features.proto || die + 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" @@ -143,6 +134,10 @@ src_test() { run-protoc @test-sources-build-2 \ || die "run-protoc test-sources-build-2 failed" + # java/core/src/test/java/editions_unittest/TestDelimited.java:2867: + # error: package editions_unittest.MessageImport does not exist + rm java/core/src/test/java/com/google/protobuf/TextFormatTest.java || die + einfo "Running tests" # Invalid test class 'map_test.MapInitializationOrderTest': # 1. Test class should have exactly one public constructor diff --git a/dev-java/protobuf-java/protobuf-java-3.26.0.ebuild b/dev-java/protobuf-java/protobuf-java-4.28.1.ebuild index 5c59d510ec97..3ac4608d8286 100644 --- a/dev-java/protobuf-java/protobuf-java-3.26.0.ebuild +++ b/dev-java/protobuf-java/protobuf-java-4.28.1.ebuild @@ -12,12 +12,14 @@ 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.26.0 from the 26.0 tarball in order to allow sharing the tarball with +# And we build artifact 4.28.1 from the 28.1 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 )" +MY_PV4="${PV#4.}" +MY_PV="${MY_PV4/_rc/-rc}" +MY_P="protobuf-${MY_PV}.tar.gz" +TV="1.1.3" +SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${MY_PV}/${MY_P} + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/${TV}/truth-${TV}.jar )" S="${WORKDIR}/protobuf-${MY_PV}" LICENSE="BSD" @@ -26,7 +28,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="system-protoc" BDEPEND=" - system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 ) + system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0[protoc] ) !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 ) " DEPEND=" @@ -38,10 +40,6 @@ DEPEND=" " RDEPEND=">=virtual/jre-1.8:*" -PATCHES=( - "${FILESDIR}/protobuf-java-3.26.0-unittest.protos.patch" -) - JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" JAVA_JAR_FILENAME="protobuf.jar" JAVA_RESOURCE_DIRS="java/core/src/main/resources" @@ -60,33 +58,22 @@ run-protoc() { 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 + if ! use system-protoc; then cmake_src_prepare fi java-pkg-2_src_prepare - mkdir "${JAVA_RESOURCE_DIRS}" || die - # https://github.com/protocolbuffers/protobuf/blob/v26.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/v26.0/java/core/generate-sources-build.xml + # https://github.com/protocolbuffers/protobuf/blob/v28.1/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.java_source.dir}:java/core/src:' \ + -e 's:${protobuf.java_source.dir}:java/core/src/main/resources:' \ -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/v26.0/java/core/generate-test-sources-build.xml + # https://github.com/protocolbuffers/protobuf/blob/v28.1/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:' \ @@ -106,17 +93,13 @@ src_configure() { -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_ABSL_PROVIDER=package ) - if use system-protoc; then - : - else + if ! use system-protoc; then cmake_src_configure fi } src_compile() { - if use system-protoc; then - : - else + if ! use system-protoc; then cmake_src_compile fi @@ -129,12 +112,15 @@ src_compile() { } src_test() { - # https://github.com/protocolbuffers/protobuf/blob/v26.0/java/core/pom.xml#L63-L71 + # https://github.com/protocolbuffers/protobuf/blob/v28.1/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" + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-${TV}.jar:testdata.jar" + + # google/protobuf/java_features.proto: File not found. + cp {java/core/src/main/resources,src}/google/protobuf/java_features.proto || die einfo "Running protoc on first part of generate-test-sources-build.xml" run-protoc @test-sources-build-1 \ @@ -144,6 +130,10 @@ src_test() { run-protoc @test-sources-build-2 \ || die "run-protoc test-sources-build-2 failed" + # java/core/src/test/java/editions_unittest/TestDelimited.java:2867: + # error: package editions_unittest.MessageImport does not exist + rm java/core/src/test/java/com/google/protobuf/TextFormatTest.java || die + einfo "Running tests" # Invalid test class 'map_test.MapInitializationOrderTest': # 1. Test class should have exactly one public constructor diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest index 85413229dd93..b9d0d34f0f66 100644 --- a/dev-java/qdox/Manifest +++ b/dev-java/qdox/Manifest @@ -1,2 +1,3 @@ +DIST jflex-1.6.1.jar 1050749 BLAKE2B 71c68bf368a239217cbf928a7c6fbf7325cc069beddfaf92fbad3f0542bf83aa5606b2e15cfb4bdbd62a54c53d8439773ba3a7f60370ef5e2501ffe2561f9945 SHA512 882e73231b6e4f12e746282bac894e79dd3ee6fcfd0317a988709f3a3b472634415031209aa96c200c65ce382c90b5dff3f6d31d5e39c2feaff90dcf30a142f4 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5 DIST qdox-2.0.1.tar.gz 528305 BLAKE2B ff2f4b59d650b93a466eae6cc69239b059f7786ea609c18c56414e7e849d711d5316664a376b2c2c6e0021a21e7577cc21c9f5cfd215c4af612100a4c81da758 SHA512 db9d9ed8e8cf38c74e35be493aebcca54ba9d2c43a92c066d1964777293ad3af8e3212fcb8c20e9453b93e9bbe868c988dab69f936e7df41450183ce385137fa diff --git a/dev-java/qdox/metadata.xml b/dev-java/qdox/metadata.xml index f00a4317cac4..fe50d6ed9393 100644 --- a/dev-java/qdox/metadata.xml +++ b/dev-java/qdox/metadata.xml @@ -12,4 +12,7 @@ <upstream> <remote-id type="github">paul-hammant/qdox</remote-id> </upstream> + <use> + <flag name="ant-task">Build the ant-task</flag> + </use> </pkgmetadata> diff --git a/dev-java/qdox/qdox-1.12.1-r4.ebuild b/dev-java/qdox/qdox-1.12.1-r5.ebuild index cf1dc1eeb7d5..a4419f6cf68e 100644 --- a/dev-java/qdox/qdox-1.12.1-r4.ebuild +++ b/dev-java/qdox/qdox-1.12.1-r5.ebuild @@ -11,31 +11,35 @@ inherit java-pkg-2 DESCRIPTION="Parser for extracting class/interface/method definitions" HOMEPAGE="https://github.com/codehaus/qdox" SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${PN}-${PV}" LICENSE="Apache-2.0" SLOT="1.12" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos" +IUSE="ant-task" +REQUIRED_USE="test? ( ant-task )" -S="${WORKDIR}/${PN}-${PN}-${PV}" - -CDEPEND=">=dev-java/ant-1.10.14-r3:0" - -DEPEND=">=virtual/jdk-1.8:* +DEPEND=" + >=virtual/jdk-1.8:* dev-java/byaccj:0 - >=dev-java/jflex-1.6.1:0 + dev-java/jflex:0 dev-java/jmock:1.0 + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) test? ( dev-java/junit:0 ) - ${CDEPEND}" +" -RDEPEND=">=virtual/jre-1.8:* - ${CDEPEND}" +RDEPEND=" + >=virtual/jre-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) +" PATCHES=( "${FILESDIR}/jflex-1.6.1.patch" ) src_prepare() { - default + default #780585 + java-pkg-2_src_prepare if ! use test ; then rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java @@ -52,12 +56,18 @@ src_compile() { # create jar mkdir -p build/classes || die - local cp="$(java-pkg_getjars --build-only ant,jmock-1.0)" + local cp="$(java-pkg_getjars --build-only jmock-1.0)" if use test ; then cp="${cp}:$(java-pkg_getjars --build-only junit)" fi + if use ant-task ; then + cp="${cp}:$(java-pkg_getjars --build-only ant)" + else + rm src/java/com/thoughtworks/qdox/ant/AbstractQdoxTask.java || die + fi + ejavac -sourcepath . -d build/classes -classpath "${cp}" \ $(find . -name "*.java") || die "Cannot compile sources" diff --git a/dev-java/qdox/qdox-1.12.1-r6.ebuild b/dev-java/qdox/qdox-1.12.1-r6.ebuild new file mode 100644 index 000000000000..a06037118b89 --- /dev/null +++ b/dev-java/qdox/qdox-1.12.1-r6.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.thoughtworks.qdox:qdox:1.12.1" + +inherit java-pkg-2 + +DESCRIPTION="Parser for extracting class/interface/method definitions" +HOMEPAGE="https://github.com/codehaus/qdox" +SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz + x86? ( https://repo1.maven.org/maven2/de/jflex/jflex/1.6.1/jflex-1.6.1.jar )" +S="${WORKDIR}/${PN}-${PN}-${PV}" + +LICENSE="Apache-2.0" +SLOT="1.12" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos" +IUSE="ant-task" +REQUIRED_USE="test? ( ant-task )" + +DEPEND=" + >=virtual/jdk-1.8:* + dev-java/byaccj:0 + dev-java/jmock:1.0 + !x86? ( dev-java/jflex:0 ) + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) + test? ( dev-java/junit:0 ) +" + +RDEPEND=" + >=virtual/jre-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) +" + +PATCHES=( + "${FILESDIR}/jflex-1.6.1.patch" +) + +src_unpack() { + unpack "${P}.tar.gz" + use x86 && cp "${DISTDIR}/jflex-1.6.1.jar" "${WORKDIR}" +} + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + + if ! use test ; then + rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java + rm -rf src/java/com/thoughtworks/qdox/junit + rm -rf src/test + fi +} + +src_compile() { + # https://bugs.gentoo.org/778416 - for x86 we provide the precompiled jflex + if use x86; then + "$(java-config -J)" -cp "${WORKDIR}/jflex-1.6.1.jar" jflex.Main \ + src/grammar/lexer.flex --skel src/grammar/skeleton.inner -d src/java/com/thoughtworks/qdox/parser/impl/ || die + else + jflex \ + src/grammar/lexer.flex --skel src/grammar/skeleton.inner -d src/java/com/thoughtworks/qdox/parser/impl/ || die + fi + byaccj -v -Jnorun \ + -Jnoconstruct \ + -Jclass=Parser \ + -Jsemantic=Value \ + -Jpackage=com.thoughtworks.qdox.parser.impl \ + src/grammar/parser.y || die + mv Parser.java src/java/com/thoughtworks/qdox/parser/impl/ || die + + # create jar + mkdir -p build/classes || die + + local cp="$(java-pkg_getjars --build-only jmock-1.0)" + + if use test ; then + cp="${cp}:$(java-pkg_getjars --build-only junit)" + fi + + if use ant-task ; then + cp="${cp}:$(java-pkg_getjars --build-only ant)" + else + rm src/java/com/thoughtworks/qdox/ant/AbstractQdoxTask.java || die + fi + + ejavac -sourcepath . -d build/classes -classpath "${cp}" \ + $(find . -name "*.java") || die "Cannot compile sources" + + mkdir dist || die + cd build/classes || die + jar -cvf "${S}"/dist/${PN}.jar com || die "Cannot create JAR" + + # generate javadoc + if use doc ; then + cd "${S}" + mkdir javadoc || die + javadoc -d javadoc -sourcepath src/java -subpackages com -classpath "${cp}" + fi +} + +src_test() { + java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant,junit,jmock-1.0) \ + com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!" +} + +src_install() { + java-pkg_dojar dist/${PN}.jar + + use source && java-pkg_dosrc src/java/com + use doc && java-pkg_dojavadoc javadoc +} diff --git a/dev-java/qdox/qdox-2.0.1.ebuild b/dev-java/qdox/qdox-2.0.1.ebuild index 0588a2ec7649..f046b3330bd9 100644 --- a/dev-java/qdox/qdox-2.0.1.ebuild +++ b/dev-java/qdox/qdox-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,10 +12,11 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Parser for extracting class/interface/method definitions" HOMEPAGE="https://github.com/paul-hammant/qdox" SRC_URI="https://github.com/paul-hammant/qdox/archive/qdox-${PV}.tar.gz" +S="${WORKDIR}/qdox-${P}" LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ppc64 ~ppc-macos ~x64-macos" DEPEND=" dev-java/jflex:0 @@ -28,8 +29,6 @@ DEPEND=" RDEPEND=">=virtual/jre-1.8:*" BDEPEND="dev-java/byaccj:0" -S="${WORKDIR}/qdox-${P}" - JAVA_AUTOMATIC_MODULE_NAME="com.thoughtworks.qdox" JAVA_SRC_DIR="src/main/java" JAVA_CLASSPATH_EXTRA="jflex" diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch index 366bb78c2cba..9ed045fef250 100644 --- a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch +++ b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch @@ -16,10 +16,6 @@ https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b9 Bug: https://bugs.gentoo.org/831394 ---- -Description: Fixes the build failure with Java 10 -Author: Emmanuel Bourg <ebourg@apache.org> -Forwarded: no --- a/Makefile.am +++ b/Makefile.am @@ -111,11 +111,6 @@ diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch index a00ed96f7e5a..b734ac7ffd25 100644 --- a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch +++ b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch @@ -5,12 +5,6 @@ Subject: [PATCH] Fix invalid Javadoc syntax that leads to errors Bug: https://bugs.gentoo.org/642030 Signed-off-by: Yuan Liao <liaoyuan@gmail.com> ---- - src/gnu/io/RXTXPort.java | 50 ++++++++++++++++++++++------------------ - 1 file changed, 27 insertions(+), 23 deletions(-) - -diff --git a/src/gnu/io/RXTXPort.java b/src/gnu/io/RXTXPort.java -index 622a6a8..77a23ea 100644 --- a/src/gnu/io/RXTXPort.java +++ b/src/gnu/io/RXTXPort.java @@ -1732,7 +1732,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch index 1337cce3c546..2d060c338429 100644 --- a/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch +++ b/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch @@ -4,11 +4,6 @@ https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b9 Bug: https://bugs.gentoo.org/550534 ---- -From: tony mancill <tmancill@debian.org> -Forwarded: no -Description: use format specifiers in fprintf statements for hardening flags - --- a/src/SerialImp.c +++ b/src/SerialImp.c @@ -5108,7 +5108,7 @@ diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch index 1e4ff4af57b7..9a69c64029db 100644 --- a/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch +++ b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch @@ -1,5 +1,5 @@ ---- src/lfd/lockdaemon.c.orig 2007-04-26 06:26:07.000000000 +0100 -+++ src/lfd/lockdaemon.c 2016-02-17 20:41:09.137509089 +0000 +--- src/lfd/lockdaemon.c.orig ++++ src/lfd/lockdaemon.c @@ -69,6 +69,7 @@ #include <errno.h> #include <signal.h> diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch new file mode 100644 index 000000000000..b56fe43092d0 --- /dev/null +++ b/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch @@ -0,0 +1,10 @@ +--- a/src/SerialImp.c ++++ b/src/SerialImp.c +@@ -146,6 +146,7 @@ + #ifdef LIBLOCKDEV + #include <lockdev.h> + #endif /* LIBLOCKDEV */ ++#include <sys/sysmacros.h> + + extern int errno; + diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild index 2d39447cb63b..460474c3ba23 100644 --- a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild +++ b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -46,6 +46,7 @@ src_prepare() { eapply "${FILESDIR}/${P}-format-security.patch" eapply "${FILESDIR}/${P}-fix-invalid-javadoc.patch" eapply "${FILESDIR}/${P}-fix-for-java-10+.patch" + eapply "${FILESDIR}/${P}-missing-include.patch" eapply_user rm acinclude.m4 || die diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest index 4f96b04522b3..38e8f07647f7 100644 --- a/dev-java/saxon/Manifest +++ b/dev-java/saxon/Manifest @@ -1,2 +1 @@ -DIST saxon6-5-5.zip 3346162 BLAKE2B 63d49545d101c3b595ff3f3db6d781158b8a51862ccdc294e782ac0935010a841405fb21663bd35853042c53548991dfefa7f789be292fe8497a29253c87ee09 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e diff --git a/dev-java/saxon/files/9.2-build.xml b/dev-java/saxon/files/9.2-build.xml deleted file mode 100644 index 3bd9a64d4fe5..000000000000 --- a/dev-java/saxon/files/9.2-build.xml +++ /dev/null @@ -1,72 +0,0 @@ -<!-- simple generic build file --> - -<project name="saxon" default="all" basedir="."> - - <!-- Properties --> - - <property name="name" value="saxon"/> - <property name="src" value="src"/> - <property name="build" value="build"/> - <property name="build.classes" value="${build}/classes"/> - <property name="build.doc" value="${build}/api"/> - <property name="build.lib" value="${build}/lib"/> - <property name="j2se.javadoc" value="http://java.sun.com/javase/@JDK@/docs/api"/> - <property name="jdom.javadoc" value="/usr/share/jdom-@JDOM@/api"/> - - <!-- Targets --> - - <!-- Prepare build directories --> - <target name="prepare"> - <mkdir dir="${src}"/> - <mkdir dir="${build}"/> - <mkdir dir="${build.classes}"/> - <mkdir dir="${build.lib}"/> - <mkdir dir="${build.doc}"/> - <copy todir="${src}"> - <fileset dir="." includes="com/**,org/**,net/**"/> - </copy> - </target> - - <!-- Kill all the created directories --> - <target name="clean"> - <delete dir="${build}"/> - <delete dir="${src}"/> - </target> - - <!-- Build classes --> - <target name="classes" depends="prepare"> - <javac srcdir="${src}" destdir="${build.classes}" encoding="ISO-8859-1"/> - </target> - - <!-- Build jar archives --> - - <target name="jar" depends="classes"> - <jar jarfile="${build.lib}/${name}.jar" - basedir="${build.classes}"> - <manifest> - <attribute name="Main-Class" value="net.sf.saxon.Transform"/> - </manifest> - </jar> - </target> - - <!-- Build the full JavaDocs --> - <target name="javadoc" depends="prepare"> - <javadoc sourcepath="${src}" - destdir="${build.doc}" - doctitle="${name} JavaDoc" - windowtitle="${name} JavaDoc" - package="true" - author="true" - version="true" - packagenames="net.sf.saxon.*,org.w3c.xsl.*" - encoding="ISO-8859-1" - > - <link href="${j2se.javadoc}"/> - <link href="${jdom.javadoc}"/> - </javadoc> - </target> - - <!-- Build everything --> - <target name="all" depends="jar,javadoc"/> - -</project> diff --git a/dev-java/saxon/files/9.2-edition.properties b/dev-java/saxon/files/9.2-edition.properties deleted file mode 100644 index bb5acee0b19c..000000000000 --- a/dev-java/saxon/files/9.2-edition.properties +++ /dev/null @@ -1,2 +0,0 @@ -config=net.sf.saxon.Configuration -platform=net.sf.saxon.java.JavaPlatform diff --git a/dev-java/saxon/metadata.xml b/dev-java/saxon/metadata.xml index 4a2440bdfc71..796069569107 100644 --- a/dev-java/saxon/metadata.xml +++ b/dev-java/saxon/metadata.xml @@ -8,4 +8,7 @@ <upstream> <remote-id type="sourceforge">saxon</remote-id> </upstream> + <use> + <flag name="ant-task">BUILD and register the ant-task</flag> + </use> </pkgmetadata> diff --git a/dev-java/saxon/saxon-6.5.5-r3.ebuild b/dev-java/saxon/saxon-6.5.5-r3.ebuild deleted file mode 100644 index 8dd6a5a954af..000000000000 --- a/dev-java/saxon/saxon-6.5.5-r3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc examples source" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Set of tools for processing XML documents" -HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/project/saxon/saxon6/${PV}/saxon${PV//./-}.zip" - -LICENSE="MPL-1.1" -SLOT="6.5" -KEYWORDS="amd64 x86" - -CP_DEPEND="dev-java/jdom:0" - -# Restricting to jdk:1.8 for following reason: -# src/org/w3c/dom/UserDataHandler.java:1: error: package exists in another module: java.xml -# package org.w3c.dom; -DEPEND="${CP_DEPEND} - virtual/jdk:1.8" - -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" - -BDEPEND="app-arch/unzip" - -JAVA_ENCODING="ISO-8859-1" -JAVA_SRC_DIR="src" - -src_unpack() { - unpack ${A} - unzip -qq source.zip -d src || die "failed to unpack" -} - -src_prepare() { - default - java-pkg_clean -} - -src_install() { - default - java-pkg-simple_src_install - use examples && java-pkg_doexamples samples -} diff --git a/dev-java/saxon/saxon-9.2.0.6-r4.ebuild b/dev-java/saxon/saxon-9.2.0.6-r4.ebuild deleted file mode 100644 index 1513e7c8fedb..000000000000 --- a/dev-java/saxon/saxon-9.2.0.6-r4.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="A XSLT and XQuery Processor" -HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/project/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV//./-}source.zip" -S="${WORKDIR}" - -LICENSE="MPL-1.0" -SLOT="9" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -CDEPEND=" - >=dev-java/ant-1.10.14-r3:0 - dev-java/dom4j:1 - dev-java/jdom:0 - dev-java/xom:0 -" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.8:*" - -BDEPEND="app-arch/unzip" - -# prepare eclass variables -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_CLASSPATH_TAGS="javac javadoc" - -src_prepare() { - default - - # Fedora-inspired removal. - - # deadNET. - rm -rv net/sf/saxon/dotnet || die - - # Depends on XQJ (javax.xml.xquery). - rm -rv net/sf/saxon/xqj || die - - # This requires a EE edition feature (com.saxonica.xsltextn). - rm -v net/sf/saxon/option/sql/SQLElementFactory.java || die - - # <major>.<minor> version - local version="$(ver_cut 1-2)" - - # generate build.xml with external javadoc links - sed -e "s:@JDK@:1.6:" \ - -e "s:@JDOM@:1:" \ - < "${FILESDIR}/${version}-build.xml" \ - > "${S}/build.xml" \ - || die "build.xml generation failed!" - - # prepare creates the dir for properties - eant prepare - - # properties - cp -v \ - "${FILESDIR}/${version}-edition.properties" \ - "${S}/build/classes/edition.properties" || die -} - -src_compile() { - local gcp="$(java-pkg_getjars dom4j-1,jdom,xom)" - gcp="${gcp}:$(java-pkg_getjar --build-only ant ant.jar)" - eant -Dgentoo.classpath="${gcp}" jar $(use_doc) -} - -src_install() { - java-pkg_dojar build/lib/${PN}.jar - - java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform - java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query - - java-pkg_register-ant-task - - use doc && java-pkg_dojavadoc build/api - - use source && java-pkg_dosrc src -} diff --git a/dev-java/saxon/saxon-9.2.0.6-r5.ebuild b/dev-java/saxon/saxon-9.2.0.6-r5.ebuild new file mode 100644 index 000000000000..f8d7b5719895 --- /dev/null +++ b/dev-java/saxon/saxon-9.2.0.6-r5.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A XSLT and XQuery Processor" +HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV//./-}source.zip" + +LICENSE="MPL-1.0" +SLOT="9" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" +IUSE="ant-task" + +BDEPEND="app-arch/unzip" +CP_DEPEND=" + dev-java/dom4j:1 + dev-java/jdom:0 + dev-java/xom:0 +" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 )" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 )" + +JAVA_ENCODING="iso-8859-1" +JAVA_RESOURCE_DIRS="resources" + +src_prepare() { + java-pkg-2_src_prepare + + # Fedora-inspired removal. + + # deadNET. + rm -rv net/sf/saxon/dotnet || die + + # Depends on XQJ (javax.xml.xquery). + rm -rv net/sf/saxon/xqj || die + + # This requires a EE edition feature (com.saxonica.xsltextn). + rm -v net/sf/saxon/option/sql/SQLElementFactory.java || die + + if use ant-task; then + JAVA_GENTOO_CLASSPATH+="ant" + else + rm net/sf/saxon/ant/AntTransform.java || die + fi + + mkdir resources || die + cat > "resources/edition.properties" <<-EOF + config=net.sf.saxon.Configuration + platform=net.sf.saxon.java.JavaPlatform + EOF +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform + java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query + use ant-task && java-pkg_register-ant-task +} diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest index 97b63d254284..4c6584dcde5b 100644 --- a/dev-java/scala-cli-bin/Manifest +++ b/dev-java/scala-cli-bin/Manifest @@ -1,15 +1,9 @@ -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-amd64-1.1.1.gz 33754319 BLAKE2B 91fb5e9b828a2c6c6dd984b421bb101ea1ae03c85d94eda14ba79433d29a88cb2850cb376c212f677c1b8167a0a21b320aeb0e4e63a29e6c8502d76babc1543d SHA512 1e0cd5eee280e208090961e4b6d216d472fef360f13e0f4e28412b9a52883d65c97e3fe70c8ce5cf96e6cd866f14b175454175be9df3bdc5c229fb2f121c925a -DIST scala-cli-amd64-1.2.1.gz 33851353 BLAKE2B 31c92901f970ec2c0a74cb45d94b98e6d8f282c175cf8deb1a806db4b6d2e9a8b2150bca9fc9e373948e5092bf4bb7d5d1145a133d3b1c234d3cbe383ff9a270 SHA512 169c81bee582c6144501e8bd5436bae0bd3447ed89856a4d4763d13d3083ad26d948729b71bea864986f2c676e50855b8fb036d3a69ed0a316e2c6af0f98ef5f DIST scala-cli-amd64-1.2.2.gz 33871512 BLAKE2B ef9328b26afb52ada07739539d560239d6ce2ffd72d1e353ce94d45c7358b6789aa0019804e249584ca497d5d15c96caab12eb31fab5b84a14162c00ca30c181 SHA512 02da0915ee140a129f622f973291c98c7dd7b7f16f5a2a5250ac825e09876b616a315fe5e6af43691f43870fa68234efeff73eadd4f6060d2d90fe937302eae7 -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-arm64-1.1.1.gz 33656505 BLAKE2B b943f370c9375fec5cec3c63628ecd9e416b569ec2d692422f217b2506c104a1c3bb415569581d68c9476bf892b4a087e7b95b2310955dd0f9af52edc90af2e9 SHA512 79836261613bafe4710c1d904ec39e88c1862b3021f7b37ac5004c6079c762e68550522fbb7240e48e7408f844f648ab92c12cb568ebc63bb3e01f1992a7eaf3 -DIST scala-cli-arm64-1.2.1.gz 33769006 BLAKE2B 4bc2c830d17e235a3eba7029bfd018ee4cd12f8ee27a3574b1c2195ab8ad22b79c452a0660fb55f1be99a610be1f4ea38f8e2de622f10277be7f5403b540778a SHA512 90a8f6b4ae2fa90dcdd3c88fdbbd1079db1cbbde80f496da8663223ad79dc4b499b6ae43835067d8fde945d4fb5ed079dec850f688b9d1b62602d186d426f7cb +DIST scala-cli-amd64-1.4.3.gz 34238734 BLAKE2B ac40427ebd664c147f3134d067143207a024f2fa96be06f452d3b037a5f9866f6d6624c31a5a6045e5d1b6d087c87a14d2a376e050e6d23a10ce66de544b5969 SHA512 09b2ca1615a3c090a195f41237aa448d3535555c976ff4abdade1b8569126794009fcab11bde2087fcfe72c5a7a72b7b74bea647eef3a941bd1af4fb584b5f9b +DIST scala-cli-amd64-1.5.0.gz 34334438 BLAKE2B 2369f8e4a27975e3bc3a646e9637f885016a7df08c1cbfd1874b2f07037b1452df5eda16fd64bc9182611aaa37e903392764a3cff19439e864cc3ee510e1c163 SHA512 53ec0a5a9079b40189391a7e2e6ef3d8bcf40ebe05af807fbe4bb3b8116975c21266d88eff87b5fc841dfd8584bb6fe8320583f19dbe1e24d0c550bdc086aea5 DIST scala-cli-arm64-1.2.2.gz 33766128 BLAKE2B d5b2d7ab8157f3874b1cfe0b0647ab30f5dd191337e575056eb758d52eda30871c54b20a08a1cda3e28c51afd744b4b8320aee6aef056b39b98f2534184739ba SHA512 004ca188e4ddd01c0e46277fa514b1c9bd061ea26d4318b8daff3ffaae5bb7cc9f4746509401da19774537c7e56f8a5a7da846cd4b5f90c61a3ab1f8d3ed0493 -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 -DIST scala-cli-non-native-1.1.1 7779964 BLAKE2B 08849ce4a6fbf1e6eb2e4fafd2e29522e535c0795d6f1acbcd25ec4523d14dcae4a746f3729786db8f62a3770e6fdbd78a76477b182b32945454ac19a2f8217c SHA512 61c2a1a325f83e19102cd2f5d6b89d37b9914d64f86da6218258f064a6a8e5ab927d28b278363316446611e2cbdc8e4687616ea2b001da00ecbafb4207eabeb2 -DIST scala-cli-non-native-1.2.1 7836408 BLAKE2B a7c191020a65a4420ef7cc9d8fe5f9c6d1548c1cfb14dea94c0d9a798f608c038083bb678bd1a4fbdc9bd3de58f02a11e970cfebec4ac755f7f12af21eeb4dbc SHA512 d889ad3fa96953423fc1d948b6e260f55ffc4234d6e9da05299afe0a6cbc2b66c42a7a65113f887d1bf41a699679d09e02aed6686150551d1e1171d7c1c7331b +DIST scala-cli-arm64-1.4.3.gz 34137841 BLAKE2B 0e8ed1f1777ac507315b7e8136b85fa1486c5817f8ae49205a7e53eebc15be0f3c90123418890ce1c96110534a962ead961aad0c6fd9230df0a5a6a70147cca3 SHA512 c81a3be8fdb2b396252f5c31b5fd9182864e6bfda14ab3a119d9922ef1e1834521781eaf935ba91d74ba24388e9bf9617e82ad2d61dfe88f845426a16b7b4e7f +DIST scala-cli-arm64-1.5.0.gz 34240198 BLAKE2B aadb5203d2b2e93e27b4408724c5ebfbfa3a1e14b9bd3f78ccefbd961063451dc16fc0374430088d981208614de82ddf538c0e04975adba46f997fbf71c0d915 SHA512 d5025e91057ba72e9a2aed177356c04c08cc10745c8614db44e7843e6825ec14c619d7c8e24154c168e485bb98ebfb234179fa4a50989c162bcf92d096413379 DIST scala-cli-non-native-1.2.2 7837019 BLAKE2B 799ed83805ba767b687cf9a041a3e23f008e20e3ca55b8c52a9361c0b2465141abb7c17ca7dca59c9307af5a5a07a0cfe0d8035eea14a2adf2580913d67d6a10 SHA512 40aa43ee601c52238989a81884b6acc7a023599abb561bed1c9d31dff6053eff0f3477097a228bc30aab4df22d81b10fbbb64b5557d3067b4715c821c4eacb3e +DIST scala-cli-non-native-1.4.3 8004147 BLAKE2B 79b37e21b4aa1335a766ff7a735cf6fd0ae47b054c246371cfe57dca601de9309abc92df60ccba9873bf112f03d61081397eb859754b3287d2f6712946988ab5 SHA512 6c032330c01b2f2730390ea83fbcd9259e498b65cb182c2cf20cec2674f3dac2262d746a8addbe8b856c34bded0805c23b9a6a59e345037ea0b546681ddc7596 +DIST scala-cli-non-native-1.5.0 8117168 BLAKE2B 9b55dec1e329c7242ff5cdcad65a77686498c6c5bf5b872473d18609e4fed59353121fc4e3df4d8c7466daa1590bb09b4c6fdbf5bddd80bcaeab541e31d426a1 SHA512 badf719bdd3d9a289ca1436ca83433ecd49ab9908158188b68682e2c8bcee9e69c0bf73d1791656ecc2d01fe560cc754ef0f5e965ea25a520d73c7f98db266b0 diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.0.4.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.0.4.ebuild deleted file mode 100644 index 67f4eefef2f4..000000000000 --- a/dev-java/scala-cli-bin/scala-cli-bin-1.0.4.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 - -UPSTREAM_PV=${PV/_/-} -UPSTREAM_PV=${UPSTREAM_PV/rc/RC} - -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${UPSTREAM_PV}/scala-cli - -> scala-cli-non-native-${UPSTREAM_PV} - ) ) - amd64? ( - https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz - -> scala-cli-amd64-${UPSTREAM_PV}.gz - ) - arm64? ( - https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz - -> scala-cli-arm64-${UPSTREAM_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 anyway, and having JRE -# in RDEPEND reduces the chances that scala-cli needs to install one -# for the user. -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-${UPSTREAM_PV} scala-cli || die - elif use arm64; then - mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die - else - mv scala-cli-non-native-${UPSTREAM_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.1.0.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild deleted file mode 100644 index d73c7e68ad79..000000000000 --- a/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 - -UPSTREAM_PV=${PV/_/-} -UPSTREAM_PV=${UPSTREAM_PV/rc/RC} - -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${UPSTREAM_PV}/scala-cli - -> scala-cli-non-native-${UPSTREAM_PV} - ) ) - amd64? ( - https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz - -> scala-cli-amd64-${UPSTREAM_PV}.gz - ) - arm64? ( - https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz - -> scala-cli-arm64-${UPSTREAM_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 anyway, and having JRE -# in RDEPEND reduces the chances that scala-cli needs to install one -# for the user. -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-${UPSTREAM_PV} scala-cli || die - elif use arm64; then - mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die - else - mv scala-cli-non-native-${UPSTREAM_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.2.2.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild index dc0659cfd5ec..d73c7e68ad79 100644 --- a/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild +++ b/dev-java/scala-cli-bin/scala-cli-bin-1.2.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.1.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.4.3.ebuild index dc0659cfd5ec..e89ddb52ce30 100644 --- a/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild +++ b/dev-java/scala-cli-bin/scala-cli-bin-1.4.3.ebuild @@ -25,11 +25,11 @@ SRC_URI=" ) " -KEYWORDS="~amd64 ~arm64" +S="${WORKDIR}" + LICENSE="Apache-2.0" SLOT="0" - -S="${WORKDIR}" +KEYWORDS="~amd64 ~arm64" # A JRE is not strictly required if native images of scala-cli are used # (amd64, arm64). However we may want a system JRE anyway, and having JRE diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.2.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.5.0.ebuild index dc0659cfd5ec..e89ddb52ce30 100644 --- a/dev-java/scala-cli-bin/scala-cli-bin-1.2.1.ebuild +++ b/dev-java/scala-cli-bin/scala-cli-bin-1.5.0.ebuild @@ -25,11 +25,11 @@ SRC_URI=" ) " -KEYWORDS="~amd64 ~arm64" +S="${WORKDIR}" + LICENSE="Apache-2.0" SLOT="0" - -S="${WORKDIR}" +KEYWORDS="~amd64 ~arm64" # A JRE is not strictly required if native images of scala-cli are used # (amd64, arm64). However we may want a system JRE anyway, and having JRE diff --git a/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild b/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6-r1.ebuild index 309ee2cc69c9..fb5680283e62 100644 --- a/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild +++ b/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,7 +25,7 @@ DEPEND=" " RDEPEND=" - ${CDP_EPEND} + ${CP_DEPEND} >=virtual/jre-1.8:* " diff --git a/dev-java/sparsebitset/Manifest b/dev-java/sparsebitset/Manifest index 170900e3d8e7..e1a04093f54e 100644 --- a/dev-java/sparsebitset/Manifest +++ b/dev-java/sparsebitset/Manifest @@ -1 +1,2 @@ +DIST SparseBitSet-1.3.tar.gz 1670241 BLAKE2B e9d8ff537b65e4c2be68d66f02595048381c4a2574e3bdc5d05602d440a57a6c7a96edb23581741a6800516e3d571dce8e016e0ce477300ce7ad08c3e81bcad2 SHA512 6851613df21bcdccb28c24535fac886d6ad74d6feb37dea477dff1711218ecf30093d90ff78becb1159c6bd570a7afbd8c86482d72a5af8f0864d6e443cd603b DIST sparsebitset-1.2.tar.gz 1669439 BLAKE2B abfd88fb21f72d22bbb1f7bff11bd2a9b4e2af84689cbe8013f27f1f138512ecf843a60b8c5c196b622d024614e7f197b349a6cd510eb1c17bd757f7c1a0d90d SHA512 0c7c182556240886e0732626561401aa8695fd46ba90e5e95c5b28c90abaf5f6fd4c3b791171cdde71f61111c6b08ae8f56de105779f71d0448635cbe3b0b247 diff --git a/dev-java/sparsebitset/sparsebitset-1.3.ebuild b/dev-java/sparsebitset/sparsebitset-1.3.ebuild new file mode 100644 index 000000000000..06c06a825139 --- /dev/null +++ b/dev-java/sparsebitset/sparsebitset-1.3.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.zaxxer:SparseBitSet:1.3" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="An efficient sparse bitset implementation for Java" +HOMEPAGE="https://github.com/brettwooldridge/SparseBitSet" +SRC_URI="https://github.com/brettwooldridge/SparseBitSet/archive/SparseBitSet-${PV}.tar.gz" +S="${WORKDIR}/SparseBitSet-SparseBitSet-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=">=virtual/jdk-1.8:* + test? ( dev-java/junit:4 )" +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="com.zaxxer.sparsebitset" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="src/test/java" diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch index 127f5e0a4b61..22b271671b8d 100644 --- a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch +++ b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch @@ -6,7 +6,7 @@ there are different space characters used in java 21 (narrow space) String expecting = "datetime: 7/5/05, 12:00 AM"; if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { expecting = "datetime: 7/5/05 12:00 AM"; -+ } else if ( javaVersion.startsWith("21") ) { ++ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) { + expecting = "datetime: 7/5/05, 12:00 AM"; } String result = st.render(); @@ -15,7 +15,7 @@ there are different space characters used in java 21 (narrow space) String expecting = " datetime: 7/5/05, 12:00 AM "; if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { expecting = " datetime: 7/5/05 12:00 AM "; -+ } else if ( javaVersion.startsWith("21") ) { ++ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) { + expecting = " datetime: 7/5/05, 12:00 AM "; } String result = st.render(); @@ -24,7 +24,7 @@ there are different space characters used in java 21 (narrow space) String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time "; if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT "; -+ } else if ( javaVersion.startsWith("21") ) { ++ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) { + expecting = " datetime: Tuesday, July 5, 2005, 12:00:00 AM Pacific Daylight Time "; } String result = st.render(); @@ -33,7 +33,7 @@ there are different space characters used in java 21 (narrow space) ST st = group.getInstanceOf("dateThing"); st.add("created", new GregorianCalendar(2005, 7 - 1, 5)); String expecting = " time: 12:00:00 AM "; -+ if ( javaVersion.startsWith("21") ) { ++ if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) { + expecting = " time: 12:00:00 AM "; + } String result = st.render(); diff --git a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild index dd01fef37fd3..0ed931834169 100644 --- a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild +++ b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild @@ -53,7 +53,10 @@ JAVA_TEST_SRC_DIR="${TARBALL_S}/test" JAVA_TEST_RESOURCE_DIRS=( "${TARBALL_S}/test/resources" ) DOCS=( "${TARBALL_S}/"{CHANGES.txt,README.md} ) -PATCHES=( "${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch" ) +PATCHES=( + "${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch" + "${FILESDIR}/stringtemplate-4.3.4-Java21+-TestRenderers.patch" +) src_prepare() { default #780585 @@ -65,10 +68,6 @@ src_prepare() { } src_test() { - local vm_version="$(java-config -g PROVIDES_VERSION)" - if ver_test "${vm_version}" -ge 21; then - eapply "${FILESDIR}/stringtemplate-4.3.4-Java21-TestRenderers.patch" - fi # Make sure no older versions of this slot are present in the classpath # https://bugs.gentoo.org/834138#c4 local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")" diff --git a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild index 3900e1d0a5c4..fb902a0a9f6b 100644 --- a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild +++ b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://java.net/projects/swingx-ws/" SRC_URI="https://downloads.sourceforge.net/bt747/Development/${MY_P}.zip" LICENSE="LGPL-2.1" SLOT="bt747" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" CP_DEPEND=" dev-java/jakarta-xml-soap-api:1 diff --git a/dev-java/swingx/metadata.xml b/dev-java/swingx/metadata.xml index 6021501589e0..6eb29ba4b9dc 100644 --- a/dev-java/swingx/metadata.xml +++ b/dev-java/swingx/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">arotenberg/swingx</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index bdc642795cb1..c5cc743a6940 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -12,3 +12,9 @@ DIST swt-4.30-gtk-linux-x86_64.zip 3856990 BLAKE2B 0ea29a5f286fb4bb362758629226b DIST swt-4.31-gtk-linux-aarch64.zip 4019864 BLAKE2B 597f9c2ce1382aacd4667c7d1fc350b2318d8b1577dfc32a0139efb9d26e7c32703a0fb2507876ef441c47901d46ba522ea40714f9b88f1d517e3d9d24c2416a SHA512 636e3a4e7adc21ab8ee3ecdc3f85bbd0ad5786836492cf0096f99177716043150b41807cc456f4813ebb1797092761bb227809e8594bf64155b438973cc84bfc DIST swt-4.31-gtk-linux-ppc64le.zip 4036590 BLAKE2B da9ad8a7e0bf168b024c4e1fbdbcc01154ec0d7e8b38b2912ba7edf1bf8239f05a9ce1f08790174158ebb788c9cc3adf754d13942fc8aa0fe9d4a53177a814ff SHA512 bf8f3f45b4229db383839a64b7d08294340ab2f0c623be8e382609b5ff9a59683229bb308d49480ffb01596ab050d45f97894fec99c0d4eb710e60c40b864531 DIST swt-4.31-gtk-linux-x86_64.zip 4039479 BLAKE2B 6f7e434acf57cd03dd5e938b1b1c578339b3d7817202681a15420ebdec3be10b95b1bf5eca6f1cf71de9a5a0c390d2d6ee903c2a71e8974e03987cc52322e44d SHA512 da61610ce00fc46893ec3ee6d5d7ed5cc59312002c6946a3748cff1a776af75bad0026512b412ef1622ca0bee124764ed8ee7f5f87364cff945b296feb86e74b +DIST swt-4.32-gtk-linux-aarch64.zip 3991281 BLAKE2B 99fece9547e801661bb65f699780eb95cb626efd78e1bd79dec15d5fb63e03805ab6c6f75b98648cfad194d800c11cbe6a3c23250f4c4084072aea2aa4cde10c SHA512 adf5d207ba35bfa43fad2c4c64d72a4b56e8830efa0f817b158ad0bd4508eca9c83c43ebebb843c4fb75cb33835a6490b8b0b2a993bfa3507b62fba50345607a +DIST swt-4.32-gtk-linux-ppc64le.zip 4028301 BLAKE2B 1ed2590ffe01836dc9209b8323db25204c157a829f4af10f20509c30f268c88e89a9e252aebd9a4a0d3337fa20b1a3d76040b768918f7a2f7c8a6313314d14b8 SHA512 713f762fab2d5eea125844912fafdc3eb42bfb76c2caac5612972714e07b66de0e2a71ae29a51c86b2ad76c32761842ad209f8b59c931ea727dc03b2161b40f2 +DIST swt-4.32-gtk-linux-x86_64.zip 4011746 BLAKE2B 5d2784f9a18684d539ea576560bb5fecbbf59960cbd8ce901c9b152df087decb2db28ebf9fbf12c710f6dde71583e9002ca0ac85d5ca7a7ce17286ad1666c5c8 SHA512 f4d511595cccf104cda35c6f314e3689508e18e5da85bb2e8bdd408d9b8d4ab3371e851b3b96ba0f835b3ff0a079c4ed887661e586ab0ce06a52abf69ba243be +DIST swt-4.33-gtk-linux-aarch64.zip 3929090 BLAKE2B 60cc67c7b197cb31c68622c2d78090a50b4d3eca9c8c5f919b230ebed8f65a588c941f32e89ed0126d5bb5558b664a61661535b158bc7b26928556768f83fb5c SHA512 5a01ffd19c62de4fc1d0df4dae7c93ba8235af7e00713f49cf9cb591843f891bb8151a33dd51bca45c31b068edf65b59a1826cec1a1f3b9d14366d30e7efd430 +DIST swt-4.33-gtk-linux-ppc64le.zip 3966353 BLAKE2B 0ab4a75ac1efdedfcacdd235f45b1b0de04ab762cf64957ca1761e2f6a7e1571e106b26ab08b9ecd600ddf89f2abcd151dcd236c303bfe7d8cfabbce2910b2b4 SHA512 8f54cce4e5ac9e0043c8e3861aeed193f919b7bc4291f5812a568fcf4206cf4875d14d9cd7836235414cbde6a837fe38a2a6380c7d50ca04d3aa366dab733d81 +DIST swt-4.33-gtk-linux-x86_64.zip 3950557 BLAKE2B 6cf4f48e32bcfa40082c08a78dd8d64e9454db3859533696c7cc7cd37639ac7df980d9cfd13abaa80e95e44ad619b96944387363d2fb93d7de34f5f25052bd54 SHA512 3211a5480b886c542f99e29b715b5b1221ba679b572f1de6ca68bdb7b06eec6863c68fbddb9b70d74f13e501c3d76a220c7c8b466031b6c0a25bba5c011f8a63 diff --git a/dev-java/swt/files/build.xml b/dev-java/swt/files/build.xml deleted file mode 100644 index ea775871bf09..000000000000 --- a/dev-java/swt/files/build.xml +++ /dev/null @@ -1,17 +0,0 @@ -<project name="SWT" default="jar" basedir="."> - <property name="src" location="."/> - <property name="build" location="build"/> - - <target name="init"> - <tstamp/> - <mkdir dir="${build}"/> - </target> - - <target name="compile" depends="init" description="Compile the SWT toolset"> - <javac srcdir="${src}" destdir="${build}"/> - </target> - - <target name="jar"> - <jar destfile="swt.jar" basedir="${build}"/> - </target> -</project> diff --git a/dev-java/swt/metadata.xml b/dev-java/swt/metadata.xml index c06386289922..2a7f473b5a30 100644 --- a/dev-java/swt/metadata.xml +++ b/dev-java/swt/metadata.xml @@ -12,7 +12,7 @@ </longdescription> <upstream> <bugs-to>https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Platform%38component=SWT</bugs-to> - <doc>https://wiki.eclipse.org/SWT</doc> + <doc>https://wiki.eclipse.org/SWT/</doc> <remote-id type="github">eclipse-platform/eclipse.platform.swt</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild deleted file mode 100644 index eb993b82f314..000000000000 --- a/dev-java/swt/swt-3.7.2-r3.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit java-pkg-2 java-ant-2 java-osgi toolchain-funcs - -MY_PV="${PV/_rc/RC}" -MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK based SWT Library" -HOMEPAGE="https://www.eclipse.org/" -SRC_URI=" - amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) - ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip ) - ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip ) - x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" - -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -SLOT="3.7" -KEYWORDS="amd64 ppc64 x86" -IUSE="cairo opengl" - -COMMON_DEPEND=" - >=dev-libs/atk-1.10.2 - >=dev-libs/glib-2.6 - >=x11-libs/gtk+-2.6.8:2 - x11-libs/libXtst - cairo? ( >=x11-libs/cairo-1.4.14 ) - opengl? ( - virtual/glu - virtual/opengl - )" -BDEPEND=" - app-arch/unzip - virtual/pkgconfig -" -DEPEND="${COMMON_DEPEND} - virtual/jdk:1.8 - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - >=x11-libs/libXtst-1.1.0" -RDEPEND="${COMMON_DEPEND} - >=virtual/jre-1.4" - -S="${WORKDIR}" - -# JNI libraries don't need SONAME, bug #253756 -QA_SONAME="usr/lib.*/libswt-.*.so" - -PATCHES=( - # Fix Makefiles to respect flags and work with --as-needed - "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch -) - -src_unpack() { - local DISTFILE=${A} - unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile" - unpack "./src.zip" - - # Cleanup the redirtied directory structure - rm -rf about_files/ || die -} - -src_prepare() { - # Replace the build.xml to allow compilation without Eclipse tasks - cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml" - mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" - - case ${ARCH} in - ppc|x86) eapply "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;; - *) eapply "${FILESDIR}"/${P}-gio_launch-URI.patch ;; - esac - - default -} - -src_compile() { - # Drop jikes support as it seems to be unfriendly with SWT - java-pkg_filter-compiler jikes - - local AWT_ARCH - local JAWTSO="libjawt.so" - if [[ $(tc-arch) == 'x86' ]] ; then - AWT_ARCH="i386" - elif [[ $(tc-arch) == 'ppc' ]] ; then - AWT_ARCH="ppc" - elif [[ $(tc-arch) == 'ppc64' ]] ; then - AWT_ARCH="ppc64" - else - AWT_ARCH="amd64" - fi - if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then - export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}" - elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then - export AWT_LIB_PATH="${JAVA_HOME}/jre/bin" - elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then - export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)" - else - eerror "${JAWTSO} not found in the JDK being used for compilation!" - die "cannot build AWT library" - fi - - # Fix the pointer size for AMD64 - [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64 - - local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" - - einfo "Building AWT library" - ${make} make_awt - - 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 - - einfo "Building JNI libraries" - eant compile - - einfo "Copying missing files" - cp -i "${S}/version.txt" "${S}/build/version.txt" || die - cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \ - "${S}/build/org/eclipse/swt/internal/" || die - - einfo "Packing JNI libraries" - eant jar -} - -src_install() { - swtArch=${ARCH} - use amd64 && swtArch=x86_64 - - sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die - use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF" - sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF" || die - use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF" - sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF" || die - java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0" - - java-pkg_sointo /usr/$(get_libdir) - java-pkg_doso *.so - - docinto html - dodoc about.html -} diff --git a/dev-java/swt/swt-3.7.2-r4.ebuild b/dev-java/swt/swt-3.7.2-r4.ebuild index dc1cb9be2255..18bc97088217 100644 --- a/dev-java/swt/swt-3.7.2-r4.ebuild +++ b/dev-java/swt/swt-3.7.2-r4.ebuild @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="3.7" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ppc64 x86" IUSE="cairo opengl" BDEPEND=" diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild deleted file mode 100644 index 4e117a49acf6..000000000000 --- a/dev-java/swt/swt-4.10-r2.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi - -MY_PV="${PV/_rc/RC}" -MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK based SWT Library" -HOMEPAGE="https://www.eclipse.org/" -SRC_URI=" - amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) - ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" - -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -SLOT="4.10" -KEYWORDS="amd64 ppc64" -IUSE="cairo opengl webkit" - -COMMON_DEP=" - >=dev-libs/atk-1.10.2 - >=dev-libs/glib-2.32 - >=x11-libs/gtk+-2.6.8:2 - x11-libs/libXtst - cairo? ( >=x11-libs/cairo-1.4.14 ) - opengl? ( - virtual/glu - virtual/opengl - ) - webkit? ( - net-libs/webkit-gtk:4 - )" -DEPEND="${COMMON_DEP} - >=virtual/jdk-1.8:*[-headless-awt] - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - >=x11-libs/libXtst-1.1.0" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8:*" -BDEPEND=" - app-arch/unzip - virtual/pkgconfig -" - -S="${WORKDIR}" - -# JNI libraries don't need SONAME, bug #253756 -QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so' - -PATCHES=( - "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch -) - -src_unpack() { - local DISTFILE=${A} - unzip -jq "${DISTDIR}"/${DISTFILE} swt.jar src.zip || die "Unable to extract distfile" - unpack "./src.zip" - - # Cleanup the redirtied directory structure - rm -rf about_files/ || die -} - -src_prepare() { - # Replace the build.xml to allow compilation without Eclipse tasks - cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml" - mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" - - # Apply patches - default - - # Define missing g_thread_supported() to be already started. - sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die - - # Webext is also in the library directory - sed -i 's|findResource([^,]\+|findResource("swt"|' \ - "${S}"/src/org/eclipse/swt/browser/WebKit.java || die -} - -src_compile() { - append-cflags -fcommon # https://bugs.gentoo.org/707838 - - # Drop jikes support as it seems to be unfriendly with SWT - java-pkg_filter-compiler jikes - - 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" - ${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 make_webkit2extension - fi - - einfo "Building JNI libraries" - eant compile - - einfo "Copying missing files" - cp -i "${S}/version.txt" "${S}/build/version.txt" || die - cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \ - "${S}/build/org/eclipse/swt/internal/" || die - unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d build || die - - einfo "Packing JNI libraries" - eant jar -} - -src_install() { - local swtArch=${ARCH} - use amd64 && swtArch=x86_64 - - sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die - remove_from_manifest() { - local subpkg=$1 - sed -i -e "/ org.eclipse.swt.internal.$subpkg; x-internal:=true,/d" "MANIFEST_TMP.MF" || die - } - use cairo || remove_from_manifest cairo - use opengl || remove_from_manifest opengl.glx - use webkit || remove_from_manifest webkit - java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0" - - java-pkg_sointo "/usr/$(get_libdir)/swt" - java-pkg_doso *.so - - dodoc about.html -} diff --git a/dev-java/swt/swt-4.10-r3.ebuild b/dev-java/swt/swt-4.10-r4.ebuild index da97a0a165ab..9c3211738446 100644 --- a/dev-java/swt/swt-4.10-r3.ebuild +++ b/dev-java/swt/swt-4.10-r4.ebuild @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.10" -KEYWORDS="~amd64 ~ppc64" +KEYWORDS="amd64 ppc64" IUSE="cairo opengl webkit" BDEPEND=" @@ -47,7 +47,8 @@ DEPEND="${COMMON_DEP} x11-libs/libXt x11-libs/libXtst" RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8:*" + >=virtual/jre-1.8:* + x11-libs/libX11" # JNI libraries don't need SONAME, bug #253756 QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so' diff --git a/dev-java/swt/swt-4.29.ebuild b/dev-java/swt/swt-4.29-r1.ebuild index 08361076b0b5..140b2c69263a 100644 --- a/dev-java/swt/swt-4.29.ebuild +++ b/dev-java/swt/swt-4.29-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 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 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}-202309031000" +MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202309031000" MY_P="${PN}-${MY_PV}" DESCRIPTION="GTK based SWT Library" @@ -44,7 +44,8 @@ DEPEND="${COMMON_DEP} x11-libs/libXt x11-libs/libXtst" RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8:*" + >=virtual/jre-1.8:* + x11-libs/libX11" BDEPEND=" app-arch/unzip virtual/pkgconfig diff --git a/dev-java/swt/swt-4.30-r1.ebuild b/dev-java/swt/swt-4.30-r2.ebuild index f0ea9b557f4b..3f0934da1e12 100644 --- a/dev-java/swt/swt-4.30-r1.ebuild +++ b/dev-java/swt/swt-4.30-r2.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}-202312010110" +MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202312010110" MY_P="${PN}-${MY_PV}" DESCRIPTION="GTK based SWT Library" @@ -45,7 +45,8 @@ DEPEND="${COMMON_DEP} x11-libs/libXtst" # error: pattern matching in instanceof is not supported in -source 11 RDEPEND="${COMMON_DEP} - >=virtual/jre-17:*" + >=virtual/jre-17:* + x11-libs/libX11" BDEPEND=" app-arch/unzip virtual/pkgconfig diff --git a/dev-java/swt/swt-4.31.ebuild b/dev-java/swt/swt-4.31-r1.ebuild index 5d3dfd9effdc..382a538ccff2 100644 --- a/dev-java/swt/swt-4.31.ebuild +++ b/dev-java/swt/swt-4.31-r1.ebuild @@ -50,7 +50,8 @@ DEPEND="${COMMON_DEP} x11-libs/libXtst" # error: pattern matching in instanceof is not supported in -source 11 RDEPEND="${COMMON_DEP} - >=virtual/jre-17:*" + >=virtual/jre-17:* + x11-libs/libX11" HTML_DOCS=( ../about.html ) diff --git a/dev-java/swt/swt-4.32.ebuild b/dev-java/swt/swt-4.32.ebuild new file mode 100644 index 000000000000..5e0f6d998c9b --- /dev/null +++ b/dev-java/swt/swt-4.32.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2024 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}-202406010610" +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 )" +S="${WORKDIR}/library" + +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +SLOT="4.32" +KEYWORDS="amd64 arm64 ppc64" +IUSE="cairo opengl webkit" + +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" +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:* + x11-libs/libX11" + +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 #780585 + 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 + cd .. || die + mkdir resources src || die "mkdir failed" + find org -type f -name '*.java' \ + | xargs \ + cp --parent -t src -v \ + || die "copying resources failed" + find org -type f ! -name '*.java' \ + | xargs \ + cp --parent -t resources -v \ + || die "copying resources failed" + 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/swt/swt-4.33.ebuild b/dev-java/swt/swt-4.33.ebuild new file mode 100644 index 000000000000..444346927d00 --- /dev/null +++ b/dev-java/swt/swt-4.33.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2024 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}-202409030240" +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 )" +S="${WORKDIR}/library" + +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +SLOT="4.33" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="cairo opengl webkit" + +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" +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:* + x11-libs/libX11" + +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 #780585 + 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 + cd .. || die + mkdir resources src || die "mkdir failed" + find org -type f -name '*.java' \ + | xargs \ + cp --parent -t src -v \ + || die "copying resources failed" + find org -type f ! -name '*.java' \ + | xargs \ + cp --parent -t resources -v \ + || die "copying resources failed" + 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/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest index 7aace8ac6336..b8af1b64ed64 100644 --- a/dev-java/tomcat-native/Manifest +++ b/dev-java/tomcat-native/Manifest @@ -1,4 +1,4 @@ -DIST tomcat-native-1.3.0-src.tar.gz 345276 BLAKE2B 73e8433e12bdd88036509f4ffbd2c0ed25b367567728829a56918d082627d43643865c492f4bc8eac4551e2ed82648ada71e6decfb45c173a856ab2fda6e01a5 SHA512 5a6c7337280774525c97e36e24d7d278ba15edd63c66cec1b3e5ecdc472f8d0535e31eac83cf0bdc68810eb779e2a118d6b4f6238b509f69a71d037c905fa433 -DIST tomcat-native-1.3.0-src.tar.gz.asc 833 BLAKE2B b7e05447643000ffda0d66143c199192b41843f10ae89874c353d613f612a6d481be3081aa971b640a3bedc6c903be7d052c418e2abc2d7d6db42924c7b3cf91 SHA512 9cfc137cd13086ccf421376a006164e6e6e14844636457db0cf7c0f699a1b1ceab28a52bd80da71dc9e190bdf84676abfdbe07a0cabecfc59b7845ac82a171e5 -DIST tomcat-native-2.0.7-src.tar.gz 538131 BLAKE2B ef973c830e3e3e04f4bf7bd711915b1ac5f28e34832edd0750117a5d6b00f9a7fa9e390858d23bfaeeb08ad825d7dcc1e95967c00d4ada96cac83377fca7bea6 SHA512 625b334271494f7c86c06d6a8c6d13c06d9d6094f65cccbdc8d3df13ee2aae4cb42ad326e20bcbf8a8f141240111778991882f9bf87793b09a2920433d6c8c85 -DIST tomcat-native-2.0.7-src.tar.gz.asc 833 BLAKE2B 081f40de6fdc5ad819a167e0150a2e03ab8d4fd679be0dbabac9a9f2aabffd2fa36fd6a9c764deefd419576dcda07bc1b22ea2f14c04eddbfa7f94e4834bec7e SHA512 16a96a3c3b55d258ad0820c30392f37643f433c563b74a983109492569d06a399471acc42c7f07b87b50bff8711bc10ed278bfa183807bcdde1355e6b8058605 +DIST tomcat-native-1.3.1-src.tar.gz 346588 BLAKE2B 3b979845dd10a0c74c7ed2e6404b217c7bdebf2d432ac904b50f8288cd3cf3b1489b4e5111ce02eca442c45deb805523062862225130386a6d47853cd972d788 SHA512 06951c67d2739ab9205a537d24345e13e4472f192602fc52015ea84612c6e2c9334404b30a82be7d1e7d4ce470ea9df8b1b8ca1a3b8674d82706ff432280724f +DIST tomcat-native-1.3.1-src.tar.gz.asc 833 BLAKE2B d7483efea5dc4d9cc069a667896950526e22a6b4b0ee1fd6739754196d1b9e84a2b16f766f68419faf2c3fcc87d1fa83c9985de7149849d4f761d2c5b7e45af7 SHA512 3550e38556dab5594aea469cd8ae43505deceeab25bf60ecd61c26ed1106ce88e35634f936cb36e7fc766f30b5c5f0f19dd01a1513ed219ae7f68c8c10e960f1 +DIST tomcat-native-2.0.8-src.tar.gz 471386 BLAKE2B 7fb5e3c4671e4b56bfa5eb546ac1f87fdf1e33b350533ffcadb9005c1f3054013d61d15f4212923d9ec9370d15fd2717e2b446c80818c82d83cd9f1497e321c4 SHA512 fd45533b9c34b008717d18ed49334c7286b93c849c487c1c42746f2998cc4a6ff0362e536a8b5124c6539847a92a9f7631c7638a21cd5d22134fe1a9bb0f0702 +DIST tomcat-native-2.0.8-src.tar.gz.asc 833 BLAKE2B b438034baf5191ce2af55087d1fcd55f196c3cfa75dc2c7fc9d1bfa8fa5b5289181dad6a02e55674e7d685482228df603478ba1f73a9b67169f50390cdd198a7 SHA512 64879cd6f02a6213a2b6cd102dc175d968a7c20bc821877e9f6f5bbaa11069e5cb672b584c47e3a7563a6c872d56646535a59e42331a2ad524c7f85e628085df diff --git a/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild index d560c27c933d..f4e9d9bd6779 100644 --- a/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild +++ b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild @@ -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" LICENSE="Apache-2.0" SLOT="0" +KEYWORDS="amd64 ~x86" IUSE="static-libs" DEPEND=" diff --git a/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild index 9507ee4750e0..7dbe994033c0 100644 --- a/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild +++ b/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild @@ -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" LICENSE="Apache-2.0" SLOT="2" +KEYWORDS="amd64 ~x86" IUSE="static-libs" DEPEND=" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild index 4cddc788557a..d782f8ef763d 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild @@ -1,38 +1,35 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source" -inherit java-pkg-2 java-ant-2 +inherit java-pkg-2 java-pkg-simple MY_P="apache-${P/-servlet-api/}-src" DESCRIPTION="Tomcat's Servlet API 2.3/JSP API 1.2 implementation" HOMEPAGE="https://tomcat.apache.org/" SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-4/v${PV}/src/${MY_P}.tar.gz" -DEPEND=">=virtual/jdk-1.8" -RDEPEND=">=virtual/jre-1.8" + +S="${WORKDIR}/${MY_P}/servletapi" + LICENSE="Apache-2.0" SLOT="2.3" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="" -S="${WORKDIR}/${MY_P}/servletapi" -src_unpack() { - unpack ${A} - cd "${S}" - - einfo "Removing bundled jars and classes" - find "${WORKDIR}/${MY_P}" '(' -name '*.class' -o -name '*.jar' ')' -delete -} - -EANT_BUILD_TARGET="all" - -src_install() { - java-pkg_dojar dist/lib/servlet.jar +DEPEND=">=virtual/jdk-1.8" +RDEPEND=">=virtual/jre-1.8" - use doc && java-pkg_dohtml -r dist/docs/* - use source && java-pkg_dosrc src/share/javax - dodoc dist/README.txt +JAVA_RESOURCE_DIRS="res/src/share" +JAVA_SRC_DIR="src/share" + +src_prepare() { + java-pkg-2_src_prepare + mkdir src/share/javax/servlet/{,jsp/}resources || die + mv src/share/dtd/web-app* src/share/javax/servlet/resources || die + mv src/share/dtd/* src/share/javax/servlet/jsp/resources || die + mkdir res || die + find src -type f ! -name '*.java' ! -name '*.gif' \ + | xargs cp --parent -t res || die } diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest index bafc24692cd9..7920653cd469 100644 --- a/dev-java/velocity/Manifest +++ b/dev-java/velocity/Manifest @@ -1,2 +1 @@ -DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb DIST velocity-2.3_p20240314.tar.gz 440967 BLAKE2B c5fcea7af49d6c46d5c0943efe82f3c04d921afc2c53201b97842ae71714e7035d075c147b3bea71e959db12dd970b7879ade73bbc23bab09a1fd262e21f2fc6 SHA512 9055e780d2a3c798bfe30e5c7859a7311c4984b551d7b2ffa68c57c076549326d0ddae31eabff8009ea021c749331d34c71eee8cab55599dea5f3c8dba841a02 diff --git a/dev-java/velocity/files/velocity-2.3-skipSecurityManager.patch b/dev-java/velocity/files/velocity-2.3-skipSecurityManager.patch deleted file mode 100644 index 3375bce00eac..000000000000 --- a/dev-java/velocity/files/velocity-2.3-skipSecurityManager.patch +++ /dev/null @@ -1,11 +0,0 @@ -bug #923612 ---- a/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java -+++ b/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java -@@ -58,7 +58,6 @@ public class VelTools66TestCase - Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); - - Velocity.init(); -- System.setSecurityManager(new TestSecurityManager()); - - } - diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild deleted file mode 100644 index fd0fb1074e25..000000000000 --- a/dev-java/velocity/velocity-2.3.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2024 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/apache/velocity-engine/archive/refs/tags/2.3.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild velocity-2.3.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.velocity:velocity-engine-core:2.3" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Apache Velocity is a general purpose template engine" -HOMEPAGE="https://velocity.apache.org" -SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1 -# org.apache.commons:commons-lang3:3.11 -> >=dev-java/commons-lang-3.11:3.6 -# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0 - -CDEPEND=" - >=dev-java/commons-io-2.8.0:1 - >=dev-java/commons-lang-3.11:3.6 - >=dev-java/slf4j-api-1.7.30:0 -" - -# Compile dependencies -# POM: pom.xml -# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4 -# test? org.hsqldb:hsqldb:2.5.1 -> !!!groupId-not-found!!! -# test? org.slf4j:slf4j-simple:1.7.30 -> >=dev-java/slf4j-simple-1.7.30:0 - -DEPEND=" - >=virtual/jdk-1.8:* - ${CDEPEND} - test? ( - dev-db/hsqldb:0 - >=dev-java/slf4j-simple-1.7.30:0 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND} -" - -BDEPEND=" - dev-java/javacc:0 -" - -S="${WORKDIR}/${PN}-engine-${PV}/${PN}-engine-core" -PATCHES=( "${FILESDIR}/velocity-2.3-skipSecurityManager.patch" ) - -JAVA_GENTOO_CLASSPATH="commons-io-1,commons-lang-3.6,slf4j-api" -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS="src/main/resources" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" - -JAVA_TEST_EXCLUDES=( - # org.junit.runners.model.InvalidTestClassError: Invalid test class, No runnable methods - "org.apache.velocity.test.RenderVelocityTemplateTest" - "org.apache.velocity.test.provider.TestNumber" - "org.apache.velocity.test.provider.TestProvider" - "org.apache.velocity.test.sql.TestDataSource" - "org.apache.velocity.test.misc.TestContext" - - # java.lang.IllegalArgumentException: Test class can only have one constructor - "org.apache.velocity.test.misc.TestLogger" - - # junit.framework.AssertionFailedError: Class org.apache.velocity.test.sql.BaseSQLTest has no public constructor TestCase(String name) or TestCase() - "org.apache.velocity.test.sql.BaseSQLTest" - - # requires configured jdbc - # junit.framework.AssertionFailedError: Exception in constructor: testSimpleTemplate (java.lang.NullPointerException - # junit.framework.AssertionFailedError: Exception in constructor: testNullTimestamp (java.lang.NullPointerException - # junit.framework.AssertionFailedError: Exception in constructor: testMacroInvocation (java.lang.NullPointerException - # junit.framework.AssertionFailedError: Exception in constructor: testRenderTool (java.lang.NullPointerException - "org.apache.velocity.test.sql.DataSourceResourceLoaderTestCase" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - - cp -v "${JAVA_SRC_DIR}-templates/org/apache/velocity/runtime/VelocityEngineVersion.java" \ - "${JAVA_SRC_DIR}/org/apache/velocity/runtime/VelocityEngineVersion.java" || die - - sed -i "s/\${project.version}/${PV}/g" \ - "${JAVA_SRC_DIR}/org/apache/velocity/runtime/VelocityEngineVersion.java" || die - - # fix paths for tests - sed -i \ - -e "s%System.getProperty(\"test.compare.dir\")%\"${S}/target/test-classes\"%g" \ - -e "s%System.getProperty(\"test.result.dir\")%\"${S}/results\"%g" \ - "${JAVA_TEST_SRC_DIR}/org/apache/velocity/test/TemplateTestBase.java" || die - - sed -i \ - -e 's/\${parser.basename}/Standard/g' \ - -e 's/\${parser.package}/org.apache.velocity.runtime.parser/g' \ - -e 's/\${parser.char.asterisk}/\*/g' \ - -e 's/\${parser.char.at}/\@/g' \ - -e 's/\${parser.char.dollar}/\$/g' \ - -e 's/\${parser.char.hash}/\#/g' \ - "${S}/src/main/parser/Parser.jjt" || die - - # File "StandardParserTreeConstants.java" does not exist. Will create one. - # File "StandardParserVisitor.java" does not exist. Will create one. - # File "JJTStandardParserState.java" does not exist. Will create one. - jjtree -GRAMMAR_ENCODING=UTF-8 \ - -JDK_VERSION=1.8 \ - -BUILD_NODE_FILES=false \ - -MULTI=true \ - -NODE_PACKAGE=org.apache.velocity.runtime.parser.node \ - -NODE_USES_PARSER=true \ - -STATIC=false \ - -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node" \ - "${S}/src/main/parser/Parser.jjt" \ - || die "Code generation via jjtree failed" - - javacc -GRAMMAR_ENCODING=UTF-8 \ - -JDK_VERSION=1.8 \ - -STATIC=false \ - -DEBUG_PARSER=false \ - -DEBUG_LOOKAHEAD=false \ - -DEBUG_TOKEN_MANAGER=false \ - -BUILD_PARSER=true \ - -TOKEN_MANAGER_USES_PARSER=true \ - -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}" \ - "${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node/Parser.jj" \ - || die "Parser.java code generation via javacc failed" - - # Avoid "error: duplicate class: org.apache.velocity.runtime.parser...." - rm -v "${JAVA_SRC_DIR}/CharStream.java" || die "cannot remove 'CharStream.java'" - rm -v "${JAVA_SRC_DIR}/ParseException.java" || die "cannot remove 'ParseException.java'" -} diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild index 9587957bd84b..948e71a0394d 100644 --- a/dev-java/velocity/velocity-2.3_p20240314.ebuild +++ b/dev-java/velocity/velocity-2.3_p20240314.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-engine-${MY_COMMIT}/${PN}-engine-core" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" CP_DEPEND=" >=dev-java/commons-io-2.8.0:1 diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest index 47e6dc2239af..e3c52c83c178 100644 --- a/dev-java/xalan/Manifest +++ b/dev-java/xalan/Manifest @@ -1,2 +1,3 @@ +DIST java-cup-bin-11b-20160615.tar.gz 144985 BLAKE2B fba4109a4999d6f5a678265d2374bc305fc9fe8b724a0af5fb60402d612904447ebe9285e8672652c492cd2e630752eb9ffeb8017be1dea081ddcb30f815a687 SHA512 edba197bfe0638838ad2e9cb7342ffcbbec4f2a71436fc4bf82ff0e1987fe9f490849c644945cf7e7deade9f12f458e019410a2d9c1f22c0182137fe5ad2349f 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.3-r2.ebuild b/dev-java/xalan/xalan-2.7.3-r2.ebuild new file mode 100644 index 000000000000..a46680273ed9 --- /dev/null +++ b/dev-java/xalan/xalan-2.7.3-r2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 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 ) + x86? ( https://www2.cs.tum.edu/projects/cup/releases/java-cup-bin-11b-20160615.tar.gz )" + +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" + +# https://bugs.gentoo.org/936274 - for x86 we provide the precompiled java-cup +COMMON_DEPEND=" + !x86? ( dev-java/javacup:0 ) +" + +CP_DEPEND=" + dev-java/bcel:0 + ~dev-java/xalan-serializer-${PV}:${SLOT} + dev-java/xerces:2 +" + +DEPEND=" + ${COMMON_DEPEND} + ${CP_DEPEND} + >=virtual/jdk-1.8:* +" + +RDEPEND=" + ${COMMON_DEPEND} + ${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_unpack() { + if use verify-sig; then + verify-sig_verify_detached \ + "${DISTDIR}/xalan-j_${PV//./_}-src.tar.gz" \ + "${DISTDIR}/xalan-j_${PV//./_}-src.tar.gz.asc" + fi + unpack "xalan-j_${PV//./_}-src.tar.gz" + use x86 && unpack java-cup-bin-11b-20160615.tar.gz +} + +src_prepare() { + java-pkg-2_src_prepare + # serializer is packaged separately + rm -r src/org/apache/xml/serializer || die "cannot remove serializer" + use !x86 && JAVA_GENTOO_CLASSPATH="javacup" + use x86 && JAVA_GENTOO_CLASSPATH_EXTRA="${WORKDIR}/java-cup-11b-runtime.jar:${WORKDIR}/java-cup-11b.jar" +} + +src_install() { + java-pkg-simple_src_install + if use x86; then + java-pkg_newjar "${WORKDIR}/java-cup-11b-runtime.jar" java-cup-runtime.jar + java-pkg_newjar "${WORKDIR}/java-cup-11b.jar" java-cup.jar + java-pkg_regjar "${ED}/usr/share/${PN}/lib/java-cup-runtime.jar" + java-pkg_regjar "${ED}/usr/share/${PN}/lib/java-cup.jar" + fi +} diff --git a/dev-java/xpp2/xpp2-2.1.10-r3.ebuild b/dev-java/xpp2/xpp2-2.1.10-r3.ebuild deleted file mode 100644 index c4b5aaa7a88b..000000000000 --- a/dev-java/xpp2/xpp2-2.1.10-r3.ebuild +++ /dev/null @@ -1,73 +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" -MAVEN_ID="pull-parser:pull-parser:2" - -inherit java-pkg-2 java-ant-2 - -MY_PN="PullParser" -MY_P="${MY_PN}${PV}" - -DESCRIPTION="A streaming pull XML parser used to quickly process input elements" -HOMEPAGE="https://web.archive.org/web/20130904163229/http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/" -SRC_URI="https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/${MY_P}.tgz" - -LICENSE="Apache-1.1 IBM" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="test" - -# Some failures, partly because we haven't patched Xerces but probably -# also because this software is ancient. :( -RESTRICT="test" - -CDEPEND="dev-java/xerces:2" -DEPEND=">=virtual/jdk-1.8:* - test? ( dev-java/junit:4 ) - ${CDEPEND}" -RDEPEND=">=virtual/jre-1.8:* - ${CDEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${P}-fix-java5+.patch" -) - -EANT_GENTOO_CLASSPATH="xerces-2" -EANT_EXTRA_ARGS="-Dx2_present=true -Djunit.present=true" -EANT_BUILD_TARGET="intf intf_jar impl x2impl" -EANT_DOC_TARGET="api" -EANT_TEST_TARGET="junit" - -src_prepare() { - default - - rm -r build/ lib/ || die - - # Our usual rewriting stomps over the existing classpath, which - # isn't helpful here. - sed -i -r \ - -e 's/\bclasspath="/\0${gentoo.classpath}:/g' \ - -e 's/\$\{java\.class\.path\}/${gentoo.classpath}/g' \ - build.xml || die -} - -src_install() { - local suffix - - for suffix in "" -intf -standard -x2; do - java-pkg_newjar build/lib/${MY_PN}${suffix}-${PV}.jar ${MY_PN}${suffix}.jar - done - - dodoc README.html - use doc && java-pkg_dojavadoc doc/api - use source && java-pkg_dosrc $(find src/java -name org -o -name javax) -} - -src_test() { - java-pkg-2_src_test -} diff --git a/dev-java/xpp2/xpp2-2.1.10-r4.ebuild b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild new file mode 100644 index 000000000000..cc77774f1703 --- /dev/null +++ b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="pull-parser:pull-parser:2" + +inherit java-pkg-2 java-pkg-simple + +MY_PN="PullParser" +MY_P="${MY_PN}${PV}" + +DESCRIPTION="A streaming pull XML parser used to quickly process input elements" +HOMEPAGE="https://web.archive.org/web/20130904163229/http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/" +SRC_URI="https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/${MY_P}.tgz" +S="${WORKDIR}/${MY_P}" + +LICENSE="Apache-1.1 IBM" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +# Some failures, partly because we haven't patched Xerces but probably +# also because this software is ancient. :( +RESTRICT="test" + +CP_DEPEND="dev-java/xerces:2" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + test? ( dev-java/junit:4 )" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +PATCHES=( "${FILESDIR}/${P}-fix-java5+.patch" ) + +JAVADOC_ARGS="-source 8" +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR="src/java" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean + mkdir res || die + cp -r src/java/impl/factory/META-INF res || die + touch "res/PullParser${PV}_VERSION" || die + + mv src/{java/,}tests || die + mv src/{java/,}samples || die +} + +src_compile() { + java-pkg-simple_src_compile + rm xpp2.jar || die + JAVA_JAR_FILENAME="PullParser.jar" + + cp -r target/classes parser || die + rm -r parser/org/gjt/xpp/x2impl || die + rm parser/org/gjt/xpp/impl/PullParserFactorySmallImpl.class || die + jar cvf PullParser.jar -C parser . || die + + cp -r target/classes standard || die + rm -r standard/{javax,org/xml} || die + rm -r standard/org/gjt/xpp/{jaxp11,sax2,x2impl} || die + rm standard/org/gjt/xpp/impl/PullParserFactorySmallImpl.class || die + jar cvf PullParser-standard.jar -C standard . || die + + cp -r target/classes intf || die + rm -r intf/{javax,org/xml,org/gjt/xpp/{impl,jaxp11,sax2,x2impl}} || die + rm -r intf/META-INF || die + jar cvf PullParser-intf.jar -C intf . || die + + cp -r target/classes x2 || die + rm -r x2/org/gjt/xpp/impl/{pullparser,tokenizer} || die + rm x2/org/gjt/xpp/impl/PullParserFactory* || die + jar cvf PullParser-x2.jar -C x2 . || die +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dojar PullParser-{standard,intf,x2}.jar +} diff --git a/dev-java/xz-java/metadata.xml b/dev-java/xz-java/metadata.xml index 4221e170cbc0..312995bd9c40 100644 --- a/dev-java/xz-java/metadata.xml +++ b/dev-java/xz-java/metadata.xml @@ -5,4 +5,7 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> + <upstream> + <remote-id type="github">tukaani-project/xz-java</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/xz-java/xz-java-1.9-r1.ebuild b/dev-java/xz-java/xz-java-1.9-r2.ebuild index 0b7ed480b07a..8d285914f327 100644 --- a/dev-java/xz-java/xz-java-1.9-r1.ebuild +++ b/dev-java/xz-java/xz-java-1.9-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -DEPEND=">=virtual/jdk-1.8:*" +DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" BDEPEND=" @@ -28,10 +28,15 @@ BDEPEND=" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lassecollin.asc" -JAVA_SRC_DIR="src/org" +JAVA_SRC_DIR="src9" DOCS=( README NEWS COPYING THANKS ) +src_prepare() { + java-pkg-2_src_prepare + mv src{,9}/org || die +} + src_install() { java-pkg-simple_src_install use examples && java-pkg_doexamples src/*Demo.java |