diff options
Diffstat (limited to 'dev-java')
566 files changed, 4586 insertions, 3337 deletions
diff --git a/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild b/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild index 9f8f2247f80d..378f8eb8372f 100644 --- a/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild +++ b/dev-java/angus-activation/angus-activation-1.0.0-r1.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: @@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" dev-java/jakarta-activation-api:2 diff --git a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild index 265decdfdc6f..b54e117c75c4 100644 --- a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild +++ b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.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 @@ -14,7 +14,7 @@ HOMEPAGE="http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/" SRC_URI="https://github.com/mojohaus/${MY_PN}/archive/${MY_PN}-parent-${PV}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild index 120a631bc481..fe75a3cfb79f 100644 --- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild +++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ppc64 x86" +KEYWORDS="amd64 ppc64" # Too many tests fail RESTRICT="test" diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild b/dev-java/ant-core/ant-core-1.10.14.ebuild deleted file mode 100644 index c69d378ddc71..000000000000 --- a/dev-java/ant-core/ant-core-1.10.14.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-pkg-2 - -DESCRIPTION="Compatibility link to ant-core for >=dev-java/ant-1.10.14" -HOMEPAGE="https://ant.apache.org/" -S="${WORKDIR}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=" - ~dev-java/ant-${PV}:0 - >=virtual/jdk-1.8:* -" -RDEPEND=">=virtual/jre-1.8:*" - -src_compile() { :; } - -src_install() { - java-pkg_regjar /usr/share/ant-core/lib/ant.jar -} diff --git a/dev-java/ant-core/metadata.xml b/dev-java/ant-core/metadata.xml deleted file mode 100644 index d0bcffb03628..000000000000 --- a/dev-java/ant-core/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <upstream> - <bugs-to>https://bz.apache.org/bugzilla/enter_bug.cgi?product=Ant</bugs-to> - <doc>https://ant.apache.org/manual/</doc> - <remote-id type="github">apache/ant</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild index 32e0a711eb11..da472003c39b 100644 --- a/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild +++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/apache-ivy-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ppc64 x86" +KEYWORDS="amd64 ppc64" PROPERTIES="test_network" RESTRICT="test" diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest index 4fdf2d20cd0a..8202ae31468b 100644 --- a/dev-java/ant/Manifest +++ b/dev-java/ant/Manifest @@ -1,2 +1,2 @@ -DIST apache-ant-1.10.14-src.tar.xz 3779488 BLAKE2B 40091c208c795d03b8f34656594cbf6c414f345cdacf637ece89a19a3ab0373cd8d65c342e0c4603569f9120f8f99a0b2eae8df874e6183649b39d7b88c614b8 SHA512 52936dfceb808a11dc842d2dc957a031508689270b59a2a6e3589f40465f6fa1aae87b189737cdd83eadfaf41b0c3f1ba2579bbd07591153107a5a27422521bd -DIST apache-ant-1.10.14-src.tar.xz.asc 833 BLAKE2B 4f8b1bb8bbd6d77b6e9eedf86818d42bb448e1b394e00590163e96967e36fe8e8e73e3f4fbf3b5bd1dab51cf69a39b99409bd8604cb7695cd6ae875ff13344a9 SHA512 2b91eda436210247ba39b82ba8aa1859051cf9baaf8ac8b551052e7986aeaa03c8b594347b8a734e08d12d8e270e29bf89b814562550a418abd0d2393ad4ac66 +DIST apache-ant-1.10.15-src.tar.xz 3780456 BLAKE2B c157b488ac5f207daf5afcec3368395cacd44d82e0b8e19cbdf637e8ea43bafd340fcb13aede1292f7a0b31ae82a968831c51dabebfccf2fafb6479aa79f7dc4 SHA512 7513c0909abcc2ebcbb552ec97eaa35f476e57fec54022755d2e83d9d6df5295e0d75274e687208a4689a30592c19a0df041dff511dd3690627b1734ee2171c5 +DIST apache-ant-1.10.15-src.tar.xz.asc 833 BLAKE2B e8741004b141955c729778cb987034f133af174dfc07c75976c8eda13272703b9b6158c68594f54dfef47c0f546c43cc97176b2a9193263076251a75b2f12129 SHA512 3585f32ef230e502db6a376d6343c74eae390931ae6a5c842b668eda6fbce1557e5d400001bbb244544c186e9e51cae4c2c05ccd6ff38cdbb16899aff5d48659 diff --git a/dev-java/ant/ant-1.10.14-r3.ebuild b/dev-java/ant/ant-1.10.15.ebuild index e0ad3fce1fed..761a9636ddb9 100644 --- a/dev-java/ant/ant-1.10.14-r3.ebuild +++ b/dev-java/ant/ant-1.10.15.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/apache-${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="antlr bcel bsf commonslogging commonsnet imageio jai jakartamail javamail jdepend jmf jsch junit junit4 junitlauncher log4j oro regexp resolver swing testutil xalan xz" @@ -361,9 +361,6 @@ src_test() { src_install() { java-pkg_dojar ant.jar ant-launcher.jar - # Compatibility symlink, should be removed after transition period. - dosym -r /usr/share/ant{,-core}/lib/ant.jar - for task in "${ANT_TASKS[@]}"; do java-pkg_dojar "${task}.jar" java-pkg_register-ant-task --version "${PV}" "${task}" diff --git a/dev-java/antlr-runtime/antlr-runtime-3.5.3.ebuild b/dev-java/antlr-runtime/antlr-runtime-3.5.3.ebuild index 5a2591a02713..5b764b32461f 100644 --- a/dev-java/antlr-runtime/antlr-runtime-3.5.3.ebuild +++ b/dev-java/antlr-runtime/antlr-runtime-3.5.3.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: @@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/antlr/${PN}/${PV}/${P}-sources.jar" LICENSE="BSD" SLOT="3.5" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Common dependencies # POM: ${P}.pom diff --git a/dev-java/antlr-runtime/antlr-runtime-4.9.3.ebuild b/dev-java/antlr-runtime/antlr-runtime-4.9.3.ebuild index cf26c16eb71e..99f84e8023e7 100644 --- a/dev-java/antlr-runtime/antlr-runtime-4.9.3.ebuild +++ b/dev-java/antlr-runtime/antlr-runtime-4.9.3.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 @@ -18,7 +18,7 @@ SRC_URI="https://github.com/antlr/antlr4/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" LICENSE="BSD" SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" >=virtual/jdk-1.8:* 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 2bb054ab64c1..a8fd495c7da5 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 @@ -27,7 +27,7 @@ SRC_URI=" LICENSE="BSD" SLOT="3.5" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" CP_DEPEND=" ~dev-java/antlr-runtime-${PV}:${SLOT} diff --git a/dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild b/dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild index c45261fa0f91..df91be0dfc6b 100644 --- a/dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild +++ b/dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild @@ -27,7 +27,7 @@ S="${WORKDIR}/${MY_PN}4-${PV}" LICENSE="BSD" SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" CP_DEPEND=" ~dev-java/antlr-runtime-${PV}:${SLOT} diff --git a/dev-java/antlr/antlr-2.7.7-r9.ebuild b/dev-java/antlr/antlr-2.7.7-r10.ebuild index 3621f5776b75..10b9b6e1131d 100644 --- a/dev-java/antlr/antlr-2.7.7-r9.ebuild +++ b/dev-java/antlr/antlr-2.7.7-r10.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -JAVA_PKG_IUSE="doc source" +JAVA_PKG_IUSE="doc examples source" MAVEN_ID="antlr:antlr:2.7.7" inherit java-pkg-2 java-pkg-simple @@ -11,23 +11,23 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="A parser generator for many languages" HOMEPAGE="https://www.antlr2.org/" SRC_URI="https://www.antlr2.org/download/${P}.tar.gz" +S="${WORKDIR}/${P}" LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="examples" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}/${P}" - +JAVA_MAIN_CLASS="antlr.Tool" JAVA_SRC_DIR="${S}/${PN}" DOCS=( CHANGES.txt README.txt ) src_prepare() { - default + default #780585 + java-pkg-2_src_prepare java-pkg_clean # Delete build files from examples. @@ -39,12 +39,8 @@ src_configure() { :; } src_install() { java-pkg-simple_src_install - java-pkg_dolauncher antlr --main antlr.Tool use doc && java-pkg_dohtml -r doc/* use examples && java-pkg_doexamples examples/java use source && java-pkg_dosrc antlr - - # https://bugs.gentoo.org/789582 - einstalldocs } diff --git a/dev-java/antlr/antlr-3.2-r2.ebuild b/dev-java/antlr/antlr-3.2-r2.ebuild index 9b58f9bff97e..cea7aa105420 100644 --- a/dev-java/antlr/antlr-3.2-r2.ebuild +++ b/dev-java/antlr/antlr-3.2-r2.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${P}" LICENSE="BSD" SLOT="3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RESTRICT="!test? ( test )" CP_DEPEND=">=dev-java/antlr-2.7.7-r7:0 diff --git a/dev-java/antlr/antlr-3.5.3.ebuild b/dev-java/antlr/antlr-3.5.3.ebuild index c3bec26d0400..d0a32d44e244 100644 --- a/dev-java/antlr/antlr-3.5.3.ebuild +++ b/dev-java/antlr/antlr-3.5.3.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,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="3.5" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" CP_DEPEND=" ~dev-java/antlr-runtime-${PV}:${SLOT} diff --git a/dev-java/antlr/antlr-4.9.3.ebuild b/dev-java/antlr/antlr-4.9.3.ebuild index 1050e440538e..50b53bbba0b2 100644 --- a/dev-java/antlr/antlr-4.9.3.ebuild +++ b/dev-java/antlr/antlr-4.9.3.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,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" CP_DEPEND=" ~dev-java/antlr-runtime-${PV}:${SLOT} diff --git a/dev-java/antunit/antunit-1.4.1-r1.ebuild b/dev-java/antunit/antunit-1.4.1-r1.ebuild index 5bdeed3d9cb0..ab1d74554301 100644 --- a/dev-java/antunit/antunit-1.4.1-r1.ebuild +++ b/dev-java/antunit/antunit-1.4.1-r1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/apache-ant-${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ant.apache.org.asc" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-ant )" diff --git a/dev-java/aopalliance/aopalliance-1.0-r3.ebuild b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild index 777a3412b445..8cd8ff2e5ac9 100644 --- a/dev-java/aopalliance/aopalliance-1.0-r3.ebuild +++ b/dev-java/aopalliance/aopalliance-1.0-r3.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 @@ -19,7 +19,7 @@ HOMEPAGE="http://aopalliance.sourceforge.net/" LICENSE="public-domain" SLOT="1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux" IUSE="" diff --git a/dev-java/apache-rat/apache-rat-0.15-r2.ebuild b/dev-java/apache-rat/apache-rat-0.15-r2.ebuild index 57fff834a4f4..628754f463cb 100644 --- a/dev-java/apache-rat/apache-rat-0.15-r2.ebuild +++ b/dev-java/apache-rat/apache-rat-0.15-r2.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64" CP_DEPEND=" >=dev-java/ant-1.10.14:0 diff --git a/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild b/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild index 942785e74192..5192f2886ea1 100644 --- a/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild +++ b/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/apiguardian-team/apiguardian/archive/r${PV}.tar.gz - LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest index 18b5f35167c0..1e9b4964dedf 100644 --- a/dev-java/asm/Manifest +++ b/dev-java/asm/Manifest @@ -1,2 +1 @@ -DIST asm-ASM_9_6.tar.bz2 1374579 BLAKE2B 621b19f1818ffdd451037af210ec7c3286e3dabdb1d6192157c2e6e8c101f599691cd4de57adf500f5413b4aaf4f808d6ac791e84626223a7be5672a17137670 SHA512 86b2db3e81c29c465d4128736f88ae3b73af8f312915921549d0acdb50a8d2c2c2beed5162af164b6e75278702af0c6f0a8d84b4133516eb4ac419520b7c764d -DIST asm-ASM_9_7.tar.bz2 1376322 BLAKE2B 397a884b257edfd61f67909390c8fe07880d5a295b51dd3982ebbe9b6f8fbac200c46913e6c18e4efdcc80f0e1f0b8463ca9d912484b466ca174b55919a1c259 SHA512 9b7f2d4895f105f75e2c42d8882b176dba32defb17d8da4bdedb2bfe4e5413b03c05a9694114d171aa9623e86a65a677a24ab16a47aef774342d56224400274f +DIST asm-ASM_9_7_1.tar.bz2 1378103 BLAKE2B f7da3a9c1bcf76398c9e9b9b86d60f8854e5248632a8b2d76605851e29ee1807713fb28c9e76012ec8f9444c44e3a151ed409cd120c34ab8d3495fdc9c84edcb SHA512 77ae76464eec97dbc8129c4a746d13f0d286d2033f909b65e0e34858e1785616b7bee22faa92128b91eb39cbd849e262efe574b73ed2859920add457d6422dd0 diff --git a/dev-java/asm/asm-9.6.ebuild b/dev-java/asm/asm-9.6.ebuild deleted file mode 100644 index ac4e0a56d01f..000000000000 --- a/dev-java/asm/asm-9.6.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2023 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" ) - -src_prepare() { - default - local module - touch "${T}/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 ${T}/asm.module) - requires java.base; - exports org.objectweb.${module/analysis/tree.analysis}; - } - EOF - echo "requires transitive org.objectweb.${module/analysis/tree.analysis};" \ - >> "${T}/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" - JAVA_JAR_FILENAME="ignoreme.jar" - JAVA_SRC_DIR=() - for module in "${ASM_MODULES[@]}"; do - rm "${module}/src/main/java/module-info.java" || die - JAVA_SRC_DIR+=("${module}/src/main/java") - done - java-pkg-simple_src_compile - fi -} - -src_install() { - local module - for module in "${ASM_MODULES[@]}"; do - java-pkg_dojar ${module}.jar - if use source; then - java-pkg_dosrc "${module}/src/main/java/*" - fi - done - if use doc; then - java-pkg_dojavadoc target/api - fi - default -} diff --git a/dev-java/asm/asm-9.7.ebuild b/dev-java/asm/asm-9.7.1.ebuild index 4eeede15217a..a4632a9dad61 100644 --- a/dev-java/asm/asm-9.7.ebuild +++ b/dev-java/asm/asm-9.7.1.ebuild @@ -24,7 +24,7 @@ S="${WORKDIR}/asm-${MY_P}" LICENSE="BSD" SLOT="9" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x64-macos" +KEYWORDS="amd64 arm64 ppc64 ~x64-macos" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/aspectj/aspectj-1.9.7-r1.ebuild b/dev-java/aspectj/aspectj-1.9.7-r1.ebuild index e3b7c408c182..98bc968b3072 100644 --- a/dev-java/aspectj/aspectj-1.9.7-r1.ebuild +++ b/dev-java/aspectj/aspectj-1.9.7-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/eclipse-aspectj/aspectj/archive/V${PV//./_}.tar.gz - LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64" CDEPEND="dev-java/asm:9 dev-java/commons-logging:0 diff --git a/dev-java/assertj-core/assertj-core-3.10.0.ebuild b/dev-java/assertj-core/assertj-core-3.10.0.ebuild index 38d9cb8187f0..712160fe8cce 100644 --- a/dev-java/assertj-core/assertj-core-3.10.0.ebuild +++ b/dev-java/assertj-core/assertj-core-3.10.0.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/assertj/${PN}/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" >=dev-java/byte-buddy-1.12.12:0 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 4cc72084bcfb..d295c654b0d2 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 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest index 38cde9303492..654726319316 100644 --- a/dev-java/batik/Manifest +++ b/dev-java/batik/Manifest @@ -1,2 +1,2 @@ -DIST batik-src-1.17.tar.gz 13578640 BLAKE2B c77f994674dd8e8054ad6f753e53304ce6daad9b9eadceef053ede0c746872528ecd1caa6e87064d41892fed0c39f07936779851777208229f817bf84cb529b2 SHA512 0879f298142630e96931f429ade5e7107d2d981c6c3a99b8f2ddca8e26ea4fde1b7c717d06412c57d64759bed6c5f2d056970d59e19e66caafb926cb30078516 -DIST batik-src-1.17.tar.gz.asc 833 BLAKE2B 33836c8f0cbc878410ce8b2738dbbb4dc47d6067c5f58febb3460d836424b1c1d815f369bd7aeb15a8ed9371628e03731c1338aa6524c8a935c48b8092e3bb1e SHA512 513bd3d5c212ce4d98daa911f36e1b00e2f2b7a637e93ea116a2ebe848e20664d722ccf6c8928eac7170fa84d3b38eec86a71c8a0a7e21fd8622c8d475991c60 +DIST batik-src-1.18.tar.gz 13699469 BLAKE2B 003a467b6948b902f56f004bf5c7d41f369bf49520d55fd70af3d3b8edef02d04557fdad5e4da70395a30c755f777791c89714edaa094eaa2964972eb81bdbf1 SHA512 209c6f4c76769cf1db616c5fe43c71d23c92afeb62e11bc7605baaa18bf9177efbb7a91a98bf03c3b4cd917bd7b7bd83e87083d16b11b3e57d3f31beeb8e1d7b +DIST batik-src-1.18.tar.gz.asc 833 BLAKE2B a779b94a666edcab5b4c69866b4e7388ce6b8d9869d59773b084d870152cffd8c8cfd74df0f2a4ef06e5d598acb3b7bc00ec841871411b379f514b3fe2019765 SHA512 2fe6de9394f89c90e5ad2ede241c57bfbe5da4627b3730d445b2daa06b1ae71945bd65cda0d7a6bd46db536f318f755778a5b5a5b52080872a3143acd0d4677d diff --git a/dev-java/batik/batik-1.17-r1.ebuild b/dev-java/batik/batik-1.18.ebuild index b389f8994bd7..ef2fec3c0982 100644 --- a/dev-java/batik/batik-1.17-r1.ebuild +++ b/dev-java/batik/batik-1.18.ebuild @@ -13,18 +13,23 @@ DESCRIPTION="XML Graphics Batik" HOMEPAGE="https://xmlgraphics.apache.org/batik/" SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz verify-sig? ( https://downloads.apache.org/xmlgraphics/batik/source/batik-src-${PV}.tar.gz.asc )" -S="${WORKDIR}/batik-${PV}" +S="${WORKDIR}/${P}" LICENSE="Apache-2.0" -SLOT="1.16" -KEYWORDS="amd64 ~arm64 ppc64 x86" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~ppc64" + +BDEPEND=" + app-arch/zip + verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-batik ) +" CP_DEPEND=" dev-java/jacl:0 dev-java/rhino:1.6 dev-java/xalan:0 dev-java/xml-commons-external:1.4 - dev-java/xmlgraphics-commons:2 + dev-java/xmlgraphics-commons:0 " DEPEND=" @@ -37,11 +42,6 @@ RDEPEND=" >=virtual/jre-1.8:* " -BDEPEND=" - app-arch/zip - verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-batik ) -" - VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-batik.apache.org.asc" DOCS=( CHANGES NOTICE README ) diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest index b8234664e4eb..cb2f13b811a3 100644 --- a/dev-java/bcel/Manifest +++ b/dev-java/bcel/Manifest @@ -1,4 +1,2 @@ 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 index 8c3d2a18b744..caf9bb70691d 100644 --- a/dev-java/bcel/bcel-6.10.0-r1.ebuild +++ b/dev-java/bcel/bcel-6.10.0-r1.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 arm64 ppc64 ~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 )" diff --git a/dev-java/bcel/bcel-6.6.0.ebuild b/dev-java/bcel/bcel-6.6.0.ebuild deleted file mode 100644 index 24751a65c002..000000000000 --- a/dev-java/bcel/bcel-6.6.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/bcel/source/bcel-6.6.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" --ebuild bcel-6.6.0.ebuild - -EAPI=8 - -# No tests, junit-jupiter is not packaged -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.bcel:bcel:6.6.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://archive.apache.org/dist/commons/bcel/source/bcel-${PV}-src.tar.gz - verify-sig? ( https://downloads.apache.org/commons/bcel/source/bcel-${PV}-src.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -# Common dependencies -# POM: pom.xml -# org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6 - -CP_DEPEND=" - dev-java/commons-lang:3.6 -" - -# Compile dependencies -# POM: pom.xml -# test? javax:javaee-api:6.0 -> !!!groupId-not-found!!! -# test? net.java.dev.jna:jna:5.12.1 -> !!!suitable-mavenVersion-not-found!!! -# test? net.java.dev.jna:jna-platform:5.12.1 -> !!!artifactId-not-found!!! -# test? org.apache.commons:commons-exec:1.3 -> !!!artifactId-not-found!!! -# test? org.junit.jupiter:junit-jupiter:5.9.1 -> !!!groupId-not-found!!! - -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND}" - -BDEPEND=" - verify-sig? ( sec-keys/openpgp-keys-apache-commons ) -" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" - -DOCS=( NOTICE.txt RELEASE-NOTES.txt ) - -S="${WORKDIR}/${P}-src" - -JAVA_AUTOMATIC_MODULE_NAME="org.apache.bcel" -JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest index 680d64e45a8b..d5ddb1650319 100644 --- a/dev-java/bcmail/Manifest +++ b/dev-java/bcmail/Manifest @@ -1 +1,2 @@ -DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4 +DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223 +DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3 diff --git a/dev-java/bcmail/bcmail-1.77-r1.ebuild b/dev-java/bcmail/bcmail-1.78.1.ebuild index fc5a0ce57369..2bc397385abe 100644 --- a/dev-java/bcmail/bcmail-1.77-r1.ebuild +++ b/dev-java/bcmail/bcmail-1.78.1.ebuild @@ -11,25 +11,31 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols" HOMEPAGE="https://www.bouncycastle.org/java.html" -MY_PV="r${PV/./rv}" +MY_PV="r$(ver_rs 1 'rv' 2 'v')" SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz" S="${WORKDIR}/bc-java-${MY_PV}/mail" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" ~dev-java/bcpkix-${PV}:0 ~dev-java/bcprov-${PV}:0 ~dev-java/bcutil-${PV}:0 dev-java/javax-mail:0 - " -DEPEND="${CP_DEPEND} +" + +DEPEND=" + ${CP_DEPEND} dev-java/jakarta-activation:1 - >=virtual/jdk-11:*" -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" + >=virtual/jdk-11:* +" + +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" DOCS=( ../{README,SECURITY}.md ) HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) diff --git a/dev-java/bcmail/bcmail-1.79.ebuild b/dev-java/bcmail/bcmail-1.79.ebuild new file mode 100644 index 000000000000..41ca49edd04a --- /dev/null +++ b/dev-java/bcmail/bcmail-1.79.ebuild @@ -0,0 +1,65 @@ +# 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.bouncycastle:bcmail-jdk18on:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols" +HOMEPAGE="https://www.bouncycastle.org/java.html" +MY_PV="r$(ver_rs 1 'rv' 2 'v')" +SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz" +S="${WORKDIR}/bc-java-${MY_PV}/mail" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm64 ~ppc64" + +CP_DEPEND=" + ~dev-java/bcpkix-${PV}:0 + ~dev-java/bcprov-${PV}:0 + ~dev-java/bcutil-${PV}:0 + dev-java/javax-mail:0 +" + +DEPEND=" + ${CP_DEPEND} + dev-java/jakarta-activation:1 + >=virtual/jdk-11:* +" + +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" + +DOCS=( ../{README,SECURITY}.md ) +HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) + +JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.mail" +JAVA_CLASSPATH_EXTRA="jakarta-activation-1" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR=( + "src/main/java" + "src/main/jdk1.9" +) + +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "../pkix/src/main/resources" ) +JAVA_TEST_RUN_ONLY="org.bouncycastle.mail.smime.test.AllTests" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + java-pkg-2_src_prepare + java-pkg_clean .. +} + +src_install() { + docinto html + dodoc -r ../docs + java-pkg-simple_src_install +} diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest index 680d64e45a8b..d5ddb1650319 100644 --- a/dev-java/bcpg/Manifest +++ b/dev-java/bcpg/Manifest @@ -1 +1,2 @@ -DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4 +DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223 +DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3 diff --git a/dev-java/bcpg/bcpg-1.77.ebuild b/dev-java/bcpg/bcpg-1.78.1.ebuild index cc3e0343f4be..1d04452ce005 100644 --- a/dev-java/bcpg/bcpg-1.77.ebuild +++ b/dev-java/bcpg/bcpg-1.78.1.ebuild @@ -11,19 +11,28 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Java cryptography APIs" HOMEPAGE="https://www.bouncycastle.org/java.html" -MY_PV="r${PV/./rv}" +MY_PV="r$(ver_rs 1 'rv' 2 'v')" SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz" S="${WORKDIR}/bc-java-${MY_PV}/pg" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" -CP_DEPEND="~dev-java/bcprov-${PV}:0" -DEPEND="${CP_DEPEND} - >=virtual/jdk-11:*" -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" +CP_DEPEND=" + ~dev-java/bcprov-${PV}:0 + ~dev-java/bcutil-${PV}:0 +" + +DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-11:* +" + +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" DOCS=( ../{README,SECURITY}.md ) HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) diff --git a/dev-java/bcpg/bcpg-1.79.ebuild b/dev-java/bcpg/bcpg-1.79.ebuild new file mode 100644 index 000000000000..c0e9b5868cea --- /dev/null +++ b/dev-java/bcpg/bcpg-1.79.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.bouncycastle:bcpg-jdk18on:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java cryptography APIs" +HOMEPAGE="https://www.bouncycastle.org/java.html" +MY_PV="r$(ver_rs 1 'rv' 2 'v')" +SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz" +S="${WORKDIR}/bc-java-${MY_PV}/pg" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm64 ~ppc64" + +CP_DEPEND=" + ~dev-java/bcprov-${PV}:0 + ~dev-java/bcutil-${PV}:0 +" + +DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-11:* +" + +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" + +DOCS=( ../{README,SECURITY}.md ) +HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) + +JAVA_SRC_DIR=( + "src/main/java" + "src/main/jdk1.9" +) + +JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.pg" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + java-pkg-2_src_prepare + java-pkg_clean .. +} + +src_test() { + pushd 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/bcpkix/Manifest b/dev-java/bcpkix/Manifest index 34f73ef00305..f227ab547b8b 100644 --- a/dev-java/bcpkix/Manifest +++ b/dev-java/bcpkix/Manifest @@ -1,2 +1,4 @@ -DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4 -DIST bc-test-data-r1rv77.tar.gz 2074825965 BLAKE2B b797821719ba0dcdd091e0fd4f14c79058a15702973978a055bcc998ff541a8c5e96feb757647a9696e4bbfa28bf80a317066a51fd4daac7b2508111d0d217b1 SHA512 c8701a270ddcfde353b480caa62e2237776b50b0937ac015ee3e5221a74d0817de9bc67f1fa9f53f5e48d861dbf94339cb45a08cb4dad37f1340f754cb1d910e +DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223 +DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3 +DIST bc-test-data-r1rv78v1.tar.gz 2084599485 BLAKE2B a4f67d4ab35321aba52696345cf1ac605866fede41d3b99aa42194f37b587fe7bdebd3ac264379b37416bf5f5c456cd78126126799257c28183e4b71a98b4225 SHA512 cc35260189f2100eb883c30f7a15b7c10f564e7e44e02c61373e7f56a03ab9971350c6798bcbb7a4c4508f5022a0a986fdcd8862449b937765dbf567e2f370ed +DIST bc-test-data-r1rv79.tar.gz 2101723062 BLAKE2B 1fa25babfbcaa855dfcf2ae8727f6a7a5221837127cc295a4c15dce515908418c9e052af101d6fc984c4b5ce204286b7361da29dbefad1b95603d6b1571603a0 SHA512 e14c1bf96a6010447cd13a680a87249a4e6d0661cc46b437e8b2e1098f3e80482dc9038446aad495ba72e1254e9c07e49b1ac848177b02ac36e10710fcd06413 diff --git a/dev-java/bcpkix/bcpkix-1.77.ebuild b/dev-java/bcpkix/bcpkix-1.78.1.ebuild index c4e5b0c09115..ee1c18616966 100644 --- a/dev-java/bcpkix/bcpkix-1.77.ebuild +++ b/dev-java/bcpkix/bcpkix-1.78.1.ebuild @@ -11,14 +11,14 @@ inherit java-pkg-2 java-pkg-simple check-reqs DESCRIPTION="Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation" HOMEPAGE="https://www.bouncycastle.org/java.html" -MY_PV="r${PV/./rv}" +MY_PV="r$(ver_rs 1 'rv' 2 'v')" SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz test? ( https://github.com/bcgit/bc-test-data/archive/${MY_PV}.tar.gz -> bc-test-data-${MY_PV}.tar.gz )" S="${WORKDIR}/bc-java-${MY_PV}/pkix" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # 1) testSANMismatchIP(org.bouncycastle.est.test.TestHostNameAuthorizer) # org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0 @@ -28,11 +28,17 @@ RESTRICT="test" CDEPEND=" ~dev-java/bcprov-${PV}:0 ~dev-java/bcutil-${PV}:0 - " -DEPEND="${CDEPEND} - >=virtual/jdk-11:*" -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" +" + +DEPEND=" + ${CDEPEND} + >=virtual/jdk-11:* +" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.8:* +" DOCS=( ../{README,SECURITY}.md ) HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) diff --git a/dev-java/bcpkix/bcpkix-1.79.ebuild b/dev-java/bcpkix/bcpkix-1.79.ebuild new file mode 100644 index 000000000000..13b701319340 --- /dev/null +++ b/dev-java/bcpkix/bcpkix-1.79.ebuild @@ -0,0 +1,108 @@ +# 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.bouncycastle:bcpkix-jdk18on:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple check-reqs + +DESCRIPTION="Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation" +HOMEPAGE="https://www.bouncycastle.org/java.html" +MY_PV="r$(ver_rs 1 'rv' 2 'v')" +SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz + test? ( https://github.com/bcgit/bc-test-data/archive/${MY_PV}.tar.gz -> bc-test-data-${MY_PV}.tar.gz )" +S="${WORKDIR}/bc-java-${MY_PV}/pkix" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm64 ~ppc64" + +# 1) testSANMismatchIP(org.bouncycastle.est.test.TestHostNameAuthorizer) +# org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0 +PROPERTIES="test_network" +RESTRICT="test" + +CDEPEND=" + ~dev-java/bcprov-${PV}:0 + ~dev-java/bcutil-${PV}:0 +" + +DEPEND=" + ${CDEPEND} + >=virtual/jdk-11:* +" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.8:* +" + +DOCS=( ../{README,SECURITY}.md ) +HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) + +JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.pkix" +JAVA_GENTOO_CLASSPATH="bcprov,bcutil" +JAVA_SRC_DIR=( + "src/main/java" + "src/main/jdk1.9" +) + +JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_RESOURCE_DIRS=( src/{main,test}/resources ) +JAVA_TEST_SRC_DIR="src/test/java" + +# https://bugs.gentoo.org/823347 +check_env() { + if use test; then + # this is needed only for tests + CHECKREQS_MEMORY="2048M" + check-reqs_pkg_pretend + fi +} + +# https://bugs.gentoo.org/823347 +pkg_pretend() { + check_env +} + +# https://bugs.gentoo.org/823347 +pkg_setup() { + check_env + java-pkg-2_pkg_setup +} + +src_unpack() { + unpack bc-java-${MY_PV}.tar.gz + use test && unpack bc-test-data-${MY_PV}.tar.gz +} + +src_prepare() { + java-pkg-2_src_prepare + java-pkg_clean .. +} + +# https://bugs.gentoo.org/823347 +src_test() { + mv ../../bc-test-data-${MY_PV} bc-test-data || die "cannot move bc-test-data" + + JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}" + pushd src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -name "AllTests.java" \ + ) + popd + einfo "${JAVA_TEST_RUN_ONLY}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} + +src_install() { + docinto html + dodoc -r ../docs + java-pkg-simple_src_install +} diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest index 34f73ef00305..f227ab547b8b 100644 --- a/dev-java/bcprov/Manifest +++ b/dev-java/bcprov/Manifest @@ -1,2 +1,4 @@ -DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4 -DIST bc-test-data-r1rv77.tar.gz 2074825965 BLAKE2B b797821719ba0dcdd091e0fd4f14c79058a15702973978a055bcc998ff541a8c5e96feb757647a9696e4bbfa28bf80a317066a51fd4daac7b2508111d0d217b1 SHA512 c8701a270ddcfde353b480caa62e2237776b50b0937ac015ee3e5221a74d0817de9bc67f1fa9f53f5e48d861dbf94339cb45a08cb4dad37f1340f754cb1d910e +DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223 +DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3 +DIST bc-test-data-r1rv78v1.tar.gz 2084599485 BLAKE2B a4f67d4ab35321aba52696345cf1ac605866fede41d3b99aa42194f37b587fe7bdebd3ac264379b37416bf5f5c456cd78126126799257c28183e4b71a98b4225 SHA512 cc35260189f2100eb883c30f7a15b7c10f564e7e44e02c61373e7f56a03ab9971350c6798bcbb7a4c4508f5022a0a986fdcd8862449b937765dbf567e2f370ed +DIST bc-test-data-r1rv79.tar.gz 2101723062 BLAKE2B 1fa25babfbcaa855dfcf2ae8727f6a7a5221837127cc295a4c15dce515908418c9e052af101d6fc984c4b5ce204286b7361da29dbefad1b95603d6b1571603a0 SHA512 e14c1bf96a6010447cd13a680a87249a4e6d0661cc46b437e8b2e1098f3e80482dc9038446aad495ba72e1254e9c07e49b1ac848177b02ac36e10710fcd06413 diff --git a/dev-java/bcprov/bcprov-1.77.ebuild b/dev-java/bcprov/bcprov-1.78.1.ebuild index 9e17d73d8035..ead554fcdd3a 100644 --- a/dev-java/bcprov/bcprov-1.77.ebuild +++ b/dev-java/bcprov/bcprov-1.78.1.ebuild @@ -11,18 +11,17 @@ inherit java-pkg-2 java-pkg-simple check-reqs DESCRIPTION="Java cryptography APIs" HOMEPAGE="https://www.bouncycastle.org/java.html" -MY_PV="r${PV/./rv}" +MY_PV="r$(ver_rs 1 'rv' 2 'v')" SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz test? ( https://github.com/bcgit/bc-test-data/archive/${MY_PV}.tar.gz -> bc-test-data-${MY_PV}.tar.gz )" S="${WORKDIR}/bc-java-${MY_PV}" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" -BDEPEND="app-arch/zip" DOCS=( {README,SECURITY}.md ) HTML_DOCS=( {CONTRIBUTORS,index}.html ) @@ -71,7 +70,8 @@ src_compile() { src_test() { mv ../bc-test-data-${MY_PV} 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="-Dtest.java.version.prefix=$(java-config -g PROVIDES_VERSION)" + 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" diff --git a/dev-java/bcprov/bcprov-1.79.ebuild b/dev-java/bcprov/bcprov-1.79.ebuild new file mode 100644 index 000000000000..ee9f4a32cc02 --- /dev/null +++ b/dev-java/bcprov/bcprov-1.79.ebuild @@ -0,0 +1,109 @@ +# 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.bouncycastle:bcprov-jdk18on:${PV}" +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" +MY_PV="r$(ver_rs 1 'rv' 2 'v')" +SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz + test? ( https://github.com/bcgit/bc-test-data/archive/${MY_PV}.tar.gz -> bc-test-data-${MY_PV}.tar.gz )" +S="${WORKDIR}/bc-java-${MY_PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm64 ~ppc64" + +DEPEND=">=virtual/jdk-11:*" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {README,SECURITY}.md ) +HTML_DOCS=( {CONTRIBUTORS,index}.html ) + +PATCHES=( "${FILESDIR}/bcprov-1.79-PKCS12StoreTest.patch" ) + +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-${MY_PV}.tar.gz + use test && unpack bc-test-data-${MY_PV}.tar.gz +} + +src_prepare() { + default #780585 + 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-${MY_PV} bc-test-data || die "cannot move bc-test-data" + + JAVA_TEST_EXTRA_ARGS="-Dtest.java.version.prefix=$(java-config -g PROVIDES_VERSION)" + JAVA_TEST_EXTRA_ARGS+=" -Dbc.test.data.home=${S}/core/src/test/data" + JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}" + JAVA_TEST_GENTOO_CLASSPATH="junit-4" + + einfo "Testing \"core\"" + JAVA_TEST_RESOURCE_DIRS="core/src/test/resources" + JAVA_TEST_SRC_DIR="core/src/test/java" + pushd core/src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -name "AllTests.java" ) + popd || die + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test + + einfo "Testing bcprov" + JAVA_GENTOO_CLASSPATH_EXTRA=":core.jar:libs/unboundid-ldapsdk-6.0.8.jar" + JAVA_TEST_RESOURCE_DIRS="prov/src/test/resources" + JAVA_TEST_SRC_DIR="prov/src/test/java" + pushd prov/src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -name "AllTests.java" ) + popd || die + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} + +src_install() { + docinto html + dodoc -r docs + java-pkg-simple_src_install +} diff --git a/dev-java/bcprov/files/bcprov-1.79-PKCS12StoreTest.patch b/dev-java/bcprov/files/bcprov-1.79-PKCS12StoreTest.patch new file mode 100644 index 000000000000..b644fa927034 --- /dev/null +++ b/dev-java/bcprov/files/bcprov-1.79-PKCS12StoreTest.patch @@ -0,0 +1,21 @@ +There was 1 failure: +1) testJCE(org.bouncycastle.jce.provider.test.SimpleTestTest) +junit.framework.AssertionFailedError: index 30 PKCS12Store: Exception: java.io.FileNotFoundException: /tmp/PKCS12-AES256-AES128.p12 (Permission denied) + at junit.framework.Assert.fail(Assert.java:57) + at junit.framework.TestCase.fail(TestCase.java:223) + at org.bouncycastle.jce.provider.test.SimpleTestTest.testJCE(SimpleTestTest.java:33) + +FAILURES!!! +Tests run: 1, Failures: 1 + +--- a/prov/src/test/java/org/bouncycastle/jce/provider/test/PKCS12StoreTest.java ++++ b/prov/src/test/java/org/bouncycastle/jce/provider/test/PKCS12StoreTest.java +@@ -2153,7 +2153,7 @@ public class PKCS12StoreTest + + inStore.load(new ByteArrayInputStream(bOut.toByteArray()), passwd); + +- FileOutputStream fOut = new FileOutputStream("/tmp/" + storeType + ".p12"); ++ FileOutputStream fOut = new FileOutputStream(System.getProperty("java.io.tmpdir") + storeType + ".p12"); + fOut.write(bOut.toByteArray()); + fOut.close(); + Key k = inStore.getKey("key", null); diff --git a/dev-java/bcutil/Manifest b/dev-java/bcutil/Manifest index 680d64e45a8b..d5ddb1650319 100644 --- a/dev-java/bcutil/Manifest +++ b/dev-java/bcutil/Manifest @@ -1 +1,2 @@ -DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4 +DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223 +DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3 diff --git a/dev-java/bcutil/bcutil-1.77.ebuild b/dev-java/bcutil/bcutil-1.78.1.ebuild index 03c870ae5331..888cbb5b742e 100644 --- a/dev-java/bcutil/bcutil-1.77.ebuild +++ b/dev-java/bcutil/bcutil-1.78.1.ebuild @@ -11,19 +11,25 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls" HOMEPAGE="https://www.bouncycastle.org/java.html" -MY_PV="r${PV/./rv}" +MY_PV="r$(ver_rs 1 'rv' 2 'v')" SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz" S="${WORKDIR}/bc-java-${MY_PV}/util" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CDEPEND="~dev-java/bcprov-${PV}:0" -DEPEND="${CDEPEND} - >=virtual/jdk-11:*" -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" + +DEPEND=" + ${CDEPEND} + >=virtual/jdk-11:* +" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.8:* +" DOCS=( ../{README,SECURITY}.md ) HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) diff --git a/dev-java/bcutil/bcutil-1.79.ebuild b/dev-java/bcutil/bcutil-1.79.ebuild new file mode 100644 index 000000000000..1fc6d548d0e0 --- /dev/null +++ b/dev-java/bcutil/bcutil-1.79.ebuild @@ -0,0 +1,61 @@ +# 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.bouncycastle:bcutil-jdk18on:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls" +HOMEPAGE="https://www.bouncycastle.org/java.html" +MY_PV="r$(ver_rs 1 'rv' 2 'v')" +SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz" +S="${WORKDIR}/bc-java-${MY_PV}/util" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm64 ~ppc64" + +CDEPEND="~dev-java/bcprov-${PV}:0" + +DEPEND=" + ${CDEPEND} + >=virtual/jdk-11:* +" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.8:* +" + +DOCS=( ../{README,SECURITY}.md ) +HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) + +JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.util" +JAVA_GENTOO_CLASSPATH="bcprov" +JAVA_SRC_DIR=( + "src/main/java" + "src/main/jdk1.9" +) + +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_RUN_ONLY=( + "org.bouncycastle.asn1.util.test.AllTests" + "org.bouncycastle.oer.test.AllTests" +) +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + java-pkg-2_src_prepare + java-pkg_clean .. +} + +src_install() { + docinto html + dodoc -r ../docs + java-pkg-simple_src_install +} diff --git a/dev-java/bnd-annotation/Manifest b/dev-java/bnd-annotation/Manifest index 4a41f3f9f080..efb6528140b2 100644 --- a/dev-java/bnd-annotation/Manifest +++ b/dev-java/bnd-annotation/Manifest @@ -1,2 +1,2 @@ DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c -DIST biz.aQute.bnd.annotation-6.3.1-sources.jar 50600 BLAKE2B 6ace86a803c378be17b4ecfb658eb17e9c95f4f8797cdf22cbb9a5acb2a382fe0ee6791ad0280a2de9d9e85fbe2732487e693b2c93f08145b3633810f480f8b9 SHA512 751855a173e6d5f9d09f6d63775b97d971cebbfc019053988ec7fe144d0f49b4d09b9a2339d63bb43cea51d09d7d766554255f727cad8d73d9c196097e58d0fd +DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028 diff --git a/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild b/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild deleted file mode 100644 index 9522fc6820a9..000000000000 --- a/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom biz.aQute.bnd.annotation-6.3.1.pom --download-uri https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/6.3.1/biz.aQute.bnd.annotation-6.3.1-sources.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild aqute-bnd-annotation-6.3.1.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.annotation:6.3.1" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="bnd Annotations Library" -HOMEPAGE="https://bnd.bndtools.org/" -SRC_URI="https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/${PV}/biz.aQute.bnd.annotation-${PV}-sources.jar" - -LICENSE="Apache-2.0 EPL-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: biz.aQute.bnd.annotation-${PV}.pom -# org.osgi:org.osgi.resource:1.0.0 -> !!!artifactId-not-found!!! -# org.osgi:org.osgi.service.serviceloader:1.0.0 -> !!!artifactId-not-found!!! - -CP_DEPEND="dev-java/osgi-annotation:0" - -# Compile dependencies -# POM: biz.aQute.bnd.annotation-${PV}.pom -# org.osgi:org.osgi.namespace.extender:1.0.1 -> !!!artifactId-not-found!!! -# org.osgi:org.osgi.namespace.service:1.0.0 -> !!!artifactId-not-found!!! -# org.osgi:osgi.annotation:8.1.0 -> >=dev-java/osgi-annotation-8.1.0:0 - -DEPEND=">=virtual/jdk-1.8:* - dev-java/osgi-cmpn:8 - dev-java/osgi-core:0 - ${CP_DEPEND}" - -RDEPEND=">=virtual/jre-1.8:* - ${CP_DEPEND}" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}" - -JAVA_CLASSPATH_EXTRA="osgi-cmpn-8,osgi-core" -JAVA_SRC_DIR="." diff --git a/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild b/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild index a66b70291b68..d34e0f32ba5a 100644 --- a/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild +++ b/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV}" LICENSE="Apache-2.0 EPL-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" dev-java/osgi-cmpn:8 diff --git a/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild b/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild new file mode 100644 index 000000000000..939ae99fc8ea --- /dev/null +++ b/dev-java/bnd-annotation/bnd-annotation-7.1.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" +MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.annotation:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="bnd Annotations Library" +HOMEPAGE="https://bnd.bndtools.org/" +SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/bnd-${PV/_rc/.RC}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" + +DEPEND=" + dev-java/osgi-cmpn:8 + >=virtual/jdk-11:* +" + +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.annotation" +JAVA_CLASSPATH_EXTRA="osgi-cmpn-8" +JAVA_SRC_DIR="biz.aQute.bnd.annotation/src" diff --git a/dev-java/bnd-ant/Manifest b/dev-java/bnd-ant/Manifest index a890570b45c8..efb6528140b2 100644 --- a/dev-java/bnd-ant/Manifest +++ b/dev-java/bnd-ant/Manifest @@ -1 +1,2 @@ DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c +DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028 diff --git a/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild b/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild index 236236e86726..5a039feb28ae 100644 --- a/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild +++ b/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV}" LICENSE="Apache-2.0 EPL-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" DEPEND=" dev-java/ant:0 diff --git a/dev-java/bnd-ant/bnd-ant-7.1.0.ebuild b/dev-java/bnd-ant/bnd-ant-7.1.0.ebuild new file mode 100644 index 000000000000..4dac2056cc13 --- /dev/null +++ b/dev-java/bnd-ant/bnd-ant-7.1.0.ebuild @@ -0,0 +1,46 @@ +# 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="biz.aQute.bnd:biz.aQute.bnd.ant:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Bnd Ant Tasks" +HOMEPAGE="https://bnd.bndtools.org/" +SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/bnd-${PV/_rc/.RC}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +DEPEND=" + dev-java/ant:0 + ~dev-java/bnd-${PV}:0 + >=virtual/jdk-17:*" +RDEPEND=">=virtual/jre-17:*" + +JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.ant" +JAVA_CLASSPATH_EXTRA=" + ant + bnd +" + +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR="biz.aQute.bnd.ant/src" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + mkdir res || die + + # java-pkg-simple wants resources in JAVA_RESOURCE_DIRS + pushd biz.aQute.bnd.ant/src > /dev/null || die + find -type f \ + ! -name '*.java' \ + | xargs cp --parent -t ../../res || die + popd > /dev/null || die +} diff --git a/dev-java/bnd-util/Manifest b/dev-java/bnd-util/Manifest index a890570b45c8..efb6528140b2 100644 --- a/dev-java/bnd-util/Manifest +++ b/dev-java/bnd-util/Manifest @@ -1 +1,2 @@ DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c +DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028 diff --git a/dev-java/bnd-util/bnd-util-7.0.0.ebuild b/dev-java/bnd-util/bnd-util-7.0.0.ebuild index 686d1ca62757..e1ac2c5f0308 100644 --- a/dev-java/bnd-util/bnd-util-7.0.0.ebuild +++ b/dev-java/bnd-util/bnd-util-7.0.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV}" LICENSE="Apache-2.0 EPL-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND="dev-java/osgi-annotation:0" diff --git a/dev-java/bnd-util/bnd-util-7.1.0.ebuild b/dev-java/bnd-util/bnd-util-7.1.0.ebuild new file mode 100644 index 000000000000..2ba4cf1dd138 --- /dev/null +++ b/dev-java/bnd-util/bnd-util-7.1.0.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" +MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.util:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="AQute Bnd Utilities" +HOMEPAGE="https://bnd.bndtools.org/" +SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/bnd-${PV/_rc/.RC}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +CP_DEPEND="dev-java/osgi-annotation:0" + +DEPEND="${CP_DEPEND} + ~dev-java/bnd-annotation-${PV}:0 + ~dev-java/libg-${PV}:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + dev-java/slf4j-api:0 + >=virtual/jdk-17:* +" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-17:* +" + +JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.util" +JAVA_CLASSPATH_EXTRA=" + bnd-annotation + libg + osgi-cmpn-8 + osgi-core + slf4j-api +" +JAVA_SRC_DIR="biz.aQute.bnd.util/src" diff --git a/dev-java/bnd/Manifest b/dev-java/bnd/Manifest index a890570b45c8..efb6528140b2 100644 --- a/dev-java/bnd/Manifest +++ b/dev-java/bnd/Manifest @@ -1 +1,2 @@ DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c +DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028 diff --git a/dev-java/bnd/bnd-7.0.0.ebuild b/dev-java/bnd/bnd-7.0.0.ebuild index b01e8447356e..fa2a82a1e3f0 100644 --- a/dev-java/bnd/bnd-7.0.0.ebuild +++ b/dev-java/bnd/bnd-7.0.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0 EPL-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" BDEPEND="app-arch/zip" diff --git a/dev-java/bnd/bnd-7.1.0.ebuild b/dev-java/bnd/bnd-7.1.0.ebuild new file mode 100644 index 000000000000..8a0cc65df29a --- /dev/null +++ b/dev-java/bnd/bnd-7.1.0.ebuild @@ -0,0 +1,100 @@ +# 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="biz.aQute.bnd:biz.aQute.bnd:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="bndlib: A Swiss Army Knife for OSGi" +HOMEPAGE="https://bnd.bndtools.org/" +SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/${P/_rc/.RC}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +BDEPEND="app-arch/zip" + +CP_DEPEND=" + ~dev-java/bndlib-${PV}:0 + dev-java/felix-resolver:0 + dev-java/guava:0 + dev-java/javaparser-core:0 + dev-java/jline:2 + dev-java/jtwig-core:0 + dev-java/osgi-annotation:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + dev-java/slf4j-simple:0 + dev-java/snakeyaml:0 + dev-java/xz-java:0 +" + +DEPEND="${CP_DEPEND} + dev-java/commons-lang:3.6 + dev-java/eclipse-jdt-annotation:0 + dev-java/felix-gogo-runtime:0 + dev-java/slf4j-api:0 + dev-java/jtwig-reflection:0 + dev-java/osgi-service-log:0 + dev-java/osgi-service-subsystem:0 + >=virtual/jdk-17:*" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-17:*" + +PATCHES=( + "${FILESDIR}/bnd-7.0.0-aQute.bnd.main.bnd.patch" +) + +JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd" +JAVA_CLASSPATH_EXTRA=" + commons-lang-3.6 + eclipse-jdt-annotation + jtwig-reflection + felix-gogo-runtime + osgi-service-subsystem + slf4j-api +" +JAVA_MAIN_CLASS="aQute.bnd.main.bnd" +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR=( + "biz.aQute.bnd.exporters/src" + "biz.aQute.bnd.reporter/src" + "biz.aQute.bnd/src" + "biz.aQute.remote/src" + "biz.aQute.repository/src" + "biz.aQute.resolve/src" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + mkdir res || die + + # java-pkg-simple wants resources in JAVA_RESOURCE_DIRS + pushd biz.aQute.bnd/src > /dev/null || die + find -type f \ + ! -name '*.java' \ + | xargs cp --parent -t ../../res || die + popd > /dev/null || die +} + +src_compile() { + # There is another version of osgi-service-log in osgi-core-0 + JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjars --build-only osgi-service-log)" + java-pkg-simple_src_compile + + # remove classes which are not in upstream's jar file + zip -d ${PN}.jar \ + "*/remote/agent/*" \ + "*/remote/embedded/*" \ + "*/remote/main/*" \ + "*/remote/plugin/*" \ + "*/remote/test/*" \ + || die +} diff --git a/dev-java/bndlib/Manifest b/dev-java/bndlib/Manifest index a890570b45c8..efb6528140b2 100644 --- a/dev-java/bndlib/Manifest +++ b/dev-java/bndlib/Manifest @@ -1 +1,2 @@ DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c +DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028 diff --git a/dev-java/bndlib/bndlib-7.0.0.ebuild b/dev-java/bndlib/bndlib-7.0.0.ebuild index 4a6bee66518d..e699671229c9 100644 --- a/dev-java/bndlib/bndlib-7.0.0.ebuild +++ b/dev-java/bndlib/bndlib-7.0.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV}" LICENSE="Apache-2.0 EPL-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" ~dev-java/bnd-annotation-${PV}:0 diff --git a/dev-java/bndlib/bndlib-7.1.0.ebuild b/dev-java/bndlib/bndlib-7.1.0.ebuild new file mode 100644 index 000000000000..532ebab39fd4 --- /dev/null +++ b/dev-java/bndlib/bndlib-7.1.0.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" +MAVEN_ID="biz.aQute.bnd:biz.aQute.bndlib:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="bndlib: A Swiss Army Knife for OSGi" +HOMEPAGE="https://bnd.bndtools.org/" +SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/bnd-${PV/_rc/.RC}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +CP_DEPEND=" + ~dev-java/bnd-annotation-${PV}:0 + ~dev-java/bnd-util-${PV}:0 + ~dev-java/libg-${PV}:0 + dev-java/osgi-annotation:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + dev-java/slf4j-api:0 +" + +DEPEND="${CP_DEPEND} + dev-java/osgi-service-log:0 + >=virtual/jdk-17:* +" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-17:* +" + +JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bndlib" +JAVA_CLASSPATH_EXTRA="osgi-service-log" +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR="biz.aQute.bndlib/src" + +src_prepare() { + java-pkg-2_src_prepare + mkdir res || die + + # java-pkg-simple wants resources in JAVA_RESOURCE_DIRS + mv biz.aQute.bndlib/img res || die + pushd biz.aQute.bndlib/src > /dev/null || die + find -type f \ + ! -name '*.java' \ + | xargs cp --parent -t ../../res || die + popd > /dev/null || die +} diff --git a/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild b/dev-java/brotli-dec/brotli-dec-0.1.2-r1.ebuild index acbd619b97b7..08422aa22fde 100644 --- a/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild +++ b/dev-java/brotli-dec/brotli-dec-0.1.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2023 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" MAVEN_ID="org.brotli:dec:${PV}" @@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/brotli/dec/${PV}/dec-${PV}-sources.j LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" BDEPEND="app-arch/unzip" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/browserlauncher2/browserlauncher2-1.3-r3.ebuild b/dev-java/browserlauncher2/browserlauncher2-1.3-r3.ebuild index 6e0be61baf7e..daae13174e47 100644 --- a/dev-java/browserlauncher2/browserlauncher2-1.3-r3.ebuild +++ b/dev-java/browserlauncher2/browserlauncher2-1.3-r3.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 @@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/browserlaunch2/browserlaunche LICENSE="LGPL-2.1" SLOT="1.0" -KEYWORDS="amd64 ppc64 x86" +KEYWORDS="amd64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/bsf/bsf-2.4.0-r5.ebuild b/dev-java/bsf/bsf-2.4.0-r5.ebuild index b3abd4a8391e..6df55fdf25fd 100644 --- a/dev-java/bsf/bsf-2.4.0-r5.ebuild +++ b/dev-java/bsf/bsf-2.4.0-r5.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="2.3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" # If you add new ones, add them to ant-apache-bsf too for use dependencies IUSE="javascript tcl" diff --git a/dev-java/bsh/bsh-2.1.1.ebuild b/dev-java/bsh/bsh-2.1.1.ebuild index bfa3513a8e0a..11a9caad1ce4 100644 --- a/dev-java/bsh/bsh-2.1.1.ebuild +++ b/dev-java/bsh/bsh-2.1.1.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 @@ -16,7 +16,7 @@ S="${WORKDIR}/beanshell-${PV}" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux" # There was 1 failure: # 1) do_not_access_non_open_methods(bsh.Java_9_Test) diff --git a/dev-java/byaccj/byaccj-1.15-r3.ebuild b/dev-java/byaccj/byaccj-1.15-r3.ebuild index a7d59bbf3ade..a2d15fc92a46 100644 --- a/dev-java/byaccj/byaccj-1.15-r3.ebuild +++ b/dev-java/byaccj/byaccj-1.15-r3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="A Java extension of BSD YACC-compatible parser generator" HOMEPAGE="https://byaccj.sourceforge.net/" @@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos" +KEYWORDS="amd64 arm64 ppc64 ~ppc-macos ~x64-macos" S="${WORKDIR}/${PN}${PV}" @@ -22,6 +22,9 @@ PATCHES=( src_compile() { cp "${FILESDIR}/Makefile" src/Makefile || die + + # bug #880329, bug #944104 + append-cflags -std=gnu17 emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" -C src linux } diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest index f5587d193af3..2fee07df74f6 100644 --- a/dev-java/byte-buddy/Manifest +++ b/dev-java/byte-buddy/Manifest @@ -1 +1,2 @@ DIST byte-buddy-1.14.0.tar.gz 1989303 BLAKE2B c284f54ebc6bf67e4706380f0876f403fcf5ae172a690888d13d6b3399cf41bf1fd8890bf15059f71a9457ec6343254ad1f421f8e4975aa70dd9a2103ab59610 SHA512 e6ccda287935b5ff7104d5c0e4904b0595918a21bcc90c6ac5b2358cc0371b22a4fcac2a95dde9e377c5d1e43077c8b57ea9520a9093b2380ab53c830f107ced +DIST byte-buddy-1.15.10.tar.gz 2057524 BLAKE2B 7f5e178b3ea31fb30379e49d69f34ba1b9953d705a54c3609bb771f66962af776dee95ea10ab7049e50351362ff87c164782bc4b1b782985ac8f122e5833cb4e SHA512 3b7a02475433193efe8a8e20378369ec18f10c81dd90b428d5393c45fe261f678b1707c92923381b8a3030f8a2e8525fe95e3337ca7e5455cdc5fc2647416d2a diff --git a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild b/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild index ed2c40b5bb64..13232b00c524 100644 --- a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild +++ b/dev-java/byte-buddy/byte-buddy-1.14.0.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" >=virtual/jdk-11:* diff --git a/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild b/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild new file mode 100644 index 000000000000..a1021afe6a00 --- /dev/null +++ b/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild @@ -0,0 +1,144 @@ +# 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="net.bytebuddy:byte-buddy-agent:${PV} net.bytebuddy:byte-buddy:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM" +HOMEPAGE="https://bytebuddy.net" +SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz" +S="${WORKDIR}/byte-buddy-${P}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" + +DEPEND=" + >=dev-java/asm-9.7.1:9 + dev-java/findbugs-annotations:0 + dev-java/jna:4 + dev-java/jsr305:0 + >=virtual/jdk-11:* + test? ( + >=dev-java/mockito-2.28.2-r1:2 + ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +PATCHES=( "${FILESDIR}/byte-buddy-1.15.10-Skip-testIgnoreExistingField.patch" ) + +JAVA_CLASSPATH_EXTRA=" + asm-9 + findbugs-annotations + jna-4 + jsr305 +" +JAVADOC_CLASSPATH="${JAVA_CLASSPATH_EXTRA}" +JAVADOC_SRC_DIRS=( + "byte-buddy-agent/src/main/java" + "byte-buddy/src/main/java" +) + +src_prepare() { + default #780585 + java-pkg_clean ! -path "./byte-buddy-dep/src/test/*" # Keep test-classes + java-pkg-2_src_prepare + # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy-agent/pom.xml#L142-L176 + cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF || die + module net.bytebuddy.agent { + requires java.instrument; + requires static jdk.attach; + requires static com.sun.jna; + requires static com.sun.jna.platform; + requires java.base; + exports net.bytebuddy.agent; + exports net.bytebuddy.agent.utility.nullability; + } + EOF + + # instead of shading byte-buddy-dep we move it into byte-buddy. + mv byte-buddy{-dep,}/src/main/java || die "cannot move sources" + + # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy/pom.xml#L159-L195 + local exports="$( \ + sed -n '/<packages.list.external>/,/<\/packages.list.external/p' \ + byte-buddy/pom.xml \ + | sed -e 's:^:exports :' -e 's:,:;:' \ + | grep -v 'packages.list.external\|shade' | tr -s '[:space:]' \ + )" || die + cat > byte-buddy/src/main/java/module-info.java <<-EOF || die + module net.bytebuddy { + requires static java.instrument; + requires static java.management; + requires static jdk.unsupported; + requires static net.bytebuddy.agent; + requires static com.sun.jna; + requires static com.sun.jna.platform; + requires java.base; + ${exports} + } + EOF +} + +src_compile() { + einfo "Compiling byte-buddy-agent.jar" + JAVA_JAR_FILENAME="byte-buddy-agent.jar" + JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources" + JAVA_SRC_DIR="byte-buddy-agent/src/main/java" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar" + rm -r target || die + + einfo "Compiling byte-buddy.jar" + JAVA_JAR_FILENAME="byte-buddy.jar" + JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default" + JAVA_RESOURCE_DIRS=() + JAVA_SRC_DIR="byte-buddy/src/main/java" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar" + rm -r target || die + + einfo "Building javadocs" + rm byte-buddy{,-agent}/src/main/java/module-info.java || die + use doc && ejavadoc +} + +src_test() { + # instead of shading byte-buddy-dep we move it into byte-buddy. + mv byte-buddy{-dep,}/src/test || die "cannot move tests" + + JAVAC_ARGS="-g" + JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-2" + + einfo "Testing byte-buddy-agent" + # https://github.com/raphw/byte-buddy/issues/1321#issuecomment-1252776459 + JAVA_TEST_EXTRA_ARGS=( -Dnet.bytebuddy.test.jnapath="${EPREFIX}/usr/$(get_libdir)/jna-4/" ) + JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java" + java-pkg-simple_src_test + + einfo "Testing byte-buddy" + JAVA_TEST_RESOURCE_DIRS=( byte-buddy/src/test/{resources,precompiled*} ) + JAVA_TEST_SRC_DIR="byte-buddy/src/test/java" + + JAVA_TEST_EXCLUDES=( + # all tests in this class fail, https://bugs.gentoo.org/863386 + net.bytebuddy.build.CachedReturnPluginTest + ) + java-pkg-simple_src_test +} + +src_install() { + java-pkg_dojar "byte-buddy-agent.jar" + java-pkg-simple_src_install + + if use source; then + java-pkg_dosrc "byte-buddy-agent/src/main/java/*" + java-pkg_dosrc "byte-buddy/src/main/java/*" + fi +} diff --git a/dev-java/byte-buddy/files/byte-buddy-1.15.10-Skip-testIgnoreExistingField.patch b/dev-java/byte-buddy/files/byte-buddy-1.15.10-Skip-testIgnoreExistingField.patch new file mode 100644 index 000000000000..c90c3c9a66c9 --- /dev/null +++ b/dev-java/byte-buddy/files/byte-buddy-1.15.10-Skip-testIgnoreExistingField.patch @@ -0,0 +1,34 @@ +There was 1 failure: +1) testIgnoreExistingField(net.bytebuddy.build.CachedReturnPluginOtherTest) +net.bytebuddy.pool.TypePool$Resolution$NoSuchTypeException: Cannot resolve type description for net.bytebuddy.build.CachedReturnPlugin$Advice$boolean + at net.bytebuddy.pool.TypePool$Resolution$Illegal.resolve(TypePool.java:190) + at net.bytebuddy.build.CachedReturnPlugin.<init>(CachedReturnPlugin.java:125) + at net.bytebuddy.build.CachedReturnPluginOtherTest.testIgnoreExistingField(CachedReturnPluginOtherTest.java:19) + +FAILURES!!! + +--- a/byte-buddy-dep/src/test/java/net/bytebuddy/build/CachedReturnPluginOtherTest.java ++++ b/byte-buddy-dep/src/test/java/net/bytebuddy/build/CachedReturnPluginOtherTest.java +@@ -6,13 +6,14 @@ import net.bytebuddy.dynamic.ClassFileLocator; + import net.bytebuddy.dynamic.DynamicType; + import org.hamcrest.CoreMatchers; + import org.junit.Test; ++import org.junit.Ignore; + + import static org.hamcrest.CoreMatchers.sameInstance; + import static org.hamcrest.MatcherAssert.assertThat; + + public class CachedReturnPluginOtherTest { + +- @Test ++ @Test @Ignore + @SuppressWarnings("rawtypes") + public void testIgnoreExistingField() { + DynamicType.Builder<ExistingField> builder = new ByteBuddy().redefine(ExistingField.class); +@@ -73,4 +74,4 @@ public class CachedReturnPluginOtherTest { + return null; + } + } +-} +\ No newline at end of file ++} diff --git a/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild index e41111b8469c..5878283bc742 100644 --- a/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild +++ b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${P}.src" LICENSE="|| ( EPL-1.0 LGPL-2.1 )" SLOT="0" -KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc64 ~amd64-linux ~x86-linux" CP_DEPEND=" dev-java/log4j-12-api:2 diff --git a/dev-java/cache2k-api/cache2k-api-0.23.1.ebuild b/dev-java/cache2k-api/cache2k-api-0.23.1.ebuild index ac521a305cf9..fef04eece7ac 100644 --- a/dev-java/cache2k-api/cache2k-api-0.23.1.ebuild +++ b/dev-java/cache2k-api/cache2k-api-0.23.1.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 @@ -11,13 +11,13 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="light weight and high performance Java caching library: API" HOMEPAGE="https://cache2k.org" SRC_URI="https://github.com/cache2k/cache2k/archive/v${PV}.tar.gz -> cache2k-${PV}.tar.gz" +S="${WORKDIR}/cache2k-${PV}/api" + LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}/cache2k-${PV}/api" - JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/cache2k-core/cache2k-core-0.23.1.ebuild b/dev-java/cache2k-core/cache2k-core-0.23.1.ebuild index 54b82f7d35c9..21b4ebc699eb 100644 --- a/dev-java/cache2k-core/cache2k-core-0.23.1.ebuild +++ b/dev-java/cache2k-core/cache2k-core-0.23.1.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,6 +12,8 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="light weight and high performance Java caching library: core" HOMEPAGE="https://cache2k.org" SRC_URI="https://github.com/cache2k/cache2k/archive/v${PV}.tar.gz -> cache2k-${PV}.tar.gz" +S="${WORKDIR}/cache2k-${PV}/core" + LICENSE="Apache-2.0" SLOT="0" KEYWORDS="" @@ -29,8 +31,6 @@ RDEPEND=" ${CP_DEPEND} " -S="${WORKDIR}/cache2k-${PV}/core" - JAVA_SRC_DIR="src/main/java" JAVA_RESOURCE_DIRS=( "src/main/resources" ) JAVA_TEST_GENTOO_CLASSPATH="junit-4" diff --git a/dev-java/caffeine/Manifest b/dev-java/caffeine/Manifest index 5fe009e7d56c..2602d39646eb 100644 --- a/dev-java/caffeine/Manifest +++ b/dev-java/caffeine/Manifest @@ -1 +1,2 @@ DIST caffeine-2.6.2-sources.jar 715580 BLAKE2B 882cac33d205c8186232c64010b4e25e805d3d188d6a9e6ca151187b55d5ee3a3d5641566f5e8d32de596fab3dae8967c74f3d60e2321b34374ce996382322fe SHA512 52a8c67648e2a6bb1c600d99712473a64911f2b6c8fe6c924ba98e72b4b040a1094fa5c93ae2bae8734d352634bc72960711afd152566ef02f6bad4c84e510c8 +DIST caffeine-2.9.3-sources.jar 730835 BLAKE2B 5864ead593cb46caa23aac18fb424429009dbe5f9a70bb95bd16d73181f57ec5cd8ce1110af6e8766e757e5ea8a546c8eef4d4c26dced12722ff05f7278e0939 SHA512 e9b479ce30d4fc6337fef3a03a149c5fb2bfa48dbe0845374baf62e9b91049b8badbc5543d135b3473cf0c7bfd2b3717254376b55005ca301ce804537f879c48 diff --git a/dev-java/caffeine/caffeine-2.6.2-r1.ebuild b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild index 673e2da08617..600b25a150e4 100644 --- a/dev-java/caffeine/caffeine-2.6.2-r1.ebuild +++ b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild @@ -20,7 +20,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/$ LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ppc64 x86" +KEYWORDS="amd64 ~arm64 ppc64" BDEPEND="app-arch/unzip" CP_DEPEND="dev-java/jsr305:0" diff --git a/dev-java/caffeine/caffeine-2.9.3.ebuild b/dev-java/caffeine/caffeine-2.9.3.ebuild new file mode 100644 index 000000000000..12549520678d --- /dev/null +++ b/dev-java/caffeine/caffeine-2.9.3.ebuild @@ -0,0 +1,37 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="com.github.ben-manes.caffeine:caffeine:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A high performance caching library" +HOMEPAGE="https://github.com/ben-manes/caffeine" +SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/${PV}/caffeine-${PV}-sources.jar" +# Compiling from Github tarball would require to be packaged at least +# package com.squareup.javapoet +# package MethodSpec +# package TypeSpec +# SRC_URI="https://github.com/ben-manes/caffeine/archive/v${PV}.tar.gz -> ${P}.tar.gz" +# S="${WORKDIR}/${P}/caffeine" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" + +BDEPEND="app-arch/unzip" +CP_DEPEND=" + dev-java/jsr305:0 + dev-java/checker-framework-qual:0 + dev-java/error-prone-annotations:0 +" +# min java 11 for bug #919464 +DEPEND="${CP_DEPEND} + >=virtual/jdk-11:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="com.github.benmanes.caffeine" diff --git a/dev-java/cal10n/cal10n-0.8.1.ebuild b/dev-java/cal10n/cal10n-0.8.1.ebuild index 625007115eaa..1ed57cbe79a1 100644 --- a/dev-java/cal10n/cal10n-0.8.1.ebuild +++ b/dev-java/cal10n/cal10n-0.8.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 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/qos-ch/cal10n/archive/v_${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild b/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild deleted file mode 100644 index ca054b493d33..000000000000 --- a/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild +++ /dev/null @@ -1,102 +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 api/pom.xml --download-uri https://github.com/jakartaee/cdi/archive/4.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild cdi-api-4.0.1.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1" -JAVA_TESTING_FRAMEWORKS="testng" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="APIs for CDI (Contexts and Dependency Injection for Java)" -HOMEPAGE="https://projects.eclipse.org/projects/ee4j.cdi" -SRC_URI="https://github.com/jakartaee/cdi/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -EL_API_SLOT="5.0" - -DEPEND=" - dev-java/injection-api:0 - dev-java/jakarta-annotations-api:0 - dev-java/jakarta-el-api:${EL_API_SLOT} - dev-java/jakarta-interceptors:0 - >=virtual/jdk-11:* -" -RDEPEND=">=virtual/jre-11:*" - -DOCS=( CONTRIBUTING.adoc {NOTICE,README}.md ) - -PATCHES=( - # https://bugs.gentoo.org/856412 - # org.jboss.cdi.api.test.se.SeContainerInitializerTest # Tests run: 4, Failures: 1 - # org.jboss.cdi.api.test.CDITest # Tests run: 11, Failures: 5 - "${FILESDIR}/cdi-api-4.0.1-skip-tests.patch" -) - -S="${WORKDIR}/cdi-${PV}" - -JAVA_TEST_GENTOO_CLASSPATH="testng" -JAVA_TEST_EXTRA_ARGS=( -DserviceDir="target/test-classes/META-INF/services" ) -JAVA_TEST_SRC_DIR="api/src/test/java" -JAVA_TEST_RESOURCE_DIRS="api/src/test/resources" - -JAVA_TEST_EXCLUDES=( - # Tests run: 1, Failures: 1 - org.jboss.cdi.api.test.privileged.CDIPrivilegedTest -) - -src_prepare(){ - default # https://bugs.gentoo.org/780585 -} - -src_compile() { - JAVA_CLASSPATH_EXTRA=" - injection-api - jakarta-annotations-api - jakarta-el-api-${EL_API_SLOT} - jakarta-interceptors - " - JAVA_SRC_DIR="lang-model/src/main/java" - JAVA_JAR_FILENAME="lang-model.jar" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":lang-model.jar" - rm -r target || die - - JAVA_SRC_DIR="api/src/main/java" - JAVA_RESOURCE_DIRS="api/src/main/resources" - JAVA_JAR_FILENAME="cdi-api.jar" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":cdi-api.jar" - rm -r target || die - - if use doc; then - rm lang-model/src/main/java/module-info.java || die - JAVA_SRC_DIR=( - "lang-model/src/main/java" - "api/src/main/java" - ) - JAVA_JAR_FILENAME="ignoreme.jar" - java-pkg-simple_src_compile - fi -} - -src_install() { - java-pkg_dojar "lang-model.jar" - java-pkg_dojar "cdi-api.jar" - - if use doc; then - java-pkg_dojavadoc target/api - fi - - if use source; then - java-pkg_dosrc "lang-model/src/main/java/*" - java-pkg_dosrc "api/src/main/java/*" - fi -} diff --git a/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild b/dev-java/cdi-api/cdi-api-4.0.1-r4.ebuild index 83b9e6610615..dd3b6ec3dc21 100644 --- a/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild +++ b/dev-java/cdi-api/cdi-api-4.0.1-r4.ebuild @@ -16,13 +16,13 @@ S="${WORKDIR}/cdi-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ppc64" EL_API_SLOT="5.0" DEPEND=" dev-java/injection-api:0 - dev-java/jakarta-annotations-api:0 + dev-java/jakarta-annotation-api:0 dev-java/jakarta-el-api:${EL_API_SLOT} dev-java/jakarta-interceptors:0 >=virtual/jdk-11:* @@ -64,7 +64,7 @@ src_compile() { # getting the modulepath DEPENDENCIES=( jakarta-el-api-${EL_API_SLOT} - jakarta-annotations-api + jakarta-annotation-api jakarta-interceptors injection-api ) diff --git a/dev-java/cglib/cglib-3.3.0-r2.ebuild b/dev-java/cglib/cglib-3.3.0-r2.ebuild index fc4bba040586..cb4cacd8a66b 100644 --- a/dev-java/cglib/cglib-3.3.0-r2.ebuild +++ b/dev-java/cglib/cglib-3.3.0-r2.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}" LICENSE="Apache-2.0" SLOT="3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" >=dev-java/ant-1.10.14-r3:0 diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest index f0802ea1f788..4db3e92f52fb 100644 --- a/dev-java/checker-framework-qual/Manifest +++ b/dev-java/checker-framework-qual/Manifest @@ -1,2 +1,2 @@ -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 +DIST checker-framework-3.48.3.tar.gz 8345833 BLAKE2B 6c3f2c641414a7cb388ee2ed672a572ca40157e89976f472c58d1a04d74ec2e24893421757fea1bbaee9791e7fbb6d617cba1c5cdda284debd87250299820518 SHA512 a0a41e7bd70d85b8dcb23d358c0a6f10884f4e119e5ae5e1d17c283beab02ba4183f56b4a07d88e9e30bb4b25ebbd003bde2ecf399bf647d23e46869d414e2d6 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 index 026febee0f73..d56fc74e5026 100644 --- 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 @@ -15,7 +15,7 @@ S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-11:*" # module-info RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.48.3.ebuild index 5831dfb7010b..5444f35ed4dc 100644 --- a/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild +++ b/dev-java/checker-framework-qual/checker-framework-qual-3.48.3.ebuild @@ -15,10 +15,9 @@ S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="~amd64 ~arm64 ~ppc64" -DEPEND=">=virtual/jdk-1.8:*" +DEPEND=">=virtual/jdk-11:*" # module-info RDEPEND=">=virtual/jre-1.8:*" -JAVA_AUTOMATIC_MODULE_NAME="org.checkerframework.checker.qual" -JAVA_SRC_DIR="src/main/java/org/checkerframework/" +JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild index ba6bfd171173..5ddf7fbbcc1b 100644 --- a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild +++ b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/${P}-src" LICENSE="Apache-2.0" SLOT="1.7" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest index 6e506677c4d4..4dc64591a27d 100644 --- a/dev-java/commons-cli/Manifest +++ b/dev-java/commons-cli/Manifest @@ -1,3 +1,2 @@ -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-r1.ebuild b/dev-java/commons-cli/commons-cli-1.5.0-r1.ebuild deleted file mode 100644 index d3b9d7264d64..000000000000 --- a/dev-java/commons-cli/commons-cli-1.5.0-r1.ebuild +++ /dev/null @@ -1,43 +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="commons-cli:commons-cli:1.5.0" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -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" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - -RDEPEND=">=virtual/jre-1.8:*" - -DEPEND=">=virtual/jdk-1.8:*" - -S="${WORKDIR}/${P}-src" - -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" - -# There were 62 failures: -# 1) testSimpleLong(org.apache.commons.cli.ParserTestCase) -# java.lang.InstantiationException -# at java.base/jdk.internal.reflect.InstantiationExceptionConstructorAccessorImpl.newInstance(InstantiationExceptionConstructorAccessorImpl.java:48) -# FAILURES!!! -# Tests run: 444, Failures: 62 -JAVA_TEST_EXCLUDES="org.apache.commons.cli.ParserTestCase" - -src_install() { - default - java-pkg-simple_src_install -} diff --git a/dev-java/commons-cli/commons-cli-1.9.0.ebuild b/dev-java/commons-cli/commons-cli-1.9.0.ebuild index c25fd62d91e9..aa26f2dcf967 100644 --- a/dev-java/commons-cli/commons-cli-1.9.0.ebuild +++ b/dev-java/commons-cli/commons-cli-1.9.0.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 arm64 ppc64 ~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 )" diff --git a/dev-java/commons-codec/commons-codec-1.16.1.ebuild b/dev-java/commons-codec/commons-codec-1.16.1.ebuild index 96485a4fea70..e7dd7fc4a86f 100644 --- a/dev-java/commons-codec/commons-codec-1.16.1.ebuild +++ b/dev-java/commons-codec/commons-codec-1.16.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" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux" RESTRICT="test" #839681 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" diff --git a/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild b/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild index 9b6bd0170923..4c8494eca3c7 100644 --- a/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild +++ b/dev-java/commons-codec/commons-codec-1.17.1-r1.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" +KEYWORDS="amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux" RESTRICT="test" #839681 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" 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 a292cac71fb2..626e8277d402 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 @@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" diff --git a/dev-java/commons-collections/commons-collections-4.4-r2.ebuild b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild index 059e87b91233..17ec6923d5ff 100644 --- a/dev-java/commons-collections/commons-collections-4.4-r2.ebuild +++ b/dev-java/commons-collections/commons-collections-4.4-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 @@ -17,7 +17,7 @@ S="${WORKDIR}/commons-collections4-${PV}-src" LICENSE="Apache-2.0" SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest index 46ca3203744a..500e2f06d88c 100644 --- a/dev-java/commons-compress/Manifest +++ b/dev-java/commons-compress/Manifest @@ -1,4 +1,2 @@ -DIST commons-compress-1.26.1-src.tar.gz 54843710 BLAKE2B 84c4c1363a4396a06773a8c120f5f32d98fceaa139e33a2a27df79a9aea41b8084a93a5735b0c4cd17fa88c404060af2336ab20f127acceb0da948ff170164c3 SHA512 096c94344a9bbcd021a3cce0869456cf6d22ca5136b63de017922d7c3de5d94b591961fe550201b654f9dc90b2cd8f32ef9bf1e507fddfb2e2f7c33bddc790c4 -DIST commons-compress-1.26.1-src.tar.gz.asc 488 BLAKE2B 4df27d6d7ab226eb87ca6b7691c677b95d59c2d37f44ced6a5c0586aefa2506c9a635d869fd181526149416c228a8859a961386ca98519dc080709a55d9264c9 SHA512 b9533d63f961022ca42e79f8aed91a6c4b8a91cb0f3aa095a4ffa2202ed87d171f6c0d32babfbd730eb0c250be2331da4bd12e5251f7e7076f78536d20d96ced DIST commons-compress-1.27.1-src.tar.gz 61131529 BLAKE2B d6109c33d833548228e2bdcb2a5563526a7adede825de7422108d9e0890942e875b28032527bdc7c329306973c2ddc0da1995f028999c66b1ccefe5830a4a741 SHA512 c7a2cef26959e687ad19b96b5ba8393d7514095e13bf0f29bd41e6b3c3cb2260d8ff23283ff3d5fd137b2522b843e7f0f50ab46bcf0f66df5383674f35f223ab DIST commons-compress-1.27.1-src.tar.gz.asc 488 BLAKE2B d7ed8dfae26b41a8884deecfb8b09e827388749f9f2c1f762947dae61635c64a76e4f86171bf893eb4d6ca53e270332a2487afbab3664f33d6618837417e979c SHA512 a7e12ee2470eae3f76540115dfb7817c3ce6142e2ac23bbd42150c32d9b615e889d3c52122b253fa9e56408c99ae5415b4987b6d8b97ff52090f676a2087b2f5 diff --git a/dev-java/commons-compress/commons-compress-1.26.1.ebuild b/dev-java/commons-compress/commons-compress-1.26.1.ebuild deleted file mode 100644 index c8764e448be2..000000000000 --- a/dev-java/commons-compress/commons-compress-1.26.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Not ready for running tests, https://bugs.gentoo.org/839681 -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.commons:commons-compress:${PV}" - -inherit java-pkg-2 java-pkg-simple verify-sig - -DESCRIPTION="Java API for working with archive files" -HOMEPAGE="https://commons.apache.org/proper/commons-compress/" -SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz - verify-sig? ( https://downloads.apache.org/commons/compress/source/${P}-src.tar.gz.asc )" -S="${WORKDIR}/${P}-src" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -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/asm:9 - dev-java/brotli-dec:0 - dev-java/commons-codec:0 - >=dev-java/commons-io-2.15.1:1 - dev-java/commons-lang:3.6 - dev-java/xz-java:0 - dev-java/zstd-jni:0 -" -DEPEND="${CP_DEPEND} - >=virtual/jdk-11:* - dev-java/osgi-core:0" -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" - -JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.compress" -JAVA_CLASSPATH_EXTRA="osgi-core" -JAVA_ENCODING="iso-8859-1" -JAVA_MAIN_CLASS="org.apache.commons.compress.archivers.Lister" -JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/commons-compress/commons-compress-1.27.1.ebuild b/dev-java/commons-compress/commons-compress-1.27.1.ebuild index b2adfc0cc3c8..daf5a74c26c4 100644 --- a/dev-java/commons-compress/commons-compress-1.27.1.ebuild +++ b/dev-java/commons-compress/commons-compress-1.27.1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ppc64" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" diff --git a/dev-java/commons-csv/Manifest b/dev-java/commons-csv/Manifest index 0bc18bae17ce..8f3527d4f994 100644 --- a/dev-java/commons-csv/Manifest +++ b/dev-java/commons-csv/Manifest @@ -1 +1,2 @@ -DIST commons-csv-1.9.0-sources.tar.gz 36975991 BLAKE2B b2e2091556f3766968dbe660e4059f491eedc458d3c15c0372770d144737ab3ddcc78ff36f674759bde8aa9690e4bbe14866f8546e1de3b67498736678650697 SHA512 4610197fbbf1b3fb3ff19ff8f5ee0ffe945c34c05e3db71b89156bf17aa7f6b2816ddace85457fec82cb22337f777e08eac5984d7299e702b537f0d242d368d8 +DIST commons-csv-1.12.0-src.tar.gz 36993963 BLAKE2B ae6e207906efa3265ba92e1919356c77fa75616eaae0b095d9795100df2c5eb514c73a855ab4fc7a77c7958aff2eacaac860775b514e705e010e6cd3e5fb9e8c SHA512 67d8fd651a9785825b2f13c5f6bd95e0f2649ef9f65ec6889a2f9fcb34bd7a2a8c2b2df06e71eb0bcb1d0063953696daadbe06cf87624714682f0c3235fe7d11 +DIST commons-csv-1.12.0-src.tar.gz.asc 488 BLAKE2B a8185e5625b87fa6040b989f3c5d768c6cd689a63ddcec871b4a38ac1b4b8ae053f03d2a5f1a8e209205c1203f3514e8ef352e7c61eef009508cc0271a3944ad SHA512 0a74375a57a585cb7182cbd1935850b456ad33c119111eff8bac9c39470ed522ad64527b759eb1df5563ca12ca7dab983b7bf6eec3565970969e8d94ba357d4b diff --git a/dev-java/commons-csv/commons-csv-1.12.0-r1.ebuild b/dev-java/commons-csv/commons-csv-1.12.0-r1.ebuild new file mode 100644 index 000000000000..8a158bf83062 --- /dev/null +++ b/dev-java/commons-csv/commons-csv-1.12.0-r1.ebuild @@ -0,0 +1,96 @@ +# 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.commons:commons-csv:1.12.0" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Simple interface for reading and writing CSV files of various types" +HOMEPAGE="https://commons.apache.org/proper/commons-csv/" +SRC_URI="mirror://apache/commons/csv/source/${P}-src.tar.gz + verify-sig? ( https://archive.apache.org/dist/commons/csv/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/${P}-src" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 arm64 ppc64" + +RESTRICT="test" #839681 + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" + +DEPEND=" + >=virtual/jdk-11:* + dev-java/commons-codec:0 + >=dev-java/commons-io-2.17.0:1 + test? ( + >=dev-java/commons-lang-3.12.0:3.6 + dev-java/junit:5 + dev-java/mockito:4 + ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( LICENSE.txt NOTICE.txt RELEASE-NOTES.txt ) + +JAVA_CLASSPATH_EXTRA=" + commons-codec + commons-io-1 +" + +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH=" + commons-io-1 + commons-lang-3.6 + junit-5 + mockito-4 +" + +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +src_compile() { + # getting dependencies into the modulepath + DEPENDENCIES=( + commons-codec + commons-io-1 + ) + local modulepath + for dependency in ${DEPENDENCIES[@]}; do + modulepath="${modulepath}:$(java-pkg_getjars --build-only ${dependency})" + done + + local JAVA_MODULE_NAME="org.apache.${PN/-/.}" + JAVA_JAR_FILENAME="${JAVA_MODULE_NAME}.jar" + java-pkg-simple_src_compile # creates a legacy jar file without module-info + + # generate module-info.java + jdeps \ + --module-path "${modulepath}" \ + --add-modules=ALL-MODULE-PATH \ + --generate-module-info src/main \ + --multi-release 9 \ + "${JAVA_MODULE_NAME}.jar" || die + + # compile module-info.java + ejavac \ + -source 9 -target 9 \ + --module-path "${modulepath}" \ + --patch-module "${JAVA_MODULE_NAME}"="${JAVA_MODULE_NAME}.jar" \ + -d target/versions/9 \ + src/main/"${JAVA_MODULE_NAME}"/versions/9/module-info.java + + # package + JAVA_JAR_FILENAME="${PN}.jar" + jar cvf "${JAVA_JAR_FILENAME}" \ + -C target/classes . \ + --release 9 -C target/versions/9 . || die +} diff --git a/dev-java/commons-csv/commons-csv-1.9.0.ebuild b/dev-java/commons-csv/commons-csv-1.9.0.ebuild deleted file mode 100644 index 43f3489184f5..000000000000 --- a/dev-java/commons-csv/commons-csv-1.9.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/csv/source/commons-csv-1.9.0-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-csv-1.9.0.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.commons:commons-csv:1.9.0" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Simple interface for reading and writing CSV files of various types" -HOMEPAGE="https://commons.apache.org/proper/commons-csv/" -SRC_URI="mirror://apache/commons/csv/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# missing test deps -RESTRICT="test" - -# Compile dependencies -# POM: pom.xml -# test? com.h2database:h2:1.4.200 -> !!!groupId-not-found!!! -# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1 -# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6 -# test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!! -# test? org.junit.jupiter:junit-jupiter:5.8.0-M1 -> !!!groupId-not-found!!! -# test? org.mockito:mockito-core:3.11.2 -> !!!suitable-mavenVersion-not-found!!! - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - >=dev-java/commons-io-2.11.0:1 - >=dev-java/commons-lang-3.12.0:3.6 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${P}-src" - -DOCS=( LICENSE.txt NOTICE.txt RELEASE-NOTES.txt ) - -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="commons-io-1,commons-lang-3.6" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS=( - "src/test/resources" -) diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest index 46a5084819ff..7b277908e194 100644 --- a/dev-java/commons-daemon/Manifest +++ b/dev-java/commons-daemon/Manifest @@ -1,4 +1,2 @@ -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.3.4.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.4.ebuild deleted file mode 100644 index fcc845ad0c9a..000000000000 --- a/dev-java/commons-daemon/commons-daemon-1.3.4.ebuild +++ /dev/null @@ -1,55 +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-daemon:commons-daemon:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -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" -RESTRICT="test" #839681 - -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" -DEPEND=">=virtual/jdk-1.8:* - test? ( dev-java/junit:5[migration-support] )" -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,NOTICE,RELEASE-NOTES}.txt ) -HTML_DOCS=( PROPOSAL.html ) -PATCHES=( "${FILESDIR}/commons-daemon-1.3.1-Make.patch" ) - -JAVA_ENCODING="iso-8859-1" -JAVA_SRC_DIR="src/main/java" -JAVA_TEST_GENTOO_CLASSPATH="junit-4 junit-5" -JAVA_TEST_SRC_DIR="src/test/java" - -src_prepare() { - default #780585 - java-pkg-2_src_prepare -} - -src_compile() { - java-pkg-simple_src_compile - - 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-daemon/commons-daemon-1.4.0.ebuild b/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild index 148d6bb0b68d..d1c5b8fe6a5d 100644 --- a/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild +++ b/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ppc64" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" diff --git a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild index 1d6571243ef9..7bbce0d59dbb 100644 --- a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild +++ b/dev-java/commons-digester/commons-digester-2.1-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 # Skeleton command: @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/digester/source/${P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="2.1" -KEYWORDS="amd64 ppc64 x86" +KEYWORDS="amd64 ppc64" # Common dependencies # POM: pom.xml diff --git a/dev-java/commons-digester/commons-digester-3.2-r3.ebuild b/dev-java/commons-digester/commons-digester-3.2-r3.ebuild index 14a7ba03b87c..30428563c87c 100644 --- a/dev-java/commons-digester/commons-digester-3.2-r3.ebuild +++ b/dev-java/commons-digester/commons-digester-3.2-r3.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: @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/digester/source/${PN}3-${PV}-src.tar.gz -> ${P} LICENSE="Apache-2.0" SLOT="3.2" -KEYWORDS="amd64 ppc64 x86" +KEYWORDS="amd64 ppc64" # 1) atomWithNamespaceParse(org.apache.commons.digester3.xmlrules.SetNamespaceURITestCase) # java.net.UnknownHostException: commons.apache.org diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild index c0053b42b61e..434aab011045 100644 --- a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild +++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux" # Tests run: 2036, Failures: 91 RESTRICT="test" diff --git a/dev-java/commons-imaging/commons-imaging-0.97.ebuild b/dev-java/commons-imaging/commons-imaging-0.97.ebuild index 6017ef9c71e8..a403893ba5f1 100644 --- a/dev-java/commons-imaging/commons-imaging-0.97.ebuild +++ b/dev-java/commons-imaging/commons-imaging-0.97.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/sanselan-${PV}-incubator" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" RESTRICT="test" # 5/48 failures, dunno why :( DEPEND=">=virtual/jdk-1.8:* diff --git a/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild b/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild index 73382ff1998c..bf8374ec9408 100644 --- a/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild +++ b/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild @@ -4,7 +4,7 @@ EAPI=8 JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.commons:commons-imaging:${PV/_/-}" +MAVEN_ID="org.apache.commons:commons-imaging:1.0-alpha3" inherit java-pkg-2 java-pkg-simple verify-sig @@ -16,7 +16,7 @@ S="${WORKDIR}/${P/_/-}-src" LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest index fb0b54d1c510..636409e7d7c3 100644 --- a/dev-java/commons-io/Manifest +++ b/dev-java/commons-io/Manifest @@ -1,6 +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 DIST commons-io-2.17.0-src.tar.gz 652908 BLAKE2B c87f10584d7933215aa24e8bde1037eced0738098149e9423371a1fef0255e36e38a6c92cdafd75eecbf56d13c4c38d479fe2706afc86224900fcaf7cae5e5f5 SHA512 5681b7bab9e34e9051e4f7a48925ecdf5d8814894c2626298dfca7aa0566c2dc46c15843850e3e14a3e05613ae9ef9fd08077042931e2fe552057f9c1bee6b69 DIST commons-io-2.17.0-src.tar.gz.asc 488 BLAKE2B 451dcfbc952994a2402a7657fb0702572c8873c977681236c26326eec15316d543a39a48530760cf8a7c8b8469c7d18b1a7f88a80ab096d1604c33ec050c9b27 SHA512 8708d9cd17a2805c385006fbd5d0db883b593c67ff4afaaac507ca2dbe9f4b2e51cc1c492577b2e2cc6151a766264f1b3cd7c4b526fe16afa814d7ae29d2722c +DIST commons-io-2.18.0-src.tar.gz 670984 BLAKE2B 3d8ffbd602cf31e89cb42059e9a7f836d46baaf687662a44dd1d110978faa6926008ba5efcbf55e4f89138c5782be848bf8d1ccb5ed4ef10bb3bdbb750905b4d SHA512 0abc1dc252a72825c5256793780a6e1fa91b8a60436bf6badab1eba8a41f44e1e69b2b90b44c641ddfb78c28f95848e13ffc611793dedf68751bbb5272f86f85 +DIST commons-io-2.18.0-src.tar.gz.asc 488 BLAKE2B 2c88e3374a839fb58ef25422c33e120699b319ebdf2baa8f72180e0db8089a4b9b851fc648c0508aad9c7707c463fbb9b849b3eaf545f101195083a4dffae160 SHA512 8101ffb12f3253e71f0234eb8a5a04d88bc7e8777cabfc88ac64f50b416dd6b4be28f8dfd14d09a97a63257c159fab4b512584085550ce965fcfd97cdb637a9e diff --git a/dev-java/commons-io/commons-io-2.15.1.ebuild b/dev-java/commons-io/commons-io-2.15.1.ebuild deleted file mode 100644 index 99a17eafd8b9..000000000000 --- a/dev-java/commons-io/commons-io-2.15.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# 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" -RESTRICT="test" #839681 - -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.io" -JAVA_ENCODING="iso-8859-1" -JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/commons-io/commons-io-2.17.0.ebuild b/dev-java/commons-io/commons-io-2.17.0.ebuild index 76e4f661e617..68c6d5fe4ea6 100644 --- a/dev-java/commons-io/commons-io-2.17.0.ebuild +++ b/dev-java/commons-io/commons-io-2.17.0.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src" LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 arm64 ppc64 ~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 )" diff --git a/dev-java/commons-io/commons-io-2.16.1.ebuild b/dev-java/commons-io/commons-io-2.18.0.ebuild index 35be4d805df0..56e38e5d6014 100644 --- a/dev-java/commons-io/commons-io-2.16.1.ebuild +++ b/dev-java/commons-io/commons-io-2.18.0.ebuild @@ -17,14 +17,13 @@ S="${WORKDIR}/${P}-src" LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~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() { @@ -38,5 +37,4 @@ src_compile() { JAVA_JAR_FILENAME="${PN}.jar" java-pkg-simple_src_compile # creates the final jar file including module-info - } diff --git a/dev-java/commons-junit4/commons-junit4-1.2.17.ebuild b/dev-java/commons-junit4/commons-junit4-1.2.17.ebuild index d12acbb23c14..db679ebbac95 100644 --- a/dev-java/commons-junit4/commons-junit4-1.2.17.ebuild +++ b/dev-java/commons-junit4/commons-junit4-1.2.17.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 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/aunkrig/commons/archive/V${PV}.tar.gz -> unkrig-comm LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" ~dev-java/commons-nullanalysis-${PV}:0 diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest index 5a5b27266678..b32732aa2fad 100644 --- a/dev-java/commons-lang/Manifest +++ b/dev-java/commons-lang/Manifest @@ -1,4 +1,2 @@ -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.14.0.ebuild b/dev-java/commons-lang/commons-lang-3.14.0.ebuild deleted file mode 100644 index 556c3414c385..000000000000 --- a/dev-java/commons-lang/commons-lang-3.14.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# No tests because of missing eclass support of junit-jupiter, #902723 -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://archive.apache.org/dist/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" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" - -JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.lang3" -JAVA_ENCODING="ISO-8859-1" -JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/commons-lang/commons-lang-3.17.0.ebuild b/dev-java/commons-lang/commons-lang-3.17.0.ebuild index 39a3dddf56a5..2e6e6fe26018 100644 --- a/dev-java/commons-lang/commons-lang-3.17.0.ebuild +++ b/dev-java/commons-lang/commons-lang-3.17.0.ebuild @@ -17,7 +17,7 @@ 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" +KEYWORDS="amd64 arm64 ppc64 ~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 )" diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest index e45becaca4a5..7e4642ee4d7d 100644 --- a/dev-java/commons-logging/Manifest +++ b/dev-java/commons-logging/Manifest @@ -1,2 +1,4 @@ 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 +DIST commons-logging-1.3.4-src.tar.gz 195717 BLAKE2B ba691ea0033c14f54fcb525faeadd4b330e063f73175c5ee40a4f50f159f1b264efb9f40661c4af3902ddca7d43f8f9b84e7a77bf1eeb3b237b31f566fc98aab SHA512 a4049d8d7ea0d97f337e169fa5f572e32be1882e07102ab004d8b2de74170cb075a251ee9603590d6e10bee5933651e8e33e108a734fc100e8b2d5acd669cb44 +DIST commons-logging-1.3.4-src.tar.gz.asc 488 BLAKE2B a9cdc993891ff39bb8ebeaa3eefdecee1adb062ed77449dfa1dad75a43cf5aa5678f014d24765ebff7b761498abfc795d3bb68359a73f8de98cb4ac115cb68da SHA512 1c132b87f03ca54887172e45c36e1d8c66d4f12a2a6a2da84e0d6cf3ac2cd2366193829fac0393837371bc1cd34215cd6318c9e7ea6c406c11d9f0dce28b3143 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 d070c40f2dee..5c2c4113e057 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 arm64 ppc64 ~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-logging/commons-logging-1.3.4-r1.ebuild b/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild new file mode 100644 index 000000000000..a5429bc2802e --- /dev/null +++ b/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild @@ -0,0 +1,193 @@ +# 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="commons-logging:commons-logging:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems" +HOMEPAGE="https://commons.apache.org/proper/commons-logging/" +SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/logging/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/${P}-src" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="log4j" + +# src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTestCase.java:26: +# error: cannot find symbol +# import org.apache.commons.logging.impl.Log4jApiLogFactory; +# ^ +# symbol: class Log4jApiLogFactory +# location: package org.apache.commons.logging.impl +REQUIRED_USE="test? ( log4j )" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" + +COMMON_DEPEND=" + dev-java/jakarta-servlet-api:4 + dev-java/slf4j-api:0 + log4j? ( + dev-java/log4j-12-api:2 + dev-java/log4j-api:2 + ) +" + +DEPEND=" + ${COMMON_DEPEND} + >=virtual/jdk-11:* + test? ( + dev-java/commons-io:1 + dev-java/junit:5 + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + >=virtual/jre-1.8:* +" + +DOCS=( NOTICE.txt src/changes/changes.xml ) +HTML_DOCS=( PROPOSAL.html ) + +JAVA_GENTOO_CLASSPATH=" + jakarta-servlet-api-4 + slf4j-api +" + +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 + rm src/main/java/org/apache/commons/logging/impl/Log4jApiLogFactory.java || die + else + JAVA_GENTOO_CLASSPATH+=" + log4j-12-api-2 + log4j-api-2 + " + fi +} + +src_compile() { + # getting dependencies into the modulepath + DEPENDENCIES=( + jakarta-servlet-api-4 + slf4j-api + $(use log4j && echo log4j-12-api-2) + $(use log4j && echo log4j-api-2) + ) + local modulepath + for dependency in ${DEPENDENCIES[@]}; do + modulepath="${modulepath}:$(java-pkg_getjars --build-only ${dependency})" + done + + local JAVA_MODULE_NAME="org.apache.${PN/-/.}" + JAVA_JAR_FILENAME="${JAVA_MODULE_NAME}.jar" + java-pkg-simple_src_compile # creates a legacy jar file without module-info + + # generate module-info.java + jdeps \ + --module-path "${modulepath}" \ + --add-modules=ALL-MODULE-PATH \ + --generate-module-info src/main \ + --multi-release 9 \ + "${JAVA_MODULE_NAME}.jar" || die + + # compile module-info.java + ejavac \ + -source 9 -target 9 \ + --module-path "${modulepath}" \ + --patch-module "${JAVA_MODULE_NAME}"="${JAVA_MODULE_NAME}.jar" \ + -d target/versions/9 \ + src/main/"${JAVA_MODULE_NAME}"/versions/9/module-info.java + + # package + JAVA_JAR_FILENAME="${PN}.jar" + jar cvf "${JAVA_JAR_FILENAME}" \ + -C target/classes . \ + --release 9 -C target/versions/9 . || die + + pushd target/classes > /dev/null || die + + # pom.xml, lines 81-103 + jar -cvf ../../commons-logging-api.jar \ + $(find . -type f -name '*.class' \ + ! -name 'Jdk13LumberjackLogger.class' \ + ! -name 'ServletContextCleaner.class' \ + ) || die + + # pom.xml, lines 205-124 + jar -cvf ../../commons-logging-adapters.jar \ + $(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 + rm src/test/java/org/apache/commons/logging/log4j2/CallerInformationTestCase.java || die + # error: package ch.qos.logback.classic does not exist + rm src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java || die + + JAVA_TEST_EXCLUDES=( + org.apache.commons.logging.jdk14.TestHandler # No runnable methods + # junit.framework.AssertionFailedError: Wrong factory retrieved through + # ServiceLoader: org.apache.commons.logging.impl.Slf4jLogFactory + org.apache.commons.logging.serviceloader.ServiceLoaderTestCase + # junit.framework.ComparisonFailure: Log class expected:<...ommons.logging.impl.[NoOp]Log> + # but was:<...ommons.logging.impl.[Slf4jLogFactory$Slf4j]Log> + org.apache.commons.logging.noop.NoOpLogTestCase + # org.junit.runners.model.InvalidTestClassyyError: Invalid test class + org.apache.commons.logging.LogSourceTest # No runnable methods + # junit.framework.AssertionFailedError: Logging config succeeded when context class loader was null! + org.apache.commons.logging.LoadTestCase + # junit.framework.AssertionFailedError: + # expected:<org.apache.commons.logging.PathableClassLoader@1edf1c96> + # but was:<org.apache.commons.logging.PathableClassLoader@15615099> + org.apache.commons.logging.tccl.logfactory.AdaptersTcclTestCase + ) + JAVA_TEST_EXTRA_ARGS=( + -Dcommons-lang3="$(java-pkg_getjars commons-lang-3.6)" + -Dlog4j-api="commons-logging-api.jar" + -Dservlet-api="$(java-pkg_getjars jakarta-servlet-api-4)" + -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="commons-io-1 commons-lang-3.6 junit-4 junit-5" + JAVA_TEST_RESOURCE_DIRS="src/test/resources" + JAVA_TEST_SRC_DIR="src/test/java" + java-pkg-simple_src_test +} diff --git a/dev-java/commons-math/commons-math-3.6.1-r2.ebuild b/dev-java/commons-math/commons-math-3.6.1-r2.ebuild index 1ca7a92bf8f1..0eea263d2bf0 100644 --- a/dev-java/commons-math/commons-math-3.6.1-r2.ebuild +++ b/dev-java/commons-math/commons-math-3.6.1-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 @@ -20,6 +20,6 @@ RDEPEND=">=virtual/jre-1.8:*" LICENSE="Apache-2.0" SLOT="3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" JAVA_AUTOMATIC_MODULE_NAME="commons.math3" diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest index 06cd5df4828f..b5d71b6d6de8 100644 --- a/dev-java/commons-net/Manifest +++ b/dev-java/commons-net/Manifest @@ -1,4 +1,2 @@ -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.10.0.ebuild b/dev-java/commons-net/commons-net-3.10.0.ebuild deleted file mode 100644 index d4161a272d96..000000000000 --- a/dev-java/commons-net/commons-net-3.10.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# No tests because of missing eclass support of junit-jupiter, #902723 -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/commons-net-${PV}-src.tar.gz - verify-sig? ( https://downloads.apache.org/commons/net/source/commons-net-${PV}-src.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" - -DOCS=( - CONTRIBUTING.md - NOTICE.txt - README.md - RELEASE-NOTES.txt -) - -S="${WORKDIR}/${P}-src" - -JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.net" -JAVA_ENCODING="iso-8859-1" -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/commons-net/commons-net-3.11.1.ebuild b/dev-java/commons-net/commons-net-3.11.1.ebuild index 2563be67f5d0..95cd09406799 100644 --- a/dev-java/commons-net/commons-net-3.11.1.ebuild +++ b/dev-java/commons-net/commons-net-3.11.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 arm64 ppc64 ~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 )" diff --git a/dev-java/commons-nullanalysis/commons-nullanalysis-1.2.17.ebuild b/dev-java/commons-nullanalysis/commons-nullanalysis-1.2.17.ebuild index 837845785cf6..39a278856242 100644 --- a/dev-java/commons-nullanalysis/commons-nullanalysis-1.2.17.ebuild +++ b/dev-java/commons-nullanalysis/commons-nullanalysis-1.2.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/aunkrig/commons/archive/V${PV}.tar.gz -> unkrig-comm LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/commons-validator/commons-validator-1.8.0.ebuild b/dev-java/commons-validator/commons-validator-1.8.0.ebuild index e92d0c4c8374..cc7f18684c9e 100644 --- a/dev-java/commons-validator/commons-validator-1.8.0.ebuild +++ b/dev-java/commons-validator/commons-validator-1.8.0.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ppc64 x86" +KEYWORDS="amd64 ppc64" RESTRICT="test" #839681 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" 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 00e0b245b14b..a0badac9a380 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 arm64 ppc64 ~amd64-linux ~x86-linux" CP_DEPEND=" >=dev-java/ant-1.10.14-r3:0 diff --git a/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild b/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild index 4f495a844c3e..8ba3e3165de0 100644 --- a/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild +++ b/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${PN%lru}${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" CP_DEPEND="dev-java/jsr305:0" diff --git a/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild b/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild index d29f64fd9a94..78e56af7a41a 100644 --- a/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild +++ b/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/conversant/disruptor/archive/${PV}.tar.gz -> ${P}.ta LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Compile dependencies # POM: pom.xml diff --git a/dev-java/cortado/cortado-0.6.0-r3.ebuild b/dev-java/cortado/cortado-0.6.0-r3.ebuild index 5334a3b56737..0b6d3a915571 100644 --- a/dev-java/cortado/cortado-0.6.0-r3.ebuild +++ b/dev-java/cortado/cortado-0.6.0-r3.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="amd64 ppc64 x86" +KEYWORDS="amd64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/coursier-bin/Manifest b/dev-java/coursier-bin/Manifest index 4588b47c8186..27571551b666 100644 --- a/dev-java/coursier-bin/Manifest +++ b/dev-java/coursier-bin/Manifest @@ -1,2 +1,3 @@ DIST coursier-bin-2.1.13.gz 20930103 BLAKE2B 0f0281917061b7684dc5728217c240515ed82ad28c502f8a8ed13e6b8e79b4d1f41e958f788bb1e3aa54ebc9c36268282a1034829bc31b2501d52741d4b7cd3b SHA512 df3fe0b552525d4c1dcd50e4e31d3c9686d9bea6d75721ff4c30c93209a1ded5521f9f8ec9746260c0c75fd50c24bbcd5f5a163c4c3f8fbef72de8be20a9d266 +DIST coursier-bin-2.1.14.gz 20928552 BLAKE2B 80bb17f45d70bf213f2df42bde77214616e69c4d2fe7a2c8dbb89b8b19da18ef6c7397658b5cc46b63b469cdc4f0b4fcafed5540fcfa5e176a3d96dffc9c6758 SHA512 6545d50aebbefa3a21f6cc74ccda6f595593e5007832c7964dfe59f188848dbb72f177f9fa706ff2c6fe217701a816a8e7b4ee7f1e86a469d9363617a18232ba DIST coursier-bin-2.1.9.gz 20870390 BLAKE2B 720698e6c55a8c070d02f01ec528bab06f397b3c580fa3e533a45cf0073d8b9caf506cfff10d1b68eb9348c8b0da9abab9e7fb183f0561b62a82a96d21d35f5e SHA512 102c351aa0647fe5cd9d00ee164c1cebbcd6bd133a11bdfd653f70a5347da02e32ba74d5b51ea425e9189bb7113ef16c3902219bfa1ef0172bac7955712031c6 diff --git a/dev-java/coursier-bin/coursier-bin-2.1.14.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.14.ebuild new file mode 100644 index 000000000000..9d486aade5e9 --- /dev/null +++ b/dev-java/coursier-bin/coursier-bin-2.1.14.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 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" + +S="${WORKDIR}" +LICENSE="Apache-2.0" +SLOT="0" + +KEYWORDS="~amd64" + +RDEPEND=" + sys-libs/zlib + >=virtual/jre-8 +" + +QA_FLAGS_IGNORED="usr/bin/coursier" +QA_TEXTRELS="usr/bin/coursier" + +src_install() { + newbin "${P}" coursier +} diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild index 22c0fbb9f05f..d7566c4033ac 100644 --- a/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild +++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_beta/b}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" >=dev-java/ant-1.10.14:0 diff --git a/dev-java/dom4j/dom4j-2.1.4.ebuild b/dev-java/dom4j/dom4j-2.1.4.ebuild index 1d44328e98cd..8f84f42c2a58 100644 --- a/dev-java/dom4j/dom4j-2.1.4.ebuild +++ b/dev-java/dom4j/dom4j-2.1.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 @@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-version-${PV}" LICENSE="dom4j" SLOT="1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" IUSE="jaxen" CP_DEPEND=" diff --git a/dev-java/easymock/easymock-2.5.2.ebuild b/dev-java/easymock/easymock-2.5.2.ebuild index 30cfb883f7a9..e2c809259df2 100644 --- a/dev-java/easymock/easymock-2.5.2.ebuild +++ b/dev-java/easymock/easymock-2.5.2.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/easymock/easymock/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="2.5" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild index 0193c3bb5f12..0e51e3cce151 100644 --- a/dev-java/easymock/easymock-3.3.1-r1.ebuild +++ b/dev-java/easymock/easymock-3.3.1-r1.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 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="3.2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CDEPEND=" dev-java/cglib:3 diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest index 007a22f402d1..feadc35b9f4c 100644 --- a/dev-java/eclipse-ecj/Manifest +++ b/dev-java/eclipse-ecj/Manifest @@ -5,3 +5,4 @@ DIST ecjsrc-4.30.jar 2330181 BLAKE2B 7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469c 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 +DIST ecjsrc-4.34.jar 2369991 BLAKE2B 61ab2deff1753864b1b69eafb7ed99134a15d0e467ad91bc9ca8a74ca607ae2f3831b8e5af11fa2a584232302b7af510d043445e86bd327e09153666e8f0103e SHA512 6bf4f7c1630d81901ff8ed2345371cadcaf7f62c4edc7ade3211c0c254a2099c4e9506563c27c49be966765899f447fc280ff4ca411e636e269fca0f687a502c diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild index 612bc76ff406..ed68d10fff3b 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV LICENSE="EPL-1.0" SLOT="4.20" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm64 ~ppc64" 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 beb7971b8347..7461639f5d13 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}" LICENSE="EPL-1.0" SLOT="4.26" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm64 ~ppc64" BDEPEND=" app-arch/unzip diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild index 6042718d196f..8a56bb6643e9 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV LICENSE="EPL-1.0" SLOT="4.27" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64" BDEPEND="app-arch/unzip" COMMON_DEP="app-eselect/eselect-java" 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 fb20056ada16..fc58d48548c3 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}" LICENSE="EPL-1.0" SLOT="4.30" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64" 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 d7601e8396e0..2313722e16b3 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}" LICENSE="EPL-1.0" SLOT="4.31" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64" BDEPEND="app-arch/unzip" COMMON_DEP="app-eselect/eselect-java" diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild index 1b686c4f4bff..9389baa0e3bf 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}" LICENSE="EPL-1.0" SLOT="4.32" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64" BDEPEND="app-arch/unzip" COMMON_DEP="app-eselect/eselect-java" diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild index 3aec5546ba39..9c70b5f1d581 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}" LICENSE="EPL-1.0" SLOT="4.33" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64" BDEPEND="app-arch/unzip" COMMON_DEP="app-eselect/eselect-java" diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.34.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.34.ebuild new file mode 100644 index 000000000000..40075b629d91 --- /dev/null +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.34.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" +# 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}-202411201800" + +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.34" +# KEYWORDS="~amd64 ~arm64 ~ppc64" # Seems to depend on higher jdk which is not LTS + +BDEPEND="app-arch/unzip" + +# restrict to >=virtual/jdk-23:* +# ./org/eclipse/jdt/internal/compiler/apt/model/ElementsImpl9.java:347: error: cannot find symbol +# public DocCommentKind getDocCommentKind(Element e) { +# ^ +# symbol: class DocCommentKind +# location: class ElementsImpl9 +DEPEND=" + >=dev-java/ant-1.10.15:0 + >=virtual/jdk-23:* +" + +# restrict to >=virtual/jre-21:* +# ./org/eclipse/jdt/internal/compiler/lookup/TypeBinding.java:722: +# error: unconditional patterns in instanceof are not supported in -source 17 +# return isRecord() && components() instanceof RecordComponentBinding [] components && components.length > 0; +# ^ +# (use -source 21 or higher to enable unconditional patterns in instanceof) +RDEPEND=">=virtual/jre-21:*" + +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' \ + ! -name 'package.html' \ + ! -path '*/grammar/*' \ + ! -path '*/OSGI-INF/*' \ + | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die +} diff --git a/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild b/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild index 0aed027c4072..2ae4a1989ffd 100644 --- a/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild +++ b/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/eclipse.jdt.core-R${PV//./_}/org.eclipse.jdt.annotation" LICENSE="EPL-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/emma/emma-2.0.5312-r6.ebuild b/dev-java/emma/emma-2.0.5312-r6.ebuild index 5d554fb81287..9fef4cd0a586 100644 --- a/dev-java/emma/emma-2.0.5312-r6.ebuild +++ b/dev-java/emma/emma-2.0.5312-r6.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${P}" LICENSE="CPL-1.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" IUSE="+launcher" diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest index d5fc2fa612b3..b9dff69f0689 100644 --- a/dev-java/error-prone-annotations/Manifest +++ b/dev-java/error-prone-annotations/Manifest @@ -1,2 +1,2 @@ -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 +DIST error-prone-2.36.0.tar.gz 2887918 BLAKE2B 8478d23214681f887607c10339a554f839f84a1f6c80d2fda0c35463c405673e50301a0fb2f450a22ee12ef1b8c84ff904721f4184004bb35e28f567df760a0f SHA512 a9e8c78119ecfc99d064ed1a1748a7ca9931a9391f241b0d36886268dd1294623368a5f703bee5b5008fb4f20008be5a0073f2c1078a7086bc34adb4c6cdf5bd 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 index 4f6b1d2395ad..914659fb4271 100644 --- 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 @@ -15,7 +15,7 @@ S="${WORKDIR}/error-prone-${PV}/annotations" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-11:*" # module-info RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.36.0.ebuild index ee798f4c460f..6f831c3b913f 100644 --- a/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild +++ b/dev-java/error-prone-annotations/error-prone-annotations-2.36.0.ebuild @@ -15,10 +15,9 @@ S="${WORKDIR}/error-prone-${PV}/annotations" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="~amd64 ~arm64 ~ppc64" -DEPEND=">=virtual/jdk-11:*" +DEPEND=">=virtual/jdk-11:*" # module-info RDEPEND=">=virtual/jre-1.8:*" -JAVA_AUTOMATIC_MODULE_NAME="com.google.errorprone.annotations" JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild b/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild index 011a70f41489..330863ffeda8 100644 --- a/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild +++ b/dev-java/fastinfoset/fastinfoset-2.1.0-r1.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaxb-fi/archive/${PV}.tar.gz -> ${P}.ta LICENSE="Apache-2.0 EPL-1.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" >=virtual/jdk-11:* diff --git a/dev-java/fec/fec-1.0.4-r5.ebuild b/dev-java/fec/fec-1.0.4-r5.ebuild index 65c72bd07d18..63daf7190093 100644 --- a/dev-java/fec/fec-1.0.4-r5.ebuild +++ b/dev-java/fec/fec-1.0.4-r5.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${P}" LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="amd64 ~arm64" CP_DEPEND="dev-java/log4j-12-api:2" diff --git a/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild b/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild index 2b2058c5acad..2a9511a9f70e 100644 --- a/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild +++ b/dev-java/felix-framework/felix-framework-7.0.5-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 @@ -17,7 +17,7 @@ S="${WORKDIR}/org.apache.felix.framework-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND="dev-java/animal-sniffer-annotations:0" diff --git a/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild b/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild index a31b155dd9a4..7ee6e06d26ec 100644 --- a/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild +++ b/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/org.apache.felix.gogo.runtime-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" CP_DEPEND=" dev-java/osgi-annotation:0 diff --git a/dev-java/felix-main/felix-main-7.0.5-r2.ebuild b/dev-java/felix-main/felix-main-7.0.5-r2.ebuild index 92f6f1035d8c..58289214edbd 100644 --- a/dev-java/felix-main/felix-main-7.0.5-r2.ebuild +++ b/dev-java/felix-main/felix-main-7.0.5-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 @@ -16,7 +16,7 @@ S="${WORKDIR}/org.apache.felix.main-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Common dependencies # POM: pom.xml diff --git a/dev-java/felix-resolver/felix-resolver-2.0.4-r1.ebuild b/dev-java/felix-resolver/felix-resolver-2.0.4-r1.ebuild index e95f1cbbf3ad..4dca801b9b68 100644 --- a/dev-java/felix-resolver/felix-resolver-2.0.4-r1.ebuild +++ b/dev-java/felix-resolver/felix-resolver-2.0.4-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 @@ -16,7 +16,7 @@ SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" dev-java/osgi-annotation:0 diff --git a/dev-java/felix-utils/felix-utils-1.11.8-r1.ebuild b/dev-java/felix-utils/felix-utils-1.11.8-r1.ebuild index 7ddf0241d207..f89f0115751d 100644 --- a/dev-java/felix-utils/felix-utils-1.11.8-r1.ebuild +++ b/dev-java/felix-utils/felix-utils-1.11.8-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,7 +17,7 @@ S="${WORKDIR}/org.apache.felix.utils-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild b/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild index 99153285f62d..707674f8b69f 100644 --- a/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild +++ b/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Common dependencies # POM: ${P}.pom diff --git a/dev-java/fishbowl/fishbowl-1.4.1.ebuild b/dev-java/fishbowl/fishbowl-1.4.1.ebuild index a00f47a95146..1cbcb60bb4ab 100644 --- a/dev-java/fishbowl/fishbowl-1.4.1.ebuild +++ b/dev-java/fishbowl/fishbowl-1.4.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: @@ -19,7 +19,7 @@ SRC_URI="https://github.com/stefanbirkner/${PN}/archive/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm64 ~ppc64" # Compile dependencies # POM: pom.xml diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest index 088db0a2393c..a015e94c5be2 100644 --- a/dev-java/fontbox/Manifest +++ b/dev-java/fontbox/Manifest @@ -1,6 +1,11 @@ DIST DejaVuSansMono.ttf 317336 BLAKE2B c80f50cea451963a75c66160596b67655afb19c9ea0d61b8a5cd38b81c66bdd89a24872d293fa8752b1ce0bb828d63caf91e682c283312d5828218943c63c095 SHA512 1af1ce3e6d34a0b89c93072d8646e92cceb45b276389d2dd0d84457ec1193394d2bcc49bf3ce99c9c6b2658cd1337fc40ee5c61957f74cd45dbc3d51b6aef417 +DIST DejaVuSerifCondensed.pfb 1062649 BLAKE2B 05159cb62eb4c3335b806d5b11653429bf84c6d14ed8e62bf2d8dcbc0b7a9818b1aad05e02f174a16c0163efe1cd433c26cde727d9245abe7eb47fd61d9960b3 SHA512 6ef13c3497862dc8e4c2a4261bc3a7ef3e2dd75e00ae2af4912b236b387225541db76c72854fbb2323d1064311ffdda9e64ed7065afc3a7d13f5b71b7df2f2ef DIST NotoEmoji-Regular.ttf 418804 BLAKE2B e94f7b1d5bced052ff3f15a32ecce8f0f1dc2ef19565d3bcaa75b82676fbf0efeaa6efa1d25edf352b577acce17a45c6f0e7be1550c46a8c2ab6cef208cd6f11 SHA512 51b01ab0794be9f92c59679f6d56d4ce09ed959daeb9ec945bb837eb15a82ab302e83b29aab1972ac9cb648f7196a5f5ff4488a4622b36bedbc9cd0cab6dc3de +DIST NotoMono-Regular.ttf 107848 BLAKE2B 2f0fdfbda5eec2c6cd1a2fd9812a2459c9af09c9d0e77c85504911d50a27433b769c766df3c2c7533c6c83b9c8a928c13aa1994823aa043ace68c37c0d897b00 SHA512 a5f3a12a02d096337cefd82a352a9d4f43555283873211c4ed0ac63eb1e722514dbd97dc959208e38643784b007ef27a96280f57ef01355fdbd8884b84d13d4c DIST NotoSansSC-Regular.otf 8481960 BLAKE2B 3eee2c1e6be5e013d2ed679ccb361221e3e410150c7dc32d570382355e80e540c71be9009ece9951eea2379fb08fc05d8bcd65e941677660c55b450d660e8b03 SHA512 cbdd317d16099d24736457eef631353c7830a1a3c132b01f2cdc1e6a0c21a78e3b1fe8479b3f40179e7630a15cc23a093775bb22d521dba39376bb367d497b21 DIST OpenSans-Regular.pfb 100962 BLAKE2B ff906c67a79df9d8deb9736f7439ba5429b72940b6a6fa49751fdea88adef70a3b57f28b2c31014da3206efe601095a8caeb98382fb36f8544afd0bec5cce355 SHA512 2787fcecc0feb1c9e6ff0d8de6193658413863e44eaab572751ca7e6c3b369c0a9731f4952cb0821f307760f0422f77c5f0d3fe7df6b054643fb39423e8d70ee DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f0e7a773c2715d50ca1a526b1ff683bc6544155b1e170fb828c3923d6b22cdf7017f9da9de164523f328c1cc187 SHA512 28a044a2685fbc8da7810d9ac7b6b93a95542d504d7d8e671f009b8ebb2f5b70c974be7ea78974b188d8e6ab17d65b08f276c054927857315d5aad26f6fe36fc +DIST ipag00303.zip 4295310 BLAKE2B b68dd7dd7a7320894d782350c4598572c31d6ef492f9572adc2aac20ca98b5c5027995c0169bf815bc1e3a64d635b0e2d4e378b749e034f2fe718bcb7901d40a SHA512 59535137c649a2f8bdbb463cd716426811a6003a65883ca6e45bb0af1d526b3889af0fba3a353e90bc8d373cd32b90a27ff9ff6916ecbccb42e922c09e9b046a DIST pdfbox-2.0.27-src.zip 15770627 BLAKE2B 9f93d597141ff3da39b69da3ce989a0cc7f4020071e5cb1609a8b86d0f12a3219037cb4c7b276acf58ee6b07d842b6d7c76e14fdf79e9efdeac401048e345f89 SHA512 59a5675f5d1d34f092adc019679f7d10e7e93c0f554a002ac29d48cbffcaa600d930309fa94a92191c01ead8da905cbb37ce5e233dcc9b8732a881d4abf75def +DIST pdfbox-2.0.32-src.zip 17094201 BLAKE2B a48677819bab371d82a956affa8a9b55a8dca2627bb301b56facb4408229639162550c67eccc843b903e28a3f6258db4b0c096c2b40c134c1f0bf6085ff122d0 SHA512 bdad289bda79e78774dd4dedb8b0531f20382038e96232eb6c55508e2187ca3d7512072e87cd293fe6d1b9967d7e6a44f39b09a3af59872bf2f307275a65f546 +DIST pdfbox-2.0.32-src.zip.asc 195 BLAKE2B a3c1f8078ded155bfecca3c15ec8c9ae648ab6dbfa9c023715eabdf72f092920b0c0ddedaafed3fc6a186f05c9880fbaa703eb088b704964ac4bb8bd5dd386e8 SHA512 b6aff86c09f75234c57ae079eff71e098377e27a1b0d55911b2cd466ff74c5d529c9cd45ba20653adae3a9b5f9ecfc3e9d6df0647bae59a7b651f128ef3b39e5 diff --git a/dev-java/fontbox/fontbox-2.0.27.ebuild b/dev-java/fontbox/fontbox-2.0.27.ebuild index 98a6bc644ba5..f707ac643437 100644 --- a/dev-java/fontbox/fontbox-2.0.27.ebuild +++ b/dev-java/fontbox/fontbox-2.0.27.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: @@ -25,7 +25,7 @@ SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Common dependencies # POM: pom.xml diff --git a/dev-java/fontbox/fontbox-2.0.32.ebuild b/dev-java/fontbox/fontbox-2.0.32.ebuild new file mode 100644 index 000000000000..8b6a4b0fe28d --- /dev/null +++ b/dev-java/fontbox/fontbox-2.0.32.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" +MAVEN_ID="org.apache.pdfbox:fontbox:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="An open source Java library for parsing font files" +HOMEPAGE="https://pdfbox.apache.org/" +SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip + test? ( + https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf + https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf + https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf + https://issues.apache.org/jira/secure/attachment/13036376/NotoSansSC-Regular.otf + https://issues.apache.org/jira/secure/attachment/13064282/DejaVuSerifCondensed.pfb + https://issues.apache.org/jira/secure/attachment/13065025/NotoMono-Regular.ttf + https://mirrors.ctan.org/fonts/opensans/type1/OpenSans-Regular.pfb + https://moji.or.jp/wp-content/ipafont/IPAfont/ipag00303.zip + ) + verify-sig? ( https://downloads.apache.org/pdfbox/${PV}/pdfbox-${PV}-src.zip.asc )" +S="${WORKDIR}/pdfbox-${PV}/${PN}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/pdfbox.apache.org.asc" +BDEPEND=" + app-arch/unzip + verify-sig? ( sec-keys/openpgp-keys-apache-pdfbox ) +" +CP_DEPEND="dev-java/commons-logging:0" +DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-1.8:* +" +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" + +JAVA_AUTOMATIC_MODULE_NAME="org.apache.fontbox" +JAVA_RESOURCE_DIRS="src/main/resources" +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_unpack() { + if use verify-sig; then + verify-sig_verify_detached \ + "${DISTDIR}/pdfbox-${PV}-src.zip" \ + "${DISTDIR}/pdfbox-${PV}-src.zip.asc" + fi + default +} + +src_test() { + mkdir --parents target/{pdfs,fonts} || die + cp \ + "${DISTDIR}"/SourceSansProBold.otf \ + "${DISTDIR}"/NotoEmoji-Regular.ttf \ + "${DISTDIR}"/NotoSansSC-Regular.otf \ + "target/pdfs" || die + cp \ + "${DISTDIR}"/DejaVuSansMono.ttf \ + "${DISTDIR}"/OpenSans-Regular.pfb \ + "${DISTDIR}"/NotoEmoji-Regular.ttf \ + "${DISTDIR}"/NotoMono-Regular.ttf \ + "${DISTDIR}"/DejaVuSerifCondensed.pfb \ + "${DISTDIR}"/NotoSansSC-Regular.otf \ + "${DISTDIR}"/SourceSansProBold.otf \ + "target/fonts" || die + unzip "${DISTDIR}"/ipag00303.zip -d "target/fonts" || die + + java-pkg-simple_src_test +} diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest index 09319bb63d30..22c0a4d70524 100644 --- a/dev-java/fop/Manifest +++ b/dev-java/fop/Manifest @@ -1,4 +1,4 @@ -DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c SHA512 71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6 -DIST fop-2.9-src.tar.gz 20642865 BLAKE2B 6ab265ddfb1c07b9266687930af21ac4653438800772da836dbceb14de126333dcff50c2cea1352ad77988ec7f7a3d4eef91341983edc13684abf2531634eb0a SHA512 d346c8fffd0d3ff5e803bea4233ce171972ded39b0c475b367333e37247da8f9e823c7e2e75fab735bf9282654d67befa2fa473f53a199cbd96b0f7305b3c093 -DIST fop-2.9-src.tar.gz.asc 833 BLAKE2B 284f04d450bcfb6583d353ae21bbadad8da14b59d946e094453b564e700c8cfdcb448ed206a5a246b725b453a1b3feea69f96ff3b2a683320bce6743cc5a167f SHA512 404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc +DIST fop-2.10-jars.tar.xz 7696 BLAKE2B aa5db0a4ee8b96e54e7beccccc21bd4559f2f228476ab65a12935fbbd69924e23296c1dfcf6e717b6031b9e21efd3aeed4df130ba5f8717ae47a1b0628013d59 SHA512 7c9d14f71e94e6a706c845d71a95adcbf0c77934618d9ce070dfd677adf8d2f171ab6e16954db684dc1781f91719e194382a629274435ecef3d3fbf0e5c7bae3 +DIST fop-2.10-src.tar.gz 20903590 BLAKE2B 5217edbabc255b2e37c6198ea7cdfb1344db0726c7156f73bdc5ac452c4c233c5280d263e65656cde92ce6aa52c8ea94e346d9d14535ca802fc37fe1475ba255 SHA512 c5ae25be3e3a4da01195e108dec66743ab6017967220db1f4e4300f79594d8144de23876eeac07b2068db75a60e1b25d10ddad48533bd0cd6cb9e110b519fcf6 +DIST fop-2.10-src.tar.gz.asc 833 BLAKE2B 70b200af6f3611b3dcd6da9d8728b12ee9a7bd4882919965c641e822cdd21510669cc98ace5d8caaa42e05347ae0d9b07384365377bbd4c5ca0b1edc07e2ff80 SHA512 ae9628cf9ca84d9c2ac1bfddcb4aec786985d3fdca16c2541e45690c81695ec5361dc1641a30572fc2d95defa69cab61a1992ab0d16843344411acb77835a73c DIST fop-hyph-2.0.jar 6655933 BLAKE2B bfbefcc2ebd9a9a467c23a70d7cef256f83cf2335f6e17db6bbefceaf8a3cee78de0302f269d096eb3238b3f4883429e09cc640bed11a42da4ef67ab9f0cb164 SHA512 3d5f27623008c7beba5332387bd42c501b7ae1dddfc98014b3fb35273394ca5f0a4ce69e7726090ec468c9b4f7983fb8b1a5759f49e81ea342c81c61311d87b3 diff --git a/dev-java/fop/files/fop-2.10-java23.patch b/dev-java/fop/files/fop-2.10-java23.patch new file mode 100644 index 000000000000..fb3aae334c72 --- /dev/null +++ b/dev-java/fop/files/fop-2.10-java23.patch @@ -0,0 +1,52 @@ +From 49e0e9ae69cf96eb4c13527b271c8a70a5f5f843 Mon Sep 17 00:00:00 2001 +From: Simon Steiner <ssteiner@apache.org> +Date: Mon, 21 Oct 2024 10:10:54 +0100 +Subject: [PATCH] Fix compile on Java 23 + +--- + .github/workflows/maven.yml | 2 +- + .../main/java/org/apache/fop/layoutmgr/KnuthSequence.java | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +# diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml +# index a9c6e0f7eba..d5e426590b5 100644 +# --- a/.github/workflows/maven.yml +# +++ b/.github/workflows/maven.yml +# @@ -17,7 +17,7 @@ jobs: +# strategy: +# fail-fast: false +# matrix: +# - jdk: ['8', '11', '17', '21'] +# + jdk: ['8', '11', '17', '21', '23'] +# os: [ubuntu-latest, windows-latest] +# +# steps: +# diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/KnuthSequence.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/KnuthSequence.java +# index ce85b686cb4..8f4a6d66c0f 100644 +--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/KnuthSequence.java ++++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/KnuthSequence.java +@@ -134,20 +134,20 @@ public void wrapPositions(LayoutManager lm) { + /** + * @return the last element of this sequence. + */ +- public ListElement getLast() { ++ public T getLast() { + return (isEmpty() + ? null +- : (ListElement) ListUtil.getLast(this)); ++ : ListUtil.getLast(this)); + } + + /** + * Remove the last element of this sequence. + * @return the removed element. + */ +- public ListElement removeLast() { ++ public T removeLast() { + return (isEmpty() + ? null +- : (ListElement) ListUtil.removeLast(this)); ++ : ListUtil.removeLast(this)); + } + + /** diff --git a/dev-java/fop/fop-2.9-r1.ebuild b/dev-java/fop/fop-2.10.ebuild index c9268c877d7d..07e4bc1319a9 100644 --- a/dev-java/fop/fop-2.9-r1.ebuild +++ b/dev-java/fop/fop-2.10.ebuild @@ -13,15 +13,15 @@ DESCRIPTION="XML Graphics Format Object Processor All-In-One" HOMEPAGE="https://xmlgraphics.apache.org/fop/" SRC_URI=" mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz - https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz + https://dev.gentoo.org/~fordfrog/distfiles/fop-2.10-jars.tar.xz verify-sig? ( https://downloads.apache.org/xmlgraphics/fop/source/${P}-src.tar.gz.asc ) test? ( https://repo1.maven.org/maven2/net/sf/offo/fop-hyph/2.0/fop-hyph-2.0.jar ) " -S="${WORKDIR}/fop-${PV}" +S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="2.8" -KEYWORDS="amd64 ~arm64 ppc64 x86" +KEYWORDS="amd64 ~arm64 ~ppc64" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc" @@ -32,17 +32,20 @@ BDEPEND=" CP_DEPEND=" >=dev-java/ant-1.10.14-r3:0 - dev-java/batik:1.16 + dev-java/batik:0 + dev-java/bcprov:0 + dev-java/bcpkix:0 dev-java/commons-io:1 dev-java/commons-logging:0 dev-java/fontbox:0 - dev-java/javax-servlet-api:2.2 + dev-java/jakarta-servlet-api:6.1 dev-java/qdox:1.12 dev-java/sun-jai-bin:0 - dev-java/xmlgraphics-commons:2 + dev-java/xmlgraphics-commons:0 " -DEPEND="${CP_DEPEND} +DEPEND=" + ${CP_DEPEND} >=virtual/jdk-1.8:* test? ( dev-java/mockito:2 @@ -51,16 +54,16 @@ DEPEND="${CP_DEPEND} ) " -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" DOCS=( NOTICE README ) PATCHES=( "${FILESDIR}/fop-2.9-PDFEncodingTestCase.patch" - "${FILESDIR}/fop-2.9-PDFToUnicodeCMapTestCase.patch" - "${FILESDIR}/fop-2.9-MissingLanguageWarningTestCase.patch" - "${FILESDIR}/fop-2.9-FO2StructureTreeConverterTestCase.patch" + "${FILESDIR}/fop-2.10-java23.patch" ) src_unpack() { @@ -72,8 +75,8 @@ src_unpack() { src_prepare() { java-pkg_clean + default #780585 java-pkg-2_src_prepare - default } src_compile() { @@ -117,18 +120,25 @@ src_compile() { -XSL code-point-mapping.xsl \ -OUT ../../java/org/apache/fop/fonts/base14/CodePointMapping.java || die popd > /dev/null || die - java-pkg-simple_src_compile - # Update "fop-core.jar" with "event-mode.xml" files produced manually - # by running "mvn package". - # Upstream does this with maven-antrun-plugin: - # https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L269-L290 - mkdir event-model && pushd $_ > /dev/null || die - jar -xf "${WORKDIR}/fop-2.7-core-event-models.jar" + # Update JAVA_RESOURCE_DIRS with "event-mode.xml" files + # produced manually by running "mvn package". + # Upstream does this with maven-antrun-plugin, fop-core/pom.xml lines 285-308 + pushd "${JAVA_RESOURCE_DIRS}" > /dev/null || die + jar -xf "${WORKDIR}/fop-2.10-core-event-models.jar" popd > /dev/null || die - jar -uf "fop-core.jar" -C event-model . || die - JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-core.jar" +# einfo "Code generation according to fop-events/pom.xml lines 80-92" +# mkdir -p test/java || die +# mkdir -p fop-core/target/classes || die +# local cp=fop-events.jar:"$(java-pkg_getjar ant ant.jar):$(java-pkg_getjars qdox-1.12)" +# "$(java-config -J)" -cp "${cp}" \ +# org.apache.fop.eventtools.EventProducerCollectorTask \ +# fop-core/target/classes \ +# fop-core/src/main/java/org/apache/fop/afp/AFPEventProducer.java || die + + java-pkg-simple_src_compile + rm -r target || die if use doc; then \ @@ -150,7 +160,7 @@ src_test() { JAVA_TEST_SRC_DIR="fop-events/src/test/java" # This jar file was created manually from the output of "mvn test". # Upstream does this with maven-antrun-plugin - jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die + jar -xf "${WORKDIR}/fop-2.10-test-event-model.jar" || die mkdir generated-test || die mv {target/test-classes,generated-test}/org || die java-pkg-simple_src_test diff --git a/dev-java/freenet-ext/freenet-ext-29-r1.ebuild b/dev-java/freenet-ext/freenet-ext-29-r1.ebuild index afdb83a3f7f7..92b682371ecd 100644 --- a/dev-java/freenet-ext/freenet-ext-29-r1.ebuild +++ b/dev-java/freenet-ext/freenet-ext-29-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/contrib-${PV}" LICENSE="public-domain" SLOT="29" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" DEPEND=" dev-libs/gmp:0= diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild index c10584cf3013..cda48af055c0 100644 --- a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild +++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.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 @@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="1" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 ~arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" CDEPEND="dev-java/java-getopt:1" diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest index d604ef388c85..a788d521af99 100644 --- a/dev-java/gradle-bin/Manifest +++ b/dev-java/gradle-bin/Manifest @@ -1,5 +1,4 @@ DIST gradle-bin-8.10.2.zip 227989293 BLAKE2B 3eaafca3c06bb82b6c95026421f40d1e24f590d2660f781aca8f3eaac72a8077bbb735297465d8ad430507003fd9231db848369e96542276098614942076258f SHA512 b2fbf57701e7d8f02b425988afe3fcad7a22814823b4748db68ea4c1c7f3027110b3d3b5f6797eded037cc28356b630b1bd6b24e0169107b85abdc860184ee53 -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.2.ebuild b/dev-java/gradle-bin/gradle-bin-8.10.2.ebuild index fb2e7d556b51..92e4a58d6fc2 100644 --- a/dev-java/gradle-bin/gradle-bin-8.10.2.ebuild +++ b/dev-java/gradle-bin/gradle-bin-8.10.2.ebuild @@ -17,7 +17,7 @@ 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" +KEYWORDS="amd64" DEPEND="app-eselect/eselect-gradle" BDEPEND="app-arch/unzip" diff --git a/dev-java/gradle-bin/gradle-bin-8.10.ebuild b/dev-java/gradle-bin/gradle-bin-8.10.ebuild deleted file mode 100644 index e83e548a9a62..000000000000 --- a/dev-java/gradle-bin/gradle-bin-8.10.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# 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.4.ebuild b/dev-java/gradle-bin/gradle-bin-8.4.ebuild index 1d63ca89fe19..6f7e1929e758 100644 --- a/dev-java/gradle-bin/gradle-bin-8.4.ebuild +++ b/dev-java/gradle-bin/gradle-bin-8.4.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/" LICENSE="Apache-2.0" SLOT="${PV}" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64" DEPEND="app-eselect/eselect-gradle" BDEPEND="app-arch/unzip" diff --git a/dev-java/gradle-bin/gradle-bin-8.5.ebuild b/dev-java/gradle-bin/gradle-bin-8.5.ebuild index 1d63ca89fe19..6f7e1929e758 100644 --- a/dev-java/gradle-bin/gradle-bin-8.5.ebuild +++ b/dev-java/gradle-bin/gradle-bin-8.5.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/" LICENSE="Apache-2.0" SLOT="${PV}" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64" DEPEND="app-eselect/eselect-gradle" BDEPEND="app-arch/unzip" diff --git a/dev-java/gradle-bin/gradle-bin-8.7.ebuild b/dev-java/gradle-bin/gradle-bin-8.7.ebuild index 1d63ca89fe19..6f7e1929e758 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" DEPEND="app-eselect/eselect-gradle" BDEPEND="app-arch/unzip" diff --git a/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild index 564a6c9ca56d..47cec623a6ab 100644 --- a/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild +++ b/dev-java/greenmail/greenmail-2.0.0_alpha2.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: @@ -19,7 +19,7 @@ SRC_URI="https://github.com/greenmail-mail-test/greenmail/archive/release-${PV/_ LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Common dependencies # POM: pom.xml diff --git a/dev-java/gson/gson-2.11.0-r2.ebuild b/dev-java/gson/gson-2.11.0-r2.ebuild index 0284eb26ee8b..da7f2829daf6 100644 --- a/dev-java/gson/gson-2.11.0-r2.ebuild +++ b/dev-java/gson/gson-2.11.0-r2.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/gson-gson-parent-${PV}/gson" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" dev-java/error-prone-annotations:0 diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest index 85db383245eb..95ff24c734e4 100644 --- a/dev-java/guava-testlib/Manifest +++ b/dev-java/guava-testlib/Manifest @@ -1,3 +1,3 @@ -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 guava-33.3.1.tar.gz 5827149 BLAKE2B f8ad29e921d7de7d4eeb65812a24dec9ee27feab7d8294ac037ac526c8069a652d7381af92afd457339ff394488d7c56d562e116b2508f105ced32080f727d78 SHA512 d357953607266b844d5711821a261b110bf44c32713a7c889aebc32e7a8e63aaa8126f1f1aee7c6ad3cf44830bd231a19fc09d802f1abeaff42096470214b0c3 DIST truth-1.4.2.jar 275487 BLAKE2B 9c0dce92648f734ab88a0faf1a1e5328d747efffd29aa8f12b7ed2b2c87036ce18bf3195348f9ffce848842a240179fa60e9625c6997439a4cedce6aac6c2b77 SHA512 5f29cb259f2cf63e8a908061d2a58b28ecf12366a03564c8e63c33cdbdb21935ac95ed7b68437b015a2bd055732c88ec8ca1e55b45b99a2cb3e9dd53cb0b87cc diff --git a/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild b/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild index c005039e87d3..99cd78d75489 100644 --- a/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild +++ b/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/guava-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" >=dev-java/error-prone-annotations-2.32.0:0 diff --git a/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild b/dev-java/guava-testlib/guava-testlib-33.3.1.ebuild index ca8893700df5..d62428453c97 100644 --- a/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild +++ b/dev-java/guava-testlib/guava-testlib-33.3.1.ebuild @@ -18,17 +18,17 @@ S="${WORKDIR}/guava-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="~amd64 ~arm64 ~ppc64" CP_DEPEND=" - >=dev-java/error-prone-annotations-2.27.1:0 + >=dev-java/error-prone-annotations-2.36.0:0 ~dev-java/guava-${PV}:0 dev-java/jsr305:0 dev-java/junit:4 " DEPEND="${CP_DEPEND} - dev-java/checker-framework-qual:0 + >=dev-java/checker-framework-qual-3.48.2:0 dev-java/j2objc-annotations:0 >=virtual/jdk-1.8:*" diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest index a0da1bd1de4a..36560547d45b 100644 --- a/dev-java/guava/Manifest +++ b/dev-java/guava/Manifest @@ -1,2 +1,2 @@ -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 guava-33.3.1.tar.gz 5827149 BLAKE2B f8ad29e921d7de7d4eeb65812a24dec9ee27feab7d8294ac037ac526c8069a652d7381af92afd457339ff394488d7c56d562e116b2508f105ced32080f727d78 SHA512 d357953607266b844d5711821a261b110bf44c32713a7c889aebc32e7a8e63aaa8126f1f1aee7c6ad3cf44830bd231a19fc09d802f1abeaff42096470214b0c3 diff --git a/dev-java/guava/guava-33.3.0.ebuild b/dev-java/guava/guava-33.3.0.ebuild index c24a36ec75a2..f30fc400b280 100644 --- a/dev-java/guava/guava-33.3.0.ebuild +++ b/dev-java/guava/guava-33.3.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" >=dev-java/error-prone-annotations-2.32.0:0 diff --git a/dev-java/guava/guava-33.2.0.ebuild b/dev-java/guava/guava-33.3.1.ebuild index 052a43b0fdd5..5d43bdc9619a 100644 --- a/dev-java/guava/guava-33.2.0.ebuild +++ b/dev-java/guava/guava-33.3.1.ebuild @@ -15,16 +15,16 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="~amd64 ~arm64 ~ppc64" CP_DEPEND=" - >=dev-java/error-prone-annotations-2.27.1:0 + >=dev-java/error-prone-annotations-2.36.0:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 " DEPEND="${CP_DEPEND} - dev-java/checker-framework-qual:0 + >=dev-java/checker-framework-qual-3.48.2:0 >=virtual/jdk-1.8:*" RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" diff --git a/dev-java/guice/guice-5.1.0-r1.ebuild b/dev-java/guice/guice-5.1.0-r1.ebuild index 4f2610fff44c..5bc330f4392f 100644 --- a/dev-java/guice/guice-5.1.0-r1.ebuild +++ b/dev-java/guice/guice-5.1.0-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Most of the test dependencies are missing in Gentoo. RESTRICT="test" diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild index d8b3c2e8df34..4dacae9bd323 100644 --- a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild +++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild @@ -1,7 +1,7 @@ -# 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" @@ -13,19 +13,18 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="Library of matchers for building test expressions" HOMEPAGE="https://hamcrest.org/JavaHamcrest/" SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}" LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x64-solaris" - -RDEPEND=" - >=virtual/jre-1.8:*" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x64-solaris" DEPEND=" >=virtual/jdk-1.8:* - source? ( app-arch/zip )" + source? ( app-arch/zip ) +" -S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}" +RDEPEND=">=virtual/jre-1.8:*" JAVA_SRC_DIR="${PN}/src" @@ -35,6 +34,7 @@ PATCHES=( ) src_prepare() { - default + default #780585 + java-pkg-2_src_prepare java-pkg_clean } diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild index 8ef55c0cf9a8..539bef963fe7 100644 --- a/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild +++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r3.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 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.ta LICENSE="BSD-2" SLOT="${PV}" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild index 2a11b0c6d4ed..4a94b8f78396 100644 --- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild +++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.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 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.ta LICENSE="BSD-2" SLOT="${PV}" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos" +KEYWORDS="amd64 arm64 ppc64 ~ppc-macos ~x64-macos" CP_DEPEND="dev-java/qdox:1.12" diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild index 1fb31d824ea8..71c99713745f 100644 --- a/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild +++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.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 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.ta LICENSE="BSD-2" SLOT="${PV}" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND="dev-java/hamcrest-core:1.3" diff --git a/dev-java/hamcrest/Manifest b/dev-java/hamcrest/Manifest index f19c6fe1c13e..d6bae6b84872 100644 --- a/dev-java/hamcrest/Manifest +++ b/dev-java/hamcrest/Manifest @@ -1,2 +1 @@ -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/files/hamcrest-2.2-java-11.patch b/dev-java/hamcrest/files/hamcrest-2.2-java-11.patch deleted file mode 100644 index 83d8ddea9108..000000000000 --- a/dev-java/hamcrest/files/hamcrest-2.2-java-11.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff --git a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java -index fc968e0..3bbc36e 100644 ---- a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java -+++ b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java -@@ -67,7 +67,7 @@ public class ArrayMatching { - */ - @SafeVarargs - public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) { -- return arrayContainingInAnyOrder(asList(itemMatchers)); -+ return arrayContainingInAnyOrder((List<Matcher<? super E>>) asList(itemMatchers)); - } - - /** -diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java -index 7e72a62..35ff806 100644 ---- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java -+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java -@@ -59,7 +59,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> { - * a list of matchers, each of which must be satisfied by an entry in an examined array - */ - public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) { -- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers)); -+ return arrayContainingInAnyOrder((List<Matcher<? super E>>) Arrays.asList(itemMatchers)); - } - - /** -diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java -index c046914..312543f 100644 ---- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java -+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java -@@ -73,7 +73,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> { - * the matchers that must be satisfied by the items in the examined array - */ - public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) { -- return arrayContaining(asList(itemMatchers)); -+ return arrayContaining((List<Matcher<? super E>>) asList(itemMatchers)); - } - - /** -diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java -index d6a9a33..6b4e39e 100644 ---- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java -+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java -@@ -98,7 +98,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher - */ - @SafeVarargs - public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) { -- return containsInAnyOrder(Arrays.asList(itemMatchers)); -+ return containsInAnyOrder((List<Matcher<? super T>>) Arrays.asList(itemMatchers)); - } - - /** -diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java -index 0657768..383c552 100644 ---- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java -+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java -@@ -99,7 +99,7 @@ public class IsIterableContainingInRelativeOrder<E> extends TypeSafeDiagnosingMa - */ - @SafeVarargs - public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(Matcher<? super E>... itemMatchers) { -- return containsInRelativeOrder(asList(itemMatchers)); -+ return containsInRelativeOrder((List<Matcher<? super E>>) asList(itemMatchers)); - } - - /** -diff --git a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java -index b8c3faa..e7e2550 100644 ---- a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java -+++ b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java -@@ -4,6 +4,7 @@ import org.hamcrest.Description; - import org.hamcrest.DiagnosingMatcher; - import org.hamcrest.Matcher; - -+import java.util.List; - import java.util.Arrays; - - /** -@@ -56,6 +57,6 @@ public class AllOf<T> extends DiagnosingMatcher<T> { - */ - @SafeVarargs - public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) { -- return allOf(Arrays.asList(matchers)); -+ return allOf((List<Matcher<? super T>>) Arrays.asList(matchers)); - } - } -diff --git a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java -index 7a22c22..ba52275 100644 ---- a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java -+++ b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java -@@ -3,6 +3,7 @@ package org.hamcrest.core; - import org.hamcrest.Description; - import org.hamcrest.Matcher; - -+import java.util.List; - import java.util.Arrays; - - /** -@@ -46,6 +47,6 @@ public class AnyOf<T> extends ShortcutCombination<T> { - */ - @SafeVarargs - public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) { -- return anyOf(Arrays.asList(matchers)); -+ return anyOf((List<Matcher<? super T>>) Arrays.asList(matchers)); - } - } -diff --git a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java -index e37efce..3ca6f96 100644 ---- a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java -+++ b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java -@@ -57,7 +57,7 @@ public class CombinableMatcher<T> extends TypeSafeDiagnosingMatcher<T> { - this.first = matcher; - } - public CombinableMatcher<X> and(Matcher<? super X> other) { -- return new CombinableMatcher<>(first).and(other); -+ return new CombinableMatcher<X>(first).and(other); - } - } - -@@ -76,7 +76,7 @@ public class CombinableMatcher<T> extends TypeSafeDiagnosingMatcher<T> { - this.first = matcher; - } - public CombinableMatcher<X> or(Matcher<? super X> other) { -- return new CombinableMatcher<>(first).or(other); -+ return new CombinableMatcher<X>(first).or(other); - } - } - } diff --git a/dev-java/hamcrest/hamcrest-2.2-r1.ebuild b/dev-java/hamcrest/hamcrest-2.2-r1.ebuild deleted file mode 100644 index 401f297eddd3..000000000000 --- a/dev-java/hamcrest/hamcrest-2.2-r1.ebuild +++ /dev/null @@ -1,41 +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.hamcrest:hamcrest:2.2" -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:* -" - -PATCHES=( "${FILESDIR}"/hamcrest-2.2-java-11.patch ) - -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" - -src_prepare() { - default - java-pkg-2_src_prepare -} diff --git a/dev-java/hamcrest/hamcrest-3.0.ebuild b/dev-java/hamcrest/hamcrest-3.0.ebuild index c6e5292340d7..701a6d3e141a 100644 --- a/dev-java/hamcrest/hamcrest-3.0.ebuild +++ b/dev-java/hamcrest/hamcrest-3.0.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/JavaHamcrest-${PV}" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/hashcash/hashcash-1.1.ebuild b/dev-java/hashcash/hashcash-1.1.ebuild index 5c93c554d7e5..c275113737af 100644 --- a/dev-java/hashcash/hashcash-1.1.ebuild +++ b/dev-java/hashcash/hashcash-1.1.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 @@ -13,7 +13,7 @@ SRC_URI="https://www.nettgryppa.com/code/HashCash.java" LICENSE="GregoryRubin" SLOT="1" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild b/dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild index 06b8d00654ba..88fa7ce83e7f 100644 --- a/dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild +++ b/dev-java/hawtjni-runtime/hawtjni-runtime-1.18.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 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/fusesource/hawtjni/archive/hawtjni-project-${PV}.tar LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild index c1e1a9887879..7b264723215c 100644 --- a/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild +++ b/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/htmlcleaner/htmlcleaner/htmlc LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64" BDEPEND="app-arch/unzip" CP_DEPEND="dev-java/jdom:2" 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 index 2b074d240ff4..58857b3d2332 100644 --- a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild +++ b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/httpcomponents-client-${PV}/httpclient" LICENSE="Apache-2.0" SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" 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 )" diff --git a/dev-java/httpcore/httpcore-4.4.14-r1.ebuild b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild index f554a2b55b78..8fc95ded1c04 100644 --- a/dev-java/httpcore/httpcore-4.4.14-r1.ebuild +++ b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/httpcore" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" 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 )" diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild index 9990e63fba50..93879d39132c 100644 --- a/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild +++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.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 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) @@ -13,7 +13,7 @@ SRC_URI="https://icedtea.classpath.org/download/source/${P}.tar.xz" LICENSE="GPL-2-with-linking-exception" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" IUSE="+doc" diff --git a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.8-r2.ebuild index f36cb218a52d..ff395edab946 100644 --- a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild +++ b/dev-java/icedtea-web/icedtea-web-1.8.8-r2.ebuild @@ -4,17 +4,19 @@ EAPI=8 README_GENTOO_SUFFIX="-r3" -CRATES="dunce-0.1.1" +CRATES="dunce@0.1.1" inherit autotools bash-completion-r1 cargo java-pkg-2 readme.gentoo-r1 xdg-utils DESCRIPTION="FOSS Java browser plugin and Web Start implementation" HOMEPAGE="https://github.com/AdoptOpenJDK/IcedTea-Web" SRC_URI="https://github.com/AdoptOpenJDK/${PN}/archive/${P}.tar.gz - $(cargo_crate_uris ${CRATES})" + ${CARGO_CRATE_URIS}" +S="${WORKDIR}/IcedTea-Web-${P}" + LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" SLOT="0" -KEYWORDS="amd64 arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" IUSE="doc" # tests require ton of java deps we don't have packaged/working @@ -25,7 +27,6 @@ BDEPEND=" app-arch/zip app-alternatives/bc virtual/pkgconfig - virtual/rust doc? ( app-alternatives/bc ) " @@ -58,10 +59,13 @@ RDEPEND=" >=virtual/jre-1.8:* " -S="${WORKDIR}/IcedTea-Web-${P}" - QA_FLAGS_IGNORED="usr/bin/.*" +pkg_setup() { + java-pkg-2_pkg_setup + rust_pkg_setup +} + src_prepare() { eapply_user sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest index 95e67ccfac14..1e831727a9de 100644 --- a/dev-java/icu4j/Manifest +++ b/dev-java/icu4j/Manifest @@ -1 +1 @@ -DIST icu4j-75.1.tar.gz 65866291 BLAKE2B ae9a2a8f9bf6f38a08c46c4c3695fa4096c831beab1af5b654e86c9d681eb32be727930aeb1fd866fe9f93a96abe807fd353d108b5fe7a4d8203ee33cc16d971 SHA512 08f8fce8a4dd85706d9f7c57fd021ba15c403ab2da33d9a122d7cb441e0e148deebf245a661e4ef53a30bfa8b7622c63035946fd8966be3927af322275b87ca3 +DIST icu4j-76.1.tar.gz 67524828 BLAKE2B 949b6b69e2201ba5b4538766d25e72a8d98daeb8b1bf376966a6f410febee8c75c031ce9e52a0e4908d5d01f4d0120526ac84178603ee3968c1a399fc0a7959c SHA512 b92e05f3b5022992dfc7881542ed957dc9a1bc0b86f28fa6123dd4ab295e2a91686672193017acc0e0b659c37c944a1d2222e4881d7c65046a1df9dfaa925f12 diff --git a/dev-java/icu4j/icu4j-75.1.ebuild b/dev-java/icu4j/icu4j-76.1-r1.ebuild index bae11e47634a..2d35023cd241 100644 --- a/dev-java/icu4j/icu4j-75.1.ebuild +++ b/dev-java/icu4j/icu4j-76.1-r1.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main" LICENSE="icu" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" >=virtual/jdk-1.8:* @@ -35,6 +35,19 @@ RDEPEND=">=virtual/jre-1.8:*" DOCS=( ../../{CONTRIBUTING,README,SECURITY}.md ) HTML_DOCS=( ../{APIChangeReport,readme}.html ) +src_prepare() { + java-pkg-2_src_prepare + # There was 1 failure: + # 1) test(com.ibm.icu.dev.test.message2.CoreTest) + # java.io.FileNotFoundException: Test data directory does not exist: + # tried /var/tmp/portage/dev-java/icu4j-76.1/work/testdata/message2 + # and /var/tmp/portage/dev-java/icu4j-76.1/work/testdata/message2 + # at com.ibm.icu.dev.test.message2.TestUtils.getTestFile(TestUtils.java:212) + # at com.ibm.icu.dev.test.message2.TestUtils.jsonReader(TestUtils.java:194) + # at com.ibm.icu.dev.test.message2.CoreTest.test(CoreTest.java:52) + cp -r ../..{,/..}/testdata || die +} + src_compile() { JAVA_GENTOO_CLASSPATH_EXTRA="icu4j.jar:icu4j-charset.jar:icu4j-localespi.jar" @@ -125,6 +138,9 @@ src_test () { ! -name "*TestFmwk.java" \ ! -name "TestMessages.java" \ ! -name "TestUtils.java" \ + ! -name "DefaultTestProperties.java" \ + ! -name "MF2Test.java" \ + ! -name "TestBoilerplate.java" \ ) popd JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" @@ -132,7 +148,7 @@ src_test () { java-pkg-simple_src_test einfo "Creating core-tests.jar" - jar cvf core-tests.jar -C target/test-classes . + jar cvf core-tests.jar -C target/test-classes . || die JAVA_GENTOO_CLASSPATH_EXTRA+=":core-tests.jar" JAVA_TEST_RUN_ONLY="" @@ -178,15 +194,13 @@ src_test () { } src_install() { - default - java-pkg_dojar "icu4j.jar" + JAVA_JAR_FILENAME="icu4j.jar" + JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo" + java-pkg-simple_src_install 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" + java-pkg_dosrc */src/main/java/* fi } diff --git a/dev-java/identicon/identicon-1.0.ebuild b/dev-java/identicon/identicon-1.0.ebuild index b3db99166311..3616ca9d833b 100644 --- a/dev-java/identicon/identicon-1.0.ebuild +++ b/dev-java/identicon/identicon-1.0.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,9 +12,11 @@ DESCRIPTION="Visual representation of a hash value" HOMEPAGE="https://github.com/PauloMigAlmeida/identicon" COMMIT="96902d3c7c9733d9da4cce9c5ed424557fc2ec3c" SRC_URI="https://github.com/PauloMigAlmeida/identicon/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}/core" + LICENSE="MIT" SLOT="1" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" CP_DEPEND=" dev-java/cache2k-api:0 @@ -29,7 +31,5 @@ RDEPEND=" >=virtual/jre-1.8:* " -S="${WORKDIR}/${PN}-${COMMIT}/core" - JAVA_SRC_DIR="src/main/java" JAVA_TEST_GENTOO_CLASSPATH="cache2k-api-2" 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 58a262fd17cc..13fef21db179 100644 --- a/dev-java/injection-api/injection-api-2.0.1.ebuild +++ b/dev-java/injection-api/injection-api-2.0.1.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/inject-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/iso-relax/iso-relax-20050331-r7.ebuild b/dev-java/iso-relax/iso-relax-20050331-r7.ebuild index de9ed0e1d7b9..74596e03bd35 100644 --- a/dev-java/iso-relax/iso-relax-20050331-r7.ebuild +++ b/dev-java/iso-relax/iso-relax-20050331-r7.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${P}" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" CP_DEPEND=">=dev-java/ant-1.10.14-r3:0" DEPEND="${CP_DEPEND} diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild index b08a535e4c27..f4fd6f03e4fb 100644 --- a/dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild +++ b/dev-java/istack-commons-runtime/istack-commons-runtime-3.0.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 @@ -16,7 +16,7 @@ S="${WORKDIR}/jaxb-istack-commons-${PV}/istack-commons" LICENSE="EPL-1.0" SLOT="3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # fails if jdk-1.8:* # https://bugs.gentoo.org/857024 DEPEND=" diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild index 710d5f856623..c8e2c54f0ffd 100644 --- a/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild +++ b/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/${PV}.tar.g LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Compile dependencies # POM: runtime/pom.xml diff --git a/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild index 7b1be4f994d1..3d1e1d5f0571 100644 --- a/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild +++ b/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/j2objc-${PV}/annotations" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jackcess/Manifest b/dev-java/jackcess/Manifest index 95b315a20989..8b0c1cf99e50 100644 --- a/dev-java/jackcess/Manifest +++ b/dev-java/jackcess/Manifest @@ -1 +1,2 @@ DIST jackcess-4.0.0-sources.tar.gz 12140889 BLAKE2B 44bdd0ba74e9e462364506e563b2e5db8a6581686a0b1ab7d9995d2dfce164593eb533986ac666a7f79180478a8a16ccc8ef57a7af08045cb671a3a5269f84a6 SHA512 514ecf235943183e0b3813550adf801cc4ab1734137ae0b131f5e3dca9f774f2a866bec397ccc8d37d65e9c3f0c4c995baee091480eb8e2bb91e85894c2a27e6 +DIST jackcess-4.0.7-sources.tar.gz 12257727 BLAKE2B 5d19d5aef02388342d881214e6956eb118e74fd4dcc6b750df927c888e689eb94bf605952c30884b0b0c4bfd1ae651c8b96cc908dd2dbf0fa7506fd789c14fa0 SHA512 3867019b50e8734938c08e562a57cd16b49f664865b8dbe904c418d73dc750492c6f94bccecd9c9a9d2ab2be51a211d49416a5dcb5130ac96aef7a9aeef7a3e0 diff --git a/dev-java/jackcess/jackcess-4.0.0.ebuild b/dev-java/jackcess/jackcess-4.0.0.ebuild index 73b567ddfba2..3f4f7d3ef2c4 100644 --- a/dev-java/jackcess/jackcess-4.0.0.ebuild +++ b/dev-java/jackcess/jackcess-4.0.0.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/jahlborn/${PN}/archive/refs/tags/${P}.tar.gz -> ${P} LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos" # Common dependencies # POM: pom.xml diff --git a/dev-java/jackcess/jackcess-4.0.7.ebuild b/dev-java/jackcess/jackcess-4.0.7.ebuild new file mode 100644 index 000000000000..9f2eff4454cc --- /dev/null +++ b/dev-java/jackcess/jackcess-4.0.7.ebuild @@ -0,0 +1,60 @@ +# 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.healthmarketscience.jackcess:jackcess:4.0.7" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A pure Java library for reading from and writing to MS Access databases" +HOMEPAGE="https://jackcess.sourceforge.io" +SRC_URI="https://github.com/jahlborn/${PN}/archive/${P}.tar.gz -> ${P}-sources.tar.gz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos" + +CP_DEPEND=" + >=dev-java/commons-lang-3.17:3.6 + >=dev-java/commons-logging-1.3.1:0[log4j] + >=dev-java/poi-5.2.5:0 +" + +DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-1.8:* +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CP_DEPEND}" + +PATCHES=( "${FILESDIR}/jackcess-4.0.0-fix-tests.patch" ) + +JAVA_RESOURCE_DIRS="src/main/resources" +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" + +JAVA_TEST_EXCLUDES=( + # initializationError(com.healthmarketscience.jackcess.TestUtil) + # org.junit.runners.model.InvalidTestClassError: Invalid test class 'com.healthmarketscience.jackcess.TestUtil' + "com.healthmarketscience.jackcess.TestUtil" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + +src_test() { + export TZ=UTC + export LC_ALL=C + java-pkg-simple_src_test +} diff --git a/dev-java/jackcess/metadata.xml b/dev-java/jackcess/metadata.xml index 68527723b496..c569b19c9503 100644 --- a/dev-java/jackcess/metadata.xml +++ b/dev-java/jackcess/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">jackcess</remote-id> + <remote-id type="github">jahlborn/jackcess</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild index bce380ed025c..278fab98fadf 100644 --- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild +++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.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 @@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" S="${WORKDIR}/${MY_PN}-${PV}/${PN}" diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild index 4505a819c458..cb9faac05f7e 100644 --- a/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild +++ b/dev-java/jackson-annotations/jackson-annotations-2.13.4.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jackson-core/jackson-core-2.13.4.ebuild b/dev-java/jackson-core/jackson-core-2.13.4.ebuild index c5efc120c377..237b13f1d151 100644 --- a/dev-java/jackson-core/jackson-core-2.13.4.ebuild +++ b/dev-java/jackson-core/jackson-core-2.13.4.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild index e7113f161f38..8e6624f019b3 100644 --- a/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild +++ b/dev-java/jackson-databind/jackson-databind-2.13.4.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: @@ -19,7 +19,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Common dependencies # POM: pom.xml diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild index 0abe765139fe..bbbf48a2f339 100644 --- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild +++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Common dependencies # POM: pom.xml diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild index a852610200cc..a63f1c452946 100644 --- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild +++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-d LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" ~dev-java/jackson-core-${PV}:0 diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild index afca2db73bd3..ad03a7d154b7 100644 --- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild +++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modul LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Common dependencies # POM: pom.xml diff --git a/dev-java/jacl/jacl-1.4.1-r2.ebuild b/dev-java/jacl/jacl-1.4.1-r2.ebuild index 53e9a0ae85f6..19942b013b42 100644 --- a/dev-java/jacl/jacl-1.4.1-r2.ebuild +++ b/dev-java/jacl/jacl-1.4.1-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/tcljava/jacl/${PV}/jacl${PV}. LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" IUSE="doc" CDEPEND=">=dev-lang/tcl-8.4.5:*" diff --git a/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild b/dev-java/jai-imageio-core/jai-imageio-core-1.4.0-r1.ebuild index cf43149a135d..33205e27e623 100644 --- a/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild +++ b/dev-java/jai-imageio-core/jai-imageio-core-1.4.0-r1.ebuild @@ -1,10 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom jai-imageio-core-jai-imageio-core-1.4.0/pom.xml --download-uri https://github.com/jai-imageio/jai-imageio-core/archive/refs/tags/jai-imageio-core-1.4.0.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jai-imageio-core-1.4.0.ebuild - -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source test" MAVEN_ID="com.github.jai-imageio:jai-imageio-core:1.4.0" @@ -14,20 +11,19 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Java Advanced Imaging Image I/O Tools API core (standalone)" HOMEPAGE="https://github.com/jai-imageio/jai-imageio-core" -SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz" +SRC_URI="https://github.com/jai-imageio/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}" LICENSE="Sun-BSD-no-nuclear-2005" SLOT="0" -KEYWORDS="amd64 arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}" - -JAVA_SRC_DIR="${PN}-${P}/src/main/java" JAVA_RESOURCE_DIRS="${PN}-${P}/src/main/resources" +JAVA_SRC_DIR="${PN}-${P}/src/main/java" JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="${PN}-${P}/src/test/java" JAVA_TEST_RESOURCE_DIRS="${PN}-${P}/src/test/resources" +JAVA_TEST_SRC_DIR="${PN}-${P}/src/test/java" diff --git a/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0-r1.ebuild b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0-r1.ebuild new file mode 100644 index 000000000000..35b593e79ae5 --- /dev/null +++ b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0-r1.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 test" +MAVEN_ID="com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="JPEG2000 support for Java Advanced Imaging Image I/O Tools API" +HOMEPAGE="https://github.com/jai-imageio/jai-imageio-jpeg2000" +SRC_URI="https://github.com/jai-imageio/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}" + +LICENSE="Sun-BSD-no-nuclear-2005" +SLOT="0" +KEYWORDS="amd64 arm64 ppc64" + +CP_DEPEND="dev-java/jai-imageio-core:0" + +DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-1.8:* +" + +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" + +JAVA_RESOURCE_DIRS="${PN}-${P}/src/main/resources" +JAVA_SRC_DIR="${PN}-${P}/src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_RESOURCE_DIRS="${PN}-${P}/src/test/resources" +JAVA_TEST_SRC_DIR="${PN}-${P}/src/test/java" diff --git a/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild deleted file mode 100644 index d6111d3e33ce..000000000000 --- a/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild +++ /dev/null @@ -1,41 +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 jai-imageio-jpeg2000-jai-imageio-jpeg2000-1.4.0/pom.xml --download-uri https://github.com/jai-imageio/jai-imageio-jpeg2000/archive/refs/tags/jai-imageio-jpeg2000-1.4.0.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jai-imageio-jpeg2000-1.4.0.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="JPEG2000 support for Java Advanced Imaging Image I/O Tools API" -HOMEPAGE="https://github.com/jai-imageio/jai-imageio-jpeg2000" -SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz" - -LICENSE="Sun-BSD-no-nuclear-2005" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64 x86" - -# Common dependencies -# POM: ${PN}-${P}/pom.xml -# com.github.jai-imageio:jai-imageio-core:1.4.0 -> >=dev-java/jai-imageio-core-1.4.0:0 - -CDEPEND="dev-java/jai-imageio-core:0" -DEPEND="${CDEPEND} - >=virtual/jdk-1.8:*" -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:* " - -S="${WORKDIR}" - -JAVA_GENTOO_CLASSPATH="jai-imageio-core" -JAVA_SRC_DIR="${PN}-${P}/src/main/java" -JAVA_RESOURCE_DIRS="${PN}-${P}/src/main/resources" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="${PN}-${P}/src/test/java" -JAVA_TEST_RESOURCE_DIRS="${PN}-${P}/src/test/resources" diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild index 20b19ae30fba..165a863fd632 100644 --- a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild +++ b/dev-java/jakarta-activation-api/jakarta-activation-api-1.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 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> jakarta-ac LICENSE="EPL-1.0" SLOT="1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild index 81fd0c8051e6..fa0367a49dce 100644 --- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild +++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.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 @@ -15,7 +15,7 @@ S="${WORKDIR}/jaf-api-${PV}/api" LICENSE="EPL-1.0" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild index 1483a29bde02..c39866589e74 100644 --- a/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild +++ b/dev-java/jakarta-activation/jakarta-activation-1.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 @@ -15,7 +15,7 @@ S="${WORKDIR}/jaf-api-${PV}/activation" LICENSE="EPL-1.0" SLOT="1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CDEPEND="dev-java/jakarta-activation-api:1" DEPEND="${CDEPEND} 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 4eae70ab60e3..c8dfd432e338 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 @@ -15,7 +15,7 @@ S="${WORKDIR}/jaf-api-${PV}/activation" LICENSE="EPL-1.0" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jakarta-annotation-api/Manifest b/dev-java/jakarta-annotation-api/Manifest new file mode 100644 index 000000000000..a858d613fbba --- /dev/null +++ b/dev-java/jakarta-annotation-api/Manifest @@ -0,0 +1,2 @@ +DIST jakarta-annotation-api-2.1.1.tar.gz 83788 BLAKE2B be9904337199bd8cf9e5748d53b4536b3562446d499992b97c7e413e2e2d9ae0c8ba50d601950a0feec8bce4c4c35093b7b8f87ad60ea407452f502996045e54 SHA512 8a61cb8a9da55efd7c5172aa9a134eae7d94489a66ef749c619a7fc596122fd50f3dda7a954d78f664132c72ce999d2d3ad01b70e1d2cb2072c881327de11d82 +DIST jakarta-annotation-api-3.0.0.tar.gz 86848 BLAKE2B 3eab46e3840bb121d1abeb1d839d00cab1db881e444613b60fa62e8412587c6a8e6a16ae89483698887631d7121f71104611dd052fd1ce6606fa2e708a4f0cc2 SHA512 9cbd14df082b2fd51e5ab92b72fad0a8f2db16e72d89f5942663dacc38ba5118ec1199a07756b9507f51ba143b9869bad32b8b8e41c9ddbef7c7c080557cb340 diff --git a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild b/dev-java/jakarta-annotation-api/jakarta-annotation-api-2.1.1.ebuild index 2d9118c013cd..8de7b9bc5d1c 100644 --- a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild +++ b/dev-java/jakarta-annotation-api/jakarta-annotation-api-2.1.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 @@ -10,11 +10,12 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Jakarta Annotations API" HOMEPAGE="https://projects.eclipse.org/projects/ee4j.ca" -SRC_URI="https://github.com/eclipse-ee4j/${PN/jakarta/common}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/eclipse-ee4j/common-annotations-api/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/common-annotations-api-${PV}" LICENSE="EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" >=virtual/jdk-11:* @@ -26,6 +27,4 @@ RDEPEND=" DOCS=( {CONTRIBUTING,NOTICE,README}.md ) -S="${WORKDIR}/${P/jakarta/common}" - JAVA_SRC_DIR="api/src/main/java" diff --git a/dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.0.ebuild b/dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.0.ebuild new file mode 100644 index 000000000000..7d5404665521 --- /dev/null +++ b/dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.0.ebuild @@ -0,0 +1,25 @@ +# 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="jakarta.annotation:jakarta.annotation-api:3.0.0" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Jakarta Annotations API" +HOMEPAGE="https://projects.eclipse.org/projects/ee4j.ca" +SRC_URI="https://github.com/jakartaee/common-annotations-api/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/common-annotations-api-${PV}" + +LICENSE="EPL-2.0 GPL-2-with-classpath-exception" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" + +DEPEND=">=virtual/jdk-11:*" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {CONTRIBUTING,NOTICE,README}.md ) + +JAVA_SRC_DIR="api/src/main/java" diff --git a/dev-java/jakarta-annotations-api/metadata.xml b/dev-java/jakarta-annotation-api/metadata.xml index 9c98d5e873bc..a53376e684fe 100644 --- a/dev-java/jakarta-annotations-api/metadata.xml +++ b/dev-java/jakarta-annotation-api/metadata.xml @@ -5,6 +5,7 @@ <email>java@gentoo.org</email> </maintainer> <upstream> - <remote-id type="github">eclipse-ee4j/common-annotations-api</remote-id> + <doc>https://jakarta.ee/specifications/annotations/</doc> + <remote-id type="github">jakartaee/common-annotations-api</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/jakarta-annotations-api/Manifest b/dev-java/jakarta-annotations-api/Manifest deleted file mode 100644 index b27c2a5598e8..000000000000 --- a/dev-java/jakarta-annotations-api/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jakarta-annotations-api-2.1.1.tar.gz 83788 BLAKE2B be9904337199bd8cf9e5748d53b4536b3562446d499992b97c7e413e2e2d9ae0c8ba50d601950a0feec8bce4c4c35093b7b8f87ad60ea407452f502996045e54 SHA512 8a61cb8a9da55efd7c5172aa9a134eae7d94489a66ef749c619a7fc596122fd50f3dda7a954d78f664132c72ce999d2d3ad01b70e1d2cb2072c881327de11d82 diff --git a/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild b/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild index 9147cace3d1f..075f5da2e2c4 100644 --- a/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild +++ b/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.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: @@ -18,7 +18,7 @@ HOMEPAGE="https://projects.eclipse.org/projects/ee4j.el" SRC_URI="https://github.com/jakartaee/expression-language/archive/${PV}-RELEASE-api.tar.gz -> ${P}.tar.gz" LICENSE="EPL-2.0 GPL-2-with-classpath-exception" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" SLOT="5.0" DEPEND=">=virtual/jdk-11:*" diff --git a/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild b/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0-r1.ebuild index 894a7f0f3b5f..6e96cc616ad1 100644 --- a/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild +++ b/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0-r1.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: @@ -14,20 +14,19 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Jakarta Interceptors" HOMEPAGE="https://projects.eclipse.org/projects/ee4j.interceptors" SRC_URI="https://github.com/jakartaee/interceptors/archive/${PV}-RELEASE.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/interceptors-${PV}-RELEASE" LICENSE="EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" - dev-java/jakarta-annotations-api:0 + dev-java/jakarta-annotation-api:0 >=virtual/jdk-11:* " RDEPEND=">=virtual/jre-1.8:*" DOCS=( {CONTRIBUTING,NOTICE,README}.md ) -S="${WORKDIR}/interceptors-${PV}-RELEASE" - -JAVA_CLASSPATH_EXTRA="jakarta-annotations-api" +JAVA_CLASSPATH_EXTRA="jakarta-annotation-api" JAVA_SRC_DIR="api/src/main/java" diff --git a/dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild b/dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild index 81ff7a0206e8..cbcf4fa51918 100644 --- a/dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild +++ b/dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,7 +19,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jsonp/archive/${MY_PV}.tar.gz -> ${P}.t LICENSE="|| ( EPL-2.0 GPL-2-with-classpath-exception )" # Since version 2.0.0, the namespace has changed to jakarta.json SLOT="1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.ebuild index 0bd19f854bc1..211be5f49336 100644 --- a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.ebuild +++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/mail-api-${PV}/api" LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" dev-java/jakarta-activation-api:2 diff --git a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild index 0e12088b9f5e..fbf1fb27aa54 100644 --- a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild +++ b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/mail-api-${PV}/mail" LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND="dev-java/jakarta-activation:2" diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r6.ebuild index f01c659c6ea0..c693ee8dc78d 100644 --- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild +++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r6.ebuild @@ -1,33 +1,30 @@ -# 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 examples" MAVEN_ID="oro:oro:2.0.8" inherit java-pkg-2 java-pkg-simple -MY_J=${PN%%-*} -MY_O=${PN##*-} - DESCRIPTION="A set of text-processing Java classes" HOMEPAGE="https://jakarta.apache.org/oro/" -SRC_URI="https://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz" +SRC_URI="https://archive.apache.org/dist/jakarta/oro/source/jakarta-oro-${PV}.tar.gz" +S="${WORKDIR}/${P}" LICENSE="Apache-1.1" SLOT="2.0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}/${P}" - JAVA_SRC_DIR="src" src_prepare() { - default + default #780585 + java-pkg-2_src_prepare java-pkg_clean mv src/java/examples examples || die } diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild index c6f3f7a1753f..d547e0c1a0ed 100644 --- a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild +++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.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 @@ -14,7 +14,7 @@ HOMEPAGE="https://jakarta.apache.org/" SLOT="${PV}" IUSE="" LICENSE="Apache-1.1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=" >=virtual/jre-1.8:*" diff --git a/dev-java/jakarta-servlet-api/Manifest b/dev-java/jakarta-servlet-api/Manifest index 93a125b9a802..0ab758f14fc6 100644 --- a/dev-java/jakarta-servlet-api/Manifest +++ b/dev-java/jakarta-servlet-api/Manifest @@ -1,2 +1,3 @@ DIST jakarta-servlet-api-4.0.4-RELEASE.tar.gz 188270 BLAKE2B 6c5db208603333abb9aa31726e60d489c5f860e3b6ad61e691d65e8b99909a8139f7677cec52d2a74ed9e8445ea2f0f510875ca32a2e512a09183245a9822889 SHA512 9cd613f8c33f5d415b06f70543eee926c81e87a14d03b837998a6c4db11ce5fb9c2b97f796f2936a63f2a6dc7847d7a97aec7a804b80234cd52e4bfdca9920a9 DIST jakarta-servlet-api-6.0.0-RELEASE.tar.gz 634690 BLAKE2B e48375f6a0b74950a2c50d73f2d50f7c79db96e22d5c845380bff670948cd1a1d1ea98eaf93e7fa02887e94010c8573382ba3f6fb52a8fca6fa98e5915c307f6 SHA512 65285bce3e8b5143eb33d548549ff5653c6c90f55e7a19e8fdb4a7799842d3430cfe0cebe54f7a7d253d9da4c2b6d4d7a08b35846636c11a2ca814b8311cecc7 +DIST jakarta-servlet-api-6.1.0-RELEASE.tar.gz 1268162 BLAKE2B f31a6276461c579a4f81778d9d55af6c367775eb21eb51b591d8e704b803ae0af019244f8a35683f0f30096256d4f19e8dad3959fa807a7087fe67d46bcf3c93 SHA512 52299b4b50fd03129753a239371ba6d35db14ff9d6292968c19d99632e965a279fbcf025722da3b174f7f0a4b620576863d7134c817f3fa34a098a9a794ca97b diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild index 063b338f3af5..260488ecb1f7 100644 --- a/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild +++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${ LICENSE="|| ( GPL-2 GPL-2-with-classpath-exception )" SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild index 7fbf152908ae..fbc433053891 100644 --- a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild +++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -19,7 +19,7 @@ SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${ LICENSE="EPL-2.0 GPL-2-with-classpath-exception" SLOT="6" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-11:*" diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.1.0.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.1.0.ebuild new file mode 100644 index 000000000000..ee41830559e3 --- /dev/null +++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.1.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="jakarta.servlet:jakarta.servlet-api:6.1.0" +# No tests because of still missing junit-jupiter +# JAVA_TESTING_FRAMEWORKS="junit-jupiter" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Javax servlet API" +HOMEPAGE="https://projects.eclipse.org/projects/ee4j.servlet" +SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${P}-RELEASE.tar.gz" +S="${WORKDIR}/servlet-${PV}-RELEASE" + +LICENSE="EPL-2.0 GPL-2-with-classpath-exception" +SLOT="6.1" +KEYWORDS="amd64 arm64 ppc64" + +DEPEND=">=virtual/jdk-11:*" # module-info +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {CONTRIBUTING,NOTICE,README}.md ) + +JAVA_RESOURCE_DIRS=( api/src/main/resources ) +JAVA_SRC_DIR="api/src/main/java" + +src_prepare() { + java-pkg-2_src_prepare + pushd api/src/main/java > /dev/null || die + find -type f -name '*.properties' \ + | xargs cp --parents -t ../resources || die + popd > /dev/null || die +} diff --git a/dev-java/jakarta-servlet-api/metadata.xml b/dev-java/jakarta-servlet-api/metadata.xml index 77e11a268a0a..0d5ea12ad2ad 100644 --- a/dev-java/jakarta-servlet-api/metadata.xml +++ b/dev-java/jakarta-servlet-api/metadata.xml @@ -4,8 +4,13 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <doc>https://jakarta.ee/specifications/servlet/</doc> + <remote-id type="github">jakartaee/servlet</remote-id> + </upstream> <slots> <slot name="4">provides javax.servlet</slot> - <slot name="6">provides jakarta.servlet</slot> + <slot name="6">https://jakarta.ee/specifications/servlet/6.0/</slot> + <slot name="6.1">https://jakarta.ee/specifications/servlet/6.1/</slot> </slots> </pkgmetadata> diff --git a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild index fc7c2c78bdec..2f8395024399 100644 --- a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild +++ b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/saaj-api-${PV}" LICENSE="BSD" # Since version 2.0.0, the namespace has changed to jakarta.xml.soap SLOT="1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" >=dev-java/jakarta-activation-api-1.2.2-r1:1 diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild index 4ee56f6fa8ae..4f90f784c7f8 100644 --- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild +++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64" +KEYWORDS="amd64 ~arm64" CP_DEPEND=" >=dev-java/ant-1.10.14-r1:0 diff --git a/dev-java/jal/jal-20031117-r7.ebuild b/dev-java/jal/jal-20031117-r7.ebuild index 184a2ce24dc7..04a4ec007862 100644 --- a/dev-java/jal/jal-20031117-r7.ebuild +++ b/dev-java/jal/jal-20031117-r7.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${P}" LICENSE="HPND" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64" DEPEND=" dev-java/ant:0 diff --git a/dev-java/jansi-native/jansi-native-1.8-r1.ebuild b/dev-java/jansi-native/jansi-native-1.8-r1.ebuild new file mode 100644 index 000000000000..be23a1a14613 --- /dev/null +++ b/dev-java/jansi-native/jansi-native-1.8-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit vcs-snapshot java-pkg-2 java-pkg-simple + +DESCRIPTION="Native JNI component for dev-java/jansi" +HOMEPAGE="https://fusesource.github.io/jansi/" +SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 arm64 ppc64" + +CP_DEPEND="dev-java/hawtjni-runtime:0" + +DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-1.8 +" + +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8 +" + +DOCS=( {changelog,readme}.md ) + +JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/jansi-native/jansi-native-1.8.ebuild b/dev-java/jansi-native/jansi-native-1.8.ebuild deleted file mode 100644 index 88351addaf4c..000000000000 --- a/dev-java/jansi-native/jansi-native-1.8.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -JAVA_PKG_IUSE="doc source" - -inherit vcs-snapshot java-pkg-2 java-pkg-simple - -DESCRIPTION="Native JNI component for dev-java/jansi" -HOMEPAGE="http://fusesource.github.io/jansi/" -SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -CDEPEND="dev-java/hawtjni-runtime:0" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.8" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8" - -S="${WORKDIR}/${P}" - -JAVA_SRC_DIR="src/main/java" -JAVA_GENTOO_CLASSPATH="hawtjni-runtime" - -src_prepare() { - # Easier to use java-pkg-simple. - rm -v pom.xml || die - - default -} - -src_install() { - java-pkg-simple_src_install - - dodoc {changelog,readme}.md -} diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest index 1325190f77b1..951f5af4912f 100644 --- a/dev-java/jansi/Manifest +++ b/dev-java/jansi/Manifest @@ -1,2 +1,5 @@ DIST jansi-1.13.tar.gz 253219 BLAKE2B 89fc81710bc0860c717241c97fe2e7a148ccbaa5fb1e7db30b978aa69cddccbc9ea45a0e30ef384c42a741d707f5eab73ce8b2a76e1095c66a2c95f9088f28f0 SHA512 9c4bb0b7435c102068718e039900828994f1ba60ed44307eb726eb91a2884bc406688c2747635b9353f3bd68a6bf0e7c082a4069343b59efffc900f59c563fde -DIST jansi-2.4.0.tar.gz 225579 BLAKE2B f07dfde9b789d62ec31999632e35609143289c5ab0972ce7cb931dea72ba41e6f2b9b74f7b3d82050e9ed4abd89386040d5268c408d787d3edd49fcdf0cce965 SHA512 4172b264463b847d6008dfad5c80246b029c7add2fd659f4b1c636891a86860f8f5ddd0ce0a5150065faeae72b19682339dda2d019c82f45d8f1be7a547e4558 +DIST jansi-1.18.tar.gz 273545 BLAKE2B 9bb18ac181551008316ecf2735a4e573a64e9869d1d5f2f79dc25072c40c088798d0388fe0c65f860617f1afcaf97af1be6c2539a6e19541e4ed40863aaed52c SHA512 d34f271853250d4b23987c0b4d2eeadd9fdb1211b2f5187258bb43e2741d8263312ee04c9a39812550eb658853668a5e941ff3978682cea47c059c6ba85d3e9d +DIST jansi-2.4.1-jni.h 74987 BLAKE2B 23ecaf1e83f043492d774420bb20b4a890fd37bc7469fe8710dcddc72ddbded4aaa7f17589f7b886f26bf9a95cac50c3afd6480fee25d6cf1b01660f98a55f3f SHA512 2c9be8438b8c93f3d00abb8cd3f4b14e57fbaa8de562c12b982db5d32c250a436210e4d44aba22585b489dcb47ea1504cd1a7695a6d1fc60808ecd2140f400b2 +DIST jansi-2.4.1-jni_md.h 2002 BLAKE2B 2112e87963902727e1755b6fa3bc4301b5181787a6f4003674db095896b78f9f745cabe3278b1df06b5cde13dffaf77938668f389f388e410b97cadd42851d75 SHA512 c3c7dffd9518accbcbab60c904af7acadb999048881c571acada162fd39f18de9aa024b09abe10a2138c1398b281890e4473fbaef6e27541e50370119eed5dff +DIST jansi-2.4.1.tar.gz 243911 BLAKE2B 56955f71e37a2e2bbc59d0d859c9d04918737da02ea3121ab7747b763c2e5ef8fd0422f0be2bb51de64eaff526d73a6d78a74a3725ed7b1e93a12cf401892f97 SHA512 ca0de5a8e2098c4d2d72fff4e345d0426ac306ed6b9778ab1fc1a6a23c251a01c86da1089c663739aecea039b6bcfda785018c99046fec42112fa70d53b63ab6 diff --git a/dev-java/jansi/jansi-1.13.ebuild b/dev-java/jansi/jansi-1.13.ebuild index 900dd405b1d8..70462305dba4 100644 --- a/dev-java/jansi/jansi-1.13.ebuild +++ b/dev-java/jansi/jansi-1.13.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 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/${PN}-project-${PV}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CDEPEND="dev-java/jansi-native:0" diff --git a/dev-java/jansi/jansi-1.18.ebuild b/dev-java/jansi/jansi-1.18.ebuild new file mode 100644 index 000000000000..3e21675510af --- /dev/null +++ b/dev-java/jansi/jansi-1.18.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="org.fusesource.jansi:jansi:1.18" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A library that allows you to use ANSI escape sequences in your console output" +HOMEPAGE="https://fusesource.github.io/jansi/" +SRC_URI="https://github.com/fusesource/${PN}/archive/${PN}-project-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/jansi-jansi-project-${PV}/jansi" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" + +CP_DEPEND=" + dev-java/hawtjni-runtime:0 + dev-java/jansi-native:0 +" + +DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-1.8:* +" + +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" + +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/jansi/jansi-2.4.0-r1.ebuild b/dev-java/jansi/jansi-2.4.0-r1.ebuild deleted file mode 100644 index 94f5bb697e72..000000000000 --- a/dev-java/jansi/jansi-2.4.0-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/fusesource/jansi/archive/refs/tags/jansi-2.4.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jansi-2.4.0.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.fusesource.jansi:jansi:2.4.0" - -inherit java-pkg-2 java-pkg-simple toolchain-funcs - -DESCRIPTION="Jansi is a java library for generating and interpreting ANSI escape sequences." -HOMEPAGE="http://fusesource.github.io/jansi" -SRC_URI="https://github.com/fusesource/${PN}/archive/refs/tags/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Compile dependencies -# POM: pom.xml -# test? info.picocli:picocli-codegen:4.5.2 -> !!!artifactId-not-found!!! -# test? org.junit.jupiter:junit-jupiter:5.7.0 -> !!!groupId-not-found!!! -# test? org.junit.jupiter:junit-jupiter-params:5.7.0 -> !!!groupId-not-found!!! - -DEPEND=">=virtual/jdk-1.8:*" - -# junit-jupiter is not available in ::gentoo -# test? ( -# !!!artifactId-not-found!!! -# !!!groupId-not-found!!! -# ) -#" - -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( {changelog,readme}.md license.txt ) - -S="${WORKDIR}/${PN}-${P}" - -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_MAIN_CLASS="org.fusesource.jansi.AnsiMain" - -# junit-jupiter is not available in ::gentoo -#JAVA_TEST_GENTOO_CLASSPATH="!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!" -#JAVA_TEST_SRC_DIR="src/test/java" -#JAVA_TEST_RESOURCE_DIRS="src/test/resources" - -src_prepare() { - default - # Remove this directory containing libjansi.so, libjansi.jnilib and jansi.dll - rm -r "${JAVA_RESOURCE_DIRS}/org/fusesource/jansi/internal/native" || die -} - -src_compile() { - java-pkg-simple_src_compile - - # build native library. - local args=( - CCFLAGS="${CFLAGS} ${CXXFLAGS} -Os -fPIC -fvisibility=hidden" - LINKFLAGS="-shared ${LDFLAGS}" - CC="$(tc-getCC)" - STRIP="$(tc-getSTRIP)" - LIBNAME="libjansi-$(ver_cut 1-2).so" - ) - emake "${args[@]}" native -} - -src_install() { - # default # https://bugs.gentoo.org/789582 - # default fails with - # make: *** No rule to make target 'install'. Stop. - java-pkg_doso target/native--/libjansi-$(ver_cut 1-2).so - java-pkg-simple_src_install -} diff --git a/dev-java/jansi/jansi-2.4.1.ebuild b/dev-java/jansi/jansi-2.4.1.ebuild new file mode 100644 index 000000000000..74f1f384f48f --- /dev/null +++ b/dev-java/jansi/jansi-2.4.1.ebuild @@ -0,0 +1,73 @@ +# 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.fusesource.jansi:jansi:2.4.1" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple toolchain-funcs + +DESCRIPTION="Jansi is a java library for generating and interpreting ANSI escape sequences." +HOMEPAGE="https://fusesource.github.io/jansi/" +# downloading jni.h and jni_md.h according to Makefile +SRC_URI=" + https://github.com/fusesource/${PN}/archive/refs/tags/${P}.tar.gz + https://raw.githubusercontent.com/openjdk/jdk/jdk-11%2B28/src/java.base/share/native/include/jni.h + -> ${P}-jni.h + https://raw.githubusercontent.com/openjdk/jdk/jdk-11%2B28/src/java.base/unix/native/include/jni_md.h + -> ${P}-jni_md.h +" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="amd64 arm64 ppc64" +RESTRICT="test" #839681 + +DEPEND=" + test? ( dev-java/junit:5 ) + >=virtual/jdk-1.8:* +" + +RDEPEND=" + >=virtual/jre-1.8:* +" + +DOCS=( {changelog,readme}.md license.txt ) + +JAVA_MAIN_CLASS="org.fusesource.jansi.AnsiMain" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH="junit-4,junit-5" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + default + # Remove this directory containing libjansi.so, libjansi.jnilib and jansi.dll + rm -r "${JAVA_RESOURCE_DIRS}/org/fusesource/jansi/internal/native" || die + + cp "${DISTDIR}/${P}-jni.h" src/main/native/jni.h || die + cp "${DISTDIR}/${P}-jni_md.h" src/main/native/jni_md.h || die +} + +src_compile() { + java-pkg-simple_src_compile + + # build native library. + local args=( + CCFLAGS="${CFLAGS} ${CXXFLAGS} -Os -fPIC -fvisibility=hidden" + LINKFLAGS="-shared ${LDFLAGS}" + CC="$(tc-getCC)" + STRIP="$(tc-getSTRIP)" + LIBNAME="libjansi-$(ver_cut 1-2).so" + ) + emake "${args[@]}" native +} + +src_install() { + java-pkg-simple_src_install + java-pkg_doso target/native--/libjansi-$(ver_cut 1-2).so +} diff --git a/dev-java/java-config/java-config-2.3.4.ebuild b/dev-java/java-config/java-config-2.3.4.ebuild index 5e3221048e7a..42aee8aa4ad6 100644 --- a/dev-java/java-config/java-config-2.3.4.ebuild +++ b/dev-java/java-config/java-config-2.3.4.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit meson python-r1 diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild index 1b124ce70a3a..b667c1052848 100644 --- a/dev-java/java-config/java-config-9999.ebuild +++ b/dev-java/java-config/java-config-9999.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=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit meson python-r1 diff --git a/dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild b/dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild index 4133d7e336de..39db4aac3f12 100644 --- a/dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild +++ b/dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64" CP_DEPEND=" dev-java/commons-cli:0 diff --git a/dev-java/java-diff-utils/Manifest b/dev-java/java-diff-utils/Manifest index 4d0a48225dde..314215eb55b5 100644 --- a/dev-java/java-diff-utils/Manifest +++ b/dev-java/java-diff-utils/Manifest @@ -1,2 +1,3 @@ DIST java-diff-utils-1.3.0-sources.jar 35161 BLAKE2B 365b2b3a8701a7bf63b1fc8c34f8a54d7a5f67b3b485e91ea3489303de821d5ac08aac4e2b13d140b045b6b45393d293a825e92e800cd34c3b84a17442d548bc SHA512 16426c13fde20c606ac5dc01b4ee368d10360c45c4569879c94d30ac41aba372e9865a7b5db3a68067ea26bdade538eeea4e3e38900f8627beb21d7e48968e62 DIST java-diff-utils-parent-4.12.tar.gz 2080632 BLAKE2B 36cb824bd00e946484dc62b3d5739620eeff6f509cdfa3f521144c21ea9d5de43ccc838700d3d9d116817dc1256d90fe1bdb552b02a2c7cff1e6b702b889f8d0 SHA512 0ac8f633e01f70b6c0f243b65c95716a1237142abde96eed3211a5ee5afb5bf721e936a67b4e2ce27e1df34a8402d0fbcb830e0557bd32cd24a7529d80e61e5c +DIST java-diff-utils-parent-4.15.tar.gz 2132869 BLAKE2B 53caeadae5a87bcedd4e1e5aaa6990f89ca144d75027b16b93e019f119d13dc5d9ee5bf398b47e45b041e86505f72f8b017f56f3650e6ad0b828aece36fa2a36 SHA512 d722687708515bea791c753981857293a58bed9cfd9eca5575b77b22919ab1167ffc55fc87f3f825b5686cff27f4fa68841eae4514baef73f6bf5b2d7a1a9c95 diff --git a/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild b/dev-java/java-diff-utils/java-diff-utils-1.3.0-r1.ebuild index aa0b2dd5d3db..eca70cabdcf4 100644 --- a/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild +++ b/dev-java/java-diff-utils/java-diff-utils-1.3.0-r1.ebuild @@ -1,10 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom diffutils-1.3.0.pom.xml --download-uri https://repo1.maven.org/maven2/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0-sources.jar --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild java-diff-utils-1.3.0.ebuild - -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source" MAVEN_ID="com.googlecode.java-diff-utils:diffutils:1.3.0" @@ -12,15 +9,13 @@ MAVEN_ID="com.googlecode.java-diff-utils:diffutils:1.3.0" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Library for computing diffs, applying patches, generationg side-by-side view" -HOMEPAGE="http://code.google.com/p/java-diff-utils/" +HOMEPAGE="https://code.google.com/archive/p/java-diff-utils" SRC_URI="https://repo1.maven.org/maven2/com/googlecode/${PN}/diffutils/${PV}/diffutils-${PV}-sources.jar -> ${P}-sources.jar" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" +BDEPEND="app-arch/unzip" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" -BDEPEND="app-arch/unzip" - -S="${WORKDIR}" diff --git a/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild b/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild index eda5f5df35e7..4d59a3d43198 100644 --- a/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild +++ b/dev-java/java-diff-utils/java-diff-utils-4.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 @@ -16,7 +16,7 @@ S="${WORKDIR}/java-diff-utils-java-diff-utils-parent-${PV}/java-diff-utils" LICENSE="Apache-2.0" SLOT="4" -KEYWORDS="amd64 arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" RESTRICT="test" #839681 BDEPEND="app-arch/unzip" diff --git a/dev-java/java-diff-utils/java-diff-utils-4.15.ebuild b/dev-java/java-diff-utils/java-diff-utils-4.15.ebuild new file mode 100644 index 000000000000..f121bb744078 --- /dev/null +++ b/dev-java/java-diff-utils/java-diff-utils-4.15.ebuild @@ -0,0 +1,32 @@ +# 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="io.github.java-diff-utils:java-diff-utils:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Library for computing diffs, applying patches, generationg side-by-side view" +HOMEPAGE="https://java-diff-utils.github.io/java-diff-utils/" +SRC_URI="https://github.com/java-diff-utils/java-diff-utils/archive/java-diff-utils-parent-${PV}.tar.gz" +S="${WORKDIR}/java-diff-utils-java-diff-utils-parent-${PV}/java-diff-utils" + +LICENSE="Apache-2.0" +SLOT="4" +KEYWORDS="~amd64 ~arm64 ~ppc64" +RESTRICT="test" #839681 + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="io.github.javadiffutils" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH=" + assertj-core-3 + junit-5 +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" diff --git a/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild b/dev-java/java-getopt/java-getopt-1.0.14-r3.ebuild index 44bec027d4f2..625f6d74c31b 100644 --- a/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild +++ b/dev-java/java-getopt/java-getopt-1.0.14-r3.ebuild @@ -1,10 +1,10 @@ -# 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" -MAVEN_ID="gnu.getopt:java-getopt:§{PV}" +MAVEN_ID="gnu.getopt:java-getopt:${PV}" inherit java-pkg-2 java-pkg-simple @@ -14,7 +14,7 @@ SRC_URI="https://www.urbanophile.com/arenn/hacking/getopt/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="1" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 ~arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild index 2576ab85e550..6260d8841d19 100644 --- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild +++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/wrapper_${PV}_src" LICENSE="tanuki-community" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="amd64 ~arm64" RESTRICT="!test? ( test )" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/javacc/javacc-4.1-r1.ebuild b/dev-java/javacc/javacc-4.1-r1.ebuild index 5f0196671842..d86c8b4e71e3 100644 --- a/dev-java/javacc/javacc-4.1-r1.ebuild +++ b/dev-java/javacc/javacc-4.1-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/javacc-release_${PV//./}" LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" BDEPEND=">=dev-java/ant-1.10.14:0" diff --git a/dev-java/javacc/javacc-7.0.13-r1.ebuild b/dev-java/javacc/javacc-7.0.13-r1.ebuild index d8dfbc20ebc3..b0f3f7faeb7a 100644 --- a/dev-java/javacc/javacc-7.0.13-r1.ebuild +++ b/dev-java/javacc/javacc-7.0.13-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="BSD-2" SLOT="7.0.13" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" BDEPEND=">=dev-java/ant-1.10.14:0[junit]" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/javacc/javacc-7.0.4-r1.ebuild b/dev-java/javacc/javacc-7.0.4-r1.ebuild index 09d1ce85e478..b82f43b77a42 100644 --- a/dev-java/javacc/javacc-7.0.4-r1.ebuild +++ b/dev-java/javacc/javacc-7.0.4-r1.ebuild @@ -14,7 +14,7 @@ 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 arm64" BDEPEND=">=dev-java/ant-1.10.14-r3:0" diff --git a/dev-java/javacup/javacup-11b_p20160615.ebuild b/dev-java/javacup/javacup-11b_p20160615.ebuild index e2ce20b6b312..3b5077688dcb 100644 --- a/dev-java/javacup/javacup-11b_p20160615.ebuild +++ b/dev-java/javacup/javacup-11b_p20160615.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${PV/_p/-}.t LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="ant-task" DEPEND="${CP_DEPEND} diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild index fdebeaa445de..29ffeb54d742 100644 --- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild +++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="GPL-2-with-linking-exception" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64" CP_DEPEND=" dev-java/javax-jsp-api:2.0 diff --git a/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild b/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild index 3f8887785b01..48fd0d22fe30 100644 --- a/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild +++ b/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/javaparser-${PV}" LICENSE="Apache-2.0 LGPL-3" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" JAVACC_SLOT="7.0.4" diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest index ab442f432fc0..473ed4889900 100644 --- a/dev-java/javassist/Manifest +++ b/dev-java/javassist/Manifest @@ -1 +1,2 @@ DIST javassist-3.29.2.tar.gz 1293705 BLAKE2B 23101970a3fe9e4428b9e2e55ec2973663b537b2e205db55952bce116eb0cdd327e156f9bebf16a3c4322d8e5002d612067b14e8d234e87524361b5f08c9ecde SHA512 651f48d9138b54d4816611c077614bbb15f8189d755c2c2c7e5c2dfb35ad8f48cd9d2e0532edbd565456a923b3166eaecdde8702d65c70a32eb21c2d42f67bfc +DIST javassist-3.30.2.tar.gz 1295788 BLAKE2B e54fc5eb0b61c3f706d3d91169fc2ed76b8b5f43c8b4ef9eca3fa8c0001d30fd700bfc3f92c2d1a6e0960910977e6086dfda37602bbc36addaaad9cab253333f SHA512 d4bcfc1dbf94f6727eceb2aa33c9c7b9bfd2087d91e3b8b38df86f79975c26b677301eca900e6fef5415f995428d107f93cb5ee5a0d634a82e14bc0199b49a62 diff --git a/dev-java/javassist/files/javassist-3.29.2-gentoo.patch b/dev-java/javassist/files/javassist-3.29.2-gentoo.patch new file mode 100644 index 000000000000..27ae390d465b --- /dev/null +++ b/dev-java/javassist/files/javassist-3.29.2-gentoo.patch @@ -0,0 +1,46 @@ +adjust BASE_PATH, PATH and JAR_PATH for java-pkg-simple.eclass + +--- a/src/test/javassist/JvstTest4.java ++++ b/src/test/javassist/JvstTest4.java +@@ -635,10 +635,10 @@ public class JvstTest4 extends JvstTestRoot { + assertEquals(packageName, obj.getClass().getPackage().getName()); + } + +- public static final String BASE_PATH = "../../"; ++ public static final String BASE_PATH = ""; + public static final String JAVASSIST_JAR = BASE_PATH + "javassist.jar"; +- public static final String CLASSES_FOLDER = BASE_PATH + "build/classes"; +- public static final String TEST_CLASSES_FOLDER = BASE_PATH + "build/test-classes"; ++ public static final String CLASSES_FOLDER = BASE_PATH + "target/classes"; ++ public static final String TEST_CLASSES_FOLDER = BASE_PATH + "target/test-classes"; + + public static class Inner1 { + public static int get() { +--- a/src/test/javassist/JvstTestRoot.java ++++ b/src/test/javassist/JvstTestRoot.java +@@ -5,10 +5,10 @@ import java.lang.reflect.Method; + + public class JvstTestRoot extends TestCase { + // the directory where all compiled class files are found. +- public static final String PATH = "../../target/test-classes/"; ++ public static final String PATH = "target/test-classes/"; + + // the directory where javassist.jar is found. +- public static final String JAR_PATH = "../../"; ++ public static final String JAR_PATH = ""; + + ClassPool sloader, dloader; + Loader cloader; +--- a/src/test/javassist/JvstTest2.java ++++ b/src/test/javassist/JvstTest2.java +@@ -333,8 +333,8 @@ public class JvstTest2 extends JvstTestRoot { + + url = cp.find("javassist.CtMethod").toString(); + System.out.println("testURL: " + url); +- assertTrue(url.startsWith("file:")); +- assertTrue(url.endsWith("/javassist/CtMethod.class")); ++ assertTrue(url.startsWith("jar:file:")); ++ assertTrue(url.endsWith("javassist.jar!/javassist/CtMethod.class")); + + assertNull(cp.find("javassist.TestURL")); + diff --git a/dev-java/javassist/javassist-3.29.2.ebuild b/dev-java/javassist/javassist-3.29.2.ebuild index 0d7ace3e1511..87d13e19f38e 100644 --- a/dev-java/javassist/javassist-3.29.2.ebuild +++ b/dev-java/javassist/javassist-3.29.2.ebuild @@ -1,9 +1,6 @@ -# Copyright 1999-2022 Gentoo Authors +# 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/jboss-javassist/javassist/archive/rel_3_29_2_ga.tar.gz --slot 3 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javassist-3.29.2.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" @@ -15,29 +12,26 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="A class library for editing bytecodes in Java." HOMEPAGE="https://www.javassist.org" SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel_${PV//./_}_ga" LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1" SLOT="3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux" -# Compile dependencies -# POM: pom.xml -# test? junit:junit:[4.13.1,) -> >=dev-java/junit-4.13.2:4 -# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!! - -DEPEND=">=virtual/jdk-11:* - test? ( dev-java/hamcrest-library:1.3 )" +DEPEND=" + >=virtual/jdk-11:* + test? ( dev-java/hamcrest-library:1.3 ) +" RDEPEND=">=virtual/jre-1.8:*" DOCS=( Changes.md README.md ) HTML_DOCS=( tutorial/{brown.css,tutorial.html,tutorial2.html,tutorial3.html} ) -S="${WORKDIR}/${PN}-rel_${PV//./_}_ga" +PATCHES=( "${FILESDIR}/javassist-3.29.2-gentoo.patch" ) JAVA_AUTOMATIC_MODULE_NAME="org.javassist" JAVA_MAIN_CLASS="javassist.CtClass" -JAVA_NEEDS_TOOLS=1 JAVA_SRC_DIR="src/main" JAVA_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,junit-4" @@ -46,28 +40,9 @@ JAVA_TEST_RUN_ONLY="javassist.JvstTest" # pom.xml, line 167 JAVA_TEST_SRC_DIR="src/test" src_prepare() { - default + default #780585 + java-pkg-2_src_prepare java-pkg_clean javassist.jar - sed -e 's:\.\./\.\./::' -i src/test/javassist/JvstTest{4,Root}.java || die - - # Tests run: 432, Failures: 6 - # https://bugs.gentoo.org/856364 - # Cannot solve those test failures. - # replacing test... with notTest... for those tests - sed \ - -e '/public void/s:testInsertAt:notTestInsertAt:' \ - -e '/public void/s:testInsertLocal:notTestInsertLocal:' \ - -e '/public void/s:testNewArray:notTestNewArray:' \ - -e '/public void/s:testURL:notTestURL:' \ - -i src/test/javassist/JvstTest2.java || die - - sed \ - -e '/public void/s:testMethodParameters:notTestMethodParameters:' \ - -i src/test/javassist/JvstTest4.java || die - - sed \ - -e '/public void/s:testLocalVarAttribute:notTestLocalVarAttribute:' \ - -i src/test/javassist/bytecode/BytecodeTest.java || die } src_test() { @@ -75,5 +50,6 @@ src_test() { einfo "Testing" JAVA_PKG_WANT_SOURCE=11 JAVA_PKG_WANT_TARGET=11 + JAVAC_ARGS="-g -parameters" java-pkg-simple_src_test } diff --git a/dev-java/javassist/javassist-3.30.2.ebuild b/dev-java/javassist/javassist-3.30.2.ebuild new file mode 100644 index 000000000000..fd3122df656a --- /dev/null +++ b/dev-java/javassist/javassist-3.30.2.ebuild @@ -0,0 +1,54 @@ +# 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.javassist:javassist:3.30.2-GA" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A class library for editing bytecodes in Java." +HOMEPAGE="https://www.javassist.org" +SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel_${PV//./_}_ga" + +LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1" +SLOT="3" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux" + +DEPEND=" + >=virtual/jdk-11:* + test? ( dev-java/hamcrest-library:1.3 ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( Changes.md README.md ) +HTML_DOCS=( tutorial/{brown.css,tutorial.html,tutorial2.html,tutorial3.html} ) + +PATCHES=( "${FILESDIR}/javassist-3.29.2-gentoo.patch" ) + +JAVA_AUTOMATIC_MODULE_NAME="org.javassist" +JAVA_MAIN_CLASS="javassist.CtClass" +JAVA_SRC_DIR="src/main" + +JAVA_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,junit-4" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_RUN_ONLY="javassist.JvstTest" # pom.xml, line 167 +JAVA_TEST_SRC_DIR="src/test" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean ! -path "./src/test*" +} + +src_test() { + einfo "Testing" + JAVA_PKG_WANT_SOURCE=11 + JAVA_PKG_WANT_TARGET=11 + JAVAC_ARGS="-g -parameters" + java-pkg-simple_src_test +} diff --git a/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild index c1e3431b5381..3b6b4eb72965 100644 --- a/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild +++ b/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 sparc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-java/javax-el-api/javax-el-api-2.2.ebuild b/dev-java/javax-el-api/javax-el-api-2.2.ebuild index 164895534df4..d72e01341b3a 100644 --- a/dev-java/javax-el-api/javax-el-api-2.2.ebuild +++ b/dev-java/javax-el-api/javax-el-api-2.2.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 @@ -15,7 +15,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/el/el-api/${PV}/el-api-${PV}-sourc # https://repo1.maven.org/maven2/javax/el/el-api/2.2/el-api-2.2.pom LICENSE="CDDL GPL-2" SLOT="2.2" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/javax-inject/javax-inject-1-r4.ebuild b/dev-java/javax-inject/javax-inject-1-r4.ebuild index e211c0f48a5e..8331f33005c7 100644 --- a/dev-java/javax-inject/javax-inject-1-r4.ebuild +++ b/dev-java/javax-inject/javax-inject-1-r4.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 @@ -17,7 +17,7 @@ SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sou LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild b/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild index a372cbbdc0cd..215d44895575 100644 --- a/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild +++ b/dev-java/javax-jms-api/javax-jms-api-2.0.3.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: @@ -17,7 +17,7 @@ SRC_URI="https://github.com/jakartaee/messaging/archive/${PV}-RELEASE.tar.gz -> LICENSE="EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/javax-jsp-api/javax-jsp-api-2.0.ebuild b/dev-java/javax-jsp-api/javax-jsp-api-2.0.ebuild index 2bc79637f253..0c8c4fc07057 100644 --- a/dev-java/javax-jsp-api/javax-jsp-api-2.0.ebuild +++ b/dev-java/javax-jsp-api/javax-jsp-api-2.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 @@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/${PV}/jsp-api- LICENSE="CDDL GPL-2-with-classpath-exception" SLOT="2.0" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="amd64 ~arm64" CP_DEPEND="dev-java/javax-servlet-api:2.5" diff --git a/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild b/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild index bd949201c1c8..7c100e1ee27b 100644 --- a/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild +++ b/dev-java/javax-jsp-api/javax-jsp-api-2.2.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 @@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/${PV}/jsp-api- LICENSE="CDDL GPL-2-with-classpath-exception" SLOT="2.2" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" CP_DEPEND=" dev-java/javax-el-api:2.2 diff --git a/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild b/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild index f19bd8c2717b..814ea5eb82fd 100644 --- a/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild +++ b/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/mail-api-${PV}" LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" dev-java/jakarta-activation:1 diff --git a/dev-java/javax-persistence-api/javax-persistence-api-2.2-r1.ebuild b/dev-java/javax-persistence-api/javax-persistence-api-2.2-r1.ebuild index 6526ed970920..11e58b4d2a2d 100644 --- a/dev-java/javax-persistence-api/javax-persistence-api-2.2-r1.ebuild +++ b/dev-java/javax-persistence-api/javax-persistence-api-2.2-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/persistence/${PN/-/.}/${PV}/${PN/- LICENSE="EPL-1.0 BSD" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" BDEPEND="app-arch/unzip" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/javax-servlet-api/javax-servlet-api-2.2.ebuild b/dev-java/javax-servlet-api/javax-servlet-api-2.2.ebuild index e1ef677f416c..5ba2ead7e975 100644 --- a/dev-java/javax-servlet-api/javax-servlet-api-2.2.ebuild +++ b/dev-java/javax-servlet-api/javax-servlet-api-2.2.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 @@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/servlet-api/${PV}/servlet- LICENSE="CDDL GPL-2" SLOT="2.2" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" +KEYWORDS="amd64 ~arm64 ppc64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild b/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild index 75c0e7178cc5..1dafea3fb148 100644 --- a/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild +++ b/dev-java/javax-servlet-api/javax-servlet-api-2.5.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 @@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/servlet-api/${PV}/servlet- LICENSE="CDDL GPL-2" SLOT="2.5" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/javax-servlet-api/javax-servlet-api-3.0.1.ebuild b/dev-java/javax-servlet-api/javax-servlet-api-3.0.1.ebuild index c591b2849432..f4e7ec9ff5b5 100644 --- a/dev-java/javax-servlet-api/javax-servlet-api-3.0.1.ebuild +++ b/dev-java/javax-servlet-api/javax-servlet-api-3.0.1.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 @@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/${PV}/ja LICENSE="CDDL GPL-2" SLOT="3.0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm64 ~ppc64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/javax-servlet-api/javax-servlet-api-3.1.0.ebuild b/dev-java/javax-servlet-api/javax-servlet-api-3.1.0.ebuild index d587febbc061..13f36585d1a2 100644 --- a/dev-java/javax-servlet-api/javax-servlet-api-3.1.0.ebuild +++ b/dev-java/javax-servlet-api/javax-servlet-api-3.1.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 @@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/${PV}/ja LICENSE="CDDL GPL-2" SLOT="3.1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild b/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild index 9d4fbbaaf082..90c307982f04 100644 --- a/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild +++ b/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild @@ -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 @@ -15,7 +15,7 @@ S="${WORKDIR}/${P}" LICENSE="EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" # Common dependencies # POM: api/pom.xml diff --git a/dev-java/jaxb-api/jaxb-api-2.3.3-r2.ebuild b/dev-java/jaxb-api/jaxb-api-2.3.3-r2.ebuild index abe2f8cfb559..92079e115c68 100644 --- a/dev-java/jaxb-api/jaxb-api-2.3.3-r2.ebuild +++ b/dev-java/jaxb-api/jaxb-api-2.3.3-r2.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}" LICENSE="EPL-1.0" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CDEPEND="dev-java/jakarta-activation-api:1" DEPEND="${CDEPEND} diff --git a/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild b/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild index 9167a5edd809..277a8690bf2d 100644 --- a/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild +++ b/dev-java/jaxb-api/jaxb-api-3.0.1-r1.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: @@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="EPL-1.0" SLOT="3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Common dependencies # POM: pom.xml diff --git a/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild b/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild index d0a0b6381a1a..9aa9e1192bb5 100644 --- a/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild +++ b/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}" LICENSE="EPL-1.0" SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND="dev-java/jakarta-activation:2" diff --git a/dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild b/dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild index 6f2e9531600b..236c07d41988 100644 --- a/dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild +++ b/dev-java/jaxb-runtime/jaxb-runtime-2.3.8.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 @@ -16,7 +16,7 @@ S="${WORKDIR}/jaxb-ri-${PV}-RI/jaxb-ri/runtime/impl" LICENSE="EPL-1.0" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" dev-java/fastinfoset:0 diff --git a/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild b/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild index f5011e99962c..8d5b42eead5a 100644 --- a/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild +++ b/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaxb-ri/archive/${PV}-RI.tar.gz -> jaxb LICENSE="EPL-1.0" SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" >=dev-java/fastinfoset-2.1.0-r1:0 diff --git a/dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild b/dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild index 670310633c8a..fb8e148ace4e 100644 --- a/dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild +++ b/dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.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 @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}" LICENSE="EPL-1.0" SLOT="1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" dev-java/jakarta-activation-api:1 diff --git a/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild b/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild index d5300cd9e6ee..9a8ef61d196d 100644 --- a/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild +++ b/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" dev-java/jakarta-activation-api:2 diff --git a/dev-java/jaxen/jaxen-2.0.0.ebuild b/dev-java/jaxen/jaxen-2.0.0.ebuild index 87e5391e9b4a..615e61a2aec8 100644 --- a/dev-java/jaxen/jaxen-2.0.0.ebuild +++ b/dev-java/jaxen/jaxen-2.0.0.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 @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}" LICENSE="BSD-2" SLOT="1.2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" IUSE="dom4j jdom xom" # It seems that most tests depend on dom4j, jdom and xom which all depend back on jaxen diff --git a/dev-java/jaxrs-api/jaxrs-api-2.1.6-r1.ebuild b/dev-java/jaxrs-api/jaxrs-api-2.1.6-r1.ebuild index f1dac5a6fa62..8f794268b211 100644 --- a/dev-java/jaxrs-api/jaxrs-api-2.1.6-r1.ebuild +++ b/dev-java/jaxrs-api/jaxrs-api-2.1.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 @@ -16,7 +16,7 @@ S="${WORKDIR}/rest-${PV}/${PN}" LICENSE="EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" >=virtual/jdk-11:* diff --git a/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild b/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild index f9b7430e6ad9..1dcdddcb465b 100644 --- a/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild +++ b/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jax-ws-api/archive/${PV}.tar.gz -> ${P} LICENSE="BSD" # "BSD-3 Clause" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=" diff --git a/dev-java/jbcrypt/jbcrypt-0.4.ebuild b/dev-java/jbcrypt/jbcrypt-0.4.ebuild index 67f22649a8e5..cde1c1bd8355 100644 --- a/dev-java/jbcrypt/jbcrypt-0.4.ebuild +++ b/dev-java/jbcrypt/jbcrypt-0.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 @@ -10,17 +10,16 @@ JAVA_TESTING_FRAMEWORKS="junit" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Java implementation of OpenBSD's Blowfish password hashing code" -HOMEPAGE="https://www.mindrot.org/projects/jBCrypt" +HOMEPAGE="https://www.mindrot.org/projects/jBCrypt/" SRC_URI="https://www.mindrot.org/files/jBCrypt/jBCrypt-${PV}.tar.gz" +S="${WORKDIR}/jBCrypt-${PV}" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}/jBCrypt-${PV}" - JAVA_SRC_DIR="src" JAVA_TEST_SRC_DIR="test" JAVA_TEST_GENTOO_CLASSPATH="junit" diff --git a/dev-java/jbig2-imageio/Manifest b/dev-java/jbig2-imageio/Manifest index e0b9d8c74615..3f4c44c3eb75 100644 --- a/dev-java/jbig2-imageio/Manifest +++ b/dev-java/jbig2-imageio/Manifest @@ -1 +1,3 @@ DIST jbig2-imageio-3.0.3-src.zip 2079380 BLAKE2B bb05f81bfdef00b1a0ffcb7a2df2617fe5f5a83957249266917e775ceab57282ee289aedb198c6639201e85df83e89b8cfe8cf2d865fff863d1f2a5acd439721 SHA512 5350b4ce89af72eea5069f6ea5fc830238e4df711712506405aaf0e14546a1b07155b8c5225b47f0d40ce2821032426a2987adbe0df63c536cae4fb319b5c700 +DIST jbig2-imageio-3.0.4-src.zip 2068836 BLAKE2B 92e1d3e50703c09cb8e22951e403b24531905d31f83f54db08abddb86b3a7a1e206c8d4bf6cf3f41777069158e3268180de09ef7803cbaf7cbc8a67390420971 SHA512 382acb53e0bb56595f7eb8c382369a48a000ced22ff4d101ec89316c749b5afd344c6303a3e6c75b12e949f1efe688e18bd1b8b0b5deb449a581b1c97c35e672 +DIST jbig2-imageio-3.0.4-src.zip.asc 195 BLAKE2B 1790d4435b8924642cc7361cd7555e31a5b8f30d536ade0c1aac0b1f304f55483f3ac720351ac7824e4d2de7f37158a5115d8642cd2c8130207b561d62059a28 SHA512 91e19f12e1de463280b058c3e7de702ab7f1fd6dc6c4e3fcf922e5f9364b49ee347635579dd83afc5ee2d617e117d591333c4e1f7d26e01898f1b8297b78ac70 diff --git a/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild b/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild index 24e6a4482fb5..3989709b8320 100644 --- a/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild +++ b/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.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: @@ -18,7 +18,7 @@ SRC_URI="https://downloads.apache.org/pdfbox/${PN}/${PV}/${P}-src.zip" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jbig2-imageio/jbig2-imageio-3.0.4.ebuild b/dev-java/jbig2-imageio/jbig2-imageio-3.0.4.ebuild new file mode 100644 index 000000000000..3ee84526614a --- /dev/null +++ b/dev-java/jbig2-imageio/jbig2-imageio-3.0.4.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 test" +MAVEN_ID="org.apache.pdfbox:jbig2-imageio:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="PDFBox JBIG2 ImageIO plugin" +HOMEPAGE="https://pdfbox.apache.org" +SRC_URI="https://downloads.apache.org/pdfbox/${PN}/${PV}/${P}-src.zip + verify-sig? ( https://downloads.apache.org/pdfbox/${PN}/${PV}/${P}-src.zip.asc )" +S="${WORKDIR}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/pdfbox.apache.org.asc" +BDEPEND=" + app-arch/unzip + verify-sig? ( sec-keys/openpgp-keys-apache-pdfbox ) +" +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="org.apache.pdfbox.jbig2" +JAVA_RESOURCE_DIRS="${P}/src/main/resources" +JAVA_SRC_DIR="${P}/src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_RESOURCE_DIRS="${P}/src/test/resources" +JAVA_TEST_SRC_DIR="${P}/src/test/java" + +JAVA_TEST_EXCLUDES=( + # org.junit.runners.model.InvalidTestClassError: Invalid test class + # 1. Test class should have exactly one public constructor + "org.apache.pdfbox.jbig2.util.TestServiceImpl" + "org.apache.pdfbox.jbig2.util.TestService" +) diff --git a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild index a72404f111ad..a57b023fc468 100644 --- a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild +++ b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="amd64 ~arm64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jboss-jms-api/jboss-jms-api-1.0.1.ebuild b/dev-java/jboss-jms-api/jboss-jms-api-1.0.1.ebuild index 015ca5b9e7fe..c31f9f711531 100644 --- a/dev-java/jboss-jms-api/jboss-jms-api-1.0.1.ebuild +++ b/dev-java/jboss-jms-api/jboss-jms-api-1.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: @@ -17,7 +17,7 @@ SRC_URI="https://github.com/jboss/${PN}_spec/archive/${PN}_1.1_spec-${PV}.Final. LICENSE="CDDL GPL-2-with-classpath-exception" SLOT="1.1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jcalendar/jcalendar-1.4-r2.ebuild b/dev-java/jcalendar/jcalendar-1.4-r2.ebuild index 2985f2ad4db0..6ae57b00fd4e 100644 --- a/dev-java/jcalendar/jcalendar-1.4-r2.ebuild +++ b/dev-java/jcalendar/jcalendar-1.4-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://www.toedter.com/download/${P}.zip" LICENSE="LGPL-2.1" SLOT="1.2" -KEYWORDS="amd64 x86" +KEYWORDS="amd64" BDEPEND="app-arch/unzip" diff --git a/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild b/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild index 52ae935d3ef8..f7b83ec0b7a9 100644 --- a/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild +++ b/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/jchart2d/jchart2d/sources/jch LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" CP_DEPEND="dev-java/jide-oss:0 dev-java/xmlgraphics-commons:2" diff --git a/dev-java/jcifs/jcifs-1.3.19-r2.ebuild b/dev-java/jcifs/jcifs-1.3.19-r2.ebuild index 1ae94af596dc..a6da74568583 100644 --- a/dev-java/jcifs/jcifs-1.3.19-r2.ebuild +++ b/dev-java/jcifs/jcifs-1.3.19-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 @@ -15,7 +15,7 @@ S="${WORKDIR}/${P/-/_}" LICENSE="LGPL-2.1" SLOT="1.1" -KEYWORDS="amd64 ppc64 x86" +KEYWORDS="amd64 ppc64" CP_DEPEND="dev-java/jakarta-servlet-api:4" diff --git a/dev-java/jclasslib/jclasslib-4.3.1.ebuild b/dev-java/jclasslib/jclasslib-4.3.1.ebuild index 65b964da4d76..d7478b38e568 100644 --- a/dev-java/jclasslib/jclasslib-4.3.1.ebuild +++ b/dev-java/jclasslib/jclasslib-4.3.1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="amd64 ~arm64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jcommander/jcommander-1.64-r1.ebuild b/dev-java/jcommander/jcommander-1.64-r1.ebuild index 3fc26c3aa562..711f0e8997a6 100644 --- a/dev-java/jcommander/jcommander-1.64-r1.ebuild +++ b/dev-java/jcommander/jcommander-1.64-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 @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="1.64" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jcommander/jcommander-1.82.ebuild b/dev-java/jcommander/jcommander-1.82.ebuild index b859e3a9c46a..0f13c5ff3e27 100644 --- a/dev-java/jcommander/jcommander-1.82.ebuild +++ b/dev-java/jcommander/jcommander-1.82.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 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest index 19c388c630ec..4f01e26f1772 100644 --- a/dev-java/jctools-core/Manifest +++ b/dev-java/jctools-core/Manifest @@ -1,2 +1 @@ -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/jctools-core-4.0.3-r1.ebuild b/dev-java/jctools-core/jctools-core-4.0.3-r1.ebuild deleted file mode 100644 index a32f97d770ab..000000000000 --- a/dev-java/jctools-core/jctools-core-4.0.3-r1.ebuild +++ /dev/null @@ -1,70 +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.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-1.8:* - 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_AUTOMATIC_MODULE_NAME="org.jctools.core" -JAVA_CLASSPATH_EXTRA="osgi-annotation" -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest,junit-4" -JAVA_TEST_SRC_DIR="src/test/java" - -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/jctools-core/jctools-core-4.0.5-r1.ebuild b/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild index 164d974b5ed5..89ceefc92492 100644 --- a/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild +++ b/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/JCTools-${PV}/jctools-core" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" dev-java/osgi-annotation:0 diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest index 52f0d34a093a..2c3dcda5087a 100644 --- a/dev-java/jdbc-mysql/Manifest +++ b/dev-java/jdbc-mysql/Manifest @@ -1,5 +1,4 @@ -DIST mysql-connector-j-8.3.0.tar.gz 4255433 BLAKE2B b5cd437e4ab87052c0fd8e4da6a2612d4c068193a4fe2d207505b2f42d664a414c8a0f3131f34b471a30bfa6b6bb9e76ad0dd4779abbecb46ea014ab5d06e36d SHA512 0849ff13f4adc4ae2d2b9f64ff192435dd9560763a50c7df117a171ae1d90fc97bc36dc89097472d0a2c182492a45ca14ffcf577a9c54267be79e5b3f147dc41 -DIST mysql-connector-j-9.0.0.tar.gz 4469329 BLAKE2B 3248d43654c56a2b566bbf515de996ab43f845beb2104f69c3c3c837b8b527d8e9851fe849bcf55fd7eafb061e4780dfaa19b42583a7d12b72367d0a36a61ab3 SHA512 40028f528e8bff686fcd700d165785194e1732a8c2c29efb2ffe67623f8915caaac4d2a9e548b0e9cda4328e25cfd6fe4e008cca1491117e38a4c79af0231475 +DIST mysql-connector-j-9.1.0.tar.gz 4485702 BLAKE2B f382d58f559c6ec10899e32d4370e817f07561b294c1a173856df98a088a3e981952ac117ec3cc0946b8ef43a68eb52880ba45d9bb23b393b8a00a6999d52176 SHA512 042aa06fc5fb84d33b8308731371a29199a68bac5ae0866729fb2881f1bd4f41141f355c56c24764f2084059d99da56d9bba35d6ce3b48d9286bd1294d84ac02 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.3.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild deleted file mode 100644 index fa5c0981ca39..000000000000 --- a/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild +++ /dev/null @@ -1,55 +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="com.mysql:mysql-connector-j:8.3.0" -# Tests disabled, see bug #902723 -# 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="3.29.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.25:0 <dev-java/protobuf-java-3.26:0 - dev-java/slf4j-api:0 -" -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8:* - test? ( dev-java/junit:5 )" -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,junit-5" -JAVA_TEST_RESOURCE_DIRS="src/test/config" -JAVA_TEST_SRC_DIR="src/test/java" diff --git a/dev-java/jdbc-mysql/jdbc-mysql-9.0.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-9.1.0.ebuild index 30b2d925ac61..09f726d891ec 100644 --- a/dev-java/jdbc-mysql/jdbc-mysql-9.0.0.ebuild +++ b/dev-java/jdbc-mysql/jdbc-mysql-9.1.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 # No tests, see bug #902723 JAVA_PKG_IUSE="doc source" -MAVEN_ID="com.mysql:mysql-connector-j:9.0.0" +MAVEN_ID="com.mysql:mysql-connector-j:9.1.0" # JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple @@ -26,7 +26,7 @@ S="${WORKDIR}/mysql-connector-j-${PV}" LICENSE="GPL-2-with-MySQL-FLOSS-exception" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64" CP_DEPEND=" dev-java/c3p0:0 diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest index d4e40c50cee0..a7574c026ba4 100644 --- a/dev-java/jdbc-postgresql/Manifest +++ b/dev-java/jdbc-postgresql/Manifest @@ -1 +1,2 @@ DIST postgresql-jdbc-42.7.3.src.tar.gz 1005966 BLAKE2B 1c9aeae572fc983d6b86f8b552a78d1bd11cf439ca863ea4856ad470f60b6a9b4c0ae5ece60f3bc19718f288b9ce93572b522b5f5953a9b4b12558044d630959 SHA512 354e71a6da0f6b4b5282de4dd949f1824f1cd17a8dd73fbd218ff5adebd08e078fa7d59ee149cbe4133a7a149e39e71c5e075b58d72bfedd3e4b47680e86fa4b +DIST postgresql-jdbc-42.7.4.src.tar.gz 1033780 BLAKE2B ece772486915c60154fdcf165854dfacdc3077da6fcfea5e58d555be14d397d090b78629ea431ac541f3ede0fce2c8c2927fc90546eac03cc27dfa0357ffc319 SHA512 3f864848d0b6b079daf8abecabb2bd8487fa8bc23ef9265bfa71c484b4ee3b38a76cc38af7a72ac3ac64fa26569952b9b69d08b3b8a115d44bee823151c6c292 diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild index ab85f684bb07..f4388dd69826 100644 --- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild +++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/postgresql-${PV}-jdbc-src" LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 ppc64 x86" +KEYWORDS="amd64 ppc64" # package se.jiderhamn.classloader does not exist # package se.jiderhamn.classloader.leak does not exist # package uk.org.webcompere.systemstubs.environment does not exist diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.4.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.4.ebuild new file mode 100644 index 000000000000..a7d3d95b2a68 --- /dev/null +++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.4.ebuild @@ -0,0 +1,58 @@ +# 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.postgresql:postgresql:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database" +HOMEPAGE="https://jdbc.postgresql.org/" +SRC_URI="https://jdbc.postgresql.org/download/postgresql-jdbc-${PV}.src.tar.gz" +S="${WORKDIR}/postgresql-${PV}-jdbc-src" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64" +# package se.jiderhamn.classloader does not exist +# package se.jiderhamn.classloader.leak does not exist +# package uk.org.webcompere.systemstubs.environment does not exist +# package uk.org.webcompere.systemstubs.jupiter does not exist +# package uk.org.webcompere.systemstubs.properties does not exist +# package uk.org.webcompere.systemstubs.resource does not exist +RESTRICT="test" #839681 + +DEPEND=" + dev-java/checker-framework-qual:0 + dev-java/jna:4 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + >=dev-java/scram-3.1:0 + dev-java/waffle-jna:0 + >=virtual/jdk-1.8:* + test? ( dev-java/junit:5 ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_CLASSPATH_EXTRA=" + checker-framework-qual + jna-4 + osgi-cmpn-8 + osgi-core + scram + waffle-jna +" +JAVA_AUTOMATIC_MODULE_NAME="org.postgresql.jdbc" +JAVA_MAIN_CLASS="org.postgresql.util.PGJDBCMain" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH=" + junit-4 + junit-5 +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" diff --git a/dev-java/jdepend/jdepend-2.10-r1.ebuild b/dev-java/jdepend/jdepend-2.10-r1.ebuild index dcf930ec4582..a6f2780d19e3 100644 --- a/dev-java/jdepend/jdepend-2.10-r1.ebuild +++ b/dev-java/jdepend/jdepend-2.10-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${P}" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RESTRICT="test" #921147 DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/jdisasm/jdisasm-1.0.6.ebuild b/dev-java/jdisasm/jdisasm-1.0.6.ebuild index 442854e9b8d4..79b8714b5313 100644 --- a/dev-java/jdisasm/jdisasm-1.0.6.ebuild +++ b/dev-java/jdisasm/jdisasm-1.0.6.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: @@ -19,7 +19,7 @@ SRC_URI="https://github.com/aunkrig/jdisasm/archive/${MY_COMMIT}.tar.gz -> ${P}. LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # There was 1 failure: # 1) testWideLocals(jdisasm.Tests) diff --git a/dev-java/jdom/jdom-1.1.3-r2.ebuild b/dev-java/jdom/jdom-1.1.3-r2.ebuild index e4c3088a799d..1dfeee085553 100644 --- a/dev-java/jdom/jdom-1.1.3-r2.ebuild +++ b/dev-java/jdom/jdom-1.1.3-r2.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}" LICENSE="JDOM" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jdom/jdom-2.0.6.1.ebuild b/dev-java/jdom/jdom-2.0.6.1.ebuild index 774430ba8820..2cda081b0341 100644 --- a/dev-java/jdom/jdom-2.0.6.1.ebuild +++ b/dev-java/jdom/jdom-2.0.6.1.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 @@ -16,7 +16,7 @@ S="${WORKDIR}/jdom-JDOM-${PV}" LICENSE="Apache-1.1" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" dev-java/iso-relax:0 diff --git a/dev-java/jeromq/Manifest b/dev-java/jeromq/Manifest index cecc2a3c6361..98fd7cec8efe 100644 --- a/dev-java/jeromq/Manifest +++ b/dev-java/jeromq/Manifest @@ -1,2 +1 @@ -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.5.2.ebuild b/dev-java/jeromq/jeromq-0.5.2.ebuild deleted file mode 100644 index a9d3fe3c79c2..000000000000 --- a/dev-java/jeromq/jeromq-0.5.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/zeromq/jeromq/archive/refs/tags/v0.5.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jeromq-0.5.2.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.zeromq:jeromq:0.5.2" -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" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -PROPERTIES="test_network" -RESTRICT="test" - -# Common dependencies -# POM: pom.xml -# com.neilalexander:jnacl:1.0.0 -> >=dev-java/jnacl-1.0:0 - -CP_DEPEND="dev-java/jnacl:0" - -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8:*" - -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" - -DOCS=( AUTHORS LICENSE {CHANGELOG,CONTRIBUTING,README}.md ) - -S="${WORKDIR}/${P}" - -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/jeromq/jeromq-0.6.0-r1.ebuild b/dev-java/jeromq/jeromq-0.6.0-r1.ebuild index 30abb471818b..0f381fd73740 100644 --- a/dev-java/jeromq/jeromq-0.6.0-r1.ebuild +++ b/dev-java/jeromq/jeromq-0.6.0-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}" LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ppc64" PROPERTIES="test_network" RESTRICT="test" diff --git a/dev-java/jetbrains-annotations/Manifest b/dev-java/jetbrains-annotations/Manifest index 69e32259d859..1cd87d3f4b58 100644 --- a/dev-java/jetbrains-annotations/Manifest +++ b/dev-java/jetbrains-annotations/Manifest @@ -1 +1 @@ -DIST jetbrains-annotations-24.1.0.tar.gz 84549 BLAKE2B 1c522e4eeb71520108d83305667571fd07b452977277a161ea0f6a940431212ccd3b7ca2980f77b0e8c015cce0b5a35500fefca73e74bf48c9859525332bdc81 SHA512 80dc35009eaac29b44a5126865bf76d1c2d20c0e9094a200b13bc9047d6ec327a25e49a06c462ba65c4aa6e3d201d0a3005614f27b07adcf107080c0189af9fa +DIST jetbrains-annotations-26.0.1.tar.gz 148134 BLAKE2B 154dad272ea1326281e4dd7b6dbfed98a8ba018ce1d6fc2a225ddff1db785646b1707f4e59640658b6f6a512ef6b3c282fa18eb2d656ce659d0ed2e47e2e9b3f SHA512 230e5812242cdad9baf0c3fd8a9cc0ef17cc52e8c2d120988da84d9097cc63fb809547afdfcd17a3506fbf3e9c96eb9fd5e149ee90645ef9098a085318be3cf1 diff --git a/dev-java/jetbrains-annotations/jetbrains-annotations-24.1.0.ebuild b/dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild index 5f359ddcbe74..596a02691f70 100644 --- a/dev-java/jetbrains-annotations/jetbrains-annotations-24.1.0.ebuild +++ b/dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild @@ -20,4 +20,4 @@ KEYWORDS="~amd64" DEPEND=">=virtual/jdk-11:*" # module-info RDEPEND=">=virtual/jre-1.8:*" -JAVA_SRC_DIR=( {common,java8,module-info}/src/main/java ) +JAVA_SRC_DIR=( src/jvmMain/{java,moduleInfo} ) diff --git a/dev-java/jffi/jffi-1.3.10.ebuild b/dev-java/jffi/jffi-1.3.10.ebuild index 6f5d7fa61f9e..3c62e8a2a78c 100644 --- a/dev-java/jffi/jffi-1.3.10.ebuild +++ b/dev-java/jffi/jffi-1.3.10.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 @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="Apache-2.0" SLOT="1.3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:* >=dev-libs/libffi-3.4.2-r2:=" diff --git a/dev-java/jflex/jflex-1.6.1-r3.ebuild b/dev-java/jflex/jflex-1.6.1-r3.ebuild index 79f141edeb94..ee3f226e1d98 100644 --- a/dev-java/jflex/jflex-1.6.1-r3.ebuild +++ b/dev-java/jflex/jflex-1.6.1-r3.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${P}" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 ~ppc-macos ~x64-macos" +KEYWORDS="amd64 arm64 ppc64 ~ppc-macos ~x64-macos" IUSE="ant-task examples test vim-syntax" RESTRICT="!test? ( test )" REQUIRED_USE="test? ( ant-task )" diff --git a/dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild b/dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild index 92301470bd7f..084928c5c1ca 100644 --- a/dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild +++ b/dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.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 @@ -17,7 +17,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip" LICENSE="BSD" SLOT="1.8" -KEYWORDS="amd64 ~ppc64 x86" +KEYWORDS="amd64 ~ppc64" IUSE="" RESTRICT="test" diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r2.ebuild index b66de1813650..dd773d43632c 100644 --- a/dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r1.ebuild +++ b/dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source" @@ -12,35 +12,33 @@ MY_PV=${PV//./_} MY_P="${PN}-${MY_PV}" DESCRIPTION="JGoodies Looks Library" -HOMEPAGE="http://www.jgoodies.com/" +HOMEPAGE="https://www.jgoodies.com" SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip" +S="${WORKDIR}"/${P} LICENSE="BSD" SLOT="2.6" -KEYWORDS="amd64 x86" -IUSE="" +KEYWORDS="amd64" -CDEPEND="dev-java/jgoodies-common:1.8" +CP_DEPEND="dev-java/jgoodies-common:1.8" RDEPEND=" - ${CDEPEND} - virtual/jre:1.8" + ${CP_DEPEND} + virtual/jre:1.8 +" DEPEND=" - ${CDEPEND} - virtual/jdk:1.8" - -BDEPEND=" - app-arch/unzip" + ${CP_DEPEND} + virtual/jdk:1.8 +" -S="${WORKDIR}"/${P} +BDEPEND="app-arch/unzip" JAVA_SRC_DIR="src" -JAVA_GENTOO_CLASSPATH="jgoodies-common-1.8" src_prepare() { - default + java-pkg-2_src_prepare mkdir src || die unzip ${P}-sources.jar -d src || die - rm "${S}"/pom.xml "${S}"/*.jar || die + rm "${S}"/*.jar || die } diff --git a/dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild b/dev-java/jide-oss/jide-oss-3.7.12-r2.ebuild index c25d8ee7fdcc..07effbc5a455 100644 --- a/dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild +++ b/dev-java/jide-oss/jide-oss-3.7.12-r2.ebuild @@ -1,10 +1,7 @@ # 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/jidesoft/jide-oss/archive/19083238ce00ecbd7370f856cb64ea69dae669a5.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild jide-oss.3.7.12-r2.ebuild - -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source test" MAVEN_ID="com.jidesoft:jide-oss:3.7.12" @@ -16,26 +13,25 @@ inherit java-pkg-2 java-pkg-simple 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" +S="${WORKDIR}/${PN}-${MY_COMMIT}" LICENSE="GPL-2-with-classpath-exception" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" # Upstream does not support java-11 # https://github.com/jidesoft/jide-oss/issues/30 DEPEND="virtual/jdk:1.8" RDEPEND="virtual/jre:1.8" -DOCS=( {LICENSE,'Readme JDK9',README}.txt libs/README_lib ) - -S="${WORKDIR}/${PN}-${MY_COMMIT}" +DOCS=( {'Readme JDK9',README}.txt libs/README_lib ) JAVA_GENTOO_CLASSPATH_EXTRA="libs/ui.jar" -JAVA_SRC_DIR=( "src" "src-jdk8" ) JAVA_RESOURCE_DIRS=( "src" "properties" ) +JAVA_SRC_DIR=( "src" "src-jdk8" ) -JAVA_TEST_SRC_DIR="test" JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="test" JAVA_TEST_EXCLUDES=( "com.jidesoft.swing.CornerScrollerVisualTest" # No runnable methods @@ -48,11 +44,6 @@ JAVA_TEST_EXCLUDES=( ) src_prepare() { - default + java-pkg-2_src_prepare rm libs/junit-4.10.jar || die } - -src_install() { - default - java-pkg-simple_src_install -} diff --git a/dev-java/jimfs/jimfs-1.3.0.ebuild b/dev-java/jimfs/jimfs-1.3.0.ebuild index bb73a2d2a856..51da03ba1670 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 arm64 ppc64" CP_DEPEND=" dev-java/auto-service-annotations:0 diff --git a/dev-java/jline/jline-2.14.6.ebuild b/dev-java/jline/jline-2.14.6-r1.ebuild index 181001afabb7..50628992ff30 100644 --- a/dev-java/jline/jline-2.14.6.ebuild +++ b/dev-java/jline/jline-2.14.6-r1.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source" -JAVA_SRC_DIR="src/main/java" -JAVA_GENTOO_CLASSPATH="jansi,jansi-native" + inherit java-pkg-2 java-pkg-simple DESCRIPTION="A Java library for handling console input" @@ -15,32 +14,36 @@ S="${WORKDIR}/${PN}2-${P}" LICENSE="BSD" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" IUSE="test" + # Needs yet-unpackaged powermock for tests RESTRICT="!test? ( test ) test" -CDEPEND=" +CP_DEPEND=" dev-java/jansi:0 dev-java/jansi-native:0" DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-1.8:* test? ( dev-java/easymock:3.2 dev-java/junit:4 ) - ${CDEPEND} - >=virtual/jdk-1.8:*" +" RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" -src_prepare() { - default +DOCS=( {CHANGELOG,README}.md ) + +JAVA_SRC_DIR="src/main/java" - # Easier to use java-pkg-simple. - rm -v pom.xml || die +src_prepare() { + java-pkg-2_src_prepare # Don't forget the resources! mkdir -p target/classes || die @@ -58,9 +61,3 @@ src_test() { ejavac -cp "${CP}" -d . $(find * -name "*.java" || die) ejunit4 -classpath "${CP}" ${TESTS} } - -src_install() { - java-pkg-simple_src_install - - dodoc {CHANGELOG,README}.md -} diff --git a/dev-java/jmh-core/jmh-core-1.37.ebuild b/dev-java/jmh-core/jmh-core-1.37.ebuild index 0fcaad366369..398898829f60 100644 --- a/dev-java/jmh-core/jmh-core-1.37.ebuild +++ b/dev-java/jmh-core/jmh-core-1.37.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/jmh-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" dev-java/commons-math:3 diff --git a/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild b/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild index a4d3d8c5c886..eef83ed218c9 100644 --- a/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild +++ b/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.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 @@ -15,7 +15,7 @@ S="${WORKDIR}/jmh-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64" DEPEND=" dev-java/jmh-core:0 diff --git a/dev-java/jmock/jmock-1.2.0-r2.ebuild b/dev-java/jmock/jmock-1.2.0-r3.ebuild index c2731ac74487..7225c30b6999 100644 --- a/dev-java/jmock/jmock-1.2.0-r2.ebuild +++ b/dev-java/jmock/jmock-1.2.0-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source" @@ -10,24 +10,26 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Library for testing Java code using mock objects" HOMEPAGE="http://jmock.org/" SRC_URI="http://jmock.org/downloads/${P}-jars.zip" +S="${WORKDIR}/${P}" LICENSE="BSD" SLOT="1.0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - -CDEPEND="dev-java/junit:0" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -RDEPEND=">=virtual/jre-1.8:* - ${CDEPEND}" +CP_DEPEND="dev-java/junit:0" -DEPEND="app-arch/unzip +DEPEND=" + ${CP_DEPEND} + app-arch/unzip >=virtual/jdk-1.8:* - ${CDEPEND}" +" -S="${WORKDIR}/${P}" +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" JAVA_SRC_DIR="src" -JAVA_GENTOO_CLASSPATH="junit" PATCHES=( # This patch isn't changing the behaviour if jmock per se. @@ -42,7 +44,7 @@ src_unpack() { } src_prepare() { - default - find -name "*.class" -delete || die - rm *.jar || die + default #780585 + java-pkg-2_src_prepare + java-pkg_clean } diff --git a/dev-java/jmock/jmock-2.12.0.ebuild b/dev-java/jmock/jmock-2.12.0.ebuild index a258ba6eeffd..7d109b992e3c 100644 --- a/dev-java/jmock/jmock-2.12.0.ebuild +++ b/dev-java/jmock/jmock-2.12.0.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}-developers/${PN}-library/archive/${PV}.tar.gz LICENSE="BSD" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" dev-java/asm:9 diff --git a/dev-java/jmock/metadata.xml b/dev-java/jmock/metadata.xml index 6021501589e0..2d37bfa76e43 100644 --- a/dev-java/jmock/metadata.xml +++ b/dev-java/jmock/metadata.xml @@ -5,4 +5,7 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> +<upstream> + <remote-id type="github">jmock-developers/jmock-library</remote-id> +</upstream> </pkgmetadata> diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest index 667bee66b18f..4353b9b342f6 100644 --- a/dev-java/jna/Manifest +++ b/dev-java/jna/Manifest @@ -1,2 +1,3 @@ DIST jna-5.13.0.tar.gz 116027625 BLAKE2B 1f2bc7ab28adefa0bbad122957ed2c6ef55ab88e79b30c05f0d2d88e0e05152f7bb5e28097906a7e24f78304dfa2b225587adb0ada205ca3c2ceac1cdbab3f04 SHA512 aefd0becc03bb7fd753e8c5cdcbcb20f6d590125a5fb03048bef0024e826ab0254b750e22a8bb26bea38cc89262ad45e5030b666cb2c857b01b15a6a55379a0f DIST jna-5.14.0.tar.gz 116167104 BLAKE2B 3ccb9e53e843690f9c90272c2e94fb2d903dd9bbcb7b6294a6ed3d973d3945c2b3fe5ac5e4c472830a7d07f4f32d84e781bb2ae3bd73cdd1894392331554e2cd SHA512 5758898052b3b099cd8b40046f764813377970a428e66370ba2a7125403661e25379d55fdb0ff75de32d66cbff20f0a05f438b2ca18804cc53f2edf4b1927ff0 +DIST jna-5.15.0.tar.gz 117272793 BLAKE2B e16f507df75715a73d2d9e35d6a31868723effdb14f86ddfdd5c49c2e925f73c6cba8375660d3b89ecd72ab54d58f14bc1347671ccf40dfe32288230629de49b SHA512 b3329138bbdb5040da7a6b305af37e46ffd02948551f5c9fc2815eb7a66946807c3b9152797808b5a171735d6a1a241f25dc0ef95ecacf897926135727d1d533 diff --git a/dev-java/jna/jna-5.13.0-r1.ebuild b/dev-java/jna/jna-5.13.0-r1.ebuild index a09e852950df..2b0bbe85f60e 100644 --- a/dev-java/jna/jna-5.13.0-r1.ebuild +++ b/dev-java/jna/jna-5.13.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 @@ -19,7 +19,7 @@ S="${WORKDIR}/${P}" LICENSE="|| ( Apache-2.0 LGPL-2.1+ )" SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" BDEPEND=" virtual/pkgconfig diff --git a/dev-java/jna/jna-5.14.0-r1.ebuild b/dev-java/jna/jna-5.14.0-r1.ebuild index 183ba4f35027..30e69f517f10 100644 --- a/dev-java/jna/jna-5.14.0-r1.ebuild +++ b/dev-java/jna/jna-5.14.0-r1.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/${P}" LICENSE="|| ( Apache-2.0 LGPL-2.1+ )" SLOT="4" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +KEYWORDS="amd64 arm64 ~ppc64" BDEPEND=" virtual/pkgconfig diff --git a/dev-java/jna/jna-5.15.0.ebuild b/dev-java/jna/jna-5.15.0.ebuild new file mode 100644 index 000000000000..4052bd136c36 --- /dev/null +++ b/dev-java/jna/jna-5.15.0.ebuild @@ -0,0 +1,198 @@ +# 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=" + net.java.dev.jna:jna:${PV} + net.java.dev.jna:jna-platform:${PV} +" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple toolchain-funcs + +DESCRIPTION="Java Native Access" +HOMEPAGE="https://github.com/java-native-access/jna" +SRC_URI="https://github.com/java-native-access/jna/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="|| ( Apache-2.0 LGPL-2.1+ )" +SLOT="4" +KEYWORDS="amd64 ~arm64 ~ppc64" + +BDEPEND=" + virtual/pkgconfig +" + +CDEPEND=" + >=dev-libs/libffi-3.4:= +" + +DEPEND=" + >=virtual/jdk-1.8:* + x11-base/xorg-proto:0 + test? ( + dev-java/reflections:0 + ) + ${CDEPEND} + x11-libs/libXt +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CDEPEND} +" + +DOCS=( README.md CHANGES.md OTHERS TODO ) +PATCHES=( + "${FILESDIR}/5.11.0-makefile-flags.patch" + "${FILESDIR}/jna-5.11.0-no-Werror.patch" + "${FILESDIR}/jna-5.13.0-testpath.patch" + "${FILESDIR}/jna-5.13.0-LibCTest.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean + mkdir -p "res/META-INF" || die + echo "Main-Class: com.sun.jna.Native" > "res/META-INF/MANIFEST.MF" || die + + # https://github.com/java-native-access/jna/blob/5.13.0/build.xml#L402-L407 + sed \ + -e "/VERSION =/s:TEMPLATE:${PV}:" \ + -e '/VERSION_NATIVE =/s:TEMPLATE:5.1.0:' \ + -i src/com/sun/jna/Version.java || die +} + +src_compile() { + einfo "Compiling jna.jar" + JAVA_AUTOMATIC_MODULE_NAME="com.sun.jna" + JAVA_JAR_FILENAME="jna.jar" + JAVA_RESOURCE_DIRS="res" + JAVA_SRC_DIR="src" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":jna.jar" + rm -r target || die + + einfo "Compiling jna-platform.jar" + JAVA_AUTOMATIC_MODULE_NAME="com.sun.jna.platform" + JAVA_JAR_FILENAME="jna-platform.jar" + JAVA_RESOURCE_DIRS="" + JAVA_SRC_DIR="contrib/platform/src" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":jna-platform.jar" + rm -r target || die + + if use doc; then + einfo "Compiling javadocs" + JAVA_SRC_DIR=( + "src" + "contrib/platform/src" + ) + JAVA_JAR_FILENAME="ignoreme.jar" + java-pkg-simple_src_compile + fi + + einfo "Generating headers com_sun_jna_Native.h com_sun_jna_Function.h" + ejavac -h native -classpath "src" \ + "src/com/sun/jna/Function.java" \ + "src/com/sun/jna/Native.java" || die + + einfo "Building native library" + cd native || die + local args=( + CC="$(tc-getCC)" + STRIP=true + DYNAMIC_LIBFFI=true + ) + # Using -j1 since otherwise fails to build: + # cannot find ../build/native/libtestlib.so: No such file or directory + # [Makefile:505: ../build/native/libtestlib2.so] Error 1 + emake -j1 "${args[@]}" +} + +src_test() { + JAVA_TEST_EXTRA_ARGS=( + -Djna.nosys=true + -Djna.boot.library.path=build/native + -Djna.library.path=build/native + ) + JAVA_TEST_GENTOO_CLASSPATH=" + junit-4 + reflections + " + + JAVA_TEST_SRC_DIR="contrib/platform/test" + rm -r contrib/platform/test/com/sun/jna/platform/{mac,unix,win32} || die + JAVA_TEST_EXCLUDES=( + # 1) testGetXAttr(com.sun.jna.platform.linux.XAttrUtilTest) + # java.io.IOException: errno: 95 + # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:85) + # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:70) + # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:56) + # at com.sun.jna.platform.linux.XAttrUtilTest.testGetXAttr(XAttrUtilTest.java:83) + # 2) setXAttr(com.sun.jna.platform.linux.XAttrUtilTest) + # java.io.IOException: errno: 95 + # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:85) + # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:70) + # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:56) + # at com.sun.jna.platform.linux.XAttrUtilTest.setXAttr(XAttrUtilTest.java:53) + com.sun.jna.platform.linux.XAttrUtilTest + ) + java-pkg-simple_src_test + + JAVA_TEST_SRC_DIR="test" + rm -r test/com/sun/jna/wince || die + rm -r test/com/sun/jna/win32 || die + + # 1) testLoadFromJarAbsolute(com.sun.jna.LibraryLoadTest) + # java.lang.UnsatisfiedLinkError: Unable to load library '/libtestlib-jar.so': + # /libtestlib-jar.so: cannot open shared object file: No such file or directory + jar cvf build/jna-test.jar \ + -C build/native libtestlib-jar.so \ + -C test com/sun/jna/data || die + JAVA_GENTOO_CLASSPATH_EXTRA+=":build/jna-test.jar" + + JAVA_TEST_EXCLUDES=( + com.sun.jna.CallbacksTest # Needs to run separately + com.sun.jna.DirectTest # Needs to run separately + com.sun.jna.NativeTest # Needs to run separately + com.sun.jna.TypeMapperTest # Needs to run separately + com.sun.jna.UnionTest # Needs to run separately + com.sun.jna.VMCrashProtectionTest # Needs to run separately + ) + java-pkg-simple_src_test + + JAVA_TEST_RUN_ONLY=( + com.sun.jna.CallbacksTest + com.sun.jna.DirectTest + com.sun.jna.UnionTest + ) + java-pkg-simple_src_test + + JAVA_TEST_RUN_ONLY=( com.sun.jna.NativeTest ) + java-pkg-simple_src_test + + JAVA_TEST_RUN_ONLY=( com.sun.jna.VMCrashProtectionTest ) + java-pkg-simple_src_test + + JAVA_TEST_RUN_ONLY=( com.sun.jna.TypeMapperTest ) + java-pkg-simple_src_test +} + +src_install() { + default + java-pkg_dojar jna.jar jna-platform.jar + java-pkg_doso build/native/libjnidispatch.so + + if use doc; then + java-pkg_dojavadoc target/api + fi + + if use source; then + java-pkg_dosrc "src/*" + java-pkg_dosrc "contrib/platform/src/*" + fi +} diff --git a/dev-java/jnacl/jnacl-1.0-r1.ebuild b/dev-java/jnacl/jnacl-1.0-r1.ebuild index 2b78a0000a35..ed0de93aa2d2 100644 --- a/dev-java/jnacl/jnacl-1.0-r1.ebuild +++ b/dev-java/jnacl/jnacl-1.0-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ppc64" # We don't have fest-assert RESTRICT="test" diff --git a/dev-java/jnacl/jnacl-1.0.ebuild b/dev-java/jnacl/jnacl-1.0.ebuild deleted file mode 100644 index a21823be388d..000000000000 --- a/dev-java/jnacl/jnacl-1.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/neilalexander/jnacl/archive/refs/tags/v1.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jnacl-1.0.ebuild - -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" - -# We don't have fest-assert -RESTRICT="test" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Compile dependencies -# POM: pom.xml -# test? org.easytesting:fest-assert:1.4 -> !!!groupId-not-found!!! -# test? org.testng:testng:6.13.1 -> !!!groupId-not-found!!! - -DEPEND=">=virtual/jdk-1.8:*" -# test? ( -# !!!groupId-not-found!!! -# ) -#" - -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( LICENSE README.md ) - -S="${WORKDIR}/${P}" - -JAVA_SRC_DIR="src/main/java" - -# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!" -# JAVA_TEST_SRC_DIR="src/test/java" - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/jnr-a64asm/jnr-a64asm-1.0.0-r1.ebuild b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0-r1.ebuild new file mode 100644 index 000000000000..e0c77ac2af16 --- /dev/null +++ b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0-r1.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.github.jnr:jnr-a64asm:1.0.0" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A pure-java A64 assembler" +HOMEPAGE="https://github.com/jnr/jnr-a64asm" +SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="amd64 arm64 ppc64" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild deleted file mode 100644 index 998ea27aa3f3..000000000000 --- a/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jnr/jnr-a64asm/archive/refs/tags/jnr-a64asm-1.0.0.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jnr-a64asm-1.0.0.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="com.github.jnr:jnr-a64asm:1.0.0" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A pure-java A64 assembler" -HOMEPAGE="http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm" -SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=" - >=virtual/jdk-1.8:* -" - -RDEPEND=" - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${PN}-${P}" - -JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/jnr-a64asm/metadata.xml b/dev-java/jnr-a64asm/metadata.xml index 75321cfb5598..ec84ffe0b483 100644 --- a/dev-java/jnr-a64asm/metadata.xml +++ b/dev-java/jnr-a64asm/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">jnr/jnr-a64asm</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/jnr-constants/jnr-constants-0.10.4.ebuild b/dev-java/jnr-constants/jnr-constants-0.10.4.ebuild index a4db1ae9b528..bf517c0858fc 100644 --- a/dev-java/jnr-constants/jnr-constants-0.10.4.ebuild +++ b/dev-java/jnr-constants/jnr-constants-0.10.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 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild index 7020f2331029..1bcbaea776f3 100644 --- a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild +++ b/dev-java/jnr-ffi/jnr-ffi-2.2.12.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: @@ -19,7 +19,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" dev-java/asm:9 diff --git a/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild index 23bbacedb948..4ce95b456a3a 100644 --- a/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild +++ b/dev-java/jnr-netdb/jnr-netdb-1.2.0.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 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/jnr-netdb/archive/jnr-netdb-${PV}.tar.gz" LICENSE="Apache-2.0" SLOT="1.0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" dev-java/jnr-ffi:2" diff --git a/dev-java/jnr-posix/jnr-posix-3.1.16.ebuild b/dev-java/jnr-posix/jnr-posix-3.1.16.ebuild index dde31b7e4fa4..2d4d881cc2cf 100644 --- a/dev-java/jnr-posix/jnr-posix-3.1.16.ebuild +++ b/dev-java/jnr-posix/jnr-posix-3.1.16.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 @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="EPL-2.0 GPL-2 LGPL-2.1" SLOT="3.0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" >=dev-java/jnr-ffi-2.2.12:2 diff --git a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r3.ebuild index d6d1682c2b7f..19f8951a3e12 100644 --- a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild +++ b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r3.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + JAVA_PKG_IUSE="doc source" MAVEN_ID="com.github.jnr:jnr-x86asm:1.0.2" @@ -9,17 +10,14 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="A pure-java port of asmjit" HOMEPAGE="https://github.com/jnr/jnr-x86asm" -SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" LICENSE="MIT" SLOT="1.0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" -IUSE="" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}/${P}" - JAVA_SRC_DIR="src/main/java" -JAVA_ANT_ENCODING="UTF-8" diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest index aa51e39d0cff..b21b8311ca0a 100644 --- a/dev-java/joda-convert/Manifest +++ b/dev-java/joda-convert/Manifest @@ -1 +1 @@ -DIST joda-convert-2.2.2.tar.gz 65476 BLAKE2B 9ef8e3b172d31f4e3b748ba5aae807b1d344c3b6bedeb0bf0b84b93009171495f271d03cd9f7b29147a256ddd1081b3fc9640c1df6b45425080ce1d44e2c0f37 SHA512 9660491373d5f7d415ab47cec7164922fc8901803e759bbf8cf7d0cc58040c2c8b245271f33d641a563ffb25b8e42f8197e297da7d1fe68a5c50ebb61536f3ae +DIST joda-convert-2.2.4.tar.gz 56778 BLAKE2B 76bcbf6a63461e2a1bb2ce82c38aa65fef1f385cdb9752ef7cffefcbd6b535b822f25a7d21026fd117fb2f40ec15113a6f2884ae21c56d1f49ea182fe9993fae SHA512 4d503328a8424f3992b4ad13f192481268136630426c3d9830d9e4bb4c6b14422d7097654c80b69f9c863b55b8da1938971b1dad5be70293824953c6c3a719ae diff --git a/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild b/dev-java/joda-convert/joda-convert-2.2.4.ebuild index ead8e8b640ec..76d7adfc3389 100644 --- a/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild +++ b/dev-java/joda-convert/joda-convert-2.2.4.ebuild @@ -1,13 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# 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/JodaOrg/joda-convert/archive/refs/tags/v2.2.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild joda-convert-2.2.2.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.joda:joda-convert:2.2.2" +MAVEN_ID="org.joda:joda-convert:2.2.4" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple @@ -15,15 +12,11 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Library to convert Objects to and from String" HOMEPAGE="https://www.joda.org/joda-convert/" SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Compile dependencies -# POM: pom.xml -# test? com.google.guava:guava:31.0.1-jre -> !!!suitable-mavenVersion-not-found!!! -# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4 +KEYWORDS="amd64 arm64 ppc64" DEPEND=" >=virtual/jdk-11:* @@ -32,14 +25,10 @@ DEPEND=" ) " -RDEPEND=" - >=virtual/jre-1.8:* -" +RDEPEND=">=virtual/jre-1.8:*" DOCS=( {NOTICE,RELEASE-NOTES}.txt README.md ) -S="${WORKDIR}/${P}" - JAVA_SRC_DIR="src/main/java" JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4" diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest index 9acad90f89bc..50464a6ea1bd 100644 --- a/dev-java/joda-time/Manifest +++ b/dev-java/joda-time/Manifest @@ -1 +1 @@ -DIST joda-time-2.11.2.tar.gz 1055885 BLAKE2B 52281dcb530734dd33d0c01b07c9fbc5e7afd507a97e6926f7ef442dc91907d999d126289bc609e6fabf6af4267e47e5a79452d462a3f0561c405e6cd7f5976f SHA512 ea43deea4ef751fc631c35589adec0c5d9d0a5c836c1a24ada5d994cb9310a55b5af69260afd2647516c64fc84b892a2e25fca4bb38e852982c40f7caa5858b3 +DIST joda-time-2.13.0.tar.gz 1076948 BLAKE2B d70be1086175c80f72c7dc945aea24f71d74552e7f8e56bd84a62f308bd9db0e006951ae415dfec6f18cb47485019e179e66a198b6c1adafaa79b3f590318825 SHA512 0e185c433891d6d6a1ac9e93e5ddf6cde4097de4b810881266ab8f149de4cfbe089b857a946e8d36731ad82f84c789e12ffcde1836cd088e9056e3533ce79200 diff --git a/dev-java/joda-time/files/joda-time-2.11.0-test.patch b/dev-java/joda-time/files/joda-time-2.11.0-test.patch deleted file mode 100644 index a74cd01edfbc..000000000000 --- a/dev-java/joda-time/files/joda-time-2.11.0-test.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/test/java/org/joda/time/TestDateTimeZone.java -+++ b/src/test/java/org/joda/time/TestDateTimeZone.java -@@ -778,9 +778,10 @@ public class TestDateTimeZone extends TestCase { - static final boolean JDK9; - static { - boolean jdk9 = true; -+ System.out.println("java.version = " + System.getProperty("java.version") ); - try { - String str = System.getProperty("java.version"); -- jdk9 = str.startsWith("9"); -+ jdk9 = str.startsWith("11"); - } catch (Exception ex) { - jdk9 = false; - } diff --git a/dev-java/joda-time/joda-time-2.11.2.ebuild b/dev-java/joda-time/joda-time-2.13.0.ebuild index 9df6e71a7775..4d89f018742b 100644 --- a/dev-java/joda-time/joda-time-2.11.2.ebuild +++ b/dev-java/joda-time/joda-time-2.13.0.ebuild @@ -1,13 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# 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/JodaOrg/joda-time/archive/v2.11..tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" --ebuild joda-time-2.11..ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="joda-time:joda-time:2.11.2" +MAVEN_ID="joda-time:joda-time:2.13.0" JAVA_TESTING_FRAMEWORKS="junit" inherit edo java-pkg-2 java-pkg-simple @@ -15,34 +12,23 @@ inherit edo java-pkg-2 java-pkg-simple DESCRIPTION="Date and time library to replace JDK date handling" HOMEPAGE="https://www.joda.org/joda-time/" SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" - -# Common dependencies -# POM: pom.xml -# org.joda:joda-convert:1.9.2 -> >=dev-java/joda-convert-2.2.2:0 +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos" -CP_DEPEND="dev-java/joda-convert:0" +DEPEND=" + dev-java/joda-convert:0 + >=virtual/jdk-1.8:* +" -DEPEND=">=virtual/jdk-1.8:* - ${CP_DEPEND}" - -RDEPEND=">=virtual/jre-1.8:* - ${CP_DEPEND}" - -PATCHES=( - # Enable tests for jdk-11 in - # src/test/java/org/joda/time/TestDateTimeZone.java - "${FILESDIR}/joda-time-2.11.0-test.patch" -) +RDEPEND=">=virtual/jre-1.8:*" DOCS=( NOTICE.txt README.md RELEASE-NOTES.txt ) -S="${WORKDIR}/${P}" - JAVA_AUTOMATIC_MODULE_NAME="org.joda.time" +JAVA_CLASSPATH_EXTRA="joda-convert" JAVA_RESOURCE_DIRS="src/main/res" JAVA_SRC_DIR="src/main/java" @@ -54,21 +40,25 @@ JAVA_TEST_SRC_DIR="src/test/java" src_prepare() { default # move .properties files to JAVA_RESOURCE_DIRS - mkdir -p src/main/res + mkdir -p src/main/res/META-INF ZoneInfoCompiler || die cp -r src/main/{java/*,res} || die find src/main/res -type f ! -name '*.properties' -exec rm -rf {} + || die + mv src/main/res{ources,}/META-INF/native-image || die } src_compile() { - java-pkg-simple_src_compile - # Generate the missing "org/joda/time/tz/data/ZoneInfoMap" # Arguments from https://github.com/JodaOrg/joda-time/blob/v2.10.10/pom.xml#L413-L427 + ejavac \ + -d ZoneInfoCompiler \ + -cp ${JAVA_SRC_DIR}:$(java-pkg_getjars --build-only joda-convert) \ + src/main/java/org/joda/time/tz/ZoneInfoCompiler.java || die + edo "$(java-config -J)" \ - -cp ${PN}.jar \ + -cp ZoneInfoCompiler \ org.joda.time.tz.ZoneInfoCompiler \ -src "${JAVA_SRC_DIR}/org/joda/time/tz/src" \ - -dst "${P}/src/main/resources/org/joda/time/tz/data" \ + -dst src/main/res/org/joda/time/tz/data \ africa \ antarctica \ asia \ @@ -77,19 +67,19 @@ src_compile() { northamerica \ southamerica \ etcetera \ - backward + backward || die - java-pkg_addres ${PN}.jar "${P}"/src/main/resources + java-pkg-simple_src_compile } src_test() { - # There are test failures in - # src/test/java/org/joda/time/TestDateTimeZone.java - # with jdk higher than 11 + # There was 1 error: + # 1) testZoneInfoProviderResourceLoading(org.joda.time.TestDateTimeZone)java.lang.UnsupportedOperationException: + # The Security Manager is deprecated and will be removed in a future release local vm_version="$(java-config -g PROVIDES_VERSION)" - if ver_test "${vm_version}" -le 11 ; then + if ver_test "${vm_version}" -lt 21 ; then java-pkg-simple_src_test else - einfo "Tests restricted to <=jdk-11" + einfo "Tests restricted to <jdk-21" fi } diff --git a/dev-java/joda-time/metadata.xml b/dev-java/joda-time/metadata.xml index 8a540039ed06..9eb8b5151f2d 100644 --- a/dev-java/joda-time/metadata.xml +++ b/dev-java/joda-time/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <upstream> <remote-id type="github">JodaOrg/joda-time</remote-id> - <remote-id type="sourceforge">joda-time</remote-id> <bugs-to>https://github.com/JodaOrg/joda-time/issues</bugs-to> <doc>https://www.joda.org/joda-time/userguide.html</doc> </upstream> diff --git a/dev-java/jol-core/jol-core-0.16-r1.ebuild b/dev-java/jol-core/jol-core-0.16-r1.ebuild index 18b26a837482..eb361ed8b085 100644 --- a/dev-java/jol-core/jol-core-0.16-r1.ebuild +++ b/dev-java/jol-core/jol-core-0.16-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ SRC_URI="https://github.com/openjdk/jol/archive/${PV}.tar.gz -> jol-${PV}.tar.gz LICENSE="GPL-2-with-classpath-exception" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild b/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild index 1ac84e768ee5..caf92a9f80de 100644 --- a/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild +++ b/dev-java/jopt-simple/jopt-simple-5.0.4.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 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-${PV}.ta LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/jrobin/jrobin-1.6.0-r2.ebuild b/dev-java/jrobin/jrobin-1.6.0-r2.ebuild index 591a820c6055..09faeb71c9b4 100644 --- a/dev-java/jrobin/jrobin-1.6.0-r2.ebuild +++ b/dev-java/jrobin/jrobin-1.6.0-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 # Skeleton command: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/OpenNMS/${PN}/archive/${P}-1.tar.gz" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64" # Common dependencies # POM: pom.xml diff --git a/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild b/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9-r1.ebuild index 0a12a3826469..ffeb3451e62a 100644 --- a/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild +++ b/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9-r1.ebuild @@ -1,10 +1,7 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom jsch-agent-proxy-12c3d64fc2b0a4fd37659369edfdee26e48954e2/jsch-agent-proxy-jsch/pom.xml --download-uri https://github.com/ymnk/jsch-agent-proxy/archive/12c3d64fc2b0a4fd37659369edfdee26e48954e2.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jsch-agent-proxy-0.0.9.ebuild - -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source" MAVEN_ID="com.jcraft:jsch.agentproxy.jsch:0.0.9" @@ -15,31 +12,32 @@ MY_COMMIT="12c3d64fc2b0a4fd37659369edfdee26e48954e2" DESCRIPTION="a proxy to ssh-agent and Pageant in Java" HOMEPAGE="http://www.jcraft.com/jsch-agent-proxy/" SRC_URI="https://github.com/ymnk/jsch-agent-proxy/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/jsch-agent-proxy-${MY_COMMIT}" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -# Common dependencies -# POM: ${PN}-12c3d64fc2b0a4fd37659369edfdee26e48954e2/${PN}-jsch/pom.xml -# com.jcraft:jsch:0.1.49 -> >=dev-java/jsch-0.1.54:0 -# com.jcraft:jsch.agentproxy.core:0.0.9 -> >=dev-java/jsch-agentproxy-core-0.0.9:0 +KEYWORDS="amd64 ppc64" -CDEPEND=" +CP_DEPEND=" dev-java/jna:4 dev-java/jsch:0 " -DEPEND="${CDEPEND} - >=virtual/jdk-1.8:*" -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" -DOCS=( LICENSE.txt README README.md ) +DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-1.8:* +" -S="${WORKDIR}/jsch-agent-proxy-${MY_COMMIT}" +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" + +DOCS=( LICENSE.txt README README.md ) JAVA_GENTOO_CLASSPATH="jna-4,jsch" -JAVA_GENTOO_CLASSPATH_EXTRA="jsch-agentproxy-core.jar:jsch-agentproxy-pageant.jar:jsch-agentproxy-sshagent.jar:jsch-agentproxy-usocket-jna.jar:jsch-agentproxy-usocket-nc.jar" +JAVA_GENTOO_CLASSPATH_EXTRA="jsch-agentproxy-core.jar:jsch-agentproxy-pageant.jar:jsch-agentproxy-sshagent.jar" +JAVA_GENTOO_CLASSPATH_EXTRA+=":jsch-agentproxy-usocket-jna.jar:jsch-agentproxy-usocket-nc.jar" JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}" JAVADOC_SRC_DIRS=( "${PN}-core" @@ -104,6 +102,7 @@ src_install() { java-pkg_dojavadoc target/api fi if use source; then - java-pkg_dosrc "${PN}-core" "${PN}-jsch" "${PN}-pageant" "${PN}-sshagent" "${PN}-usocket-jna" "${PN}-usocket-nc" "${PN}-connector-factory" + java-pkg_dosrc "${PN}-core" "${PN}-jsch" "${PN}-pageant" "${PN}-sshagent" "${PN}-usocket-jna" \ + "${PN}-usocket-nc" "${PN}-connector-factory" fi } diff --git a/dev-java/jsch-agent-proxy/metadata.xml b/dev-java/jsch-agent-proxy/metadata.xml index 75321cfb5598..34b9f09b108d 100644 --- a/dev-java/jsch-agent-proxy/metadata.xml +++ b/dev-java/jsch-agent-proxy/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">ymnk/jsch-agent-proxy</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/jsch/jsch-0.1.55.ebuild b/dev-java/jsch/jsch-0.1.55.ebuild index 3b319db72cf5..4685f67c902b 100644 --- a/dev-java/jsch/jsch-0.1.55.ebuild +++ b/dev-java/jsch/jsch-0.1.55.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.zip" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Common dependencies # POM: ${P}.pom diff --git a/dev-java/json-simple/json-simple-2.3.1.ebuild b/dev-java/json-simple/json-simple-2.3.1.ebuild index db1876d94be6..d9eee68bd912 100644 --- a/dev-java/json-simple/json-simple-2.3.1.ebuild +++ b/dev-java/json-simple/json-simple-2.3.1.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 @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="Apache-2.0" SLOT="2.3" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" +KEYWORDS="amd64 ~arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/json-smart/json-smart-1.3.3.ebuild b/dev-java/json-smart/json-smart-1.3.3.ebuild index c174d7e6acb7..1edda64d3342 100644 --- a/dev-java/json-smart/json-smart-1.3.3.ebuild +++ b/dev-java/json-smart/json-smart-1.3.3.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,15 +12,15 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="old JSON parser" HOMEPAGE="https://urielch.github.io" SRC_URI="https://github.com/netplex/json-smart-v1/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-v1-${PV}/json-smart" + LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}/${PN}-v1-${PV}/json-smart" - JAVA_SRC_DIR="src/main/java" JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_GENTOO_CLASSPATH="junit-4" diff --git a/dev-java/json-smart/json-smart-2.5.0.ebuild b/dev-java/json-smart/json-smart-2.5.0.ebuild index 04a95c02d05f..ddc968a2a7b6 100644 --- a/dev-java/json-smart/json-smart-2.5.0.ebuild +++ b/dev-java/json-smart/json-smart-2.5.0.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-v2-${PV}" LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="amd64 ~arm64" RESTRICT="test" #839681 DEPEND=" diff --git a/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild b/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild index 239213069dcd..f35f32dd2946 100644 --- a/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.ebuild +++ b/dev-java/jsonrpc2-base/jsonrpc2-base-1.38.2.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,9 +12,11 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Represent, parse and serialise JSON-RPC 2.0 messages" HOMEPAGE="https://software.dzhuvinov.com/json-rpc-2.0-base.html" SRC_URI="https://bitbucket.org/thetransactioncompany/json-rpc-2.0-base/get/${PV}.tar.bz2 -> ${P}.tar.bz2" +S="${WORKDIR}/thetransactioncompany-json-rpc-2.0-base-75e66af02953" + LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" CP_DEPEND="dev-java/json-smart:1" DEPEND=" @@ -27,8 +29,6 @@ RDEPEND=" >=virtual/jre-1.8:* " -S="${WORKDIR}/thetransactioncompany-json-rpc-2.0-base-75e66af02953" - JAVA_SRC_DIR="src/main/java" JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_GENTOO_CLASSPATH="junit-4" diff --git a/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild b/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild index b54e6d257874..1543308315e7 100644 --- a/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.ebuild +++ b/dev-java/jsonrpc2-server/jsonrpc2-server-1.11.1.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,9 +12,11 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Server framework for processing JSON-RPC 2.0 messages" HOMEPAGE="https://software.dzhuvinov.com/json-rpc-2.0-server.html" SRC_URI="https://bitbucket.org/thetransactioncompany/json-rpc-2.0-server/get/${PV}.tar.bz2 -> ${P}.tar.bz2" +S="${WORKDIR}/thetransactioncompany-json-rpc-2.0-server-40234a8c2029" + LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" PROPERTIES="test_network" RESTRICT="test" # single test, need access to google @@ -35,8 +37,6 @@ RDEPEND=" >=virtual/jre-1.8:* " -S="${WORKDIR}/thetransactioncompany-json-rpc-2.0-server-40234a8c2029" - JAVA_CLASSPATH_EXTRA="javax-servlet-api-3.0" JAVA_SRC_DIR="src/main/java" JAVA_TEST_SRC_DIR="src/test/java" diff --git a/dev-java/jsr305/jsr305-3.0.2-r1.ebuild b/dev-java/jsr305/jsr305-3.0.2-r1.ebuild index 83b864f8feb9..7f44aab9e95a 100644 --- a/dev-java/jsr305/jsr305-3.0.2-r1.ebuild +++ b/dev-java/jsr305/jsr305-3.0.2-r1.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 @@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/${PV}/js LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/jstl-api/jstl-api-1.2.7.ebuild b/dev-java/jstl-api/jstl-api-1.2.7.ebuild index 2d1f36d7caa3..db415207d233 100644 --- a/dev-java/jstl-api/jstl-api-1.2.7.ebuild +++ b/dev-java/jstl-api/jstl-api-1.2.7.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 @@ -15,7 +15,7 @@ S="${WORKDIR}/tags-${PV}-RELEASE" LICENSE="EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" CP_DEPEND=" dev-java/javax-el-api:2.2 diff --git a/dev-java/jstl/jstl-1.2.7.ebuild b/dev-java/jstl/jstl-1.2.7.ebuild index a7312416c603..7ac9dc6987ca 100644 --- a/dev-java/jstl/jstl-1.2.7.ebuild +++ b/dev-java/jstl/jstl-1.2.7.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 @@ -15,7 +15,7 @@ S="${WORKDIR}/tags-${PV}-RELEASE" LICENSE="EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" CP_DEPEND=" dev-java/javax-el-api:2.2 diff --git a/dev-java/jtds/jtds-1.3.1-r1.ebuild b/dev-java/jtds/jtds-1.3.1-r1.ebuild index 650c6251d4b3..3a3f61a9e25c 100644 --- a/dev-java/jtds/jtds-1.3.1-r1.ebuild +++ b/dev-java/jtds/jtds-1.3.1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}-src.zi LICENSE="LGPL-2.1" SLOT="1.3" -KEYWORDS="amd64 x86" +KEYWORDS="amd64" RESTRICT="test" # Needs a running server CDEPEND="dev-java/jcifs:1.1" diff --git a/dev-java/jtidy/jtidy-1.0-r2.ebuild b/dev-java/jtidy/jtidy-1.0-r2.ebuild index 3121a966d659..be5a440b99a8 100644 --- a/dev-java/jtidy/jtidy-1.0-r2.ebuild +++ b/dev-java/jtidy/jtidy-1.0-r2.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/JTidy/${MY_PV}/${PN}-${ LICENSE="HTML-Tidy W3C" SLOT="0" -KEYWORDS="amd64 ppc64 x86" +KEYWORDS="amd64 ppc64" BDEPEND="app-arch/unzip" CP_DEPEND=">=dev-java/ant-1.10.14-r3:0" diff --git a/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild b/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild index 4750629545a8..4f96b964098c 100644 --- a/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild +++ b/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}.RELEASE" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" # no tests because # net.jperf does not exist # org.unitils.reflectionassert does not exist diff --git a/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild index 46276ea49c1f..44b9944c3e77 100644 --- a/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild +++ b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}.RELEASE" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" DEPEND=" dev-java/commons-lang:3.6 diff --git a/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild b/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild index cf9d0c136c29..7f7230e4c053 100644 --- a/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild +++ b/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Common dependencies # POM: pom.xml diff --git a/dev-java/junit-clptr/junit-clptr-1.2.2-r1.ebuild b/dev-java/junit-clptr/junit-clptr-1.2.2-r1.ebuild new file mode 100644 index 000000000000..d1e2eaaa043a --- /dev/null +++ b/dev-java/junit-clptr/junit-clptr-1.2.2-r1.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="org.bitstrings.test:junit-clptr:1.2.2" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="ClassLoader per Test runner for JUnit 4.12+" +HOMEPAGE="https://github.com/bitstrings/junit-clptr" +SRC_URI="https://github.com/bitstrings/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}-sources.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ppc64" + +CP_DEPEND=" + dev-java/junit:4 +" + +DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-1.8:* +" + +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" + +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild b/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild deleted file mode 100644 index bbf2af86203e..000000000000 --- a/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/bitstrings/junit-clptr/archive/refs/tags/1.2.2.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild junit-clptr-1.2.2.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.bitstrings.test:junit-clptr:1.2.2" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="ClassLoader per Test runner for JUnit 4.12+" -HOMEPAGE="http://nexus.sonatype.org/oss-repository-hosting.html/junit-clptr" -SRC_URI="https://github.com/bitstrings/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}-sources.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# junit:junit:4.12 -> >=dev-java/junit-4.13.2:4 - -CDEPEND=" - dev-java/junit:4 -" - -DEPEND=" - >=virtual/jdk-1.8:* - ${CDEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND} -" - -S="${WORKDIR}/${P}" - -JAVA_GENTOO_CLASSPATH="junit-4" -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS=( - "src/main/resources" -) diff --git a/dev-java/junit-clptr/metadata.xml b/dev-java/junit-clptr/metadata.xml index 645a73add6c7..7fef0aef9e43 100644 --- a/dev-java/junit-clptr/metadata.xml +++ b/dev-java/junit-clptr/metadata.xml @@ -8,5 +8,6 @@ <upstream> <bugs-to>https://github.com/bitstrings/junit-clptr/issues</bugs-to> <changelog>https://github.com/bitstrings/junit-clptr/commits/master</changelog> + <remote-id type="github">bitstrings/junit-clptr</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild index 79576d4265fc..650cba22a78f 100644 --- a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild +++ b/dev-java/junit-dataprovider/junit-dataprovider-2.9.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 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/TNG/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND="dev-java/findbugs-annotations:0" diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest index 014914194795..93b1c2751094 100644 --- a/dev-java/junit/Manifest +++ b/dev-java/junit/Manifest @@ -1,5 +1,3 @@ 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.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/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild index 79144cb8e889..3138621640e8 100644 --- a/dev-java/junit/junit-3.8.2-r2.ebuild +++ b/dev-java/junit/junit-3.8.2-r2.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/junit${PV}" LICENSE="CPL-1.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="app-arch/unzip" DEPEND=">=virtual/jdk-1.8" diff --git a/dev-java/junit/junit-4.13.2_p20240222.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild index 50aa3c3c6763..6685743be268 100644 --- a/dev-java/junit/junit-4.13.2_p20240222.ebuild +++ b/dev-java/junit/junit-4.13.2_p20240222.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}4-${MY_COMMIT}" LICENSE="EPL-1.0" SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" CP_DEPEND="dev-java/hamcrest-core:1.3" DEPEND="${CP_DEPEND} diff --git a/dev-java/junit/junit-5.10.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild deleted file mode 100644 index 9429d37e25d6..000000000000 --- a/dev-java/junit/junit-5.10.2.ebuild +++ /dev/null @@ -1,351 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Declare the 'doc' USE flag in IUSE -- not JAVA_PKG_IUSE -- to -# prevent java-pkg-simple.eclass from handling Javadoc; instead, -# let this ebuild handle Javadoc generation and installation itself. -# This ebuild invokes java-pkg-simple.eclass's phase functions -# 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 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 - https://sources.debian.org/data/main/j/junit5/${DEB}/debian/patches/18-java-compatibility.patch \ - -> junit5-java18-compatibility.patch" -S="${WORKDIR}/junit5-r${PV}" - -LICENSE="EPL-2.0" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" -IUSE="doc migration-support suite vintage" - -CP_DEPEND=" - dev-java/apiguardian-api:0 - dev-java/opentest4j:0 - dev-java/open-test-reporting-events:0 - dev-java/picocli:0 - dev-java/univocity-parsers:0 -" - -# java-utils-2.eclass does not support -# USE-conditional dependencies in CP_DEPEND -COND_DEPEND=" - migration-support? ( dev-java/junit:4 ) - vintage? ( dev-java/junit:4 ) -" - -# Limiting JDK version to >=11 for module-info.java in this package -# https://bugs.gentoo.org/796875#c3 -DEPEND=" - >=virtual/jdk-11:* - ${CP_DEPEND} - ${COND_DEPEND} - test? ( dev-java/jimfs:0 ) -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND} - ${COND_DEPEND} -" - -PATCHES=( - "${DISTDIR}/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: - # https://junit.org/junit5/docs/current/user-guide/index.html#dependency-metadata - # https://junit.org/junit5/docs/current/user-guide/index.html#dependency-diagram - JUNIT5_MODULES=( - junit-platform-commons - junit-platform-engine - junit-platform-launcher - junit-platform-reporting - junit-platform-console # For launching tests from CLI; - # an eclass would need it to support running tests using JUnit 5 - - $(use suite && echo \ - junit-platform-suite-api \ - junit-platform-suite-commons \ - junit-platform-suite-engine \ - ) - - junit-jupiter-api - junit-jupiter-engine # For JUnit Jupiter tests -- the so-called - # "JUnit 5 tests", which cannot run on earlier JUnit versions - junit-jupiter-params # For parameterized tests; the junit-jupiter - # aggregator module includes it, so building it unconditionally - $(usev migration-support junit-jupiter-migrationsupport) - - $(usev vintage junit-vintage-engine) - - # Modules not included: - # - junit-bom: Has no sources; solely for helping Maven and Gradle - # projects that use JUnit 5 manage dependencies easier - # - junit-jupiter: Aggregator; does not have 'src/main/java' - # - junit-platform-console-standalone: Has no sources; solely used - # by the upstream to build a fat JAR that bundles everything, so - # users can use just this single JAR to run JUnit 5 - # - junit-platform-jfr: For an experimental feature - # - junit-platform-runner: Deprecated - # - junit-platform-suite: Aggregator; does not have 'src/main/java' - # - junit-platform-testkit: Requires >=dev-java/assertj-core-3.14.0 - ) - local cp_packages=() - (use migration-support || use vintage) && cp_packages+=( junit-4 ) - local save_IFS="${IFS}" - IFS=',' JAVA_GENTOO_CLASSPATH="${cp_packages[*]}" - IFS="${save_IFS}" - - JUNIT5_VM_VERSION="$(java-config --get-env PROVIDES_VERSION)" -} - -junit5_foreach_module() { - local module - for module in "${JUNIT5_MODULES[@]}"; do - junit5_module_do "${module}" "${@}" - done -} - -junit5_module_do() { - local module="${1}" - # Invocation of the passed function will not be guarded by '|| die'. - # Like the case for multibuild_foreach_variant(), it is recommended - # that the passed function itself calls 'die'. - local func=( "${@:2}" ) - - einfo "Running '${func[@]}' for ${module} ..." - pushd "${module}" > /dev/null || die "Failed to enter directory '${module}'" - - # Set up Java eclass variables that are - # supposed to be set in the ebuild global scope - - local JAVA_JAR_FILENAME="${module}.jar" - - local JAVA_SRC_DIR=( - src/main/java - src/module - ) - - local JAVA_RESOURCE_DIRS=() - local default_resource_dir="src/main/resources" - [[ -d "${default_resource_dir}" ]] && - JAVA_RESOURCE_DIRS+=( "${default_resource_dir}" ) - - if [[ "${module}" == junit-platform-console ]]; then - local JAVA_MAIN_CLASS="org.junit.platform.console.ConsoleLauncher" - local JAVA_LAUNCHER_FILENAME="${module}" - fi - - # Invoke the passed function - "${func[@]}" - local ret="${?}" - - popd > /dev/null || die "Failed to leave directory '${module}'" - return "${ret}" -} - -junit5_gen_cp() { - echo "$(java-pkg_getjars --build-only --with-dependencies \ - "${JAVA_GENTOO_CLASSPATH}"):${JAVA_GENTOO_CLASSPATH_EXTRA}" -} - -junit5_module_compile() { - if [[ "${module}" == junit-platform-console ]]; then - # Unlike other modules that have a src/main/java9 directory, for this - # module, the upstream puts the class files built from src/main/java9 - # in their JAR's top-level directory instead of META-INF/versions/9 - cp -rv src/main/java9/* src/main/java/ || - die "Failed to merge ${module}'s sources for Java 9+" - # Remove for the [[ -d src/main/java9 ]] test - # during versioned directory handling - rm -rv src/main/java9 || - die "Failed to remove ${module}'s Java 9+ source directory" - fi - - java-pkg-simple_src_compile - local sources="sources.lst" - local classes="target/classes" - - # Collect a list of all compiler input files for building Javadoc - local source - while read source; do - echo "${module}/${source}" >> "${all_sources}" - done < "${sources}" || - die "Failed to add ${module}'s sources to Javadoc input list" - - # Handle classes that will go into versioned directories. This will be - # no longer needed after https://bugs.gentoo.org/900433 is implemented. - local vm_ver - for vm_ver in 9 17; do - local versioned_src="src/main/java${vm_ver}" - if [[ -d "${versioned_src}" ]]; then - if ver_test "${JUNIT5_VM_VERSION}" -ge "${vm_ver}"; then - local versioned_classes="target/${vm_ver}/classes" - mkdir -p "${versioned_classes}" || - die "Failed to create directory for ${module}'s Java ${vm_ver}+ classes" - ejavac -d "${versioned_classes}" -encoding "${JAVA_ENCODING}" \ - -classpath "${classes}:$(junit5_gen_cp)" ${JAVAC_ARGS} \ - $(find "${versioned_src}" -type f -name '*.java') - "$(java-config --jar)" -uvf "${JAVA_JAR_FILENAME}" \ - --release "${vm_ver}" -C "${versioned_classes}" . || - die "Failed to add ${module}'s Java ${vm_ver}+ classes to JAR" - else - # Modules that may hit this branch as of 5.9.2: - # - junit-platform-console: - # src/main/java17/.../ConsoleUtils.java tries to use - # java.io.Console.charset() (available since Java 17) to get - # the default output charset. It is fine to not use this - # file, even if the built artifacts will be used on JRE 17+, - # as src/main/java/.../ConsoleUtils.java still gets the - # default from java.nio.charset.Charset.defaultCharset(). - elog "JDK ${JUNIT5_VM_VERSION} used; skipping Java ${vm_ver}-dependent parts in ${module}" - fi - fi - done - - # Add the current module's JAR to classpath - # for the module's reverse dependencies in this package - JAVA_GENTOO_CLASSPATH_EXTRA+=":${S}/${module}/${JAVA_JAR_FILENAME}" -} - -src_compile() { - local all_sources="${S}/all-sources.lst" - junit5_foreach_module junit5_module_compile - - if use doc; then - einfo "Generating Javadoc for all modules ..." - local apidoc="target/api" - mkdir -p "${apidoc}" || die "Failed to create Javadoc directory" - ejavadoc -d "${apidoc}" \ - -encoding "${JAVA_ENCODING}" -docencoding UTF-8 -charset UTF-8 \ - -classpath "$(junit5_gen_cp)" ${JAVADOC_ARGS:- -quiet} \ - -windowtitle "JUnit ${PV} API" \ - "@${all_sources}" - fi -} - -src_test() { - # Running the JUnit 5 modules' tests (located in each module's - # 'src/test/java') has a few obstacles: - # - Some test sources use text blocks -- a feature introduced in Java 15. - # A JDK at a lower version, e.g. 11, cannot compile them. - # - Some test classes depend on JUnit 5 modules that this ebuild does not - # include, like junit-platform-runner and junit-platform-testkit. - # - # Therefore, this ebuild uses a simpler approach to test the artifacts just - # built: it uses the artifacts to run tests in examples under the - # 'documentation/src' directory. The test coverage will not be impressive, - # but at least this approach verifies that the copy of JUnit 5 just built - # is capable of running some simple tests launched from CLI. - - local JUNIT5_TEST_SRC_DIR="documentation/src/test/java" - local JUNIT5_TEST_RESOURCE_DIR="documentation/src/test/resources" - local JUNIT5_TEST_RM=( - $(usev !migration-support example/IgnoredTestsDemo.java) - $(use !suite && echo \ - example/DocumentationTestSuite.java \ - example/SuiteDemo.java \ - ) - $(usev !vintage example/JUnit4Tests.java) - - # Need excluded module junit-platform-runner - example/JUnitPlatformClassDemo.java - example/JUnitPlatformSuiteDemo.java - - # Need excluded module junit-platform-testkit - example/testkit/ - - # Not necessary for the tests; some files even require extra dependency - org/junit/api/tools/ - - # Needs dev-java/hamcrest; no need to pull in extra dependency - # as the examples already provide ample tests to run - example/HamcrestAssertionsDemo.java - - # Makes an HTTP request and expects a certain response - example/session/HttpTests.java - ) - - pushd "${JUNIT5_TEST_SRC_DIR}" > /dev/null || - die "Failed to enter test source directory" - rm -rv "${JUNIT5_TEST_RM[@]}" || - die "Failed to remove unneeded test sources" - # Test sources expect the working directory to be 'documentation' - sed -i -e "s|src/test/resources|${JUNIT5_TEST_RESOURCE_DIR}|g" \ - example/ParameterizedTestDemo.java || - die "Failed to update file paths in test sources" - popd > /dev/null || die "Failed to leave test source directory" - - local test_dir="${T}/junit5_src_test" - local example_classes="${test_dir}/classes" - local test_classes="${test_dir}/test-classes" - mkdir -p "${example_classes}" "${test_classes}" || - die "Failed to create test directories" - - local example_sources="${test_dir}/sources.lst" - local test_sources="${test_dir}/test-sources.lst" - find documentation/src/main/java -type f -name '*.java' > "${example_sources}" || - die "Failed to get a list of example sources" - find documentation/src/test/java -type f -name '*.java' > "${test_sources}" || - die "Failed to get a list of test sources" - - ejavac -d "${example_classes}" -encoding "${JAVA_ENCODING}" \ - -classpath "$(junit5_gen_cp)" ${JAVAC_ARGS} \ - "@${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}" - - set -- "$(java-config --java)" -classpath "${test_classes}:${test_cp}" \ - org.junit.platform.console.ConsoleLauncher \ - --disable-ansi-colors --fail-if-no-tests --scan-classpath \ - --include-classname='^(Test.*|.+[.$]Test.*|.*Tests?|.*Demo)$' \ - --exclude-tag="exclude" - echo "${@}" >&2 - "${@}" - local status="${?}" - [[ "${status}" -eq 2 ]] && die "JUnit did not discover any tests" - [[ "${status}" -eq 0 ]] || die "ConsoleLauncher failed" -} - -junit5_module_install() { - # It is OK to let java-pkg-simple_src_install call einstalldocs for - # each module as long as each documentation file being installed - # has a unique filename among _all_ modules; otherwise, some files - # would overwrite other ones. - if [[ -f README.md ]]; then - mv -v README.md "README-${module}.md" || - die "Failed to rename ${module}'s README.md" - fi - java-pkg-simple_src_install -} - -src_install() { - junit5_foreach_module junit5_module_install - einstalldocs # For project-global documentation - - if use doc; then - einfo "Installing Javadoc for all modules ..." - local apidoc="target/api" - java-pkg_dojavadoc "${apidoc}" - fi -} diff --git a/dev-java/junit/junit-5.10.3.ebuild b/dev-java/junit/junit-5.10.3.ebuild index 0ef2463d340f..81a4571700d9 100644 --- a/dev-java/junit/junit-5.10.3.ebuild +++ b/dev-java/junit/junit-5.10.3.ebuild @@ -22,7 +22,7 @@ S="${WORKDIR}/junit5-r${PV}" LICENSE="EPL-2.0" SLOT="5" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" IUSE="doc migration-support suite vintage" CP_DEPEND=" diff --git a/dev-java/junitparams/junitparams-1.1.1-r1.ebuild b/dev-java/junitparams/junitparams-1.1.1-r2.ebuild index db8ec80d207d..0b40cf5e590e 100644 --- a/dev-java/junitparams/junitparams-1.1.1-r1.ebuild +++ b/dev-java/junitparams/junitparams-1.1.1-r2.ebuild @@ -1,10 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# 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/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-1.1.1.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild junitparams-1.1.1.ebuild - -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source test" MAVEN_ID="pl.pragmatists:JUnitParams:1.1.1" @@ -14,22 +11,15 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Better parameterised tests for JUnit" HOMEPAGE="https://github.com/Pragmatists/JUnitParams" -SRC_URI="https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/Pragmatists/JUnitParams/archive/JUnitParams-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/JUnitParams-JUnitParams-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# junit:junit:4.12 -> >=dev-java/junit-4.12:4 +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND="dev-java/junit:4" -# Compile dependencies -# POM: pom.xml -# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2 - DEPEND=" >=virtual/jdk-1.8:* ${CP_DEPEND} @@ -40,19 +30,16 @@ DEPEND=" RDEPEND=" >=virtual/jre-1.8:* - ${CP_DEPEND}" - -PATCHES=( - "${FILESDIR}"/junitparams-1.1.1-test.patch -) + ${CP_DEPEND} +" -S="${WORKDIR}/JUnitParams-JUnitParams-${PV}" +PATCHES=( "${FILESDIR}"/junitparams-1.1.1-test.patch ) JAVA_SRC_DIR="src/main/java" JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3" -JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_EXCLUDES=( # java.lang.RuntimeException: Could not find method: paramsForSuperclassMethod so no params were used. @@ -60,5 +47,6 @@ JAVA_TEST_EXCLUDES=( ) src_prepare() { - default + default #780585 + java-pkg-2_src_prepare } diff --git a/dev-java/jzlib/jzlib-1.1.3-r2.ebuild b/dev-java/jzlib/jzlib-1.1.3-r3.ebuild index 0961413b289f..1984d1245054 100644 --- a/dev-java/jzlib/jzlib-1.1.3-r2.ebuild +++ b/dev-java/jzlib/jzlib-1.1.3-r3.ebuild @@ -1,7 +1,7 @@ -# 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="examples source test" MAVEN_ID="com.jcraft:jzlib:1.1.3" @@ -11,28 +11,20 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="JZlib is a re-implementation of zlib in pure Java" HOMEPAGE="http://www.jcraft.com/jzlib/" SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -RDEPEND=" - >=virtual/jre-1.8:*" -DEPEND=" - >=virtual/jdk-1.8:*" -# test? ( -# dev-lang/scala -# dev-java/junit:4 )" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" # Restrict test due to missing keywords for scala RESTRICT="test" -S="${WORKDIR}/${P}" -JAVA_SRC_DIR="src/main/java" +DOCS=( README ChangeLog ) -src_prepare() { - default - rm pom.xml || die -} +JAVA_SRC_DIR="src/main/java" src_test() { local CP TESTS @@ -46,6 +38,5 @@ src_test() { src_install() { java-pkg-simple_src_install - dodoc README ChangeLog use examples && java-pkg_doexamples example } diff --git a/dev-java/kafka-clients/kafka-clients-1.1.1-r2.ebuild b/dev-java/kafka-clients/kafka-clients-1.1.1-r2.ebuild index 1e48a4ed395b..13aa6830ce98 100644 --- a/dev-java/kafka-clients/kafka-clients-1.1.1-r2.ebuild +++ b/dev-java/kafka-clients/kafka-clients-1.1.1-r2.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/kafka-${PV}-src/clients" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" >=dev-java/lz4-java-1.4.1:0 diff --git a/dev-java/leiningen-bin/leiningen-bin-2.11.2.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.11.2.ebuild index 9b67aaa8bbc5..02878c69efd3 100644 --- a/dev-java/leiningen-bin/leiningen-bin-2.11.2.ebuild +++ b/dev-java/leiningen-bin/leiningen-bin-2.11.2.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="amd64 arm64 ~x86 ~x64-macos" +KEYWORDS="amd64 arm64 ~x64-macos" RDEPEND=">=virtual/jre-1.8" DEPEND=">=virtual/jdk-1.8" diff --git a/dev-java/libg/Manifest b/dev-java/libg/Manifest index a890570b45c8..efb6528140b2 100644 --- a/dev-java/libg/Manifest +++ b/dev-java/libg/Manifest @@ -1 +1,2 @@ DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c +DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028 diff --git a/dev-java/libg/libg-7.0.0.ebuild b/dev-java/libg/libg-7.0.0.ebuild index 7acbb7965c60..a0d110013f1e 100644 --- a/dev-java/libg/libg-7.0.0.ebuild +++ b/dev-java/libg/libg-7.0.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV}" LICENSE="Apache-2.0 EPL-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # aQute.bnd.test.jupiter does not exist # org.assertj.core.api.junit.jupiter does not exist RESTRICT="test" #839681 diff --git a/dev-java/libg/libg-7.1.0.ebuild b/dev-java/libg/libg-7.1.0.ebuild new file mode 100644 index 000000000000..4aeca1dfcea8 --- /dev/null +++ b/dev-java/libg/libg-7.1.0.ebuild @@ -0,0 +1,48 @@ +# 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="biz.aQute.bnd:aQute.libg:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A library to be statically linked. Contains many small utilities" +HOMEPAGE="https://bnd.bndtools.org/" +SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/bnd-${PV/_rc/.RC}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +# aQute.bnd.test.jupiter does not exist +# org.assertj.core.api.junit.jupiter does not exist +RESTRICT="test" #839681 + +CP_DEPEND=" + dev-java/slf4j-api:0 +" + +DEPEND=" + ${CP_DEPEND} + ~dev-java/bnd-annotation-${PV}:0 + dev-java/eclipse-jdt-annotation:0 + dev-java/osgi-cmpn:8 + >=virtual/jdk-17:* +" + +# aQute.libg/src/aQute/libg/uri/URIUtil.java:161: +# error: switch expressions are not supported in -source 11 +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-17:* +" + +JAVA_AUTOMATIC_MODULE_NAME="aQute.libg" +JAVA_CLASSPATH_EXTRA=" + bnd-annotation + eclipse-jdt-annotation + osgi-cmpn-8 +" +JAVA_SRC_DIR="aQute.libg/src" diff --git a/dev-java/lmax-disruptor/lmax-disruptor-3.4.4.ebuild b/dev-java/lmax-disruptor/lmax-disruptor-3.4.4.ebuild index 75b087415f61..1cbd81f22f82 100644 --- a/dev-java/lmax-disruptor/lmax-disruptor-3.4.4.ebuild +++ b/dev-java/lmax-disruptor/lmax-disruptor-3.4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/LMAX-Exchange/disruptor/archive/${PV}.tar.gz -> ${P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/log4j-12-api/log4j-12-api-2.19.0.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.19.0.ebuild index eb4baf392fe0..4272ee330433 100644 --- a/dev-java/log4j-12-api/log4j-12-api-2.19.0.ebuild +++ b/dev-java/log4j-12-api/log4j-12-api-2.19.0.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: @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz" LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # We don't have junit-vintage and junit-jupiter RESTRICT="test" diff --git a/dev-java/log4j-api/log4j-api-2.19.0.ebuild b/dev-java/log4j-api/log4j-api-2.19.0.ebuild index 3175e9cecaea..73bc91bd6052 100644 --- a/dev-java/log4j-api/log4j-api-2.19.0.ebuild +++ b/dev-java/log4j-api/log4j-api-2.19.0.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: @@ -19,7 +19,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # junit-{jupiter,vintage} is not available in ::gentoo RESTRICT="test" diff --git a/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild b/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild index 23f8b39d5371..c3bca3cfeaf1 100644 --- a/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild +++ b/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz" LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # We don't have junit-vintage and junit-jupiter RESTRICT="test" diff --git a/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild b/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild index d71e64f91321..96f51226a040 100644 --- a/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild +++ b/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Common dependencies # POM: pom.xml diff --git a/dev-java/lucene/lucene-2.4.1-r5.ebuild b/dev-java/lucene/lucene-2.4.1-r5.ebuild index 2a1641800238..ffee12eddb45 100644 --- a/dev-java/lucene/lucene-2.4.1-r5.ebuild +++ b/dev-java/lucene/lucene-2.4.1-r5.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz LICENSE="Apache-2.0" SLOT="2.4" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lucene.apache.org.asc" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-lucene )" diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r6.ebuild index 1eca00a9a589..939880e8104a 100644 --- a/dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild +++ b/dev-java/lz4-java/lz4-java-1.8.0-r6.ebuild @@ -16,11 +16,11 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" app-arch/lz4:= - dev-java/mvel:2.5 + dev-java/mvel:0 dev-libs/xxhash:0 >=virtual/jdk-1.8:* test? ( dev-java/randomized-runner:0 )" @@ -52,7 +52,7 @@ src_compile() { einfo "Code generation" "$(java-config -J)" \ -Dout.dir="src/java" \ - -cp "$(java-pkg_getjars --build-only mvel-2.5)" \ + -cp "$(java-pkg_getjars --build-only mvel)" \ org.mvel2.sh.Main \ src/build/gen_sources.mvel \ || die diff --git a/dev-java/lzma/lzma-22.01.ebuild b/dev-java/lzma/lzma-22.01.ebuild index 69ea039791a5..ecadcae4135f 100644 --- a/dev-java/lzma/lzma-22.01.ebuild +++ b/dev-java/lzma/lzma-22.01.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,7 +12,7 @@ SRC_URI="https://7-zip.org/a/lzma${PV/./}.7z -> ${P}.7z" LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="amd64 ~arm64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/lzmajio/Manifest b/dev-java/lzmajio/Manifest index cf220190b755..43b00f07f497 100644 --- a/dev-java/lzmajio/Manifest +++ b/dev-java/lzmajio/Manifest @@ -1 +1 @@ -DIST lzmajio-0.95.tar.gz 20790 BLAKE2B e24a5f4778bb135ce3ab519dfc8357cf3abc04d564b8d365f7cbad579be7ff86b4d24156720954bab882d7ade8e5145e533fd477c1925f6a9353c90dd5a2e511 SHA512 65736a66ec8f5eb63688edda912718f4e9b0518c68b0b1eed3df26e7b6bb15728024c637b4cf40f6ab52168c913cce91bd7cafefca7515e0f3e386738cedc6e5 +DIST lzmajio-0.95.tar.gz 20501 BLAKE2B 0b45d55c0fb56ff97eecc2ed3fb2dc5a5321ff33e78aa51e71c9e074c69006b3db449d95959d346bb5fb7b87bc104e8ad11d198537315106e27ac3edb7af07db SHA512 c9b9e2655259cda24ce60956c3aba320e661f8639fb88f614bb2e63ce8c747e92d4a37b6233f1962a5e655364b24f49e7370f7af13dfde41f9d2217c6c1ae788 diff --git a/dev-java/lzmajio/lzmajio-0.95-r3.ebuild b/dev-java/lzmajio/lzmajio-0.95-r4.ebuild index 3eee961802ac..d0b2f3fb47e1 100644 --- a/dev-java/lzmajio/lzmajio-0.95-r3.ebuild +++ b/dev-java/lzmajio/lzmajio-0.95-r4.ebuild @@ -1,7 +1,7 @@ -# 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" @@ -10,23 +10,23 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders" HOMEPAGE="https://contrapunctus.net/league/haques/lzmajio/ https://github.com/league/lzmajio" -SRC_URI="https://github.com/league/${P}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/league/lzmajio/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="amd64 ~arm64" -CDEPEND="dev-java/lzma:0" +CP_DEPEND="dev-java/lzma:0" RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.8:*" - -S="${WORKDIR}/${P}" + ${CP_DEPEND} + >=virtual/jdk-1.8:* +" -JAVA_GENTOO_CLASSPATH="lzma" JAVA_SRC_DIR="net" diff --git a/dev-java/maven-bin/maven-bin-3.8.8-r1.ebuild b/dev-java/maven-bin/maven-bin-3.8.8-r1.ebuild index 731294052d5e..b05640d31613 100644 --- a/dev-java/maven-bin/maven-bin-3.8.8-r1.ebuild +++ b/dev-java/maven-bin/maven-bin-3.8.8-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 @@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/" LICENSE="Apache-2.0" SLOT="3.8" -KEYWORDS="amd64 x86" +KEYWORDS="amd64" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/maven-bin/maven-bin-3.9.9.ebuild b/dev-java/maven-bin/maven-bin-3.9.9.ebuild index 16060561ede9..199d1adc2e7b 100644 --- a/dev-java/maven-bin/maven-bin-3.9.9.ebuild +++ b/dev-java/maven-bin/maven-bin-3.9.9.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0" SLOT="3.9" -KEYWORDS="amd64 x86" +KEYWORDS="amd64" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild index 9ad7bcf8724b..984384073b88 100644 --- a/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild +++ b/dev-java/mchange-commons/mchange-commons-0.2.20.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/swaldman/${PN}-java/archive/refs/tags/v${PV}.tar.gz LICENSE="EPL-1.0 LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ppc64 x86" +KEYWORDS="amd64 ppc64" CP_DEPEND=" dev-java/log4j-api:2 diff --git a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0-r1.ebuild index 4164784cd150..2d40f7efbad3 100644 --- a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild +++ b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0-r1.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 @@ -11,13 +11,14 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="An in memory implementation of a JSR-203 file system." HOMEPAGE="https://github.com/marschall/memoryfilesystem" SRC_URI="https://github.com/marschall/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" - dev-java/jakarta-annotations-api:0 + dev-java/jakarta-annotation-api:0 " DEPEND=" @@ -30,8 +31,6 @@ RDEPEND=" ${CP_DEPEND} " -S="${WORKDIR}/${P}" - JAVA_SRC_DIR="src/main/java" JAVA_RESOURCE_DIRS="src/main/resources" diff --git a/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild b/dev-java/mersennetwister/mersennetwister-0_pre23765-r3.ebuild index c633ea89d5c8..47624e139641 100644 --- a/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild +++ b/dev-java/mersennetwister/mersennetwister-0_pre23765-r3.ebuild @@ -1,7 +1,7 @@ -# 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" @@ -13,10 +13,11 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="" +KEYWORDS="amd64 ~arm64" -RDEPEND=">=virtual/jre-1.8:*" DEPEND=" source? ( app-arch/zip ) - >=virtual/jdk-1.8:*" + >=virtual/jdk-1.8:* +" + +RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/metainf-services/Manifest b/dev-java/metainf-services/Manifest index 69a4f55fe8b4..3fb0a34d30b3 100644 --- a/dev-java/metainf-services/Manifest +++ b/dev-java/metainf-services/Manifest @@ -1,2 +1 @@ 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 index d03e2e80adf5..7cd296a22397 100644 --- a/dev-java/metainf-services/metainf-services-1.11.ebuild +++ b/dev-java/metainf-services/metainf-services-1.11.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/metainf-services/metainf-services-1.9.ebuild b/dev-java/metainf-services/metainf-services-1.9.ebuild deleted file mode 100644 index bc65997190d7..000000000000 --- a/dev-java/metainf-services/metainf-services-1.9.ebuild +++ /dev/null @@ -1,22 +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-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" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=">=virtual/jre-1.8:*" -DEPEND=">=virtual/jdk-1.8:*" - -S="${WORKDIR}/${PN}-${P}" - -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS="src/main/resources" diff --git a/dev-java/miglayout/miglayout-5.3.ebuild b/dev-java/miglayout/miglayout-5.3.ebuild index 26caf78554f7..06d13085cba0 100644 --- a/dev-java/miglayout/miglayout-5.3.ebuild +++ b/dev-java/miglayout/miglayout-5.3.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 @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}" LICENSE="BSD" SLOT="5" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest index 5340ebc92a15..57a46177b725 100644 --- a/dev-java/mill-bin/Manifest +++ b/dev-java/mill-bin/Manifest @@ -1,3 +1,5 @@ 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 +DIST mill-bin-0.12.0 67781970 BLAKE2B f705100c1b6a847cfbd9ccb8f170f9ec376a0d88c282741b20433f36377fc8cf132dbde3d1f6554799fc6fca4e7611b713a8fb1463a65791fcfe8c2924e2fe2a SHA512 9ed44a2438513ec77edf1d5d13dfa3c4a3156abf8fcc3e179572a81b3d62247109e2a48b947dfacf7ecfd335e564b30872e3dc1079890cb9d312da379c707764 +DIST mill-bin-0.12.1 67788135 BLAKE2B cfd10c21342159ebca4363c26df36bdb6512901112a419ad014ae3ae2f513d291f9e2d47293224d99eb7edc631e07dae846ad5f81ac53177f96ca16f1d2a7667 SHA512 9fe8d6dc01085503733ab5dc9af11f31da1859d67129ba300f9731eea1304545b4784bc0fb72694b7b74413987a91ce15ad8edf5812867ea2450c1a218761977 +DIST mill-bin-0.12.3 65455398 BLAKE2B 522a7c14b2408a73b471aa9fc677106c3b485ae127c912625bc65a0ff8e3fb71d73b5e98a623d01b7db5c9586f0cca227c2ec448f03f158430310befe97aedd3 SHA512 a6bef9a14a9bed714f53af9d2ef5a3513b76556a625126612b6112b75070e6aa2b420ba8c89f47c176e3c76209614124f52b42f9b7e17a44099fa6e236bdbe7b diff --git a/dev-java/mill-bin/mill-bin-0.11.12.ebuild b/dev-java/mill-bin/mill-bin-0.11.12.ebuild index 3534e0b8c898..13be1b452c85 100644 --- a/dev-java/mill-bin/mill-bin-0.11.12.ebuild +++ b/dev-java/mill-bin/mill-bin-0.11.12.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64" RDEPEND=">=virtual/jre-1.8:*" 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 95f583ce077d..ffb3d77a5ada 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" LICENSE="MIT" SLOT="0" diff --git a/dev-java/mill-bin/mill-bin-0.11.6.ebuild b/dev-java/mill-bin/mill-bin-0.12.0.ebuild index 95f583ce077d..e33ff36d8393 100644 --- a/dev-java/mill-bin/mill-bin-0.11.6.ebuild +++ b/dev-java/mill-bin/mill-bin-0.12.0.ebuild @@ -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" RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}" - src_unpack() { : } diff --git a/dev-java/mill-bin/mill-bin-0.12.1.ebuild b/dev-java/mill-bin/mill-bin-0.12.1.ebuild new file mode 100644 index 000000000000..e33ff36d8393 --- /dev/null +++ b/dev-java/mill-bin/mill-bin-0.12.1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=${PN%-bin} + +DESCRIPTION="A Java/Scala build tool" +HOMEPAGE="https://mill-build.org/" +SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}" +S="${WORKDIR}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=">=virtual/jre-1.8:*" + +src_unpack() { + : +} + +src_install() { + newbin "${DISTDIR}"/${P} ${MY_PN} +} diff --git a/dev-java/mill-bin/mill-bin-0.12.3.ebuild b/dev-java/mill-bin/mill-bin-0.12.3.ebuild new file mode 100644 index 000000000000..e33ff36d8393 --- /dev/null +++ b/dev-java/mill-bin/mill-bin-0.12.3.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=${PN%-bin} + +DESCRIPTION="A Java/Scala build tool" +HOMEPAGE="https://mill-build.org/" +SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}" +S="${WORKDIR}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=">=virtual/jre-1.8:*" + +src_unpack() { + : +} + +src_install() { + newbin "${DISTDIR}"/${P} ${MY_PN} +} diff --git a/dev-java/minidns-core/minidns-core-1.0.4.ebuild b/dev-java/minidns-core/minidns-core-1.0.4.ebuild index 3a9f492efae0..480941460422 100644 --- a/dev-java/minidns-core/minidns-core-1.0.4.ebuild +++ b/dev-java/minidns-core/minidns-core-1.0.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 @@ -11,15 +11,15 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="DNS library for Java and Android systems" HOMEPAGE="https://github.com/minidns/minidns" SRC_URI="https://github.com/MiniDNS/minidns/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/minidns-${PV}/${PN}" + LICENSE="Apache-2.0" SLOT="1" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}/minidns-${PV}/${PN}" - JAVA_SRC_DIR="src/main/java" # needs junit:5 #JAVA_TESTING_FRAMEWORKS="junit-5" diff --git a/dev-java/mockito/files/mockito-2.28.2-fix-unused-stubbings-test.patch b/dev-java/mockito/files/mockito-2.28.2-fix-unused-stubbings-test.patch new file mode 100644 index 000000000000..7689b4e64f65 --- /dev/null +++ b/dev-java/mockito/files/mockito-2.28.2-fix-unused-stubbings-test.patch @@ -0,0 +1,14 @@ +--- a/src/test/java/org/mockito/internal/junit/UnusedStubbingsTest.java ++++ b/src/test/java/org/mockito/internal/junit/UnusedStubbingsTest.java +@@ -53,7 +53,10 @@ public class UnusedStubbingsTest extends TestBase { + "[MockitoHint] 2. Unused -> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n", + "[MockitoHint] MyTest.myTestMethod (see javadoc for MockitoHint):\n" + //Java 9 + "[MockitoHint] 1. Unused -> at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" + +- "[MockitoHint] 2. Unused -> at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" ++ "[MockitoHint] 2. Unused -> at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n", ++ "[MockitoHint] MyTest.myTestMethod (see javadoc for MockitoHint):\n" + //Java 21 ++ "[MockitoHint] 1. Unused -> at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:0)\n" + ++ "[MockitoHint] 2. Unused -> at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:0)\n" + ); + } + } diff --git a/dev-java/mockito/mockito-1.9.5-r4.ebuild b/dev-java/mockito/mockito-1.9.5-r4.ebuild index 6c673f92d0ab..c84fa46afec3 100644 --- a/dev-java/mockito/mockito-1.9.5-r4.ebuild +++ b/dev-java/mockito/mockito-1.9.5-r4.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/mockito/mockito-core/${PV}/mockito-c LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" >=dev-java/ant-1.10.14-r3:0 diff --git a/dev-java/mockito/mockito-2.28.2-r1.ebuild b/dev-java/mockito/mockito-2.28.2-r1.ebuild new file mode 100644 index 000000000000..6b413be4b92e --- /dev/null +++ b/dev-java/mockito/mockito-2.28.2-r1.ebuild @@ -0,0 +1,106 @@ +# 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.mockito:mockito-core:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Mockito mock objects library core API and implementation" +HOMEPAGE="https://github.com/mockito/mockito" +SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="MIT" +SLOT="2" +KEYWORDS="~amd64 ~arm64 ~ppc64" + +# Tests need a version of byte-buddy supporting Java 21. #930103 +CP_DEPEND=" + dev-java/asm:9 + >=dev-java/byte-buddy-1.15.10:0 + dev-java/hamcrest-core:1.3 + dev-java/junit:4 + dev-java/objenesis:0 + dev-java/opentest4j:0 +" + +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + test? ( dev-java/assertj-core:3 ) +" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:* +" + +# see https://bugs.gentoo.org/903897 +PATCHES=( + "${FILESDIR}/mockito-2.28.2-skip-failing-tests.patch" + "${FILESDIR}/mockito-2.28.2-fix-unused-stubbings-test.patch" +) + +JAVA_AUTOMATIC_MODULE_NAME="org.mockito" +JAVA_CLASSPATH_EXTRA="junit-4 opentest4j" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_EXCLUDES=( + org.mockito.internal.junit.JUnitRuleTest # We run it in JAVA_TEST_RUN_ONLY + org.mockito.internal.util.reflection.DummyClassForTests # No runnable methods + org.mockito.internal.util.reflection.DummyParentClassForTests # No runnable methods + org.mockito.junit.TestableJUnitRunner # No runnable methods + org.mockitoutil.TestBase # No runnable methods +) +JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3,junit-4" +JAVA_TEST_RUN_ONLY=( + # This needs to run separately, otherwise one of its 4 tests would fail. + org.mockito.internal.junit.JUnitRuleTest +) +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + java-pkg-2_src_prepare + default + # dev-java/byte-buddy is built from byte-buddy-dep without shaded stuff. + sed \ + -e 's:net.bytebuddy.jar.asm:org.objectweb.asm:' \ + -i src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java \ + -i src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java || die +} + +src_compile() { + java-pkg-simple_src_compile + mv target/classes/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.{class,raw} || die + jar ufv mockito.jar -C target/classes org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.raw || die +} + +src_test() { + # Increasing number of test failures with higher Java versions + # Test failures are documented in https://bugs.gentoo.org/903897 + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge 11; then + JAVA_TEST_EXCLUDES+=( + org.mockito.internal.stubbing.defaultanswers.ReturnsMocksTest + org.mockitousage.bugs.GenericsMockitoAnnotationsTest + ) + fi + if ver_test "${vm_version}" -ge 17; then + JAVA_TEST_EXCLUDES+=( + org.concurrentmockito.ThreadsRunAllTestsHalfManualTest + org.mockitousage.matchers.InvalidUseOfMatchersTest + org.mockitousage.serialization.DeepStubsSerializableTest + org.mockitousage.stubbing.StubbingWithDelegateTest + ) + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED ) + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED ) + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED ) + fi + # First run what needs to run separately + java-pkg-simple_src_test + # And then the other tests + JAVA_TEST_RUN_ONLY="" + java-pkg-simple_src_test +} diff --git a/dev-java/mockito/mockito-2.28.2.ebuild b/dev-java/mockito/mockito-2.28.2.ebuild index 40c00744c354..92706ad5b55e 100644 --- a/dev-java/mockito/mockito-2.28.2.ebuild +++ b/dev-java/mockito/mockito-2.28.2.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 @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}" LICENSE="MIT" SLOT="2" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" +KEYWORDS="amd64 ~arm64 ppc64" CP_DEPEND=" dev-java/asm:9 @@ -38,7 +38,10 @@ RDEPEND=" " # see https://bugs.gentoo.org/903897 -PATCHES=( "${FILESDIR}/mockito-2.28.2-skip-failing-tests.patch" ) +PATCHES=( + "${FILESDIR}/mockito-2.28.2-skip-failing-tests.patch" + "${FILESDIR}/mockito-2.28.2-fix-unused-stubbings-test.patch" +) JAVA_AUTOMATIC_MODULE_NAME="org.mockito" JAVA_CLASSPATH_EXTRA="junit-4 opentest4j" diff --git a/dev-java/mockito/mockito-4.11.0.ebuild b/dev-java/mockito/mockito-4.11.0.ebuild index 1327aa6b7fa7..f6b5a44d91d6 100644 --- a/dev-java/mockito/mockito-4.11.0.ebuild +++ b/dev-java/mockito/mockito-4.11.0.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 @@ -16,7 +16,7 @@ SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" dev-java/asm:9 diff --git a/dev-java/msv/msv-2022.7.ebuild b/dev-java/msv/msv-2022.7.ebuild index 9f000389fc0a..63e4fa8f8afd 100644 --- a/dev-java/msv/msv-2022.7.ebuild +++ b/dev-java/msv/msv-2022.7.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: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/xmlark/msv/archive/msv-${PV}.tar.gz" LICENSE="BSD-1" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" # Common dependencies # POM: pom.xml diff --git a/dev-java/mvel/Manifest b/dev-java/mvel/Manifest index 41568dbf8e17..ac9a36913bb6 100644 --- a/dev-java/mvel/Manifest +++ b/dev-java/mvel/Manifest @@ -1 +1 @@ -DIST mvel2-2.5.0.Final.tar.gz 2182715 BLAKE2B 1e8dbde4b75e36ea4d285ab45c0040957b9af7b5819786daf6469ae509c9c1e16ba2b201a05f9f9cf1c694bac816afd2d613226a8eb3b06f9049a898c6586b85 SHA512 29ca1ef8fdc4cbb97b5847f59e7c3118e837022d7292b507869208da1798b55d0445c40214d72c159e610d7094df7002c091296b2b31775a1ad0606f622d12b5 +DIST mvel2-2.5.2.Final.tar.gz 2184489 BLAKE2B 4e7b79f096a2a87a1d60b5edc0909fbadc754aa3927d5d439ebf8f2df2b05b6a85248d31d720b3a4f13e5890c45079388f8745baba32cffe5a2c998748cfb1a6 SHA512 ff1c0ee2b3cbce9d5f996e16df72cd1620087543b74c65c52632951a4842a7dc17d764303eac48c2df6a94feda0bbfffae7573b44409647db16ef2066930b4f1 diff --git a/dev-java/mvel/mvel-2.5.0.ebuild b/dev-java/mvel/mvel-2.5.2.ebuild index dc7079a91c1c..a3474156664b 100644 --- a/dev-java/mvel/mvel-2.5.0.ebuild +++ b/dev-java/mvel/mvel-2.5.2.ebuild @@ -15,8 +15,8 @@ SRC_URI="https://github.com/mvel/mvel/archive/mvel2-${PV}.Final.tar.gz" S="${WORKDIR}/${PN}-${PN}2-${PV}.Final" LICENSE="Apache-2.0" -SLOT="2.5" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +SLOT="0" +KEYWORDS="amd64 arm64 ppc64" DEPEND=" dev-java/asm:9 @@ -58,6 +58,7 @@ src_test() { ! -name "MVELThreadTest.java*" \ ! -name "SimpleTests.java*" \ ! -name "BaseOperatorsTest.java*" \ + ! -name "BaseMvelTest.java*" \ ) popd JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" diff --git a/dev-java/objenesis/Manifest b/dev-java/objenesis/Manifest index 955ff2825c1c..c474ebc59816 100644 --- a/dev-java/objenesis/Manifest +++ b/dev-java/objenesis/Manifest @@ -1 +1 @@ -DIST objenesis-3.3.tar.gz 125400 BLAKE2B 36cff7cb5a2dca9a81f3ca07d56995f68d9c61c9d2b7caeac5f87bb13da02b0494053927e2221c776edef0bafb862f5c97dfc0e79cf991c6c970b5b9206a5aa3 SHA512 786fe0d2d1dba0f006d5218101578d8fd23616765f5cdb4df190d138fd10dd675b9189887c27a40b63f09ed5e1dac1324b2936c7ac24a655e6f63d53b9cd7c01 +DIST objenesis-3.4.tar.gz 128447 BLAKE2B 220694fb496b4a29ad50c92741477e08475a6bdbd4f6ff647a03995a86945d9474672ee1be4f60f1fc07f0b05a4f1e59110977fccf9fd063dbd57750a66e2a26 SHA512 e4b106ae71e5f62e6057dba749ac56c42030a2a1aca5c2ec5c95c934a7fe1af99e6c62ca9c50e76fa67610bfbf075e46a0c9f37d4e6c35ea6047175189ab686e diff --git a/dev-java/objenesis/objenesis-3.3.ebuild b/dev-java/objenesis/objenesis-3.4.ebuild index 7ce789fc392d..52fa27bb6345 100644 --- a/dev-java/objenesis/objenesis-3.3.ebuild +++ b/dev-java/objenesis/objenesis-3.4.ebuild @@ -1,41 +1,44 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -# No tests since we don't have junit-jupiter -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.objenesis:objenesis:3.3" -# JAVA_TESTING_FRAMEWORKS="junit-4" +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.objenesis:objenesis:3.4" +JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple DESCRIPTION="A library for instantiating Java objects" -HOMEPAGE="http://objenesis.org/" +HOMEPAGE="https://objenesis.org/" SRC_URI="https://github.com/easymock/objenesis/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" +RESTRICT="test" #839681 DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}/${P}" +JAVA_TEST_GENTOO_CLASSPATH=" + junit-4 + junit-5 +" -JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_SRC_DIR="main/src/test/java" src_compile() { -# if use test; then -# einfo "Compiling objenesis-test" -# JAVA_AUTOMATIC_MODULE_NAME="org.objenesis.test" -# JAVA_SRC_DIR="test/src/main/java" -# JAVA_JAR_FILENAME="objenesis-test.jar" -# java-pkg-simple_src_compile -# JAVA_GENTOO_CLASSPATH_EXTRA+=":objenesis-test.jar" -# rm -r target || die -# fi + if use test; then + einfo "Compiling objenesis-test" + JAVA_AUTOMATIC_MODULE_NAME="org.objenesis.test" + JAVA_SRC_DIR="test/src/main/java" + JAVA_JAR_FILENAME="objenesis-test.jar" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":objenesis-test.jar" + rm -r target || die + fi einfo "Compiling objenesis" JAVA_SRC_DIR="main/src/main/java" diff --git a/dev-java/open-test-reporting-events/open-test-reporting-events-0.1.0_pre1.ebuild b/dev-java/open-test-reporting-events/open-test-reporting-events-0.1.0_pre1.ebuild index d14e4f96b6e6..6a59c7786456 100644 --- a/dev-java/open-test-reporting-events/open-test-reporting-events-0.1.0_pre1.ebuild +++ b/dev-java/open-test-reporting-events/open-test-reporting-events-0.1.0_pre1.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 @@ -16,7 +16,7 @@ S="${WORKDIR}/open-test-reporting-r${MY_PV}/events" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND="~dev-java/open-test-reporting-schema-${PV}:0" RDEPEND=">=virtual/jre-1.8:* diff --git a/dev-java/open-test-reporting-schema/open-test-reporting-schema-0.1.0_pre1.ebuild b/dev-java/open-test-reporting-schema/open-test-reporting-schema-0.1.0_pre1.ebuild index 220e706acfc9..6cab8a063da8 100644 --- a/dev-java/open-test-reporting-schema/open-test-reporting-schema-0.1.0_pre1.ebuild +++ b/dev-java/open-test-reporting-schema/open-test-reporting-schema-0.1.0_pre1.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 @@ -16,7 +16,7 @@ S="${WORKDIR}/open-test-reporting-r${MY_PV}/schema" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest index b7c6f2420178..4a1ae24a308a 100644 --- a/dev-java/openjdk-bin/Manifest +++ b/dev-java/openjdk-bin/Manifest @@ -1,37 +1,37 @@ -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 +DIST OpenJDK-jdk_aarch64_alpine-linux_hotspot_24_20-ea.tar.gz 213486173 BLAKE2B 429486689b28a436462d20691919ff90f242ea0d7f9e2f35c10596cb21780c14cfc8434531e2c75af0a486cec9004a815815ce0ac759a99612c8d325fd925230 SHA512 e003b0f91325560891c831e4e37a641699685b8e32f032040c65bf75c7557f89673976bd87ece4ad31a8e5b46f7854a830d553f91804379661319da087d9a9f1 +DIST OpenJDK-jdk_aarch64_linux_hotspot_24_20-ea.tar.gz 213435180 BLAKE2B 0163fbc674b7f04dc69bf2d57444e2f9625f22050a6ae09bd976d9d393d69c3b557332302a6ff0cc58e04ea910bb4f2bc5fda677024c06ac568df6cc57698d11 SHA512 b6fd2b0750e22dd986314314e126932dc95475314636733083d1d0f50c1e298371d418cad098e0062f6e4a3b3d4a2f50e3cf2e7954db407b01ea5f3432e606d2 +DIST OpenJDK-jdk_ppc64le_linux_hotspot_24_20-ea.tar.gz 214984344 BLAKE2B c6582a845579246f920b0ab94657870650669a30e45f0435a4ad8b63657771b5a708cf5aa417f87d9e2a7dde7fae0603864e21558e022fd39cfa818d1d5bd20b SHA512 f5e8644094b737a3eb8b1d40b2140fbc283e9c397c0dd23bc53c4678430abf84dc8f2e264ac4aee824b135e30dd3df390d8a38af5b7e7ac74e945ce081984f91 +DIST OpenJDK-jdk_riscv64_linux_hotspot_24_20-ea.tar.gz 211454913 BLAKE2B c5aec2757115c71abf2a3d711c5cc8074661ba558d7657ceb1774e2a59681a58a08e167eb17aeae7140a61aa8f32cab891c56130ea74db490a51795d81a148c6 SHA512 78e601771ce3b22c3ec361aceac53184524eccb6ae0e0434be415a7af4cd528253facaf8d161bdec691946394f8fdc47a0b37d8fd3cffae0627dbcbd347ccf98 +DIST OpenJDK-jdk_x64_alpine-linux_hotspot_24_20-ea.tar.gz 215768214 BLAKE2B 32dc974b0e13a14c79c77333bc2208b29455f5c1f2818bc2480b09ae7ff1f48e2ea9c03ae80264a4bf389bdf3df9f17157456576e943fd71713fae97110404d9 SHA512 62f1776e1b34fd5950450745e1de81ade2f882037b8bb707926c9deec19101d3623e1c9d76702d577458cbaf0d1239be5674d3752e8d58eb0200e4b446464fe1 +DIST OpenJDK-jdk_x64_linux_hotspot_24_20-ea.tar.gz 215528275 BLAKE2B abfe4b018d32fcd8c814033bfea181300b3c166694e2e3e58dbba53bf7d2b6236294e619837474cefdea972d229588e41b488d7043aca9533bc14376dcf79da9 SHA512 b7ccdb432f7f837acfbe6e617486d032bf6da191ab767e2a607ca4cea0e46b58ebc4d91b9e8611771ae0814ed60db4f9c9def3d1987b85c9f2c31bb43d6bbabc +DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.25_9.tar.gz 192125336 BLAKE2B e083ce8691f8462310eeaa7495d26519754f5bfadc8a786dd188f1dad4dc36164eea9220125340b43c9e6b4321be6e26d66a9c18247a6462e4cae9f453fe1171 SHA512 860fff5eff6ef2a29062aac0ee7f90d80dca417fb58ccbf9a9f2ca96a8dc4798a00dab42deedbc64a371d0356b17e6cd12cdc2b2879edfcec9463ffc004ce5fb +DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz 182871332 BLAKE2B ac6ba9e02fcec38dbb685cdebf379ecdcb5041bc53a71a0896baf7f2628faaa0dd1402b045a57010e2495c16e48116fd1216fe6d4b6cf35cbc996dafe8516e0a SHA512 db0761f8b0baa82c61567a869f2c23da61470d055ecbd73c7693a7be37167282af7387006f22a0c7a46e1e71591615fac0431925987af8fb8e36d77207669856 +DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.25_9.tar.gz 177532830 BLAKE2B 5a2e15a9cd601dfbc6749875ee53de1ca5d41c41335e52588c778412499c4825b9108bcf8dacbe250814ff5664d8b8fceefceb738dc24c3ab3d13d292fa3d027 SHA512 8ba8c210717046ab167eeccfc8a3b18e34e77262a0aef866b6268cbd5b91bfd6ed90003ce7de852d6e24f923e044839092e5faac2f3df6273b8b3868eb7e7398 +DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.25_9.tar.gz 194039813 BLAKE2B 23995a31297ebdaa099722fe9962d14bf71800d6ab61904a7ff7ea4661f5a9bfe20f7669de2044999243626cfe97a63da7129571aa81d61436543fa3dbcaa220 SHA512 6a1fcfb1eed0c7b0823fe78c74630e9322bacbe973ea54684c9454df12118add9f8cae991e9f9c8ed721f0f7dc326ad9dfee010660d8a2c738c8c3fa3782aa1e +DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.25_9.tar.gz 195304316 BLAKE2B 99245dfcfc0b930486e07ef4fd46d5a398626bc20f4396ab4acdd15894645f085b861edae51c4724725f9d4d6fd0893644a4b09c6be3f2e72dba7f97e8397d0c SHA512 af63a7933e3c1c14c1f92682d4f1cb442a3637f077a22944b4fe559953a64a89f0ccf3bb8d1801c4fae9382fb66ec112ab3c43f9c7ac9319d59bcc5a41ffaade +DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.25_9.tar.gz 187793518 BLAKE2B e6e8ae58d450e54476c3374a630dcce989402b80aec776ef53dd19505541ffca635121942ae74fe005dd141c1a16b09a243326a380b2cdd5263f188c07da0555 SHA512 d3be11c3caa29670f60b0e16c4009ad14a2d43db86f03c12954edacb7e081ed213e27f03b744e578199362066674b71d416c1035186815ceca6b46c88b3f0138 +DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.13_11.tar.gz 190583488 BLAKE2B 5ae3b41174f9a1b2b29cb4f4dc74d7b9644b1f168d1b44dc8536dd1dd94692f8b56e238e019bf9a956ac5da3575bf8435570f281e0de359d356e9ba2f035dcd3 SHA512 abbb6f0df93d17f14bcd7df7fcb4450e89c89c3f6f96d0b3e5b22fa0bd33c857dbd7a9751393f837984b9bf7c055acb25924c1dcbef9a294d1149bc03a91fa7a +DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.13_11.tar.gz 185240495 BLAKE2B 6c99ba7106d9d8fd53bf427a03810e243b00908c9afabac0f75cd89f172bed5ce56c877bc4439d063616ec3944cbc74da77db4a1894d3ed93ae13edf81747816 SHA512 2a14c4e4ec20b34fb63465d7633ddf622e1097416511aa3983f43d0ddcf341e516fb2eefeb8e8619c931c9a2098decc8ef353bccd4a7b7ce70c31ab1c320fdc1 +DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.13_11.tar.gz 188864608 BLAKE2B 5cb50382a86a60b63116db850bec71ca7df0a17f3c05fc5b296a92a81e4522915b9e0aeef5443c6516bf670176f56b36be8a0b64a2e4101f0a970c0342139652 SHA512 1c26a5dc7733e8662aea769a5c8e76cf2a81fe93638d45befca6083521450bba4e2c700287af7bece2fd6bc3cc2a5ecb07bda7f655253acb04fcee486b06b532 |