diff options
Diffstat (limited to 'dev-java')
642 files changed, 10723 insertions, 10009 deletions
diff --git a/dev-java/angus-activation/metadata.xml b/dev-java/angus-activation/metadata.xml index 75321cfb5598..0174e643d7c7 100644 --- a/dev-java/angus-activation/metadata.xml +++ b/dev-java/angus-activation/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">eclipse-ee4j/angus-activation</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/ant-antlr/Manifest b/dev-java/ant-antlr/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-antlr/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild b/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild deleted file mode 100644 index 3d1f5f5f4ac0..000000000000 --- a/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="" - -inherit ant-tasks - -DESCRIPTION="Apache Ant's optional tasks for Antlr" -KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -RDEPEND=">=dev-java/antlr-2.7.7-r7:0" - -src_install() { - ant-tasks_src_install - java-pkg_register-dependency antlr -} diff --git a/dev-java/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-apache-bcel/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild deleted file mode 100644 index 19fd7d66d46e..000000000000 --- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="bcel" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/bcel-5.1-r3:0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-apache-bsf/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild deleted file mode 100644 index f6ba1618b0fe..000000000000 --- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="bsf-2.3" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="python javascript tcl" - -DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]" -RDEPEND="${DEPEND}" - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "Also, >=dev-java/bsf-2.4.0-r1 adds optional support for groovy," - elog "ruby and beanshell. See its postinst elog messages for instructions." - fi -} diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-apache-log4j/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild deleted file mode 100644 index b7f808b7f60d..000000000000 --- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="log4j-12-api-2" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND="dev-java/log4j-12-api:2" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-apache-oro/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild deleted file mode 100644 index 4fa3ab36eac0..000000000000 --- a/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="jakarta-oro-2.0" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-apache-oro/metadata.xml b/dev-java/ant-apache-oro/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-apache-oro/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-apache-regexp/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild deleted file mode 100644 index 07ce567a85e6..000000000000 --- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="jakarta-regexp-1.4" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-apache-regexp/metadata.xml b/dev-java/ant-apache-regexp/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-apache-regexp/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-apache-resolver/Manifest b/dev-java/ant-apache-resolver/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-apache-resolver/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild deleted file mode 100644 index 77c663e553ce..000000000000 --- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="xml-commons-resolver" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/xml-commons-resolver-1.2:0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-apache-resolver/metadata.xml b/dev-java/ant-apache-resolver/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-apache-resolver/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-apache-xalan2/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild deleted file mode 100644 index a46ac087c870..000000000000 --- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="xalan" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND="dev-java/xalan:0 - dev-java/xalan-serializer:0" - -RDEPEND="${DEPEND}" - -src_unpack() { - ant-tasks_src_unpack all - java-pkg_jar-from xalan-serializer -} diff --git a/dev-java/ant-apache-xalan2/metadata.xml b/dev-java/ant-apache-xalan2/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-apache-xalan2/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-commons-logging/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild deleted file mode 100644 index ce6a50054a6c..000000000000 --- a/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/commons-logging-1.0.4-r2:0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-commons-logging/metadata.xml b/dev-java/ant-commons-logging/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-commons-logging/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-commons-net/Manifest b/dev-java/ant-commons-net/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-commons-net/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild deleted file mode 100644 index 1ba1262c90f3..000000000000 --- a/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/commons-net-1.4.1-r1:0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-commons-net/metadata.xml b/dev-java/ant-commons-net/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-commons-net/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild index 38db7e73b27e..172467ec6ed4 100644 --- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild +++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild @@ -1,9 +1,6 @@ -# Copyright 1999-2021 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/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild ant-contrib-1.0_beta6_pre20201123.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" @@ -14,8 +11,9 @@ inherit java-pkg-2 java-pkg-simple MY_COMMIT="0228412be2ef648cfabc1d74416d3188755aff9b" DESCRIPTION="Ant-contrib tasks for Apache Ant" -HOMEPAGE="http://ant-contrib.sourceforge.net" +HOMEPAGE="https://ant-contrib.sourceforge.net/" SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}" LICENSE="Apache-2.0" SLOT="0" @@ -34,7 +32,7 @@ RESTRICT="test" # xerces:xercesImpl:2.12.0 -> >=dev-java/xerces-2.12.0:2 CDEPEND=" - dev-java/ant-core:0 + >=dev-java/ant-1.10.14-r3:0 dev-java/ant-ivy:2 dev-java/bcel:0 dev-java/commons-httpclient:3 @@ -49,20 +47,18 @@ CDEPEND=" DEPEND="${CDEPEND} >=virtual/jdk-1.8:* test? ( - dev-java/ant-core:0 + >=dev-java/ant-1.10.14-r3:0[junit4] )" RDEPEND="${CDEPEND} >=virtual/jre-1.8:*" -S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}" - # JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2" -JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,xerces-2" +JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant,bcel,ant-ivy-2,xerces-2" JAVA_SRC_DIR="src/main/java" JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant-core" +JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant" JAVA_TEST_SRC_DIR="test/src" JAVA_TEST_RESOURCE_DIRS="test/resources" diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-core/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild b/dev-java/ant-core/ant-core-1.10.14.ebuild new file mode 100644 index 000000000000..c69d378ddc71 --- /dev/null +++ b/dev-java/ant-core/ant-core-1.10.14.ebuild @@ -0,0 +1,26 @@ +# 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/ant-core-1.10.9-r5.ebuild b/dev-java/ant-core/ant-core-1.10.9-r5.ebuild deleted file mode 100644 index 40333bc9a9d1..000000000000 --- a/dev-java/ant-core/ant-core-1.10.9-r5.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Don't depend on itself. -JAVA_ANT_DISABLE_ANT_CORE_DEP="true" - -# Rewriting build.xml files for the testcases has no use at the moment. -JAVA_PKG_BSFIX_ALL="no" -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.ant:ant:1.10.9" - -inherit java-pkg-2 java-ant-2 prefix - -MY_P="apache-ant-${PV}" - -DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files" -HOMEPAGE="https://ant.apache.org/" -SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2 - https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -CDEPEND=">=virtual/jdk-1.8:*" -DEPEND="${CDEPEND} - doc? ( - dev-java/bcel:0 - dev-java/bsf:2.3 - dev-java/commons-logging:0 - dev-java/commons-net:0 - dev-java/jakarta-activation-api:1 - dev-java/jakarta-regexp:1.4 - dev-java/jakarta-oro:2.0 - dev-java/jdepend:0 - dev-java/jsch:0 - dev-java/log4j-12-api:2 - dev-java/javax-mail:0 - dev-java/sun-jai-bin:0 - dev-java/xalan:0 - dev-java/xml-commons-resolver:0 - dev-java/xz-java:0 - )" -RDEPEND="${CDEPEND}" - -S="${WORKDIR}/${MY_P}" - -RESTRICT="test" - -PATCHES=( - "${WORKDIR}/${PV}-build.patch" - "${WORKDIR}/${PV}-launch.patch" -) - -src_prepare() { - default - - eprefixify "${S}/src/script/ant" - - # Fixes bug 556008. - java-ant_xml-rewrite -f build.xml \ - -c -e javadoc \ - -a failonerror \ - -v "false" - - # See bug #196080 for more details. - java-ant_bsfix_one build.xml - java-pkg-2_src_prepare - - # Remove JDK9+ stuff - einfo "Removing JDK9+ classes (Jmod and Link)" - rm "${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java -} - -src_compile() { - export ANT_HOME="" - # Avoid error message that package ant-core was not found - export ANT_TASKS="none" - - local bsyscp - - # This ensures that when building ant with bootstrapped ant, - # only the source is used for resolving references, and not - # the classes in bootstrapped ant but jikes in kaffe has issues with this... - if ! java-pkg_current-vm-matches kaffe; then - bsyscp="-Dbuild.sysclasspath=ignore" - fi - - CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal || - die "build failed" - - if use doc; then - # All Java packages imported by the source files need to present in - # the classpath, otherwise it would be https://bugs.gentoo.org/780531 - local doc_deps=( - bcel - bsf-2.3 - commons-logging - commons-net - jakarta-activation-api-1 - jakarta-oro-2.0 - jakarta-regexp-1.4 - jdepend - jsch - log4j-12-api-2 - javax-mail - sun-jai-bin - xalan - xml-commons-resolver - xz-java - ) - for dep in "${doc_deps[@]}"; do - java-pkg_jar-from --build-only --into lib/optional/ "${dep}" - done - # This file imports netrexx.lang.Rexx, which is not available - # from ::gentoo. Fortunately, there is not a dev-java/ant-* - # package for it, so even if we could generate documentation - # for it, it would be irrelevant - rm src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java || - die "Failed to remove Java source file blocking Javadoc generation" - ./build.sh ${bsyscp} javadocs || die "Javadoc build failed" - fi -} - -src_install() { - dodir /usr/share/ant/lib - - for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do - java-pkg_dojar build/lib/${jar} - dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar} - done - - dobin src/script/ant - - dodir /usr/share/${PN}/bin - for each in antRun antRun.pl runant.pl runant.py ; do - dobin "${S}/src/script/${each}" - dosym ../../../bin/${each} /usr/share/${PN}/bin/${each} - done - dosym ../${PN}/bin /usr/share/ant/bin - - insinto /usr/share/${PN} - doins -r dist/etc - dosym ../${PN}/etc /usr/share/ant/etc - - echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant" - doenvd "${T}/20ant" - - dodoc NOTICE README WHATSNEW KEYS - - if use doc; then - dodoc -r manual/* - java-pkg_dojavadoc --symlink manual/api build/javadocs - fi - - use source && java-pkg_dosrc src/main/* -} diff --git a/dev-java/ant-core/metadata.xml b/dev-java/ant-core/metadata.xml index 4221e170cbc0..d0bcffb03628 100644 --- a/dev-java/ant-core/metadata.xml +++ b/dev-java/ant-core/metadata.xml @@ -5,4 +5,9 @@ <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-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest deleted file mode 100644 index aa67f4731d80..000000000000 --- a/dev-java/ant-eclipse-ecj/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d -DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild deleted file mode 100644 index 86295bc01b6a..000000000000 --- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple prefix - -DMF="R-${PV}-202003050155" - -DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler" -HOMEPAGE="https://www.eclipse.org/" -SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar" - -LICENSE="EPL-1.0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" -SLOT="4.15" -IUSE="" - -CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT} - dev-java/ant-core:0" -RDEPEND="${CDEPEND} - >=virtual/jre-11:*" -DEPEND="${CDEPEND} - >=virtual/jdk-11:*" -BDEPEND="app-arch/unzip" - -JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}" - -src_prepare() { - default - - # Remove everything but the Ant component. - find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die - - rm build.xml || die -} - -src_compile() { - java-pkg-simple_src_compile - find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed" -} - -src_install() { - java-pkg-simple_src_install - insinto /usr/share/java-config-2/compiler - doins "${FILESDIR}/ecj-${SLOT}" - eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT} -} diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild deleted file mode 100644 index 478ef5996a68..000000000000 --- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple prefix - -DMF="R-${PV}-202211231800" - -DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler" -HOMEPAGE="https://www.eclipse.org/" -SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar" - -LICENSE="EPL-1.0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" -SLOT="4.26" -IUSE="" - -CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT} - dev-java/ant-core:0" -# though technically both could be set to 1.8 and it would -# compile using jdk 11+, it would not compile using jdk 1.8 -# because eclipse ecj has min jdk 11 -RDEPEND="${CDEPEND} - >=virtual/jre-11:*" -DEPEND="${CDEPEND} - >=virtual/jdk-17:*" -BDEPEND="app-arch/unzip" - -JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}" - -src_prepare() { - default - - # Remove everything but the Ant component. - find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die - - rm build.xml || die -} - -src_compile() { - java-pkg-simple_src_compile - find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed" -} - -src_install() { - java-pkg-simple_src_install - insinto /usr/share/java-config-2/compiler - doins "${FILESDIR}/ecj-${SLOT}" - eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT} -} diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.15 b/dev-java/ant-eclipse-ecj/files/ecj-4.15 deleted file mode 100644 index f943dedcc19b..000000000000 --- a/dev-java/ant-eclipse-ecj/files/ecj-4.15 +++ /dev/null @@ -1,7 +0,0 @@ -JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.15" -PACKAGE="=dev-java/ant-eclipse-ecj-4.15*" -SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13" -SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13" -ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" -ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.15,ant-eclipse-ecj-4.15" -GENERATION="2" diff --git a/dev-java/ant-eclipse-ecj/metadata.xml b/dev-java/ant-eclipse-ecj/metadata.xml deleted file mode 100644 index 2c9857d120ad..000000000000 --- a/dev-java/ant-eclipse-ecj/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> -<longdescription> -ECJ is the Eclipse Compiler for Java. It's a separate packaging of -the embedded Java compiler that comes with Eclipse. It can be used -as a batch-compiler by running the ecj-3.1 script, or it can be -used with Ant by using the -lib option to and and setting --Dbuild.compiler=ecj -</longdescription> -</pkgmetadata> diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild index fff42019b905..0158c70768f5 100644 --- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild +++ b/dev-java/ant-ivy/ant-ivy-2.5.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 EAPI=8 @@ -11,7 +11,7 @@ inherit java-pkg-2 java-pkg-simple java-osgi DESCRIPTION="Ivy is a free java based dependency manager" HOMEPAGE="https://ant.apache.org/ivy/" -SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz" +SRC_URI="https://archive.apache.org/dist/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz" LICENSE="Apache-2.0" SLOT="2" @@ -21,7 +21,7 @@ PROPERTIES="test_network" RESTRICT="test" CDEPEND=" - dev-java/ant-core:0 + >=dev-java/ant-1.10.14-r3:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/httpcomponents-client @@ -31,10 +31,7 @@ CDEPEND=" dev-java/jsch:0 dev-java/jsch-agent-proxy:0 test? ( - dev-java/ant-junit:0 - dev-java/ant-junit4:0 - dev-java/ant-junitlauncher:0 - dev-java/ant-testutil:0 + >=dev-java/ant-1.10.14-r3:0[junit,junit4,junitlauncher,testutil] dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/xmlunit:1 @@ -50,12 +47,28 @@ DOCS=( LICENSE NOTICE README.adoc ) S="${WORKDIR}/apache-ivy-${PV}" -JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,httpcomponents-client-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy" +JAVA_GENTOO_CLASSPATH=" + ant + bcpg + bcprov + httpcomponents-client-4 + commons-vfs-2 + httpcore + jakarta-oro-2.0 + jsch + jsch-agent-proxy +" JAVA_MAIN_CLASS="org.apache.ivy.Main" JAVA_SRC_DIR="src/java" JAVA_RESOURCE_DIRS="resources/java" -JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1" +JAVA_TEST_GENTOO_CLASSPATH=" + ant + hamcrest-core-1.3 + hamcrest-library-1.3 + junit-4 + xmlunit-1 +" JAVA_TEST_SRC_DIR="test-src/java" JAVA_TEST_RESOURCE_DIRS="test" JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar" diff --git a/dev-java/ant-ivy/metadata.xml b/dev-java/ant-ivy/metadata.xml index 91e2ba1cf10c..84db44eaed66 100644 --- a/dev-java/ant-ivy/metadata.xml +++ b/dev-java/ant-ivy/metadata.xml @@ -16,7 +16,7 @@ </longdescription> <upstream> <remote-id type="github">apache/ant-ivy</remote-id> - <doc>https://ant.apache.org/ivy/history/2.5.0</doc> - <bugs-to>https://issues.apache.org/jira/browse/IVY </bugs-to> + <doc>https://ant.apache.org/ivy/history/2.5.0/</doc> + <bugs-to>https://issues.apache.org/jira/browse/IVY</bugs-to> </upstream> </pkgmetadata> diff --git a/dev-java/ant-jai/Manifest b/dev-java/ant-jai/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-jai/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-jai/ant-jai-1.10.9.ebuild b/dev-java/ant-jai/ant-jai-1.10.9.ebuild deleted file mode 100644 index 3a2873b650bb..000000000000 --- a/dev-java/ant-jai/ant-jai-1.10.9.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="sun-jai-bin" - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86" - -# Unmigrated, has textrels and there's also some source one now too. -DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-jai/metadata.xml b/dev-java/ant-jai/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-jai/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-javamail/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild deleted file mode 100644 index c02f16c20d31..000000000000 --- a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME=( "gnu-jaf-1" "javax-mail" ) - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -# needs some classes from javax.activation.* which are not in jdk 11 -DEPEND="virtual/jdk:1.8 - dev-java/gnu-jaf:1 - dev-java/javax-mail:0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-javamail/metadata.xml b/dev-java/ant-javamail/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-javamail/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-jdepend/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild deleted file mode 100644 index 97d0329f5756..000000000000 --- a/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/jdepend-2.9-r2:0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-jdepend/metadata.xml b/dev-java/ant-jdepend/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-jdepend/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-jmf/Manifest b/dev-java/ant-jmf/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-jmf/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild b/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild deleted file mode 100644 index 76a06ae0e5a0..000000000000 --- a/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -# Seems we don't need to depend on jmf-bin, the classes ant imports are in J2SE -# API since version 1.3. -ANT_TASK_DEPNAME="" - -inherit ant-tasks - -DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)" - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" diff --git a/dev-java/ant-jmf/metadata.xml b/dev-java/ant-jmf/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-jmf/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-jsch/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild b/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild deleted file mode 100644 index 43d214487023..000000000000 --- a/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 - -inherit ant-tasks - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=">=dev-java/jsch-0.1.37:0" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-jsch/metadata.xml b/dev-java/ant-jsch/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-jsch/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-junit/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-junit/ant-junit-1.10.9.ebuild b/dev-java/ant-junit/ant-junit-1.10.9.ebuild deleted file mode 100644 index cea7fdca5bc1..000000000000 --- a/dev-java/ant-junit/ant-junit-1.10.9.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 - -inherit ant-tasks - -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=" - dev-java/junit:0 - dev-java/junit:4 -" -RDEPEND="${DEPEND}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="junit-4" - -src_compile() { - eant jar-junit -} diff --git a/dev-java/ant-junit/metadata.xml b/dev-java/ant-junit/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-junit/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-junit4/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild b/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild deleted file mode 100644 index 9eef99a67149..000000000000 --- a/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="junit-4" - -inherit ant-tasks - -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND="dev-java/junit:4 - ~dev-java/ant-junit-${PV}" - -RDEPEND="${DEPEND}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="junit-4,ant-junit" - -src_prepare() { - default - - java-pkg_jar-from --build-only --into "${S}/lib" ant-junit -} - -src_install() { - # No registration as ant-task, would be loaded together with ant-junit. - java-pkg_dojar build/lib/ant-junit4.jar - - # As we dont't want to depend on and-junit in package.env, because it depends - # on junit:0. Instead, we "steal" its jar and record it to our package.env as - # if it belongs to this package's classpath. - java-pkg_getjar --build-only ant-junit ant-junit.jar - java-pkg_regjar $(java-pkg_getjar --build-only ant-junit ant-junit.jar) -} diff --git a/dev-java/ant-junit4/metadata.xml b/dev-java/ant-junit4/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-junit4/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-junitlauncher/Manifest b/dev-java/ant-junitlauncher/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-junitlauncher/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild deleted file mode 100644 index 2b8d03f2e629..000000000000 --- a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="" - -inherit ant-tasks - -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" diff --git a/dev-java/ant-junitlauncher/metadata.xml b/dev-java/ant-junitlauncher/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-junitlauncher/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-swing/Manifest b/dev-java/ant-swing/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-swing/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-swing/ant-swing-1.10.9.ebuild b/dev-java/ant-swing/ant-swing-1.10.9.ebuild deleted file mode 100644 index e204f8e1393e..000000000000 --- a/dev-java/ant-swing/ant-swing-1.10.9.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -# No extra dependencies are needed. -ANT_TASK_DEPNAME="" - -inherit ant-tasks - -DESCRIPTION="Apache Ant's optional tasks for Swing" - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" diff --git a/dev-java/ant-swing/metadata.xml b/dev-java/ant-swing/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-swing/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-testutil/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild deleted file mode 100644 index 23d1ace04929..000000000000 --- a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 - -inherit ant-tasks - -DESCRIPTION="Apache Ant's optional test utility classes" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" - -CDEPEND="dev-java/ant-core:0" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.8 - >=dev-java/junit-4.11:4 - ~dev-java/ant-swing-${PV} - ~dev-java/ant-junit4-${PV} - ~dev-java/ant-junitlauncher-${PV}" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8" - -# The build system builds much more than it actually packages, so there are many -# build-only deps, but since those are quite common, it wasn't worth to patch it. - -src_unpack() { - ant-tasks_src_unpack base - java-pkg_jar-from --build-only junit-4,ant-junit4,ant-junitlauncher,ant-swing - java-pkg_jar-from --build-only ant-core ant-launcher.jar -} - -src_compile() { - eant test-jar -} diff --git a/dev-java/ant-testutil/metadata.xml b/dev-java/ant-testutil/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-testutil/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant-xz/Manifest b/dev-java/ant-xz/Manifest deleted file mode 100644 index dccd735d44ed..000000000000 --- a/dev-java/ant-xz/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-xz/ant-xz-1.10.9.ebuild b/dev-java/ant-xz/ant-xz-1.10.9.ebuild deleted file mode 100644 index a7d47300d608..000000000000 --- a/dev-java/ant-xz/ant-xz-1.10.9.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="xz-java" - -inherit ant-tasks - -DESCRIPTION="Apache Ant's optional tasks for XZ compression" - -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND="dev-java/xz-java" -RDEPEND="${DEPEND}" diff --git a/dev-java/ant-xz/metadata.xml b/dev-java/ant-xz/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/ant-xz/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest new file mode 100644 index 000000000000..4fdf2d20cd0a --- /dev/null +++ b/dev-java/ant/Manifest @@ -0,0 +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 diff --git a/dev-java/ant/ant-1.10.14-r3.ebuild b/dev-java/ant/ant-1.10.14-r3.ebuild new file mode 100644 index 000000000000..e0ad3fce1fed --- /dev/null +++ b/dev-java/ant/ant-1.10.14-r3.ebuild @@ -0,0 +1,395 @@ +# 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=" + org.apache.ant:ant:${PV} + org.apache.ant:ant-launcher:${PV} +" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig prefix + +DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files" +HOMEPAGE="https://ant.apache.org/" +SRC_URI="mirror://apache/ant/source/apache-${P}-src.tar.xz + verify-sig? ( https://downloads.apache.org/ant/source/apache-${P}-src.tar.xz.asc )" +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" +IUSE="antlr bcel bsf commonslogging commonsnet imageio jai jakartamail javamail jdepend + jmf jsch junit junit4 junitlauncher log4j oro regexp resolver swing testutil xalan xz" + +# At least 10 test cases would fail without network +PROPERTIES="test_network" +RESTRICT="test" + +REQUIRED_USE=" + junit4? ( junit ) + test? ( bsf ) + testutil? ( junit ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ant.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-ant )" +# jdk-11:* because it needs java/util/spi/ToolProvider, available since Java 9. +DEPEND=" + >=virtual/jdk-11:* + bcel? ( dev-java/bcel:0 ) + bsf? ( dev-java/bsf:2.3 ) + commonslogging? ( dev-java/commons-logging:0 ) + commonsnet? ( dev-java/commons-net:0 ) + jai? ( dev-java/sun-jai-bin:0 ) + jakartamail? ( dev-java/jakarta-mail:0 ) + javamail? ( + dev-java/jakarta-activation-api:1 + dev-java/javax-mail:0 + ) + jdepend? ( >=dev-java/jdepend-2.10-r1:0 ) + jsch? ( dev-java/jsch:0 ) + junit4? ( dev-java/junit:4 ) + junit? ( dev-java/junit:4 ) + junitlauncher? ( dev-java/junit:5[vintage] ) + log4j? ( dev-java/log4j-12-api:2 ) + oro? ( dev-java/jakarta-oro:2.0 ) + regexp? ( dev-java/jakarta-regexp:1.4 ) + resolver? ( dev-java/xml-commons-resolver:0 ) + test? ( + dev-java/antunit:0 + dev-java/bsf:2.3[javascript] + dev-java/bsh:0 + dev-java/hamcrest-library:1.3 + dev-java/xerces:2 + ) + xalan? ( + dev-java/xalan:0 + dev-java/xalan-serializer:0 + ) + xz? ( dev-java/xz-java:0 ) +" +RDEPEND=" + !dev-java/ant-apache-regexp + !dev-java/ant-apache-log4j + !dev-java/ant-apache-xalan2 + !dev-java/ant-commons-logging + !<dev-java/ant-core-1.10.14 + !dev-java/ant-swing + !dev-java/ant-junit4 + !dev-java/ant-testutil + !dev-java/ant-junitlauncher + !dev-java/ant-jai + !dev-java/ant-commons-net + !dev-java/ant-apache-bsf + !dev-java/ant-jmf + !dev-java/ant-apache-oro + !dev-java/ant-javamail + !dev-java/ant-junit + !dev-java/ant-jdepend + !dev-java/ant-antlr + !dev-java/ant-apache-bcel + !dev-java/ant-apache-resolver + !dev-java/ant-jsch + !dev-java/ant-xz + >=virtual/jre-1.8:* +" + +DOCS=( CONTRIBUTORS INSTALL NOTICE README WHATSNEW ) +PATCHES=( + "${FILESDIR}/1.10.9-launch.patch" # reusing this patch since the script has not changed + "${FILESDIR}/ant-1.10.14-AntlibTest.patch" # skips 1 of 6 tests + "${FILESDIR}/ant-1.10.14-AntTest.patch" # skips 1 of 32 tests + "${FILESDIR}/ant-1.10.14-JavaTest.patch" # skips 12 of 38 tests + "${FILESDIR}/ant-1.10.14-LinkTest.patch" # skips 4 of 67 tests + "${FILESDIR}/ant-1.10.14-PathTest.patch" # skips 1 of 33 tests +) + +JAVADOC_SRC_DIRS=( + ant + ant-launcher/src/main +) +JAVA_TEST_GENTOO_CLASSPATH=" + bsh + hamcrest-library-1.3 + junit-4 + xerces-2 +" +JAVA_TEST_RESOURCE_DIRS=( + "src/etc/testcases" + "src/main" +) +JAVA_TEST_SRC_DIR="src/tests/junit" + +# $1 ant-apache-bsf (source directory) +# $2 bsf-2.3 (classpath of external dependency) +taskdeps() { + if [[ ${task} == $1 ]]; then + JAVA_CLASSPATH_EXTRA="${2}" + JAVADOC_CLASSPATH+=" ${2}" + JAVADOC_SRC_DIRS+=( "${task}/src/main" ) + JAVA_RESOURCE_DIRS="${3}" + fi +} + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean ! -path "./src/etc/*" # keep test resources + + eprefixify "src/script/ant" + + ANT_TASKS=( + $(use antlr && echo ant-antlr) # no dependencies + $(use bcel && echo ant-apache-bcel) + $(use bsf && echo ant-apache-bsf) # REQUIRED_USE for tests + $(use log4j && echo ant-apache-log4j) + $(use oro && echo ant-apache-oro) # ORO is retired - replace with java.util.regex? + $(use regexp && echo ant-apache-regexp) + $(use resolver && echo ant-apache-resolver) + $(use xalan && echo ant-apache-xalan2) + $(use commonslogging && echo ant-commons-logging) + $(use commonsnet && echo ant-commons-net) + $(use imageio && echo ant-imageio) # no dependencies + $(use jai && echo ant-jai) + $(use jakartamail && echo ant-jakartamail) + $(use javamail && echo ant-javamail) + $(use jdepend && echo ant-jdepend) + $(use jmf && echo ant-jmf) # no dependencies + $(use jsch && echo ant-jsch) + $(use junit && echo ant-junit) # REQUIRED_USE for junit4 and for testutil + $(use junit4 && echo ant-junit4) + $(use junitlauncher && echo ant-junitlauncher) + # depends on "com.ibm.netrexx:netrexx:2.0.5" which is + # available on https://www.netrexx.org/downloads.nsp and states: + # "IBM's last NetRexx release, suitable for JVM versions 1.5 and below [...]" + # $(use netrexx && echo ant-netrexx) # src/etc/poms/ant-netrexx/pom.xml + $(use swing && echo ant-swing) # no dependencies + $(use testutil && echo ant-testutil) + $(use xz && echo ant-xz) + ) + + # defaultManifest.mf + sed -e "s:\${project.version}:${PV}:" \ + -i src/main/org/apache/tools/ant/defaultManifest.mf || die + + # version.txt + local mydate="$(date '+%B %d %Y')" + echo "VERSION=${PV}" > src/main/org/apache/tools/ant/version.txt || die + echo "DATE=${mydate}" >> src/main/org/apache/tools/ant/version.txt || die + + # src directory for ant.jar + mkdir ant || die "cannot create src directory for ant" + cp -r {src/main/,ant}/org || die "cannot copy ant sources" + + # resources directory for ant.jar according to lines 317-325 src/etc/poms/ant/pom.xml + local INCLUDES=( $( + sed -n '/<resources>/,/<\/resources>/p' \ + src/etc/poms/ant/pom.xml \ + | grep org \ + | sed -e 's:.*<include>\(.*\)</include>:\1:' || die + )) + cp -r {src/,ant}/resources || die "cannot copy ant resources" + pushd src/main > /dev/null || die "pushd src/main" + cp --parents -v "${INCLUDES[@]}" ../../ant/resources || die "CANNOT" + popd > /dev/null || die "popd" + + # Remove sources according to lines 158-187 src/etc/poms/ant/pom.xml + # We don't remove anything from src/main/org + local EXCLUDES=$( + sed -n '/<excludes>/,/<\/excludes/p' \ + src/etc/poms/ant/pom.xml \ + | grep org \ + | sed -e 's:<exclude>\(.*\)</exclude>:ant/\1:' || die + ) + rm -r ${EXCLUDES} || die + # Remove one more file directly, could not get it with sed. + rm ant/org/apache/tools/ant/taskdefs/optional/ANTLR.java || die + + # Same handling for everything between <testExcludes> </testExcludes> + # Removing non-existing files is not possible: We ignore them ( grep -v ). + local TEST_EXCLUDES=$( + sed -n '/<testExcludes>/,/<\/testExcludes/p' \ + src/etc/poms/ant/pom.xml \ + | grep org \ + | grep -v CommonsLoggingListener \ + | grep -v Log4jListener \ + | sed -e 's:<exclude>\(.*\)</exclude>:src/tests/junit/\1:' || die + ) + rm -r ${TEST_EXCLUDES} || die + + # Prepare a separate JAVA_SRC_DIR directory for each jar file to be created. + einfo "Copy source files of ant-tasks" + local task + for task in ant-launcher "${ANT_TASKS[@]}"; do + # "${task}/src/main" will be JAVA_SRC_DIR + mkdir -p "${task}/src/main" || die "mkdir ${task}" + # Read from pom.xml the file names which can still contain wildcards + local INCLUDES=( $( + sed -n '/<includes>/,/<\/includes>/p' "src/etc/poms/${task}/pom.xml" \ + | grep org \ + | sed -e 's:.*<include>\(.*\)</include>:\1:' || die + )) + local sourcefile + # Resolve wildcards in file names using find and copy the files to the corresponding + # "${task}"/src/main directory + # echo "${INCLUDES[@]}" + for sourcefile in "${INCLUDES[@]}"; do + # einfo "${task}: ${sourcefile}" + # Parameter substitution % to remove trailing slash from ${sourcefile}. + # Applies to ant-jdepend and ant-junitlauncher where find would otherwise fail. + find \ + -path "./src/*/${sourcefile%/}" \ + -exec cp -r --parents "{}" \ + "${task}/src/main" \; + done + # tree "${task}" + done + + # JAVA_RESOURCE_DIRS for ant-junit + mkdir -p ant-junit/src/resources/org/apache/tools/ant/taskdefs/optional/junit/xsl \ + || die "junit resource dir" + cp src/etc/{junit-frames,junit-noframes,junit-frames-saxon,junit-noframes-saxon}.xsl \ + ant-junit/src/resources/org/apache/tools/ant/taskdefs/optional/junit/xsl \ + || die "junit resources" +} + +src_compile() { + einfo "Compiling ant-launcher.jar" + JAVA_JAR_FILENAME="ant-launcher.jar" + JAVA_MAIN_CLASS="org.apache.tools.ant.launch.Launcher" + JAVA_SRC_DIR="ant-launcher/src/main" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":ant-launcher.jar" + rm -r target || die + + einfo "Compiling ant.jar" + JAVA_JAR_FILENAME="ant.jar" + JAVA_LAUNCHER_FILENAME="ant" + JAVA_MAIN_CLASS="org.apache.tools.ant.Main" + JAVA_RESOURCE_DIRS="ant/resources" + JAVA_SRC_DIR="ant" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":ant.jar" + rm -r target || die + + local task + for task in "${ANT_TASKS[@]}"; do + einfo "Compiling ${task}" + JAVA_JAR_FILENAME="${task}.jar" + JAVA_MAIN_CLASS="" + JAVA_RESOURCE_DIRS="" + JAVA_SRC_DIR="" + + JAVA_SRC_DIR="${task}/src/main" + taskdeps ant-apache-bcel bcel + taskdeps ant-apache-bsf bsf-2.3 + taskdeps ant-apache-log4j log4j-12-api-2 + taskdeps ant-apache-oro jakarta-oro-2.0 + taskdeps ant-apache-regexp jakarta-regexp-1.4 + taskdeps ant-apache-resolver xml-commons-resolver + taskdeps ant-apache-xalan2 xalan + taskdeps ant-commons-logging commons-logging + taskdeps ant-commons-net commons-net + taskdeps ant-jai sun-jai-bin + taskdeps ant-jakartamail jakarta-mail + taskdeps ant-javamail 'javax-mail jakarta-activation-api-1' + taskdeps ant-jdepend jdepend + taskdeps ant-jsch jsch + taskdeps ant-junit junit-4 ant-junit/src/resources + taskdeps ant-junit4 junit-4 + taskdeps ant-junitlauncher junit-5 + # $(use netrexx && echo ant-netrexx) + taskdeps ant-xz xz-java + + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":${task}.jar" + rm -fr target || die + done + use doc && ejavadoc +} + +src_test() { + # Avoid "--with-dependencies" as used by JAVA_TEST_GENTOO_CLASSPATH. + # dev-java/antunit has a circular dependency with dev-java/ant[test] + JAVA_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only antunit)" + # according to line 115 src/etc/poms/ant/pom.xml + jar -cvf src/etc/testcases/org/apache/tools/ant/taskdefs/test2-antlib.jar \ + -C src/etc/testcases taskdefs/test.antlib.xml || die "cannot test2-antlib.jar" + + JAVA_TEST_EXCLUDES=( + # according to lines 1956-1964 build.xml (abstract classes, not testcases) + org.apache.tools.ant.taskdefs.TaskdefsTest + org.apache.tools.ant.BuildFileTest + org.apache.tools.ant.util.regexp.RegexpMatcherTest + org.apache.tools.ant.util.regexp.RegexpTest + org.apache.tools.ant.types.selectors.BaseSelectorTest + # according to line 1970 build.xml (helper classes, not testcases) + org.apache.tools.ant.TestHelper + # lines 2097-2102 build.xml (interactive tests) + org.apache.tools.ant.taskdefs.TestProcess # 1. No runnable methods + # 1) testAll(org.apache.tools.ant.taskdefs.InitializeClassTest) + # /var/tmp/portage/dev-java/ant-1.10.14/work/apache-ant-1.10.14/ + # src/etc/testcases/taskdefs/initializeclass.xml:24: Java returned: 1 + # <pathelement path="${build.tests.value}"/> + # <pathelement location="${java.home}/lib/classes.zip"/> + org.apache.tools.ant.taskdefs.InitializeClassTest # Tests run: 1, Failures: 1 + ) + +# tests with patches to be revisited +# JAVA_TEST_RUN_ONLY=( +# org.apache.tools.ant.taskdefs.AntlibTest # Tests run: 6, Failures: 1 test2-antlib.jar? +# org.apache.tools.ant.taskdefs.AntTest # Tests run: 32, Failures: 1 +# org.apache.tools.ant.taskdefs.JavaTest # Tests run: 38, Failures: 12 +# org.apache.tools.ant.taskdefs.modules.LinkTest # Tests run: 67, Failures: 4 +# org.apache.tools.ant.types.PathTest # Tests run: 33, Failures: 1 +# ) + + # according to lines 276-297 src/etc/poms/ant/pom.xml + JAVA_TEST_EXTRA_ARGS=( + -Dant.home="${ANT_HOME}" + -Dbuild.classes.value=../../../target/test-classes # needed for org.apache.tools.ant.taskdefs.SignJarTest + -Dbuild.tests.value=target/test-classes + -Doffline=true + -Dant.test.basedir.ignore=true + ) + java-pkg-simple_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}" + done + + dobin src/script/ant + + dodir /usr/share/ant/bin + for each in antRun antRun.pl runant.pl runant.py ; do + dobin "${S}/src/script/${each}" + done + + insinto /usr/share/ant/etc + doins -r src/etc/*.xsl + insinto /usr/share/ant/etc/checkstyle + doins -r src/etc/checkstyle/*.xsl + + echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant" + doenvd "${T}/20ant" + + einstalldocs + if use doc; then + java-pkg_dojavadoc target/api + docinto html + dodoc -r manual + fi + + use source && java-pkg_dosrc src/main/* +} diff --git a/dev-java/ant/ant-1.10.9.ebuild b/dev-java/ant/ant-1.10.9.ebuild deleted file mode 100644 index e68c9948a493..000000000000 --- a/dev-java/ant/ant-1.10.9.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files" -HOMEPAGE="https://ant.apache.org/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf - +jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz" - -DEPEND="~dev-java/ant-core-${PV}" - -RDEPEND="${DEPEND} - ~dev-java/ant-core-${PV} - ~dev-java/ant-junit-${PV} - ~dev-java/ant-apache-xalan2-${PV} - antlr? ( ~dev-java/ant-antlr-${PV} ) - bcel? ( ~dev-java/ant-apache-bcel-${PV} ) - bsf? ( ~dev-java/ant-apache-bsf-${PV} ) - commonslogging? ( ~dev-java/ant-commons-logging-${PV} ) - commonsnet? ( ~dev-java/ant-commons-net-${PV} ) - jai? ( ~dev-java/ant-jai-${PV} ) - javamail? ( ~dev-java/ant-javamail-${PV} ) - jdepend? ( ~dev-java/ant-jdepend-${PV} ) - jmf? ( ~dev-java/ant-jmf-${PV} ) - jsch? ( ~dev-java/ant-jsch-${PV} ) - junit? ( ~dev-java/ant-junit-${PV} ) - junit4? ( ~dev-java/ant-junit4-${PV} ) - junitlauncher? ( ~dev-java/ant-junitlauncher-${PV} ) - log4j? ( ~dev-java/ant-apache-log4j-${PV} ) - oro? ( ~dev-java/ant-apache-oro-${PV} ) - regexp? ( ~dev-java/ant-apache-regexp-${PV} ) - resolver? ( ~dev-java/ant-apache-resolver-${PV} ) - swing? ( ~dev-java/ant-swing-${PV} ) - testutil? ( ~dev-java/ant-testutil-${PV} ) - X? ( ~dev-java/ant-swing-${PV} ) - xz? ( ~dev-java/ant-xz-${PV} ) -" - -S="${WORKDIR}" - -src_compile() { :; } diff --git a/dev-java/ant/files/1.10.9-launch.patch b/dev-java/ant/files/1.10.9-launch.patch new file mode 100644 index 000000000000..7babe6740fa9 --- /dev/null +++ b/dev-java/ant/files/1.10.9-launch.patch @@ -0,0 +1,361 @@ +diff --git a/src/script/ant b/src/script/ant +index 81107b5..a501081 100644 +--- a/src/script/ant ++++ b/src/script/ant +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#!@GENTOO_PORTAGE_EPREFIX@/bin/bash + + # Licensed to the Apache Software Foundation (ASF) under one or more + # contributor license agreements. See the NOTICE file distributed with +@@ -15,6 +15,10 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + ++# Edited for Gentoo Linux ++ ++EPREFIX="@GENTOO_PORTAGE_EPREFIX@" ++ + # Extract launch and ant arguments, (see details below). + ant_exec_args= + no_config=false +@@ -83,9 +87,9 @@ if $no_config; then + usejikes=$use_jikes_default + else + # load system-wide ant configuration (ONLY if ANT_HOME has NOT been set) +- if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then +- if [ -f "/etc/ant.conf" ]; then +- . /etc/ant.conf ++ if [ -z "$ANT_HOME" -o "$ANT_HOME" = "${EPREFIX}/usr/share/ant" ]; then ++ if [ -f "${EPREFIX}/etc/ant.conf" ]; then ++ . "${EPREFIX}"/etc/ant.conf + fi + fi + +@@ -106,69 +110,23 @@ else + fi + fi + +-# Setup Java environment in rpm mode +-if $rpm_mode; then +- if [ -f /usr/share/java-utils/java-functions ]; then +- . /usr/share/java-utils/java-functions +- set_jvm +- set_javacmd +- fi +-fi +- +-# OS specific support. $var _must_ be set to either true or false. +-cygwin=false; +-darwin=false; +-mingw=false; +-case "`uname`" in +- CYGWIN*) +- cygwin=true +- ;; +- Darwin*) +- darwin=true +- if [ -z "$JAVA_HOME" ]; then +- if [ -x '/usr/libexec/java_home' ]; then +- JAVA_HOME=`/usr/libexec/java_home` +- elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then +- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home +- fi +- fi +- ;; +- MINGW*) +- mingw=true +- ;; +-esac +- +-if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ]; then +- ## resolve links - $0 may be a link to ant's home +- PRG="$0" +- progname=`basename "$0"` +- +- # need this for relative symlinks +- while [ -h "$PRG" ]; do +- ls=`ls -ld "$PRG"` +- link=`expr "$ls" : '.*-> \(.*\)$'` +- if expr "$link" : '/.*' > /dev/null; then +- PRG="$link" +- else +- PRG=`dirname "$PRG"`"/$link" +- fi +- done +- +- ANT_HOME=`dirname "$PRG"`/.. ++export WANT_JAVA_CONFIG=2 + +- # make it fully qualified +- ANT_HOME=`cd "$ANT_HOME" > /dev/null && pwd` ++# Always get JAVA_HOME from java-config, unless ANT_RESPECT_JAVA_HOME is set ++# Use GENTOO_VM to change which VM is used instead. ++if [[ -z "${ANT_RESPECT_JAVA_HOME}" || -z "${JAVA_HOME}" ]]; then ++ export JAVA_HOME="$(java-config -g JAVA_HOME)" + fi + +-# For Cygwin and Mingw, ensure paths are in UNIX format before +-# anything is touched +-if $cygwin; then +- [ -n "$ANT_HOME" ] && ANT_HOME=`cygpath --unix "$ANT_HOME"` +- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` ++if [ -z $JAVA_HOME ] ; then ++ echo 'Error: No JDK found!' ++ echo "Try using java-config script to set your JDK" ++ echo "Remember that you need a JDK not a JRE" ++ exit 1 + fi +-if $mingw; then +- [ -n "$ANT_HOME" ] && ANT_HOME="`(cd "$ANT_HOME"; pwd)`" +- [ -n "$JAVA_HOME" ] && JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" ++ ++if [[ -z "${ANT_HOME}" ]] ; then ++ ANT_HOME="${EPREFIX}"/usr/share/ant + fi + + # set ANT_LIB location +@@ -176,14 +134,7 @@ ANT_LIB="${ANT_HOME}/lib" + + if [ -z "$JAVACMD" ]; then + if [ -n "$JAVA_HOME" ]; then +- # IBM's JDK on AIX uses strange locations for the executables +- if [ -x "$JAVA_HOME/jre/sh/java" ]; then +- JAVACMD="$JAVA_HOME/jre/sh/java" +- elif [ -x "$JAVA_HOME/jre/bin/java" ]; then +- JAVACMD="$JAVA_HOME/jre/bin/java" +- else + JAVACMD="$JAVA_HOME/bin/java" +- fi + else + JAVACMD=`which java 2> /dev/null ` + if [ -z "$JAVACMD" ]; then +@@ -200,88 +151,61 @@ if [ ! -x "$JAVACMD" ]; then + exit 1 + fi + +-# Build local classpath using just the launcher in non-rpm mode or +-# use the Jpackage helper in rpm mode with basic and default jars +-# specified in the ant.conf configuration. Because the launcher is +-# used, libraries linked in ANT_HOME/lib will also be included, but this +-# is discouraged as it is not java-version safe. A user should +-# request optional jars and their dependencies via the OPT_JAR_LIST +-# variable +-if $rpm_mode && [ -x /usr/bin/build-classpath ]; then +- LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)" +- +- # If no optional jars have been specified then build the default list +- if [ -z "$OPT_JAR_LIST" ]; then +- for file in /etc/ant.d/*; do +- if [ -f "$file" ]; then +- case "$file" in +- *~|*#*|*.rpmsave|*.rpmnew) +- ;; +- *) +- for dep in `cat "$file"`; do +- OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep" +- done +- ;; +- esac +- fi +- done +- fi +- +- # If the user requested to try to add some other jars to the classpath +- if [ -n "$OPT_JAR_LIST" ]; then +- _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)" +- if [ -n "$_OPTCLASSPATH" ]; then +- LOCALCLASSPATH="$LOCALCLASSPATH:$_OPTCLASSPATH" +- fi +- fi +- +- # Explicitly add javac path to classpath, assume JAVA_HOME set +- # properly in rpm mode +- if [ -f "$JAVA_HOME/lib/tools.jar" ]; then +- LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar" +- fi +- if [ -f "$JAVA_HOME/lib/classes.zip" ]; then +- LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip" +- fi ++if [ -z "$LOCALCLASSPATH" ] ; then ++ LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar ++else ++ LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH ++fi ++ ++# if ANT_TASKS is not set, default to "all" ++ANT_TASKS="${ANT_TASKS:-all}" ++ ++# if ANT_TASKS is set to "all", get the tasks list from /usr/share/ant/tasks/ ++if [[ "${ANT_TASKS}" == "all" ]]; then ++ ANT_TASKS="" ++ # but only if it exists ++ if [[ -d "${EPREFIX}"/usr/share/ant/tasks ]]; then ++ ANT_TASKS="${ANT_TASKS} ${EPREFIX}"/usr/share/ant/tasks/* ++ fi ++ if [[ -d "${EPREFIX}"/usr/share/ant/tasks-1.8.2 ]]; then ++ ANT_TASKS="${ANT_TASKS} ${EPREFIX}"/usr/share/ant/tasks-1.8.2/* ++ fi ++# if set to "none", make ANT_TASKS empty list ++elif [[ "${ANT_TASKS}" == "none" ]]; then ++ ANT_TASKS="" ++fi ++# otherwise ANT_TASKS defines explicit task list ++ ++# construct the tasks list separated with commas to pass to java-config ++TASKS_LIST="" ++for task in $ANT_TASKS; do ++ TASKS_LIST="${TASKS_LIST},$(basename $task)" ++done ++TASKS_LIST=${TASKS_LIST#,} + +- # if CLASSPATH_OVERRIDE env var is set, LOCALCLASSPATH will be +- # user CLASSPATH first and ant-found jars after. +- # In that case, the user CLASSPATH will override ant-found jars +- # +- # if CLASSPATH_OVERRIDE is not set, we'll have the normal behaviour +- # with ant-found jars first and user CLASSPATH after +- if [ -n "$CLASSPATH" ]; then +- # merge local and specified classpath +- if [ -z "$LOCALCLASSPATH" ]; then +- LOCALCLASSPATH="$CLASSPATH" +- elif [ -n "$CLASSPATH_OVERRIDE" ]; then +- LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH" +- else +- LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH" +- fi ++# get the classpath for optional tasks and their dependency .jar files ++if [[ -n "${TASKS_LIST}" ]] ; then ++ ANT_TASKS_CLASSPATH="-lib \"$(java-config -dp ${TASKS_LIST})\"" ++ ANT_TASKS_LIBPATH="-Djava.library.path=\"$(java-config -di ${TASKS_LIST})\"" ++else ++ ANT_TASKS_CLASSPATH="" ++ ANT_TASKS_LIBPATH="" ++fi + +- # remove class path from launcher -cp option +- CLASSPATH="" +- fi ++# determine where to get tools.jar from ++if [[ -n "${ANT_RESPECT_JAVA_HOME}" ]]; then ++ TOOLS_JAR="${JAVA_HOME}/lib/tools.jar" + else +- # not using rpm_mode; use launcher to determine classpaths +- if [ -z "$LOCALCLASSPATH" ]; then +- LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar +- else +- LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH +- fi ++ TOOLS_JAR="$(java-config --tools)" + fi + +-if [ -n "$JAVA_HOME" ]; then +- # OSX hack to make Ant work with jikes +- if $darwin; then +- OSXHACK="${JAVA_HOME}/../Classes" +- if [ -d "${OSXHACK}" ]; then +- for i in "${OSXHACK}"/*.jar; do +- JIKESPATH="$JIKESPATH:$i" +- done +- fi +- fi ++if [[ -n "${TOOLS_JAR}" ]] ; then ++ LOCALCLASSPATH="$LOCALCLASSPATH:${TOOLS_JAR}" ++elif [[ $(java-config -f) != apple-jdk-bin* ]] ; then ++ echo "Warning: Unable to determine tools.jar location." ++ echo " If build fails because sun.* classes could not be found," ++ echo " Make sure you are using a JDK, not JRE as your user/system VM." ++ echo " and that you have java-config version 2.0.30 or above installed." + fi + + # Allow Jikes support (off by default) +@@ -289,29 +213,6 @@ if $usejikes; then + ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes" + fi + +-# For Cygwin, switch paths to appropriate format before running java +-# For PATHs convert to unix format first, then to windows format to ensure +-# both formats are supported. Probably this will fail on directories with ; +-# in the name in the path. Let's assume that paths containing ; are more +-# rare than windows style paths on cygwin. +-if $cygwin; then +- if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null; then +- format=mixed +- else +- format=windows +- fi +- [ -n "$ANT_HOME" ] && ANT_HOME=`cygpath --$format "$ANT_HOME"` +- ANT_LIB=`cygpath --$format "$ANT_LIB"` +- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --$format "$JAVA_HOME"` +- LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"` +- LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"` +- if [ -n "$CLASSPATH" ]; then +- CP_TEMP=`cygpath --path --unix "$CLASSPATH"` +- CLASSPATH=`cygpath --path --$format "$CP_TEMP"` +- fi +- CYGHOME=`cygpath --$format "$HOME"` +-fi +- + # Show script help if requested + if $show_help; then + echo $0 '[script options] [options] [target [target2 [target3] ..]]' +@@ -326,49 +227,20 @@ if $show_help; then + echo ' launch script' + echo '' + fi +-# add a second backslash to variables terminated by a backslash under cygwin +-if $cygwin; then +- case "$ANT_HOME" in +- *\\ ) +- ANT_HOME="$ANT_HOME\\" +- ;; +- esac +- case "$CYGHOME" in +- *\\ ) +- CYGHOME="$CYGHOME\\" +- ;; +- esac +- case "$JIKESPATH" in +- *\\ ) +- JIKESPATH="$JIKESPATH\\" +- ;; +- esac +- case "$LOCALCLASSPATH" in +- *\\ ) +- LOCALCLASSPATH="$LOCALCLASSPATH\\" +- ;; +- esac +- case "$CLASSPATH" in +- *\\ ) +- CLASSPATH="$CLASSPATH\\" +- ;; +- esac +-fi ++ + # Execute ant using eval/exec to preserve spaces in paths, + # java options, and ant args + ant_sys_opts= +-if [ -n "$CYGHOME" ]; then +- if [ -n "$JIKESPATH" ]; then +- ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\" -Dcygwin.user.home=\"$CYGHOME\"" +- else +- ant_sys_opts="-Dcygwin.user.home=\"$CYGHOME\"" +- fi +-else +- if [ -n "$JIKESPATH" ]; then +- ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\"" +- fi ++ ++if [ -n "$JIKESPATH" ]; then ++ ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\"" + fi +-ant_exec_command="exec \"\$JAVACMD\" $ANT_OPTS -classpath \"\$LOCALCLASSPATH\" -Dant.home=\"\$ANT_HOME\" -Dant.library.dir=\"\$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"\$CLASSPATH\"" ++ ++ant_exec_command="exec \"${JAVACMD}\" ${ANT_OPTS} -classpath \"${LOCALCLASSPATH}\" \ ++ -Dant.home=\"${ANT_HOME}\" -Dant.library.dir=\"${ANT_LIB}\" ${ant_sys_opts} \ ++ ${ANT_TASKS_LIBPATH} org.apache.tools.ant.launch.Launcher \ ++ ${ANT_TASKS_CLASSPATH} ${ANT_ARGS} -cp \"${CLASSPATH}\"" ++ + if $ant_exec_debug; then + # using printf to avoid echo line continuation and escape interpretation confusion + printf "%s\n" "$ant_exec_command $ant_exec_args" diff --git a/dev-java/ant/files/ant-1.10.14-AntTest.patch b/dev-java/ant/files/ant-1.10.14-AntTest.patch new file mode 100644 index 000000000000..2e2e7fe38d96 --- /dev/null +++ b/dev-java/ant/files/ant-1.10.14-AntTest.patch @@ -0,0 +1,28 @@ +There was 1 failure: +1) testAntCoreLib(org.apache.tools.ant.taskdefs.AntTest) +java.lang.AssertionError: found ant.core.lib in: /var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/target/test-classes + at org.junit.Assert.fail(Assert.java:89) + at org.junit.Assert.assertTrue(Assert.java:42) + at org.apache.tools.ant.taskdefs.AntTest.testAntCoreLib(AntTest.java:377) + +FAILURES!!! +Tests run: 32, Failures: 1 +--- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java ++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java +@@ -33,6 +33,7 @@ import org.junit.After; + import org.junit.Before; + import org.junit.Rule; + import org.junit.Test; ++import org.junit.Ignore; + + import static org.hamcrest.Matchers.containsString; + import static org.junit.Assert.assertEquals; +@@ -369,7 +370,7 @@ public class AntTest { + assertEquals("dadctb", buildRule.getLog()); + } + +- @Test ++ @Test @Ignore + public void testAntCoreLib() { + // Cf. #42263 + buildRule.executeTarget("sub-show-ant.core.lib"); diff --git a/dev-java/ant/files/ant-1.10.14-AntlibTest.patch b/dev-java/ant/files/ant-1.10.14-AntlibTest.patch new file mode 100644 index 000000000000..d45925272beb --- /dev/null +++ b/dev-java/ant/files/ant-1.10.14-AntlibTest.patch @@ -0,0 +1,40 @@ +There was 1 failure: +1) testAntlibResource(org.apache.tools.ant.taskdefs.AntlibTest) +/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/antlib.xml:43: Problem: failed to create task or type mytask2 +Cause: The name is undefined. +Action: Check the spelling. +Action: Check that any custom tasks/types have been declared. +Action: Check that any <presetdef>/<macrodef> declarations have taken place. + + at org.apache.tools.ant.UnknownElement.getNotFoundException(UnknownElement.java:506) + at org.apache.tools.ant.UnknownElement.makeObject(UnknownElement.java:438) + at org.apache.tools.ant.UnknownElement.maybeConfigure(UnknownElement.java:166) + at org.apache.tools.ant.Task.perform(Task.java:349) + at org.apache.tools.ant.Target.execute(Target.java:449) + at org.apache.tools.ant.Target.performTasks(Target.java:470) + at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401) + at org.apache.tools.ant.Project.executeTarget(Project.java:1374) + at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197) + at org.apache.tools.ant.taskdefs.AntlibTest.testAntlibResource(AntlibTest.java:67) + +FAILURES!!! +Tests run: 6, Failures: 1 +--- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntlibTest.java ++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntlibTest.java +@@ -24,6 +24,7 @@ import org.apache.tools.ant.Task; + import org.junit.Before; + import org.junit.Rule; + import org.junit.Test; ++import org.junit.Ignore; + + import static org.junit.Assert.assertEquals; + import static org.junit.Assert.assertNotNull; +@@ -61,7 +62,7 @@ public class AntlibTest { + * can collect several antlibs in one Definer call. + * @see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=24024">bug 24024</a> + */ +- @Test ++ @Test @Ignore + public void testAntlibResource() { + assertNotNull("build.tests.value not set", System.getProperty("build.tests.value")); + buildRule.executeTarget("antlib.resource"); diff --git a/dev-java/ant/files/ant-1.10.14-JavaTest.patch b/dev-java/ant/files/ant-1.10.14-JavaTest.patch new file mode 100644 index 000000000000..9143cba43ca2 --- /dev/null +++ b/dev-java/ant/files/ant-1.10.14-JavaTest.patch @@ -0,0 +1,102 @@ +bug #922775 +--- a/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java ++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java +@@ -42,6 +42,7 @@ import org.junit.AssumptionViolatedException; + import org.junit.Before; + import org.junit.Rule; + import org.junit.Test; ++import org.junit.Ignore; + import org.junit.rules.ExpectedException; + + import static org.hamcrest.Matchers.containsString; +@@ -241,7 +242,7 @@ public class JavaTest { + buildRule.executeTarget("testRunFailFoeFork"); + } + +- @Test ++ @Test @Ignore + public void testExcepting() { + buildRule.executeTarget("testExcepting"); + assertThat(buildRule.getLog(), containsString("Exception raised inside called program")); +@@ -253,7 +254,7 @@ public class JavaTest { + assertThat(buildRule.getLog(), containsString("Java Result:")); + } + +- @Test ++ @Test @Ignore + public void testExceptingFoe() { + thrown.expect(BuildException.class); + thrown.expectMessage("Exception raised inside called program"); +@@ -267,13 +268,13 @@ public class JavaTest { + buildRule.executeTarget("testExceptingFoeFork"); + } + +- @Test ++ @Test @Ignore + public void testResultPropertyZero() { + buildRule.executeTarget("testResultPropertyZero"); + assertEquals("0", buildRule.getProject().getProperty("exitcode")); + } + +- @Test ++ @Test @Ignore + public void testResultPropertyNonZero() { + buildRule.executeTarget("testResultPropertyNonZero"); + assertEquals("2", buildRule.getProject().getProperty("exitcode")); +@@ -301,12 +302,12 @@ public class JavaTest { + buildRule.executeTarget("testRunFailWithFailOnError"); + } + +- @Test ++ @Test @Ignore + public void testRunSuccessWithFailOnError() { + buildRule.executeTarget("testRunSuccessWithFailOnError"); + } + +- @Test ++ @Test @Ignore + public void testSpawn() throws InterruptedException { + File logFile = FILE_UTILS.createTempFile("spawn", "log", + new File(buildRule.getProject().getProperty("output")), false, false); +@@ -326,27 +327,27 @@ public class JavaTest { + assertTrue("log file exists", logFile.exists()); + } + +- @Test ++ @Test @Ignore + public void testRedirect1() { + buildRule.executeTarget("redirect1"); + } + +- @Test ++ @Test @Ignore + public void testRedirect2() { + buildRule.executeTarget("redirect2"); + } + +- @Test ++ @Test @Ignore + public void testRedirect3() { + buildRule.executeTarget("redirect3"); + } + +- @Test ++ @Test @Ignore + public void testRedirector1() { + buildRule.executeTarget("redirector1"); + } + +- @Test ++ @Test @Ignore + public void testRedirector2() { + buildRule.executeTarget("redirector2"); + } +@@ -397,7 +398,7 @@ public class JavaTest { + assertEquals("foo", buildRule.getProject().getProperty("input.value")); + } + +- @Test ++ @Test @Ignore + public void testFlushedInput() throws Exception { + final PipedOutputStream out = new PipedOutputStream(); + final PipedInputStream in = new PipedInputStream(out); diff --git a/dev-java/ant/files/ant-1.10.14-LinkTest.patch b/dev-java/ant/files/ant-1.10.14-LinkTest.patch new file mode 100644 index 000000000000..23075707fb9b --- /dev/null +++ b/dev-java/ant/files/ant-1.10.14-LinkTest.patch @@ -0,0 +1,87 @@ +There were 4 failures: +1) testLocalesInAttributeAndNested(org.apache.tools.ant.taskdefs.modules.LinkTest) +java.lang.AssertionError: Verifying that image has access to locales specified during linking. expected:<0> but was:<1> + at org.junit.Assert.fail(Assert.java:89) + at org.junit.Assert.failNotEquals(Assert.java:835) + at org.junit.Assert.assertEquals(Assert.java:647) + at org.apache.tools.ant.taskdefs.modules.LinkTest.verifyLocales(LinkTest.java:289) + at org.apache.tools.ant.taskdefs.modules.LinkTest.testLocalesInAttributeAndNested(LinkTest.java:330) +2) testLocales(org.apache.tools.ant.taskdefs.modules.LinkTest) +java.lang.AssertionError: Verifying that image has access to locales specified during linking. expected:<0> but was:<1> + at org.junit.Assert.fail(Assert.java:89) + at org.junit.Assert.failNotEquals(Assert.java:835) + at org.junit.Assert.assertEquals(Assert.java:647) + at org.apache.tools.ant.taskdefs.modules.LinkTest.verifyLocales(LinkTest.java:289) + at org.apache.tools.ant.taskdefs.modules.LinkTest.testLocales(LinkTest.java:306) +3) testNestedLocales(org.apache.tools.ant.taskdefs.modules.LinkTest) +java.lang.AssertionError: Verifying that image has access to locales specified during linking. expected:<0> but was:<1> + at org.junit.Assert.fail(Assert.java:89) + at org.junit.Assert.failNotEquals(Assert.java:835) + at org.junit.Assert.assertEquals(Assert.java:647) + at org.apache.tools.ant.taskdefs.modules.LinkTest.verifyLocales(LinkTest.java:289) + at org.apache.tools.ant.taskdefs.modules.LinkTest.testNestedLocales(LinkTest.java:315) +4) testIgnoreSigning(org.apache.tools.ant.taskdefs.modules.LinkTest) +/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/link.xml:1119: exec returned: 1 + at org.apache.tools.ant.taskdefs.ExecTask.runExecute(ExecTask.java:675) + at org.apache.tools.ant.taskdefs.ExecTask.runExec(ExecTask.java:699) + at org.apache.tools.ant.taskdefs.ExecTask.execute(ExecTask.java:527) + at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299) + at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99) + at org.apache.tools.ant.Task.perform(Task.java:350) + at org.apache.tools.ant.Target.execute(Target.java:449) + at org.apache.tools.ant.Target.performTasks(Target.java:470) + at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401) + at org.apache.tools.ant.Project.executeTarget(Project.java:1374) + at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197) + at org.apache.tools.ant.taskdefs.modules.LinkTest.testIgnoreSigning(LinkTest.java:901) + +FAILURES!!! +Tests run: 67, Failures: 4 +--- a/src/tests/junit/org/apache/tools/ant/taskdefs/modules/LinkTest.java ++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/modules/LinkTest.java +@@ -46,6 +46,7 @@ import org.junit.Assume; + import org.junit.Before; + import org.junit.Rule; + import org.junit.Test; ++import org.junit.Ignore; + import org.junit.rules.ExpectedException; + + import org.apache.tools.ant.BuildException; +@@ -297,7 +298,7 @@ public class LinkTest { + + "not specified during linking.", 0, exitCode); + } + +- @Test ++ @Test @Ignore + public void testLocales() + throws IOException, + InterruptedException { +@@ -306,7 +307,7 @@ public class LinkTest { + verifyLocales(); + } + +- @Test ++ @Test @Ignore + public void testNestedLocales() + throws IOException, + InterruptedException { +@@ -321,7 +322,7 @@ public class LinkTest { + buildRule.executeTarget("locales-nested-missing-name"); + } + +- @Test ++ @Test @Ignore + public void testLocalesInAttributeAndNested() + throws IOException, + InterruptedException { +@@ -896,7 +897,7 @@ public class LinkTest { + 1, nonLinkCount); + } + +- @Test ++ @Test @Ignore + public void testIgnoreSigning() { + buildRule.executeTarget("ignoresigning"); + verifyImageBuiltNormally(); diff --git a/dev-java/ant/files/ant-1.10.14-PathTest.patch b/dev-java/ant/files/ant-1.10.14-PathTest.patch new file mode 100644 index 000000000000..022377ecc4d7 --- /dev/null +++ b/dev-java/ant/files/ant-1.10.14-PathTest.patch @@ -0,0 +1,30 @@ +There was 1 failure: +1) testDirSet(org.apache.tools.ant.types.PathTest) +java.lang.AssertionError: expected:<1> but was:<0> + at org.junit.Assert.fail(Assert.java:89) + at org.junit.Assert.failNotEquals(Assert.java:835) + at org.junit.Assert.assertEquals(Assert.java:647) + at org.junit.Assert.assertEquals(Assert.java:633) + at org.apache.tools.ant.types.PathTest.testDirSet(PathTest.java:585) + +FAILURES!!! +Tests run: 33, Failures: 1 +--- a/src/tests/junit/org/apache/tools/ant/types/PathTest.java ++++ b/src/tests/junit/org/apache/tools/ant/types/PathTest.java +@@ -29,6 +29,7 @@ import org.apache.tools.ant.taskdefs.condition.Os; + import org.junit.Before; + import org.junit.Rule; + import org.junit.Test; ++import org.junit.Ignore; + import org.junit.rules.ExpectedException; + + import static org.hamcrest.Matchers.endsWith; +@@ -570,7 +571,7 @@ public class PathTest { + assertEquals(project.resolveFile("build.xml").getAbsolutePath(), l[0]); + } + +- @Test ++ @Test @Ignore + public void testDirSet() { + DirSet d = new DirSet(); + d.setProject(project); diff --git a/dev-java/ant/metadata.xml b/dev-java/ant/metadata.xml index 219a679d237b..1c03ec86e251 100644 --- a/dev-java/ant/metadata.xml +++ b/dev-java/ant/metadata.xml @@ -12,7 +12,9 @@ (<pkg>dev-java/bsf</pkg>)</flag> <flag name="commonslogging">Enable commons-logging Ant tasks</flag> <flag name="commonsnet">Enable commons-net Ant tasks</flag> + <flag name="imageio">Enable imageio Ant tasks</flag> <flag name="jai">Enable JAI (Java Imaging) Ant task</flag> + <flag name="jakartamail">Enable Jakartamail Ant task</flag> <flag name="javamail">Enable JavaMail Ant task</flag> <flag name="jdepend">Enable Jdepend Ant tasks</flag> <flag name="jmf">Enable JMF (Java Media Framework) Ant tasks</flag> @@ -26,6 +28,12 @@ <flag name="resolver">Enable Apache Resolver Ant tasks</flag> <flag name="swing">Enable Swing Ant tasks</flag> <flag name="testutil">Enable optional test util classes</flag> + <flag name="xalan">Enable Apache Xalan2 Ant tasks</flag> <flag name="xz">Enable XZ Ant tasks</flag> </use> + <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/antlr-tool/antlr-tool-3.5.3.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild index 0d99b11e44be..1997ce8c081f 100644 --- a/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild +++ b/dev-java/antlr-tool/antlr-tool-3.5.3-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 @@ -58,9 +58,11 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_SRC_DIR="${TARBALL_S}/tool/src/test/java" DOCS=( "${TARBALL_S}/tool/CHANGES.txt" ) +PATCHES=( "${FILESDIR}/antlr-tool-3.5.3-java21.patch" ) src_prepare() { java-pkg_clean + default #780585 java-pkg-2_src_prepare # Some tests fail under Java 8 in ways that probably aren't limited diff --git a/dev-java/antlr-tool/antlr-tool-4.9.3.ebuild b/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild index 3461968d2cae..2891b009c53f 100644 --- a/dev-java/antlr-tool/antlr-tool-4.9.3.ebuild +++ b/dev-java/antlr-tool/antlr-tool-4.9.3-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 @@ -32,7 +32,7 @@ CP_DEPEND=" ~dev-java/antlr-runtime-${PV}:${SLOT} dev-java/antlr-runtime:3.5 dev-java/jakarta-json-api:1 - dev-java/icu4j:70 + >=dev-java/icu4j-74.2-r1:0 dev-java/stringtemplate:4 dev-java/treelayout:0 " @@ -97,7 +97,7 @@ src_test() { antlr-runtime-${SLOT} antlr-runtime-3.5 jakarta-json-api-1 - icu4j-70 + icu4j stringtemplate-4 treelayout ) diff --git a/dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch b/dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch new file mode 100644 index 000000000000..2e196df96ef9 --- /dev/null +++ b/dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch @@ -0,0 +1,11 @@ +bug #919481 +--- a/org/antlr/codegen/templates/Java/ST.stg ++++ b/org/antlr/codegen/templates/Java/ST.stg +@@ -32,6 +32,7 @@ + @outputFile.imports() ::= << + <@super.imports()> + import org.antlr.stringtemplate.*; ++import org.antlr.stringtemplate.StringTemplate; + import org.antlr.stringtemplate.language.*; + import java.util.HashMap; + >> diff --git a/dev-java/antlr/antlr-3.2-r1.ebuild b/dev-java/antlr/antlr-3.2-r2.ebuild index bf4946c25c62..9b58f9bff97e 100644 --- a/dev-java/antlr/antlr-3.2-r1.ebuild +++ b/dev-java/antlr/antlr-3.2-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 test" @@ -11,19 +11,20 @@ DESCRIPTION="A parser generator for many languages" HOMEPAGE="https://www.antlr3.org/" SRC_URI="https://www.antlr3.org/download/${P}.tar.gz https://www.antlr3.org/download/${P}.jar" # Prebuilt version needed. +S="${WORKDIR}/${P}" LICENSE="BSD" SLOT="3" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RESTRICT="!test? ( test )" -CDEPEND=">=dev-java/antlr-2.7.7-r7:0 +CP_DEPEND=">=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0" -RDEPEND="${CDEPEND} +RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" -DEPEND="${CDEPEND} +DEPEND="${CP_DEPEND} >=virtual/jdk-1.8:* test? ( dev-java/junit:4 )" @@ -31,11 +32,10 @@ PATCHES=( # These fixes have been applied in 3.5. "${FILESDIR}/${PV}-test-fixes.patch" "${FILESDIR}/${PV}-java-8.patch" + "${FILESDIR}/antlr-3.2-java21.patch" ) -S="${WORKDIR}/${P}" JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar" -JAVA_GENTOO_CLASSPATH="antlr,stringtemplate" src_unpack() { unpack ${P}.tar.gz @@ -49,7 +49,8 @@ src_prepare() { # to the tests. This is bad but upstream is never going to update # 3.2 even though other projects still rely on it. If any issues # arise, we can only put pressure on those projects to upgrade. - if java-pkg_is-vm-version-ge 1.8; then + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge 1.8; then rm -v tool/src/test/java/org/antlr/test/Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die fi diff --git a/dev-java/antlr/files/antlr-3.2-java21.patch b/dev-java/antlr/files/antlr-3.2-java21.patch new file mode 100644 index 000000000000..8d885f9a5f11 --- /dev/null +++ b/dev-java/antlr/files/antlr-3.2-java21.patch @@ -0,0 +1,31 @@ +bug #919684 +--- a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java ++++ b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java +@@ -36,6 +36,7 @@ import org.antlr.Tool; + import org.antlr.analysis.*; + import org.antlr.misc.*; + import org.antlr.stringtemplate.*; ++import org.antlr.stringtemplate.StringTemplate; + import org.antlr.stringtemplate.language.AngleBracketTemplateLexer; + import org.antlr.tool.*; + +--- a/tool/src/main/antlr2/org/antlr/grammar/v2/codegen.g ++++ b/tool/src/main/antlr2/org/antlr/grammar/v2/codegen.g +@@ -32,6 +32,7 @@ header { + import org.antlr.misc.*; + import java.util.*; + import org.antlr.stringtemplate.*; ++ import org.antlr.stringtemplate.StringTemplate; + import antlr.TokenWithIndex; + import antlr.CommonToken; + import org.antlr.codegen.*; +--- a/tool/src/main/resources/org/antlr/codegen/templates/Java/ST.stg ++++ b/tool/src/main/resources/org/antlr/codegen/templates/Java/ST.stg +@@ -33,6 +33,7 @@ group ST; + @outputFile.imports() ::= << + <@super.imports()> + import org.antlr.stringtemplate.*; ++import org.antlr.stringtemplate.StringTemplate; + import org.antlr.stringtemplate.language.*; + import java.util.HashMap; + >> diff --git a/dev-java/antunit/Manifest b/dev-java/antunit/Manifest new file mode 100644 index 000000000000..765c72b8f4c9 --- /dev/null +++ b/dev-java/antunit/Manifest @@ -0,0 +1,2 @@ +DIST apache-ant-antunit-1.4.1-src.tar.bz2 125017 BLAKE2B 2c092d22eaf716c52bd6c6ce43d1e33c1f599621ee383303c97553f9dc2d0708cf58420338184f8877cd2b0fc053c9742b04cd869583db7b2fc2dedfb4a2dddd SHA512 7c59f0e918f5ec8edbf10bdbcdca1c9bd2ba2a7b27ade69aa4ca92c0c058c434be517799ce795309c0f1c00726a1c77650101b0d1cbe189db5379b15d29ad305 +DIST apache-ant-antunit-1.4.1-src.tar.bz2.asc 224 BLAKE2B c56e3d8005b1a39e42b85fad3c542aa4dd894d9e6cc61a8ea34bce33a8fb3f56d142cb77372fd4d664d46427365d24078b7429480f689245eb31d771c525f90e SHA512 3ad2cca4240e2714d7c435828b3a3d3cbe1e57647400237ce2a96a714d877605199ccf54a2266ff35081ed9f3e23ca46306b30293c1981e55ccbbc61591ad760 diff --git a/dev-java/antunit/antunit-1.4.1-r1.ebuild b/dev-java/antunit/antunit-1.4.1-r1.ebuild new file mode 100644 index 000000000000..5bdeed3d9cb0 --- /dev/null +++ b/dev-java/antunit/antunit-1.4.1-r1.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.apache.ant:ant-antunit:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="An Antlib that provides a test framework for Apache Ant tasks and types" +HOMEPAGE="https://ant.apache.org/antlibs/antunit/" +SRC_URI="mirror://apache/ant/antlibs/${PN}/source/apache-ant-${P}-src.tar.bz2 + verify-sig? ( https://downloads.apache.org/ant/antlibs/antunit/source/apache-ant-${P}-src.tar.bz2.asc )" +S="${WORKDIR}/apache-ant-${P}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ant.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-ant )" +# reset to ant-core:0 when ready +CP_DEPEND=" + >=dev-java/ant-1.10.14:0 + dev-java/junit:4 +" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + test? ( >=dev-java/ant-1.10.14:0[junit,testutil] ) +" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +DOCS=( NOTICE README WHATSNEW ) +HTML_DOCS=( README.html ) +PATCHES=( + # Some tests expect classes in "build" instead in "target" directory. + "${FILESDIR}/antunit-1.4.1-gentoo.patch" +) + +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR="src/main" +JAVA_TEST_GENTOO_CLASSPATH="ant" +JAVA_TEST_SRC_DIR="src/tests/junit" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS + mkdir -p "res/org/apache/ant/antunit" || die + cp {src/main,res}/org/apache/ant/antunit/antlib.xml || die +} diff --git a/dev-java/antunit/files/antunit-1.4.1-gentoo.patch b/dev-java/antunit/files/antunit-1.4.1-gentoo.patch new file mode 100644 index 000000000000..7aeccf662bc7 --- /dev/null +++ b/dev-java/antunit/files/antunit-1.4.1-gentoo.patch @@ -0,0 +1,62 @@ +--- a/src/etc/testcases/antunit/java-io.xml ++++ b/src/etc/testcases/antunit/java-io.xml +@@ -30,7 +30,7 @@ under the License. + <target name="testTaskHandlingOutput"> + <java classname="org.apache.ant.antunit.AntUnitTest$HelloWorld" + outputproperty="propertyToSet" +- classpath="build/test-classes" ++ classpath="target/test-classes" + failonerror="true" + /> + <au:assertEquals expected="HelloWorld" actual="${propertyToSet}" /> +--- a/src/etc/testcases/assert.xml ++++ b/src/etc/testcases/assert.xml +@@ -156,28 +156,28 @@ under the License. + <au:assertDestIsUptodate + src="../../main/org/apache/ant/antunit/AssertTask.java" + +- dest="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/> ++ dest="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/> + </target> + + <target name="assertDestIsUptodateFail"> + <au:assertDestIsUptodate + dest="../../main/org/apache/ant/antunit/AssertTask.java" + +- src="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/> ++ src="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/> + </target> + + <target name="assertDestIsOutofdatePass"> + <au:assertDestIsOutofdate + dest="../../main/org/apache/ant/antunit/AssertTask.java" + +- src="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/> ++ src="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/> + </target> + + <target name="assertDestIsOutofdateFail"> + <au:assertDestIsOutofdate + src="../../main/org/apache/ant/antunit/AssertTask.java" + +- dest="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/> ++ dest="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/> + </target> + + <target name="assertFilesMatchPass"> +--- a/src/tests/junit/org/apache/ant/antunit/AssertTest.java ++++ b/src/tests/junit/org/apache/ant/antunit/AssertTest.java +@@ -137,11 +137,11 @@ public class AssertTest extends BuildFileTest { + } + public void testDestIsUptodateFail() { + testFail("assertDestIsUptodateFail", +- "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../build/classes/org/apache/ant/antunit/AssertTask.class'"); ++ "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../target/classes/org/apache/ant/antunit/AssertTask.class'"); + } + public void testDestIsOutofdateFail() { + testFail("assertDestIsOutofdateFail", +- "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../build/classes/org/apache/ant/antunit/AssertTask.class'"); ++ "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../target/classes/org/apache/ant/antunit/AssertTask.class'"); + } + public void testFilesMatchFail() { + testFail("assertFilesMatchFail", diff --git a/dev-java/antunit/metadata.xml b/dev-java/antunit/metadata.xml new file mode 100644 index 000000000000..8c6f551aec20 --- /dev/null +++ b/dev-java/antunit/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">apache/ant-antlibs-antunit</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/apache-rat-core/Manifest b/dev-java/apache-rat-core/Manifest deleted file mode 100644 index bb5c63616d58..000000000000 --- a/dev-java/apache-rat-core/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST apache-rat-0.13-src.tar.bz2 197443 BLAKE2B 5880894bf48e62c97fefebe5672964a78016ba045ca6a13a9b100c1a15cf0a6933edc22c41cb3552f30ebea0486fd6b415f60902f0af7d96663611bfef1a1781 SHA512 564cb2b0f21c98ca5c10566417c0d2732cd177efb68607589e43bcf64eeedee7a570dbea7ef4d6237f6438ecb40d382cb96bd0d6f60c1d1ba1f76778f15ee26a diff --git a/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild b/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild deleted file mode 100644 index 5e26db26f1a7..000000000000 --- a/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom apache-rat-core/pom.xml --download-uri https://mirrors.nav.ro/apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2 --slot 0 --keywords "~amd64 ~x86" --ebuild apache-rat-core-0.13.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.rat:apache-rat-core:0.13" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="The core functionality, shared by the Ant tasks and the Maven plugin" -HOMEPAGE="https://creadur.apache.org/rat/apache-rat-core/" -SRC_URI="mirror://apache//creadur/apache-rat-${PV}/apache-rat-${PV}-src.tar.bz2" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" - -# Common dependencies -# POM: ${PN}/pom.xml -# commons-cli:commons-cli:1.3.1 -> >=dev-java/commons-cli-1.3.1:1 -# commons-collections:commons-collections:3.2.2 -> !!!suitble-mavenVersion-not-found!!! -# commons-io:commons-io:2.2 -> >=dev-java/commons-io-2.8.0:1 -# commons-lang:commons-lang:2.6 -> >=dev-java/commons-lang-2.6:2.1 -# org.apache.commons:commons-compress:1.11 -> >=dev-java/commons-compress-1.20:0 -# org.apache.rat:apache-rat-api:0.13 -> >=dev-java/apache-rat-api-0.13:0 - -CDEPEND=" - >=dev-java/commons-cli-1.3.1:1 - >=dev-java/commons-compress-1.20:0 - dev-java/commons-collections:0 - >=dev-java/commons-io-2.8.0:1 - dev-java/commons-lang:3.6 -" - -DEPEND=" - >=virtual/jdk-1.8:* - ${CDEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND}" - -S="${WORKDIR}/apache-rat-${PV}/${PN}" - -PATCHES=( - "${FILESDIR}/${P}-commons-lang3.patch" -) - -JAVA_GENTOO_CLASSPATH="commons-cli-1,commons-collections,commons-io-1,commons-lang-3.6,commons-compress" -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS=( - "src/main/resources" -) - -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS=( - "src/test/resources" -) - -src_prepare() { - default - java-utils-2_src_prepare -} diff --git a/dev-java/apache-rat-core/files/apache-rat-core-0.13-commons-lang3.patch b/dev-java/apache-rat-core/files/apache-rat-core-0.13-commons-lang3.patch deleted file mode 100644 index 77a90207cbcf..000000000000 --- a/dev-java/apache-rat-core/files/apache-rat-core-0.13-commons-lang3.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/main/java/org/apache/rat/Report.java b/src/main/java/org/apache/rat/Report.java -index de4a2e7..ecb8ddf 100644 ---- a/src/main/java/org/apache/rat/Report.java -+++ b/src/main/java/org/apache/rat/Report.java -@@ -21,7 +21,7 @@ package org.apache.rat; - import org.apache.commons.cli.*; - import org.apache.commons.io.FileUtils; - import org.apache.commons.io.filefilter.*; --import org.apache.commons.lang.StringUtils; -+import org.apache.commons.lang3.StringUtils; - import org.apache.rat.api.RatException; - import org.apache.rat.report.IReportable; - import org.apache.rat.report.RatReport; -diff --git a/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java b/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java -index d56a672..d6b7f4d 100644 ---- a/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java -+++ b/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java -@@ -20,7 +20,7 @@ package org.apache.rat.document.impl.guesser; - - import java.util.Locale; - --import org.apache.commons.lang.StringUtils; -+import org.apache.commons.lang3.StringUtils; - - public class GuessUtils { - -diff --git a/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java b/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java -index 02e21d6..5001dff 100644 ---- a/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java -+++ b/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java -@@ -18,7 +18,7 @@ - */ - package org.apache.rat.report.claim.impl.xml; - --import org.apache.commons.lang.time.DateFormatUtils; -+import org.apache.commons.lang3.time.DateFormatUtils; - import org.apache.rat.api.Document; - import org.apache.rat.api.MetaData; - import org.apache.rat.api.RatException; diff --git a/dev-java/apache-rat-core/metadata.xml b/dev-java/apache-rat-core/metadata.xml deleted file mode 100644 index 6ef2d50cf07e..000000000000 --- a/dev-java/apache-rat-core/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/apache-rat-tasks/Manifest b/dev-java/apache-rat-tasks/Manifest deleted file mode 100644 index bb5c63616d58..000000000000 --- a/dev-java/apache-rat-tasks/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST apache-rat-0.13-src.tar.bz2 197443 BLAKE2B 5880894bf48e62c97fefebe5672964a78016ba045ca6a13a9b100c1a15cf0a6933edc22c41cb3552f30ebea0486fd6b415f60902f0af7d96663611bfef1a1781 SHA512 564cb2b0f21c98ca5c10566417c0d2732cd177efb68607589e43bcf64eeedee7a570dbea7ef4d6237f6438ecb40d382cb96bd0d6f60c1d1ba1f76778f15ee26a diff --git a/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild b/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild deleted file mode 100644 index cdc925c1a2f0..000000000000 --- a/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom apache-rat-tasks/pom.xml --download-uri https://mirrors.nav.ro/apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2 --slot 0 --keywords "~amd64 ~x86" --ebuild apache-rat-tasks-0.13.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.rat:apache-rat-tasks:0.13" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A plugin for Apache Ant that runs Apache Rat to audit the source" -HOMEPAGE="https://creadur.apache.org/rat/apache-rat-tasks/" -SRC_URI="mirror://apache//creadur/apache-rat-${PV}/apache-rat-${PV}-src.tar.bz2" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" - -# Common dependencies -# POM: ${PN}/pom.xml -# org.apache.rat:apache-rat-core:0.13 -> >=dev-java/apache-rat-core-0.13:0 - -CDEPEND=" - dev-java/ant-core:0 - ~dev-java/apache-rat-core-${PV}:0 -" - -# Compile dependencies -# POM: ${PN}/pom.xml -# org.apache.ant:ant:1.9.12 -> !!!groupId-not-found!!! -# POM: ${PN}/pom.xml -# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4 -# test? org.apache.ant:ant-antunit:1.4 -> !!!groupId-not-found!!! -# test? org.apache.ant:ant-testutil:1.9.12 -> !!!groupId-not-found!!! - -DEPEND=" - >=virtual/jdk-1.8:* - ${CDEPEND} - test? ( - dev-java/ant-testutil:0 - )" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND}" - -S="${WORKDIR}/apache-rat-${PV}/${PN}" - -PATCHES=( - "${FILESDIR}/${P}-fix-tests.patch" -) - -JAVA_GENTOO_CLASSPATH="ant-core,apache-rat-core" -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS=( - "src/main/resources" -) - -JAVA_TEST_GENTOO_CLASSPATH="ant-testutil,junit-4" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS=( - "src/test/resources" -) - -src_prepare() { - default - java-utils-2_src_prepare -} diff --git a/dev-java/apache-rat-tasks/files/apache-rat-tasks-0.13-fix-tests.patch b/dev-java/apache-rat-tasks/files/apache-rat-tasks-0.13-fix-tests.patch deleted file mode 100644 index 536b68371c3a..000000000000 --- a/dev-java/apache-rat-tasks/files/apache-rat-tasks-0.13-fix-tests.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/src/test/resources/antunit/report-junit.xml b/src/test/resources/antunit/report-junit.xml -index 54b0c9c..d12fee4 100644 ---- a/src/test/resources/antunit/report-junit.xml -+++ b/src/test/resources/antunit/report-junit.xml -@@ -48,7 +48,7 @@ - <target name="all"/> - - <target name="testWithReportSentToFile"> -- <property name="report.file" location="${output.dir}/selftest.report"/> -+ <property name="report.file" location="../../../../target/anttasks/selftest.report"/> - <rat:report reportFile="${report.file}"> - <file file="${ant.file}"/> - </rat:report> -@@ -88,22 +88,22 @@ - <target name="testAddLicenseHeaders"> - <delete dir="${output.dir}/it-sources"/> - <mkdir dir="${output.dir}/it-sources"/> -- <copy file="src/test/resources/antunit/index.apt" tofile="${output.dir}/it-sources/index.apt"/> -+ <copy file="index.apt" tofile="../../../../target/anttasks/it-sources/index.apt"/> - <rat:report addLicenseHeaders="true"> -- <file file="${output.dir}/it-sources/index.apt"/> -+ <file file="../../../../target/anttasks/it-sources/index.apt"/> - </rat:report> - </target> - - <target name="testISO88591"> - <rat:report format="xml"> -- <file file="src/test/resources/org/example/iso-8859-1.html"/> -+ <file file="../../../../src/test/resources/org/example/iso-8859-1.html"/> - </rat:report> - </target> - - <target name="testISO88591WithReportFile"> -- <property name="report.file" location="${output.dir}/selftest.report"/> -+ <property name="report.file" location="../../../../target/anttasks/selftest.report"/> - <rat:report reportFile="${report.file}" format="xml"> -- <file file="src/test/resources/org/example/iso-8859-1.html"/> -+ <file file="../../../../src/test/resources/org/example/iso-8859-1.html"/> - </rat:report> - </target> - </project> diff --git a/dev-java/apache-rat-tasks/metadata.xml b/dev-java/apache-rat-tasks/metadata.xml deleted file mode 100644 index 6ef2d50cf07e..000000000000 --- a/dev-java/apache-rat-tasks/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/apache-rat/apache-rat-0.15.ebuild b/dev-java/apache-rat/apache-rat-0.15-r1.ebuild index 278f8ba410cf..330f4023ee7a 100644 --- a/dev-java/apache-rat/apache-rat-0.15.ebuild +++ b/dev-java/apache-rat/apache-rat-0.15-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 @@ inherit java-pkg-2 java-pkg-simple verify-sig DESCRIPTION="Apache Rat is a release audit tool, focused on licenses" HOMEPAGE="https://creadur.apache.org/rat/" -SRC_URI="mirror://apache//creadur/${P}/${P}-src.tar.bz2 +SRC_URI="https://archive.apache.org/dist/creadur/${P}/${P}-src.tar.bz2 verify-sig? ( https://archive.apache.org/dist/creadur/${P}/${P}-src.tar.bz2.asc )" S="${WORKDIR}/${P}" @@ -24,7 +24,7 @@ SLOT="0" KEYWORDS="amd64 x86" CP_DEPEND=" - dev-java/ant-core:0 + >=dev-java/ant-1.10.14:0 dev-java/commons-cli:1 dev-java/commons-collections:4 dev-java/commons-compress:0 @@ -34,7 +34,7 @@ CP_DEPEND=" DEPEND="${CP_DEPEND} >=virtual/jdk-1.8:* - test? ( dev-java/ant-testutil:0 )" + test? ( >=dev-java/ant-1.10.14:0[junit,testutil] )" RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" @@ -45,6 +45,11 @@ DOCS=( NOTICE README.md README.txt RELEASE-NOTES.txt RELEASE_NOTES.txt ) PATCHES=( "${FILESDIR}/apache-rat-0.15-fix-tests.patch" ) +JAVADOC_SRC_DIRS=( + "${PN}-core/src/main/java" + "${PN}-tasks/src/main/java" +) + src_prepare() { default #780585 java-pkg-2_src_prepare @@ -68,24 +73,12 @@ src_compile() { rm -r target || die # javadoc is broken for java 17, see https://bugs.gentoo.org/914458 - if use doc; then - einfo "Compiling javadocs" - ejavadoc \ - -verbose \ - -classpath "$(java-pkg_getjars \ - --build-only ant-core)":"$(java-pkg_getjars \ - --build-only commons-cli-1)":"$(java-pkg_getjars \ - --build-only commons-collections-4)":"$(java-pkg_getjars \ - --build-only commons-compress):$(java-pkg_getjars \ - --build-only commons-io-1):$(java-pkg_getjars \ - --build-only commons-lang-3.6)" \ - -sourcepath "${PN}-core/src/main/java:${PN}-tasks/src/main/java" \ - -d javadoc -subpackages org.apache.rat org.apache.rat.anttasks - fi + JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}" + use doc && ejavadoc } src_test() { - JAVA_TEST_GENTOO_CLASSPATH="ant-testutil,junit-4" + JAVA_TEST_GENTOO_CLASSPATH="ant,junit-4" einfo "Testing apache-rat-core" cp -r "${PN}"-core/src/{main,test} src || die @@ -107,7 +100,7 @@ src_install() { java-pkg_dojar "${PN}-tasks.jar" java-pkg_dolauncher "${PN}" --main org.apache.rat.Report - use doc && java-pkg_dojavadoc javadoc + use doc && java-pkg_dojavadoc target/api if use source; then java-pkg_dosrc "${PN}-core/src/main/java/*" diff --git a/dev-java/aspectj/aspectj-1.9.7.ebuild b/dev-java/aspectj/aspectj-1.9.7-r1.ebuild index 4f7ef2231ed2..e3b7c408c182 100644 --- a/dev-java/aspectj/aspectj-1.9.7.ebuild +++ b/dev-java/aspectj/aspectj-1.9.7-r1.ebuild @@ -1,14 +1,14 @@ -# 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" inherit java-pkg-2 java-pkg-simple DESCRIPTION="A seamless aspect-oriented extension to the Java programming language" HOMEPAGE="https://eclipse.org/aspectj/" -SRC_URI="https://github.com/eclipse/org.aspectj/archive/refs/tags/V${PV//./_}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/eclipse-aspectj/aspectj/archive/V${PV//./_}.tar.gz -> ${P}.tar.gz" LICENSE="EPL-1.0" SLOT="0" @@ -16,7 +16,7 @@ KEYWORDS="amd64 x86" CDEPEND="dev-java/asm:9 dev-java/commons-logging:0 - dev-java/ant-apache-regexp:0" + dev-java/jakarta-regexp:1.4" DEPEND="${CDEPEND} >=virtual/jdk-1.8:*" RDEPEND="${CDEPEND} @@ -26,7 +26,7 @@ BDEPEND="app-arch/zip" S=${WORKDIR}/org.${P//./_} JAVA_GENTOO_CLASSPATH_EXTRA="aspectjweaver.jar" -JAVA_GENTOO_CLASSPATH="commons-logging,asm-9,ant-apache-regexp" +JAVA_GENTOO_CLASSPATH="commons-logging,asm-9,jakarta-regexp-1.4" JAVA_ENCODING="iso8859-1" src_compile() { diff --git a/dev-java/aspectj/metadata.xml b/dev-java/aspectj/metadata.xml index 5c762e7860f2..32a6a916de1c 100644 --- a/dev-java/aspectj/metadata.xml +++ b/dev-java/aspectj/metadata.xml @@ -6,7 +6,7 @@ <name>Java</name> </maintainer> <upstream> - <remote-id type="github">eclipse/org.aspectj</remote-id> - <bugs-to>https://www.eclipse.org/aspectj/bugs.php</bugs-to> + <bugs-to>https://github.com/eclipse-aspectj/aspectj/issues</bugs-to> + <remote-id type="github">eclipse-aspectj/aspectj</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/assertj-core/Manifest b/dev-java/assertj-core/Manifest index 6d5c5f3a7ea0..7e6324ac741b 100644 --- a/dev-java/assertj-core/Manifest +++ b/dev-java/assertj-core/Manifest @@ -1,2 +1 @@ -DIST assertj-core-2.3.0.tar.gz 611609 BLAKE2B b99a01f67da75bad18e08df739c10943012f75eda9855ed906d407e474eeafe9a30be2e761de0bc791d72a6ff8c7ec8181cd37c6b6c9126f073df82a974163c3 SHA512 da67930d45afde12d317579edb62b5cff546283ea6a252c9b297f21b74404d7cfb63372d339f51733322205b89d35734e97888085387fb1a83c80d5963b05fd3 DIST assertj-core-3.10.0.tar.gz 1100495 BLAKE2B 4050060e027588d9c62abd5f4c6b77affd96d94a6474c4acc750a946cd3906787f9b2194627abff6d2e0849d590f5a74bbc702b41de6cbfaa09fae951a1012cf SHA512 3763768c5572e133de69735b01fd64432c4330723aa7e6cc0de42e5948cb2d455ae52d9ada66391fb41e47c261816fe12a00d07962e253f0da13ef49255fc5c6 diff --git a/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild b/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild deleted file mode 100644 index 018ad72c7861..000000000000 --- a/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.assertj:assertj-core:2.3.0" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Java library that provides a fluent interface for writing assertions" -HOMEPAGE="https://joel-costigliola.github.io/assertj/" -SRC_URI="https://github.com/assertj/assertj-core/archive/assertj-core-${PV}.tar.gz" - -LICENSE="Apache-2.0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" -SLOT="2" - -CDEPEND="dev-java/cglib:3 - dev-java/junit:4" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.8:*" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" - -S="${WORKDIR}/${PN}-${P}" -JAVA_SRC_DIR="src/main/java" -JAVA_GENTOO_CLASSPATH="cglib-3,junit-4" - -src_install() { - java-pkg-simple_src_install - dodoc {CONTRIBUTING,README}.md -} diff --git a/dev-java/auto-service-annotations/Manifest b/dev-java/auto-service-annotations/Manifest new file mode 100644 index 000000000000..2ef345ae2602 --- /dev/null +++ b/dev-java/auto-service-annotations/Manifest @@ -0,0 +1 @@ +DIST auto-service-1.1.1.tar.gz 422101 BLAKE2B 9050607917f6637e77d234074787662b32f0e245a8e61b233cb664834e50ad41523bf89869e7e7b44a9e77db22c99481dce6b7c8051934b4e159fab37f060b36 SHA512 4e18c422103d6857724d5fcb28fc2f12cdaeacd7a47ebdc1982e9cd2e9d83a90e571c5e14332e3fcaac3a9e1ecf947f0e9e89a87c0c3bb1dc2e401b1a76ca044 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 new file mode 100644 index 000000000000..4cc72084bcfb --- /dev/null +++ b/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="com.google.auto.service:auto-service-annotations:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Provider-configuration files for ServiceLoader" +HOMEPAGE="https://github.com/google/auto/" +SRC_URI="https://github.com/google/auto/archive/auto-service-${PV}.tar.gz" +S="${WORKDIR}/auto-auto-service-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="com.google.auto.service" +JAVA_SRC_DIR="service/annotations/src/main/java" diff --git a/dev-java/ant-apache-bsf/metadata.xml b/dev-java/auto-service-annotations/metadata.xml index 4221e170cbc0..5b0a6ef06e06 100644 --- a/dev-java/ant-apache-bsf/metadata.xml +++ b/dev-java/auto-service-annotations/metadata.xml @@ -3,6 +3,8 @@ <pkgmetadata> <maintainer type="project"> <email>java@gentoo.org</email> - <name>Java</name> </maintainer> + <upstream> + <remote-id type="github">google/auto</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest index 883b9e84cf5b..38cde9303492 100644 --- a/dev-java/batik/Manifest +++ b/dev-java/batik/Manifest @@ -1,4 +1,2 @@ -DIST batik-src-1.16.tar.gz 13495722 BLAKE2B 041442b5485588a23b6e335cc46630b3c73fb8a36157e8bc77baa7b399bf7986549039f27e89727ebc98b8492095b957c8c6deb12b232a39784844e4c5edf6ab SHA512 024ab7a204d00b6c855e26c62a326dfcde5fb486a7635890c6fcb37d421c7195ae04b3d292daabc0fcb6564f55bfa93d6fef15cf4c2dad77e569ca17d1eeb250 -DIST batik-src-1.16.tar.gz.asc 833 BLAKE2B fdcfb26b9cc0d4fb0c37ce42d65628629ab0c27257ebe07715d5b2786500515125a240957c9ba76333aa54320905273031354cf09ee29e3a79fc7529640ebf03 SHA512 7fc3450d2b4d19e03528707fc20d6e18af926938ad24ad7460cc1c423c6c40507059fff2e2921d82fc582a4b486a75141fb407d450b043e2cc5007e0c2d486ea DIST batik-src-1.17.tar.gz 13578640 BLAKE2B c77f994674dd8e8054ad6f753e53304ce6daad9b9eadceef053ede0c746872528ecd1caa6e87064d41892fed0c39f07936779851777208229f817bf84cb529b2 SHA512 0879f298142630e96931f429ade5e7107d2d981c6c3a99b8f2ddca8e26ea4fde1b7c717d06412c57d64759bed6c5f2d056970d59e19e66caafb926cb30078516 DIST batik-src-1.17.tar.gz.asc 833 BLAKE2B 33836c8f0cbc878410ce8b2738dbbb4dc47d6067c5f58febb3460d836424b1c1d815f369bd7aeb15a8ed9371628e03731c1338aa6524c8a935c48b8092e3bb1e SHA512 513bd3d5c212ce4d98daa911f36e1b00e2f2b7a637e93ea116a2ebe848e20664d722ccf6c8928eac7170fa84d3b38eec86a71c8a0a7e21fd8622c8d475991c60 diff --git a/dev-java/batik/batik-1.16-r2.ebuild b/dev-java/batik/batik-1.17-r1.ebuild index e86745d88df5..b389f8994bd7 100644 --- a/dev-java/batik/batik-1.16-r2.ebuild +++ b/dev-java/batik/batik-1.17-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 @@ -229,7 +229,7 @@ src_install() { _EOF_ java-pkg_register-environment-variable \ gjl_java_args \ - "-Djava.security.policy=file:${EPREFIX}${java_policy_file}" + "\$gjl_java_args -Djava.security.policy=file:${EPREFIX}${java_policy_file}" if use doc; then java-pkg_dojavadoc target/api diff --git a/dev-java/batik/batik-1.17.ebuild b/dev-java/batik/batik-1.17.ebuild deleted file mode 100644 index 62259c27b4a4..000000000000 --- a/dev-java/batik/batik-1.17.ebuild +++ /dev/null @@ -1,247 +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.apache.xmlgraphics:batik:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit desktop java-pkg-2 java-pkg-simple xdg-utils verify-sig - -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}" - -LICENSE="Apache-2.0" -SLOT="1.16" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" - -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 -" - -DEPEND=" - ${CP_DEPEND} - >=virtual/jdk-1.8:* -" - -RDEPEND=" - ${CP_DEPEND} - >=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 ) - -# Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts their jar files in the extensions -# directory, see batik-extension/src/main/resources/org/apache/batik/extensions/README.txt -# We comment them out but keep them in the mudules list for later. -# The same for batik-test-old which depends on fop-transcoder-allinone which itself depends on batik. -# We also don't build batik-shared-resources since we install those resources on global scope. -# And we don't build batik-all. Instead we install the modules. -# BATIK_MODULES is the "Reactor Build Order" extracted from the output of "mvn dependency:tree": -# mvn -DskipTests dependency:tree \ -# | sed -n '/Reactor Build Order:/,/Building org/p' \ -# | cut -d':' -f2 | cut -d' ' -f1 | grep 'batik-' || die -BATIK_MODULES=( -# batik-shared-resources - batik-constants - batik-i18n - batik-test - batik-util - batik-awt-util - batik-css - batik-ext - batik-xml - batik-dom - batik-parser - batik-svg-dom - batik-anim - batik-gvt - batik-script - batik-bridge - batik-svggen - batik-transcoder - batik-codec - batik-extension - batik-gui-util - batik-svgrasterizer -# batik-rasterizer-ext - batik-rasterizer - batik-slideshow - batik-swing - batik-svgbrowser -# batik-squiggle-ext - batik-squiggle - batik-svgpp - batik-ttf2svg -# batik-all - batik-test-swing - batik-test-svg -# batik-test-old -) - -src_prepare() { - java-pkg_clean - java-pkg-2_src_prepare - # We drop support for jython due to bug #825486. - rm batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreter.java || die - rm batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreterFactory.java || die - - cat > "batik-squiggle-${SLOT}.desktop" <<-EOF || die - [Desktop Entry] - Name=Squiggle - Comment=SVG browser - Exec=batik-squiggle-${SLOT} - Icon=init - Terminal=false - Type=Application - Categories=Graphics;VectorGraphics; - MimeType=image/svg+xml - EOF -} - -src_compile() { - # We loop over the modules list and compile the jar files. - local module - for module in "${BATIK_MODULES[@]}"; do - einfo "Compiling ${module}" - - JAVA_JAR_FILENAME="${module}.jar" - JAVA_MAIN_CLASS="" - JAVA_RESOURCE_DIRS="" - JAVA_SRC_DIR="" - - # Not all of the modules have resources. - if [[ -d "${module}/src/main/resources" ]]; then - JAVA_RESOURCE_DIRS="${module}/src/main/resources" - fi - - # Get Main-Class from the module's pom.xml - JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' "${module}/pom.xml" ) - - # Some modules don't have source code. - if [[ -d "${module}/src/main/java/org" ]]; then - JAVA_SRC_DIR="${module}/src/main/java" - java-pkg-simple_src_compile - else - # This case applies to batik-rasterizer. - if [[ -d "${module}/src/main/resources/org" ]]; then - jar -cfe "${module}.jar" "${JAVA_MAIN_CLASS}" -C "${module}/src/main/resources" . || die - # Else for batik-squiggle (also batik-rasterizer-ext, batik-squiggle-ext) - else - # Create the JAR file (not possible without adding at least one file). - jar -cfe "${module}.jar" "${JAVA_MAIN_CLASS}" -C . README || die - zip -d "${module}.jar" "README" || die - fi - fi - - JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar" - - rm -fr target || die - done - - if use doc; then - JAVA_SRC_DIR="" - JAVA_JAR_FILENAME="ignoreme.jar" - - for module in "${BATIK_MODULES[@]}"; do - # Some modules don't have source code - if [[ -d "${module}/src/main/java/org" ]]; then - JAVA_SRC_DIR+=( "${module}/src/main/java" ) - fi - done - - java-pkg-simple_src_compile - fi -} - -src_test() { - JAVA_TEST_GENTOO_CLASSPATH="junit-4" - - for module in "${BATIK_MODULES[@]}"; do - einfo "Testing ${module}" - - JAVA_TEST_SRC_DIR="" - JAVA_TEST_RESOURCE_DIRS="" - JAVA_TEST_RUN_ONLY="" - - if [[ -d "${module}/src/test/resources" ]]; then - JAVA_TEST_RESOURCE_DIRS="${module}/src/test/resources" - fi - - # https://github.com/apache/xmlgraphics-batik/blob/refs/tags/batik-1_14/batik-util/pom.xml#L74-L75 - if [[ "${module}" == batik-util ]]; then - JAVA_TEST_RUN_ONLY="org.apache.batik.util.Base64TestCases" - fi - - if [[ -d "${module}/src/test/java/org" ]]; then - JAVA_TEST_SRC_DIR="${module}/src/test/java" - java-pkg-simple_src_test - fi - done -} - -src_install() { - einstalldocs - domenu "batik-squiggle-${SLOT}.desktop" - newicon -s scalable \ - batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/init.svg \ - squiggle-${SLOT}.svg - - for module in "${BATIK_MODULES[@]}"; do - JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' "${module}/pom.xml" ) - - java-pkg_dojar "${module}.jar" - - # Add a launcher if the module has a MainClass. - if [[ -n "${JAVA_MAIN_CLASS}" ]]; then - java-pkg_dolauncher "${module}-${SLOT}" --main "${JAVA_MAIN_CLASS}" - fi - - # Some modules don't have source code - if [[ -d "${module}/src/main/java/org" ]]; then - if use source; then - java-pkg_dosrc "${module}/src/main/java/*" - fi - fi - done - - local java_policy_file="${JAVA_PKG_SHAREPATH}/etc/${PN}.policy" - insinto "$(dirname "${java_policy_file}")" - newins - "$(basename "${java_policy_file}")" <<- _EOF_ - grant codeBase "file:${EPREFIX}${JAVA_PKG_JARDEST}/-" { - permission java.security.AllPermission; - }; - _EOF_ - java-pkg_register-environment-variable \ - gjl_java_args \ - "-Djava.security.policy=file:${EPREFIX}${java_policy_file}" - - if use doc; then - java-pkg_dojavadoc target/api - fi -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest index 880e2012db6f..680d64e45a8b 100644 --- a/dev-java/bcmail/Manifest +++ b/dev-java/bcmail/Manifest @@ -1 +1 @@ -DIST bc-java-r1rv76.tar.gz 31256952 BLAKE2B b791ef3da7189bc6990935aaad7c331c1bf6a45af0cdfc72056ae0cf1723e57ce15a76060251f6de630b0729ffe22ba4718255c103a8ab66db61f2e46f1201c8 SHA512 7d408821408bbabd209d9507b061f3113822878c12b12a040c829f5a8c6bdf8450719aef60c423025824bec1fcb6c63d8478d1f84f3cb1d692fdbacde6d9ce6e +DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4 diff --git a/dev-java/bcmail/bcmail-1.76.ebuild b/dev-java/bcmail/bcmail-1.77-r1.ebuild index 478e8647dbd2..fc5a0ce57369 100644 --- a/dev-java/bcmail/bcmail-1.76.ebuild +++ b/dev-java/bcmail/bcmail-1.77-r1.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.bouncycastle:bcmail-jdk18on:1.76" +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" -SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz" +MY_PV="r${PV/./rv}" +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" @@ -21,10 +23,10 @@ CP_DEPEND=" ~dev-java/bcpkix-${PV}:0 ~dev-java/bcprov-${PV}:0 ~dev-java/bcutil-${PV}:0 - dev-java/jakarta-activation:1 dev-java/javax-mail:0 " DEPEND="${CP_DEPEND} + dev-java/jakarta-activation:1 >=virtual/jdk-11:*" RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" @@ -32,9 +34,8 @@ RDEPEND="${CP_DEPEND} DOCS=( ../{README,SECURITY}.md ) HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) -S="${WORKDIR}/bc-java-r${PV/./rv}/mail" - 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" @@ -47,7 +48,7 @@ JAVA_TEST_RUN_ONLY="org.bouncycastle.mail.smime.test.AllTests" JAVA_TEST_SRC_DIR="src/test/java" src_prepare() { - default + java-pkg-2_src_prepare java-pkg_clean .. } diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest index 880e2012db6f..680d64e45a8b 100644 --- a/dev-java/bcpg/Manifest +++ b/dev-java/bcpg/Manifest @@ -1 +1 @@ -DIST bc-java-r1rv76.tar.gz 31256952 BLAKE2B b791ef3da7189bc6990935aaad7c331c1bf6a45af0cdfc72056ae0cf1723e57ce15a76060251f6de630b0729ffe22ba4718255c103a8ab66db61f2e46f1201c8 SHA512 7d408821408bbabd209d9507b061f3113822878c12b12a040c829f5a8c6bdf8450719aef60c423025824bec1fcb6c63d8478d1f84f3cb1d692fdbacde6d9ce6e +DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4 diff --git a/dev-java/bcpg/bcpg-1.76.ebuild b/dev-java/bcpg/bcpg-1.77.ebuild index 343650de4d43..cc3e0343f4be 100644 --- a/dev-java/bcpg/bcpg-1.76.ebuild +++ b/dev-java/bcpg/bcpg-1.77.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.bouncycastle:bcpg-jdk18on:1.76" +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" -SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz" +MY_PV="r${PV/./rv}" +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" @@ -26,8 +28,6 @@ RDEPEND="${CP_DEPEND} DOCS=( ../{README,SECURITY}.md ) HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) -S="${WORKDIR}/bc-java-r${PV/./rv}/pg" - JAVA_SRC_DIR=( "src/main/java" "src/main/jdk1.9" @@ -39,7 +39,7 @@ JAVA_TEST_RESOURCE_DIRS="src/test/resources" JAVA_TEST_SRC_DIR="src/test/java" src_prepare() { - default + java-pkg-2_src_prepare java-pkg_clean .. } diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest index b8411158075e..34f73ef00305 100644 --- a/dev-java/bcpkix/Manifest +++ b/dev-java/bcpkix/Manifest @@ -1,2 +1,2 @@ -DIST bc-java-r1rv76.tar.gz 31256952 BLAKE2B b791ef3da7189bc6990935aaad7c331c1bf6a45af0cdfc72056ae0cf1723e57ce15a76060251f6de630b0729ffe22ba4718255c103a8ab66db61f2e46f1201c8 SHA512 7d408821408bbabd209d9507b061f3113822878c12b12a040c829f5a8c6bdf8450719aef60c423025824bec1fcb6c63d8478d1f84f3cb1d692fdbacde6d9ce6e -DIST bc-test-data-r1rv76.tar.gz 2074813467 BLAKE2B 3d1bd122a907e4c46f3c8b84c4d27b3327b6c6deaded623e5bc9842d00c62bdeb521b1be3bdd495ffa10f2d1facc73d41176829eda4511827d24eb0f62fccef9 SHA512 3de068667ce9572530fa6422bdbc4455d7f1edd85e12166e7a266a447ed0ffab50c33cc5a99e668caf79156f87d86512a5507534469d3e6f479b908d4d2a1fb7 +DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4 +DIST bc-test-data-r1rv77.tar.gz 2074825965 BLAKE2B b797821719ba0dcdd091e0fd4f14c79058a15702973978a055bcc998ff541a8c5e96feb757647a9696e4bbfa28bf80a317066a51fd4daac7b2508111d0d217b1 SHA512 c8701a270ddcfde353b480caa62e2237776b50b0937ac015ee3e5221a74d0817de9bc67f1fa9f53f5e48d861dbf94339cb45a08cb4dad37f1340f754cb1d910e diff --git a/dev-java/bcpkix/bcpkix-1.76.ebuild b/dev-java/bcpkix/bcpkix-1.77.ebuild index f81d320078e6..c4e5b0c09115 100644 --- a/dev-java/bcpkix/bcpkix-1.76.ebuild +++ b/dev-java/bcpkix/bcpkix-1.77.ebuild @@ -1,18 +1,20 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.bouncycastle:bcpkix-jdk18on:1.76" +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" -SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz - test? ( https://github.com/bcgit/bc-test-data/archive/r${PV/./rv}.tar.gz -> bc-test-data-r${PV/./rv}.tar.gz )" +MY_PV="r${PV/./rv}" +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" @@ -35,8 +37,6 @@ RDEPEND="${CDEPEND} DOCS=( ../{README,SECURITY}.md ) HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) -S="${WORKDIR}/bc-java-r${PV/./rv}/pkix" - JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.pkix" JAVA_GENTOO_CLASSPATH="bcprov,bcutil" JAVA_SRC_DIR=( @@ -70,8 +70,8 @@ pkg_setup() { } src_unpack() { - unpack bc-java-r${PV/./rv}.tar.gz - use test && unpack bc-test-data-r${PV/./rv}.tar.gz + unpack bc-java-${MY_PV}.tar.gz + use test && unpack bc-test-data-${MY_PV}.tar.gz } src_prepare() { @@ -81,7 +81,7 @@ src_prepare() { # https://bugs.gentoo.org/823347 src_test() { - mv ../../bc-test-data-r${PV/./rv} bc-test-data || die "cannot move bc-test-data" + 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 diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest index def9e26aa563..34f73ef00305 100644 --- a/dev-java/bcprov/Manifest +++ b/dev-java/bcprov/Manifest @@ -1,4 +1,2 @@ -DIST bc-java-r1rv74.tar.gz 31236157 BLAKE2B ffdfe7aa34f361a559051f31fc57eeff39f7d080e4de4a94bdd0d79d92172b2646efa122edaf067633d6a840015e17271c186122598c18e3226622428fa9e1e7 SHA512 887183f825a8834ff512a66fa3f9075259b3266c2861e6e046990bd2dda80b896a8fd221ff2982a127de79fe998727ecc12cade4e6c381f2a152a72ee575d8a1 -DIST bc-java-r1rv76.tar.gz 31256952 BLAKE2B b791ef3da7189bc6990935aaad7c331c1bf6a45af0cdfc72056ae0cf1723e57ce15a76060251f6de630b0729ffe22ba4718255c103a8ab66db61f2e46f1201c8 SHA512 7d408821408bbabd209d9507b061f3113822878c12b12a040c829f5a8c6bdf8450719aef60c423025824bec1fcb6c63d8478d1f84f3cb1d692fdbacde6d9ce6e -DIST bc-test-data-r1rv74.tar.gz 2074813647 BLAKE2B 8060ee31fa45fbceecb3ed57bc5d8195c8ea72c732e56f2c5f5adf9f785e76934300fe2b07aabc4fa5672c2eb39b5b7aad1393a7ff47dd42a048fa110b9a1db6 SHA512 8a8aa2e372b533a8bca5dc81a94c08c50470446c1457a487b18a96620841b8035344148bcb46b4e211c287ca42b0ee2db29ea402967bf55b8bb0958eb5fbabae -DIST bc-test-data-r1rv76.tar.gz 2074813467 BLAKE2B 3d1bd122a907e4c46f3c8b84c4d27b3327b6c6deaded623e5bc9842d00c62bdeb521b1be3bdd495ffa10f2d1facc73d41176829eda4511827d24eb0f62fccef9 SHA512 3de068667ce9572530fa6422bdbc4455d7f1edd85e12166e7a266a447ed0ffab50c33cc5a99e668caf79156f87d86512a5507534469d3e6f479b908d4d2a1fb7 +DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4 +DIST bc-test-data-r1rv77.tar.gz 2074825965 BLAKE2B b797821719ba0dcdd091e0fd4f14c79058a15702973978a055bcc998ff541a8c5e96feb757647a9696e4bbfa28bf80a317066a51fd4daac7b2508111d0d217b1 SHA512 c8701a270ddcfde353b480caa62e2237776b50b0937ac015ee3e5221a74d0817de9bc67f1fa9f53f5e48d861dbf94339cb45a08cb4dad37f1340f754cb1d910e diff --git a/dev-java/bcprov/bcprov-1.74.ebuild b/dev-java/bcprov/bcprov-1.74.ebuild deleted file mode 100644 index 6918c239c192..000000000000 --- a/dev-java/bcprov/bcprov-1.74.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.bouncycastle:bcprov-jdk18on:1.74" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple check-reqs - -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="https://www.bouncycastle.org/java.html" -SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz - test? ( https://github.com/bcgit/bc-test-data/archive/r${PV/./rv}.tar.gz -> bc-test-data-r${PV/./rv}.tar.gz )" - -LICENSE="BSD" -SLOT="1.74" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" - -DEPEND=">=virtual/jdk-11:*" -RDEPEND=">=virtual/jre-1.8:*" -BDEPEND="app-arch/zip" - -DOCS=( {README,SECURITY}.md ) -HTML_DOCS=( {CONTRIBUTORS,index}.html ) - -S="${WORKDIR}/bc-java-r${PV/./rv}" - -check_env() { - if use test; then - # this is needed only for tests - CHECKREQS_MEMORY="2048M" - check-reqs_pkg_pretend - fi -} - -pkg_pretend() { - check_env -} - -pkg_setup() { - check_env - java-pkg-2_pkg_setup -} - -src_unpack() { - unpack bc-java-r${PV/./rv}.tar.gz - use test && unpack bc-test-data-r${PV/./rv}.tar.gz -} - -src_prepare() { - java-pkg-2_src_prepare - # TBD: unboundid-ldapsdk should be packaged from source. - java-pkg_clean ! -path "./libs/unboundid-ldapsdk-6.0.8.jar" -} - -src_compile() { - JAVA_RESOURCE_DIRS=( - "core/src/main/resources" - "prov/src/main/resources" - ) - JAVA_SRC_DIR=( - "core/src/main/java" - "prov/src/main/java" - "prov/src/main/jdk1.9" - ) - java-pkg-simple_src_compile -} - -src_test() { - mv ../bc-test-data-r${PV/./rv} bc-test-data || die "cannot move bc-test-data" - - JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/core/src/test/data" - JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}" - JAVA_TEST_GENTOO_CLASSPATH="junit-4" - - einfo "Testing \"core\"" - JAVA_TEST_RESOURCE_DIRS="core/src/test/resources" - JAVA_TEST_SRC_DIR="core/src/test/java" - pushd core/src/test/java || die - local JAVA_TEST_RUN_ONLY=$(find * \ - -name "AllTests.java" ) - popd || die - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - java-pkg-simple_src_test - - einfo "Testing bcprov" - JAVA_GENTOO_CLASSPATH_EXTRA=":core.jar:libs/unboundid-ldapsdk-6.0.8.jar" - JAVA_TEST_RESOURCE_DIRS="prov/src/test/resources" - JAVA_TEST_SRC_DIR="prov/src/test/java" - pushd prov/src/test/java || die - local JAVA_TEST_RUN_ONLY=$(find * \ - -name "AllTests.java" ) - popd || die - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - java-pkg-simple_src_test -} - -src_install() { - docinto html - dodoc -r docs - java-pkg-simple_src_install -} diff --git a/dev-java/bcprov/bcprov-1.76.ebuild b/dev-java/bcprov/bcprov-1.77.ebuild index 765e01e1dfd4..9e17d73d8035 100644 --- a/dev-java/bcprov/bcprov-1.76.ebuild +++ b/dev-java/bcprov/bcprov-1.77.ebuild @@ -1,18 +1,20 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.bouncycastle:bcprov-jdk18on:1.76" +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" -SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz - test? ( https://github.com/bcgit/bc-test-data/archive/r${PV/./rv}.tar.gz -> bc-test-data-r${PV/./rv}.tar.gz )" +MY_PV="r${PV/./rv}" +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" @@ -25,8 +27,6 @@ BDEPEND="app-arch/zip" DOCS=( {README,SECURITY}.md ) HTML_DOCS=( {CONTRIBUTORS,index}.html ) -S="${WORKDIR}/bc-java-r${PV/./rv}" - check_env() { if use test; then # this is needed only for tests @@ -45,8 +45,8 @@ pkg_setup() { } src_unpack() { - unpack bc-java-r${PV/./rv}.tar.gz - use test && unpack bc-test-data-r${PV/./rv}.tar.gz + unpack bc-java-${MY_PV}.tar.gz + use test && unpack bc-test-data-${MY_PV}.tar.gz } src_prepare() { @@ -69,7 +69,7 @@ src_compile() { } src_test() { - mv ../bc-test-data-r${PV/./rv} bc-test-data || die "cannot move bc-test-data" + 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+=" -Xmx${CHECKREQS_MEMORY}" diff --git a/dev-java/bcutil/Manifest b/dev-java/bcutil/Manifest index 880e2012db6f..680d64e45a8b 100644 --- a/dev-java/bcutil/Manifest +++ b/dev-java/bcutil/Manifest @@ -1 +1 @@ -DIST bc-java-r1rv76.tar.gz 31256952 BLAKE2B b791ef3da7189bc6990935aaad7c331c1bf6a45af0cdfc72056ae0cf1723e57ce15a76060251f6de630b0729ffe22ba4718255c103a8ab66db61f2e46f1201c8 SHA512 7d408821408bbabd209d9507b061f3113822878c12b12a040c829f5a8c6bdf8450719aef60c423025824bec1fcb6c63d8478d1f84f3cb1d692fdbacde6d9ce6e +DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4 diff --git a/dev-java/bcutil/bcutil-1.76.ebuild b/dev-java/bcutil/bcutil-1.77.ebuild index 27836258fffc..03c870ae5331 100644 --- a/dev-java/bcutil/bcutil-1.76.ebuild +++ b/dev-java/bcutil/bcutil-1.77.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.bouncycastle:bcutil-jdk18on:1.76" +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" -SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz" +MY_PV="r${PV/./rv}" +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" @@ -26,8 +28,6 @@ RDEPEND="${CDEPEND} DOCS=( ../{README,SECURITY}.md ) HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) -S="${WORKDIR}/bc-java-r${PV/./rv}/util" - JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.util" JAVA_GENTOO_CLASSPATH="bcprov" JAVA_SRC_DIR=( @@ -36,16 +36,15 @@ JAVA_SRC_DIR=( ) JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" 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() { - default + java-pkg-2_src_prepare java-pkg_clean .. } diff --git a/dev-java/aqute-bnd-annotation/Manifest b/dev-java/bnd-annotation/Manifest index 5b277a425cec..4a41f3f9f080 100644 --- a/dev-java/aqute-bnd-annotation/Manifest +++ b/dev-java/bnd-annotation/Manifest @@ -1 +1,2 @@ +DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c DIST biz.aQute.bnd.annotation-6.3.1-sources.jar 50600 BLAKE2B 6ace86a803c378be17b4ecfb658eb17e9c95f4f8797cdf22cbb9a5acb2a382fe0ee6791ad0280a2de9d9e85fbe2732487e693b2c93f08145b3633810f480f8b9 SHA512 751855a173e6d5f9d09f6d63775b97d971cebbfc019053988ec7fe144d0f49b4d09b9a2339d63bb43cea51d09d7d766554255f727cad8d73d9c196097e58d0fd diff --git a/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild b/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild index 0ec922b091fb..9522fc6820a9 100644 --- a/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild +++ b/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: diff --git a/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild b/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild new file mode 100644 index 000000000000..a66b70291b68 --- /dev/null +++ b/dev-java/bnd-annotation/bnd-annotation-7.0.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}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/bnd-${PV}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +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-annotation/metadata.xml b/dev-java/bnd-annotation/metadata.xml new file mode 100644 index 000000000000..cb6317e530db --- /dev/null +++ b/dev-java/bnd-annotation/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">bndtools/bnd</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/bnd-ant/Manifest b/dev-java/bnd-ant/Manifest new file mode 100644 index 000000000000..a890570b45c8 --- /dev/null +++ b/dev-java/bnd-ant/Manifest @@ -0,0 +1 @@ +DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c diff --git a/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild b/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild new file mode 100644 index 000000000000..236236e86726 --- /dev/null +++ b/dev-java/bnd-ant/bnd-ant-7.0.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}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/bnd-${PV}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~x86" + +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-ant/metadata.xml b/dev-java/bnd-ant/metadata.xml new file mode 100644 index 000000000000..cb6317e530db --- /dev/null +++ b/dev-java/bnd-ant/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">bndtools/bnd</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/bnd-junit/Manifest b/dev-java/bnd-junit/Manifest deleted file mode 100644 index 068af0665527..000000000000 --- a/dev-java/bnd-junit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e diff --git a/dev-java/bnd-junit/bnd-junit-2.1.0-r2.ebuild b/dev-java/bnd-junit/bnd-junit-2.1.0-r2.ebuild deleted file mode 100644 index 3c659d744e29..000000000000 --- a/dev-java/bnd-junit/bnd-junit-2.1.0-r2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Junit plugin for bndlib, a swiss army knife for OSGi" -HOMEPAGE="http://www.aqute.biz/Bnd/Bnd" -SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> bndlib-${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -CDEPEND=" - dev-java/osgi-core-api:0 - dev-java/bndlib:0" - -DEPEND=" - ${CDEPEND} - virtual/jdk:1.8 - test? ( dev-java/junit:4 )" - -RDEPEND=" - ${CDEPEND} - virtual/jre:1.8" - -S="${WORKDIR}/bnd-${PV}.REL/biz.aQute.junit" - -EANT_BUILD_TARGET="build" -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="bndlib,junit-4,osgi-core-api" - -# Tests appear broken and cause a circular dependency. -RESTRICT="test" - -src_prepare() { - default - java-pkg_clean - cp ../cnf/build.xml . || die -} - -src_install() { - java-pkg_newjar generated/biz.aQute.junit.jar -} diff --git a/dev-java/bnd-junit/metadata.xml b/dev-java/bnd-junit/metadata.xml deleted file mode 100644 index 94feb65b0b18..000000000000 --- a/dev-java/bnd-junit/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <upstream> - <remote-id type="github">bndtools/bnd</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-java/bnd-util/Manifest b/dev-java/bnd-util/Manifest new file mode 100644 index 000000000000..a890570b45c8 --- /dev/null +++ b/dev-java/bnd-util/Manifest @@ -0,0 +1 @@ +DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c diff --git a/dev-java/bnd-util/bnd-util-7.0.0.ebuild b/dev-java/bnd-util/bnd-util-7.0.0.ebuild new file mode 100644 index 000000000000..686d1ca62757 --- /dev/null +++ b/dev-java/bnd-util/bnd-util-7.0.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}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/bnd-${PV}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +CP_DEPEND="dev-java/osgi-annotation:0" + +DEPEND="${CP_DEPEND} + ~dev-java/bnd-annotation-${PV}:0 + ~dev-java/libg-${PV}:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + dev-java/slf4j-api:0 + >=virtual/jdk-17:* +" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-17:* +" + +JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.util" +JAVA_CLASSPATH_EXTRA=" + bnd-annotation + libg + osgi-cmpn-8 + osgi-core + slf4j-api +" +JAVA_SRC_DIR="biz.aQute.bnd.util/src" diff --git a/dev-java/bnd-util/metadata.xml b/dev-java/bnd-util/metadata.xml new file mode 100644 index 000000000000..cb6317e530db --- /dev/null +++ b/dev-java/bnd-util/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">bndtools/bnd</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/bnd/Manifest b/dev-java/bnd/Manifest new file mode 100644 index 000000000000..a890570b45c8 --- /dev/null +++ b/dev-java/bnd/Manifest @@ -0,0 +1 @@ +DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c diff --git a/dev-java/bnd/bnd-7.0.0.ebuild b/dev-java/bnd/bnd-7.0.0.ebuild new file mode 100644 index 000000000000..b01e8447356e --- /dev/null +++ b/dev-java/bnd/bnd-7.0.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}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~x86" + +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/bnd/files/bnd-7.0.0-aQute.bnd.main.bnd.patch b/dev-java/bnd/files/bnd-7.0.0-aQute.bnd.main.bnd.patch new file mode 100644 index 000000000000..6d37cbc9f7d6 --- /dev/null +++ b/dev-java/bnd/files/bnd-7.0.0-aQute.bnd.main.bnd.patch @@ -0,0 +1,21 @@ +Upstream uses an older version of slf4j-simple +--- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java ++++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java +@@ -486,14 +486,14 @@ public class bnd extends Processor { + System.setProperty(DEFAULT_LOG_LEVEL_KEY, "warn"); + level = org.slf4j.spi.LocationAwareLogger.WARN_INT; + } +- Field field = org.slf4j.impl.SimpleLogger.class.getDeclaredField("CONFIG_PARAMS"); ++ Field field = org.slf4j.simple.SimpleLogger.class.getDeclaredField("CONFIG_PARAMS"); + field.setAccessible(true); + Object CONFIG_PARAMS = field.get(null); +- field = org.slf4j.impl.SimpleLoggerConfiguration.class.getDeclaredField("defaultLogLevel"); ++ field = org.slf4j.simple.SimpleLoggerConfiguration.class.getDeclaredField("defaultLogLevel"); + field.setAccessible(true); + field.set(CONFIG_PARAMS, level); + +- field = org.slf4j.impl.SimpleLogger.class.getDeclaredField("currentLogLevel"); ++ field = org.slf4j.simple.SimpleLogger.class.getDeclaredField("currentLogLevel"); + field.setAccessible(true); + field.set(logger, level); + } catch (Exception e) { diff --git a/dev-java/bnd/metadata.xml b/dev-java/bnd/metadata.xml new file mode 100644 index 000000000000..cb6317e530db --- /dev/null +++ b/dev-java/bnd/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">bndtools/bnd</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/bndlib/Manifest b/dev-java/bndlib/Manifest index 068af0665527..a890570b45c8 100644 --- a/dev-java/bndlib/Manifest +++ b/dev-java/bndlib/Manifest @@ -1 +1 @@ -DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e +DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c diff --git a/dev-java/bndlib/bndlib-2.1.0-r1.ebuild b/dev-java/bndlib/bndlib-2.1.0-r1.ebuild deleted file mode 100644 index f78e091b0744..000000000000 --- a/dev-java/bndlib/bndlib-2.1.0-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="A swiss army knife for OSGi" -HOMEPAGE="https://bnd.bndtools.org/" -SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -CDEPEND="dev-java/libg:0 - dev-java/osgi-compendium:0 - dev-java/osgi-core-api:0 - dev-java/osgi-enterprise-api:0" - -# Tests appear broken and cause a circular dependency. -# test? ( dev-java/bnd-junit:0 ) -DEPEND="virtual/jdk:1.8 - ${CDEPEND} - test? ( dev-java/junit:4 )" - -RDEPEND="virtual/jre:1.8 - ${CDEPEND}" - -S="${WORKDIR}/bnd-${PV}.REL/biz.aQute.${PN}" - -EANT_BUILD_TARGET="build" - -JAVA_ANT_REWRITE_CLASSPATH="true" - -# Tests appear broken and cause a circular dependency. -RESTRICT="test" - -src_prepare() { - default - # Move the correct build.xml into place, needed for testing. - cp ../cnf/build.xml . || die - - # Remove bundled jar files. - find . -name '*.jar' -delete > /dev/null - - if ! use test ; then - rm -rf src/aQute/bnd/test || die "Failed to remove tests." - fi -} - -src_compile() { - local extra_cp="" - - if use test ; then - extra_cp=":$(java-pkg_getjars --build-only junit-4)" - fi - - EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars libg):$(java-pkg_getjars osgi-compendium):$(java-pkg_getjars osgi-core-api):$(java-pkg_getjars osgi-enterprise-api)${extra_cp}" \ - java-pkg-2_src_compile -} - -EANT_TEST_GENTOO_CLASSPATH="junit-4,bnd-junit" -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar generated/biz.aQute.${PN}.jar -} diff --git a/dev-java/bndlib/bndlib-7.0.0.ebuild b/dev-java/bndlib/bndlib-7.0.0.ebuild new file mode 100644 index 000000000000..4a6bee66518d --- /dev/null +++ b/dev-java/bndlib/bndlib-7.0.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}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/bnd-${PV}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +CP_DEPEND=" + ~dev-java/bnd-annotation-${PV}:0 + ~dev-java/bnd-util-${PV}:0 + ~dev-java/libg-${PV}:0 + dev-java/osgi-annotation:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + dev-java/slf4j-api:0 +" + +DEPEND="${CP_DEPEND} + dev-java/osgi-service-log:0 + >=virtual/jdk-17:* +" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-17:* +" + +JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bndlib" +JAVA_CLASSPATH_EXTRA="osgi-service-log" +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR="biz.aQute.bndlib/src" + +src_prepare() { + java-pkg-2_src_prepare + mkdir res || die + + # java-pkg-simple wants resources in JAVA_RESOURCE_DIRS + mv biz.aQute.bndlib/img res || die + pushd biz.aQute.bndlib/src > /dev/null || die + find -type f \ + ! -name '*.java' \ + | xargs cp --parent -t ../../res || die + popd > /dev/null || die +} diff --git a/dev-java/bndlib/metadata.xml b/dev-java/bndlib/metadata.xml index 94feb65b0b18..cb6317e530db 100644 --- a/dev-java/bndlib/metadata.xml +++ b/dev-java/bndlib/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <upstream> - <remote-id type="github">bndtools/bnd</remote-id> - </upstream> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">bndtools/bnd</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest index aeacf27f9b5a..4add2dfdfd39 100644 --- a/dev-java/bsf/Manifest +++ b/dev-java/bsf/Manifest @@ -1 +1,2 @@ DIST bsf-src-2.4.0.tar.gz 299749 BLAKE2B 41f3cfe77b1ccf6b78493df7f5f288b397234b3236977c4b7d2e6c85b330e40319474419f560eefa1632da4d0524593b8c3e0c66cd27b852749b1405c20df5a6 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43 +DIST bsf-src-2.4.0.tar.gz.asc 191 BLAKE2B c4d17ee6df06aa2da70b9e733cb9890cef2f0f22124d8699400494496c4045851feb006e53ee4f4d09e926d982afd4057c08caf791fd4ea8a8bef5f576d6d8a1 SHA512 b82d1f9e6cd6bc3b3228ceb8f5f0679e8dd95c2200328accafa0ee9fd4b4065367e071d0fa718ecdc34e11c6b14456a671d4e8e74d2b56dea4e8fc3db73c4392 diff --git a/dev-java/bsf/bsf-2.4.0-r3.ebuild b/dev-java/bsf/bsf-2.4.0-r3.ebuild deleted file mode 100644 index ce4e977848a5..000000000000 --- a/dev-java/bsf/bsf-2.4.0-r3.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -JAVA_PKG_IUSE="doc examples source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Bean Script Framework" -HOMEPAGE="https://commons.apache.org/proper/commons-bsf/" -SRC_URI="mirror://apache/commons/bsf/source/${PN}-src-${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2.3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~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 python tcl" - -CDEPEND=" - python? ( - dev-java/jython:2.7 - ) - javascript? ( - dev-java/rhino:1.6 - ) - tcl? ( - dev-java/jacl:0 - ) - dev-java/xalan:0 - dev-java/commons-logging:0" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.8:*" - -JAVA_ANT_REWRITE_CLASSPATH="yes" - -src_prepare() { - default - rm -v lib/*.jar || die - rm samples/*/*.class || die - - java-ant_ignore-system-classes - - # somebody forgot to add them to source tarball... fetched from svn - cp "${FILESDIR}/${P}-build-properties.xml" build-properties.xml || die - - # Silence javadoc. - java-ant_xml-rewrite -f build.xml -c \ - -e javadoc \ - -a failonerror \ - -v no - - # http://bugs.jython.org/issue1814 - # Also, bsf is an old project (2011) and hasn't officially taken the leap to - # jython-2.7. This patch fixes the issue. - eapply "${FILESDIR}"/${P}-PyJavaInstance.patch -} - -src_compile() { - local pkgs="commons-logging,xalan" - local antflags="-Dxalan.present=true" - - if use python; then - antflags="${antflags} -Djython.present=true" - pkgs="${pkgs},jython-2.7" - fi - if use javascript; then - antflags="${antflags} -Drhino.present=true" - pkgs="${pkgs},rhino-1.6" - fi - if use tcl; then - antflags="${antflags} -Djacl.present=true" - pkgs="${pkgs},jacl" - fi - - local cp="$(java-pkg_getjars ${pkgs})" - eant -Dgentoo.classpath="${cp}" ${antflags} jar - - # stupid clean - mv build/lib/${PN}.jar "${S}" || die - use doc && eant -Dgentoo.classpath="${cp}" ${antflags} javadocs -} - -src_install() { - java-pkg_dojar ${PN}.jar - - java-pkg_dolauncher ${PN} --main org.apache.bsf.Main - - dodoc CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt - - use doc && java-pkg_dojavadoc build/javadocs - use examples && java-pkg_doexamples samples - use source && java-pkg_dosrc src/org - - java-pkg_register-optional-dependency bsh,groovy-1,jruby -} - -pkg_postinst() { - elog "Support for python, javascript, and tcl is controlled via USE flags." - elog "Also, following languages can be supported just by installing" - elog "respective package with USE=\"bsf\": BeanShell (dev-java/bsh)," - elog "Groovy (dev-java/groovy) and JRuby (dev-java/jruby)" -} diff --git a/dev-java/bsf/bsf-2.4.0-r5.ebuild b/dev-java/bsf/bsf-2.4.0-r5.ebuild new file mode 100644 index 000000000000..b3abd4a8391e --- /dev/null +++ b/dev-java/bsf/bsf-2.4.0-r5.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Bean Script Framework" +HOMEPAGE="https://commons.apache.org/proper/commons-bsf/" +SRC_URI="mirror://apache/commons/bsf/source/bsf-src-${PV}.tar.gz + verify-sig? ( https://downloads.apache.org/commons/bsf/source/bsf-src-${PV}.tar.gz.asc )" +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" + +# If you add new ones, add them to ant-apache-bsf too for use dependencies +IUSE="javascript tcl" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" +CDEPEND=" + dev-java/commons-logging:0 + dev-java/xalan:0 + javascript? ( dev-java/rhino:1.6 ) + tcl? ( dev-java/jacl:0 ) +" +DEPEND="${CDEPEND} + >=virtual/jdk-1.8:*" +RDEPEND="${CDEPEND} + >=virtual/jre-1.8:*" + +DOCS=( CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt ) + +JAVA_GENTOO_CLASSPATH=" + commons-logging + xalan +" +JAVA_MAIN_CLASS="org.apache.bsf.Main" +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR="src" + +src_prepare() { + java-pkg-2_src_prepare + rm -r src/org/apache/bsf/engines/{java,javaclass,jython,netrexx} || die + if use javascript; then + JAVA_GENTOO_CLASSPATH+=" rhino-1.6" + else + rm -r src/org/apache/bsf/engines/javascript || die + fi + if use tcl; then + JAVA_GENTOO_CLASSPATH+=" jacl" + else + rm -r src/org/apache/bsf/engines/jacl || die + fi + # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS + mkdir res || die "create res" + pushd src > /dev/null || die "pushd" + find -type f -name '*.properties' \ + | xargs cp --parent -t ../res || die "copy resources" + popd > /dev/null +} + +src_install() { + java-pkg-simple_src_install +# java-pkg_register-optional-dependency bsh,groovy-1,jruby +} + +pkg_postinst() { + elog "Support for javascript and tcl is controlled via USE flags." + elog "Also, following languages can be supported just by installing" + elog "respective package with USE=\"bsf\": BeanShell (dev-java/bsh)," + elog "Groovy (dev-java/groovy) and JRuby (dev-java/jruby)" +} diff --git a/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch b/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch deleted file mode 100644 index 4e8c4de7b015..000000000000 --- a/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/src/org/apache/bsf/engines/jython/JythonEngine.java.orig 2015-07-04 08:00:17.120000000 +0000 -+++ b/src/org/apache/bsf/engines/jython/JythonEngine.java 2015-07-04 08:04:55.230000000 +0000 -@@ -26,7 +26,7 @@ - import org.apache.bsf.util.BSFFunctions; - import org.python.core.Py; - import org.python.core.PyException; --import org.python.core.PyJavaInstance; -+import org.python.core.PyJavaType; - import org.python.core.PyObject; - import org.python.util.InteractiveInterpreter; - -@@ -110,8 +110,9 @@ - - Object result = interp.eval ("bsf_temp_fn()"); - -- if (result != null && result instanceof PyJavaInstance) -- result = ((PyJavaInstance)result).__tojava__(Object.class); -+ if (result != null && result instanceof PyJavaType) -+ //result = ((PyJavaInstance)result).__tojava__(Object.class); -+ result = PyJavaType.wrapJavaObject(result).__tojava__(Object.class); - return result; - } catch (PyException e) { - throw new BSFException (BSFException.REASON_EXECUTION_ERROR, -@@ -126,8 +127,9 @@ - Object script) throws BSFException { - try { - Object result = interp.eval (byteify(script.toString ())); -- if (result != null && result instanceof PyJavaInstance) -- result = ((PyJavaInstance)result).__tojava__(Object.class); -+ if (result != null && result instanceof PyJavaType) -+ //result = ((PyJavaInstance)result).__tojava__(Object.class); -+ result = PyJavaType.wrapJavaObject(result).__tojava__(Object.class); - return result; - } catch (PyException e) { - throw new BSFException (BSFException.REASON_EXECUTION_ERROR, diff --git a/dev-java/bsf/files/bsf-2.4.0-build-properties.xml b/dev-java/bsf/files/bsf-2.4.0-build-properties.xml deleted file mode 100644 index 6d716ed00563..000000000000 --- a/dev-java/bsf/files/bsf-2.4.0-build-properties.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<project name="props"> - <property name="project.name" value="bsf"/> - <property name="project.fullName" value="Bean Scripting Framework"/> - <property name="project.version" value="2.4.0"/> - <property name="project.debug" value="on"/> - <property name="project.deprecation" value="on"/> - - <property name="build.file" value="build.xml"/> - <property name="build.properties.file" value="build-properties.xml"/> - <property name="build.dir" value="build"/> - <property name="build.dest" value="build/classes"/> - <property name="build.lib" value="build/lib"/> - <property name="build.lib.win32" value="build/lib/win32"/> - <property name="build.samples" value="build/samples"/> - <property name="build.samples.calc" value="build/samples/calc"/> - <property name="build.samples.scriptedui" value="build/samples/scriptedui"/> - <property name="build.samples.xsl" value="build/samples/xsl"/> - <property name="build.javadocs" value="build/javadocs"/> - <property name="build.tests" value="build/testcases" /> - - <property name="dist.dir" value="dist"/> - <property name="dist.dir.root" value="${dist.dir}/${project.name}-${project.version}"/> - <property name="dist.bin.file" value="${dist.dir}/${project.name}-bin-${project.version}"/> - <property name="dist.src.file" value="${dist.dir}/${project.name}-src-${project.version}"/> - - <property name="packages" value="org.apache.*"/> - - <property name="samples.dir" value="samples"/> - - <property name="site.src" location="xdocs"/> - <property name="site.dest" location="docs"/> - <property name="site.projectFile" value="stylesheets/project.xml"/> - - <property name="source.level" value="1.4" /> - - <property name="src.dir" value="src"/> - - <property name="templ.path" location="xdocs/stylesheets"/> - - <property name="tests.dir" value="test"/> - - <property name="velocity.props" location="${site.src}/velocity.properties"/> -</project> diff --git a/dev-java/bsf/metadata.xml b/dev-java/bsf/metadata.xml index b193994fe63e..90f0e6f3943c 100644 --- a/dev-java/bsf/metadata.xml +++ b/dev-java/bsf/metadata.xml @@ -5,7 +5,9 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> - +<upstream> + <remote-id type="github">apache/commons-bsf</remote-id> +</upstream> <longdescription> Bean Scripting Framework (BSF) is a set of Java classes which provides scripting language support within Java applications, and access to Java diff --git a/dev-java/byaccj/byaccj-1.15-r3.ebuild b/dev-java/byaccj/byaccj-1.15-r3.ebuild index 70d92d0ce0ef..a7d59bbf3ade 100644 --- a/dev-java/byaccj/byaccj-1.15-r3.ebuild +++ b/dev-java/byaccj/byaccj-1.15-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 @@ -8,7 +8,7 @@ inherit toolchain-funcs DESCRIPTION="A Java extension of BSD YACC-compatible parser generator" HOMEPAGE="https://byaccj.sourceforge.net/" MY_P="${PN}${PV}_src" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" LICENSE="public-domain" SLOT="0" diff --git a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild index fe4312864b67..4111832765af 100644 --- a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild +++ b/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ inherit java-pkg-2 java-ant-2 DESCRIPTION="JDBC drivers with JNDI-bindable DataSources" HOMEPAGE="https://www.mchange.com/projects/c3p0/" -SRC_URI="mirror://sourceforge/project/c3p0/c3p0-src/c3p0-${PV}/${P}.src.tgz" +SRC_URI="https://downloads.sourceforge.net/project/c3p0/c3p0-src/c3p0-${PV}/${P}.src.tgz" LICENSE="|| ( EPL-1.0 LGPL-2.1 )" SLOT="0" diff --git a/dev-java/caffeine/Manifest b/dev-java/caffeine/Manifest new file mode 100644 index 000000000000..5fe009e7d56c --- /dev/null +++ b/dev-java/caffeine/Manifest @@ -0,0 +1 @@ +DIST caffeine-2.6.2-sources.jar 715580 BLAKE2B 882cac33d205c8186232c64010b4e25e805d3d188d6a9e6ca151187b55d5ee3a3d5641566f5e8d32de596fab3dae8967c74f3d60e2321b34374ce996382322fe SHA512 52a8c67648e2a6bb1c600d99712473a64911f2b6c8fe6c924ba98e72b4b040a1094fa5c93ae2bae8734d352634bc72960711afd152566ef02f6bad4c84e510c8 diff --git a/dev-java/caffeine/caffeine-2.6.2-r1.ebuild b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild new file mode 100644 index 000000000000..673e2da08617 --- /dev/null +++ b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild @@ -0,0 +1,33 @@ +# 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 ppc64 x86" + +BDEPEND="app-arch/unzip" +CP_DEPEND="dev-java/jsr305: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/caffeine/metadata.xml b/dev-java/caffeine/metadata.xml new file mode 100644 index 000000000000..8168da8f9820 --- /dev/null +++ b/dev-java/caffeine/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">ben-manes/caffeine</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/cglib/cglib-3.3.0-r1.ebuild b/dev-java/cglib/cglib-3.3.0-r2.ebuild index 64fd2b7900fc..fc4bba040586 100644 --- a/dev-java/cglib/cglib-3.3.0-r1.ebuild +++ b/dev-java/cglib/cglib-3.3.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 EAPI=8 @@ -16,26 +16,25 @@ MY_P=cglib-${MY_PV} DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library" HOMEPAGE="https://github.com/cglib/cglib" SRC_URI="https://github.com/cglib/cglib/archive//${MY_PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}" LICENSE="Apache-2.0" SLOT="3" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -CDEPEND="dev-java/ant-core:0 +CP_DEPEND=" + >=dev-java/ant-1.10.14-r3:0 dev-java/asm:9 " DEPEND=" >=virtual/jdk-1.8:* - ${CDEPEND} + ${CP_DEPEND} " RDEPEND=" >=virtual/jre-1.8:* - ${CDEPEND} + ${CP_DEPEND} " -S="${WORKDIR}" - -JAVA_GENTOO_CLASSPATH="asm-9 ant-core" JAVA_SRC_DIR="${MY_P}/${PN}/src/main/java" JAVA_RESOURCE_DIRS="${MY_P}/${PN}/src/main/resources" @@ -54,7 +53,8 @@ src_test() { # Caused by: net.sf.cglib.core.CodeGenerationException: # java.lang.reflect.InaccessibleObjectException-->Unable to make protected final java.lang.Class # java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain) - # throws java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @42bb2aee + # throws java.lang.ClassFormatError accessible: \ + # module java.base does not "opens java.lang" to unnamed module @42bb2aee local vm_version="$(java-config -g PROVIDES_VERSION)" if ver_test "${vm_version}" -ge "17" ; then diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest index 420abc50100b..a5959914cdf3 100644 --- a/dev-java/checker-framework-qual/Manifest +++ b/dev-java/checker-framework-qual/Manifest @@ -1 +1 @@ -DIST checker-framework-3.14.0.tar.gz 7788010 BLAKE2B e05647b7a551cb1e53c32ea65c1d5a28ed7a968310223664704722c58b6df188e80581df383937fef6ebed5042e7234281b55069fde1f4cb34853495c4e2fbff SHA512 14be47e823ba67b6fcb7a8033632a2dd56341bd0d2a56c7501b50eab5e471622372eb4b62f4e78e33be019c15f44d075d146ece98fa3316e7cb24346db98c238 +DIST checker-framework-3.43.0.tar.gz 8306595 BLAKE2B bcabe8e5a0de20615980048780528b6fcb1946f8793b9cd7c3b12afeb4688c6eb91724fd111419a243801b1456537cd40994d062f2ac341e904c93c285c530ad SHA512 73f6d6d45cf926b23160fc6089596f27b33b1ae6b8489aa3a2c2e0d8330331c331ce87d0826de8f512432d469f96330e77a4323082b3db4af5f5abf81ba06295 diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild index 57becae21d2e..5831dfb7010b 100644 --- a/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild +++ b/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild @@ -1,19 +1,18 @@ -# 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 -MY_PN="${PN%-qual}" -MY_P="${MY_PN}-${PV}" JAVA_PKG_IUSE="doc source" -JAVA_TESTING_FRAMEWORKS="junit" MAVEN_ID="org.checkerframework:checker-qual:${PV}" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Annotations for type-checking by the Checker Framework" HOMEPAGE="https://checkerframework.org/" -SRC_URI="https://codeload.github.com/typetools/${MY_PN}/tar.gz/refs/tags/${MY_P} -> ${MY_P}.tar.gz" +SRC_URI="https://github.com/typetools/checker-framework/archive/checker-framework-${PV}.tar.gz" +S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual" + LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" @@ -21,6 +20,5 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}/${MY_PN}-${MY_P}/checker-qual" - +JAVA_AUTOMATIC_MODULE_NAME="org.checkerframework.checker.qual" JAVA_SRC_DIR="src/main/java/org/checkerframework/" diff --git a/dev-java/checker-framework-qual/metadata.xml b/dev-java/checker-framework-qual/metadata.xml index ca606ae4ec36..29b8e33bf4e4 100644 --- a/dev-java/checker-framework-qual/metadata.xml +++ b/dev-java/checker-framework-qual/metadata.xml @@ -5,6 +5,9 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> + <upstream> + <remote-id type="github">typetools/checker-framework</remote-id> + </upstream> <longdescription> The Checker Framework enhances Java's type system to make it more powerful and useful. This lets software developers detect diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest index fe0438633a4b..3d0920954f02 100644 --- a/dev-java/commons-beanutils/Manifest +++ b/dev-java/commons-beanutils/Manifest @@ -1 +1,3 @@ DIST commons-beanutils-1.9.4-src.tar.gz 412606 BLAKE2B 213a2ad4d976ed4c55c9a73c0970a656e2f03efcba886369c8be164e04618937ad636ce7ffa6aa7b981e9595b24e4cbacc2bc632268bbfede8172091ef6eb4ff SHA512 6f3d30d02b9a66cf20509bd868c6e2dadb44bb27da1e6b9af7275675e0f3826845a5d4005509dd1eb77a5b2937820c4770a3753daaab072785dcdab0caa69e73 +DIST commons-beanutils-1.9.4-src.tar.gz.asc 833 BLAKE2B c971231cfb034bd9bbbd6e7801a4fcb54853c0d18872cfae81ce761fc8f71ebb70955456827ad33b4abd4df8c9820031fd49f28c50eddef5251b2a0d1b01cff9 SHA512 2a966959b2c94bf013df71885c2906a092b43a0ac6d63963f1462e7c09376964bb948c0681278a58fffae6716d042dc846b1649e1f4b0816e2adb3733bf14451 +DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230 diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild deleted file mode 100644 index a4b3175fa186..000000000000 --- a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild +++ /dev/null @@ -1,101 +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/beanutils/source/1.9.4-src.tar.gz --slot 1.7 --keywords "~amd64 ~x86 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos" --ebuild commons-beanutils-1.9.4.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="commons-beanutils:commons-beanutils:1.9.4" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Provides easy-to-use wrappers around Reflection and Introspection APIs" -HOMEPAGE="https://commons.apache.org/proper/commons-beanutils/" -SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1.7" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos" - -# Common dependencies -# POM: pom.xml -# commons-collections:commons-collections:3.2.2 -> >=dev-java/commons-collections-3.2.2:0 -# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 - -CP_DEPEND=" - dev-java/commons-collections:0 - dev-java/commons-logging:0 -" - -# Compile dependencies -# POM: pom.xml -# test? commons-collections:commons-collections-testframework:3.2.1 -> !!!artifactId-not-found!!! -# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4 - -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8:* - test? ( - dev-java/commons-collections:0[test] - )" - -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" - -DOCS=( {CONTRIBUTING,README}.md {LICENSE,NOTICE,RELEASE-NOTES}.txt ) - -S="${WORKDIR}/${P}-src" - -JAVA_ENCODING="iso-8859-1" - -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="commons-collections,junit-4" -JAVA_TEST_SRC_DIR="src/test/java" - -JAVA_TEST_EXCLUDES=( - # Upstream: Tests run: 1293, Failures: 0, Errors: 0, Skipped: 3 - "org.apache.commons.beanutils.TestBeanPublicSubclass" # Invalid test class - "org.apache.commons.beanutils.TestBeanPackageSubclass" # Invalid test class - "org.apache.commons.beanutils.TestResultSetMetaData" # Invalid test class - "org.apache.commons.beanutils.TestResultSet" # Test class can only have one constructor - "org.apache.commons.beanutils.TestBean" # Test class can only have one constructor - # https://github.com/apache/commons-beanutils/blob/32ceb2c92512d44f97638805e2f3fd9d70dfcfc6/pom.xml#L378-L383 - # <!-- This test case is known to fail, and there isn't any proposed fix - # - so we will just exclude it until someone comes up with a solution. - # --> - "org.apache.commons.beanutils.converters.MemoryTestCase" -) - -src_test() { - # There were 8 failures: - # 1) testPropertyUtilsBean_descriptorsCache_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase) - # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects - # 2) testPropertyUtilsBean_mappedDescriptorsCache_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase) - # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects - # 3) testMappedPropertyDescriptor_MappedMethodReference1(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase) - # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects - # 4) testMappedPropertyDescriptor_MappedMethodReference2(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase) - # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects - # 5) testLocaleConvertUtilsBean_converters_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase) - # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects - # 6) testWrapDynaClass_dynaClasses_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase) - # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects - # 7) testMethodUtils_cache_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase) - # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects - # 8) testConvertUtilsBean_converters_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase) - # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects - local vm_version="$(java-config -g PROVIDES_VERSION)" - if [[ "${vm_version}" == "11" ]] ; then - JAVA_TEST_EXCLUDES+=( "org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase" ) - fi - - java-pkg-simple_src_test -} - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} 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 new file mode 100644 index 000000000000..ba6bfd171173 --- /dev/null +++ b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild @@ -0,0 +1,84 @@ +# 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-beanutils:commons-beanutils:1.9.4" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Provides easy-to-use wrappers around Reflection and Introspection APIs" +HOMEPAGE="https://commons.apache.org/proper/commons-beanutils/" +# We need some test classes of commons-collections which are not part of the jar file. +ACC="commons-collections-3.2.2" +SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz + test? ( https://archive.apache.org/dist/commons/collections/source/${ACC}-src.tar.gz ) + verify-sig? ( https://downloads.apache.org/commons/beanutils/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/${P}-src" + +LICENSE="Apache-2.0" +SLOT="1.7" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~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 )" +CP_DEPEND=" + dev-java/commons-collections:0 + dev-java/commons-logging:0 +" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +DOCS=( {CONTRIBUTING,README}.md {NOTICE,RELEASE-NOTES}.txt ) + +JAVA_ENCODING="iso-8859-1" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="junit-4 " +JAVA_TEST_SRC_DIR=( + src/test/java + ../"${ACC}"-src/src/test +) + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc} + fi + default +} + +src_test() { + export LC_ALL="en_US.UTF-8" + # Apply patch to unpacked commons-collections + pushd "../${ACC}-src" >> /dev/null || die + eapply "${FILESDIR}/${ACC}-fixes.patch" + popd + + pushd src/test/java || die + # Selection according to lines 375-383 pom.xml + local JAVA_TEST_RUN_ONLY=$(find * \ + -path "**/*TestCase.java" \ + ! -path "**/*MemoryTestCase.java" \ + ! -path "**/*MemoryLeakTestCase.java" \ + ! -path "**/*LocaleBeanificationTestCase.java" \ + ! -path "**/Jira347TestCase.java" \ + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + + # We skip 2 more test classes conditionally which have failures with Java 21 + # Error converting 'String' to 'java.sql.Time' using pattern 'h:mm a' + # Error converting 'String' to 'java.sql.Timestamp' using pattern 'M/d/yy, h:mm a' + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge "21"; then + JAVA_TEST_RUN_ONLY=${JAVA_TEST_RUN_ONLY//org.apache.commons.beanutils.converters.SqlTimeConverterTestCase} + JAVA_TEST_RUN_ONLY=${JAVA_TEST_RUN_ONLY//org.apache.commons.beanutils.converters.SqlTimestampConverterTestCase} + fi + + java-pkg-simple_src_test +} diff --git a/dev-java/commons-beanutils/files/commons-collections-3.2.2-fixes.patch b/dev-java/commons-beanutils/files/commons-collections-3.2.2-fixes.patch new file mode 100644 index 000000000000..2f1380a06ffc --- /dev/null +++ b/dev-java/commons-beanutils/files/commons-collections-3.2.2-fixes.patch @@ -0,0 +1,187 @@ +Patch stolen from: +From e90a6173247f06514731825677f3fc67c62bdc52 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miroslav=20=C5=A0ulc?= <fordfrog@gentoo.org> +Date: Wed, 21 Apr 2021 11:31:11 +0200 +--- a/build.xml ++++ b/build.xml +@@ -154,8 +154,7 @@ + + <!-- NOTE: A jar built using JDK1.4 is incompatible with JDK1.2 --> + <jar jarfile="${build.jar.name}" +- basedir="${build.classes}" +- manifest="${build.conf}/MANIFEST.MF"/> ++ basedir="${build.classes}"/> + </target> + + <!-- ====================================================================== --> +--- a/src/java/org/apache/commons/collections/MultiHashMap.java ++++ b/src/java/org/apache/commons/collections/MultiHashMap.java +@@ -331,7 +331,7 @@ public class MultiHashMap extends HashMap implements MultiMap { + * @param item the value to remove + * @return the value removed (which was passed in), null if nothing removed + */ +- public Object remove(Object key, Object item) { ++ public Object removeMapping(Object key, Object item) { + Collection valuesForKey = getCollection(key); + if (valuesForKey == null) { + return null; +--- a/src/java/org/apache/commons/collections/MultiMap.java ++++ b/src/java/org/apache/commons/collections/MultiMap.java +@@ -66,7 +66,7 @@ public interface MultiMap extends Map { + * @throws ClassCastException if the key or value is of an invalid type + * @throws NullPointerException if the key or value is null and null is invalid + */ +- public Object remove(Object key, Object item); ++ public Object removeMapping(Object key, Object item); + + //----------------------------------------------------------------------- + /** +--- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java ++++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java +@@ -197,7 +197,7 @@ public class MultiKeyMap + * @param key2 the second key + * @return the value mapped to the removed key, null if key not in map + */ +- public Object remove(Object key1, Object key2) { ++ public Object removeMultiKey(Object key1, Object key2) { + int hashCode = hash(key1, key2); + int index = map.hashIndex(hashCode, map.data.length); + AbstractHashedMap.HashEntry entry = map.data[index]; +--- a/src/java/org/apache/commons/collections/map/MultiValueMap.java ++++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java +@@ -153,7 +153,7 @@ public class MultiValueMap extends AbstractMapDecorator implements MultiMap { + * @param value the value to remove + * @return the value removed (which was passed in), null if nothing removed + */ +- public Object remove(Object key, Object value) { ++ public Object removeMapping(Object key, Object value) { + Collection valuesForKey = getCollection(key); + if (valuesForKey == null) { + return null; +--- a/src/test/org/apache/commons/collections/TestMultiHashMap.java ++++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java +@@ -217,7 +217,7 @@ public class TestMultiHashMap extends AbstractTestMap { + MultiHashMap one = new MultiHashMap(); + Integer value = new Integer(1); + one.put("One", value); +- one.remove("One", value); ++ one.removeMapping("One", value); + + MultiHashMap two = new MultiHashMap(); + assertEquals(two, one); +@@ -269,7 +269,7 @@ public class TestMultiHashMap extends AbstractTestMap { + assertEquals(4, map.totalSize()); + map.remove("A"); + assertEquals(3, map.totalSize()); +- map.remove("B", "BC"); ++ map.removeMapping("B", "BC"); + assertEquals(2, map.totalSize()); + } + +@@ -292,7 +292,7 @@ public class TestMultiHashMap extends AbstractTestMap { + map.remove("A"); + assertEquals(0, map.size("A")); + assertEquals(3, map.size("B")); +- map.remove("B", "BC"); ++ map.removeMapping("B", "BC"); + assertEquals(0, map.size("A")); + assertEquals(2, map.size("B")); + } +@@ -464,11 +464,11 @@ public class TestMultiHashMap extends AbstractTestMap { + map.put("A", "AA"); + map.put("A", "AB"); + map.put("A", "AC"); +- assertEquals(null, map.remove("C", "CA")); +- assertEquals(null, map.remove("A", "AD")); +- assertEquals("AC", map.remove("A", "AC")); +- assertEquals("AB", map.remove("A", "AB")); +- assertEquals("AA", map.remove("A", "AA")); ++ assertEquals(null, map.removeMapping("C", "CA")); ++ assertEquals(null, map.removeMapping("A", "AD")); ++ assertEquals("AC", map.removeMapping("A", "AC")); ++ assertEquals("AB", map.removeMapping("A", "AB")); ++ assertEquals("AA", map.removeMapping("A", "AA")); + assertEquals(new MultiHashMap(), map); + } + +--- a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java ++++ b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java +@@ -1116,7 +1116,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { + verify(); + + try { +- array = collection.toArray(null); ++ array = collection.toArray((Object[]) null); + fail("toArray(null) should raise NPE"); + } catch (NullPointerException e) { + // expected +--- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java ++++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java +@@ -315,10 +315,10 @@ public class TestMultiKeyMap extends AbstractTestIterableMap { + switch (key.size()) { + case 2: + assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1))); +- assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1))); ++ assertEquals(value, multimap.removeMultiKey(key.getKey(0), key.getKey(1))); + assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1))); + assertEquals(size - 1, multimap.size()); +- assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1))); ++ assertEquals(null, multimap.removeMultiKey(key.getKey(0), key.getKey(1))); + assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1))); + break; + case 3: +--- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java ++++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java +@@ -161,7 +161,7 @@ public class TestMultiValueMap extends TestCase { + MultiValueMap one = new MultiValueMap();
+ Integer value = new Integer(1);
+ one.put("One", value);
+- one.remove("One", value);
++ one.removeMapping("One", value);
+
+ MultiValueMap two = new MultiValueMap();
+ assertEquals(two, one);
+@@ -187,7 +187,7 @@ public class TestMultiValueMap extends TestCase { + assertEquals(4, map.totalSize());
+ map.remove("A");
+ assertEquals(3, map.totalSize());
+- map.remove("B", "BC");
++ map.removeMapping("B", "BC");
+ assertEquals(2, map.totalSize());
+ }
+
+@@ -204,7 +204,7 @@ public class TestMultiValueMap extends TestCase { + assertEquals(2, map.size());
+ map.remove("A");
+ assertEquals(2, map.size());
+- map.remove("B", "BC");
++ map.removeMapping("B", "BC");
+ assertEquals(2, map.size());
+ }
+
+@@ -227,7 +227,7 @@ public class TestMultiValueMap extends TestCase { + map.remove("A");
+ assertEquals(0, map.size("A"));
+ assertEquals(3, map.size("B"));
+- map.remove("B", "BC");
++ map.removeMapping("B", "BC");
+ assertEquals(0, map.size("A"));
+ assertEquals(2, map.size("B"));
+ }
+@@ -338,11 +338,11 @@ public class TestMultiValueMap extends TestCase { + map.put("A", "AA");
+ map.put("A", "AB");
+ map.put("A", "AC");
+- assertEquals(null, map.remove("C", "CA"));
+- assertEquals(null, map.remove("A", "AD"));
+- assertEquals("AC", map.remove("A", "AC"));
+- assertEquals("AB", map.remove("A", "AB"));
+- assertEquals("AA", map.remove("A", "AA"));
++ assertEquals(null, map.removeMapping("C", "CA"));
++ assertEquals(null, map.removeMapping("A", "AD"));
++ assertEquals("AC", map.removeMapping("A", "AC"));
++ assertEquals("AB", map.removeMapping("A", "AB"));
++ assertEquals("AA", map.removeMapping("A", "AA"));
+ assertEquals(new MultiValueMap(), map);
+ }
+
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest index c9d10fb3e58a..6493f8c68cff 100644 --- a/dev-java/commons-codec/Manifest +++ b/dev-java/commons-codec/Manifest @@ -1,2 +1,2 @@ -DIST commons-codec-1.16.0-src.tar.gz 447581 BLAKE2B 111151b4cf409dbc6f69106ed30f2cfd60a1ab3aa15eb0cfe80ff1c2a06875f6856e387f66751c26f58dc29907ae7a03b16f23f7860114839df298a6c37d9fdd SHA512 5212beae43a59d5a92c80f87640278913bf07d6527ead573710391a8b5c813af67f8086de5cd80f4b06845752652684d7c28f6236f5a8bd0bd6a8b89dc0d9532 -DIST commons-codec-1.16.0-src.tar.gz.asc 488 BLAKE2B 96ac95b5efbc812b5df0d002eeff874ff23e05e0229e4f49bf29aaf9c75b32845adeb803c9c8d4d3b190bf2bfab626c59cb2fa2b2439b5611b158d27b73d4c0c SHA512 03f9281e93cd4a1cf42878bd25045368bc72a50edace9b38a977658e7e83b45bfe835065e80e0838a5e57d16a8737624ab388cdcd3fee58ec2114ff4fc241816 +DIST commons-codec-1.16.1-src.tar.gz 450009 BLAKE2B da06c823fae5e106c27b10274fb159e3de62827fe1bb1ace8d65377da26d012534636a8ac58a558b653ba3a7e868bb2f7d94b2ea820b5ddc6400fd4d288c6ba9 SHA512 8e2d40ae625c04e61b0dd7473dea0b32fdd13a6d3aad47b8b052952ca46f57d3df4917133f523ea147305a1c7ed9267cce7c4fa34d901496e36e9d5de9856e61 +DIST commons-codec-1.16.1-src.tar.gz.asc 488 BLAKE2B d3f193b602339714728875189ae90a49f70f9efb70076e73bdc460ccca99aea832a7cf0b18ecd212b016787f8cc96a1e30f9cb0af7b83f05db2dfba00d71c144 SHA512 a0716601374f17add25698eb5abd111c560c258f4ab18278b6bd857b2bf32916b5e4e590ce8c39a0bdef3b83e16e9330ce84268dec810db7dfab1679cace85af diff --git a/dev-java/commons-codec/commons-codec-1.16.0.ebuild b/dev-java/commons-codec/commons-codec-1.16.1.ebuild index 3f139af22920..96485a4fea70 100644 --- a/dev-java/commons-codec/commons-codec-1.16.0.ebuild +++ b/dev-java/commons-codec/commons-codec-1.16.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 diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest index 7038859c5ae2..ce4044f37b42 100644 --- a/dev-java/commons-collections/Manifest +++ b/dev-java/commons-collections/Manifest @@ -1,3 +1,4 @@ DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230 DIST commons-collections-3.2.2-src.tar.gz.asc 819 BLAKE2B a7d170b03613cddddc284908d95287fc092c01b125c5adffebfc493daf9119e0c9d82fdc7d8ce1865ef45a1e015072f5a09181abcba5b17c9c48d7c6333279da SHA512 c5d33518ed5343b38c10e317f677266858bd9614eff7fdc13a2e0131fe71836c3694f49898843e6978496d7dd2f976b82922230a44cde1eac5f6cdfdb822dcd0 -DIST commons-collections-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee +DIST commons-collections4-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee +DIST commons-collections4-4.4-src.tar.gz.asc 499 BLAKE2B 8217d8c8714d2c07a66eca22069b40e2d1012881385172bedd29d52f14ae5c6e287ce2f097f1bde77af06677c776e45c3e67dc6c885709f6c97f61155252131c SHA512 533c47ad2cb6b6926ea8e4aaf9072b6c7a0c9d4a6becb31163a33a6cba8a9888534b74701935a0f0e797c10cbc688331d9abefc3d4085edcd9a7d29260f735ae diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild deleted file mode 100644 index 77421d30330b..000000000000 --- a/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild +++ /dev/null @@ -1,70 +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-collections:commons-collections:3.2.2" - -inherit java-pkg-2 java-ant-2 verify-sig - -DESCRIPTION="Jakarta-Commons Collections Component" -HOMEPAGE="https://commons.apache.org/collections/" -SRC_URI="https://archive.apache.org/dist/commons/collections/source/commons-collections-${PV}-src.tar.gz - verify-sig? ( https://archive.apache.org/dist/commons/collections/source/commons-collections-${PV}-src.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos" -RESTRICT="!test? ( test )" - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/junit:0 - dev-java/ant-junit:0 - )" - -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" - -S="${WORKDIR}/${P}-src" - -PATCHES=( - "${FILESDIR}/${P}-fixes.patch" -) - -src_prepare() { - default -} - -src_compile() { - local antflags - if use test; then - antflags="tf.jar -Djunit.jar=$(java-pkg_getjars --build-only junit)" - fi - eant jar $(use_doc) ${antflags} -} - -src_test() { - if [[ "${ARCH}" = "ppc" ]]; then - einfo "tests are disabled on ppc" - else - ANT_TASKS="ant-junit" eant testjar -Djunit.jar="$(java-pkg_getjars junit)" - fi -} - -src_install() { - java-pkg_newjar build/${P}.jar ${PN}.jar - use test && \ - java-pkg_newjar build/${PN}-testframework-${PV}.jar \ - ${PN}-testframework.jar - - java-pkg_dohtml *.html - if use doc; then - java-pkg_dojavadoc build/docs/apidocs - fi - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild new file mode 100644 index 000000000000..a292cac71fb2 --- /dev/null +++ b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="commons-collections:commons-collections:${PV}" +JAVA_TESTING_FRAMEWORKS="junit" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Jakarta-Commons Collections Component" +HOMEPAGE="https://commons.apache.org/collections/" +SRC_URI="https://archive.apache.org/dist/commons/collections/source/${P}-src.tar.gz + verify-sig? ( https://archive.apache.org/dist/commons/collections/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/${P}-src" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" +# broken with jdk:21 - https://bugs.gentoo.org/916445 +DEPEND=" + <=virtual/jdk-17:* + test? ( dev-java/junit:0 ) +" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {NOTICE,README,RELEASE-NOTES}.txt ) +HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html ) + +PATCHES=( "${FILESDIR}/${P}-fixes.patch" ) + +JAVA_SRC_DIR="src/java" +JAVA_TEST_GENTOO_CLASSPATH="junit" +JAVA_TEST_SRC_DIR="src/test" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} diff --git a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild deleted file mode 100644 index 5c4b6e0ebaee..000000000000 --- a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild commons-collections-4.4.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.commons:commons-collections4:4.4" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities" -HOMEPAGE="https://commons.apache.org/proper/commons-collections/" -SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> ${P}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Compile dependencies -# POM: pom.xml -# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4 -# test? org.apache.commons:commons-lang3:3.9 -> >=dev-java/commons-lang-3.12.0:3.6 -# test? org.easymock:easymock:4.0.2 -> !!!suitable-mavenVersion-not-found!!! - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/easymock:3.2 - dev-java/commons-lang:3.6 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* -" - -DOCS=( {CONTRIBUTING,README}.md {LICENSE,NOTICE,RELEASE-NOTES}.txt ) -HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html ) - -S="${WORKDIR}/commons-collections4-${PV}-src" - -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6,easymock-3.2" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.collections4" - -src_test() { - # https://github.com/apache/commons-collections/blob/cab58b3a8093a2f6b84f12783a3fb358747310f7/pom.xml#L542-L550 - pushd src/test/java || die - local TESTS=$(find * -name "*Test.java" ! -name "TestUtils.java" ! -name "Abstract*.java" ! -name "BulkTest.java") - TESTS="${TESTS//.java}" - TESTS="${TESTS//\//.}" - popd - - JAVA_TEST_RUN_ONLY=( "${TESTS}" ) - java-pkg-simple_src_test -} - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/commons-collections/commons-collections-4.4-r2.ebuild b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild new file mode 100644 index 000000000000..059e87b91233 --- /dev/null +++ b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.commons:commons-collections4:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities" +HOMEPAGE="https://commons.apache.org/proper/commons-collections/" +SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/collections/source/${PN}4-${PV}-src.tar.gz.asc )" +S="${WORKDIR}/commons-collections4-${PV}-src" + +LICENSE="Apache-2.0" +SLOT="4" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" +# broken with jdk:21 - https://bugs.gentoo.org/916445 +DEPEND=" + <=virtual/jdk-17:* + test? ( + dev-java/easymock:3.2 + dev-java/commons-lang:3.6 + ) +" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {CONTRIBUTING,README}.md {NOTICE,RELEASE-NOTES}.txt ) +HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html ) + +JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.collections4" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH=" + commons-lang-3.6 + easymock-3.2 + junit-4 +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +src_test() { + # https://github.com/apache/commons-collections/blob/commons-commons-collections-4.4/pom.xml#L542-L550 + pushd src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -name "*Test.java" \ + ! -name "TestUtils.java" \ + ! -name "Abstract*.java" \ + ! -name "BulkTest.java") + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + popd + java-pkg-simple_src_test +} diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml index 62a57c23950f..23e31dd764c3 100644 --- a/dev-java/commons-collections/metadata.xml +++ b/dev-java/commons-collections/metadata.xml @@ -5,6 +5,12 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> + <upstream> + <bugs-to>https://issues.apache.org/jira/projects/COLLECTIONS/issues</bugs-to> + <changelog>https://commons.apache.org/proper/commons-collections/changes-report.html</changelog> + <doc>https://commons.apache.org/proper/commons-collections/userguide.html</doc> + <remote-id type="github">apache/commons-collections</remote-id> + </upstream> <longdescription> The Apache Commons Collections package contains types that extend and augment the Java Collections Framework. </longdescription> diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest index e433074b748e..531be855daa7 100644 --- a/dev-java/commons-compress/Manifest +++ b/dev-java/commons-compress/Manifest @@ -1 +1,2 @@ -DIST commons-compress-1.21-src.tar.gz 15165800 BLAKE2B 3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a SHA512 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1 +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 diff --git a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild b/dev-java/commons-compress/commons-compress-1.21-r1.ebuild deleted file mode 100644 index 40cf830dd60a..000000000000 --- a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild +++ /dev/null @@ -1,121 +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://apache.miloslavbrada.cz//commons/compress/source/commons-compress-1.21-src.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~x86" --ebuild commons-compress-1.21.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.commons:commons-compress:1.21" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -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" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# asm:asm:3.2 -> !!!groupId-not-found!!! -# com.github.luben:zstd-jni:1.5.0-2 -> >=dev-java/zstd-jni-1.5.0.5:0 -# org.brotli:dec:0.1.2 -> >=dev-java/brotli-dec-0.1.2:0 -# org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0 - -CP_DEPEND=" - dev-java/asm:9 - dev-java/brotli-dec:0 - dev-java/xz-java:0 - dev-java/zstd-jni:0 -" - -# Compile dependencies -# POM: pom.xml -# org.osgi:osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0 -# POM: pom.xml -# test? com.github.marschall:memoryfilesystem:2.1.0 -> >=dev-java/memoryfilesystem-2.3.0:0 -# test? javax.inject:javax.inject:1 -> >=dev-java/javax-inject-1:0 -# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4 -# test? org.apache.felix:org.apache.felix.framework:7.0.0 -> >=dev-java/felix-framework-7.0.5:0 -# test? org.hamcrest:hamcrest:2.2 -> >=dev-java/hamcrest-2.2:0 -# test? org.mockito:mockito-core:3.11.1 -> >=dev-java/mockito-4.6.1:4 -# test? org.ops4j.pax.exam:pax-exam-cm:4.13.1 -> !!!groupId-not-found!!! -# test? org.ops4j.pax.exam:pax-exam-container-native:4.13.1 -> !!!groupId-not-found!!! -# test? org.ops4j.pax.exam:pax-exam-junit4:4.13.1 -> !!!groupId-not-found!!! -# test? org.ops4j.pax.exam:pax-exam-link-mvn:4.13.1 -> !!!groupId-not-found!!! -# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.36:0 - -DEPEND=" - >=virtual/jdk-11:* - ${CP_DEPEND} - dev-java/osgi-core:0 - test? ( - dev-java/felix-framework:0 - dev-java/hamcrest:0 - dev-java/javax-inject:0 - dev-java/memoryfilesystem:0 - dev-java/mockito:4 - dev-java/slf4j-api:0 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND}" - -S="${WORKDIR}/${P}-src" - -PATCHES=( - "${FILESDIR}/${P}-asm7+.patch" -) - -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" - -JAVA_TEST_GENTOO_CLASSPATH="memoryfilesystem,javax-inject,junit-4,felix-framework,hamcrest,mockito-4,slf4j-api" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -src_prepare() { - default - # error: package org.ops4j.pax.exam does not exist - # removing it costs 2 tests - rm src/test/java/org/apache/commons/compress/OsgiITest.java || die - - # java.io.FileNotFoundException: couldn't find zstandard.testdata.zst - # pom.xml lines 420-422 - tar xf src/test/resources/zstd-tests.tar \ - -C src/test/resources || die "cannot unpack zstd-tests.tar" - - # pom.xml lines 518-520 - tar xjf src/test/resources/zip64support.tar.bz2 \ - -C src/test/resources || die "cannot unpack zip64support.tar.bz2" - - JAVA_TEST_EXTRA_ARGS=( -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/zstd-jni/" ) -} - -JAVA_TEST_EXCLUDES=( - # No runnable methods - org.apache.commons.compress.archivers.TestArchiveStreamProvider - org.apache.commons.compress.compressors.TestCompressorStreamProvider - - # fails without useful message - org.apache.commons.compress.compressors.DetectCompressorTestCase # has 8 tests - - # These tests pass but they prevent printing test messages:: -# org.apache.commons.compress.compressors.pack200.Pack200UtilsTest # has 2 tests -# org.apache.commons.compress.compressors.FramedSnappyTestCase # has 5 tests -# org.apache.commons.compress.compressors.XZTestCase # has 4 tests -# org.apache.commons.compress.compressors.Pack200TestCase # has 15 tests -# org.apache.commons.compress.harmony.pack200.tests.PackingOptionsTest # has 12 tests -# org.apache.commons.compress.harmony.pack200.tests.ArchiveTest # has 9 tests -# org.apache.commons.compress.harmony.unpack200.tests.ArchiveTest # has 13 tests -) diff --git a/dev-java/commons-compress/commons-compress-1.26.1.ebuild b/dev-java/commons-compress/commons-compress-1.26.1.ebuild new file mode 100644 index 000000000000..c8764e448be2 --- /dev/null +++ b/dev-java/commons-compress/commons-compress-1.26.1.ebuild @@ -0,0 +1,43 @@ +# 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/files/commons-compress-1.21-asm7+.patch b/dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch deleted file mode 100644 index e20fa89787dc..000000000000 --- a/dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 7709c8be97147e8d5c5d7fa42d076504931ba9e0 Mon Sep 17 00:00:00 2001 -From: Stephan Blecher <token_github@blecher.at> -Date: Tue, 10 Aug 2021 14:39:21 +0200 -Subject: [PATCH] COMPRESS-582: update harmony to ASM >= 7.0 - ---- - pom.xml | 5 +-- - .../harmony/pack200/Pack200ClassReader.java | 2 +- - .../compress/harmony/pack200/Segment.java | 35 +++++++++++++++---- - .../harmony/pack200/tests/ArchiveTest.java | 0 - 4 files changed, 32 insertions(+), 10 deletions(-) - mode change 100644 => 100755 src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java - -diff --git a/pom.xml b/pom.xml -index 28f50f06a..1c6844d24 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -78,6 +78,7 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj. - <commons.jacoco.version>0.8.7</commons.jacoco.version> - <commons.japicmp.version>0.15.3</commons.japicmp.version> - <commons.javadoc.version>3.3.0</commons.javadoc.version> -+ <asm.version>7.0</asm.version> - </properties> - - <issueManagement> -@@ -119,9 +120,9 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj. - - <!-- Pack200 --> - <dependency> -- <groupId>asm</groupId> -+ <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> -- <version>3.2</version> -+ <version>${asm.version}</version> - <optional>true</optional> - </dependency> - -diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java -index 2a017bc01..7022b7b30 100644 ---- a/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java -+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java -@@ -40,7 +40,7 @@ public int readUnsignedShort(final int index) { - // Doing this to check whether last load-constant instruction was ldc (18) or ldc_w (19) - // TODO: Assess whether this impacts on performance - final int unsignedShort = super.readUnsignedShort(index); -- if (b[index - 1] == 19) { -+ if (index > 0 && b[index - 1] == 19) { - lastUnsignedShort = unsignedShort; - } else { - lastUnsignedShort = Short.MIN_VALUE; -diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java -index 0609aa4c2..1bc73a018 100644 ---- a/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java -+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java -@@ -32,12 +32,20 @@ - import org.objectweb.asm.FieldVisitor; - import org.objectweb.asm.Label; - import org.objectweb.asm.MethodVisitor; -+import org.objectweb.asm.Opcodes; - import org.objectweb.asm.Type; - -+ - /** - * A Pack200 archive consists of one or more Segments. - */ --public class Segment implements ClassVisitor { -+public class Segment extends ClassVisitor { -+ -+ public static int ASM_API = Opcodes.ASM4; /* see https://asm.ow2.io/javadoc/org/objectweb/asm/Opcodes.html#ASM4 */ -+ -+ public Segment() { -+ super(ASM_API); -+ } - - private SegmentHeader segmentHeader; - private CpBands cpBands; -@@ -255,8 +263,12 @@ public void visitEnd() { - * - * It delegates to BcBands for bytecode related visits and to ClassBands for everything else. - */ -- public class SegmentMethodVisitor implements MethodVisitor { -- -+ public class SegmentMethodVisitor extends MethodVisitor { -+ -+ public SegmentMethodVisitor() { -+ super(ASM_API); -+ } -+ - @Override - public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) { - return new SegmentAnnotationVisitor(MetadataBandGroup.CONTEXT_METHOD, desc, visible); -@@ -427,7 +439,7 @@ public ClassBands getClassBands() { - /** - * SegmentAnnotationVisitor implements <code>AnnotationVisitor</code> to visit Annotations found in a class file. - */ -- public class SegmentAnnotationVisitor implements AnnotationVisitor { -+ public class SegmentAnnotationVisitor extends AnnotationVisitor { - - private int context = -1; - private int parameter = -1; -@@ -443,17 +455,20 @@ public ClassBands getClassBands() { - private final List nestPairN = new ArrayList(); - - public SegmentAnnotationVisitor(final int context, final String desc, final boolean visible) { -+ super(ASM_API); - this.context = context; - this.desc = desc; - this.visible = visible; - } - - public SegmentAnnotationVisitor(final int context) { -+ super(ASM_API); - this.context = context; - } - - public SegmentAnnotationVisitor(final int context, final int parameter, final String desc, - final boolean visible) { -+ super(ASM_API); - this.context = context; - this.parameter = parameter; - this.desc = desc; -@@ -478,7 +493,7 @@ public AnnotationVisitor visitAnnotation(String name, final String desc) { - nameRU.add(name); - nestTypeRS.add(desc); - nestPairN.add(Integer.valueOf(0)); -- return new AnnotationVisitor() { -+ return new AnnotationVisitor(context, av) { - @Override - public void visit(final String name, final Object value) { - final Integer numPairs = (Integer) nestPairN.remove(nestPairN.size() - 1); -@@ -552,7 +567,7 @@ public void visitEnum(String name, final String desc, final String value) { - } - } - -- public class ArrayVisitor implements AnnotationVisitor { -+ public class ArrayVisitor extends AnnotationVisitor { - - private final int indexInCaseArrayN; - private final List caseArrayN; -@@ -561,6 +576,8 @@ public void visitEnum(String name, final String desc, final String value) { - private final List T; - - public ArrayVisitor(final List caseArrayN, final List T, final List nameRU, final List values) { -+ super(ASM_API); -+ - this.caseArrayN = caseArrayN; - this.T = T; - this.nameRU = nameRU; -@@ -612,7 +629,11 @@ public void visitEnum(final String name, final String desc, final String value) - * SegmentFieldVisitor implements <code>FieldVisitor</code> to visit the metadata relating to fields in a class - * file. - */ -- public class SegmentFieldVisitor implements FieldVisitor { -+ public class SegmentFieldVisitor extends FieldVisitor { -+ -+ public SegmentFieldVisitor() { -+ super(ASM_API); -+ } - - @Override - public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) { -diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java -old mode 100644 -new mode 100755 diff --git a/dev-java/commons-compress/metadata.xml b/dev-java/commons-compress/metadata.xml index 6021501589e0..add1db7ad802 100644 --- a/dev-java/commons-compress/metadata.xml +++ b/dev-java/commons-compress/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> + <maintainer type="project"> + <email>java@gentoo.org</email> + <name>Java</name> + </maintainer> + <upstream> + <remote-id type="github">apache/commons-compress</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest index 4135d040e978..2255e60c5501 100644 --- a/dev-java/commons-daemon/Manifest +++ b/dev-java/commons-daemon/Manifest @@ -1,4 +1,2 @@ -DIST commons-daemon-1.3.3-src.tar.gz 290415 BLAKE2B c9c175ba52cef25ce6d1b56c7466aa5e775ed1ac3ca7c710c3519574c35e8a66ff5846313de8da594511ad411e802b7e0b647cbfd66a50abaaa0d39574a4e103 SHA512 ec246e2c05d66408374ba56b3715b13f8f24f89af11fa00c2381dc19c188f1b6228f19351c97d5774808a804b83fdbdfb8f537d099db062c39ffd281c142ee77 -DIST commons-daemon-1.3.3-src.tar.gz.asc 873 BLAKE2B 01fc7ec60393f2077a2bbf80aacb1a03b821cb52f88d87010f26a5811e2695d08b7c01193d00c2fb1a28bb875b63a5a0a935feadf7c1f00c4799aafa32592804 SHA512 c42b36acd45665daeda06a59006f05fd9846817e4e1065ef89dfedef060216ecce0316d06400437e4fb5138cf41c2fe52790cd5da9306c64e3000a3765bad2a2 DIST commons-daemon-1.3.4-src.tar.gz 290834 BLAKE2B be57fbf89cad23fb4108e97b8e75d8380ff5b286068edfed65cd3539971375949ec80fd5aeece50a6498642f60e26498eb37ea3778f503d7498662ae79ecd14e SHA512 bb36d88bc21a5777245012b2a73ee0e764b85715731f54cc4ff09343e95ccb18fc6c68b3ae9c680fb45a60c7ef5ed0f9e40991c2c03246dd7f8dd65031eddf24 DIST commons-daemon-1.3.4-src.tar.gz.asc 873 BLAKE2B f7886e67e2cfb0211d3271d79c251d07e5b0d7f7819566891e838619021ab9e3f468e3647f2f901d41a6d00f12b30adfa2d16f828ac5ce526666caab30ab8001 SHA512 eae6b01844bf5c49a95a60f4b59e0b989488728edb209252779f83e33ea3eeb53900a5fdeee5d953b231b241ba14a27c77967bdd3fe5acf2d9c6da50c225c79b diff --git a/dev-java/commons-daemon/commons-daemon-1.3.3.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.3.ebuild deleted file mode 100644 index 839625a12d88..000000000000 --- a/dev-java/commons-daemon/commons-daemon-1.3.3.ebuild +++ /dev/null @@ -1,56 +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/daemon/source/commons-daemon-1.3.3-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-daemon-1.3.3.ebuild - -EAPI=8 - -# No tests because "package org.junit.jupiter.api does not exist" -JAVA_PKG_IUSE="doc source" -MAVEN_ID="commons-daemon:commons-daemon:1.3.3" - -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 )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -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,README}.md {HOWTO-RELEASE,NOTICE,RELEASE-NOTES}.txt ) -HTML_DOCS=( PROPOSAL.html ) -PATCHES=( "${FILESDIR}/commons-daemon-1.3.1-Make.patch" ) - -S="${WORKDIR}/${P}-src" - -JAVA_ENCODING="iso-8859-1" -JAVA_SRC_DIR="src/main/java" - -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.3.4.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.4.ebuild index ede046cf7682..fcc845ad0c9a 100644 --- a/dev-java/commons-daemon/commons-daemon-1.3.4.ebuild +++ b/dev-java/commons-daemon/commons-daemon-1.3.4.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" +KEYWORDS="amd64 ppc64 x86" RESTRICT="test" #839681 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest index a8ecdcddf113..f2e83ed5113b 100644 --- a/dev-java/commons-httpclient/Manifest +++ b/dev-java/commons-httpclient/Manifest @@ -1 +1,2 @@ DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490 +DIST commons-httpclient-3.1-src.tar.gz.asc 189 BLAKE2B 44661748db96429682a82d8dba5ad71d0d1fc2aaf03e2f1dda059985757547a78ab04dff38863ca421e65d13100a68c8cb909ed4c34e0a66a837b6fdb91baf63 SHA512 3832c90048de4db1f96efecd2f467153f0bdce1ebd533b848b8fc78a92da0bba3ba8bb3447e6c8d34f4c1c731a5b41ab941754a1509728ff4ea96e238927ab09 diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild deleted file mode 100644 index 6e82213d770d..000000000000 --- a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc examples source test" -MAVEN_ID="commons-httpclient:commons-httpclient:3.1" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="The Jakarta Commons HttpClient library" -HOMEPAGE="https://hc.apache.org/httpclient-legacy/" -SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -# doesn't work with IBM JDK, bug #176133 -RESTRICT="test" - -CDEPEND="dev-java/commons-logging:0 - dev-java/commons-codec:0" -RDEPEND=">=virtual/jre-1.8:* - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.8:* - test? ( dev-java/ant-junit:0 ) - ${CDEPEND}" - -JAVA_ANT_ENCODING="ISO-8859-1" -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="commons-logging,commons-codec" -EANT_BUILD_TARGET="dist" -EANT_DOC_TARGET="doc" - -# patch against CVE-2012-{5783,6153}. See bug 442292. -PATCHES=( - "${FILESDIR}/${P}-SSLProtocolSocketFactory.java.patch" -) - -src_prepare() { - default - - # generated docs go into docs/api - rm -rf docs/apidocs - - # remove javadoc task from compile task - sed -i -e 's/depends="compile,doc"/depends="compile"/' build.xml || die - sed -i -e '/link/ d' build.xml || die - - mkdir lib && cd lib - java-pkg_filter-compiler jikes -} - -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit" -EANT_TEST_TARGET="test" - -src_install() { - java-pkg_dojar dist/${PN}.jar - - # contains both html docs and javadoc in correct subdir - if use doc ; then - java-pkg_dojavadoc dist/docs/api - java-pkg_dohtml -r dist/docs/* - fi - use source && java-pkg_dosrc src/java/* - use examples && java-pkg_doexamples src/examples -} diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild new file mode 100644 index 000000000000..c0053b42b61e --- /dev/null +++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.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="commons-httpclient:commons-httpclient:3.1" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="The Jakarta Commons HttpClient library" +HOMEPAGE="https://hc.apache.org/httpclient-legacy/" +SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/httpcomponents/commons-httpclient/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/${P}" + +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux" + +# Tests run: 2036, Failures: 91 +RESTRICT="test" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpclient.commons.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons-httpclient )" +DEPEND=" + dev-java/commons-logging:0 + dev-java/commons-codec:0 + >=virtual/jdk-1.8:* + test? ( >=dev-java/ant-1.10.14:0[junit] ) +" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( NOTICE README RELEASE_NOTES ) + +JAVA_ENCODING="ISO-8859-1" +JAVA_CLASSPATH_EXTRA=" + commons-logging + commons-codec +" +JAVA_SRC_DIR="src/java" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="src/test" + +src_prepare() { + java-pkg-2_src_prepare + rm -r docs/apidocs || die "clean apidocs" +} + +src_install() { + java-pkg-simple_src_install + use doc && docinto html dodoc -r docs +} diff --git a/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch b/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch deleted file mode 100644 index c059bf496a45..000000000000 --- a/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch +++ /dev/null @@ -1,369 +0,0 @@ ---- ./src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java -+++ ./src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java -@@ -31,10 +31,25 @@ - package org.apache.commons.httpclient.protocol; - - import java.io.IOException; -+import java.io.InputStream; - import java.net.InetAddress; - import java.net.Socket; - import java.net.UnknownHostException; -- -+import java.security.cert.Certificate; -+import java.security.cert.CertificateParsingException; -+import java.security.cert.X509Certificate; -+import java.util.Arrays; -+import java.util.Collection; -+import java.util.Iterator; -+import java.util.LinkedList; -+import java.util.List; -+import java.util.Locale; -+import java.util.StringTokenizer; -+import java.util.regex.Pattern; -+ -+import javax.net.ssl.SSLException; -+import javax.net.ssl.SSLSession; -+import javax.net.ssl.SSLSocket; - import javax.net.ssl.SSLSocketFactory; - - import org.apache.commons.httpclient.ConnectTimeoutException; -@@ -55,6 +70,11 @@ - */ - private static final SSLProtocolSocketFactory factory = new SSLProtocolSocketFactory(); - -+ // This is a a sorted list, if you insert new elements do it orderdered. -+ private final static String[] BAD_COUNTRY_2LDS = -+ {"ac", "co", "com", "ed", "edu", "go", "gouv", "gov", "info", -+ "lg", "ne", "net", "or", "org"}; -+ - /** - * Gets an singleton instance of the SSLProtocolSocketFactory. - * @return a SSLProtocolSocketFactory -@@ -79,12 +99,14 @@ - InetAddress clientHost, - int clientPort) - throws IOException, UnknownHostException { -- return SSLSocketFactory.getDefault().createSocket( -+ Socket sslSocket = SSLSocketFactory.getDefault().createSocket( - host, - port, - clientHost, - clientPort - ); -+ verifyHostName(host, (SSLSocket) sslSocket); -+ return sslSocket; - } - - /** -@@ -124,16 +146,19 @@ - } - int timeout = params.getConnectionTimeout(); - if (timeout == 0) { -- return createSocket(host, port, localAddress, localPort); -+ Socket sslSocket = createSocket(host, port, localAddress, localPort); -+ verifyHostName(host, (SSLSocket) sslSocket); -+ return sslSocket; - } else { - // To be eventually deprecated when migrated to Java 1.4 or above -- Socket socket = ReflectionSocketFactory.createSocket( -+ Socket sslSocket = ReflectionSocketFactory.createSocket( - "javax.net.ssl.SSLSocketFactory", host, port, localAddress, localPort, timeout); -- if (socket == null) { -- socket = ControllerThreadSocketFactory.createSocket( -+ if (sslSocket == null) { -+ sslSocket = ControllerThreadSocketFactory.createSocket( - this, host, port, localAddress, localPort, timeout); - } -- return socket; -+ verifyHostName(host, (SSLSocket) sslSocket); -+ return sslSocket; - } - } - -@@ -142,10 +167,12 @@ - */ - public Socket createSocket(String host, int port) - throws IOException, UnknownHostException { -- return SSLSocketFactory.getDefault().createSocket( -+ Socket sslSocket = SSLSocketFactory.getDefault().createSocket( - host, - port - ); -+ verifyHostName(host, (SSLSocket) sslSocket); -+ return sslSocket; - } - - /** -@@ -157,13 +184,271 @@ - int port, - boolean autoClose) - throws IOException, UnknownHostException { -- return ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket( -+ Socket sslSocket = ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket( - socket, - host, - port, - autoClose - ); -+ verifyHostName(host, (SSLSocket) sslSocket); -+ return sslSocket; -+ } -+ -+ -+ -+ -+ /** -+ * Verifies that the given hostname in certicifate is the hostname we are trying to connect to -+ * http://www.cvedetails.com/cve/CVE-2012-5783/ -+ * @param host -+ * @param ssl -+ * @throws IOException -+ */ -+ -+ private static void verifyHostName(String host, SSLSocket ssl) -+ throws IOException { -+ if (host == null) { -+ throw new IllegalArgumentException("host to verify was null"); -+ } -+ -+ SSLSession session = ssl.getSession(); -+ if (session == null) { -+ // In our experience this only happens under IBM 1.4.x when -+ // spurious (unrelated) certificates show up in the server's chain. -+ // Hopefully this will unearth the real problem: -+ InputStream in = ssl.getInputStream(); -+ in.available(); -+ /* -+ If you're looking at the 2 lines of code above because you're -+ running into a problem, you probably have two options: -+ -+ #1. Clean up the certificate chain that your server -+ is presenting (e.g. edit "/etc/apache2/server.crt" or -+ wherever it is your server's certificate chain is -+ defined). -+ -+ OR -+ -+ #2. Upgrade to an IBM 1.5.x or greater JVM, or switch to a -+ non-IBM JVM. -+ */ -+ -+ // If ssl.getInputStream().available() didn't cause an exception, -+ // maybe at least now the session is available? -+ session = ssl.getSession(); -+ if (session == null) { -+ // If it's still null, probably a startHandshake() will -+ // unearth the real problem. -+ ssl.startHandshake(); -+ -+ // Okay, if we still haven't managed to cause an exception, -+ // might as well go for the NPE. Or maybe we're okay now? -+ session = ssl.getSession(); -+ } -+ } -+ -+ Certificate[] certs = session.getPeerCertificates(); -+ verifyHostName(host.trim().toLowerCase(Locale.US), (X509Certificate) certs[0]); -+ } -+ /** -+ * Extract the names from the certificate and tests host matches one of them -+ * @param host -+ * @param cert -+ * @throws SSLException -+ */ -+ -+ private static void verifyHostName(final String host, X509Certificate cert) -+ throws SSLException { -+ // I'm okay with being case-insensitive when comparing the host we used -+ // to establish the socket to the hostname in the certificate. -+ // Don't trim the CN, though. -+ -+ String cn = getCN(cert); -+ String[] subjectAlts = getDNSSubjectAlts(cert); -+ verifyHostName(host, cn.toLowerCase(Locale.US), subjectAlts); -+ -+ } -+ -+ /** -+ * Extract all alternative names from a certificate. -+ * @param cert -+ * @return -+ */ -+ private static String[] getDNSSubjectAlts(X509Certificate cert) { -+ LinkedList subjectAltList = new LinkedList(); -+ Collection c = null; -+ try { -+ c = cert.getSubjectAlternativeNames(); -+ } catch (CertificateParsingException cpe) { -+ // Should probably log.debug() this? -+ cpe.printStackTrace(); -+ } -+ if (c != null) { -+ Iterator it = c.iterator(); -+ while (it.hasNext()) { -+ List list = (List) it.next(); -+ int type = ((Integer) list.get(0)).intValue(); -+ // If type is 2, then we've got a dNSName -+ if (type == 2) { -+ String s = (String) list.get(1); -+ subjectAltList.add(s); -+ } -+ } -+ } -+ if (!subjectAltList.isEmpty()) { -+ String[] subjectAlts = new String[subjectAltList.size()]; -+ subjectAltList.toArray(subjectAlts); -+ return subjectAlts; -+ } else { -+ return new String[0]; -+ } -+ -+ } -+ /** -+ * Verifies -+ * @param host -+ * @param cn -+ * @param subjectAlts -+ * @throws SSLException -+ */ -+ -+ private static void verifyHostName(final String host, String cn, String[] subjectAlts)throws SSLException{ -+ StringBuffer cnTested = new StringBuffer(); -+ -+ for (int i = 0; i < subjectAlts.length; i++){ -+ String name = subjectAlts[i]; -+ if (name != null) { -+ name = name.toLowerCase(); -+ if (verifyHostName(host, name)){ -+ return; -+ } -+ cnTested.append("/").append(name); -+ } -+ } -+ if (cn != null && verifyHostName(host, cn)){ -+ return; -+ } -+ cnTested.append("/").append(cn); -+ throw new SSLException("hostname in certificate didn't match: <" -+ + host + "> != <" + cnTested + ">"); -+ -+ } -+ -+ private static boolean verifyHostName(final String host, final String cn){ -+ if (doWildCard(cn) && !isIPAddress(host)) { -+ return matchesWildCard(cn, host); -+ } -+ return host.equalsIgnoreCase(cn); -+ } -+ private static boolean doWildCard(String cn) { -+ // Contains a wildcard -+ // wildcard in the first block -+ // not an ipaddress (ip addres must explicitily be equal) -+ // not using 2nd level common tld : ex: not for *.co.uk -+ String parts[] = cn.split("\\."); -+ return parts.length >= 3 && -+ parts[0].endsWith("*") && -+ acceptableCountryWildcard(cn) && -+ !isIPAddress(cn); - } -+ -+ -+ private static final Pattern IPV4_PATTERN = -+ Pattern.compile("^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$"); -+ -+ private static final Pattern IPV6_STD_PATTERN = -+ Pattern.compile("^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$"); -+ -+ private static final Pattern IPV6_HEX_COMPRESSED_PATTERN = -+ Pattern.compile("^((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)$"); -+ -+ -+ private static boolean isIPAddress(final String hostname) { -+ return hostname != null -+ && ( -+ IPV4_PATTERN.matcher(hostname).matches() -+ || IPV6_STD_PATTERN.matcher(hostname).matches() -+ || IPV6_HEX_COMPRESSED_PATTERN.matcher(hostname).matches() -+ ); -+ -+ } -+ -+ private static boolean acceptableCountryWildcard(final String cn) { -+ // The CN better have at least two dots if it wants wildcard action, -+ // but can't be [*.co.uk] or [*.co.jp] or [*.org.uk], etc... -+ // The [*.co.uk] problem is an interesting one. Should we just -+ // hope that CA's would never foolishly allow such a -+ // certificate to happen? -+ -+ String[] parts = cn.split("\\."); -+ // Only checks for 3 levels, with country code of 2 letters. -+ if (parts.length > 3 || parts[parts.length - 1].length() != 2) { -+ return true; -+ } -+ String countryCode = parts[parts.length - 2]; -+ return Arrays.binarySearch(BAD_COUNTRY_2LDS, countryCode) < 0; -+ } -+ -+ private static boolean matchesWildCard(final String cn, -+ final String hostName) { -+ String parts[] = cn.split("\\."); -+ boolean match = false; -+ String firstpart = parts[0]; -+ if (firstpart.length() > 1) { -+ // server∗ -+ // e.g. server -+ String prefix = firstpart.substring(0, firstpart.length() - 1); -+ // skipwildcard part from cn -+ String suffix = cn.substring(firstpart.length()); -+ // skip wildcard part from host -+ String hostSuffix = hostName.substring(prefix.length()); -+ match = hostName.startsWith(prefix) && hostSuffix.endsWith(suffix); -+ } else { -+ match = hostName.endsWith(cn.substring(1)); -+ } -+ if (match) { -+ // I f we're in strict mode , -+ // [ ∗.foo.com] is not allowed to match [a.b.foo.com] -+ match = countDots(hostName) == countDots(cn); -+ } -+ return match; -+ } -+ -+ private static int countDots(final String data) { -+ int dots = 0; -+ for (int i = 0; i < data.length(); i++) { -+ if (data.charAt(i) == '.') { -+ dots += 1; -+ } -+ } -+ return dots; -+ } -+ -+ private static String getCN(X509Certificate cert) { -+ // Note: toString() seems to do a better job than getName() -+ // -+ // For example, getName() gives me this: -+ // 1.2.840.113549.1.9.1=#16166a756c6975736461766965734063756362632e636f6d -+ // -+ // whereas toString() gives me this: -+ // EMAILADDRESS=juliusdavies@cucbc.com -+ String subjectPrincipal = cert.getSubjectX500Principal().toString(); -+ -+ return getCN(subjectPrincipal); -+ -+ } -+ private static String getCN(String subjectPrincipal) { -+ StringTokenizer st = new StringTokenizer(subjectPrincipal, ","); -+ while(st.hasMoreTokens()) { -+ String tok = st.nextToken().trim(); -+ if (tok.length() > 3) { -+ if (tok.substring(0, 3).equalsIgnoreCase("CN=")) { -+ return tok.substring(3); -+ } -+ } -+ } -+ return null; -+ } - - /** - * All instances of SSLProtocolSocketFactory are the same. diff --git a/dev-java/commons-imaging/Manifest b/dev-java/commons-imaging/Manifest index 5472b1ce60c6..f9c3e790ff64 100644 --- a/dev-java/commons-imaging/Manifest +++ b/dev-java/commons-imaging/Manifest @@ -1 +1,3 @@ DIST commons-imaging-1.0-alpha3-src.tar.gz 39966281 BLAKE2B f0fbb6d7ae0c12be19fe13d3ff4e1cced5acfe7ea72326528c67b57fade73c0acee3eb8eaa62b3d40c473c0c2faf7f60ec190bc0954c5159405358bfac4efd42 SHA512 16300adb5873fef464bedfdce7e1368f52add8d33087f059667840880b8666024feeecdb278a53d5c3d8e76d01ab921ea146d41ca688757f0cf0c2f2b32b0d53 +DIST commons-imaging-1.0-alpha3-src.tar.gz.asc 833 BLAKE2B b28631badf344fa476a99db78e26a9453d033d21dba8484b2621a4cb0295ea262f58d2df4f8afd6d8090ecd0ea98ec2dca0168e2b401d662c335ad1ef9518b98 SHA512 b7e6691d5eac6f81657dc42aa69184da7fd1bf364da391ac4e1a27991d9a8bbba23296d58b874b4c69a20d39c3c1e821ca19c312f3e71b3acd8903156a2a0a1d +DIST apache-sanselan-incubating-0.97-src.tar.gz 33317875 BLAKE2B c9db6c30accc308d2c5d5977b84da118ab50b010b3728665a75dab13f9fecb70075e2d2208a62fabc57af7396f7c39b1ec498e0840e5a2c9c8de9b95d2dd597a SHA512 b7e8af01f4b4ca812313bbf573758d9c0e1355266bfb83898336b14c4b492a8979f2a593f00d53c076e83cf807a049df624491a26623cfbceb00560b748f05f2 diff --git a/dev-java/commons-imaging/commons-imaging-0.97.ebuild b/dev-java/commons-imaging/commons-imaging-0.97.ebuild new file mode 100644 index 000000000000..6017ef9c71e8 --- /dev/null +++ b/dev-java/commons-imaging/commons-imaging-0.97.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A minimalistic realtime charting library for Java" +HOMEPAGE="https://commons.apache.org/proper/commons-imaging/" +SRC_URI="https://archive.apache.org/dist/commons/sanselan/source/apache-sanselan-incubating-${PV}-src.tar.gz" +S="${WORKDIR}/sanselan-${PV}-incubator" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +RESTRICT="test" # 5/48 failures, dunno why :( + +DEPEND=">=virtual/jdk-1.8:* + test? ( dev-java/junit:4 )" +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_ENCODING="ISO-8859-1" +JAVA_SRC_DIR="src/main/java" + +src_prepare() { + java-pkg-2_src_prepare + # Tsk, Windows developers… + find src/test/java -name "*.java" -exec sed -i 's:\\:/:g' {} + || die +} + +src_test() { + local DIR="src/test/java" + local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4)" + + local TESTS=$(find "${DIR}" -name "*Test.java" \ + ! -name "*BaseTest.java" ! -name SanselanTest.java ! -name ByteSourceTest.java) + TESTS="${TESTS//src\/test\/java\/}" + TESTS="${TESTS//.java}" + TESTS="${TESTS//\//.}" + + ejavac -cp "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java") + ejunit4 -classpath "${CP}" ${TESTS} +} 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 new file mode 100644 index 000000000000..73382ff1998c --- /dev/null +++ b/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild @@ -0,0 +1,36 @@ +# 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.apache.commons:commons-imaging:${PV/_/-}" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Apache Commons Imaging (previously Sanselan) is a pure-Java image library." +HOMEPAGE="https://commons.apache.org/proper/commons-imaging/" +SRC_URI="mirror://apache/commons/imaging/source/${P/_/-}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/imaging/source/${P/_/-}-src.tar.gz.asc )" +S="${WORKDIR}/${P/_/-}-src" + +LICENSE="Apache-2.0" +SLOT="1" +KEYWORDS="~amd64 ~x86" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {NOTICE,RELEASE-NOTES}.txt README.md ) +PATCHES=( "${FILESDIR}/commons-imaging-1.0_alpha3-PngChunk.javadoc.patch" ) + +JAVA_SRC_DIR="src/main/java" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.imaging" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} diff --git a/dev-java/commons-imaging/commons-imaging-1.0_alpha3.ebuild b/dev-java/commons-imaging/commons-imaging-1.0_alpha3.ebuild deleted file mode 100644 index 338fc76ea1a4..000000000000 --- a/dev-java/commons-imaging/commons-imaging-1.0_alpha3.ebuild +++ /dev/null @@ -1,37 +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/imaging/source/commons-imaging-1.0-alpha3-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-imaging-1.0_alpha3.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.commons:commons-imaging:1.0-alpha2" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Apache Commons Imaging (previously Sanselan) is a pure-Java image library." -HOMEPAGE="https://commons.apache.org/proper/commons-imaging/" -SRC_URI="mirror://apache/commons/imaging/source/commons-imaging-${PV/_/-}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -# Compile dependencies -# POM: pom.xml -# test? commons-io:commons-io:2.7 -> >=dev-java/commons-io-2.11.0:1 -# test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!! -# test? org.junit.jupiter:junit-jupiter:5.6.2 -> !!!groupId-not-found!!! - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt README.md ) - -S="${WORKDIR}/${P/_/-}-src" - -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.imaging" diff --git a/dev-java/commons-imaging/files/commons-imaging-1.0_alpha3-PngChunk.javadoc.patch b/dev-java/commons-imaging/files/commons-imaging-1.0_alpha3-PngChunk.javadoc.patch new file mode 100644 index 000000000000..03f8074b8f3a --- /dev/null +++ b/dev-java/commons-imaging/files/commons-imaging-1.0_alpha3-PngChunk.javadoc.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/861767 +--- a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java ++++ b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java +@@ -24,7 +24,7 @@ import org.apache.commons.imaging.common.BinaryFileParser; + * A PNG image is composed of several chunks. This is the base class for the chunks, + * used by the parser. + * +- * @see <a href="https://en.wikipedia.org/wiki/Portable_Network_Graphics#%22Chunks%22_within_the_file>Portable_Network_Graphics</a> ++ * @see <a href="https://en.wikipedia.org/wiki/Portable_Network_Graphics#%22Chunks%22_within_the_file">Portable_Network_Graphics</a> + */ + public class PngChunk extends BinaryFileParser { + public final int length; diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest index 322cd4d655c9..10661d3ab0c6 100644 --- a/dev-java/commons-io/Manifest +++ b/dev-java/commons-io/Manifest @@ -1 +1,2 @@ -DIST commons-io-2.11.0-sources.tar.gz 498841 BLAKE2B e45ae4400246d7469e8628f08d2f647ea670b994360c1150fe1f414beee5177e7af7c94589a5c81ce6996f2fb755441f29080ca9b69b98cb5ae1ad897f8f00b5 SHA512 e2ab8ebc9c328093a460f8f5f96c80bb45f5073ec7aaa0beabdcdeac2e97324292eab2e2cb8b64d8e78b2c5d89048ba84e50daa0965dffcbe2fd0da7ab789ee3 +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 diff --git a/dev-java/commons-io/commons-io-2.11.0-r1.ebuild b/dev-java/commons-io/commons-io-2.11.0-r1.ebuild deleted file mode 100644 index 29bd88fca479..000000000000 --- a/dev-java/commons-io/commons-io-2.11.0-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://mirror.dkm.cz/apache//commons/io/source/commons-io-2.11.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" --ebuild commons-io-2.11.0.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="commons-io:commons-io:2.11.0" - -inherit java-pkg-2 java-pkg-simple - -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 -> ${P}-sources.tar.gz" -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" - -# Compile dependencies -# POM: pom.xml -# test? com.google.jimfs:jimfs:1.2 -> !!!groupId-not-found!!! -# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6 -# test? org.junit-pioneer:junit-pioneer:1.4.2 -> !!!groupId-not-found!!! -# test? org.junit.jupiter:junit-jupiter:5.7.2 -> !!!groupId-not-found!!! -# test? org.mockito:mockito-inline:3.11.2 -> !!!artifactId-not-found!!! -# test? org.openjdk.jmh:jmh-core:1.32 -> !!!groupId-not-found!!! -# test? org.openjdk.jmh:jmh-generator-annprocess:1.32 -> !!!groupId-not-found!!! - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - >=dev-java/commons-lang-3.12.0:3.6 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* -" - -# some test dependencies are missing -RESTRICT="test" - -S="${WORKDIR}/${P}-src" - -JAVA_ENCODING="iso-8859-1" - -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="commons-lang-3.6" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.io" diff --git a/dev-java/commons-io/commons-io-2.15.1.ebuild b/dev-java/commons-io/commons-io-2.15.1.ebuild new file mode 100644 index 000000000000..99a17eafd8b9 --- /dev/null +++ b/dev-java/commons-io/commons-io-2.15.1.ebuild @@ -0,0 +1,30 @@ +# 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/metadata.xml b/dev-java/commons-io/metadata.xml index 6021501589e0..571ffcd30f0e 100644 --- a/dev-java/commons-io/metadata.xml +++ b/dev-java/commons-io/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> + <maintainer type="project"> + <email>java@gentoo.org</email> + <name>Java</name> + </maintainer> + <upstream> + <remote-id type="github">apache/commons-io</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest index 070187d939f5..32bc9f65cb7e 100644 --- a/dev-java/commons-lang/Manifest +++ b/dev-java/commons-lang/Manifest @@ -1,2 +1,2 @@ -DIST commons-lang-3.13.0-sources.tar.gz 1133483 BLAKE2B bf2239b03129f3cc6104c8ff66ac9d0c2dc7367111e4a8c4d76b5e2773c56a17607e28b24f5d7283b2119c3421f1526dac4ef98ed16da9e8bf9d033fbb7a4b80 SHA512 6fca0ce86aea84458021360bac3f6775135a1a5c1826194921e2d4ead7c12f6ac560e7c3fc240112f862aaee24be8754c37dd867f45e9449cde4a388018d8691 -DIST commons-lang-3.13.0-sources.tar.gz.asc 488 BLAKE2B ecfc26f598b4a683a14803f5eee42f9b9ebfc7c02dac5b9fdc72ef97839e80ac648489da4e136f94044852fb09eff05bc08021cf1678ea9c19065a5b69c1375f SHA512 4d9dca040d9f06791f7f67ad7313e5a2c6bc19a07a62ae4dbcd10712afbcc51e926258938a54f0507d8cd1486041b46b29ed070b488b55833c30cbb6786c4145 +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 diff --git a/dev-java/commons-lang/commons-lang-3.13.0.ebuild b/dev-java/commons-lang/commons-lang-3.14.0.ebuild index ebcca6edf83b..556c3414c385 100644 --- a/dev-java/commons-lang/commons-lang-3.13.0.ebuild +++ b/dev-java/commons-lang/commons-lang-3.14.0.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2023 Gentoo Authors +# 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:3.13.0" +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}-sources.tar.gz - verify-sig? ( https://archive.apache.org/dist/commons/lang/source/${PN}3-${PV}-src.tar.gz.asc -> ${P}-sources.tar.gz.asc )" - +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" diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest index 25360c6e9487..e45becaca4a5 100644 --- a/dev-java/commons-logging/Manifest +++ b/dev-java/commons-logging/Manifest @@ -1 +1,2 @@ -DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e +DIST commons-logging-1.3.1-src.tar.gz 189156 BLAKE2B 23308b2bff6ea67620b0f07f49a63ffdbd07833fc0d9a6654386f4c17c9125abef5ad2afb6d8c798dcb98bc3e99bd8d94d35b9deec569c3aec1dde20f69e1a1d SHA512 ffda970d086601df4b476caf8bd01d1bdc22dd7f8846a22287036f7f000ce6cf0a757d16621910f041f8d90aa6066819454b3977dd005ca66817bec59e91e91f +DIST commons-logging-1.3.1-src.tar.gz.asc 488 BLAKE2B 3225a62f6269224f1b52907631be03d97cde65d1c7a76c06b6a23b9e30b1cee08b048eb4fdaa41b0a6b5bcf090b54c9dc54307fb1629b039b786fd426572a4d1 SHA512 6f13f85a5aeab1099ebfca38a6173384050b1f1c2e7eac93d978587c92751ddd24d583e39bc5a949f0caec66ca141d265147e63e9e2afea2094bda4667936a86 diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild b/dev-java/commons-logging/commons-logging-1.3.1.ebuild index e7ce766be362..d070c40f2dee 100644 --- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild +++ b/dev-java/commons-logging/commons-logging-1.3.1.ebuild @@ -1,63 +1,87 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="commons-logging:commons-logging:1.3.0" +MAVEN_ID="commons-logging:commons-logging:${PV}" JAVA_TESTING_FRAMEWORKS="junit-4" -inherit java-pkg-2 java-pkg-simple +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/" -MY_COMMIT="d376d3128663e53de4af948e161291e7ec0c6ec1" -SRC_URI="https://github.com/apache/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_COMMIT}" +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 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="log4j" -CDEPEND=" +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 - dev-java/log4j-core:2 - ) -" + )" -DEPEND="${CDEPEND} - dev-java/javax-servlet-api:2.5 - >=virtual/jdk-1.8:* -" +DEPEND="${COMMON_DEPEND} + >=virtual/jdk-11:*" -RDEPEND="${CDEPEND} +RDEPEND="${COMMON_DEPEND} >=virtual/jre-1.8:*" -DOCS=( README.md src/changes/changes.xml ) +DOCS=( NOTICE.txt src/changes/changes.xml ) +HTML_DOCS=( PROPOSAL.html ) JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.logging" JAVA_ENCODING="iso-8859-1" -JAVA_CLASSPATH_EXTRA="javax-servlet-api-2.5" +JAVA_GENTOO_CLASSPATH=" + jakarta-servlet-api-4 + slf4j-api +" JAVA_SRC_DIR="src/main/java" src_prepare() { java-pkg-2_src_prepare + + # javax-servlet-api and log4j* do not presently provide module-info + cat > src/main/java/module-info.java <<-EOF || die + module org.apache.commons.logging { + // requires static org.apache.logging.log4j; + requires static org.slf4j; + requires static java.logging; + // requires static log4j; + // requires static servlet.api; + // requires static org.apache.log4j; + requires java.base; + exports org.apache.commons.logging; + exports org.apache.commons.logging.impl; + uses org.apache.commons.logging.LogFactory; + } + EOF + # 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() { - if use log4j; then - JAVA_GENTOO_CLASSPATH="log4j-12-api-2,log4j-api-2,log4j-core-2" - fi java-pkg-simple_src_compile pushd target/classes > /dev/null || die @@ -65,14 +89,14 @@ src_compile() { # Need Automatic-Module-Name also for the other JAR files jar xvf ../../commons-logging.jar META-INF/MANIFEST.MF || die - # https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L215-L236 + # pom.xml, lines 81-103 jar -cvfm ../../commons-logging-api.jar META-INF/MANIFEST.MF \ $(find . -type f -name '*.class' \ ! -name 'Jdk13LumberjackLogger.class' \ ! -name 'ServletContextCleaner.class' \ ) || die - # https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L240-L257 + # pom.xml, lines 205-124 jar -cvfm ../../commons-logging-adapters.jar META-INF/MANIFEST.MF \ $(find . -type f -path './org/apache/commons/logging/impl/**.class' \ ! -name 'WeakHashtable*.class' \ @@ -94,13 +118,21 @@ src_test() { 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.security.SecurityForbiddenTestCase # 2 tests 1 failing 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 ) JAVA_TEST_EXTRA_ARGS=( - -Dservlet-api="$(java-pkg_getjars javax-servlet-api-2.5)" + -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" diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest index f32a1d4c9b0e..ff3a88cde8b6 100644 --- a/dev-java/commons-net/Manifest +++ b/dev-java/commons-net/Manifest @@ -1,2 +1,2 @@ -DIST commons-net-3.9.0-src.tar.gz 440911 BLAKE2B d7f24bff2e36d727bc12bf700b5a5ba9bf6b34a1d63cf892124b81ced113e4b66ebdb8b1eb54fbac33b76efcfc7333150c8d5ce87039cc7204ebf16bb64c8044 SHA512 a2d4ef4937701f28304fdb9a39a0d4a8fdd5fd7ae84c6d647a6b9e05eee68cb4fde8ae9eedd94f45fdc0194d160dd9f64b3c1cfbdd8bcea2214e9826ace32877 -DIST commons-net-3.9.0-src.tar.gz.asc 488 BLAKE2B 7999c63348fdb63de670cf1ace3c928796c663aa960494e0d4a398529b19c4834e9c3d2d8dbdb13e2ba392909e1761458c99332f35e39e0efb0f212b3c0f32de SHA512 72da1fe78bc6c0dea70d171c3c60c7eee8387bb28244f8b67bf38b66c3e7f2c183e4413c3f090a5b1a591ce64a6d43434093425f44c10a9dd03f0b354306e017 +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 diff --git a/dev-java/commons-net/commons-net-3.9.0.ebuild b/dev-java/commons-net/commons-net-3.10.0.ebuild index fd0d7b728a57..d4161a272d96 100644 --- a/dev-java/commons-net/commons-net-3.9.0.ebuild +++ b/dev-java/commons-net/commons-net-3.10.0.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# 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:3.9.0" -# No tests, junit-jupiter and junit-vintage are not packaged. -# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter" +MAVEN_ID="commons-net:commons-net:${PV}" inherit java-pkg-2 java-pkg-simple verify-sig diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest index 8b0c5a34c397..c8d595696045 100644 --- a/dev-java/commons-validator/Manifest +++ b/dev-java/commons-validator/Manifest @@ -1 +1,2 @@ -DIST commons-validator-1.7-src.tar.gz 289870 BLAKE2B 576c6ac00187b67618eee251a69e7166cd817bb6184f4cf138a226539fc100a1a4e32ebc4ef6cea567aff581d11c63a817a9dad4836142de4d9a3b313d59a31b SHA512 4007872fda856e9e154f325270748081920d21a716143389713706ca0e5a8ec3c88b9b978d75801a5926723764a81f1dbfd77a8fd4b361b16cd65e84cf47a868 +DIST commons-validator-1.8.0-src.tar.gz 291779 BLAKE2B 0a0a0f9019b39ff1899be2f65e5e6750e12ed7b6833cc7e03279b5bedd3b3c3e02561891ba8885b50c356d103dabe207bf18adf04d8e6ba627397c5b81656603 SHA512 f0c2662e5db0bbc6ee9d05d5508caa02bf45b7c7ada92f4a97a867848f3d704b35552d47859a46567705194248e7b88cd8df8f082939012ab60b6aed446e36b2 +DIST commons-validator-1.8.0-src.tar.gz.asc 488 BLAKE2B 9e9b7f54f430c5a42de8af6d8c55a0f4029e3a41f0bc41efb08863a9470f0935ad23d6ba6757cf4d5e28c11626e15ae392807ae9c33529a3feb15b90a2316ca5 SHA512 f04709f64026560bfd2f5cc51ebf373d44359452f41af73b53d105059a6760786f49d89837c624cd133875de0a37358af1cf587a6db567e7cc76ce823efa9efd diff --git a/dev-java/commons-validator/commons-validator-1.7.ebuild b/dev-java/commons-validator/commons-validator-1.7.ebuild deleted file mode 100644 index b71d4a85a4b9..000000000000 --- a/dev-java/commons-validator/commons-validator-1.7.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://artfiles.org/apache.org//commons/validator/source/commons-validator-1.7-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-validator-1.7.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="commons-validator:commons-validator:1.7" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Commons component to validate user input, or data input" -HOMEPAGE="https://commons.apache.org/proper/commons-validator/" -SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# commons-beanutils:commons-beanutils:1.9.4 -> >=dev-java/commons-beanutils-1.9.4:1.7 -# commons-collections:commons-collections:3.2.2 -> >=dev-java/commons-collections-3.2.2:0 -# commons-digester:commons-digester:2.1 -> >=dev-java/commons-digester-2.1:2.1 -# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 - -CDEPEND=" - dev-java/commons-beanutils:1.7 - dev-java/commons-digester:2.1 - dev-java/commons-logging:0 -" - -# Compile dependencies -# POM: pom.xml -# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4 -# test? org.apache.commons:commons-csv:1.6 -> dev-java/commons-csv:0 -# test? org.bitstrings.test:junit-clptr:1.2.2 -> dev-java/junit-clptr:0 -# -# restricting for compilation to jdk 1.8 just because of tests which -# are not adjusted by upstream for jdk 11, otherwise the package works fine with jdk 11 - -DEPEND="${CDEPEND} - virtual/jdk:1.8 - test? ( - dev-java/commons-csv:0 - dev-java/junit-clptr:0 - ) -" -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" - -S="${WORKDIR}/${P}-src" - -JAVA_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-digester-2.1,commons-logging" -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS="src/main/resources" - -JAVA_TEST_GENTOO_CLASSPATH="commons-csv,junit-4,junit-clptr" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" diff --git a/dev-java/commons-validator/commons-validator-1.8.0.ebuild b/dev-java/commons-validator/commons-validator-1.8.0.ebuild new file mode 100644 index 000000000000..e92d0c4c8374 --- /dev/null +++ b/dev-java/commons-validator/commons-validator-1.8.0.ebuild @@ -0,0 +1,36 @@ +# 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-validator:commons-validator:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Commons component to validate user input, or data input" +HOMEPAGE="https://commons.apache.org/proper/commons-validator/" +SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/validator/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 )" +CP_DEPEND=" + dev-java/commons-beanutils:1.7 + dev-java/commons-digester:2.1 + dev-java/commons-logging:0 +" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +JAVA_SRC_DIR="src/main/java" +JAVA_RESOURCE_DIRS="src/main/resources" diff --git a/dev-java/commons-validator/metadata.xml b/dev-java/commons-validator/metadata.xml index 7a495722507b..b356ec45e875 100644 --- a/dev-java/commons-validator/metadata.xml +++ b/dev-java/commons-validator/metadata.xml @@ -7,6 +7,9 @@ </maintainer> <upstream> <bugs-to>https://issues.apache.org/jira/projects/VALIDATOR/issues/</bugs-to> - <changelog>http://commons.apache.org/proper/commons-validator/changes-report.html</changelog> + <changelog> + http://commons.apache.org/proper/commons-validator/changes-report.html + </changelog> + <remote-id type="github">apache/commons-validator</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild index 6a24d0bb811e..00e0b245b14b 100644 --- a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild +++ b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild @@ -1,22 +1,23 @@ -# 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="source" +JAVA_PKG_IUSE="doc source" -inherit java-pkg-2 java-ant-2 +inherit java-pkg-2 java-pkg-simple DESCRIPTION="A single API for accessing various different file systems" HOMEPAGE="https://commons.apache.org/vfs/" -SRC_URI="mirror://apache/commons/vfs/source/${P}-src.tar.gz" +SRC_URI="https://archive.apache.org/dist/commons/vfs/source/${P}-src.tar.gz" +S="${WORKDIR}/${P}/core" LICENSE="Apache-2.0" SLOT="2" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux" -CDEPEND=" - dev-java/ant-core:0 +CP_DEPEND=" + >=dev-java/ant-1.10.14-r3:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 @@ -24,28 +25,19 @@ CDEPEND=" dev-java/jackrabbit-webdav:0 dev-java/jsch:0" -DEPEND="${CDEPEND} +DEPEND="${CP_DEPEND} >=virtual/jdk-1.8:*" -RDEPEND="${CDEPEND} +RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" PATCHES=( "${FILESDIR}"/${P}-incompatibility.patch + "${FILESDIR}"/commons-vfs-2.0-utf8.patch ) -S="${WORKDIR}/${P}/core" - -EANT_GENTOO_CLASSPATH=" - ant-core - commons-collections - commons-logging - commons-net - commons-httpclient-3 - jackrabbit-webdav - jsch -" -EANT_EXTRA_ARGS="-Dlibdir=${T}" +JAVA_RESOURCE_DIRS="resources/src/main/java" +JAVA_SRC_DIR="src/main/java" # The build.xml is generated from maven and can't run the tests properly # Use maven test to execute these manually but that means downloading deps from @@ -56,17 +48,9 @@ EANT_EXTRA_ARGS="-Dlibdir=${T}" #} src_prepare() { - default - cp "${FILESDIR}"/${P}-build.xml build.xml || die - - java-ant_rewrite-classpath - java-ant_ignore-system-classes -} - -src_install() { - java-pkg_newjar target/*.jar - - # [javadoc] No javadoc created, no need to post-process anything -# use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java + default #780585 + java-pkg-2_src_prepare + mkdir resources || die + find src/main/java -type f ! -name '*.java' ! -name 'package.html' \ + | xargs cp --parent -t resources || die } diff --git a/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml b/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml deleted file mode 100644 index 753e93d669f2..000000000000 --- a/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml +++ /dev/null @@ -1,298 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> -<!-- ====================================================================== --> - -<!-- ====================================================================== --> -<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== --> -<!-- ====================================================================== --> -<!-- --> -<!-- Any modifications will be overwritten. --> -<!-- --> -<!-- Generated by Maven Ant Plugin on 5/29/13 3:05 PM --> -<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ --> -<!-- --> -<!-- ====================================================================== --> - -<project name="commons-vfs2-from-maven" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Build environment properties --> - <!-- ====================================================================== --> - - <property file="${user.home}/.m2/maven.properties"/> - <property file="maven-build.properties"/> - - <property name="maven.build.finalName" value="commons-vfs2-2.0"/> - <property name="maven.build.dir" value="target"/> - <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> - <property name="maven.build.srcDir.0" value="src/main/java"/> - <property name="maven.build.resourceDir.0" value="src/main/java"/> - <property name="maven.build.resourceDir.1" value=".."/> - <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/> - <property name="maven.build.testDir.0" value="src/test/java"/> - <property name="maven.build.testResourceDir.0" value="src/test/resources"/> - <property name="maven.build.testResourceDir.1" value=".."/> - <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/> - <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/> - - <property name="maven.repo.local" value="${user.home}/.m2/repository"/> - <property name="maven.settings.offline" value="false"/> - <property name="maven.settings.interactiveMode" value="true"/> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> - <pathelement location="${maven.repo.local}/ant/ant/1.6.2/ant-1.6.2.jar"/> - <pathelement location="${maven.repo.local}/commons-net/commons-net/2.2/commons-net-2.2.jar"/> - <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> - <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> - <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/> - <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-webdav/1.5.2/jackrabbit-webdav-1.5.2.jar"/> - <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-jcr-commons/1.5.2/jackrabbit-jcr-commons-1.5.2.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.5.3/slf4j-api-1.5.3.jar"/> - <pathelement location="${maven.repo.local}/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar"/> - <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-api/1.4/maven-scm-api-1.4.jar"/> - <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar"/> - <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svnexe/1.4/maven-scm-provider-svnexe-1.4.jar"/> - <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svn-commons/1.4/maven-scm-provider-svn-commons-1.4.jar"/> - <pathelement location="${maven.repo.local}/regexp/regexp/1.3/regexp-1.3.jar"/> - </path> - <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> - <pathelement location="${maven.repo.local}/ant/ant/1.6.2/ant-1.6.2.jar"/> - <pathelement location="${maven.repo.local}/commons-net/commons-net/2.2/commons-net-2.2.jar"/> - <pathelement location="${maven.repo.local}/org/apache/commons/commons-compress/1.1/commons-compress-1.1.jar"/> - <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> - <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> - <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/> - <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-webdav/1.5.2/jackrabbit-webdav-1.5.2.jar"/> - <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-jcr-commons/1.5.2/jackrabbit-jcr-commons-1.5.2.jar"/> - <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.5.3/slf4j-api-1.5.3.jar"/> - <pathelement location="${maven.repo.local}/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar"/> - <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/> - <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-api/1.4/maven-scm-api-1.4.jar"/> - <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar"/> - <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svnexe/1.4/maven-scm-provider-svnexe-1.4.jar"/> - <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svn-commons/1.4/maven-scm-provider-svn-commons-1.4.jar"/> - <pathelement location="${maven.repo.local}/regexp/regexp/1.3/regexp-1.3.jar"/> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${maven.build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" depends="get-deps" description="Compile the code"> - <mkdir dir="${maven.build.outputDir}"/> - <javac destdir="${maven.build.outputDir}" - encoding="iso-8859-1" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="1.5" - verbose="false" - fork="false" - source="1.5"> - <src> - <pathelement location="${maven.build.srcDir.0}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <copy todir="${maven.build.outputDir}"> - <fileset dir="${maven.build.resourceDir.0}"> - <exclude name="**/*.java"/> - </fileset> - </copy> - <mkdir dir="${maven.build.outputDir}/META-INF"/> - <copy todir="${maven.build.outputDir}/META-INF"> - <fileset dir="${maven.build.resourceDir.1}"> - <include name="NOTICE.txt"/> - <include name="LICENSE.txt"/> - </fileset> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" - depends="compile" - description="Compile the test code" - unless="maven.test.skip"> - <mkdir dir="${maven.build.testOutputDir}"/> - <javac destdir="${maven.build.testOutputDir}" - encoding="iso-8859-1" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="1.5" - verbose="false" - fork="false" - source="1.5"> - <src> - <pathelement location="${maven.build.testDir.0}"/> - </src> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${maven.build.outputDir}"/> - </classpath> - </javac> - <copy todir="${maven.build.testOutputDir}"> - <fileset dir="${maven.build.testResourceDir.0}"/> - </copy> - <mkdir dir="${maven.build.testOutputDir}/META-INF"/> - <copy todir="${maven.build.testOutputDir}/META-INF"> - <fileset dir="${maven.build.testResourceDir.1}"> - <include name="NOTICE.txt"/> - <include name="LICENSE.txt"/> - </fileset> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" - depends="compile-tests, junit-missing" - unless="junit.skipped" - description="Run the test cases"> - <mkdir dir="${maven.test.reports}"/> - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> - <sysproperty key="basedir" value="."/> - <formatter type="xml"/> - <formatter type="plain" usefile="false"/> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${maven.build.outputDir}"/> - <pathelement location="${maven.build.testOutputDir}"/> - </classpath> - <batchtest todir="${maven.test.reports}" unless="test"> - <fileset dir="${maven.build.testDir.0}"> - <include name="**/Test*.java"/> - <include name="**/*Test.java"/> - <include name="**/*TestCase.java"/> - <exclude name="**/RunTest.java"/> - <exclude name="**/*$*"/> - </fileset> - </batchtest> - <batchtest todir="${maven.test.reports}" if="test"> - <fileset dir="${maven.build.testDir.0}"> - <include name="**/${test}.java"/> - <exclude name="**/RunTest.java"/> - <exclude name="**/*$*"/> - </fileset> - </batchtest> - </junit> - </target> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present"/> - </target> - - <target name="test-junit-status" - depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}"/> - <isfalse value="${maven.test.skip}"/> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}"/> - <istrue value="${maven.test.skip}"/> - </or> - </condition> - </target> - - <target name="junit-missing" - depends="test-junit-status" - if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${maven.build.srcDir.0}" - packagenames="*" - destdir="${maven.reporting.outputDirectory}/apidocs" - access="protected" - old="false" - verbose="false" - encoding="iso-8859-1" - version="true" - use="true" - author="true" - splitindex="false" - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - charset="ISO-8859-1" - source="1.5" - linksource="true" - breakiterator="false"> - <link href="http://download.oracle.com/javase/6/docs/api/"/> - </javadoc> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="compile,test" description="Package the application"> - <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" - compress="true" - index="false" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> - </jar> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application"/> - - <!-- ====================================================================== --> - <!-- Download dependencies target --> - <!-- ====================================================================== --> - - <target name="test-offline"> - <condition property="maven.mode.offline"> - <equals arg1="${maven.settings.offline}" arg2="true"/> - </condition> - </target> - - <target name="get-deps" - depends="test-offline" - description="Download all dependencies" - unless="maven.mode.offline"> - </target> - -</project> diff --git a/dev-java/commons-vfs/files/commons-vfs-2.0-utf8.patch b/dev-java/commons-vfs/files/commons-vfs-2.0-utf8.patch new file mode 100644 index 000000000000..199fb380c3cb --- /dev/null +++ b/dev-java/commons-vfs/files/commons-vfs-2.0-utf8.patch @@ -0,0 +1,13 @@ +diff --git a/src/main/java/org/apache/commons/vfs2/FileSystemManager.java b/src/main/java/org/apache/commons/vfs2/FileSystemManager.java +index bb8cc2a..1e26559 100644 +--- a/src/main/java/org/apache/commons/vfs2/FileSystemManager.java ++++ b/src/main/java/org/apache/commons/vfs2/FileSystemManager.java +@@ -98,7 +98,7 @@ public interface FileSystemManager + FileObject resolveFile(String name, FileSystemOptions fileSystemOptions) + throws FileSystemException; + +- /** § ++ /** + * Locates a file by name. The name is resolved as described + * <a href="#naming">above</a>. That is, the name can be either + * an absolute URI, an absolute file name, or a relative path to diff --git a/dev-java/concurrentlinkedhashmap-lru/Manifest b/dev-java/concurrentlinkedhashmap-lru/Manifest new file mode 100644 index 000000000000..1e9c38335e81 --- /dev/null +++ b/dev-java/concurrentlinkedhashmap-lru/Manifest @@ -0,0 +1 @@ +DIST concurrentlinkedhashmap-lru-1.4.2.tar.gz 245357 BLAKE2B ac743e2be30195f171154c179ac1b4a6bc6b563b080555c664cdd57fc30d083525f03a8367a891e1087623d455adef27c7ff7416b5c8523c01fc3d5ef775a185 SHA512 95f33cdeb2e3e65be0fa26a825339c4c60eb830e07895fbae731103ef14a9599137f8fad18f9b0a582ec2552ccc1391f5d0338837395e35c1d28de977614a199 diff --git a/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild b/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild new file mode 100644 index 000000000000..4f495a844c3e --- /dev/null +++ b/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild @@ -0,0 +1,36 @@ +# 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.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A high performance version of java.util.LinkedHashMap for use as software cache" +HOMEPAGE="https://github.com/ben-manes/concurrentlinkedhashmap" +SRC_URI="https://github.com/ben-manes/concurrentlinkedhashmap/archive/${P}.tar.gz" +S="${WORKDIR}/${PN%lru}${P}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~x86" + +CP_DEPEND="dev-java/jsr305:0" + +RDEPEND=">=virtual/jre-1.8:* + ${CP_DEPEND}" +DEPEND=">=virtual/jdk-1.8:* + ${CP_DEPEND}" + +JAVA_SRC_DIR="src/main/java" + +src_prepare() { + java-pkg-2_src_prepare + # https://github.com/ben-manes/concurrentlinkedhashmap/issues/46#issuecomment-160696203 + rm src/main/java/com/googlecode/concurrentlinkedhashmap/ConcurrentHashMapV8.java || die + sed \ + -e 's/ConcurrentHashMapV8/ConcurrentHashMap/' \ + -i src/main/java/com/googlecode/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java || die +} diff --git a/dev-java/concurrentlinkedhashmap-lru/metadata.xml b/dev-java/concurrentlinkedhashmap-lru/metadata.xml new file mode 100644 index 000000000000..fe2d156a4574 --- /dev/null +++ b/dev-java/concurrentlinkedhashmap-lru/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">ben-manes/concurrentlinkedhashmap</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/conversant-disruptor/metadata.xml b/dev-java/conversant-disruptor/metadata.xml index 75321cfb5598..44a1037d7ce3 100644 --- a/dev-java/conversant-disruptor/metadata.xml +++ b/dev-java/conversant-disruptor/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">conversant/disruptor</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/cortado/Manifest b/dev-java/cortado/Manifest index df5b340e6078..3ddb27a53bab 100644 --- a/dev-java/cortado/Manifest +++ b/dev-java/cortado/Manifest @@ -1 +1,2 @@ DIST cortado-0.6.0.tar.gz 233854 BLAKE2B 54ace339a6038b46bbf2d993eb911f1845f8717dcf4eeaae0fcd807488a0293bb6618fe72ffa5bc425dc9f7d47f5362ff55168191aab15dbed59547f7c1d72dd SHA512 56113259da05a73f4d4e7aca92d031fa934987ad3607a69b31666c9e452330a95728e7780c45d825ddeb9c0815ace479d7a55df0e68a50e63a76ddf5602c76da +DIST cortado-sun.audio-Java-9.patch 1653 BLAKE2B aa365d4c8746cb69aba3c78c1db37560808c99b73a1a0a4b8170e6df630faf526b793f4aaf5bdbaa28ecb9cf63cd97986400c6bc0acf59c9ddd9f12a9022e1be SHA512 e78468ee40b4eaae7da49de0d820a66c0ccb23a75974499de7e7cb9c8c6870521c4c5587b5d791e45c9d2316354dae422ff41ac0c6128381aa820d57f74a5527 diff --git a/dev-java/cortado/cortado-0.6.0-r2.ebuild b/dev-java/cortado/cortado-0.6.0-r2.ebuild deleted file mode 100644 index 903bdfbfd5bf..000000000000 --- a/dev-java/cortado/cortado-0.6.0-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Multimedia framework for Java written by Fluendo" -HOMEPAGE="https://www.theora.org/cortado/" -SRC_URI="https://downloads.xiph.org/releases/cortado/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -# Package 'sun.audio' seems to have moved to 'javax.sound'. -# More work would be needed. Presently we restrict to jdk:1.8 -DEPEND="virtual/jdk:1.8" -RDEPEND=">=virtual/jre-1.8:*" - -EANT_BUILD_TARGET="stripped" - -src_prepare() { - default - cat > scripts/get-revision <<-EOF || die - #!/bin/sh - echo ${PV} - EOF - -# sed -e '/import/s/sun.audio/javax.sound/' \ -# -i src/com/fluendo/plugin/AudioSinkSA.java || die -} - -src_install() { - java-pkg_newjar "output/dist/applet/${PN}-ovt-stripped-${PV}.jar" - dodoc ChangeLog HACKING NEWS README RELEASE TODO -} diff --git a/dev-java/cortado/cortado-0.6.0-r3.ebuild b/dev-java/cortado/cortado-0.6.0-r3.ebuild new file mode 100644 index 000000000000..5334a3b56737 --- /dev/null +++ b/dev-java/cortado/cortado-0.6.0-r3.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Multimedia framework for Java written by Fluendo" +HOMEPAGE="https://www.theora.org/cortado/" +SRC_URI="https://downloads.xiph.org/releases/cortado/${P}.tar.gz + https://sources.debian.org/data/main/c/cortado/0.6.0-5/debian/patches/sun.audio-Java-9.patch + -> cortado-sun.audio-Java-9.patch" +S="${WORKDIR}/${P}" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="amd64 ppc64 x86" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( ChangeLog HACKING NEWS README RELEASE TODO ) + +PATCHES=( "${DISTDIR}/cortado-sun.audio-Java-9.patch" ) + +JAVA_SRC_DIR="src" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + cat > scripts/get-revision <<-EOF || die + #!/bin/sh + echo ${PV} + EOF +} diff --git a/dev-java/coursier-bin/Manifest b/dev-java/coursier-bin/Manifest index d8d59c15783b..0876b79d106f 100644 --- a/dev-java/coursier-bin/Manifest +++ b/dev-java/coursier-bin/Manifest @@ -1,2 +1,3 @@ -DIST coursier-bin-2.1.5.gz 20679081 BLAKE2B 8ab0d971949b7a5527c82686fab9d62f6dc360ce7ff72bfc4d5a123401e577f17b2392e9a919aebe1c988a477a273d77cd3eb86dcb7b73c0c1a609cccac77eea SHA512 6397f13f82c91079575f58ccbd35e788a2760179cf5c11a986962e3bbe9c669b6e06730a6ff12e0aeb26198df4448e822e927a5d6bd031f67dab8072835979f6 DIST coursier-bin-2.1.7.gz 20790038 BLAKE2B 6e362ae784fcb7007f0adc58604d72dba33cb37f0726883b69f9f298e38759e3acea0232edac30c7cb34c5b837598e6b2c0947345938bce196f7a326a4aa3f0e SHA512 b6df4d7ad89f735989dfb4bb8cacbdf1559dd5ea4f494b7e72df544bd24a3a208738cf37d1cfd7944bb6aebc0e1b6d32b1bfd48c9f333cf54919a055afd5348e +DIST coursier-bin-2.1.8.gz 20863902 BLAKE2B 13ce0a1aa6dd2c1272567a76f3a762e31d9d6794e034e033d5d5accd0b6c534702fc62b5cab83070bb1081c7072ad7a04be86c38b4929d75f2d1f050f320820d SHA512 9cc8f13ecd0c166d46aaeeedb9279eb2885a7edac24c5b106ca30968c4c6fc5f47efe3a38e7aa6864dee517a7bc2cfba71fdd32741d295887bdb62594832bb9e +DIST coursier-bin-2.1.9.gz 20870390 BLAKE2B 720698e6c55a8c070d02f01ec528bab06f397b3c580fa3e533a45cf0073d8b9caf506cfff10d1b68eb9348c8b0da9abab9e7fb183f0561b62a82a96d21d35f5e SHA512 102c351aa0647fe5cd9d00ee164c1cebbcd6bd133a11bdfd653f70a5347da02e32ba74d5b51ea425e9189bb7113ef16c3902219bfa1ef0172bac7955712031c6 diff --git a/dev-java/coursier-bin/coursier-bin-2.1.5.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.8.ebuild index 4c77d05f1d13..536fb0da7de1 100644 --- a/dev-java/coursier-bin/coursier-bin-2.1.5.ebuild +++ b/dev-java/coursier-bin/coursier-bin-2.1.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 diff --git a/dev-java/coursier-bin/coursier-bin-2.1.9.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.9.ebuild new file mode 100644 index 000000000000..af4c8329d0bf --- /dev/null +++ b/dev-java/coursier-bin/coursier-bin-2.1.9.ebuild @@ -0,0 +1,30 @@ +# 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" + +KEYWORDS="~amd64" +LICENSE="Apache-2.0" +SLOT="0" + +S="${WORKDIR}" + +RDEPEND=">=virtual/jre-8" + +QA_FLAGS_IGNORED="usr/bin/coursier" +QA_TEXTRELS="usr/bin/coursier" + +src_install() { + newbin "${P}" coursier +} diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild deleted file mode 100644 index 38a0c3f54a50..000000000000 --- a/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc examples source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Ant-tasks to compile various source languages and produce executables" -HOMEPAGE="http://ant-contrib.sourceforge.net/" -SRC_URI="mirror://sourceforge/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz" -S="${WORKDIR}/${P/_beta/b}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -CP_DEPEND=" - dev-java/ant-core:0 - dev-java/xerces:2 -" - -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND} - test? ( - dev-java/ant-junit:0 - dev-java/junit:0 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND} -" - -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_CLASSPATH_TAGS="javac javadoc" - -EANT_BUILD_TARGET="jars" -EANT_TEST_TARGET="run-tests -Djunit-available=true" -EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api" - -src_prepare() { - java-pkg_clean - use test && eapply "${FILESDIR}/${P}-test-classpath.patch" - java-pkg-2_src_prepare -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_dojar target/lib/${PN}.jar - - java-pkg_register-ant-task - - dodoc NOTICE - use doc && java-pkg_dojavadoc build/api - use examples && java-pkg_doexamples src/samples/* - use source && java-pkg_dosrc src/main/java/* -} diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild new file mode 100644 index 000000000000..22c0fbb9f05f --- /dev/null +++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc examples source test" +JAVA_TESTING_FRAMEWORKS="junit" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Ant-tasks to compile various source languages and produce executables" +HOMEPAGE="https://ant-contrib.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz" +S="${WORKDIR}/${P/_beta/b}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +CP_DEPEND=" + >=dev-java/ant-1.10.14:0 + dev-java/xerces:2 +" + +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + test? ( + >=dev-java/ant-1.10.14:0[junit] + dev-java/junit:0 + ) +" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:* +" + +DOCS=( NOTICE ) + +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH="junit" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_RUN_ONLY=( net.sf.antcontrib.cpptasks.TestAllClasses ) +JAVA_TEST_SRC_DIR="src/test/java" + +src_install() { + java-pkg-simple_src_install + java-pkg_register-ant-task + use examples && java-pkg_doexamples src/samples/* +} diff --git a/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch b/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch deleted file mode 100644 index 02754ce7f1ed..000000000000 --- a/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 732e296e780633e3dce1bace28a4abae04f506c7 Mon Sep 17 00:00:00 2001 -From: Yuan Liao <liaoyuan@gmail.com> -Date: Sat, 15 Jan 2022 10:58:28 -0800 -Subject: [PATCH] Prevent test classpath from being overwritten by - java-ant-2.eclass - -Signed-off-by: Yuan Liao <liaoyuan@gmail.com> ---- - build.xml | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/build.xml b/build.xml -index ed3a0f7..24a3114 100644 ---- a/build.xml -+++ b/build.xml -@@ -176,8 +176,12 @@ - deprecation="false" - target="${javac.target}" - source="${javac.source}" -- optimize="false" -- classpath="${build.lib}/${name}.jar;${java.class.path}"/> -+ optimize="false"> -+ <classpath> -+ <pathelement location="${build.lib}/${name}.jar" /> -+ <pathelement location="${java.class.path}" /> -+ </classpath> -+ </javac> - <jar jarfile="${tests.build.lib}/${name}_test.jar"> - <fileset dir="." includes="NOTICE LICENSE"/> - <fileset dir="${tests.build.classes}"/> --- -2.34.1 - diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest index 3166accfca73..6b1083ddddd7 100644 --- a/dev-java/eclipse-ecj/Manifest +++ b/dev-java/eclipse-ecj/Manifest @@ -1,4 +1,6 @@ -DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d +DIST ecjsrc-4.20.jar 2255761 BLAKE2B 42e16e1bd3d90b8d9bf3e57f83b3e06f2857a20db3e3ac065ce39e95fc47e75de33186115c36dede691bc37fd55fa8123f2220d13f3d5819404f5de702b10fd2 SHA512 fb27c0a37ed5cdfdcdbc904d067bfdd0477ddfd873a6cd8477d3b473734fd0e37329f0e9ab85dc5f89994d68d9886a488bd88568bc00e25f54c1a5a468dc1384 DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f DIST ecjsrc-4.27.jar 2301849 BLAKE2B 77f35d1a9f36086e8515dc9437894b84c88fd440bd48b5248b141191bc04babfcf1af288643ed21e41cb054bdcfa94125a7eb139cbec9ead97e366c65c1dbe95 SHA512 689fe9ed2327f1d0e89fd13c3543369e0e13d7f15f521fc7667352e7f8d7f0b48107bc180ac16cfad375449cc2b61de74bc8ca56c95cab9ef172260a9d3a530b -DIST ecjsrc-4.29.jar 2319437 BLAKE2B 2ce2432a80c725a169337737908bc8d1fb531e57380e05e069558463ffece2f4851635796550d14c3383c1e365c06802937618dd3ddd90472a541f1ca491dc91 SHA512 d9ead697d8e880b3bc537117446453d21f648a0bcbe3044123acfd7c9118dae12211ebba1efc4a0fe890ea25d80634da09792398caea7121c87c084eb921e78f +DIST ecjsrc-4.30.jar 2330181 BLAKE2B 7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d255559bd376bf158b114e30a17d40 SHA512 ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23 +DIST ecjsrc-4.31.jar 2347993 BLAKE2B edb1a525646fc3152661a6583ab5c50a1dd7f06dac0b7cdae0913843e0ed6ef2c9862889351557857140c79c479505aeca154958b649d05ace6a5b83f6ccac45 SHA512 3e72ae5e5209dd80f7b3f208aeb0a6eece28ab416c56eedd590c67724c6a905b39b8f27a41394e3cf6a96acc16a9c7dd91d12df9651bc289839648036ac2d430 +DIST ecjsrc-4.32.jar 2357386 BLAKE2B f6c440b13eb3cd014f317d9232a7db713621b3bcb902bc385561fc4ce68711c9fde021920b535fafb4db7e93d515e23c9d57ac3506539915e1ba33ce37a4570a SHA512 e45cfe0df73f5ec83efeeb12785c2efab9977e927de8766507668f104fea4fefeaa59695988d977734fee4ccd43da43da798976177bb3b15a87ca2966e448d9e diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild deleted file mode 100644 index fbd6934fc695..000000000000 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -MY_PN="ecj" -DMF="R-${PV}-202003050155" - -DESCRIPTION="Eclipse Compiler for Java" -HOMEPAGE="https://www.eclipse.org/" -SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar" - -LICENSE="EPL-1.0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" -SLOT="4.15" -IUSE="+ant" - -COMMON_DEP=" - app-eselect/eselect-java - dev-java/ant-core:0" -RDEPEND="${COMMON_DEP} - virtual/jre" -DEPEND="${COMMON_DEP} - >=virtual/jdk-11 - app-arch/unzip" -PDEPEND=" - ant? ( ~dev-java/ant-eclipse-ecj-${PV} )" - -JAVA_PKG_WANT_SOURCE="1.8" -JAVA_PKG_WANT_TARGET="1.8" -JAVA_JAR_FILENAME="${MY_PN}.jar" -JAVA_GENTOO_CLASSPATH="ant-core" - -S="${WORKDIR}" - -# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details -src_prepare() { - default - - # These have their own package. - rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die - rm -r org/eclipse/jdt/internal/antadapter || die - - # JavaCore is not distributed in the jar - sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \ - -e 's|JavaCore.getOptions()||g' \ - org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java -} - -src_compile() { - java-pkg-simple_src_compile - find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed" -} - -src_install() { - java-pkg-simple_src_install - java-pkg_dolauncher ${MY_PN}-${SLOT} --main \ - org.eclipse.jdt.internal.compiler.batch.Main -} - -pkg_postinst() { - einfo "To select between slots of ECJ..." - einfo " # eselect ecj" - - eselect ecj update ecj-${SLOT} -} - -pkg_postrm() { - eselect ecj update -} diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild new file mode 100644 index 000000000000..b892008977f0 --- /dev/null +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple prefix + +DMF="R-${PV/_rc/RC}-202106111600" + +DESCRIPTION="Eclipse Compiler for Java" +HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt" +SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar" + +LICENSE="EPL-1.0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" +SLOT="4.20" + +BDEPEND="app-arch/unzip" +COMMON_DEP="app-eselect/eselect-java" +DEPEND="${COMMON_DEP} + dev-java/ant:0 + >=virtual/jdk-11:*" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.8:*" + +HTML_DOCS=( about.html ) + +JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch" +JAVA_CLASSPATH_EXTRA="ant" +JAVA_JAR_FILENAME="ecj.jar" +JAVA_LAUNCHER_FILENAME="ecj-${SLOT}" +JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main" +JAVA_RESOURCE_DIRS="res" + +src_prepare() { + java-pkg-2_src_prepare + + # Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes + rm META-INF/ECLIPSE_* || die + mkdir "${JAVA_RESOURCE_DIRS}" || die + find -type f \ + ! -name '*.java' \ + | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die +} + +src_install() { + java-pkg-simple_src_install + insinto /usr/share/java-config-2/compiler + doins "${FILESDIR}/ecj-${SLOT}" + eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT} +} + +pkg_postinst() { + einfo "To select between slots of ECJ..." + einfo " # eselect ecj" + + eselect ecj update ecj-${SLOT} +} + +pkg_postrm() { + eselect ecj update +} diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild new file mode 100644 index 000000000000..0a750385f6ab --- /dev/null +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.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" + +inherit java-pkg-2 java-pkg-simple prefix + +DMF="R-${PV}-202211231800" + +DESCRIPTION="Eclipse Compiler for Java" +HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt" +SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar" +S="${WORKDIR}" + +LICENSE="EPL-1.0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" +SLOT="4.26" + +BDEPEND=" + app-arch/unzip + app-arch/zip +" +COMMON_DEP="app-eselect/eselect-java" +DEPEND="${COMMON_DEP} + >=dev-java/ant-1.10.14:0 + >=virtual/jdk-17:*" +RDEPEND="${COMMON_DEP} + !dev-java/ant-eclipse-ecj:4.26 + >=virtual/jre-11:*" + +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 + + mkdir "${JAVA_RESOURCE_DIRS}" || die + find org META-INF -type f \ + ! -name '*.java' \ + | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die +} + +src_compile() { + java-pkg-simple_src_compile + #925083 + # Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes + zip -d ecj.jar "META-INF/ECLIPSE_.RSA" || die "Failed to remove ECLIPSE_.RSA" + zip -d ecj.jar "META-INF/ECLIPSE_.SF" || die "Failed to remove ECLIPSE_.SF" +} + +src_install() { + java-pkg-simple_src_install + insinto /usr/share/java-config-2/compiler + doins "${FILESDIR}/ecj-${SLOT}" + eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT} +} + +pkg_postinst() { + einfo "To select between slots of ECJ..." + einfo " # eselect ecj" + + eselect ecj update ecj-${SLOT} +} + +pkg_postrm() { + eselect ecj update +} diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild deleted file mode 100644 index 4ad6e3222bb1..000000000000 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -MY_PN="ecj" -DMF="R-${PV}-202211231800" - -DESCRIPTION="Eclipse Compiler for Java" -HOMEPAGE="https://www.eclipse.org/" -SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar" - -LICENSE="EPL-1.0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" -SLOT="4.26" -IUSE="+ant" - -COMMON_DEP=" - app-eselect/eselect-java - dev-java/ant-core:0" -RDEPEND="${COMMON_DEP} - >=virtual/jre-11:*" -DEPEND="${COMMON_DEP} - >=virtual/jdk-17:* - app-arch/unzip" -PDEPEND=" - ant? ( ~dev-java/ant-eclipse-ecj-${PV} )" - -JAVA_JAR_FILENAME="${MY_PN}.jar" -JAVA_GENTOO_CLASSPATH="ant-core" - -S="${WORKDIR}" - -# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details -src_prepare() { - default - - # These have their own package. - rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die - rm -r org/eclipse/jdt/internal/antadapter || die - - # JavaCore is not distributed in the jar - sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \ - -e 's|JavaCore.getOptions()||g' \ - org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java -} - -src_compile() { - java-pkg-simple_src_compile - find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed" -} - -src_install() { - java-pkg-simple_src_install - java-pkg_dolauncher ${MY_PN}-${SLOT} --main \ - org.eclipse.jdt.internal.compiler.batch.Main -} - -pkg_postinst() { - einfo "To select between slots of ECJ..." - einfo " # eselect ecj" - - eselect ecj update ecj-${SLOT} -} - -pkg_postrm() { - eselect ecj update -} diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild new file mode 100644 index 000000000000..5b3748f2682d --- /dev/null +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +# 3.36.0 according to +# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_30/org.eclipse.jdt.core.compiler.batch/pom.xml#L20 +MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.33.0" + +inherit java-pkg-2 java-pkg-simple prefix + +DMF="R-${PV/_rc/RC}-202303020300" + +DESCRIPTION="Eclipse Compiler for Java" +HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt" +SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar" + +LICENSE="EPL-1.0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +SLOT="4.27" + +BDEPEND="app-arch/unzip" +COMMON_DEP="app-eselect/eselect-java" +# jdk-21 for https://bugs.gentoo.org/931195 +DEPEND="${COMMON_DEP} + dev-java/ant:0 + >=virtual/jdk-21:*" +RDEPEND="${COMMON_DEP} + >=virtual/jre-11:*" + +HTML_DOCS=( about.html ) + +JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch" +JAVA_CLASSPATH_EXTRA="ant" +JAVA_JAR_FILENAME="ecj.jar" +JAVA_LAUNCHER_FILENAME="ecj-${SLOT}" +JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main" +JAVA_RESOURCE_DIRS="res" + +src_prepare() { + java-pkg-2_src_prepare + + # Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes + rm META-INF/ECLIPSE_* || die + mkdir "${JAVA_RESOURCE_DIRS}" || die + find -type f \ + ! -name '*.java' \ + | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die +} + +src_install() { + java-pkg-simple_src_install + insinto /usr/share/java-config-2/compiler + doins "${FILESDIR}/ecj-${SLOT}" + eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT} +} + +pkg_postinst() { + einfo "To select between slots of ECJ..." + einfo " # eselect ecj" + + eselect ecj update ecj-${SLOT} +} + +pkg_postrm() { + eselect ecj update +} diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild index 0de20cf2511c..b87cee1c3b1a 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild @@ -1,25 +1,25 @@ -# 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" -# 3.35.0 according to -# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_29/org.eclipse.jdt.core.compiler.batch/pom.xml#L20 -MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.35.0" +# 3.36.0 according to +# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_30/org.eclipse.jdt.core.compiler.batch/pom.xml#L20 +MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.36.0" inherit java-pkg-2 java-pkg-simple prefix -DMF="R-${PV}-202309031000" +DMF="R-${PV/_rc/RC}-202312010110" DESCRIPTION="Eclipse Compiler for Java" -HOMEPAGE="https://www.eclipse.org/" -SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar" +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" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -SLOT="4.29" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +SLOT="4.30" BDEPEND=" app-arch/unzip @@ -29,7 +29,7 @@ COMMON_DEP="app-eselect/eselect-java" # ElementsImpl9.java:206: error: # method does not override or implement a method from a supertype DEPEND="${COMMON_DEP} - dev-java/ant-core:0 + >=dev-java/ant-1.10.14:0 >=virtual/jdk-21:*" # Parser.java:1095: error: # pattern matching in instanceof is not supported in -source 11 @@ -39,7 +39,7 @@ RDEPEND="${COMMON_DEP} DOCS=( org/eclipse/jdt/core/README.md ) JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch" -JAVA_CLASSPATH_EXTRA="ant-core" +JAVA_CLASSPATH_EXTRA="ant" JAVA_JAR_FILENAME="ecj.jar" JAVA_LAUNCHER_FILENAME="ecj-${SLOT}" JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main" diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild index c71988b8619d..44e5c0c826be 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild @@ -1,65 +1,61 @@ -# 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" -# 3.33.0 according to -# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_27/org.eclipse.jdt.core.compiler.batch/pom.xml#L20 -MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.33.0" +# 3.36.0 according to +# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_30/org.eclipse.jdt.core.compiler.batch/pom.xml#L20 +MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.37.0" inherit java-pkg-2 java-pkg-simple prefix -DMF="R-${PV}-202303020300" +DMF="R-${PV/_rc/RC}-202402290520" DESCRIPTION="Eclipse Compiler for Java" -HOMEPAGE="https://www.eclipse.org/" -SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar" +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" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -SLOT="4.27" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +SLOT="4.31" -BDEPEND=" - app-arch/unzip - app-arch/zip -" +BDEPEND="app-arch/unzip" COMMON_DEP="app-eselect/eselect-java" # ElementsImpl9.java:206: error: # method does not override or implement a method from a supertype DEPEND="${COMMON_DEP} - dev-java/ant-core:0 + >=dev-java/ant-1.10.14:0 >=virtual/jdk-21:*" +# Parser.java:1095: error: +# pattern matching in instanceof is not supported in -source 11 RDEPEND="${COMMON_DEP} - >=virtual/jre-11:*" + >=virtual/jre-17:*" DOCS=( org/eclipse/jdt/core/README.md ) +PATCHES=( "${FILESDIR}/eclipse-ecj-4.31-java21.patch" ) JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch" -JAVA_CLASSPATH_EXTRA="ant-core" +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() { + default #780585 java-pkg-2_src_prepare + # Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes + rm META-INF/ECLIPSE_* || die + mkdir "${JAVA_RESOURCE_DIRS}" || die find -type f \ ! -name '*.java' \ | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die } -src_compile() { - java-pkg-simple_src_compile - # Error: A JNI error has occurred, please check your installation and try again - # Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes - zip -d ecj.jar "META-INF/ECLIPSE_.RSA" || die "Failed to remove ECLIPSE_.RSA" - zip -d ecj.jar "META-INF/ECLIPSE_.SF" || die "Failed to remove ECLIPSE_.SF" -} - src_install() { java-pkg-simple_src_install insinto /usr/share/java-config-2/compiler diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild new file mode 100644 index 000000000000..3eefeac04654 --- /dev/null +++ b/dev-java/eclipse-ecj/eclipse-ecj-4.32.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" +# 3.38.0 according to +# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_32/org.eclipse.jdt.core.compiler.batch/pom.xml#L20 +MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.38.0" + +inherit java-pkg-2 java-pkg-simple prefix + +DMF="R-${PV/_rc/RC}-202406010610" + +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" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +SLOT="4.32" + +BDEPEND="app-arch/unzip" +COMMON_DEP="app-eselect/eselect-java" +# ElementsImpl9.java:206: error: +# method does not override or implement a method from a supertype +DEPEND="${COMMON_DEP} + >=dev-java/ant-1.10.14-r3:0 + >=virtual/jdk-21:*" +# Parser.java:1095: error: +# pattern matching in instanceof is not supported in -source 11 +RDEPEND="${COMMON_DEP} + >=virtual/jre-17:*" + +DOCS=( org/eclipse/jdt/core/README.md ) + +JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch" +JAVA_CLASSPATH_EXTRA="ant" +JAVA_JAR_FILENAME="ecj.jar" +JAVA_LAUNCHER_FILENAME="ecj-${SLOT}" +JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main" +JAVA_RESOURCE_DIRS="res" + +src_prepare() { + java-pkg-2_src_prepare + + # Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes + rm META-INF/ECLIPSE_* || die + + mkdir "${JAVA_RESOURCE_DIRS}" || die + find -type f \ + ! -name '*.java' \ + | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die +} + +src_install() { + java-pkg-simple_src_install + insinto /usr/share/java-config-2/compiler + doins "${FILESDIR}/ecj-${SLOT}" + eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT} +} + +pkg_postinst() { + einfo "To select between slots of ECJ..." + einfo " # eselect ecj" + + eselect ecj update ecj-${SLOT} +} + +pkg_postrm() { + eselect ecj update +} diff --git a/dev-java/eclipse-ecj/files/ecj-4.20 b/dev-java/eclipse-ecj/files/ecj-4.20 new file mode 100644 index 000000000000..c6ecf2c0deeb --- /dev/null +++ b/dev-java/eclipse-ecj/files/ecj-4.20 @@ -0,0 +1,7 @@ +JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.20" +PACKAGE="=dev-java/eclipse-ecj-4.20*" +SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19" +SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19" +ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" +ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.20" +GENERATION="2" diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.26 b/dev-java/eclipse-ecj/files/ecj-4.26 index 950088453264..950088453264 100644 --- a/dev-java/ant-eclipse-ecj/files/ecj-4.26 +++ b/dev-java/eclipse-ecj/files/ecj-4.26 diff --git a/dev-java/eclipse-ecj/files/ecj-4.27 b/dev-java/eclipse-ecj/files/ecj-4.27 index 7b66f97ff0c7..29fb3b51444e 100644 --- a/dev-java/eclipse-ecj/files/ecj-4.27 +++ b/dev-java/eclipse-ecj/files/ecj-4.27 @@ -1,7 +1,7 @@ JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.27" -PACKAGE="=dev-java/ant-eclipse-ecj-4.27*" -SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21" -SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21" +PACKAGE="=dev-java/eclipse-ecj-4.27*" +SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19" +SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19" ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" -ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.27,ant-eclipse-ecj-4.27" +ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.27" GENERATION="2" diff --git a/dev-java/eclipse-ecj/files/ecj-4.29 b/dev-java/eclipse-ecj/files/ecj-4.30 index 4cb14c005ddf..65b04403b711 100644 --- a/dev-java/eclipse-ecj/files/ecj-4.29 +++ b/dev-java/eclipse-ecj/files/ecj-4.30 @@ -1,7 +1,7 @@ -JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.29" -PACKAGE="=dev-java/ant-eclipse-ecj-4.29*" +JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.30" +PACKAGE="=dev-java/ant-eclipse-ecj-4.30*" SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21" SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21" ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" -ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.29,ant-eclipse-ecj-4.29" +ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.30,ant-eclipse-ecj-4.30" GENERATION="2" diff --git a/dev-java/eclipse-ecj/files/ecj-4.31 b/dev-java/eclipse-ecj/files/ecj-4.31 new file mode 100644 index 000000000000..b5ed4e32a326 --- /dev/null +++ b/dev-java/eclipse-ecj/files/ecj-4.31 @@ -0,0 +1,7 @@ +JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.31" +PACKAGE="=dev-java/eclipse-ecj-4.31*" +SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21 22" +SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21 22" +ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" +ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.31" +GENERATION="2" diff --git a/dev-java/eclipse-ecj/files/ecj-4.32 b/dev-java/eclipse-ecj/files/ecj-4.32 new file mode 100644 index 000000000000..8f4574ac16e1 --- /dev/null +++ b/dev-java/eclipse-ecj/files/ecj-4.32 @@ -0,0 +1,7 @@ +JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.32" +PACKAGE="=dev-java/eclipse-ecj-4.32*" +SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21 22" +SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21 22" +ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" +ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.32" +GENERATION="2" diff --git a/dev-java/eclipse-ecj/files/eclipse-ecj-4.31-java21.patch b/dev-java/eclipse-ecj/files/eclipse-ecj-4.31-java21.patch new file mode 100644 index 000000000000..fc131777bcba --- /dev/null +++ b/dev-java/eclipse-ecj/files/eclipse-ecj-4.31-java21.patch @@ -0,0 +1,12 @@ +# ./org/eclipse/jdt/internal/compiler/parser/Parser.java:4511: \ +# error: reference to StringTemplate is ambiguous +--- a/org/eclipse/jdt/internal/compiler/parser/Parser.java ++++ b/org/eclipse/jdt/internal/compiler/parser/Parser.java +@@ -56,6 +56,7 @@ import org.eclipse.jdt.core.compiler.InvalidInputException; + import org.eclipse.jdt.internal.compiler.ASTVisitor; + import org.eclipse.jdt.internal.compiler.CompilationResult; + import org.eclipse.jdt.internal.compiler.ast.*; ++import org.eclipse.jdt.internal.compiler.ast.StringTemplate; + import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants; + import org.eclipse.jdt.internal.compiler.codegen.ConstantPool; + import org.eclipse.jdt.internal.compiler.env.ICompilationUnit; diff --git a/dev-java/eclipse-ecj/metadata.xml b/dev-java/eclipse-ecj/metadata.xml index 218c1eb894a3..d59675e7a795 100644 --- a/dev-java/eclipse-ecj/metadata.xml +++ b/dev-java/eclipse-ecj/metadata.xml @@ -15,7 +15,4 @@ used with Ant by using the -lib option to and and setting <upstream> <remote-id type="github">eclipse-jdt/eclipse.jdt.core</remote-id> </upstream> -<use> - <flag name="ant">Support using ecj in Ant builds via <pkg>dev-java/ant-eclipse-ecj</pkg></flag> -</use> </pkgmetadata> diff --git a/dev-java/eclipse-jdt-annotation/Manifest b/dev-java/eclipse-jdt-annotation/Manifest new file mode 100644 index 000000000000..4bcbba688975 --- /dev/null +++ b/dev-java/eclipse-jdt-annotation/Manifest @@ -0,0 +1 @@ +DIST eclipse.jdt.core-4.30.tar.gz 13729445 BLAKE2B 9458ec92e3561d42505a602bb637c678c99b1997e2ba530048298d587cad9861066233e7f8e4b1cb22fd30ce50159aabc4e12295fb8231cc8840cdaac4f967a7 SHA512 b51c3ccc098b9100ad653baec7bbff108344ff0402de1cbb7e0f75d97c7b5b64a9746bc7b7f2faee8126bbb5a5f421fe7c54c428cc6403662626f4a566a9ead5 diff --git a/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild b/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild new file mode 100644 index 000000000000..0aed027c4072 --- /dev/null +++ b/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild @@ -0,0 +1,24 @@ +# 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="org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.800" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="JDT Annotations for Enhanced Null Analysis" +HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt" +SRC_URI="https://github.com/eclipse-jdt/eclipse.jdt.core/archive//R${PV//./_}.tar.gz -> eclipse.jdt.core-${PV}.tar.gz" +S="${WORKDIR}/eclipse.jdt.core-R${PV//./_}/org.eclipse.jdt.annotation" + +LICENSE="EPL-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~x86" + +RDEPEND=">=virtual/jre-1.8:*" +DEPEND=">=virtual/jdk-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.annotation" diff --git a/dev-java/eclipse-jdt-annotation/metadata.xml b/dev-java/eclipse-jdt-annotation/metadata.xml new file mode 100644 index 000000000000..7ac29f83dafb --- /dev/null +++ b/dev-java/eclipse-jdt-annotation/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">eclipse-jdt/eclipse.jdt.core</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/emma/emma-2.0.5312-r4.ebuild b/dev-java/emma/emma-2.0.5312-r4.ebuild deleted file mode 100644 index 0ea013aa1a3e..000000000000 --- a/dev-java/emma/emma-2.0.5312-r4.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Free Java code coverage tool" -HOMEPAGE="http://emma.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip" - -LICENSE="CPL-1.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -IUSE="+launcher" - -CDEPEND=" - dev-java/ant-core - launcher? ( !sci-biology/emboss )" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.8:*" - -BDEPEND="app-arch/unzip" - -EANT_BUILD_TARGET="build" - -src_prepare() { - default - eapply "${FILESDIR}/${P}-java15api.patch" - # bcp mangling unneccessary for 1.4+ and breaks with IBM 1.6 - bug #220463 - sed -e '/bootclasspathref/d' -e '/extdirs/d' -i build.xml || die -} - -src_install() { - java-pkg_dojar "dist/${PN}.jar" - java-pkg_dojar "dist/${PN}_ant.jar" - java-pkg_register-ant-task - - use launcher && java-pkg_dolauncher ${PN} --main emmarun - - # One of these does not have java sources - use source && java-pkg_dosrc */*/com 2> /dev/null -} diff --git a/dev-java/emma/emma-2.0.5312-r6.ebuild b/dev-java/emma/emma-2.0.5312-r6.ebuild new file mode 100644 index 000000000000..5d554fb81287 --- /dev/null +++ b/dev-java/emma/emma-2.0.5312-r6.ebuild @@ -0,0 +1,82 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_PROVIDES=" + emma:emma:${PV} + emma:emma_ant:${PV} +" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Free Java code coverage tool" +HOMEPAGE="https://emma.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/project/emma/emma-release/${PV}/${P}-src.zip" +S="${WORKDIR}/${P}" + +LICENSE="CPL-1.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +IUSE="+launcher" + +BDEPEND="app-arch/unzip" +CP_DEPEND=">=dev-java/ant-1.10.14:0" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:* + launcher? ( !sci-biology/emboss:0 )" + +PATCHES=( "${FILESDIR}/emma-2.0.5312-java15api.patch" ) + +JAVADOC_CLASSPATH="ant" +JAVADOC_SRC_DIRS=( + core/data core/java1{2,3,4} + ant/ant1{4,5} +) + +src_prepare() { + default #780585 +} + +src_compile() { + einfo "Compiling emma.jar" + JAVA_JAR_FILENAME="emma.jar" + JAVA_MAIN_CLASS="emmarun" + JAVA_RESOURCE_DIRS=( core/res ) + JAVA_SRC_DIR=( core/data core/java1{2,3,4} ) + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":emma.jar" + rm -r target || die + + einfo "Compiling emma_ant.jar" + JAVA_JAR_FILENAME="emma_ant.jar" + JAVA_MAIN_CLASS="com.vladium.emma.ANTMain" + JAVA_RESOURCE_DIRS=() + JAVA_SRC_DIR=( ant/ant1{4,5} ) + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":emma_ant.jar" + rm -r target || die + + use doc && ejavadoc +} + +src_install() { + java-pkg_dojar "emma.jar" "emma_ant.jar" + java-pkg_register-ant-task + + use launcher && java-pkg_dolauncher ${PN} --main emmarun + + if use doc; then + java-pkg_dojavadoc target/api + fi + + if use source; then + java-pkg_dosrc core/data/* + java-pkg_dosrc core/java1{2,3,4}/* + java-pkg_dosrc ant/ant1{4,5}* + fi +} diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest index 9cb3038bb4fa..f1084eef66fc 100644 --- a/dev-java/error-prone-annotations/Manifest +++ b/dev-java/error-prone-annotations/Manifest @@ -1 +1 @@ -DIST error-prone-2.16.tar.gz 2685946 BLAKE2B e10d38e5d0f6be102d64c4d24543f525c192300665a141d136d4bcb1db0e8553c16828411b60e2bca0d27a89fe7e094ac2fc2a367028091a4ad28b303c023a43 SHA512 c61d14e237ae45f3d1196e03ecdb5e77aa8aaa2f5983eee3667cc73951a12b1f0c85bd8a15c477c18fd517d486024d3b1f115928affb3697afc064d561b5f405 +DIST error-prone-2.27.1.tar.gz 2826681 BLAKE2B 8f848a89e97ea939dc4b81751a40d7b6bec64807ddca0d078bc02599bb663fa8a8d10d566536c33c4d50b3af21cf613bb282ac3403fe5345a20361627e116e5a SHA512 54d288dd5d5f23ae052eacc92ce304b2743aa56a524ad1b235ecd35cc4ecd72b44ec0c3fee319076466b8e90c20095fd5191d59b9c48cbe5bd940e189b1a073e diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.16.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild index d000706c8189..ee798f4c460f 100644 --- a/dev-java/error-prone-annotations/error-prone-annotations-2.16.ebuild +++ b/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild @@ -1,9 +1,6 @@ -# 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/google/error-prone/archive/v2.16.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild error-prone-annotations-2.16.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source" @@ -14,15 +11,14 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Java annotations for the Error Prone static analysis tool" HOMEPAGE="https://errorprone.info" SRC_URI="https://github.com/google/error-prone/archive/v${PV}.tar.gz -> error-prone-${PV}.tar.gz" +S="${WORKDIR}/error-prone-${PV}/annotations" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -DEPEND=">=virtual/jdk-1.8:*" +DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}/error-prone-${PV}/annotations" - JAVA_AUTOMATIC_MODULE_NAME="com.google.errorprone.annotations" JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/failureaccess/Manifest b/dev-java/failureaccess/Manifest deleted file mode 100644 index beb166188cf0..000000000000 --- a/dev-java/failureaccess/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78 diff --git a/dev-java/failureaccess/failureaccess-32.1.2.ebuild b/dev-java/failureaccess/failureaccess-32.1.2.ebuild deleted file mode 100644 index fff769f48fc7..000000000000 --- a/dev-java/failureaccess/failureaccess-32.1.2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P=guava-${PV} - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="com.google.guava:failureaccess:1.0.1" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Guava's InternalFutureFailureAccess and InternalFutures classes." -HOMEPAGE="https://github.com/google/guava/" -SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -JAVA_SRC_DIR="futures/${PN}/src/com/google/common/util/concurrent/internal/" diff --git a/dev-java/failureaccess/metadata.xml b/dev-java/failureaccess/metadata.xml deleted file mode 100644 index 599c42537433..000000000000 --- a/dev-java/failureaccess/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <longdescription lang="en"> -Contains com.google.common.util.concurrent.internal.InternalFutureFailureAccess -and InternalFutures. Most users will never need to use this artifact. Its -classes are conceptually a part of Guava, but they're in this separate artifact -so that Android libraries can use them without pulling in all of Guava (just as -they can use ListenableFuture by depending on the listenablefuture artifact). - </longdescription> - <upstream> - <remote-id type="github">google/guava</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-java/felix-gogo-runtime/Manifest b/dev-java/felix-gogo-runtime/Manifest new file mode 100644 index 000000000000..a252dc474e84 --- /dev/null +++ b/dev-java/felix-gogo-runtime/Manifest @@ -0,0 +1,2 @@ +DIST felix-gogo-runtime-1.1.6.tar.gz 117060 BLAKE2B 5ffbc36688f7f69595c5087910e6b9007b57d4b60a6d18d9adee473987193b5fc478cf241229a32044abebf3e796394591e2626ad5560d1cbde0dfb572d62f7f SHA512 0cf431767506a0ca3f78a4e7c666bb9da7301d9968078653ef67deccc73da80e15e01e19ecd6e499215faa4236d46a4f4179b54798ba4d847cfe8a0d858e44ee +DIST felix-gogo-runtime-1.1.6.tar.gz.asc 833 BLAKE2B 12ef2c9bf4d5f6e5dee1a10b1d6afcd366805361181f2621ed98f3c4a36db155e7c1b493152e528cd3a8e46ca12e61bda140a2e4c13b133374bb10ec47c4554a SHA512 05b8247508c477ad374f18e7dc22faa9d116c3416b6390173366391b6f7a726cbb604adcaecc013faf51b03cbde57f09d95891a283045d35ed809e01ae7d5dae diff --git a/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild b/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild new file mode 100644 index 000000000000..a31b155dd9a4 --- /dev/null +++ b/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild @@ -0,0 +1,55 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.felix:org.apache.felix.gogo.runtime:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Apache Felix Gogo Runtime" +HOMEPAGE="https://felix.apache.org/documentation/subprojects/apache-felix-gogo.html" +SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz + verify-sig? ( https://dlcdn.apache.org/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz.asc -> ${P}.tar.gz.asc )" +S="${WORKDIR}/org.apache.felix.gogo.runtime-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~x86" + +CP_DEPEND=" + dev-java/osgi-annotation:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 +" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + test? ( + dev-java/mockito:2 + ) +" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:* +" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/felix.apache.org.asc" + +PATCHES=( "${FILESDIR}/${P}-skip-tests-non-java-8.patch" ) + +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_EXCLUDES=( + #Invalid test class No runnable methods + org.apache.felix.gogo.runtime.TestEvaluate +) +JAVA_TEST_GENTOO_CLASSPATH=" + junit-4 + mockito-2 +" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + default +} diff --git a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch new file mode 100644 index 000000000000..270b01be759a --- /dev/null +++ b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch @@ -0,0 +1,22 @@ +skip tests that fail with java > 1.8 if java > 1.8 is used + +we compare here just that the first part of the version is 1 +which is true only for version 1.8, other versions have first number +like 11, 17, 21 and those fail the condition hence the remaining tests +are skipped +we cannot use System.version() here as this is available only since java 9 + +--- a/src/test/java/org/apache/felix/gogo/runtime/TestParser.java ++++ b/src/test/java/org/apache/felix/gogo/runtime/TestParser.java +@@ -149,9 +149,10 @@ public class TestParser extends AbstractParserTest + assertEquals("def", c.execute("echo def|grep d.*|capture")); + assertEquals("def", c.execute("echoout def|grep d.*|capture")); + assertEquals("def", c.execute("myecho def|grep d.*|capture")); +- assertEquals("def", c.execute("(echoout abc; echoout def; echoout ghi)|grep d.*|capture")); + assertEquals("", c.execute("echoout def; echoout ghi | grep d.* | capture")); + assertEquals("hello world", c.execute("echo hello world|capture")); ++ org.junit.Assume.assumeTrue("1".equals(System.getProperty("java.version").split("\\.")[0])); ++ assertEquals("def", c.execute("(echoout abc; echoout def; echoout ghi)|grep d.*|capture")); + assertEquals("defghi", c.execute("(echoout abc; echoout def; echoout ghi)|grep 'def|ghi'|capture")); + } + diff --git a/dev-java/felix-gogo-runtime/metadata.xml b/dev-java/felix-gogo-runtime/metadata.xml new file mode 100644 index 000000000000..b2e227e0b6b2 --- /dev/null +++ b/dev-java/felix-gogo-runtime/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <bugs-to>https://issues.apache.org/jira/browse/FELIX</bugs-to> + <doc>https://felix.apache.org/documentation/subprojects/apache-felix-gogo.html</doc> + <remote-id type="github">apache/felix-dev</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild b/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild index 5270eda74562..99153285f62d 100644 --- a/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild +++ b/dev-java/findbugs-annotations/findbugs-annotations-3.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: @@ -12,8 +12,9 @@ MAVEN_ID="com.google.code.findbugs:findbugs-annotations:3.0.1" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Annotation defined by the FindBugs tool" -HOMEPAGE="http://findbugs.sourceforge.net/" +HOMEPAGE="https://findbugs.sourceforge.net/" SRC_URI="https://repo1.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${P}-sources.jar" +S="${WORKDIR}" LICENSE="LGPL-3" SLOT="0" @@ -37,5 +38,3 @@ RDEPEND=" ${CP_DEPEND}" BDEPEND="app-arch/unzip" - -S="${WORKDIR}" diff --git a/dev-java/findbugs-annotations/metadata.xml b/dev-java/findbugs-annotations/metadata.xml index 75321cfb5598..8a3dfbf0281d 100644 --- a/dev-java/findbugs-annotations/metadata.xml +++ b/dev-java/findbugs-annotations/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="sourceforge">findbugs</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/fishbowl/metadata.xml b/dev-java/fishbowl/metadata.xml index 75321cfb5598..9a4cc6850f96 100644 --- a/dev-java/fishbowl/metadata.xml +++ b/dev-java/fishbowl/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">stefanbirkner/fishbowl</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest index 5080bc909c93..09319bb63d30 100644 --- a/dev-java/fop/Manifest +++ b/dev-java/fop/Manifest @@ -1,6 +1,4 @@ DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c SHA512 71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6 -DIST fop-2.8-src.tar.gz 22855369 BLAKE2B 183649f531068b8f7513613c89f9f66a48894ab97a659e110b91853d5dffc1664d3830a8ced9ba221e22ca02fc51aed991ddee0e927cab59b9160a504f6dab02 SHA512 22e1737b5cd87dc5e014838e2ad867ccf46bdc564fb5c231cc6b4c1f8a9862864679ea7ddf143126058553ed90045941fb07aa2657db9e3ed35660ce11169357 -DIST fop-2.8-src.tar.gz.asc 833 BLAKE2B f761b427bac89249ab4ab5f2194468e44f997e28ed77392a785764fb60dd2fbbc716ef881e2009a3dbad416ef195fc8ae4d2ebdbd63c3fb3f47d355acab8389b SHA512 c25e94ac4a72c9ff9bfa487369ee1510ab5b19a6178f14f5076b9cf0548044e79eca707025e962c63d268d0f48661cc7110f604036957e447f8413cdb582d3de DIST fop-2.9-src.tar.gz 20642865 BLAKE2B 6ab265ddfb1c07b9266687930af21ac4653438800772da836dbceb14de126333dcff50c2cea1352ad77988ec7f7a3d4eef91341983edc13684abf2531634eb0a SHA512 d346c8fffd0d3ff5e803bea4233ce171972ded39b0c475b367333e37247da8f9e823c7e2e75fab735bf9282654d67befa2fa473f53a199cbd96b0f7305b3c093 DIST fop-2.9-src.tar.gz.asc 833 BLAKE2B 284f04d450bcfb6583d353ae21bbadad8da14b59d946e094453b564e700c8cfdcb448ed206a5a246b725b453a1b3feea69f96ff3b2a683320bce6743cc5a167f SHA512 404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc DIST fop-hyph-2.0.jar 6655933 BLAKE2B bfbefcc2ebd9a9a467c23a70d7cef256f83cf2335f6e17db6bbefceaf8a3cee78de0302f269d096eb3238b3f4883429e09cc640bed11a42da4ef67ab9f0cb164 SHA512 3d5f27623008c7beba5332387bd42c501b7ae1dddfc98014b3fb35273394ca5f0a4ce69e7726090ec468c9b4f7983fb8b1a5759f49e81ea342c81c61311d87b3 diff --git a/dev-java/fop/files/fop-2.8-skip-failing-tests.patch b/dev-java/fop/files/fop-2.8-skip-failing-tests.patch deleted file mode 100644 index 729795e93fd2..000000000000 --- a/dev-java/fop/files/fop-2.8-skip-failing-tests.patch +++ /dev/null @@ -1,48 +0,0 @@ -# https://bugs.gentoo.org/903880 ---- a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java -+++ b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java -@@ -43,6 +43,7 @@ import javax.xml.transform.stream.StreamSource; - - import org.custommonkey.xmlunit.Diff; - import org.junit.Test; -+import org.junit.Ignore; - import org.w3c.dom.Document; - import org.xml.sax.SAXException; - import org.xml.sax.helpers.AttributesImpl; -@@ -144,7 +145,7 @@ public class FO2StructureTreeConverterTestCase { - assertNull(d.getStructureTreeEventHandler().startNode("table-body", null, null)); - } - -- @Test -+ @Test @Ignore - public void testRemoveBlocks() throws Exception { - keepEmptyTags = false; - compare("<fo:root xmlns:fo=\"http://www.w3.org/1999/XSL/Format\">\n" -@@ -180,7 +181,7 @@ public class FO2StructureTreeConverterTestCase { - + "</structure-tree-sequence>\n"); - } - -- @Test -+ @Test @Ignore - public void testRemoveTableHeader() throws Exception { - keepEmptyTags = false; - String fo = IOUtils.toString(getResource("table-artifact.fo"), "utf8").replace("role=\"artifact\"", ""); ---- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java -+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java -@@ -25,6 +25,7 @@ import java.io.File; - import java.io.IOException; - - import org.junit.Test; -+import org.junit.Ignore; - import org.xml.sax.SAXException; - - import static org.junit.Assert.assertEquals; -@@ -61,7 +62,7 @@ public class PDFEncodingTestCase extends BasePDFTest { - * Test using a standard FOP font - * @throws Exception checkstyle wants a comment here, even a silly one - */ -- @Test -+ @Test @Ignore - public void testPDFEncodingWithStandardFont() throws Exception { - - /* If the PDF encoding is correct, a text dump of the generated PDF file contains this (excerpts) diff --git a/dev-java/fop/fop-2.8-r1.ebuild b/dev-java/fop/fop-2.8-r1.ebuild deleted file mode 100644 index 89f3be35d3bc..000000000000 --- a/dev-java/fop/fop-2.8-r1.ebuild +++ /dev/null @@ -1,188 +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.apache.xmlgraphics:fop:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple verify-sig - -DESCRIPTION="XML Graphics Format Object Processor All-In-One" -HOMEPAGE="https://xmlgraphics.apache.org/fop/" -SRC_URI=" - mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz - https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz - verify-sig? ( https://www.apache.org/dist/xmlgraphics/fop/source/${P}-src.tar.gz.asc ) - test? ( https://repo1.maven.org/maven2/net/sf/offo/fop-hyph/2.0/fop-hyph-2.0.jar ) -" -S="${WORKDIR}/fop-${PV}" - -LICENSE="Apache-2.0" -SLOT="2.8" -KEYWORDS="amd64 ~arm64 ppc64 x86" - -CP_DEPEND=" - dev-java/batik:1.16 - dev-java/commons-io:1 - dev-java/commons-logging:0 - dev-java/fontbox:0 - dev-java/qdox:1.12 - dev-java/xmlgraphics-commons:2 -" - -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8:* - dev-java/ant-core:0 - dev-java/javax-servlet-api:2.2 - dev-java/sun-jai-bin:0 - test? ( - dev-java/mockito:2 - dev-java/pdfbox:0 - dev-java/xmlunit:1 - ) -" - -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" - -BDEPEND="dev-java/xalan:0" - -DOCS=( NOTICE README ) - -PATCHES=( "${FILESDIR}/fop-2.8-skip-failing-tests.patch" ) - -JAVA_CLASSPATH_EXTRA=" - ant-core - javax-servlet-api-2.2 - sun-jai-bin -" - -BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc" - -src_unpack() { - if use verify-sig; then - verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc} - fi - default -} - -src_prepare() { - java-pkg_clean - java-pkg-2_src_prepare - default -} - -src_compile() { - JAVA_JAR_FILENAME="fop-util.jar" - JAVA_SRC_DIR="fop-util/src/main/java" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar" - rm -r target || die - - JAVA_JAR_FILENAME="fop-events.jar" - JAVA_RESOURCE_DIRS="fop-events/src/main/resources" - JAVA_SRC_DIR="fop-events/src/main/java" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar" - rm -r target || die - - JAVA_JAR_FILENAME="fop-core.jar" - JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' fop-core/pom.xml ) - JAVA_RESOURCE_DIRS="fop-core/src/main/resources" - JAVA_SRC_DIR="fop-core/src/main/java" - # Code generation according to - # https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L156-L225 - pushd fop-core/src/main/codegen/fonts > /dev/null || die - local fonts=$(find . -name "Courier*.xml" \ - -o -name "Helvetica*.xml" \ - -o -name "Times*.xml" \ - -o -name "Symbol.xml" \ - -o -name "ZapfDingbats.xml" - ) - for font in ${fonts}; do \ - xalan -XSLTC \ - -IN $font \ - -XSL font-file.xsl \ - -OUT ../../java/org/apache/fop/fonts/base14/${font//.xml}.java || die - done - xalan -XSLTC \ - -IN encodings.xml \ - -XSL code-point-mapping.xsl \ - -OUT ../../java/org/apache/fop/fonts/base14/CodePointMapping.java || die - popd > /dev/null || die - java-pkg-simple_src_compile - - # Update "fop-core.jar" with "event-mode.xml" files produced manually - # by running "mvn package". - # Upstream does this with maven-antrun-plugin: - # https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L269-L290 - mkdir event-model && pushd $_ > /dev/null || die - jar -xf "${WORKDIR}/fop-2.7-core-event-models.jar" - popd > /dev/null || die - - jar -uf "fop-core.jar" -C event-model . || die - JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-core.jar" - rm -r target || die - - if use doc; then \ - JAVA_SRC_DIR=( - "fop-util/src/main/java" - "fop-events/src/main/java" - "fop-core/src/main/java" - ) - JAVA_JAR_FILENAME="ignoreme.jar" - java-pkg-simple_src_compile - fi -} - -src_test() { - JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-2,pdfbox,xmlunit-1" - - einfo "Testing fop-events" - JAVA_TEST_EXCLUDES="org.apache.fop.events.TestEventProducer" - JAVA_TEST_SRC_DIR="fop-events/src/test/java" - # This jar file was created manually from the output of "mvn test". - # Upstream does this with maven-antrun-plugin - jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die - java-pkg-simple_src_test - - einfo "Testing fop-core" - pushd fop-core/src/test/java > /dev/null || die - # Excluding one test, see https://bugs.gentoo.org/903880 - local JAVA_TEST_RUN_ONLY=$(find * -type f \ - -name "*TestCase.java" \ - ! -name 'MissingLanguageWarningTestCase.java' \ - ) - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - popd > /dev/null || die - # https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L297-L307 - # <workingDirectory>../fop</workingDirectory> - pushd fop > /dev/null || die - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/fop-hyph-2.0.jar" - JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-util.jar" - JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-events.jar" - JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-core.jar" - JAVA_TEST_RESOURCE_DIRS="../fop-core/src/test/resources" - JAVA_TEST_SRC_DIR="../fop-core/src/test/java" - java-pkg-simple_src_test - popd > /dev/null || die -} - -src_install() { - local module - for module in fop-util fop-events fop-core ; do - java-pkg_dojar "${module}.jar" - if use source; then - java-pkg_dosrc "${module}/src/main/java/*" - fi - done - if use doc; then - java-pkg_dojavadoc target/api - fi - java-pkg_dolauncher "fop-${SLOT}" --main "org.apache.fop.cli.Main" - einstalldocs -} diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9-r1.ebuild index 63bf4d2080f1..c9268c877d7d 100644 --- a/dev-java/fop/fop-2.9.ebuild +++ b/dev-java/fop/fop-2.9-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,29 +14,36 @@ HOMEPAGE="https://xmlgraphics.apache.org/fop/" SRC_URI=" mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz - verify-sig? ( https://www.apache.org/dist/xmlgraphics/fop/source/${P}-src.tar.gz.asc ) + 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}" LICENSE="Apache-2.0" SLOT="2.8" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ppc64 x86" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc" + +BDEPEND=" + dev-java/xalan:0 + verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop ) +" CP_DEPEND=" + >=dev-java/ant-1.10.14-r3:0 dev-java/batik:1.16 dev-java/commons-io:1 dev-java/commons-logging:0 dev-java/fontbox:0 + dev-java/javax-servlet-api:2.2 dev-java/qdox:1.12 + dev-java/sun-jai-bin:0 dev-java/xmlgraphics-commons:2 " DEPEND="${CP_DEPEND} >=virtual/jdk-1.8:* - dev-java/ant-core:0 - dev-java/javax-servlet-api:2.2 - dev-java/sun-jai-bin:0 test? ( dev-java/mockito:2 dev-java/pdfbox:0 @@ -47,8 +54,6 @@ DEPEND="${CP_DEPEND} RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" -BDEPEND="dev-java/xalan:0" - DOCS=( NOTICE README ) PATCHES=( @@ -58,14 +63,6 @@ PATCHES=( "${FILESDIR}/fop-2.9-FO2StructureTreeConverterTestCase.patch" ) -JAVA_CLASSPATH_EXTRA=" - ant-core - javax-servlet-api-2.2 - sun-jai-bin -" - -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc" src_unpack() { if use verify-sig; then verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc} @@ -80,6 +77,9 @@ src_prepare() { } src_compile() { + # while ant could install multiple jar files we only need ant.jar + JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjar ant ant.jar)" + JAVA_JAR_FILENAME="fop-util.jar" JAVA_SRC_DIR="fop-util/src/main/java" java-pkg-simple_src_compile @@ -151,6 +151,8 @@ src_test() { # 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 + mkdir generated-test || die + mv {target/test-classes,generated-test}/org || die java-pkg-simple_src_test einfo "Testing fop-core" diff --git a/dev-java/freenet-ext/freenet-ext-29.ebuild b/dev-java/freenet-ext/freenet-ext-29-r1.ebuild index 9cac638d5835..afdb83a3f7f7 100644 --- a/dev-java/freenet-ext/freenet-ext-29.ebuild +++ b/dev-java/freenet-ext/freenet-ext-29-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,10 @@ DEPEND=" dev-libs/gmp:0= >=virtual/jdk-1.8:* " -RDEPEND=">=virtual/jre-1.8:*" +RDEPEND=" + dev-libs/gmp + >=virtual/jre-1.8:* +" PATCHES=( "${FILESDIR}/freenet-ext-29-convert-jcpuid.patch" diff --git a/dev-java/gin/Manifest b/dev-java/gin/Manifest deleted file mode 100644 index 5908cb81423c..000000000000 --- a/dev-java/gin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gin-2.1.2.tar.gz 4100895 BLAKE2B ba9dcd333d51460f8e108253b7a5aeb92fa521b7d2b5133285917dc398264f581b1384b7e002b4d2ac677edc0e62a43b8718e02514ea942d90e2836dd5c66c40 SHA512 cfd11497d358217e3e6e0a024f461bd8fbd23cb39262c447c2729799b9aa3252967f866da9253c03de72a5dc43ee5cf1e7f6353f388b296af33e1e7be2bb8ddd diff --git a/dev-java/gin/gin-2.1.2-r1.ebuild b/dev-java/gin/gin-2.1.2-r1.ebuild deleted file mode 100644 index 43bf6656dd6e..000000000000 --- a/dev-java/gin/gin-2.1.2-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Google Gin (GWT INjection)" -HOMEPAGE="https://gwtplus.github.io/google-gin/" -SRC_URI="https://github.com/gwtplus/google-gin/archive/${PV}.tar.gz -> ${P}.tar.gz" - -RESTRICT="mirror" -SLOT="2.1" -LICENSE="Apache-2.0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -CDEPEND=" - dev-java/aopalliance:1 - dev-java/javax-inject:0 - dev-java/gwt:2.8 - dev-java/validation-api:1.0 -" -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" -DEPEND=" - ${CDEPEND} - virtual/jdk:1.8" - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_BUILD_XML="build.xml" -EANT_GENTOO_CLASSPATH=" - aopalliance-1 - javax-inject - gwt-2.8 - validation-api-1.0 -" - -S="${WORKDIR}/google-gin-${PV}" - -JAVA_RM_FILES=( - trunk/lib/aopalliance.jar - trunk/lib/javax.inject.jar - lib/aopalliance.jar - lib/javax.inject.jar -) - -src_compile() { - local EANT_BUILD_TARGET="compile" - GWT_HOME="${ESYSROOT}/usr/share/gwt-2.8/lib" \ - java-pkg-2_src_compile - EANT_BUILD_TARGET="jars" - GWT_HOME="${ESYSROOT}/usr/share/gwt-2.8/lib" \ - java-pkg-2_src_compile -} - -src_test() { - GWT_HOME="${ESYSROOT}/usr/share/gwt-2.8/lib" \ - ant test || die -} - -src_install() { - java-pkg_newjar \ - out/dist/${P}-src.jar ${PN}-src.jar - java-pkg_newjar \ - out/dist/${P}.jar ${PN}.jar - java-pkg_dojar \ - lib/*.jar -} diff --git a/dev-java/gin/metadata.xml b/dev-java/gin/metadata.xml deleted file mode 100644 index 0aaeb43aefdc..000000000000 --- a/dev-java/gin/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>gienah@gentoo.org</email> - <name>Mark Wright</name> - </maintainer> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <longdescription lang="en"> - Gin (GWT INjection) brings automatic dependency injection to - GWT client-side code. Gin is built on top of Guice and uses (a - subset of) Guice's binding language. - </longdescription> -</pkgmetadata> diff --git a/dev-java/glassfish-persistence/Manifest b/dev-java/glassfish-persistence/Manifest deleted file mode 100644 index bdd1ede41798..000000000000 --- a/dev-java/glassfish-persistence/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST glassfish-9_0-b48-src.zip 35162972 BLAKE2B ff96f2135c6bbdc60eadab6a6bd60b623ac1a3635e4465591ee75f6c1229e83f9f6424b46e42eb333eb6edd3ba1aba51897ab80ca5bd5c754e516a27a03381d9 SHA512 512ccd1c89a1bbd88ca1e45b1e60693bd3c4a6c6ffa19376febb786eb73556f27bc0ce4f0e760d6d80b0711206f6701e7c7da70ef3a5e0084ad0482246506a48 diff --git a/dev-java/glassfish-persistence/files/glassfish-persistence-1.0-python2.7-sax-parser.patch b/dev-java/glassfish-persistence/files/glassfish-persistence-1.0-python2.7-sax-parser.patch deleted file mode 100644 index 51b1e8af9429..000000000000 --- a/dev-java/glassfish-persistence/files/glassfish-persistence-1.0-python2.7-sax-parser.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glassfish/bootstrap/build.xml -+++ glassfish/bootstrap/build.xml -@@ -23,7 +23,7 @@ - --> - - <!DOCTYPE project [ -- <!ENTITY glassfish SYSTEM "file:./glassfish.xml"> -+ <!ENTITY glassfish SYSTEM "file:glassfish.xml"> - ]> - - <project name="Top Level Build" default="all" basedir="."> diff --git a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild deleted file mode 100644 index 9bfaadee8841..000000000000 --- a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Glassfish implementation of persistence API" -HOMEPAGE="https://javaee.github.io/glassfish/" -SRC_URI="https://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip" - -LICENSE="CDDL" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -BDEPEND="app-arch/unzip" -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -S="${WORKDIR}/glassfish" - -EANT_BUILD_XML="persistence-api/build.xml" -EANT_BUILD_TARGET="all" - -PATCHES=( - "${FILESDIR}"/${P}-python2.7-sax-parser.patch -) - -src_prepare() { - default -} - -src_install() { - cd "${WORKDIR}"/publish/glassfish || die - java-pkg_newjar lib/javaee.jar - - insinto /usr/share/${PN}/lib/schemas - doins lib/schemas/*.xsd -} diff --git a/dev-java/glassfish-persistence/metadata.xml b/dev-java/glassfish-persistence/metadata.xml deleted file mode 100644 index 851b900d2361..000000000000 --- a/dev-java/glassfish-persistence/metadata.xml +++ /dev/null @@ -1,7 +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> -</maintainer> -</pkgmetadata> diff --git a/dev-java/gnu-jaf/Manifest b/dev-java/gnu-jaf/Manifest deleted file mode 100644 index bc1c053be9b8..000000000000 --- a/dev-java/gnu-jaf/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST activation-1.1.2.tar.gz 290644 BLAKE2B 15ec89a5c757bb134b9ec71e384a80dea5394b9b6463ca1fe44e2e622993fa8809231379b262b0a54595c32451a49ef508bea45ce82120138efe07d81939a817 SHA512 26534f7bb47daddf97b850ab74fc8ef2c5bd62d12cfb96e28e235071af7dcfc7761fa15f2d8f3a2d194f035665cef127812b7476af6cc81f6d6374f1fa725584 diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild deleted file mode 100644 index 6835f9c1d704..000000000000 --- a/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="GNU implementation of the JavaBeans Activation Framework" -HOMEPAGE="https://www.gnu.org/software/classpathx/jaf/jaf.html" -SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz" - -LICENSE="GPL-2-with-linking-exception" -SLOT="1" -KEYWORDS="amd64 ppc64 x86" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -S="${WORKDIR}/activation-${PV}" - -EANT_BUILD_TARGET="activation.jar" - -src_install() { - java-pkg_dojar activation.jar - einstalldocs - use doc && java-pkg_dojavadoc docs - use source && java-pkg_dosrc source/* -} diff --git a/dev-java/gnu-jaf/metadata.xml b/dev-java/gnu-jaf/metadata.xml deleted file mode 100644 index ab2d72bd90a7..000000000000 --- a/dev-java/gnu-jaf/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> - -<longdescription> -GNU JAF is a framework for declaring what beans operate on what MIME -type data. Content handler beans can be defined to handle particular -MIME content. The JAF unites internet standards for declaring content -with JavaBeansâ„¢. - -The JAF defines two mechanisms within the framework. The first, the -file type map, specifies the MIME content type for a given file. The -default implementation of this uses the UNIX mime.types format to map -filename extensions to MIME types. The second mechanism, the command -map, specifies the actions that can be applied to a given MIME content -type. The default implementation of this uses the standard mailcap format -to map actions to JavaBeanâ„¢ classes. These beans can then view, edit, -print, or perform whatever other action is required on the underlying -resource. -</longdescription> - -</pkgmetadata> diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest index 539c6ffe4fde..98941f07f28e 100644 --- a/dev-java/gradle-bin/Manifest +++ b/dev-java/gradle-bin/Manifest @@ -1,12 +1,3 @@ -DIST gradle-bin-6.8.3.zip 150631445 BLAKE2B 935a6631167481e289ac5a468b822ffeec204519edf42c8a0f05a911ef716715b706e3c22637763b4a7a0c7cbfa89f163673ef5631c115c025c5634b353fcee6 SHA512 fdd5c347142c2a8e2a1455d8886ddb103531de6e69d41f20d199a488d10165600924876761b452da213759a1dc6d47ed00a069f1a9f8af99fdbf1af3bb2e0564 -DIST gradle-bin-7.1.1.zip 154838841 BLAKE2B 0a0ad08101f0c5fa7c0cb2a4c9ad6e53320cc6214fe1a139f390b73d9aa656ebfaf90c21816d57964f37e9cad51faed21f82f55b7e24fcf0f5a3ffd861c990ad SHA512 95cc2de9b7c3d6019d7780b17238ff8f0db14c9a1e494b391c84d75619eb3064322bb2c56fa9127b0a5681c94b32283090a15b06fefeccdb95a1f8fb9e58c75c -DIST gradle-bin-7.2.zip 157058280 BLAKE2B 918213df58ac2afbd075c74588f60676cd7dc99030834828138c621348ac1abd368e0b54c2f6937cbfc9533e55e310b46cf841c92dcb1039b898c6f456032d38 SHA512 6ccc79f08afdc20b3d5abf876c3cabb69114d1ab4285cdb77158cd8c5e09207589edefb6c79f2bcffe4629a38c6b9e2f473de42dab29a24310965bc5816b907d -DIST gradle-bin-7.3.3.zip 158875257 BLAKE2B 94f86e06da3eae4a9522d35a28577d033d64ce1bc2f36d0f5c1992e9b92ec311d25bd98bbeaf4b8a9869f22d93e14c88952e12166e436a0a6c206541d1f967aa SHA512 03f2bdd77202788cd43bb3e3a6390340f4d083d69ade5a53e0163204fb85307f5bbbbf4e04077c6ae558bc36ab3c478674f941079bc14a8344f55631fbba1490 -DIST gradle-bin-7.4.2.zip 159315974 BLAKE2B c7c8dbe82d22dec699d1997a781f3a66110c9910dfe67df2304c48cead96c130ca072550b8c5fa2362744cd2ea3c9723c45a6ecf6e0737fe3c9b7e286b44f4ae SHA512 2e1d05486baa9661d5c8ffead2df87874a66f6cfc958ee6840432b89d221d8b0af9e3cad3675766f5413d12aa61c5b5fb0dd82f4164e5da3022865eba9ceadbf -DIST gradle-bin-7.5.1.zip 166101707 BLAKE2B e018f8ae0e4cbe1fff2e3fb3029ef4c3f35e1bf541ce75f22561e16c43d8501c2f2501db72081656a836ab1c3358020dbf0be3499e7c16b385d9940c852c62ae SHA512 89189d529df1258a01ad2e6c38b1374dfb3a1440706c1c7f27ace89b6fd5b6849f9809f209e3e410f226aeeb9348d144de70397ac94b4e59fd311a2b0dee0dc9 -DIST gradle-bin-7.6.1.zip 165594858 BLAKE2B 623ed41b7e0dfbfa015578c6915ca382cb441082e181f96d00d058a1bd42b5e749b807f8c0444c4cd41de17a7f754960f55aa69e8dd4339bd64444432ad8748e SHA512 72d051d8cf348c13dda20eec56526a3c212e9a9635920b3260281e2f98cf113ffaf4efb8efbb96081c36b9fae847c291125e24d175d6fb832b8dd6e0e74779ae -DIST gradle-bin-8.0.2.zip 167671533 BLAKE2B e5cb4bef61ea89cfbf42c72c14e739f049b4930521dabaeb88fa6e2fffec81d6ee6514b615a6c1732db3bad4539e72ebbbeeb37b2f22a72fd2d2e08f7bf8d1b8 SHA512 70f114e353ec3e114b003e733e21c47fd26d2777363d015872aa9eab73c68b3186f77698aa1d72d4f4eedb2c53b0cd47a98f26ef5f0a9b2c1e42c6c877cca80f -DIST gradle-bin-8.1.1.zip 168381151 BLAKE2B 334727108ccfd374daaa91c363ebf10d8b13e00c61fe14e097b3baa5bb8bf0d2fdde509ef4ac0d90db1fd075c7552a0f7ba90b67d549e45a3c1cb37d036ae000 SHA512 185a831dc37b946e348f9d98ff88eefaad303cdb385d45a5f65c401dd51d4d0c1225d8d716e7345167e53d41cade2bf3008bbde1d66a18d9a4925a589853b598 -DIST gradle-bin-8.2.1.zip 193042584 BLAKE2B 10381d2601c707c6a391fb515e753d583eec0d7e89213fef690df4259aedbdde0ea8981e474eae5c7b21ff12d621897158271c5e2ee964190bca02bf6882c237 SHA512 a3d05873460c4045e2b43c41e39120b444ad5896c6561104ccf8cca4e58fa95bd512e356faa3a507b0e3c4212548002ff02845791dd42518635f4bc6ae67475b -DIST gradle-bin-8.3.zip 200258206 BLAKE2B f9909266e2887971f2f7480dbfe441c040fcd2ae12146bd9393d0836bca48f931124e60a1095d79ba6b172136ebb1734976e28d255aa3f16a22125a2662b80f1 SHA512 c328b597ff0c28b8071c050b6f1e57bf3eccca4d0eaeda0974700fc2d380667aca2e1a7b3548314519e99b7a823ede4c83a5786147a6a002d081920afa9c490b DIST gradle-bin-8.4.zip 212870963 BLAKE2B da32c1010e85f6cded0c1b539b243db6d41fcd033266be3b03b389e6a2e317bea17ddbe65c597c7ea82628cc5bec913954ec998d018b68daa67d39f9a8958e7e SHA512 52d5f622b8ad0ab36ff84589733b47423b12f94211086a84eca9810690af29e396877f1155ee31279c4325e98cd1d55b32137d52efcf48eb1e258caeece08f22 +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-6.8.3.ebuild b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild deleted file mode 100644 index 1e7b593a8227..000000000000 --- a/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -IUSE="doc" -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 - -MY_PN=${PN%%-bin} -MY_P="${MY_PN}-${PV/_rc/-rc-}" - -DESCRIPTION="A project automation and build tool with a Groovy based DSL" -SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip" -HOMEPAGE="https://www.gradle.org/" - -LICENSE="Apache-2.0" -SLOT="${PV}" -KEYWORDS="amd64 x86" - -DEPEND="app-eselect/eselect-gradle" -BDEPEND="app-arch/unzip" -RDEPEND=" - ${DEPEND} - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - : -} - -src_install() { - local gradle_dir="/usr/share/${PN}-${SLOT}" - - if use source; then - java-pkg_dosrc src - fi - - docinto html - dodoc -r docs/release-notes.html - if use doc; then - dodoc -r docs/{dsl,userguide} - java-pkg_dojavadoc docs/javadoc - fi - - insinto "${gradle_dir}" - doins -r bin/ lib/ - fperms 755 "${gradle_dir}/bin/gradle" - dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}" -} - -pkg_postinst() { - eselect gradle update ifunset -} - -pkg_postrm() { - eselect gradle update ifunset -} diff --git a/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild deleted file mode 100644 index 1e7b593a8227..000000000000 --- a/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -IUSE="doc" -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 - -MY_PN=${PN%%-bin} -MY_P="${MY_PN}-${PV/_rc/-rc-}" - -DESCRIPTION="A project automation and build tool with a Groovy based DSL" -SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip" -HOMEPAGE="https://www.gradle.org/" - -LICENSE="Apache-2.0" -SLOT="${PV}" -KEYWORDS="amd64 x86" - -DEPEND="app-eselect/eselect-gradle" -BDEPEND="app-arch/unzip" -RDEPEND=" - ${DEPEND} - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - : -} - -src_install() { - local gradle_dir="/usr/share/${PN}-${SLOT}" - - if use source; then - java-pkg_dosrc src - fi - - docinto html - dodoc -r docs/release-notes.html - if use doc; then - dodoc -r docs/{dsl,userguide} - java-pkg_dojavadoc docs/javadoc - fi - - insinto "${gradle_dir}" - doins -r bin/ lib/ - fperms 755 "${gradle_dir}/bin/gradle" - dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}" -} - -pkg_postinst() { - eselect gradle update ifunset -} - -pkg_postrm() { - eselect gradle update ifunset -} diff --git a/dev-java/gradle-bin/gradle-bin-7.2.ebuild b/dev-java/gradle-bin/gradle-bin-7.2.ebuild deleted file mode 100644 index fe6f492c7e4e..000000000000 --- a/dev-java/gradle-bin/gradle-bin-7.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -IUSE="doc" -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 - -MY_PN=${PN%%-bin} -MY_P="${MY_PN}-${PV/_rc/-rc-}" - -DESCRIPTION="A project automation and build tool with a Groovy based DSL" -SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip" -HOMEPAGE="https://www.gradle.org/" - -LICENSE="Apache-2.0" -SLOT="${PV}" -KEYWORDS="amd64 x86" - -DEPEND="app-eselect/eselect-gradle" -BDEPEND="app-arch/unzip" -RDEPEND=" - ${DEPEND} - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - : -} - -src_install() { - local gradle_dir="/usr/share/${PN}-${SLOT}" - - if use source; then - java-pkg_dosrc src - fi - - docinto html - dodoc -r docs/release-notes.html - if use doc; then - dodoc -r docs/{dsl,userguide} - java-pkg_dojavadoc docs/javadoc - fi - - insinto "${gradle_dir}" - doins -r bin/ lib/ - fperms 755 "${gradle_dir}/bin/gradle" - dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}" -} - -pkg_postinst() { - eselect gradle update ifunset -} - -pkg_postrm() { - eselect gradle update ifunset -} diff --git a/dev-java/gradle-bin/gradle-bin-7.3.3.ebuild b/dev-java/gradle-bin/gradle-bin-7.3.3.ebuild deleted file mode 100644 index fe6f492c7e4e..000000000000 --- a/dev-java/gradle-bin/gradle-bin-7.3.3.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -IUSE="doc" -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 - -MY_PN=${PN%%-bin} -MY_P="${MY_PN}-${PV/_rc/-rc-}" - -DESCRIPTION="A project automation and build tool with a Groovy based DSL" -SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip" -HOMEPAGE="https://www.gradle.org/" - -LICENSE="Apache-2.0" -SLOT="${PV}" -KEYWORDS="amd64 x86" - -DEPEND="app-eselect/eselect-gradle" -BDEPEND="app-arch/unzip" -RDEPEND=" - ${DEPEND} - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - : -} - -src_install() { - local gradle_dir="/usr/share/${PN}-${SLOT}" - - if use source; then - java-pkg_dosrc src - fi - - docinto html - dodoc -r docs/release-notes.html - if use doc; then - dodoc -r docs/{dsl,userguide} - java-pkg_dojavadoc docs/javadoc - fi - - insinto "${gradle_dir}" - doins -r bin/ lib/ - fperms 755 "${gradle_dir}/bin/gradle" - dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}" -} - -pkg_postinst() { - eselect gradle update ifunset -} - -pkg_postrm() { - eselect gradle update ifunset -} diff --git a/dev-java/gradle-bin/gradle-bin-7.4.2.ebuild b/dev-java/gradle-bin/gradle-bin-7.4.2.ebuild deleted file mode 100644 index fe6f492c7e4e..000000000000 --- a/dev-java/gradle-bin/gradle-bin-7.4.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -IUSE="doc" -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 - -MY_PN=${PN%%-bin} -MY_P="${MY_PN}-${PV/_rc/-rc-}" - -DESCRIPTION="A project automation and build tool with a Groovy based DSL" -SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip" -HOMEPAGE="https://www.gradle.org/" - -LICENSE="Apache-2.0" -SLOT="${PV}" -KEYWORDS="amd64 x86" - -DEPEND="app-eselect/eselect-gradle" -BDEPEND="app-arch/unzip" -RDEPEND=" - ${DEPEND} - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - : -} - -src_install() { - local gradle_dir="/usr/share/${PN}-${SLOT}" - - if use source; then - java-pkg_dosrc src - fi - - docinto html - dodoc -r docs/release-notes.html - if use doc; then - dodoc -r docs/{dsl,userguide} - java-pkg_dojavadoc docs/javadoc - fi - - insinto "${gradle_dir}" - doins -r bin/ lib/ - fperms 755 "${gradle_dir}/bin/gradle" - dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}" -} - -pkg_postinst() { - eselect gradle update ifunset -} - -pkg_postrm() { - eselect gradle update ifunset -} diff --git a/dev-java/gradle-bin/gradle-bin-7.5.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.5.1.ebuild deleted file mode 100644 index 0e7b49ee8847..000000000000 --- a/dev-java/gradle-bin/gradle-bin-7.5.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -IUSE="doc" -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 - -MY_PN=${PN%%-bin} -MY_P="${MY_PN}-${PV/_rc/-rc-}" - -DESCRIPTION="A project automation and build tool with a Groovy based DSL" -SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip" -HOMEPAGE="https://www.gradle.org/" - -LICENSE="Apache-2.0" -SLOT="${PV}" -KEYWORDS="amd64 x86" - -DEPEND="app-eselect/eselect-gradle" -BDEPEND="app-arch/unzip" -RDEPEND=" - ${DEPEND} - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - : -} - -src_install() { - local gradle_dir="/usr/share/${PN}-${SLOT}" - - if use source; then - java-pkg_dosrc src - fi - - docinto html - dodoc -r docs/release-notes.html - if use doc; then - dodoc -r docs/{dsl,userguide} - java-pkg_dojavadoc docs/javadoc - fi - - insinto "${gradle_dir}" - doins -r bin/ lib/ - fperms 755 "${gradle_dir}/bin/gradle" - dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}" -} - -pkg_postinst() { - eselect gradle update ifunset -} - -pkg_postrm() { - eselect gradle update ifunset -} diff --git a/dev-java/gradle-bin/gradle-bin-7.6.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.6.1.ebuild deleted file mode 100644 index 7d07ab9dc4b0..000000000000 --- a/dev-java/gradle-bin/gradle-bin-7.6.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -IUSE="doc" -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 - -MY_PN=${PN%%-bin} -MY_P="${MY_PN}-${PV/_rc/-rc-}" - -DESCRIPTION="A project automation and build tool with a Groovy based DSL" -SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip" -HOMEPAGE="https://www.gradle.org/" - -LICENSE="Apache-2.0" -SLOT="${PV}" -KEYWORDS="amd64 x86" - -DEPEND="app-eselect/eselect-gradle" -BDEPEND="app-arch/unzip" -RDEPEND=" - ${DEPEND} - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - : -} - -src_install() { - local gradle_dir="/usr/share/${PN}-${SLOT}" - - if use source; then - java-pkg_dosrc src - fi - - docinto html - dodoc -r docs/release-notes.html - if use doc; then - dodoc -r docs/{dsl,userguide} - java-pkg_dojavadoc docs/javadoc - fi - - insinto "${gradle_dir}" - doins -r bin/ lib/ - fperms 755 "${gradle_dir}/bin/gradle" - dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}" -} - -pkg_postinst() { - eselect gradle update ifunset -} - -pkg_postrm() { - eselect gradle update ifunset -} diff --git a/dev-java/gradle-bin/gradle-bin-8.0.2.ebuild b/dev-java/gradle-bin/gradle-bin-8.0.2.ebuild deleted file mode 100644 index 7d07ab9dc4b0..000000000000 --- a/dev-java/gradle-bin/gradle-bin-8.0.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -IUSE="doc" -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 - -MY_PN=${PN%%-bin} -MY_P="${MY_PN}-${PV/_rc/-rc-}" - -DESCRIPTION="A project automation and build tool with a Groovy based DSL" -SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip" -HOMEPAGE="https://www.gradle.org/" - -LICENSE="Apache-2.0" -SLOT="${PV}" -KEYWORDS="amd64 x86" - -DEPEND="app-eselect/eselect-gradle" -BDEPEND="app-arch/unzip" -RDEPEND=" - ${DEPEND} - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - : -} - -src_install() { - local gradle_dir="/usr/share/${PN}-${SLOT}" - - if use source; then - java-pkg_dosrc src - fi - - docinto html - dodoc -r docs/release-notes.html - if use doc; then - dodoc -r docs/{dsl,userguide} - java-pkg_dojavadoc docs/javadoc - fi - - insinto "${gradle_dir}" - doins -r bin/ lib/ - fperms 755 "${gradle_dir}/bin/gradle" - dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}" -} - -pkg_postinst() { - eselect gradle update ifunset -} - -pkg_postrm() { - eselect gradle update ifunset -} diff --git a/dev-java/gradle-bin/gradle-bin-8.1.1.ebuild b/dev-java/gradle-bin/gradle-bin-8.1.1.ebuild deleted file mode 100644 index 7d07ab9dc4b0..000000000000 --- a/dev-java/gradle-bin/gradle-bin-8.1.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -IUSE="doc" -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 - -MY_PN=${PN%%-bin} -MY_P="${MY_PN}-${PV/_rc/-rc-}" - -DESCRIPTION="A project automation and build tool with a Groovy based DSL" -SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip" -HOMEPAGE="https://www.gradle.org/" - -LICENSE="Apache-2.0" -SLOT="${PV}" -KEYWORDS="amd64 x86" - -DEPEND="app-eselect/eselect-gradle" -BDEPEND="app-arch/unzip" -RDEPEND=" - ${DEPEND} - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - : -} - -src_install() { - local gradle_dir="/usr/share/${PN}-${SLOT}" - - if use source; then - java-pkg_dosrc src - fi - - docinto html - dodoc -r docs/release-notes.html - if use doc; then - dodoc -r docs/{dsl,userguide} - java-pkg_dojavadoc docs/javadoc - fi - - insinto "${gradle_dir}" - doins -r bin/ lib/ - fperms 755 "${gradle_dir}/bin/gradle" - dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}" -} - -pkg_postinst() { - eselect gradle update ifunset -} - -pkg_postrm() { - eselect gradle update ifunset -} diff --git a/dev-java/gradle-bin/gradle-bin-8.4.ebuild b/dev-java/gradle-bin/gradle-bin-8.4.ebuild index 6fceca3ae5c8..1d63ca89fe19 100644 --- a/dev-java/gradle-bin/gradle-bin-8.4.ebuild +++ b/dev-java/gradle-bin/gradle-bin-8.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 @@ HOMEPAGE="https://www.gradle.org/" LICENSE="Apache-2.0" SLOT="${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" DEPEND="app-eselect/eselect-gradle" BDEPEND="app-arch/unzip" diff --git a/dev-java/gradle-bin/gradle-bin-8.2.1.ebuild b/dev-java/gradle-bin/gradle-bin-8.5.ebuild index afe46bd7d1c6..1d63ca89fe19 100644 --- a/dev-java/gradle-bin/gradle-bin-8.2.1.ebuild +++ b/dev-java/gradle-bin/gradle-bin-8.5.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 diff --git a/dev-java/gradle-bin/gradle-bin-8.3.ebuild b/dev-java/gradle-bin/gradle-bin-8.7.ebuild index afe46bd7d1c6..1d63ca89fe19 100644 --- a/dev-java/gradle-bin/gradle-bin-8.3.ebuild +++ b/dev-java/gradle-bin/gradle-bin-8.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 EAPI=8 diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest index 357c58725dd7..813f8d121a60 100644 --- a/dev-java/gson/Manifest +++ b/dev-java/gson/Manifest @@ -1 +1,3 @@ -DIST gson-parent-2.10.1.tar.gz 394777 BLAKE2B e118a7c39b17c4119b4140f3c105fef4c3cb07580dbc530d9bfd59edc4f152f62ac5ff93db1a3861c73758e369ecef4f8ed4e94d556869291469764ea848bbbd SHA512 074f40f7f9aa48daf5b5a3ec371713db02f6f8fceb959b01e8a16732862645d2350f3276ab7ff8021d48082f890b53c6e80d992af6af4b74e4646f85494b8e70 +DIST gson-2.10.2_pre20231128.tar.gz 451312 BLAKE2B d16e0510e0806fd33e8d49b5a8fb73e969b89acb2598ca34a43faa97a09debc99466ab472176d60d617aa20b2190884def25881f0bf651e96be2c1bb9a976d70 SHA512 37f2073e5eee2cb85626040552ac750f4917abd05e3b7944c30a2d5ace6888424870a95a0ceba89bf2dadf9ab33e6bbae1591509b84f35aba4521780764c0877 +DIST gson-parent-2.11.0.tar.gz 458360 BLAKE2B 88d242c725b054ac5e7e3ef31f312f77dd03aea29f6604770253564d80f84cd752b43d74dd416785836d08884e462275f8ec924a00e2ffee195c0237bc2bac0b SHA512 1834b7c95f0a40ff1bcf8088f3ffdb8332ae38d452bab4ad2c9271421e75a9236645d1ee0fdb58c2f32eac86cf503afa3de19f08eb422cc91c4d32e370c36eac +DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 diff --git a/dev-java/gson/files/gson-2.10.2-GsonVersionDiagnosticsTest.patch b/dev-java/gson/files/gson-2.10.2-GsonVersionDiagnosticsTest.patch new file mode 100644 index 000000000000..9feeb0aa3797 --- /dev/null +++ b/dev-java/gson/files/gson-2.10.2-GsonVersionDiagnosticsTest.patch @@ -0,0 +1,13 @@ +support our versioning schemes + +--- a/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java ++++ b/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java +@@ -35,7 +35,7 @@ import org.junit.Test; + public class GsonVersionDiagnosticsTest { + // We require a patch number, even if it is .0, consistent with https://semver.org/#spec-item-2. + private static final Pattern GSON_VERSION_PATTERN = +- Pattern.compile("(\\(GSON \\d\\.\\d+\\.\\d)(?:[-.][A-Z]+)?\\)$"); ++ Pattern.compile("(\\(GSON \\d\\.\\d+\\.\\d)(?:[-.][A-Z]+|_[a-z]+[0-9]+)?\\)$"); + + private Gson gson; + diff --git a/dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild b/dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild new file mode 100644 index 000000000000..4247c08c2190 --- /dev/null +++ b/dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.code.gson:gson:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Gson JSON library" +HOMEPAGE="https://github.com/google/gson" +# SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz" +# S="${WORKDIR}/gson-gson-parent-${PV}/gson" +MY_COMMIT="b17b1a0e98dcaf4b61823e1f0c29dda44c0ea3d5" +SRC_URI="https://github.com/google/gson/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" +S="${WORKDIR}/gson-${MY_COMMIT}/gson" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +DEPEND=" + dev-java/error-prone-annotations:0 + >=virtual/jdk-17:* + test? ( + dev-java/guava:0 + dev-java/guava-testlib:0 + )" +# src/test/java/com/google/gson/functional/Java17RecordTest.java:78: +# error: records are not supported in -source 11 +RDEPEND=">=virtual/jre-17:*" + +DOCS=( + ../CHANGELOG.md + ../GsonDesignDocument.md + ../README.md + ../Troubleshooting.md + ../UserGuide.md +) + +PATCHES=( "${FILESDIR}/gson-2.10.2-GsonVersionDiagnosticsTest.patch" ) + +JAVA_CLASSPATH_EXTRA="error-prone-annotations" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR=( + "src/main/java" + "src/main/java-templates" +) + +JAVA_TEST_EXCLUDES=( + # requires the test class to be obfuscated using proguard which we do not have atm + "com.google.gson.functional.EnumWithObfuscatedTest" + # testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest) + # junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest + "com.google.gson.regression.OSGiTest" +) +JAVA_TEST_GENTOO_CLASSPATH=" + guava + guava-testlib + junit-4 +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + sed -e "s/\${project.version}/${PV}/g" \ + -i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \ + || die "Failed to set version" +} + +src_compile() { + if ! use test; then + JAVA_PKG_WANT_SOURCE="1.8" + JAVA_PKG_WANT_TARGET="1.8" + fi + java-pkg-simple_src_compile +} + +src_test() { + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" + java-pkg-simple_src_test +} diff --git a/dev-java/gson/gson-2.10.1.ebuild b/dev-java/gson/gson-2.11.0-r2.ebuild index 96e7d452fb78..935c5f12fafd 100644 --- a/dev-java/gson/gson-2.10.1.ebuild +++ b/dev-java/gson/gson-2.11.0-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 @@ -11,14 +11,23 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Gson JSON library" HOMEPAGE="https://github.com/google/gson" -SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz" +SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" S="${WORKDIR}/gson-gson-parent-${PV}/gson" LICENSE="Apache-2.0" -SLOT="2.6" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=" + dev-java/error-prone-annotations:0 + >=virtual/jdk-11:* + test? ( + dev-java/guava:0 + dev-java/guava-testlib:0 + ) +" -DEPEND=">=virtual/jdk-17:*" RDEPEND=">=virtual/jre-1.8:*" DOCS=( @@ -29,6 +38,10 @@ DOCS=( ../UserGuide.md ) +PATCHES=( "${FILESDIR}/gson-2.10.2-GsonVersionDiagnosticsTest.patch" ) + +JAVA_CLASSPATH_EXTRA="error-prone-annotations" +JAVA_RESOURCE_DIRS="src/main/resources" JAVA_SRC_DIR=( "src/main/java" "src/main/java-templates" @@ -37,23 +50,30 @@ JAVA_SRC_DIR=( JAVA_TEST_EXCLUDES=( # requires the test class to be obfuscated using proguard which we do not have atm "com.google.gson.functional.EnumWithObfuscatedTest" - # FAILURES!!! - # Tests run: 1258, Failures: 2 - # testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest) - # junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest - "com.google.gson.regression.OSGiTest" ) -JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_GENTOO_CLASSPATH=" + guava + guava-testlib + junit-4 +" JAVA_TEST_RESOURCE_DIRS="src/test/resources" JAVA_TEST_SRC_DIR="src/test/java" src_prepare() { + default #780585 java-pkg-2_src_prepare sed -e "s/\${project.version}/${PV}/g" \ -i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \ || die "Failed to set version" - # error: records are not supported in -source 8 - # This test would pass "OK (25 tests)" only with >=jre-17 - # pom.xml, lines 20-22 - rm src/test/java/com/google/gson/functional/Java17RecordTest.java || die + grep ^Bundle bnd.bnd > src/main/resources/META-INF/MANIFEST.MF || die + echo "Import-Package: sun.misc;resolution:=optional, com.google.gson.annotations" \ + >> src/main/resources/META-INF/MANIFEST.MF || die +} + +src_test() { + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" + + # src/test/java/com/google/gson/functional/Java17RecordTest.java:78: + # error: records are not supported in -source 11 + JAVAC_ARGS="--source 17 --target 17" java-pkg-simple_src_test } diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest index 2c2239d9e6bf..909dfaa7631a 100644 --- a/dev-java/guava-testlib/Manifest +++ b/dev-java/guava-testlib/Manifest @@ -1,2 +1,2 @@ -DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78 -DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 +DIST guava-33.2.0.tar.gz 5812764 BLAKE2B ebfc20be079385e1bf4822b1402323d468c49604f585b514c1e6d40c64803df2f9848b73c63961976908ea8e6250f5e706add1619fc0ee0befaeacab02da075f SHA512 8807dd320af652cffc83ac930e6191b36c8942bc8bfe16cec5503e0721e2fe8a36d6636eb45d650c0ccd60c67fafe4f5aa8595ad454a822fd6888d4e1f22d466 +DIST truth-1.4.2.jar 275487 BLAKE2B 9c0dce92648f734ab88a0faf1a1e5328d747efffd29aa8f12b7ed2b2c87036ce18bf3195348f9ffce848842a240179fa60e9625c6997439a4cedce6aac6c2b77 SHA512 5f29cb259f2cf63e8a908061d2a58b28ecf12366a03564c8e63c33cdbdb21935ac95ed7b68437b015a2bd055732c88ec8ca1e55b45b99a2cb3e9dd53cb0b87cc diff --git a/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild b/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild index f2a7f38e6762..ca8893700df5 100644 --- a/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild +++ b/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -# No tests because "error: package com.google.common.truth does not exist" JAVA_PKG_IUSE="doc source test" MAVEN_ID="com.google.guava:guava-testlib:${PV}-jre" JAVA_TESTING_FRAMEWORKS="junit-4" -inherit java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple check-reqs DESCRIPTION="A set of java classes to assist the tests for Guava itself" HOMEPAGE="https://github.com/google/guava" # Currently we bundle the binary version of truth.jar used only for tests, we don't install it. SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz - test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.jar )" S="${WORKDIR}/guava-${PV}" LICENSE="Apache-2.0" @@ -22,25 +21,44 @@ SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" CP_DEPEND=" - dev-java/checker-framework-qual:0 - dev-java/error-prone-annotations:0 + >=dev-java/error-prone-annotations-2.27.1:0 ~dev-java/guava-${PV}:0 - dev-java/j2objc-annotations:0 dev-java/jsr305:0 dev-java/junit:4 " DEPEND="${CP_DEPEND} + dev-java/checker-framework-qual:0 + dev-java/j2objc-annotations:0 >=virtual/jdk-1.8:*" RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" +JAVA_CLASSPATH_EXTRA="checker-framework-qual j2objc-annotations" JAVA_SRC_DIR="${PN}/src" JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_SRC_DIR="${PN}/test" +check_env() { + if use test; then + # this is needed only for tests + CHECKREQS_MEMORY="1024M" + check-reqs_pkg_pretend + fi +} + +pkg_pretend() { + check_env +} + +pkg_setup() { + check_env + java-pkg-2_pkg_setup +} + src_test() { - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.4.2.jar:testdata.jar" + JAVA_TEST_EXTRA_ARGS="-Xmx${CHECKREQS_MEMORY}" java-pkg-simple_src_test } diff --git a/dev-java/guava-testlib/metadata.xml b/dev-java/guava-testlib/metadata.xml index 8f8ff281cf6a..5dcc33c704ec 100644 --- a/dev-java/guava-testlib/metadata.xml +++ b/dev-java/guava-testlib/metadata.xml @@ -4,6 +4,9 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">google/guava</remote-id> + </upstream> <longdescription> Guava testlib is a set of java classes used for more convenient unit testing - particularly to assist the tests for Guava itself. </longdescription> diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest index beb166188cf0..bd3ef1d79f18 100644 --- a/dev-java/guava/Manifest +++ b/dev-java/guava/Manifest @@ -1 +1 @@ -DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78 +DIST guava-33.2.0.tar.gz 5812764 BLAKE2B ebfc20be079385e1bf4822b1402323d468c49604f585b514c1e6d40c64803df2f9848b73c63961976908ea8e6250f5e706add1619fc0ee0befaeacab02da075f SHA512 8807dd320af652cffc83ac930e6191b36c8942bc8bfe16cec5503e0721e2fe8a36d6636eb45d650c0ccd60c67fafe4f5aa8595ad454a822fd6888d4e1f22d466 diff --git a/dev-java/guava/guava-32.1.2-r1.ebuild b/dev-java/guava/guava-33.2.0.ebuild index dfa306985777..052a43b0fdd5 100644 --- a/dev-java/guava/guava-32.1.2-r1.ebuild +++ b/dev-java/guava/guava-33.2.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 @@ -18,22 +18,18 @@ SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" CP_DEPEND=" - dev-java/checker-framework-qual:0 - dev-java/error-prone-annotations:0 - ~dev-java/failureaccess-${PV}:0 + >=dev-java/error-prone-annotations-2.27.1:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 " -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND} -" +DEPEND="${CP_DEPEND} + dev-java/checker-framework-qual:0 + >=virtual/jdk-1.8:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" JAVA_AUTOMATIC_MODULE_NAME="com.google.common" +JAVA_CLASSPATH_EXTRA="checker-framework-qual" +JAVA_GENTOO_CLASSPATH_EXTRA=":futures/failureaccess/src" JAVA_SRC_DIR="guava/src" diff --git a/dev-java/guice/guice-5.1.0.ebuild b/dev-java/guice/guice-5.1.0-r1.ebuild index e1ee08998250..4f2610fff44c 100644 --- a/dev-java/guice/guice-5.1.0.ebuild +++ b/dev-java/guice/guice-5.1.0-r1.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 core/pom.xml --download-uri https://github.com/google/guava/archive/v30.1.1.tar.gz --slot 5 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x866" --ebuild guice-5.1.0.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" @@ -15,6 +12,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Guice is a lightweight dependency injection framework for Java 6 and above" HOMEPAGE="https://github.com/google/guice" SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="4" @@ -23,32 +21,17 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Most of the test dependencies are missing in Gentoo. RESTRICT="test" -# Common dependencies -# POM: core/pom.xml -# aopalliance:aopalliance:1.0 -> >=dev-java/aopalliance-1.0:1 -# com.google.guava:guava:30.1-jre -> >=dev-java/guava-30.1.1:0 -# javax.inject:javax.inject:1 -> >=dev-java/javax-inject-1:0 -# org.ow2.asm:asm:9.2 -> >=dev-java/asm-9.2:9 - CP_DEPEND=" dev-java/aopalliance:1 dev-java/asm:9 + dev-java/error-prone-annotations:0 dev-java/guava:0 dev-java/javax-inject:0 " -# Compile dependencies -# POM: core/pom.xml -# test? biz.aQute:bnd:0.0.384 -> !!!groupId-not-found!!! -# test? com.google.guava:guava-testlib:30.1-jre -> >=dev-java/guava-testlib-30.1.1:0 -# test? com.google.truth:truth:0.45 -> !!!groupId-not-found!!! -# test? javax.inject:javax.inject-tck:1 -> !!!artifactId-not-found!!! -# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4 -# test? org.apache.felix:org.apache.felix.framework:3.0.5 -> !!!groupId-not-found!!! - DEPEND=" >=virtual/jdk-1.8:* - ${CDEPEND} + ${CP_DEPEND} test? ( dev-java/guava-testlib:0 ) @@ -60,8 +43,6 @@ RDEPEND=" DOCS=( {COPYING,{CONTRIBUTING,README}.md} ) -S="${WORKDIR}/${P}" - JAVA_SRC_DIR=( "core/src" ) JAVA_RESOURCE_DIRS=( "core/res" ) @@ -70,12 +51,7 @@ JAVA_TEST_SRC_DIR=( "core/test" ) JAVA_TEST_RESOURCE_DIRS=( "core/test" ) src_prepare() { - default + java-pkg-2_src_prepare mkdir -p "core/res/com/google/inject/" || die cp core/{src,res}/com/google/inject/BUILD || die } - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/guice/metadata.xml b/dev-java/guice/metadata.xml index fbbc13fd826c..a8f059e86374 100644 --- a/dev-java/guice/metadata.xml +++ b/dev-java/guice/metadata.xml @@ -6,7 +6,6 @@ <name>Java</name> </maintainer> <upstream> - <remote-id type="google-code">google-guice</remote-id> <remote-id type="github">google/guice</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/gwt/Manifest b/dev-java/gwt/Manifest deleted file mode 100644 index 095834180d62..000000000000 --- a/dev-java/gwt/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gwt-2.9.0.tar.gz 13081965 BLAKE2B 8b18e4cad6df9b1a2336bdf537a26def021ccd950299a6064e9a7328d0161c093f56284cce7b8a0e0a0c72b0dc9604e5e5527332d1878afd19a3c95eed5129a7 SHA512 424484a42f28387734a89a3a12b48716031e194e3a712a5e7cbdb66f77ab68e72ff8751f70a4048f4b9f35d92948c285490fd8e23c34d5c5e5558fee33952bf5 -DIST gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz 575902138 BLAKE2B 518ed1752cc82a527521525e181db712a641d36db203f511bdcc5206de314aa1eb693415b690fc42f38c9beabaffc484ad6ec3444e3cd8b4f2a3fa2ab9505f11 SHA512 0365d664b4b14ec833c922c8fab5df269e69ac8f1526315810f4922132439b880ee15e7e8b80e8b505469a374ba4a47998c7ed07b5f53227d50100247fade82b diff --git a/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch b/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch deleted file mode 100644 index 55d14fab15d3..000000000000 --- a/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch +++ /dev/null @@ -1,20 +0,0 @@ -# It's unclear how upstream gets their "dev.compile.test" target to compile -# without this - it could be that their testing is done with the local tools/ -# dir, and that some assumptions are made somewhere in the build system that -# don't apply when the tools dir is elsewhere. Either way, this fixes it. -# -# a Pull Request (of sorts) has been issued with upstream to incorporate this -# change. I would list the PR link here, but they use gerrit, and i don't -# understand what happened to my submission after I issued -# `git push upstream HEAD:refs/for/master` - ---- a/dev/build.xml -+++ b/dev/build.xml -@@ -60,6 +60,7 @@ - <pathelement - location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/> - <pathelement location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar"/> -+ <pathelement location="${gwt.tools.lib}/jsinterop/jsinterop-annotations-2.0.0.jar"/> - <pathelement location="${alldeps.jar}"/> - </classpath> - </gwt.javac> diff --git a/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch b/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch deleted file mode 100644 index 9ebbafb99099..000000000000 --- a/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch +++ /dev/null @@ -1,26 +0,0 @@ -# This git stuff in the ant configs is useful during development, since it does -# something or other withe git revision and sets some sort of sentinel file. -# Since this package is for a release, we don't need it. ---- a/common.ant.xml -+++ b/common.ant.xml -@@ -277,16 +277,16 @@ - - <macrodef name="gwt.getgitinfo" description="Identifies the GIT info of a workspace"> - <sequential> -- <exec executable="git" searchpath="true" outputproperty="gwt.gitrev"> -- <arg line="rev-parse --short HEAD"/> -- </exec> -+ <!-- <exec executable="git" searchpath="true" outputproperty="gwt.gitrev"> --> -+ <!-- <arg line="rev-parse - -short HEAD"/> --> -+ <!-- </exec> --> - <!-- Generally, filtering requires a sentinel file so that changes to git rev will - be noticed as invalidating the previously-generated filter output. This property - names where such a sentinel lives; it is tested with <available/> and created - with <touch/> --> - <mkdir dir="${project.build}/sentinels"/> - <property name="filter.sentinel" -- location="${project.build}/sentinels/gwt-${gwt.version}-git-${gwt.gitrev}"/> -+ location="${project.build}/sentinels/gwt-${gwt.version}"/> - </sequential> - </macrodef> - diff --git a/dev-java/gwt/gwt-2.9.0-r3.ebuild b/dev-java/gwt/gwt-2.9.0-r3.ebuild deleted file mode 100644 index a86cdb15be16..000000000000 --- a/dev-java/gwt/gwt-2.9.0-r3.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 - -GWT_TOOLS_COMMIT="194772ed94078802d8030136796de344eb1fdbe1" -GWT_TOOLS_PN="tools" - -DESCRIPTION="Google Web Toolkit library" -HOMEPAGE="https://www.gwtproject.org/" -SRC_URI="https://github.com/gwtproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/gwtproject/${GWT_TOOLS_PN}/archive/${GWT_TOOLS_COMMIT}.tar.gz -> ${PN}-${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}.tar.gz" -# While the test suite does compile and does execute with an exit status of 0, -# there are many tests that end with FAILED status. It is unclear if this is -# expected from upstream or not, but in order to keep things honest, the test -# suite is being restricted -RESTRICT="mirror test" -SLOT="2.8" -LICENSE="Apache-2.0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -CDEPEND=" - dev-java/guava:0 - dev-java/rhino:1.6 - dev-java/asm:9 - dev-java/eclipse-ecj:4.15 - dev-java/validation-api:1.0 -" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" -DEPEND=" - ${CDEPEND} - virtual/jdk:1.8 -" - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_BUILD_TARGET="build" -EANT_GENTOO_CLASSPATH=" - asm-9 - guava - rhino-1.6 - eclipse-ecj-4.15 - validation-api-1.0 -" - -PATCHES=( - "${FILESDIR}/${PN}-2.9.0-jsinterop-classpath.patch" - "${FILESDIR}/${PN}-2.9.0-remove-git-usage.patch" -) - -src_prepare() { - default - - java-pkg-2_src_prepare -} - -src_compile() { - # the default setup assumes that you've placed these in ${S}/tools. We put - # it in ${WORKDIR} though - export GWT_TOOLS="${WORKDIR}/${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}" - export GWT_VERSION="${PV}" - - java-pkg-2_src_compile -} - -src_test() { - local -x ANT_OPTS=-Dfile.encoding=UTF-8 - local -x TZ=America/Los_Angeles - - java-pkg-2_src_test -} - -src_install() { - local i18nCreater_launcher_args=( - i18nCreater - --main com.google.gwt.i18n.tools.I18NCreater - --jar gwt-dev.jar - ) - local webAppCreator_launcher_args=( - webAppCreator - --main com.google.gwt.user.tools.WebAppCreator - --jar gwt-dev.jar - ) - - java-pkg_dojar build/lib/*.jar - java-pkg_dolauncher ${i18nCreater_launcher_args[@]} - java-pkg_dolauncher ${webAppCreator_launcher_args[@]} -} diff --git a/dev-java/gwt/metadata.xml b/dev-java/gwt/metadata.xml deleted file mode 100644 index 18f25b56258f..000000000000 --- a/dev-java/gwt/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>gienah@gentoo.org</email> - <name>Mark Wright</name> - </maintainer> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <longdescription lang="en"> - GWT is a development toolkit for building and optimizing - complex browser-based applications. Its goal is to enable - productive development of high-performance web applications - without the developer having to be an expert in browser - quirks, XMLHttpRequest, and JavaScript. It’s open source, - completely free, and used by thousands of developers around - the world. - </longdescription> -</pkgmetadata> diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest index ee70232228bb..e19159c540f6 100644 --- a/dev-java/htmlcleaner/Manifest +++ b/dev-java/htmlcleaner/Manifest @@ -1,2 +1 @@ -DIST htmlcleaner-2.26-src.zip 414195 BLAKE2B c73533054bf7a8a66a767e53cbafecca1f174cb3be16e116ddd0e025e627603e225323e9095ea40b38a06c661ebe9f2a9e1f53736bf74fd8a2e41d909381c4fb SHA512 df1f9ccc696d538289a0addd19f8d955a3bcb0da88640208c513b2f4f0c4a3ee516b459aa3aae25d36d6ec09c4082b96484df287fb422add2eb160072668af5a DIST htmlcleaner-src-2.29.zip 394326 BLAKE2B 6317e5dd51facd901e7a5bdc72322c58deb5d3a2e2d0a784e6cd71b938c7b46b7a612d0610a1e5f96ac6c55714942e00ffa68f2259416fe1e6be8cb5ad96c0b3 SHA512 87c3884f56c01d4f34be71b5a016a839f949f03ea429a3c10cc5518fe954b09aa42d05fdf821e7b0bf2115787cffff6ae72dbe13e3d7e08537c4ffbf51d6b34f diff --git a/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch b/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch deleted file mode 100644 index 0e10ccee4816..000000000000 --- a/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/test/java/org/htmlcleaner/DomSerializerTest.java b/src/test/java/org/htmlcleaner/DomSerializerTest.java -index b09c6d6..f4e83f0 100644 ---- a/src/test/java/org/htmlcleaner/DomSerializerTest.java -+++ b/src/test/java/org/htmlcleaner/DomSerializerTest.java -@@ -132,7 +132,7 @@ public class DomSerializerTest extends AbstractHtmlCleanerTest { - + "</html>"; - - final String expectedOutput = -- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" -+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" - + "<html>\n" + - " <head/>\n" + - " <body>\n" + -diff --git a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java -index 3e1d1e9..d406c40 100644 ---- a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java -+++ b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java -@@ -143,7 +143,7 @@ public class TraversalDomSerializerTest extends AbstractHtmlCleanerTest { - + "</html>"; - - final String expectedOutput = -- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" -+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" - + "<html>\n" + - " <head/>\n" + - " <body>\n" + diff --git a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild deleted file mode 100644 index 11ae5880fbc2..000000000000 --- a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="net.sourceforge.htmlcleaner:htmlcleaner:2.26" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="HTML parser written in Java that can be used as a tool, library or Ant task" -HOMEPAGE="http://htmlcleaner.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${PV}/htmlcleaner-${PV}-src.zip" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" - -CP_DEPEND="dev-java/jdom:2" - -RDEPEND=" - ${CP_DEPEND} - >=virtual/jre-1.8:* -" - -DEPEND=" - ${CP_DEPEND} - dev-java/ant-core:0 - >=virtual/jdk-1.8:* - test? ( dev-java/junit:4 ) -" - -BDEPEND="app-arch/unzip" - -PATCHES=( - "${FILESDIR}/${PN}-2.24-fix-tests.patch" -) - -JAVA_CLASSPATH_EXTRA="ant-core" -JAVA_SRC_DIR="src/main/java" -JAVA_MAIN_CLASS="org.htmlcleaner.CommandLine" -JAVA_TEST_GENTOO_CLASSPATH="junit-4" - -src_prepare() { - default # https://bugs.gentoo.org/780585 -} - -src_install() { - java-pkg-simple_src_install - java-pkg_register-ant-task - - insinto "${JAVA_PKG_SHAREPATH}" - newins example.xml default.xml -} diff --git a/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild index 39354c4424da..c1e1a9887879 100644 --- a/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild +++ b/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,22 +11,22 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="HTML parser written in Java that can be used as a tool, library or Ant task" HOMEPAGE="https://htmlcleaner.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${PV}/htmlcleaner-src-${PV}.zip" +SRC_URI="https://downloads.sourceforge.net/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${PV}/htmlcleaner-src-${PV}.zip" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" BDEPEND="app-arch/unzip" CP_DEPEND="dev-java/jdom:2" DEPEND="${CP_DEPEND} - dev-java/ant-core:0 + dev-java/ant:0 >=virtual/jdk-1.8:* test? ( dev-java/junit:4 )" RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" -JAVA_CLASSPATH_EXTRA="ant-core" +JAVA_CLASSPATH_EXTRA="ant" JAVA_MAIN_CLASS="org.htmlcleaner.CommandLine" JAVA_SRC_DIR="src/main/java" JAVA_TEST_GENTOO_CLASSPATH="junit-4" diff --git a/dev-java/httpcomponents-client/Manifest b/dev-java/httpcomponents-client/Manifest index 9706b591e796..66ff2b793020 100644 --- a/dev-java/httpcomponents-client/Manifest +++ b/dev-java/httpcomponents-client/Manifest @@ -1 +1,2 @@ DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05 +DIST httpcomponents-client-4.5.13-src.tar.gz.asc 183 BLAKE2B 76b19170412672c8f4f30bcf96e1512ada5c6217a62ac1937d53c99223d687b363dc276365f2b0b6cd57abfd9d7d3a829e58f9c634081d84f05b558a61806402 SHA512 2af6ec691f0ebe6ceec4ca462e12638c8cfdb238fb4120195db1d9faca255b41119b6ddf34734ae29333256c91e1a0f1805192c0a2f1206093226e56e846cfc9 diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild deleted file mode 100644 index 5c35d1fb5ad7..000000000000 --- a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom httpcomponents-client-4.5.13/httpclient/pom.xml --download-uri https://github.com/apache/httpcomponents-client/archive/refs/tags/rel/v4.5.13.tar.gz --slot 4 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-httpclient-4.5.13.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.httpcomponents:httpclient:4.5.13" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Apache HttpComponents Client" -HOMEPAGE="https://hc.apache.org/httpcomponents-client" -SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-${PV}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="4" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: httpcomponents-client-${PV}/httpclient/pom.xml -# commons-codec:commons-codec:1.11 -> >=dev-java/commons-codec-1.15:0 -# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 -# org.apache.httpcomponents:httpcore:4.4.13 -> >=dev-java/httpcore-4.4.14:0 - -CDEPEND=" - dev-java/commons-codec:0 - dev-java/commons-logging:0 - dev-java/httpcore:0 -" - -# Compile dependencies -# POM: httpcomponents-client-${PV}/httpclient/pom.xml -# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4 -# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0 - -DEPEND="${CDEPEND} - >=virtual/jdk-1.8:* - test? ( - dev-java/hamcrest-core:1.3 - dev-java/mockito:0 - )" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" - -DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt ) - -S="${WORKDIR}/httpcomponents-client-${PV}/httpclient" - -JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore" -JAVA_SRC_DIR=( - "src/main/java" - "src/main/java-deprecated" -) -JAVA_RESOURCE_DIRS="src/main/resources" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,hamcrest-core-1.3" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" - -JAVA_TEST_EXCLUDES=( - # Tests run: 929, Failures: 1 - # javax.net.ssl.SSLHandshakeException: Remote host terminated the handshake - "org.apache.http.conn.ssl.TestSSLSocketFactory" -) - -src_install() { - default - java-pkg-simple_src_install -} diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild new file mode 100644 index 000000000000..2b074d240ff4 --- /dev/null +++ b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.httpcomponents:httpclient:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Apache HttpComponents Client" +HOMEPAGE="https://hc.apache.org/httpcomponents-client-5.2.x/" +SRC_URI="mirror://apache/httpcomponents/httpclient/source/${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/httpcomponents/httpclient/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/httpcomponents-client-${PV}/httpclient" + +LICENSE="Apache-2.0" +SLOT="4" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpcomponents-client.hc.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-httpcomponents-client )" + +CDEPEND=" + dev-java/commons-codec:0 + dev-java/commons-logging:0 + dev-java/httpcore:0 +" + +DEPEND="${CDEPEND} + >=virtual/jdk-1.8:* + test? ( + dev-java/hamcrest-core:1.3 + dev-java/mockito:0 + )" + +RDEPEND="${CDEPEND} + >=virtual/jre-1.8:*" + +DOCS=( ../{NOTICE,README,RELEASE_NOTES}.txt ) + +JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore" +JAVA_SRC_DIR=( + "src/main/java" + "src/main/java-deprecated" +) +JAVA_RESOURCE_DIRS="src/main/resources" + +JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,hamcrest-core-1.3" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" + +JAVA_TEST_EXCLUDES=( + # Tests run: 929, Failures: 1 + # javax.net.ssl.SSLHandshakeException: Remote host terminated the handshake + "org.apache.http.conn.ssl.TestSSLSocketFactory" +) + +src_test() { + # https://bugs.gentoo.org/923602 + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge "17" ; then + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED ) + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.net=ALL-UNNAMED ) + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED ) + fi + java-pkg-simple_src_test +} diff --git a/dev-java/httpcore/Manifest b/dev-java/httpcore/Manifest index 58259b00cd12..719bf090c35f 100644 --- a/dev-java/httpcore/Manifest +++ b/dev-java/httpcore/Manifest @@ -1 +1,2 @@ DIST httpcomponents-core-4.4.14-src.tar.gz 591869 BLAKE2B d6f4900d8781cf7189edb2dfa9c1157b02584e8c66cde02dc261b0e29cdfb971e0323ce4478966b8e125df475ab1014fbee5b4bdf411eb118647f47f95c8f1a7 SHA512 9c713c7ea4e966a35ed391bc2a3aa10a0963cd21978c028dbd0790c9c2a6592385c7b2f135ea2836e6c495d9faea1bdcc65aa994bd5548bc2d84db38d5dbb713 +DIST httpcomponents-core-4.4.14-src.tar.gz.asc 215 BLAKE2B 52aae4a503ff720f87538283c9215b7a8be9d5d2744c5ad6e86c7d44924ba18e8ef8d55af570543c2d52f20ce8a3918266773c274382e2c495087cd3e247232a SHA512 0824d3adecc5d1cbaf19dbb8674fd192b9d04cff9091475e5e55a18f6012ef11c2d0829d643e1003e8e18f9d2f0964ee0402a7b0e2e3f21b34dcb0676e1392e9 diff --git a/dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch b/dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch new file mode 100644 index 000000000000..5c722c5e714d --- /dev/null +++ b/dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch @@ -0,0 +1,55 @@ +There was 1 failure: +1) testRequestTargetHostFallback(org.apache.http.protocol.TestStandardInterceptors) +org.mockito.exceptions.base.MockitoException: +Mockito cannot mock this class: class java.net.InetAddress +Mockito can only mock visible & non-final classes. +If you're not sure why you're getting this error, please report to the mailing list. + at org.apache.http.protocol.TestStandardInterceptors.testRequestTargetHostFallback(TestStandardInterceptors.java:372) + ... 31 trimmed +Caused by: org.mockito.cglib.core.CodeGenerationException: java.lang.reflect.InvocationTargetException-->null + at org.mockito.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:238) + at org.mockito.cglib.proxy.Enhancer.createHelper(Enhancer.java:378) + at org.mockito.cglib.proxy.Enhancer.createClass(Enhancer.java:318) + at org.mockito.internal.creation.jmock.ClassImposterizer.createProxyClass(ClassImposterizer.java:110) + at org.mockito.internal.creation.jmock.ClassImposterizer.imposterise(ClassImposterizer.java:62) + at org.mockito.internal.creation.jmock.ClassImposterizer.imposterise(ClassImposterizer.java:56) + at org.mockito.internal.creation.CglibMockMaker.createMock(CglibMockMaker.java:23) + at org.mockito.internal.util.MockUtil.createMock(MockUtil.java:26) + at org.mockito.internal.MockitoCore.mock(MockitoCore.java:51) + at org.mockito.Mockito.mock(Mockito.java:1243) + at org.mockito.Mockito.mock(Mockito.java:1120) + ... 33 more +Caused by: java.lang.reflect.InvocationTargetException + at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:118) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at org.mockito.cglib.core.ReflectUtils.defineClass(ReflectUtils.java:385) + at org.mockito.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:220) + ... 43 more +Caused by: java.lang.IncompatibleClassChangeError: class $java.net.InetAddress$$EnhancerByMockitoWithCGLIB$$d2bd6316 cannot inherit from sealed class java.net.InetAddress + at java.base/java.lang.ClassLoader.defineClass1(Native Method) + at java.base/java.lang.ClassLoader.defineClass(ClassLoader.java:1027) + at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103) + ... 46 more + +FAILURES!!! +Tests run: 665, Failures: 1 + +--- a/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java ++++ b/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java +@@ -44,6 +44,7 @@ import org.apache.http.message.BasicHttpRequest; + import org.apache.http.message.BasicHttpResponse; + import org.junit.Assert; + import org.junit.Test; ++import org.junit.Ignore; + import org.mockito.Mockito; + + public class TestStandardInterceptors { +@@ -365,7 +366,7 @@ public class TestStandardInterceptors { + Assert.assertEquals("somehost:8080", header.getValue()); + } + +- @Test ++ @Test @Ignore + public void testRequestTargetHostFallback() throws Exception { + final HttpContext context = new BasicHttpContext(null); + final BasicHttpRequest request = new BasicHttpRequest("GET", "/"); diff --git a/dev-java/httpcore/httpcore-4.4.14-r1.ebuild b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild new file mode 100644 index 000000000000..f554a2b55b78 --- /dev/null +++ b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.httpcomponents:httpcore:4.4.14" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Apache HttpComponents Core (blocking I/O)" +HOMEPAGE="https://hc.apache.org/httpcomponents-core-5.2.x/" +SRC_URI="https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz + verify-sig? ( + https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz.asc + )" +S="${WORKDIR}/httpcore" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpcomponents-core.hc.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-httpcomponents-httpcore )" +DEPEND=">=virtual/jdk-1.8:* + test? ( + dev-java/commons-logging:0 + dev-java/mockito:0 + )" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt ) + +JAVA_SRC_DIR=( + "src/main/java" + "src/main/java-deprecated" +) +JAVA_RESOURCE_DIRS="src/main/resources" + +JAVA_TEST_GENTOO_CLASSPATH="commons-logging,junit-4,mockito" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" + +src_test() { + # https://bugs.gentoo.org/923603 + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge "17" ; then + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED ) + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.net=ALL-UNNAMED ) + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED ) + eapply "${FILESDIR}/httpcore-4.4.14-skipFailingTest.patch" + fi + java-pkg-simple_src_test +} diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild deleted file mode 100644 index ff51d1ba0fdb..000000000000 --- a/dev-java/httpcore/httpcore-4.4.14.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom httpcore/pom.xml --download-uri https://mirror.netcologne.de/apache.org//httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild httpcomponents-core-4.4.14.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.httpcomponents:httpcore:4.4.14" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Apache HttpComponents Core (blocking I/O)" -HOMEPAGE="https://hc.apache.org/httpcomponents-core-ga" -SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Compile dependencies -# POM: httpcore/pom.xml -# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 -# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4 -# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0 - -DEPEND=">=virtual/jdk-1.8:* - test? ( - dev-java/commons-logging:0 - dev-java/mockito:0 - )" - -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt ) - -S="${WORKDIR}/httpcore" - -JAVA_SRC_DIR=( - "src/main/java" - "src/main/java-deprecated" -) -JAVA_RESOURCE_DIRS="src/main/resources" - -JAVA_TEST_GENTOO_CLASSPATH="commons-logging,junit-4,mockito" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" - -src_install() { - default - java-pkg-simple_src_install -} diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest deleted file mode 100644 index 21af4ba8ba10..000000000000 --- a/dev-java/icedtea-bin/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -DIST icedtea-bin-core-3.16.0-amd64.tar.xz 62350972 BLAKE2B 0980787ee1f619907e958fcbf6c75674115adc325abe4d428e46842eab9a26fc2666f3b0498e79de0451a63d01c83302501fc5f861c4ffc7f5914dd7adbb4cf8 SHA512 0f79408811fa5b3ab60e72b3fcb8510234a22d698c66f0d5a8f06b67bead0f4a215b771065d6d189fddd25f762b64732a28fd69ad402ef57aa5cedeca745552b -DIST icedtea-bin-core-3.16.0-arm.tar.xz 58351704 BLAKE2B a1fbd5744d3155861e7de5a85a508f8199295568d92efd840a7fc81b9eaed755366fa3212d3039d87c77215168fc6ab9baaa5c92531fc11c1099e6ea486fce48 SHA512 84624b80bfb0035b714c38f92a9982c11bae3137fe70d030111c6b2c253472c0c857edfea1a16d646a5e9c4d3215fc66d7f9bf96e8184ae1b5c75a5c3c844549 -DIST icedtea-bin-core-3.16.0-arm64.tar.xz 61918380 BLAKE2B 8f6778bd63fe037f19115d094ae32294f84a57782b63f32997c80ff580a5a13ff3beec37bae809e45fa4dc174c10335c9040119207a9489b33df590f79398b1d SHA512 dc0bbcb15c897a8f3e83e56877c5a3b7f29740a122597fc26b7f6c43eeb07c32407db060954a262ab1db92cfa6cafc44c7fad131c53c4a811938da5e76c89fe2 -DIST icedtea-bin-core-3.16.0-ppc64.tar.xz 55356056 BLAKE2B 265635ef70f244696dc09baa6cfef628d794ff851edeebb2d4b531aff4a25dafb902c4f3cbe527540ba65d76da2f3d4234b14cca16d5439d2e92f551a5aaf478 SHA512 840b0faed3882324392ad1f7ce8123d9d2f53f33576bb5eec37357d2aab292c21d947867d8b20a34de6fc25c8e1d5dc5c7f541cebe5b008b79bc9daf9250910d -DIST icedtea-bin-core-3.16.0-ppc64le.tar.xz 55356384 BLAKE2B ffa6c0e381b20a3a9d78a61519a0d47715dbd82f9472c5335fb9e2b4dff6948486cf85f6f4f416462158a3476b9a228fdb9c0725294a58bcdc91058d60811bd9 SHA512 d9902159044135e1ff5d3b200f5fe283249a2be1da6705b9fdc94eb88c2d199ed3a5c80e70ae89aa870a05110e649e93d4710605c85db15dca360bc66d2c60da -DIST icedtea-bin-core-3.16.0-x86.tar.xz 61745436 BLAKE2B efb37cb8ac00c6fe2a45bed9b829fc5410062105b373ba77012ec2d8f8deff03dcb88288025dcc8a8300d28139068ef202d2c709fe5aad4b8ed2ab1edd54c412 SHA512 3df52ec949d8d5ba6cd046841160fab1637666e506f536664506c1de0e74f1b2620836706cca8e194ded575761299ecb3b3f83e295e6dfed8222de1949a73077 -DIST icedtea-bin-doc-3.16.0.tar.xz 11613128 BLAKE2B de8224c7e3a62178c6cc5a4c883c3c90a2712049f9e6687bf0a0d93a8dc9bd3abc562486c483c7b72bd17fa5c376495b0739babf10b1282acbd3e41beb3d1cd4 SHA512 dd3bb69de2d0f720f18700a97a549c21b67569d12a982d2fbe39eef8bf876e0f02af673e70d53ac59891377e4d48f3cc05f60d1b1dac0c7d9969a4a07e346fc6 -DIST icedtea-bin-examples-3.16.0-amd64.tar.xz 1855056 BLAKE2B 678e887ac613df96e7b255bdd6de4a9644f1b5940fbd036d88dfc1b74154d8e1e4032a380586965d727c5d9ebd2d1c4ba7d7d62a88d8994e5400eacc3f83d6dd SHA512 afea08925258e6e9d7bdabdf3078d6b580680fa43fb44589b6e0faa07ab78fea0d25e30bd22ae92317a77007ab0b30c9b3e16decf0e78bc1ff88ffa780b9d25b -DIST icedtea-bin-examples-3.16.0-arm.tar.xz 1839892 BLAKE2B c5824fbf698f4861baa32f973f2040ae72f5a92f889309bb1aeed03c652114c89f38394559c2619c36dccc075205b91fbd6ae97d9de7554c9144fe059fc9a9db SHA512 6fb4ac90bac679cb2d1827ead49fcd1b2acac27aca3af77c7aa7c771317281d7ffe477f2c1365ee78a21ab9694c9beba38516f053ad954e78f6f5b8bfb991151 -DIST icedtea-bin-examples-3.16.0-arm64.tar.xz 1850400 BLAKE2B 577206b3b15f5eb7dfcbccbb02e209354f99e780c5989eba8f21fdca3630f7188c1b4a0c845a556ccd93916a7f6182ec9932983ee22fa37cfcb47b28fac62e41 SHA512 ff80389720947f781f48b8f39bd49a7b096eea03f48bc70d588bc326256676b568a743b70e5d13ccf161da81fd4fceef5e8a1913991a5805391de7e93e913662 -DIST icedtea-bin-examples-3.16.0-ppc64.tar.xz 1864968 BLAKE2B e806ccb1d430e42b1ae75954a8ab4dcb9d7f2e6a00b9cf0343716ef18943d66e46834859fb90c50d7553dcda3502f4f3b73c060e2cbfaec883aa98ef7c874807 SHA512 9bd762776178d117c20fabb90558f80d97d4392a4015a26729437e50f82e7bcd55a6c1e12df45726ae484d20df3bc4867e392242588062d926ae4d3b14b8b679 -DIST icedtea-bin-examples-3.16.0-ppc64le.tar.xz 1863432 BLAKE2B fa227b246e5ddb9197c065fa27092b9114ee5423e7d914ceb9dfd3491fb2ddb60707379fb50ece1e8d4834cfe24cc82cb37e341aafc338623c4720bb74f4c4af SHA512 8efa40365c0689e9fdb3d2c350d95a837706219442b46305e3314185afc9cf0dfab51854bddabdf0f6abc50ce9f45b4c3cac66d6d7a4fd472e58f0070507599e -DIST icedtea-bin-examples-3.16.0-x86.tar.xz 1861512 BLAKE2B 3ee3bc1d9bde79aea9e765ad06e29b76617f00077d28ca08042ff23434edbdfa012033bfc5c2e4ca5bf1485b079ce412c399a9ed9ea5df137e627f1d74cadb30 SHA512 df247ee749d9fd41a3bde5c28a8894cff837ff0725c8d45b89134e294d1cba2493de9d7bbab15b6098c464ed11dc317892df87f10f14b507cc3f27e872c92637 -DIST icedtea-bin-src-3.16.0.tar.xz 45993284 BLAKE2B 748ce12cf4231af2410523b394f91afffbdb774a73a0754e6df5c124c9c9f8f8cffed82fa84ec5a9940de80127ca9018379f72085b3de1a2ced3146df27aa943 SHA512 546364dcf4a20d7aa6fc68c465f9c77c3a6c24b9b8889629152dc2424b3d9f818d56ea678ecbdcb58e499c1564f246a75d6b9ff00925d9ecc305dec94ba60548 diff --git a/dev-java/icedtea-bin/files/icedtea-bin.env.sh b/dev-java/icedtea-bin/files/icedtea-bin.env.sh deleted file mode 100644 index 9734e8a604c0..000000000000 --- a/dev-java/icedtea-bin/files/icedtea-bin.env.sh +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -VERSION="IcedTea JDK ${PV}$(multilib_is_native_abi || printf ' ('${ABI}')')" -JAVA_HOME="${EPREFIX}/opt/icedtea-bin-${PV}$(multilib_is_native_abi || printf -- -${ABI})" -JDK_HOME="${EPREFIX}/opt/icedtea-bin-${PV}$(multilib_is_native_abi || printf -- -${ABI})" -JAVAC="\${JAVA_HOME}/bin/javac" -PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin" -ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin" -LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/" -MANPATH="${EPREFIX}/opt/icedtea-bin-${PV}/man" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="1.${SLOT}" -# Taken from sun.boot.class.path property -BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/lib/jfr.jar" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/icedtea-bin/icedtea-bin-3.16.0-r2.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.16.0-r2.ebuild deleted file mode 100644 index 329f90ac4a8d..000000000000 --- a/dev-java/icedtea-bin/icedtea-bin-3.16.0-r2.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# pkgcheck reports that multilib-build is not used but in fact it is used -# from files/icedtea-bin.env.sh so DO NOT REMOVE THAT CLASS even if pkgcheck -# says it's unused -inherit java-vm-2 multilib-build toolchain-funcs - -abi_uri() { - echo "${2-$1}? ( - ${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz - examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz ) - )" -} - -BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles" -SRC_URI=" - doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz ) - source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz ) - big-endian? ( $(abi_uri ppc64) ) - !big-endian? ( $(abi_uri ppc64le ppc64) ) - $(abi_uri amd64) - $(abi_uri arm) - $(abi_uri arm64) - $(abi_uri x86) -" - -DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK" -HOMEPAGE="http://icedtea.classpath.org" - -LICENSE="GPL-2-with-classpath-exception" -SLOT="8" -KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="+alsa big-endian cups doc examples +gtk headless-awt pulseaudio selinux source" - -REQUIRED_USE="gtk? ( !headless-awt )" - -RESTRICT="preserve-libs strip" -QA_PREBUILT="opt/.*" - -DEPEND="app-arch/xz-utils" - -RDEPEND=" - >=dev-libs/glib-2.60.7:2 - >=media-libs/fontconfig-2.13:1.0 - >=media-libs/freetype-2.9.1:2 - >=media-libs/lcms-2.9:2 - >=sys-apps/baselayout-java-0.1.0-r1 - >=sys-libs/zlib-1.2.11-r2 - virtual/jpeg-compat:62 - alsa? ( >=media-libs/alsa-lib-1.2 ) - cups? ( >=net-print/cups-2.0 ) - gtk? ( - >=dev-libs/atk-2.32.0 - >=x11-libs/cairo-1.16.0 - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.24:2 - >=x11-libs/pango-1.42 - ) - selinux? ( sec-policy/selinux-java ) - virtual/ttf-fonts - !headless-awt? ( - media-libs/giflib:0/7 - =media-libs/libpng-1.6* - >=x11-libs/libX11-1.6 - >=x11-libs/libXcomposite-0.4 - >=x11-libs/libXext-1.3 - >=x11-libs/libXi-1.7 - >=x11-libs/libXrender-0.9.10 - >=x11-libs/libXtst-1.2 - ) -" - -PDEPEND="pulseaudio? ( dev-java/icedtea-sound )" - -S="${WORKDIR}" - -pkg_pretend() { - if [[ "$(tc-is-softfloat)" != "no" ]]; then - die "These binaries require a hardfloat system." - fi -} - -src_prepare() { - default - - # I wouldn't normally use -f below but symlinks in the arm files - # make this fail otherwise and any other approach would be tedious. - - if ! use alsa; then - rm -fv */jre/lib/*/libjsoundalsa.* || die - fi - - if use headless-awt; then - rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \ - */{,jre/}bin/policytool */bin/appletviewer || die - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}/${dest#/}" - dodir "${dest}" - - dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README} - use doc && dodoc -r ${P}/doc/html - - # doins doesn't preserve executable bits. - cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die - - if use examples; then - cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die - fi - - if use source; then - cp ${P}/src.zip "${ddest}" || die - fi - - # use system-wide cacert store - rm "${ddest}"/jre/lib/security/cacerts || die - dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts - - java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh" - - # Both icedtea itself and the icedtea ebuild set PAX markings but we - # disable them for the icedtea-bin build because the line below will - # respect end-user settings when icedtea-bin is actually installed. - java-vm_set-pax-markings "${ddest}" - - # Each invocation appends to the config. - java-vm_revdep-mask "${EPREFIX}${dest}" - java-vm_sandbox-predict /proc/self/coredump_filter -} diff --git a/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild deleted file mode 100644 index 0d8ff65ee21c..000000000000 --- a/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-vm-2 multilib-build toolchain-funcs - -abi_uri() { - echo "${2-$1}? ( - ${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz - examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz ) - )" -} - -BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles" -SRC_URI=" - doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz ) - source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz ) - big-endian? ( $(abi_uri ppc64) ) - !big-endian? ( $(abi_uri ppc64le ppc64) ) - $(abi_uri amd64) - $(abi_uri arm) - $(abi_uri arm64) - $(abi_uri x86) -" - -DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK" -HOMEPAGE="http://icedtea.classpath.org" - -LICENSE="GPL-2-with-classpath-exception" -SLOT="8" -KEYWORDS="-* amd64 ~arm arm64 ppc64 x86" -IUSE="+alsa big-endian cups doc examples +gtk headless-awt pulseaudio selinux source" - -REQUIRED_USE="gtk? ( !headless-awt )" - -RESTRICT="preserve-libs strip" -QA_PREBUILT="opt/.*" - -DEPEND="app-arch/xz-utils" - -RDEPEND=" - >=dev-libs/glib-2.60.7:2 - >=media-libs/fontconfig-2.13:1.0 - >=media-libs/freetype-2.9.1:2 - >=media-libs/lcms-2.9:2 - >=sys-apps/baselayout-java-0.1.0-r1 - >=sys-libs/zlib-1.2.11-r2 - virtual/jpeg-compat:62 - alsa? ( >=media-libs/alsa-lib-1.2 ) - cups? ( >=net-print/cups-2.0 ) - gtk? ( - >=dev-libs/atk-2.32.0 - >=x11-libs/cairo-1.16.0 - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.24:2 - >=x11-libs/pango-1.42 - ) - selinux? ( sec-policy/selinux-java ) - virtual/ttf-fonts - !headless-awt? ( - media-libs/giflib:0/7 - =media-libs/libpng-1.6* - >=x11-libs/libX11-1.6 - >=x11-libs/libXcomposite-0.4 - >=x11-libs/libXext-1.3 - >=x11-libs/libXi-1.7 - >=x11-libs/libXrender-0.9.10 - >=x11-libs/libXtst-1.2 - ) -" - -PDEPEND="pulseaudio? ( dev-java/icedtea-sound )" - -S="${WORKDIR}" - -pkg_pretend() { - if [[ "$(tc-is-softfloat)" != "no" ]]; then - die "These binaries require a hardfloat system." - fi -} - -src_prepare() { - default - - # I wouldn't normally use -f below but symlinks in the arm files - # make this fail otherwise and any other approach would be tedious. - - if ! use alsa; then - rm -fv */jre/lib/*/libjsoundalsa.* || die - fi - - if use headless-awt; then - rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \ - */{,jre/}bin/policytool */bin/appletviewer || die - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}${dest#/}" - dodir "${dest}" - - dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README} - use doc && dodoc -r ${P}/doc/html - - # doins doesn't preserve executable bits. - cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die - - if use examples; then - cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die - fi - - if use source; then - cp ${P}/src.zip "${ddest}" || die - fi - - # use system-wide cacert store - rm "${ddest}"/jre/lib/security/cacerts || die - dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts - - java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh" - - # Both icedtea itself and the icedtea ebuild set PAX markings but we - # disable them for the icedtea-bin build because the line below will - # respect end-user settings when icedtea-bin is actually installed. - java-vm_set-pax-markings "${ddest}" - - # Each invocation appends to the config. - java-vm_revdep-mask "${EPREFIX}${dest}" - java-vm_sandbox-predict /proc/self/coredump_filter -} diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml deleted file mode 100644 index 97520fe245f0..000000000000 --- a/dev-java/icedtea-bin/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <use> - <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> - </use> -</pkgmetadata> diff --git a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild index 186bb18591b3..f36cb218a52d 100644 --- a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild +++ b/dev-java/icedtea-web/icedtea-web-1.8.8-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 @@ -23,10 +23,10 @@ RESTRICT="test" BDEPEND=" app-arch/zip - sys-devel/bc + app-alternatives/bc virtual/pkgconfig virtual/rust - doc? ( sys-devel/bc ) + doc? ( app-alternatives/bc ) " # Build within Portage using JDK 11+ (also presumably 9+) fails during diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest deleted file mode 100644 index 6adf8d98b5fa..000000000000 --- a/dev-java/icedtea/Manifest +++ /dev/null @@ -1,13 +0,0 @@ -DIST icedtea-3.21-aarch32-3.21.0.tar.xz 7207712 BLAKE2B bb9001aa31011fd0b29141caa1ba48344f2ca08e5dbe69cb3501a4830886d02b7a8782336a84273aad2ea721f26db2d3f51cdc72a9eccde1ad45a2790fb2caf1 SHA512 fc44c3c59164f6904ad92e04cb8023f39e82d6a2704fb5a91bf84d41066183ca6140273fa4c13d08a0dda47f263bd2d7d5138a5c45f205c58f649e6b87f15a9e -DIST icedtea-3.21-corba-3.21.0.tar.xz 949700 BLAKE2B b845a46b5dcb22545073f894fbc5464e014f8f0e02e0cc66bccda0db6bd5566908a886823189ecf476847adb7f3fa5c009814e54c69d65a3a4a6c3cfc692564d SHA512 55110b92c6eddeb29eab97cbe644d8cc171a489b9fa806c81e4af88a1e5e3e6776fb97371715782935222944464f68e7d6783c46bd0d0de5659123f46c577a7a -DIST icedtea-3.21-hotspot-3.21.0.tar.xz 7121192 BLAKE2B 64813c6a71405c5c093792dadf8613361a056b590fa4fa7453887ac5eb1eda1da63777a2f1e529e50eefe033d6f7f757d3235d53ba8f0f45d40dad6f0c215334 SHA512 678f6c53db5858ba828e063eeeddb727dbeb0586ff26a4287f9735dc01ad00ddcd9f41fa65343b81d5f5c512a944f47a447d4bdc929ca26ba78a68a7e3dfc1cd -DIST icedtea-3.21-jaxp-3.21.0.tar.xz 2269276 BLAKE2B a1848fa6832a8c87c9a6edcfc5ac45fc487b5378368c07bafe5a3e54b849b81b781fb3652593e3506ffbd220a933cb5a04ae6dee86b3a44be7a1138813f5454c SHA512 ff14c9b63cee2a7b9213872b8710b1c5b901ccaf4122c8ddf5d8437d1cdd35cf9af50f461d05f004b74802ba8a21c7e9f288ec080b2b5f7daad065d40dc39258 -DIST icedtea-3.21-jaxws-3.21.0.tar.xz 2278396 BLAKE2B 1fb8608df94937447e192d010465379b2c3aa578f9c1ebd2eba445b1cd92ea9427511fd72351537ae78796d90d130497b02bc3e89b9e1ff1765013c681e6cf83 SHA512 e21bd36b6cfa92f648856532647150243f2184943dc6f5003fea02cf69aa9b6a94fb18d6478db28d5ee5e3af9b780122c0539fd3207cf4dfcb69a042835c13d6 -DIST icedtea-3.21-jdk-3.21.0.tar.xz 40714380 BLAKE2B be2bda5027d20515717ffecef71996bd56c4246a2a0e4d670bb386ea9ed2ff71c91ca8faa17ee209a5894784dff8e1b7d8df544c0b88b8f9da946514d9070bc7 SHA512 06385f14d093be250aa530d0659576d75aed57b0264ec7329d6b2c9309cf4ed660a9ecbfb6f199868ae23aedfbdb97036fccda501c00e9d2e3b1562c92b0ed37 -DIST icedtea-3.21-langtools-3.21.0.tar.xz 2081452 BLAKE2B 97c0820a9c734fc8d155fd5ec8fa9c56b4eaa0bf6fe5df5235b2dc5680f8c1989e608210007faa8e0120ad7dadfe682f4fe174e5cdae64d34624f239a7b1bb16 SHA512 949366138278104fc06452d8227bbe5d0829a9124503928cab34e5e9df37e25d25964a5c755e46d9ca74e63f1b318b2e3366f8f08e144524a8043bc2a7ca626e -DIST icedtea-3.21-nashorn-3.21.0.tar.xz 2324264 BLAKE2B d7bcd9dd6df244004e3cb3ea1cdc178d781dd7f1b1d7b97df32385b67829bc3d9cb168caa64dc13fc15f27a9eeab276576d22cb804de5bc0d0209b98308a7105 SHA512 eda17f94ed2f34dd5bc4670dd3340d50de956723213948fd15963b0a589433bbe2e0ba8be7761974754b6a5d875ef58c31839daa6fef7215af552842f787bb44 -DIST icedtea-3.21-openjdk-3.21.0.tar.xz 367068 BLAKE2B 7fe212e84f1f527c229a854212617cd99457c0a4c5fdbd41a1ae65098706a22843e52a108cbf62fac341b9aa85e22f00746bb5a84e7d249ebbd605630bee127a SHA512 6a1706dfcb5e5d79191c01db6da30ca0ca48cea628a26a3a35f6e43c710091e25c97ec95122e8bc19b4ac69ede27a8dae37b49e1a7e4db07a635ded69e2e0336 -DIST icedtea-3.21-shenandoah-3.21.0.tar.xz 7295776 BLAKE2B c139711d81ccf593a93f786c398371eaddbaa9aa5044683669204ef9671cd17e80488ba2d290565ba5f1e27a62fa696c3d331c215442ddd29f3067b60682adec SHA512 c0282207854ad13d57dc7e1dd73412fb184406e7783d720cacbf58152177ae70af51bb4d577442bc1bebc75e88458cdb86356b79857b01eafb1eb214dbc439f4 -DIST icedtea-3.21.0.tar.xz 1574548 BLAKE2B 55dca04bf55a272a92f161a96a1cabe7c0e1f46289d95d74e9253c4da45d8df00e292e5d806118805241ea5c4b914643e380b05ad7996d850a8e5eebd7a2959a SHA512 874f91f3c3311d7017efb91aaff4e2fb660f55c58a626bcf5b120b7158df15e9b94abda7cd28f9620ad76c50bfa89cc8c1d251c193404c0db51ff1430167b018 -DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 -DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 diff --git a/dev-java/icedtea/files/icedtea.env.sh b/dev-java/icedtea/files/icedtea.env.sh deleted file mode 100644 index ac8303bda073..000000000000 --- a/dev-java/icedtea/files/icedtea.env.sh +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -VERSION="IcedTea JDK ${PV}" -JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" -JDK_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" -JAVAC="\${JAVA_HOME}/bin/javac" -PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin" -ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin" -LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/" -MANPATH="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="1.${SLOT}" -# Taken from sun.boot.class.path property -BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/lib/jfr.jar" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch b/dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch deleted file mode 100644 index ba5283f15771..000000000000 --- a/dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch +++ /dev/null @@ -1,16 +0,0 @@ -Workarounds build error: -Error: dl failure on line 895 -Error relocating .../libjvm.so: _ZN14ArrayAllocatorImL10MemoryType7EE4freeEv: symbol not found - -Possibly due to g++ 10.x error on not properly instantiating the template. - ---- openjdk/hotspot/src/share/vm/utilities/bitMap.cpp.orig 2020-11-10 14:07:08.372045326 +0200 -+++ openjdk/hotspot/src/share/vm/utilities/bitMap.cpp 2020-11-10 14:08:07.911412813 +0200 -@@ -42,6 +42,7 @@ - # include "os_bsd.inline.hpp" - #endif - -+template class ArrayAllocator<BitMap::bm_word_t, mtInternal>; - - BitMap::BitMap(bm_word_t* map, idx_t size_in_bits) : - _map(map), _size(size_in_bits), _map_allocator(false) diff --git a/dev-java/icedtea/icedtea-3.21.0.ebuild b/dev-java/icedtea/icedtea-3.21.0.ebuild deleted file mode 100644 index 9e6737770814..000000000000 --- a/dev-java/icedtea/icedtea-3.21.0.ebuild +++ /dev/null @@ -1,385 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL * -# ********************************************************* - -EAPI=6 -SLOT="8" - -inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs xdg-utils - -ICEDTEA_VER=$(ver_cut 1-3) -ICEDTEA_BRANCH=$(ver_cut 1-2) -ICEDTEA_PKG=icedtea-${ICEDTEA_VER} - -CORBA_TARBALL="${PV}.tar.xz" -JAXP_TARBALL="${PV}.tar.xz" -JAXWS_TARBALL="${PV}.tar.xz" -JDK_TARBALL="${PV}.tar.xz" -LANGTOOLS_TARBALL="${PV}.tar.xz" -OPENJDK_TARBALL="${PV}.tar.xz" -NASHORN_TARBALL="${PV}.tar.xz" -HOTSPOT_TARBALL="${PV}.tar.xz" -SHENANDOAH_TARBALL="${PV}.tar.xz" -AARCH32_TARBALL="${PV}.tar.xz" - -CACAO_TARBALL="cacao-c182f119eaad.tar.xz" -JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz" - -CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}" -JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}" -JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}" -JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}" -LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}" -OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}" -NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}" -HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}" -SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}" -AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}" - -CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}" -JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}" - -DROP_URL="https://icedtea.classpath.org/download/drops" -ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}" - -DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" -HOMEPAGE="https://icedtea.classpath.org" -SRC_PKG="${ICEDTEA_PKG}.tar.xz" -SRC_URI=" - https://icedtea.classpath.org/download/source/${SRC_PKG} - ${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL} - ${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL} - ${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL} - ${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL} - ${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL} - ${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL} - ${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL} - ${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL} - shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} ) - arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} ) - ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL} - ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}" - -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -IUSE="+alsa cacao +cups doc examples +gtk headless-awt - jamvm +jbootstrap kerberos pax-kernel pch - pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero" - -RESTRICT="!test? ( test )" -REQUIRED_USE="gtk? ( !headless-awt )" - -# Ideally the following were optional at build time. -ALSA_COMMON_DEP=">=media-libs/alsa-lib-1.0" -CUPS_COMMON_DEP=">=net-print/cups-1.2.12" - -X_COMMON_DEP=" - >=media-libs/giflib-4.1.6:0= - >=media-libs/libpng-1.2:0= - >=x11-libs/libX11-1.1.3 - >=x11-libs/libXext-1.1.1 - >=x11-libs/libXi-1.1.3 - >=x11-libs/libXrender-0.9.4 - >=x11-libs/libXtst-1.0.3 - x11-libs/libXcomposite -" - -X_DEPEND=" - x11-base/xorg-proto - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXinerama-1.0.2 -" - -# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn -COMMON_DEP=" - >=dev-libs/glib-2.26:2= - >=dev-util/systemtap-1 - media-libs/fontconfig:1.0= - >=media-libs/freetype-2.5.3:2= - >=sys-libs/zlib-1.2.3 - virtual/jpeg:0= - gtk? ( - >=dev-libs/atk-1.30.0 - >=x11-libs/cairo-1.8.8 - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.8:2 - >=x11-libs/pango-1.24.5 - ) - kerberos? ( virtual/krb5 ) - sctp? ( net-misc/lksctp-tools ) - smartcard? ( sys-apps/pcsc-lite ) - system-lcms? ( >=media-libs/lcms-2.9:2= ) -" - -RDEPEND="${COMMON_DEP} - !dev-java/icedtea:0 - !dev-java/icedtea-web:7 - >=gnome-base/gsettings-desktop-schemas-3.12.2 - >=sys-apps/baselayout-java-0.1.0-r1 - virtual/ttf-fonts - alsa? ( ${ALSA_COMMON_DEP} ) - cups? ( ${CUPS_COMMON_DEP} ) - !headless-awt? ( ${X_COMMON_DEP} ) - selinux? ( sec-policy/selinux-java ) -" - -# perl is needed for running the SystemTap tests and the bootstrap javac -# lsb-release is used to obtain distro information for the version & crash dump output -# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2 -# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h) -# Ant is no longer needed under the new build system -DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND} - || ( - dev-java/openjdk-bin:8 - dev-java/openjdk:8 - dev-java/icedtea-bin:8 - dev-java/icedtea:8 - ) - app-arch/cpio - app-arch/unzip - app-arch/zip - app-misc/ca-certificates - dev-lang/perl - dev-libs/openssl:0 - sys-apps/attr - sys-apps/lsb-release - x11-libs/libXt - virtual/pkgconfig - pax-kernel? ( sys-apps/elfix )" - -PDEPEND="pulseaudio? ( dev-java/icedtea-sound )" - -S="${WORKDIR}"/${ICEDTEA_PKG} - -icedtea_check_requirements() { - local CHECKREQS_DISK_BUILD - - if use doc; then - CHECKREQS_DISK_BUILD="9000M" - else - CHECKREQS_DISK_BUILD="8500M" - fi - - check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - icedtea_check_requirements -} - -pkg_setup() { - icedtea_check_requirements - - JAVA_PKG_WANT_BUILD_VM=" - openjdk-8 openjdk-bin-8 - icedtea-8 icedtea-bin-8" - JAVA_PKG_WANT_SOURCE="1.5" - JAVA_PKG_WANT_TARGET="1.5" - - java-vm-2_pkg_setup - java-pkg-2_pkg_setup -} - -src_unpack() { - unpack ${SRC_PKG} -} - -src_configure() { - # GCC10/-fno-common handling, #723102 - if [[ $(gcc-major-version) -ge 10 ]]; then - append-flags -fcommon - append-flags -fno-delete-null-pointer-checks -fno-lifetime-dse - fi - # this patch helps with gcc10 as well - # since build system unpacks tarballs itself, this is a way to force makefile - # to apply our patch. it expects relative path inside source, so we can't specify - # ${FILESDIR} directly. - mkdir -v gentoo_patches || die - cp -v "${FILESDIR}/openjdk-8-hotspot-arrayallocator.patch" gentoo_patches || die - export DISTRIBUTION_PATCHES="gentoo_patches//openjdk-8-hotspot-arrayallocator.patch" - - # For bootstrap builds as the sandbox control file might not yet exist. - addpredict /proc/self/coredump_filter #nowarn - - # icedtea doesn't like some locales. #330433 #389717 - export LANG="C" LC_ALL="C" - - local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config - local vm=$(java-pkg_get-current-vm) - - # gcj-jdk ensures ecj is present. - if use jbootstrap || has "${vm}" gcj-jdk; then - use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\"" - config+=" --enable-bootstrap" - else - config+=" --disable-bootstrap" - fi - - # Use Zero if requested - if use zero; then - use_zero="yes" - fi - - # Use JamVM if requested - if use jamvm; then - use_jamvm="yes" - fi - - # Use CACAO if requested - if use cacao; then - use_cacao="yes" - fi - - # Are we on a architecture with a HotSpot port? - # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86. - if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then - hotspot_port="yes" - # Work around stack alignment issue, bug #647954. - use x86 && append-flags -mincoming-stack-boundary=2 - fi - - # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... - # Otherwise use Zero for now until alternate VMs are working - if test "x${hotspot_port}" != "xyes"; then - use_zero="yes" - fi - - if use shenandoah; then - if { use amd64 || use arm64; }; then - hs_config="--with-hotspot-build=shenandoah" - hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}"" - else - eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah"" - fi - else - if use arm ; then - hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}"" - else - hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}"" - fi - fi - - # Turn on JamVM if needed (non-HS archs) or requested - if test "x${use_jamvm}" = "xyes"; then - if test "x${hotspot_port}" = "xyes"; then - ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.' - ewarn 'If so, please rebuild with USE="-jamvm"' - fi - ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"' - jamvm_config="--enable-jamvm" - fi - - # Turn on CACAO if needed (non-HS archs) or requested - if test "x${use_cacao}" = "xyes"; then - if test "x${hotspot_port}" = "xyes"; then - ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.' - ewarn 'If so, please rebuild with USE="-cacao"' - fi - ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"' - cacao_config="--enable-cacao" - fi - - # Turn on Zero if needed (non-HS/CACAO archs) or requested - if test "x${use_zero}" = "xyes"; then - if test "x${hotspot_port}" = "xyes"; then - ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.' - fi - zero_config="--enable-zero" - fi - - # PaX breaks pch, bug #601016 - if use pch && ! host-is-pax; then - config+=" --enable-precompiled-headers" - else - config+=" --disable-precompiled-headers" - fi - - config+=" --with-parallel-jobs=$(makeopts_jobs)" - - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - # force bash for now https://bugs.gentoo.org/722292 - CONFIG_SHELL="${EPREFIX}/bin/bash" econf ${config} \ - --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \ - --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \ - --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \ - --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \ - --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \ - --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \ - --with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \ - --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \ - --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \ - --with-jdk-home="$(java-config -O)" \ - --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ - --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \ - --with-pkgversion="Gentoo ${PF}" \ - --disable-ccache \ - --disable-downloading --disable-Werror --disable-tests \ - --disable-systemtap-tests --enable-improved-font-rendering \ - --enable-system-jpeg --enable-system-zlib \ - $(use_enable headless-awt headless) \ - $(use_enable !headless-awt system-gif) \ - $(use_enable !headless-awt system-png) \ - $(use_enable doc docs) \ - $(use_enable kerberos system-kerberos) \ - $(use_enable system-lcms) \ - $(use_with pax-kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \ - $(use_enable sctp system-sctp) \ - $(use_enable smartcard system-pcsc) \ - ${zero_config} ${cacao_config} ${jamvm_config} ${hs_config} -} - -src_compile() { - default -} - -src_test() { - default -} - -src_install() { - default - - local dest="/usr/$(get_libdir)/icedtea${SLOT}" - local ddest="${ED}${dest#/}" - - if ! use alsa; then - rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die - fi - - if ! use examples; then - rm -r "${ddest}"/demo "${ddest}"/sample || die - fi - - if ! use source; then - rm -v "${ddest}"/src.zip || die - fi - - dosym ../../../usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}" - - # Fix the permissions. - find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die - - dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts - - java-vm_install-env "${FILESDIR}/icedtea.env.sh" - java-vm_sandbox-predict /proc/self/coredump_filter -} - -pkg_postinst() { - xdg_icon_cache_update - java-vm-2_pkg_postinst - einfo "JavaWebStart functionality provided by icedtea-web package" -} - -pkg_postrm() { - xdg_icon_cache_update - java-vm-2_pkg_postrm -} diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml deleted file mode 100644 index ed7f1f695903..000000000000 --- a/dev-java/icedtea/metadata.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gnu_andrew@member.fsf.org</email> - <name>Andrew John Hughes</name> - </maintainer> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <longdescription> - The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. - </longdescription> - <use> - <flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag> - <flag name="cups">Link against the CUPS library at compile time, rather than using it dynamically at runtime.</flag> - <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> - <flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag> - <flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag> - <flag name="kerberos">Link against Kerberos in order to obtain the cache location.</flag> - <flag name="pax-kernel">Apply patch needed for pax enabled kernels.</flag> - <flag name="pch">Build using pre-compiled headers.</flag> - <flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag> - <flag name="shenandoah">Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (arm64 and x86_64 only)</flag> - <flag name="smartcard">Build the PCSC driver against pcsc-lite</flag> - <flag name="system-lcms">Build against the system LCMS installation rather than the in-tree copy.</flag> - <flag name="zero">Enable Zero assembler port (usually for non-HotSpot architectures)</flag> - </use> -</pkgmetadata> diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest index 654f43047d9e..95e67ccfac14 100644 --- a/dev-java/icu4j/Manifest +++ b/dev-java/icu4j/Manifest @@ -1 +1 @@ -DIST icu-73.2.tar.gz 81522943 BLAKE2B 006d7ccab04385f0aa60e2e60b616be9598f448f27d9b0f6dba554874bfe1dd442ba0719a7677ba8aba7e4e0f05e5e50dca74855a900da1f496aad0cd54c3cdc SHA512 f234fb9c76af62dad59e159ef7f7792aca563d88f2988d3d1ecc8be6250837beb9a530ec121e0949f6925ee8e5171a0d04fa41a0c50d9993c4061fa55be6836e +DIST icu4j-75.1.tar.gz 65866291 BLAKE2B ae9a2a8f9bf6f38a08c46c4c3695fa4096c831beab1af5b654e86c9d681eb32be727930aeb1fd866fe9f93a96abe807fd353d108b5fe7a4d8203ee33cc16d971 SHA512 08f8fce8a4dd85706d9f7c57fd021ba15c403ab2da33d9a122d7cb441e0e148deebf245a661e4ef53a30bfa8b7622c63035946fd8966be3927af322275b87ca3 diff --git a/dev-java/icu4j/icu4j-73.2.ebuild b/dev-java/icu4j/icu4j-73.2.ebuild deleted file mode 100644 index bb57ea2829c9..000000000000 --- a/dev-java/icu4j/icu4j-73.2.ebuild +++ /dev/null @@ -1,240 +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="com.ibm.icu:icu4j:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A set of Java libraries providing Unicode and Globalization support" -HOMEPAGE="https://icu.unicode.org" -SRC_URI="https://github.com/unicode-org/icu/archive/release-${PV/./-}.tar.gz -> icu-${PV}.tar.gz" -S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main" - -LICENSE="icu" -SLOT="70" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=">=virtual/jdk-1.8:* - test? ( dev-java/junitparams:0 )" - -RDEPEND=">=virtual/jre-1.8:*" - -HTML_DOCS=( ../{APIChangeReport,readme}.html ) - -JAVA_TEST_EXCLUDES=( - # Invalid tests, not run by maven - "com.ibm.icu.dev.data.TestDataElements_testtypes" - "com.ibm.icu.dev.data.resources.TestDataElements_en_Latn_US" - "com.ibm.icu.dev.data.resources.TestDataElements_en_US" - "com.ibm.icu.dev.data.resources.TestDataElements_fr_Latn_FR" - "com.ibm.icu.dev.data.resources.TestDataElements_te" - "com.ibm.icu.dev.data.resources.TestMessages" - "com.ibm.icu.dev.test.ModuleTest" - "com.ibm.icu.dev.test.TestBoilerplate" - "com.ibm.icu.dev.test.TestDataModule" - "com.ibm.icu.dev.test.bidi.TestData" - "com.ibm.icu.dev.test.calendar.ChineseTestCase" - "com.ibm.icu.dev.test.calendar.TestCase" - "com.ibm.icu.dev.test.format.ExhaustivePersonNameFormatterTest" - "com.ibm.icu.dev.test.localespi.TestUtil" - "com.ibm.icu.dev.test.message2.TestCase" - "com.ibm.icu.dev.test.stringprep.TestData" - "com.ibm.icu.dev.test.translit.TestUtility" - # Maven: [INFO] Tests run: 364, Failures: 0, Errors: 0, Skipped: 0 - "com.ibm.icu.dev.test.serializable.CompatibilityTest" # Tests run: 364, Failures: 4 - # Maven: [INFO] Tests run: 90, Failures: 0, Errors: 0, Skipped: 0 - "com.ibm.icu.dev.test.serializable.CoverageTest" # Tests run: 99, Failures: 9 - # Following tests need to run separately: - com.ibm.icu.dev.test.calendar.CalendarRegressionTest - com.ibm.icu.dev.test.calendar.CompatibilityTest - com.ibm.icu.dev.test.calendar.DataDrivenCalendarTest - com.ibm.icu.dev.test.calendar.HolidayTest - com.ibm.icu.dev.test.calendar.IndianTest - com.ibm.icu.dev.test.calendar.IslamicTest - com.ibm.icu.dev.test.calendar.JapaneseTest - com.ibm.icu.dev.test.format.DataDrivenFormatTest - com.ibm.icu.dev.test.format.DateFormatRegressionTest - com.ibm.icu.dev.test.format.DateFormatRoundTripTest - com.ibm.icu.dev.test.format.DateIntervalFormatTest - com.ibm.icu.dev.test.format.DateTimeGeneratorTest - com.ibm.icu.dev.test.format.TestMessageFormat - com.ibm.icu.dev.test.message2.MessageFormat2Test - com.ibm.icu.dev.test.message2.Mf2FeaturesTest - com.ibm.icu.dev.test.message2.Mf2IcuTest - com.ibm.icu.dev.test.timezone.TimeZoneBoundaryTest - com.ibm.icu.dev.test.util.CurrencyTest -) -JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI" -JAVA_TEST_GENTOO_CLASSPATH="junit-4,junitparams" -JAVA_TEST_RESOURCE_DIRS=( - tests/res/collate/src - tests/res/core/src - tests/res/translit/src -) -JAVA_TEST_SRC_DIR=( - tests/charset/src - tests/collate/src - tests/core/src - tests/localespi/src - tests/packaging/src - tests/translit/src -) - -src_prepare() { - java-pkg_clean ! -path "./shared/data/*" # keep icudata.jar, icutzdata.jar, testdata.jar - java-pkg-2_src_prepare - - # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS - mkdir -p resources || die - - pushd classes > /dev/null || die - find -type f \ - ! -name '*.java' \ - ! -name 'license.html' \ - | xargs cp --parent -t ../resources || die - popd > /dev/null || die - - pushd resources/core/src > /dev/null || die - # icudata and icutzdata for "icu4j.jar" - jar -xf "${S}"/shared/data/icudata.jar || die - jar -xf "${S}"/shared/data/icutzdata.jar || die - # move these resources to "icu4j-charset.jar" - mkdir -p "${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die - mv com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/{*.cnv,cnvalias.icu} \ - "${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die - - # create 9 files com/ibm/icu/impl/data/icudt69b/*/fullLocaleNames.lst - for dir in $(find com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/ -type d ! -name 'unit' -exec echo {} +); do - ls -1 $dir/*.res | sed -e 's%.*\/%%' -e 's%\..*$%%' -e '/pool/d' -e '/res_index/d' -e '/tzdbNames/d'\ - > $dir/'fullLocaleNames.lst'; - done || die "fullLocaleNames.lst failed" - popd > /dev/null || die - - if use test; then - # initializationError(com.ibm.icu.dev.data.resources.TestDataElements) - # but test_excluding it would kill tousands of other tests. - mkdir -p tests/framework/src/com/ibm/icu/dev/data/resources || die - mv tests/{core,framework}/src/com/ibm/icu/dev/data/resources/TestDataElements.java || die - - # Separate tests resources - mkdir tests/res || die - pushd tests > /dev/null || die - find -type f \ - ! -name '*.java' \ - | xargs cp --parent -t res || die - popd > /dev/null || die - - cp -r ../tools/misc/{src,resources} || die - find ../tools/misc/resources -type f -name '*.java' -exec rm -rf {} + || die - fi -} - -src_compile() { - einfo "Compiling icu4j.jar" - JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu" - JAVA_JAR_FILENAME="icu4j.jar" - JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo" - JAVA_RESOURCE_DIRS="resources/core/src" - JAVA_SRC_DIR=( - classes/collate/src - classes/core/src - classes/currdata/src - classes/langdata/src - classes/regiondata/src - classes/translit/src - ) - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":icu4j.jar" - rm -r target || die - - einfo "Compiling icu4j-charset.jar" - JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.charset" - JAVA_JAR_FILENAME="icu4j-charset.jar" - JAVA_MAIN_CLASS="" - JAVA_RESOURCE_DIRS="resources/charset/src" - JAVA_SRC_DIR=( classes/charset/src ) - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":icu4j-charset.jar" - rm -r target || die - - einfo "Compiling icu4j-localespi.jar" - JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.localespi" - JAVA_JAR_FILENAME="icu4j-localespi.jar" - JAVA_RESOURCE_DIRS="resources/localespi/src" - JAVA_SRC_DIR=( classes/localespi/src ) - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":icu4j-localespi.jar" - rm -r target || die - - # main/test/framework - # needed for compilicg the tests - # but "No runnable methods" ("Invalid test class") - if use test; then - JAVA_JAR_FILENAME="framework.jar" - JAVA_RESOURCE_DIRS=( tests/res/framework/src ../tools/misc/resources ) - JAVA_SRC_DIR=( tests/framework/src ../tools/misc/src ) - java-pkg-simple_src_compile - rm -fr target || die - fi - - # javadocs - if use doc; then - JAVA_JAR_FILENAME="ignoreme.jar" - JAVA_SRC_DIR=( classes ) - java-pkg-simple_src_compile - fi -} - -src_test () { - # TZ needed for some tests in com/ibm/icu/dev/test/format/DateFormatTest - export LC_ALL="en_US.UTF-8" TZ="US/Pacific" - JAVA_GENTOO_CLASSPATH_EXTRA+=":framework.jar:shared/data/testdata.jar" - - JAVA_TEST_RUN_ONLY=( - com.ibm.icu.dev.test.rbbi.AbstractBreakIteratorTests - com.ibm.icu.dev.test.calendar.CalendarRegressionTest - com.ibm.icu.dev.test.calendar.CompatibilityTest - com.ibm.icu.dev.test.calendar.DataDrivenCalendarTest - com.ibm.icu.dev.test.calendar.HolidayTest - com.ibm.icu.dev.test.calendar.IndianTest - com.ibm.icu.dev.test.calendar.IslamicTest - com.ibm.icu.dev.test.calendar.JapaneseTest - com.ibm.icu.dev.test.format.DataDrivenFormatTest - com.ibm.icu.dev.test.format.DateFormatRegressionTest - com.ibm.icu.dev.test.format.DateFormatRoundTripTest - com.ibm.icu.dev.test.format.DateIntervalFormatTest - com.ibm.icu.dev.test.format.DateTimeGeneratorTest - com.ibm.icu.dev.test.format.TestMessageFormat - com.ibm.icu.dev.test.message2.MessageFormat2Test - com.ibm.icu.dev.test.message2.Mf2FeaturesTest - com.ibm.icu.dev.test.message2.Mf2IcuTest - com.ibm.icu.dev.test.timezone.TimeZoneBoundaryTest - com.ibm.icu.dev.test.util.CurrencyTest - ) - java-pkg-simple_src_test - - JAVA_TEST_RUN_ONLY=() - # ../maven-build/maven-icu4j-localespi/pom.xml#L133-L143 - local vm_version="$(java-config -g PROVIDES_VERSION)" - if [[ "${vm_version}" != "1.8" ]] ; then - java-pkg-simple_src_test - fi -} - -src_install() { - default - java-pkg_dojar "icu4j.jar" - java-pkg_dojar "icu4j-charset.jar" - java-pkg_dojar "icu4j-localespi.jar" - - if use doc; then - java-pkg_dojavadoc target/api - fi - if use source; then - java-pkg_dosrc "classes" - fi -} diff --git a/dev-java/icu4j/icu4j-75.1.ebuild b/dev-java/icu4j/icu4j-75.1.ebuild new file mode 100644 index 000000000000..bae11e47634a --- /dev/null +++ b/dev-java/icu4j/icu4j-75.1.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_PROVIDES=" + com.ibm.icu:icu4j:${PV} + com.ibm.icu:icu4j-charset:${PV} + com.ibm.icu:icu4j-localespi:${PV} +" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A set of Java libraries providing Unicode and Globalization support" +HOMEPAGE="https://icu.unicode.org" +SRC_URI="https://github.com/unicode-org/icu/archive/release-${PV/./-}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main" + +LICENSE="icu" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/gson:0 + dev-java/junitparams:0 + ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( ../../{CONTRIBUTING,README,SECURITY}.md ) +HTML_DOCS=( ../{APIChangeReport,readme}.html ) + +src_compile() { + JAVA_GENTOO_CLASSPATH_EXTRA="icu4j.jar:icu4j-charset.jar:icu4j-localespi.jar" + + einfo "Compiling icu4j.jar" + JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu" + JAVA_JAR_FILENAME="icu4j.jar" + JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo" + JAVA_RESOURCE_DIRS=( + collate/src/main/resources + core/src/main/resources + currdata/src/main/resources + langdata/src/main/resources + regiondata/src/main/resources + translit/src/main/resources + ) + JAVA_SRC_DIR=( + collate/src/main/java + core/src/main/java + currdata/src/main/java + langdata/src/main/java + regiondata/src/main/java + translit/src/main/java + ) + java-pkg-simple_src_compile + rm -r target || die + + einfo "Compiling icu4j-charset.jar" + JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.charset" + JAVA_JAR_FILENAME="icu4j-charset.jar" + JAVA_MAIN_CLASS="" + JAVA_RESOURCE_DIRS=( charset/src/main/resources ) + JAVA_SRC_DIR=( charset/src/main/java ) + java-pkg-simple_src_compile + rm -r target || die + + einfo "Compiling icu4j-localespi.jar" + JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.localespi" + JAVA_JAR_FILENAME="icu4j-localespi.jar" + JAVA_RESOURCE_DIRS=( localespi/src/main/resources ) + JAVA_SRC_DIR=( localespi/src/main/java ) + java-pkg-simple_src_compile + rm -r target || die + + einfo "Generating javadocs" + JAVADOC_SRC_DIRS=( + collate/src/main/java + core/src/main/java + currdata/src/main/java + langdata/src/main/java + regiondata/src/main/java + translit/src/main/java + charset/src/main/java + localespi/src/main/java + ) + use doc && ejavadoc +} + +src_test () { + # TZ needed for some tests in com/ibm/icu/dev/test/format/DateFormatTest + export LC_ALL="en_US.UTF-8" TZ="US/Pacific" + + JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI" + JAVA_TEST_GENTOO_CLASSPATH="gson,junit-4,junitparams" + + einfo "Compiling framework-tests.jar" + JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.framework" + JAVA_JAR_FILENAME="framework-tests.jar" + JAVA_MAIN_CLASS="com.ibm.icu.dev.test.TestAll" + JAVA_RESOURCE_DIRS=( framework/src/test/resources ) + JAVA_SRC_DIR=( framework/src/test/java ) + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":framework-tests.jar" + + einfo "Testing core aka icu4j.jar" + JAVA_TEST_RESOURCE_DIRS="core/src/test/resources" + JAVA_TEST_SRC_DIR="core/src/test/java" + pushd "${JAVA_TEST_SRC_DIR}" || die + # exclude invalid tests, not run by "mvn test" + local JAVA_TEST_RUN_ONLY=$(find * \ + -name "*Test*.java" \ + ! -name "ChineseTestCase.java" \ + ! -name "DataDrivenNumberFormatTestUtility.java" \ + ! -name "*Helper.java" \ + ! -name "ModuleTest.java" \ + ! -name "*Sample.java" \ + ! -name "TestCase.java" \ + ! -name "*TestData*.java" \ + ! -name "*TestFmwk.java" \ + ! -name "TestMessages.java" \ + ! -name "TestUtils.java" \ + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test + + einfo "Creating core-tests.jar" + jar cvf core-tests.jar -C target/test-classes . + JAVA_GENTOO_CLASSPATH_EXTRA+=":core-tests.jar" + JAVA_TEST_RUN_ONLY="" + + einfo "Testing collate" + JAVA_TEST_RESOURCE_DIRS="collate/src/test/resources" + JAVA_TEST_SRC_DIR="collate/src/test/java" + java-pkg-simple_src_test + + einfo "Testing translit" + JAVA_TEST_EXCLUDES=( + # Invalid test classes, No runnable methods + com.ibm.icu.dev.test.TestBoilerplate + com.ibm.icu.dev.test.translit.TestUtility + ) + JAVA_TEST_RESOURCE_DIRS="translit/src/test/resources" + JAVA_TEST_SRC_DIR="translit/src/test/java" + java-pkg-simple_src_test + + einfo "Testing charset" + JAVA_TEST_RESOURCE_DIRS="" + JAVA_TEST_SRC_DIR="charset/src/test/java" + java-pkg-simple_src_test + + einfo "Testing common_tests" + # "mvn test" runs only 90 tests here, Gentoo runs 99 but 9 of them fail. + # coverage tests fail because test handlers for the parametrized tests + # are not defined so the tests are broken and cannot succeed + JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.serializable.CoverageTest ) + JAVA_TEST_RESOURCE_DIRS="" + JAVA_TEST_SRC_DIR="common_tests/src/test/java" + java-pkg-simple_src_test + + einfo "Testing localespi" + JAVA_TEST_RESOURCE_DIRS="" + JAVA_TEST_SRC_DIR="localespi/src/test/java" + # Invalid test classes, No runnable methods + JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.localespi.TestUtil ) + # https://bugs.gentoo.org/827212, "mvn test" does not run it at all + local vm_version="$(java-config -g PROVIDES_VERSION)" + if [[ "${vm_version}" != "1.8" ]] ; then + java-pkg-simple_src_test + fi +} + +src_install() { + default + java-pkg_dojar "icu4j.jar" + java-pkg_dojar "icu4j-charset.jar" + java-pkg_dojar "icu4j-localespi.jar" + + if use doc; then + java-pkg_dojavadoc target/api + fi + if use source; then + java-pkg_dosrc "classes" + fi +} diff --git a/dev-java/injection-api/Manifest b/dev-java/injection-api/Manifest index f27cd5678a48..f6acbb6d3577 100644 --- a/dev-java/injection-api/Manifest +++ b/dev-java/injection-api/Manifest @@ -1 +1 @@ -DIST injection-api-2.0.1.tar.gz 15277 BLAKE2B e1a575ce9705636e0e176e63684c3c4ddd3e7932f2fcf36af86e00e4ebb9888151d64019dea8339c80951d40d3f588bcb6857943c2e3a501e68ad7702a73c643 SHA512 21037c1b9b9687210663ee32b40c7ab897a27812591e38af2f840421488029d1b90f0528570940499142a7ec21ebd1f0fc4506872d9667a066b4ce84d38428e5 +DIST injection-api-2.0.1.tar.gz 15280 BLAKE2B 786c4748eb58bb3f37ed2c8189ec44eb76a77d5e6d6cbb6c54da0ecfd6bbd757b138567dfd4c64d8a5caa69e34ea630e457d84dbfbd3de5ccc58dae7fdef810a SHA512 2d1e182a6520819235c2c8b193b3af916a6533e899f42ea2040977d841f32b3cec256b7566862483c6bee3f727136219d54a025c3dea026c906668e5b9fb3517 diff --git a/dev-java/injection-api/injection-api-2.0.1.ebuild b/dev-java/injection-api/injection-api-2.0.1.ebuild index 149141f12301..58a262fd17cc 100644 --- a/dev-java/injection-api/injection-api-2.0.1.ebuild +++ b/dev-java/injection-api/injection-api-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -13,7 +13,8 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Jakarta Dependency Injection" HOMEPAGE="https://jakarta.ee/specifications/dependency-injection/" -SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/jakartaee/inject/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/inject-${PV}" LICENSE="Apache-2.0" SLOT="0" @@ -24,6 +25,4 @@ RDEPEND=">=virtual/jre-1.8:*" DOCS=( {CONTRIBUTING,NOTICE}.md ) -S="${WORKDIR}/${P}" - JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/injection-api/metadata.xml b/dev-java/injection-api/metadata.xml index 4c37da7799c7..2139e80c1616 100644 --- a/dev-java/injection-api/metadata.xml +++ b/dev-java/injection-api/metadata.xml @@ -5,6 +5,6 @@ <email>java@gentoo.org</email> </maintainer> <upstream> - <remote-id type="github">eclipse-ee4j/injection-api</remote-id> + <remote-id type="github">jakartaee/inject</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/iso-relax/iso-relax-20050331-r5.ebuild b/dev-java/iso-relax/iso-relax-20050331-r6.ebuild index e0990c5abb6d..6359c5cb8203 100644 --- a/dev-java/iso-relax/iso-relax-20050331-r5.ebuild +++ b/dev-java/iso-relax/iso-relax-20050331-r6.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,30 +10,20 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Interfaces useful for applications which support RELAX Core" HOMEPAGE="http://www.xml.gr.jp/relax/" SRC_URI="mirror://gentoo/${P}.tar.bz2" +S="${WORKDIR}/${P}" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" -RESTRICT="test" - -CDEPEND="dev-java/ant-core:0" - -DEPEND=" - ${CDEPEND} +CP_DEPEND=">=dev-java/ant-1.10.14-r3:0" +DEPEND="${CP_DEPEND} >=virtual/jdk-1.8:*" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -S="${WORKDIR}/${P}" - -JAVA_GENTOO_CLASSPATH="ant-core" +RDEPEND=">=virtual/jre-1.8:*" JAVA_SRC_DIR="src" src_prepare() { - default + java-pkg-2_src_prepare java-pkg_clean } diff --git a/dev-java/j2objc-annotations/Manifest b/dev-java/j2objc-annotations/Manifest index 7ce33bc9a26c..f3cf7f8491c0 100644 --- a/dev-java/j2objc-annotations/Manifest +++ b/dev-java/j2objc-annotations/Manifest @@ -1 +1 @@ -DIST j2objc-2.8.tar.gz 29383083 BLAKE2B a2d288b95fac5d5fafbf5e3c8c7c862e41ba9562f6a3f367ee03574db0f07e030f7812de7d0cf63c97acdbbf8ddd8128fe14e89e97623d6d3cf7b85071e160b3 SHA512 f93a77db3a672691666de317010e455aceb20313a40217270cf4cfd082a0443f7f5cf6f53f06a1006d0a2788c199685a574b0acb435dccdc4e419a2340451860 +DIST j2objc-3.0.0.tar.gz 29562144 BLAKE2B b0dc9aeef148ee29154062228049b4db86648fb66b93d224d536a3c0b7e56eb4850d38761b59c6728b005e1520a7a3c07ef3bdb3662d9cad52794ec3ce533426 SHA512 b7e295e448caa61d03c12cde77266ab397f27a5632ab01944571736a79860fa0375279f27fcb1870d0452bde4d8b50ee453a88a23e5b92c1ef0411d4212f3779 diff --git a/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild index 3d69f0171861..7b1be4f994d1 100644 --- a/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild +++ b/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild @@ -1,30 +1,27 @@ -# Copyright 1999-2022 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" -# Yes. version is "2.2" regardless ${PV} being "2.8". -# See https://github.com/google/j2objc/blob/2.8/annotations/pom.xml#L32-L35 -MAVEN_ID="com.google.j2objc:j2objc-annotations:2.2" +MAVEN_ID="com.google.j2objc:j2objc-annotations:${PV}" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Annotations for the J2ObjC Java to Objective-C translator" HOMEPAGE="https://developers.google.com/j2objc/" SRC_URI="https://github.com/google/j2objc/archive/${PV}.tar.gz -> j2objc-${PV}.tar.gz" +S="${WORKDIR}/j2objc-${PV}/annotations" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -DEPEND="virtual/jdk:1.8" +DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" DOCS=( ../{CONTRIBUTING,README}.md ) -S="${WORKDIR}/j2objc-${PV}/annotations" - JAVA_SRC_DIR="src/main/java" src_prepare() { diff --git a/dev-java/jackson-core/metadata.xml b/dev-java/jackson-core/metadata.xml index 7c4f08455c28..b23e2bb1f6ba 100644 --- a/dev-java/jackson-core/metadata.xml +++ b/dev-java/jackson-core/metadata.xml @@ -6,5 +6,6 @@ </maintainer> <upstream> <bugs-to>https://github.com/FasterXML/jackson-core/issues</bugs-to> + <remote-id type="github">FasterXML/jackson-core</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/jackson-databind/metadata.xml b/dev-java/jackson-databind/metadata.xml index 7db69d87c0d8..de712481f022 100644 --- a/dev-java/jackson-databind/metadata.xml +++ b/dev-java/jackson-databind/metadata.xml @@ -6,5 +6,6 @@ </maintainer> <upstream> <bugs-to>https://github.com/FasterXML/jackson-databind/issues</bugs-to> + <remote-id type="github">FasterXML/jackson-databind</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/jackson-dataformat-xml/metadata.xml b/dev-java/jackson-dataformat-xml/metadata.xml index 76dcd355d49d..8891308e2cbd 100644 --- a/dev-java/jackson-dataformat-xml/metadata.xml +++ b/dev-java/jackson-dataformat-xml/metadata.xml @@ -9,5 +9,6 @@ </longdescription> <upstream> <bugs-to>https://github.com/FasterXML/jackson-dataformat-xml/issues</bugs-to> + <remote-id type="github">FasterXML/jackson-dataformat-xml</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/jackson-module-jakarta-xmlbind/metadata.xml b/dev-java/jackson-module-jakarta-xmlbind/metadata.xml index d8255baa3203..b32b36b8af8e 100644 --- a/dev-java/jackson-module-jakarta-xmlbind/metadata.xml +++ b/dev-java/jackson-module-jakarta-xmlbind/metadata.xml @@ -9,5 +9,6 @@ </longdescription> <upstream> <bugs-to>https://github.com/FasterXML/jackson-modules-base/issues</bugs-to> + <remote-id type="github">FasterXML/jackson-modules-base</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/jacl/jacl-1.4.1-r2.ebuild b/dev-java/jacl/jacl-1.4.1-r2.ebuild index f1cd44ee2aaa..53e9a0ae85f6 100644 --- a/dev-java/jacl/jacl-1.4.1-r2.ebuild +++ b/dev-java/jacl/jacl-1.4.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 @@ -8,7 +8,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Jacl is an implementation of Tcl written in Java" HOMEPAGE="http://tcljava.sourceforge.net" -SRC_URI="mirror://sourceforge/project/tcljava/jacl/${PV}/jacl${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/project/tcljava/jacl/${PV}/jacl${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/dev-java/jakarta-mail-api/Manifest b/dev-java/jakarta-mail-api/Manifest index 501667971499..f1de9f7bc250 100644 --- a/dev-java/jakarta-mail-api/Manifest +++ b/dev-java/jakarta-mail-api/Manifest @@ -1 +1 @@ -DIST jakarta-mail-api-2.1.1.tar.gz 1214949 BLAKE2B d92861ed3c957db8d7fda2ec25269ed7b3ec27d55c6b8865278cd6b1dcdef750ecb126136760f15bf86216c14bb00a856a60719f6121ccb87b41523662754ab1 SHA512 e367c27d85aa9513ab1a4ff0a1eb9ef947b6fad6b0c24263c5f0c0befc8f152e193eedb4a0c9687aa3decac07615094904639e11db395d25dd45c5d9fd8677cc +DIST jakarta-mail-api-2.1.3.tar.gz 1219840 BLAKE2B 6fff0fc63bcdb9f52e02c957408fffdc77be9733bc612f461500b23212572407b3a26dcef2434043d6b38011f8f8c8983a450a043f540c9217783247cf2bfd2b SHA512 274f8dfac3d228df4161a293ef02ca22cd7e411ee9143216eb6784a8bd049b9d2849566ce78baee0ba8e65ed5a7e84b4e03d8b551ac1e6273de1ed44e7798931 diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.ebuild index 9a5fec2d653a..0bd19f854bc1 100644 --- a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild +++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.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 test" -MAVEN_ID="jakarta.mail:jakarta.mail-api:2.1.1" +MAVEN_ID="jakarta.mail:jakarta.mail-api:2.1.3" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple @@ -22,7 +22,7 @@ DEPEND=" dev-java/jakarta-activation-api:2 >=virtual/jdk-11:* test? ( - >=dev-java/angus-activation-1.0.0-r1:0 + dev-java/angus-activation:0 ) " @@ -38,16 +38,12 @@ JAVA_TEST_RESOURCE_DIRS="src/test/resources" JAVA_TEST_SRC_DIR="src/test/java" src_test() { - rm src/test/java/module-info.java || die - - # There was 1 failure: - # 1) doesNotExist(jakarta.mail.util.FactoryFinderTest) - # java.lang.NullPointerException - # at jakarta.mail.util.FactoryFinderTest.doesNotExist(FactoryFinderTest.java:55) - sed \ - -e '/import org.junit.Test/a import org.junit.Ignore;' \ - -e '/doesNotExist/i @Ignore' \ - -i src/test/java/jakarta/mail/util/FactoryFinderTest.java || die + # bug #853151 - copying from target/classes as a workaraound + # handing of module-info.java in java-pkg-simple_src_test seems not aware of target/classes + mkdir -p generated-test/jakarta/mail || die + cp -r {target/classes,generated-test}/jakarta/mail/event || die + cp -r {target/classes,generated-test}/jakarta/mail/util || die + cp -r target/classes/jakarta/mail/Provider* generated-test/jakarta/mail || die # These tests need to run separately, otherwise would fail JAVA_TEST_EXCLUDES=( diff --git a/dev-java/jakarta-mail/files/jakarta-mail-2.0.1-LogManagerPropertiesTest.patch b/dev-java/jakarta-mail/files/jakarta-mail-2.0.1-LogManagerPropertiesTest.patch new file mode 100644 index 000000000000..7848f1e77c9a --- /dev/null +++ b/dev-java/jakarta-mail/files/jakarta-mail-2.0.1-LogManagerPropertiesTest.patch @@ -0,0 +1,11 @@ +--- a/src/test/java/com/sun/mail/util/logging/LogManagerPropertiesTest.java ++++ b/src/test/java/com/sun/mail/util/logging/LogManagerPropertiesTest.java +@@ -78,7 +78,7 @@ public class LogManagerPropertiesTest extends AbstractLogging { + assertEquals(Arrays.toString(declared), 0, declared.length); + } + +- @Test ++ @Test @Ignore + public void testCheckAccessPresent() { + LogManager m = LogManager.getLogManager(); + m.checkAccess(); 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 2fcf73b3a66e..0e12088b9f5e 100644 --- a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild +++ b/dev-java/jakarta-mail/jakarta-mail-2.0.1.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/jakartaee/mail-api/archive/2.0.1.tar.gz --slot 0 --keywords "~amd64" --ebuild jakarta-mail-2.0.1.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" @@ -15,31 +12,22 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Implementation of the Jakarta Mail API" HOMEPAGE="https://github.com/jakartaee/mail-api" SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.gz" +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" -# Common dependencies -# POM: pom.xml -# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2 - CP_DEPEND="dev-java/jakarta-activation:2" -DEPEND=" - >=virtual/jdk-11:* - ${CP_DEPEND} -" +DEPEND="${CP_DEPEND} + >=virtual/jdk-11:*" -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND} -" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" DOCS=( ../{CONTRIBUTING,NOTICE,README}.md ) -S="${WORKDIR}/mail-api-${PV}/mail" - JAVA_ENCODING="iso-8859-1" JAVA_SRC_DIR="src/main/java" @@ -56,15 +44,25 @@ src_prepare() { } src_test() { + # test failure with jdk:21 + # 1) testCheckAccessPresent(com.sun.mail.util.logging.LogManagerPropertiesTest) + # java.lang.UnsupportedOperationException: + # The Security Manager is deprecated and will be removed in a future release + # at java.base/java.lang.System.setSecurityManager(System.java:429) + # at com.sun.mail.util.logging.LogManagerPropertiesTest.testCheckAccessPresent(LogManagerPropertiesTest.java:89) + # https://github.com/jakartaee/mail-api/pull/704#issuecomment-1911924741 + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge 21; then + eapply "${FILESDIR}/jakarta-mail-2.0.1-LogManagerPropertiesTest.patch" + fi pushd src/test/java || die # Selection according to 137,138 pom.xml - # This one does not run because of + # MailHandlerTest does not run because of # "java.io.IOException: Permission denied" # excluding it costs 141 tests. - # 1) com.sun.mail.util.logging.MailHandlerTest local JAVA_TEST_RUN_ONLY=$(find * \ - \( -wholename "**/*TestSuite.java" \ - -o -wholename "**/*Test.java" \) \ + \( -path "**/*TestSuite.java" \ + -o -path "**/*Test.java" \) \ ! -name "MailHandlerTest.java" \ ) JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" diff --git a/dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch b/dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch new file mode 100644 index 000000000000..a94489044d7f --- /dev/null +++ b/dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch @@ -0,0 +1,14 @@ +bug #923606 +--- a/api/src/test/java/javax/xml/soap/test/SAAJFactoryTest.java ++++ b/api/src/test/java/javax/xml/soap/test/SAAJFactoryTest.java +@@ -165,9 +165,7 @@ public class SAAJFactoryTest { + } + + private void enableSM() { +- System.setSecurityManager(null); +- System.setProperty("java.security.policy", classesDir + "javax/xml/soap/test.policy"); +- System.setSecurityManager(new SecurityManager()); ++ // no-op + } + + protected MessageFactory factory() throws Throwable { diff --git a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild index 3186460aa436..fc7c2c78bdec 100644 --- a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild +++ b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.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 @@ -12,6 +12,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="SOAP with Attachments API for Java (SAAJ) API (Eclipse Project for JAX-WS)" HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jaxws" SRC_URI="https://github.com/jakartaee/saaj-api/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/saaj-api-${PV}" # EDL-1.0 equivalent to BSD # - 'SPDX-License-Identifier: BSD-3-Clause' in source files' headers @@ -35,7 +36,9 @@ RDEPEND=" ${CP_DEPEND} " -S="${WORKDIR}/saaj-api-${PV}" +PATCHES=( + "${FILESDIR}/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch" +) JAVA_SRC_DIR="api/src/main/java" @@ -46,7 +49,7 @@ JAVA_TEST_EXTRA_ARGS=( -Xbootclasspath/a:target/classes ) DOCS=( CONTRIBUTING.md NOTICE.md README.md ) -src_install() { - java-pkg-simple_src_install - einstalldocs # https://bugs.gentoo.org/789582 +src_prepare() { + default #780585 + java-pkg-2_src_prepare } diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest index 085e1f137a17..604ff981904b 100644 --- a/dev-java/jakartaee-migration/Manifest +++ b/dev-java/jakartaee-migration/Manifest @@ -1 +1 @@ -DIST jakartaee-migration-1.0.7-sources.tar.gz 43381 BLAKE2B 9a1a6bfd217f77890940240c6c860e21e0b72c758a63426a0c63009213738a9322a758d4525a9a8a8c69883c490edf128d8b70a6120ede431da434c4d1408e19 SHA512 f7edd70b997b2ae2a93b14b93c5b6dcb80de04f554125729f89e62eddaecfbfea21b304226887edb029c8a7b255b50a55a38381d017c7d44859f2e56b912f25a +DIST jakartaee-migration-1.0.8-sources.tar.gz 43466 BLAKE2B f9ffbb46ef6a26c9884e1d3eb55f283556cf8dbaf0955c9efe7e9766f77eadaae1e5bd066225948e9d97adac0f2f34fee3d6ad552bbbdad7303a0abb98d3070c SHA512 ecb1db63cb258b1b8c0e8106ea171e80e66622a48cafa62f8fb75e1b1ba6d539cfefc5dfe0ba9536d06b102c599afeba80d094598d2af3fe1d2ca153ef61ced8 diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild index 4308d151f1bf..4ee56f6fa8ae 100644 --- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild +++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.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 test" -MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.7" +MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.8" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple @@ -12,73 +12,51 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9" HOMEPAGE="https://tomcat.apache.org" SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" +S="${WORKDIR}/${P}" + LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm ~arm64" -# Common dependencies -# POM: pom.xml -# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1 -# org.apache.bcel:bcel:6.6.0 -> >=dev-java/bcel-6.6.0:0 -# org.apache.commons:commons-compress:1.22 -> !!!suitable-mavenVersion-not-found!!! - -CDEPEND=" - dev-java/ant-core:0 +CP_DEPEND=" + >=dev-java/ant-1.10.14-r1:0 dev-java/bcel:0 - dev-java/commons-compress:0 + >=dev-java/commons-compress-1.26.0:0 dev-java/commons-io:1 " -# Compile dependencies -# POM: pom.xml -# org.apache.ant:ant:1.10.12 -> !!!suitable-mavenVersion-not-found!!! -# POM: pom.xml -# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4 - # we need jdk-11 just for some tests as those need stuff from newer jdk, # otherwise the package as of version 1.0.7 compiles fine with jdk 1.8 # with tests disabled # see bug https://bugs.gentoo.org/910499 -DEPEND=" - >=virtual/jdk-11:* - ${CDEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND}" - -S="${WORKDIR}/${P}" +DEPEND="${CP_DEPEND} + >=virtual/jdk-11:*" -JAVA_LAUNCHER_FILENAME="${PN}" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" -JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1" -JAVA_SRC_DIR="src/main/java" JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI" -JAVA_RESOURCE_DIRS=( - "src/main/resources" -) +JAVA_RESOURCE_DIRS="src/main/resources" +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" -) JAVA_TEST_EXCLUDES=( "org.apache.tomcat.jakartaee.TesterConstants" ) +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" src_prepare() { - default + java-pkg-2_src_prepare sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties } src_test() { # we need to create jar files for the tests the same way as it's done using pom.xml local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+") - mkdir -p target/test-classes/META-INF || die - pushd target/test-classes || die + mkdir -p generated-test/META-INF || die + pushd generated-test || die echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die diff --git a/dev-java/jakartaee-migration/metadata.xml b/dev-java/jakartaee-migration/metadata.xml index 6021501589e0..e9aebc513f50 100644 --- a/dev-java/jakartaee-migration/metadata.xml +++ b/dev-java/jakartaee-migration/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> + <maintainer type="project"> + <email>java@gentoo.org</email> + <name>Java</name> + </maintainer> + <upstream> + <remote-id type="github">apache/tomcat-jakartaee-migration</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/jal/jal-20031117-r6.ebuild b/dev-java/jal/jal-20031117-r7.ebuild index d8d008aab7b0..184a2ce24dc7 100644 --- a/dev-java/jal/jal-20031117-r6.ebuild +++ b/dev-java/jal/jal-20031117-r7.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,27 +10,24 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Partial port of the C++ Standard Template Library" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz" +S="${WORKDIR}/${P}" LICENSE="HPND" SLOT="0" KEYWORDS="amd64 x86" -CP_DEPEND="dev-java/ant-core:0" - -RDEPEND=" - ${CP_DEPEND} - >=virtual/jre-1.8:*" - DEPEND=" - ${CP_DEPEND} - >=virtual/jdk-1.8:*" + dev-java/ant:0 + >=virtual/jdk-1.8:* +" -S="${WORKDIR}/${P}" +RDEPEND=">=virtual/jre-1.8:*" +JAVA_CLASSPATH_EXTRA="ant" JAVA_SRC_DIR="src/jal" src_prepare() { - default + java-pkg-2_src_prepare # Generate sources. ./instantiate -n byte bytes || die diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest index 3bcc3e4b9642..fdcffb98710e 100644 --- a/dev-java/java-config/Manifest +++ b/dev-java/java-config/Manifest @@ -1,2 +1,3 @@ DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4 DIST java-config-2.3.3.tar.gz 33837 BLAKE2B dc522a61775272e520521a06c80ac33cbe40010a40051857df8abdbda72cc064969cb00dbf8f7d06efabd352d9cf2c711808205579c7cef73ce4bb7fe2845c8d SHA512 f999ccbdd47f2552913467d3b0c6704fc6511f2bc9d0a6f62d38a9c2e9899f11b239f2039b025f7fdee5e0713d2aaf13c1a9a9baf4f1551bb97d85b12d3f28e9 +DIST java-config-2.3.4.tar.gz 33833 BLAKE2B 36cb628375a05530f515d886d819bc99a7ed233bec2956db3562349ae845be57363a2b6629ab5536be15c5f64387d0760cca7959b76a5685918732ee7bf62300 SHA512 9df42a70aceb400a9fab73668151da783e98e767fa6289c13427095d7a3268bd4bb15de9ef980b82692e7c1cb0eaf5326c19a632679419d78a419294579fb29e diff --git a/dev-java/java-config/java-config-2.3.3-r1.ebuild b/dev-java/java-config/java-config-2.3.3-r1.ebuild index b63dbff8d490..ab1cb1b890e9 100644 --- a/dev-java/java-config/java-config-2.3.3-r1.ebuild +++ b/dev-java/java-config/java-config-2.3.3-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git" else SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="Java environment configuration query tool" diff --git a/dev-java/java-config/java-config-2.3.4.ebuild b/dev-java/java-config/java-config-2.3.4.ebuild new file mode 100644 index 000000000000..90c000f935f3 --- /dev/null +++ b/dev-java/java-config/java-config-2.3.4.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit meson python-r1 + +if [[ ${PV} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git" +else + SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="Java environment configuration query tool" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" + +LICENSE="GPL-2" +SLOT="2" +IUSE="+compat test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )" + +# baselayout-java is added as a dep till it can be added to eclass. +RDEPEND=" + ${PYTHON_DEPS} + sys-apps/baselayout-java + sys-apps/portage[${PYTHON_USEDEP}] +" + +src_configure() { + local python_only=false + python_foreach_impl my_src_configure +} + +my_src_configure() { + local emesonargs=( + -Darch="${ARCH}" + -Dpython-only="${python_only}" + -Deprefix="${EPREFIX}" + ) + + meson_src_configure + python_only=true +} + +src_compile() { + python_foreach_impl meson_src_compile +} + +src_test() { + python_foreach_impl meson_src_test --no-rebuild --verbose +} + +src_install() { + python_foreach_impl my_src_install + + local scripts + mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/bin/* || die) + python_replicate_script "${scripts[@]}" + + if use compat; then + # Symlink java-config-2 to java-config for now. + dosym java-config /usr/bin/java-config-2 + fi +} + +my_src_install() { + meson_src_install + + local pydirs=( + "${D}$(python_get_sitedir)" + ) + python_optimize "${pydirs[@]}" +} diff --git a/dev-java/java-dep-check/java-dep-check-0.5-r2.ebuild b/dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild index 39cd7d500a85..0ab6c71728ef 100644 --- a/dev-java/java-dep-check/java-dep-check-0.5-r2.ebuild +++ b/dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016-2023 Gentoo Authors +# Copyright 2016-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,8 +19,8 @@ RDEPEND=">=virtual/jre-1.8:* ${CP_DEPEND}" DEPEND=">=virtual/jdk-1.8:* ${CP_DEPEND}" +PDEPEND="dev-java/javatoolkit:0" -JAVA_LAUNCHER_FILENAME="${PN}" JAVA_MAIN_CLASS="javadepchecker.Main" src_unpack() { 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 bb67109d452d..eda5f5df35e7 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 @@ -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 x86" RESTRICT="test" #839681 BDEPEND="app-arch/unzip" 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 new file mode 100644 index 000000000000..7d8fc6989375 --- /dev/null +++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple toolchain-funcs + +DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon" +HOMEPAGE="https://wrapper.tanukisoftware.com" +SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar.gz" +S="${WORKDIR}/wrapper_${PV}_src" + +LICENSE="tanuki-community" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +RESTRICT="!test? ( test )" + +RDEPEND=">=virtual/jre-1.8:*" +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/junit:4 + dev-util/cunit + ) +" +BDEPEND=">=dev-java/ant-1.10.14-r3:0" + +JAVA_SRC_DIR="src/java/" +JAVA_JAR_FILENAME="wrapper.jar" +JAVA_TEST_SRC_DIR="src/test" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" + +PATCHES=( + "${FILESDIR}"/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch +) + +src_prepare() { + default #780585 + + # replaces as-needed.patch + sed -i \ + -e 's/gcc -O3/$(CC)/g' \ + -e 's/ -pthread/ $(CFLAGS) $(LDFLAGS) -pthread/g' \ + -e 's/ -shared/ $(LDFLAGS) -shared/g' \ + -e 's/$(TEST)\/testsuite/testsuite/g' \ + src/c/Makefile-*.make || die + + cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make" + java-pkg-2_src_prepare + + # disable tests by default (they are only enabled by default on amd64) + sed -e "s/\(all: init wrapper libwrapper.so\) testsuite/\1/g" \ + -i src/c/Makefile-linux-x86-64.make || die + + # re-enable tests on all platforms if requested + if use test; then + grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make + assert + echo 'all: testsuite' | tee -a src/c/Makefile-*.make + assert + fi +} + +src_compile() { + tc-export CC + + pushd "${T}" || die + echo 'public class GetArchDataModel{public static void main(String[] args){System.out.println(System.getProperty("sun.arch.data.model"));}}' \ + > GetArchDataModel.java || die + ejavac GetArchDataModel.java + local BITS + BITS="$(java GetArchDataModel)" || die "Failed to identify sun.arch.data.model property" + popd || die + eant -Dbits="${BITS}" compile-c + + java-pkg-simple_src_compile +} + +src_test() { + src/c/testsuite --basic || die + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install + java-pkg_doso lib/libwrapper.so + + dobin bin/wrapper + dodoc README*.txt + dodoc doc/revisions.txt +} diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest index b126cef8bf5a..aea384cd1646 100644 --- a/dev-java/javacc/Manifest +++ b/dev-java/javacc/Manifest @@ -1 +1,3 @@ -DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6 +DIST javacc-4.1.tar.gz 769476 BLAKE2B c2a22fa78ff4dcf1e36221a23ca1e3cd1eecb473a59ea94ce52e298673f6bd18c0ea0cf757dd68885696ebc8cc724d271c69c923a21ffa433d03c1062b1201ee SHA512 911e5e9f062561ade1748dcef3596e0f25c399c4d52dd174773783dadf24a4ceea8d3feab9ab08880370677959051d8557aed815d4c4184f5ecd5789ee8a5754 +DIST javacc-7.0.13.tar.gz 3199783 BLAKE2B 7e3dddbe53a6e417a31bb7386d154c0e9589f17f88e652f5e146a4e344d72cd948d4d8e55fab753bb983e5d31971efc948c1ecdca4e875031bea3f8a38bfc082 SHA512 ed71e47fc4a382c9c53067bbf73bd9736ee0c41d65e328d5e4843cd71c88d3b7715d7a8fe38f10152ef7ef3be064abf9e801c6ea78066c4fcbabf124dfc4e144 +DIST javacc-7.0.4.tar.gz 2842349 BLAKE2B e5a2e24c99e5e3883270cf0e3931d7667e5b5b49a11c1d9b79b98767f74f4addf2dc7d3d620550bc1b5bb0bfbef8bf07af48a40d250d0902d97c8215f6cb8e01 SHA512 b93c93e8490aae9a26b0de948896ec6d7a044c205d09584c3908988e24a3ea63a1147365115b17a15c6fb311c44f53ddff7c11f092731cbd05d3ec1950ef57f1 diff --git a/dev-java/javacc/files/javacc-4.1-javadoc.patch b/dev-java/javacc/files/javacc-4.1-javadoc.patch new file mode 100644 index 000000000000..134aaa35abc9 --- /dev/null +++ b/dev-java/javacc/files/javacc-4.1-javadoc.patch @@ -0,0 +1,16 @@ +--- a/build.xml ++++ b/build.xml +@@ -150,5 +150,13 @@ + <arg line="${version}" /> + </exec> + </target> ++ <target name="javadoc" depends="compile"> ++ <javadoc destdir="doc/api" source="8"> ++ <packageset dir="src"/> ++ <classpath> ++ <pathelement path="lib/junit3.8.1/junit.jar" /> ++ </classpath> ++ </javadoc> ++ </target> + + </project> diff --git a/dev-java/javacc/files/javacc-4.1-source8.patch b/dev-java/javacc/files/javacc-4.1-source8.patch new file mode 100644 index 000000000000..6dfc3e47382d --- /dev/null +++ b/dev-java/javacc/files/javacc-4.1-source8.patch @@ -0,0 +1,134 @@ +--- a/build.xml ++++ b/build.xml +@@ -112,6 +112,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <junit printsummary="yes" haltonfailure="yes"> + <classpath> + <pathelement path="classes" /> ++ <pathelement path="lib/junit3.8.1/junit.jar" /> + </classpath> + <batchtest fork="no" todir="."> + <fileset dir="classes"> +--- a/src/org/javacc/jjdoc/build.xml ++++ b/src/org/javacc/jjdoc/build.xml +@@ -46,7 +46,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + <javac srcdir="${javacc.root}/src" + destdir="${javacc.root}/classes" + debug="${build.compiler.debug}" +- source="1.4" ++ source="8" ++ target="8" + classpath="${javacc.root}/classes"> + </javac> + </target> +--- a/src/org/javacc/jjtree/build.xml ++++ b/src/org/javacc/jjtree/build.xml +@@ -54,7 +54,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + <javac srcdir="${javacc.root}/src" + destdir="${javacc.root}/classes" + debug="${build.compiler.debug}" +- source="1.4" ++ source="8" ++ target="8" + classpath="${javacc.root}/classes"> + </javac> + </target> +--- a/src/org/javacc/parser/build.xml ++++ b/src/org/javacc/parser/build.xml +@@ -52,7 +52,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + <javac srcdir="${javacc.root}/src" + destdir="${javacc.root}/classes" + debug="${build.compiler.debug}" +- source="1.4" ++ source="8" ++ target="8" + classpath="${javacc.root}/classes:${junit.jar}"> + </javac> + </target> +--- a/test/imports/build.xml ++++ b/test/imports/build.xml +@@ -41,7 +41,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> +--- a/test/javaFiles/build.xml ++++ b/test/javaFiles/build.xml +@@ -52,7 +52,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir/static" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> +@@ -74,7 +75,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir/non-static" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> +@@ -99,7 +101,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir/non-static" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> +@@ -126,7 +129,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir/non-static" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> +@@ -152,7 +156,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir/non-static" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> +--- a/test/javacodeLA/build.xml ++++ b/test/javacodeLA/build.xml +@@ -40,7 +40,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> +--- a/test/lom/build.xml ++++ b/test/lom/build.xml +@@ -40,7 +40,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + <javac srcdir="out-dir" + destdir="out-dir" +- source="1.4" ++ source="8" ++ target="8" + debug="true" + classpath="../../bin/lib/javacc.jar"> + </javac> diff --git a/dev-java/javacc/files/javacc-7.0.13-javadoc.patch b/dev-java/javacc/files/javacc-7.0.13-javadoc.patch new file mode 100644 index 000000000000..2849ced4340f --- /dev/null +++ b/dev-java/javacc/files/javacc-7.0.13-javadoc.patch @@ -0,0 +1,14 @@ +diff --git a/build.xml b/build.xml +index bddc709..52f3626 100644 +--- a/build.xml ++++ b/build.xml +@@ -202,9 +202,6 @@ THE POSSIBILITY OF SUCH DAMAGE. + <fileset dir="${java-src}" /> + </javadoc> + +- <zip destfile="${install-name}-javadoc.jar" basedir="${target-folder}/javadoc"> +- </zip> +- + </target> + + diff --git a/dev-java/javacc/files/javacc-7.0.13-source8.patch b/dev-java/javacc/files/javacc-7.0.13-source8.patch new file mode 100644 index 000000000000..544da8197eca --- /dev/null +++ b/dev-java/javacc/files/javacc-7.0.13-source8.patch @@ -0,0 +1,100 @@ +--- a/test/exceptions/build.xml ++++ b/test/exceptions/build.xml +@@ -40,7 +40,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + +@@ -83,7 +83,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.7" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" includeantruntime='false' + debug="true" + classpath="../../target/javacc.jar"> + </javac> +--- a/test/imports/build.xml ++++ b/test/imports/build.xml +@@ -39,7 +39,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + +--- a/test/javaFiles/build.xml ++++ b/test/javaFiles/build.xml +@@ -50,7 +50,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </condition> + </fail> + +- <javac srcdir="out-dir" destdir="out-dir/static" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java fork="true" classname="Parser" classpath="out-dir/static" inputstring="A" failonerror="true"> </java> +@@ -69,7 +69,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </condition> + </fail> + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +@@ -91,7 +91,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </condition> + </fail> + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +@@ -115,7 +115,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </fail> + + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +@@ -138,7 +138,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </fail> + + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +--- a/test/javacodeLA/build.xml ++++ b/test/javacodeLA/build.xml +@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="javacode.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + +--- a/test/lom/build.xml ++++ b/test/lom/build.xml +@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + diff --git a/dev-java/javacc/files/javacc-7.0.4-javadoc.patch b/dev-java/javacc/files/javacc-7.0.4-javadoc.patch new file mode 100644 index 000000000000..57699b5249d5 --- /dev/null +++ b/dev-java/javacc/files/javacc-7.0.4-javadoc.patch @@ -0,0 +1,12 @@ +--- a/build.xml ++++ b/build.xml +@@ -201,9 +201,6 @@ THE POSSIBILITY OF SUCH DAMAGE. + <fileset dir="${generated-src}" /> + <fileset dir="${java-src}" /> + </javadoc> +- +- <zip destfile="${install-name}-javadoc.jar" basedir="${target-folder}/javadoc"> +- </zip> + </target> + + <target name="unittest" depends="jar" description="run JUnit unit test cases" unless="true"> diff --git a/dev-java/javacc/files/javacc-7.0.4-source8.patch b/dev-java/javacc/files/javacc-7.0.4-source8.patch new file mode 100644 index 000000000000..620b1c03f78b --- /dev/null +++ b/dev-java/javacc/files/javacc-7.0.4-source8.patch @@ -0,0 +1,100 @@ +--- a/test/exceptions/build.xml ++++ b/test/exceptions/build.xml +@@ -40,7 +40,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + +@@ -83,7 +83,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.5" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" includeantruntime='false' + debug="true" + classpath="../../target/javacc.jar"> + </javac> +--- a/test/imports/build.xml ++++ b/test/imports/build.xml +@@ -39,7 +39,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + +--- a/test/javaFiles/build.xml ++++ b/test/javaFiles/build.xml +@@ -50,7 +50,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </condition> + </fail> + +- <javac srcdir="out-dir" destdir="out-dir/static" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java classname="Parser" classpath="out-dir/static" inputstring="A" failonerror="true"> </java> +@@ -69,7 +69,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </condition> + </fail> + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +@@ -91,7 +91,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </condition> + </fail> + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +@@ -115,7 +115,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </fail> + + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +@@ -138,7 +138,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + </fail> + + +- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java> +--- a/test/javacodeLA/build.xml ++++ b/test/javacodeLA/build.xml +@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="javacode.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + +--- a/test/lom/build.xml ++++ b/test/lom/build.xml +@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE. + <arg line="Parser.jj" /> + </java> + +- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false' ++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false' + classpath="../../target/javacc.jar"> + </javac> + diff --git a/dev-java/javacc/javacc-4.1-r1.ebuild b/dev-java/javacc/javacc-4.1-r1.ebuild new file mode 100644 index 000000000000..ba73aa439119 --- /dev/null +++ b/dev-java/javacc/javacc-4.1-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc examples source test" +MAVEN_ID="net.java.dev.javacc:javacc:${PV}" + +inherit java-pkg-2 + +DESCRIPTION="Java Compiler Compiler - The Java Parser Generator" +HOMEPAGE="https://javacc.github.io/javacc/" +SRC_URI="https://github.com/javacc/javacc/archive/release_${PV//./}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/javacc-release_${PV//./}" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +BDEPEND=">=dev-java/ant-1.10.14:0" + +DEPEND=" + dev-java/junit:0 + >=virtual/jdk-1.8:* + test? ( >=dev-java/ant-1.10.14:0[junit] ) +" +RDEPEND=">=virtual/jre-1.8:*" + +PATCHES=( + "${FILESDIR}/${PN}-4.1-javadoc.patch" + "${FILESDIR}/javacc-4.1-source8.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean ! -path "./bootstrap/*" + java-pkg_jar-from --build-only --into lib/junit3.8.1 junit +} + +src_compile() { + eant + use doc && eant javadoc +} + +src_test() { + eant test +} + +src_install() { + java-pkg_dojar bin/lib/"${PN}".jar + + if use doc; then + java-pkg_dohtml -r www/* + java-pkg_dojavadoc doc/api + fi + + use examples && java-pkg_doexamples examples + use source && java-pkg_dosrc src/* + + echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die + doenvd "${T}"/22javacc-${SLOT} + + echo "export VERSION=${PV}" > "${T}"/pre || die + + local launcher + for launcher in javacc jjdoc jjtree; do + java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher} + done + + einstalldocs +} diff --git a/dev-java/javacc/javacc-5.0-r4.ebuild b/dev-java/javacc/javacc-4.1.ebuild index f63c12eccf55..f74f36d4eb2f 100644 --- a/dev-java/javacc/javacc-5.0-r4.ebuild +++ b/dev-java/javacc/javacc-4.1.ebuild @@ -1,47 +1,40 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc examples source test" +MAVAN_ID="net.java.dev.javacc:javacc:${PV}" inherit java-pkg-2 java-ant-2 DESCRIPTION="Java Compiler Compiler - The Java Parser Generator" HOMEPAGE="https://javacc.github.io/javacc/" -SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz" +SRC_URI="https://github.com/javacc/javacc/archive/release_${PV//./}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/javacc-release_${PV//./}" -LICENSE="BSD" +LICENSE="BSD-2" SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +CP_DEPEND="dev-java/junit:0" -CDEPEND="dev-java/junit:0" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -DEPEND=" - ${CDEPEND} +DEPEND="${CP_DEPEND} >=virtual/jdk-1.8:* - test? ( dev-java/ant-junit:0 )" - -S="${WORKDIR}/${PN}" + test? ( >=dev-java/ant-1.10.14:0[junit] )" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" PATCHES=( "${FILESDIR}"/${PN}-4.0-javadoc.patch ) -JAVA_ANT_REWRITE_CLASSPATH="yes" JAVA_ANT_CLASSPATH_TAGS+=" javadoc" - -EANT_GENTOO_CLASSPATH="junit" +JAVA_ANT_REWRITE_CLASSPATH="yes" src_prepare() { - default - - rm -v lib/junit*/*.jar || die + java-pkg-2_src_prepare + java-pkg_clean ! -path "./bootstrap/*" } src_test() { @@ -49,18 +42,18 @@ src_test() { } src_install() { - java-pkg_dojar "bin/lib/${PN}.jar" + java-pkg_dojar bin/lib/"${PN}".jar if use doc; then java-pkg_dohtml -r www/* - java-pkg_dojavadoc doc/api + java-pkg_dojavadoc target/javadoc fi use examples && java-pkg_doexamples examples use source && java-pkg_dosrc src/* - echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc || die - doenvd "${T}"/22javacc + echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die + doenvd "${T}"/22javacc-${SLOT} echo "export VERSION=${PV}" > "${T}"/pre || die diff --git a/dev-java/javacc/javacc-7.0.13-r1.ebuild b/dev-java/javacc/javacc-7.0.13-r1.ebuild new file mode 100644 index 000000000000..83edc96db3e2 --- /dev/null +++ b/dev-java/javacc/javacc-7.0.13-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc examples source test" +MAVEN_ID="net.java.dev.javacc:javacc:${PV}" + +inherit java-pkg-2 + +DESCRIPTION="Java Compiler Compiler - The Java Parser Generator" +HOMEPAGE="https://javacc.github.io/javacc/" +SRC_URI="https://github.com/javacc/javacc/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="BSD-2" +SLOT="7.0.13" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +BDEPEND=">=dev-java/ant-1.10.14:0[junit]" +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( + README.md + docs/faq.md + docs/release-notes.md +) + +PATCHES=( + "${FILESDIR}/javacc-7.0.13-javadoc.patch" + "${FILESDIR}/javacc-7.0.13-source8.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean ! -path "./bootstrap/*" +} + +src_compile() { + eant -Dant.build.javac.source="8" -Dant.build.javac.target="8" + use doc && eant javadoc -Dant.build.javac.source="8" -Dant.build.javac.target="8" +} + +src_test() { + eant test -Dant.build.javac.source="8" -Dant.build.javac.target="8" +} + +src_install() { + java-pkg_dojar "target/${PN}.jar" + + use doc && java-pkg_dojavadoc target/javadoc + + use examples && java-pkg_doexamples examples + use source && java-pkg_dosrc src/* + + echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die + doenvd "${T}"/22javacc-${SLOT} + + echo "export VERSION=${PV}" > "${T}"/pre || die + + local launcher + for launcher in javacc jjdoc jjtree; do + java-pkg_dolauncher ${launcher}-${SLOT} -pre "${T}"/pre --main ${launcher} + done + + einstalldocs +} diff --git a/dev-java/javacc/javacc-7.0.13.ebuild b/dev-java/javacc/javacc-7.0.13.ebuild new file mode 100644 index 000000000000..3a111cb197bb --- /dev/null +++ b/dev-java/javacc/javacc-7.0.13.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 examples source test" +MAVAN_ID="net.java.dev.javacc:javacc:${PV}" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Java Compiler Compiler - The Java Parser Generator" +HOMEPAGE="https://javacc.github.io/javacc/" +SRC_URI="https://github.com/javacc/javacc/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="BSD-2" +SLOT="7.0.13" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( >=dev-java/ant-1.10.14:0[junit] )" + +RDEPEND=">=virtual/jre-1.8:*" + +src_prepare() { + java-pkg-2_src_prepare + java-pkg_clean ! -path "./bootstrap/*" +} + +src_test() { + java-pkg-2_src_test +} + +src_install() { + java-pkg_dojar "target/${PN}.jar" + + use doc && java-pkg_dojavadoc target/javadoc + + use examples && java-pkg_doexamples examples + use source && java-pkg_dosrc src/* + + echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die + doenvd "${T}"/22javacc-${SLOT} + + echo "export VERSION=${PV}" > "${T}"/pre || die + + local launcher + for launcher in javacc jjdoc jjtree; do + java-pkg_dolauncher ${launcher}-${SLOT} -pre "${T}"/pre --main ${launcher} + done + + einstalldocs +} diff --git a/dev-java/javacc/javacc-7.0.4-r1.ebuild b/dev-java/javacc/javacc-7.0.4-r1.ebuild new file mode 100644 index 000000000000..41b912eee734 --- /dev/null +++ b/dev-java/javacc/javacc-7.0.4-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc examples source test" +MAVEN_ID="net.java.dev.javacc:javacc:${PV}" + +inherit java-pkg-2 + +DESCRIPTION="Java Compiler Compiler - The Java Parser Generator" +HOMEPAGE="https://javacc.github.io/javacc/" +SRC_URI="https://github.com/javacc/javacc/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="7.0.4" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +BDEPEND=">=dev-java/ant-1.10.14-r3:0" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( >=dev-java/ant-1.10.14:0[junit] )" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( + README + javacc-releases.notes + jjdoc-releases.notes + jjtree-releases.notes + release.notes +) + +PATCHES=( + "${FILESDIR}/javacc-7.0.4-javadoc.patch" + "${FILESDIR}/javacc-7.0.4-source8.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean ! -path "./bootstrap/*" +} + +src_compile() { + eant -Dant.build.javac.source="8" -Dant.build.javac.target="8" + use doc && eant javadoc -Dant.build.javac.source="8" -Dant.build.javac.target="8" +} + +src_test() { + eant test -Dant.build.javac.source="8" -Dant.build.javac.target="8" +} + +src_install() { + java-pkg_dojar "target/${PN}.jar" + + if use doc; then + java-pkg_dohtml -r www/* + java-pkg_dojavadoc target/javadoc + fi + + use examples && java-pkg_doexamples examples + use source && java-pkg_dosrc src/* + + echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die + doenvd "${T}"/22javacc-${SLOT} + + echo "export VERSION=${PV}" > "${T}"/pre || die + + local launcher + for launcher in javacc jjdoc jjtree; do + java-pkg_dolauncher ${launcher}-${SLOT} -pre "${T}"/pre --main ${launcher} + done + + einstalldocs +} diff --git a/dev-java/javacc/javacc-7.0.4.ebuild b/dev-java/javacc/javacc-7.0.4.ebuild new file mode 100644 index 000000000000..58d0ccdccbcb --- /dev/null +++ b/dev-java/javacc/javacc-7.0.4.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc examples source test" +MAVAN_ID="net.java.dev.javacc:javacc:${PV}" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Java Compiler Compiler - The Java Parser Generator" +HOMEPAGE="https://javacc.github.io/javacc/" +SRC_URI="https://github.com/javacc/javacc/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="7.0.4" +KEYWORDS="amd64 ~arm ~arm64 ~x86" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( >=dev-java/ant-1.10.14:0[junit] )" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( + README + javacc-releases.notes + jjdoc-releases.notes + jjtree-releases.notes + release.notes +) + +JAVA_ANT_REWRITE_CLASSPATH="yes" + +src_prepare() { + java-pkg-2_src_prepare + java-pkg_clean ! -path "./bootstrap/*" +} + +src_test() { + java-pkg-2_src_test +} + +src_install() { + java-pkg_dojar "target/${PN}.jar" + + if use doc; then + java-pkg_dohtml -r www/* + java-pkg_dojavadoc target/javadoc + fi + + use examples && java-pkg_doexamples examples + use source && java-pkg_dosrc src/* + + echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die + doenvd "${T}"/22javacc-${SLOT} + + echo "export VERSION=${PV}" > "${T}"/pre || die + + local launcher + for launcher in javacc jjdoc jjtree; do + java-pkg_dolauncher ${launcher}-${SLOT} -pre "${T}"/pre --main ${launcher} + done + + einstalldocs +} diff --git a/dev-java/javacc/metadata.xml b/dev-java/javacc/metadata.xml index 6021501589e0..ceba116c02a9 100644 --- a/dev-java/javacc/metadata.xml +++ b/dev-java/javacc/metadata.xml @@ -5,4 +5,7 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> +<upstream> + <remote-id type="github">javacc/javacc</remote-id> +</upstream> </pkgmetadata> diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest index e86cdb7e2e96..5bb555f43821 100644 --- a/dev-java/javacup/Manifest +++ b/dev-java/javacup/Manifest @@ -1 +1,2 @@ DIST java-cup-src-11b-20151001.tar.gz 313405 BLAKE2B 126944916d120dd2150e4a665fea6d216f3d55e002a72b581621df726e4bf0e0664f9ff925189c97162582277c08a4f121e056299ea5a3f5c10cc31d7c0feb9c SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e +DIST java-cup-src-11b-20160615.tar.gz 313847 BLAKE2B 0031cdb73471512162f69fff6ed47e91d78769c5162f37d4fdcef1c4b4be17ec9e950eda973a8842ae95423840be6c43a335180584b81c4618ea43cbfa926972 SHA512 532a8169f8e1ed2c637c66e7e21cc90eea363732870fbf4e3d66acbff03de3ba0583cefb7b4e7b8f8cb0c9bf1ca92dd5a59111860612bc7544e8beab87f5fbda diff --git a/dev-java/javacup/javacup-11b_p20160615.ebuild b/dev-java/javacup/javacup-11b_p20160615.ebuild new file mode 100644 index 000000000000..cc3c6e0d7637 --- /dev/null +++ b/dev-java/javacup/javacup-11b_p20160615.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="CUP Parser Generator for Java" +HOMEPAGE="https://www2.cs.tum.edu/projects/cup/" +SRC_URI="https://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${PV/_p/-}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="ant-task" + +DEPEND="${CP_DEPEND} + >=dev-java/jflex-1.6.1-r3:0 + >=virtual/jdk-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 )" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 )" + +DOCS=( changelog.txt ) +HTML_DOCS=( manual.html ) + +JAVA_MAIN_CLASS="java_cup/Main" +JAVA_SRC_DIR=( "src" "java" ) + +src_prepare() { + java-pkg-2_src_prepare + if use ant-task; then + JAVA_GENTOO_CLASSPATH+="ant" + else + rm src/java_cup/anttask/CUPTask.java || die + fi +} + +src_compile() { + if has_version \>=${CATEGORY}/${PN}-11b:${SLOT}; then + einfo "Get path of installed JAVACUP" + CP_CUP="$(java-pkg_getjar --build-only javacup javacup.jar)" + else + einfo "Get path of bundled JAVACUP" + CP_CUP="$(echo bin/java-cup-*.jar)" + fi + einfo "Path to JAVACUP is ${CP_CUP}" + + einfo "Get path to jflex" + CP_FLEX="$(java-pkg_getjars --build-only jflex)" + einfo "Path to jflex is ${CP_FLEX}" + + einfo "Generate parser with: ${CP_CUP}" + "$(java-config -J)" -jar "${CP_CUP}" \ + -interface -destdir "java" -parser "parser" -symbols "sym" \ + cup/parser.cup || die + + einfo "Generate lexer" + # https://jflex.de/manual.html#running-jflex + $(java-config -J) -cp "${CP_CUP}:${CP_FLEX}" jflex.Main \ + flex/Lexer.jflex -d java/javacup || die + + einfo "Build intermediate jar" + JAVA_JAR_FILENAME="seco.jar" + java-pkg-simple_src_compile + + einfo "Remove classes and generated code" + rm -rv java/* target/classes/ || die + + einfo "Regenerate parser with intermediate jar file" + "$(java-config -J)" -jar ./seco.jar \ + -interface -destdir "java" -parser "parser" -symbols "sym" \ + cup/parser.cup || die + + einfo "Regenerate lexer with intermediate jar file" + $(java-config -J) -cp "$(echo ./seco.jar):${CP_FLEX}" jflex.Main \ + flex/Lexer.jflex -d java/javacup || die + + einfo "Build final jar with regenerated parser and lexer" + JAVA_JAR_FILENAME="${PN}.jar" + java-pkg-simple_src_compile + "$(java-config --jar)" cvf "${PN}-runtime.jar" -C target/classes java_cup/runtime || die +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dojar "${PN}.jar" "${PN}-runtime.jar" + use ant-task && java-pkg_register-ant-task +} diff --git a/dev-java/javacup/metadata.xml b/dev-java/javacup/metadata.xml index 4221e170cbc0..565315fe27ec 100644 --- a/dev-java/javacup/metadata.xml +++ b/dev-java/javacup/metadata.xml @@ -5,4 +5,10 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> + <upstream> + <remote-id type="github">ultimate-pa/javacup</remote-id> + </upstream> + <use> + <flag name="ant-task">Build and register the ant-task</flag> + </use> </pkgmetadata> diff --git a/dev-java/javaparser-core/Manifest b/dev-java/javaparser-core/Manifest new file mode 100644 index 000000000000..44d5620a8988 --- /dev/null +++ b/dev-java/javaparser-core/Manifest @@ -0,0 +1 @@ +DIST javaparser-3.13.10.tar.gz 7043664 BLAKE2B 5d2e35cfa22dbcb425365e2e7806c46b989b92a84472fbd80d42716fbb2a5ddcad2daec6214be689b1dcc6541890527e422953c083e713e9f1d22ce5b3035e90 SHA512 b90a6b7b2fbb6a13cc36cdd17acd09a22adb9e62311862c2a67a9ea339b98e245c93ba371645e3c695e76966b21e3bc01accf040482e30b2b6882a5569db5806 diff --git a/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild b/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild new file mode 100644 index 000000000000..3f8887785b01 --- /dev/null +++ b/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild @@ -0,0 +1,45 @@ +# 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.javaparser:javaparser-core:3.13.10" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java 1-17 Parser and Abstract Syntax Tree for Java" +HOMEPAGE="https://javaparser.org/" +SRC_URI="https://github.com/javaparser/javaparser/archive/v${PV}.tar.gz -> javaparser-${PV}.tar.gz" +S="${WORKDIR}/javaparser-${PV}" + +LICENSE="Apache-2.0 LGPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~x86" + +JAVACC_SLOT="7.0.4" + +BDEPEND="dev-java/javacc:7.0.4" +# Does not compile with Java 21 +DEPEND="<=virtual/jdk-17:*" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( CONTRIBUTING.md changelog.md readme.md ) + +JAVA_AUTOMATIC_MODULE_NAME="com.github.javaparser.core" +JAVA_SRC_DIR=( + "${PN}/src/main/java" + "${PN}/src/main/java-templates" + "${PN}/src/main/javacc-support" +) + +src_prepare() { + java-pkg-2_src_prepare + + mkdir -p "${PN}/src/main/java/com/github/javaparser" + javacc-${JAVACC_SLOT} -GRAMMAR_ENCODING=UTF-8 \ + -JDK_VERSION=1.8 \ + -OUTPUT_DIRECTORY="${PN}/src/main/java/com/github/javaparser" \ + "javaparser-core/src/main/javacc/java.jj" \ + || die "Code generation with java.jj failed" +} diff --git a/dev-java/javaparser-core/metadata.xml b/dev-java/javaparser-core/metadata.xml new file mode 100644 index 000000000000..297067f408d2 --- /dev/null +++ b/dev-java/javaparser-core/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">javaparser/javaparser</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild index e0d6e70346ee..c1e3431b5381 100644 --- a/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild +++ b/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="xml(+)" DISTUTILS_USE_SETUPTOOLS=no @@ -17,6 +17,8 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + python_prepare_all() { hprefixify src/py/buildparser src/py/findclass setup.py distutils-r1_python_prepare_all diff --git a/dev-java/javax-inject/metadata.xml b/dev-java/javax-inject/metadata.xml index 6ef2d50cf07e..72c0c8eb4e70 100644 --- a/dev-java/javax-inject/metadata.xml +++ b/dev-java/javax-inject/metadata.xml @@ -5,4 +5,7 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> + <upstream> + <remote-id type="github">javax-inject/javax-inject</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/javax-mail/Manifest b/dev-java/javax-mail/Manifest index 25170c74c15f..35dd8eaf5b5a 100644 --- a/dev-java/javax-mail/Manifest +++ b/dev-java/javax-mail/Manifest @@ -1 +1,2 @@ -DIST javax-mail-1.6.7.tar.gz 1854297 BLAKE2B 70dac40cdf67c413db3370f9cdf5b9786fcebce4ba12725758bf6120a2b6874e079a5beef08ee1190e30bfe2f14ad21e73ef1710c982e3f658a2f2f11e524f2e SHA512 9e8754839efb43d14ade6189428c4b86f5fc180e2e18b4e121a9463aaa52c34a431dbf05a6264ef8221faf0b09cc08f914ff758cbb3931df97cea1a897c54c08 +DIST javax-mail-1.6.7-java21.patch 108038 BLAKE2B 41dd770dc9de5b17d9a4b4a427f31fd3158d45420a3bf1b7949075f1c65103c4093d945e224d70fec66045c314d41aca721b8a7667b6c839fd3f1c3d448c00a4 SHA512 f6f777f7a158114707196321f4480c98bd04ab9a807cbc65a6166bbb55dd9e33853ec4074a5fd23540a1d70629368f1e187e9e839c2bd775ad6d309b4d59fca7 +DIST javax-mail-1.6.7.tar.gz 1854403 BLAKE2B b6681995202c5fd9ed978314d79a6e3c6ee0edeecbbcdb147b94e1f789f7706e090342df8e6491dc23a67d9b3b2b12150cdd0c8ab17a120d1bc0dd4e153be846 SHA512 eb9d1bf863ef2404bdcfde4d9c23089e8d6f76c3f8fd2fc817dd365811636d23d57a60e6991e0349842b1f29b5a1b36b3af78533077858fd2d4550560d2e2d8c diff --git a/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild b/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild index cb0feeaf01ef..f19bd8c2717b 100644 --- a/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild +++ b/dev-java/javax-mail/javax-mail-1.6.7-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 @@ -11,45 +11,42 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Jakarta Mail API" HOMEPAGE="https://jakartaee.github.io/mail-api/" -SRC_URI="https://github.com/jakartaee/mail-api/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/mail-${PV}/mail" +SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/jakartaee/mail-api/commit/86ee859eb1.patch -> ${P}-java21.patch" +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" -CDEPEND=" - dev-java/jakarta-activation:1 -" - DEPEND=" + dev-java/jakarta-activation:1 >=virtual/jdk-11:* - ${CDEPEND} " -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND}" +RDEPEND=">=virtual/jre-1.8:*" -DOCS=( ../{NOTICE,README}.md ) +DOCS=( {NOTICE,README}.md ) +PATCHES=( "${DISTDIR}/javax-mail-1.6.7-java21.patch" ) #917068 src_prepare() { + default #780585 java-pkg-2_src_prepare - mv src/main/{resources,java}/javax/mail/Version.java || die + mv mail/src/main/{resources,java}/javax/mail/Version.java || die } +JAVA_CLASSPATH_EXTRA="jakarta-activation-1" JAVA_ENCODING="iso-8859-1" -JAVA_GENTOO_CLASSPATH="jakarta-activation-1" -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_SRC_DIR="src/main/java" +JAVA_RESOURCE_DIRS="mail/src/main/resources" +JAVA_SRC_DIR="mail/src/main/java" JAVA_TEST_EXTRA_ARGS=( -ea ) JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="mail/src/test/resources" +JAVA_TEST_SRC_DIR="mail/src/test/java" src_test() { - pushd src/test/java || die + pushd mail/src/test/java || die # Selection according to 137,138 pom.xml # 1) com.sun.mail.util.logging.MailHandlerTest # java.io.IOException: Permission denied @@ -60,6 +57,5 @@ src_test() { JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" popd - java-pkg-simple_src_test } diff --git a/dev-java/javax-persistence-api/javax-persistence-api-2.2.ebuild b/dev-java/javax-persistence-api/javax-persistence-api-2.2-r1.ebuild index 9350a857e77e..6526ed970920 100644 --- a/dev-java/javax-persistence-api/javax-persistence-api-2.2.ebuild +++ b/dev-java/javax-persistence-api/javax-persistence-api-2.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ DESCRIPTION="Persistence API" HOMEPAGE="https://www.jcp.org/en/jsr/detail?id=220" SRC_URI="https://repo1.maven.org/maven2/javax/persistence/${PN/-/.}/${PV}/${PN/-/.}-${PV}-sources.jar" -LICENSE="CDDL" +LICENSE="EPL-1.0 BSD" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" diff --git a/dev-java/jaxb-api/Manifest b/dev-java/jaxb-api/Manifest index d20a942ff296..26a0e66387da 100644 --- a/dev-java/jaxb-api/Manifest +++ b/dev-java/jaxb-api/Manifest @@ -1,3 +1,3 @@ DIST jaxb-api-2.3.3.tar.gz 193025 BLAKE2B 1cf4461fdc67cc05ee43e880c254290b9dbe8a40b1dc39444d8fb6656698876a4bb16c679ee551ec7baa95c07eaf83e2fe5638a71eafbb158805c14c38888cb8 SHA512 37d6705fc1563f0d35a215e2f176473ee5e817a4a3017afe22042a4235c86b8556ea1fb23210d07ca7ea3cd1e0a3271daa4be8c9652cfe92ce2898f1381de3bf DIST jaxb-api-3.0.1.tar.gz 420695 BLAKE2B 70da435e75f6fcb155d57ee20659897d7d1a72dc38e77f0348eaa767b56e2c5fbb7df88c3b0c794cfc7eaad3d839550a197288dab59520a63562f083388764c0 SHA512 16d62a1fd6045a57f1d215227ce75860340c286eb0986b1086a0312dbc8ca8119b25533c42fe54f367231ec1c34795fec6a9355417f71ce826ee28d5fb6cf9fe -DIST jaxb-api-4.0.0.tar.gz 543827 BLAKE2B 12a113126290fdf46270d2713d88836e8f5d01059127747a343816a10deb45ecc8c8dc8cf2cf7e2b71754977900645d4fef6e08fa8c47f583945fea34bc62357 SHA512 eb4eab396b894ab801433e0e31f93a4980f3913176a1960591a69e4fd55f10f316a7edb712df323c59f7dc9ca6cebacb7257be06aec72446059dd8b93c6de175 +DIST jaxb-api-4.0.2.tar.gz 544391 BLAKE2B fc143248645eb7ea5e17724531c3b6bd902d8c787c735abf16a97259850386d330de67b96837fcbb2be74182e0abbca585e4d6766dd4efffc31b73cb6040e336 SHA512 9fa4cb55a2771011d372fee670672062a12d9eb12aeb3a250ec86cc7814d9ea9fe80aca01039b37f96d5997b15938b2371d8fa323a132caf3be1093e76db1869 diff --git a/dev-java/jaxb-api/files/jaxb-api-2.3.3-dropSecurityManager.patch b/dev-java/jaxb-api/files/jaxb-api-2.3.3-dropSecurityManager.patch new file mode 100644 index 000000000000..36fed49987b4 --- /dev/null +++ b/dev-java/jaxb-api/files/jaxb-api-2.3.3-dropSecurityManager.patch @@ -0,0 +1,10 @@ +--- a/jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextTest.java ++++ b/jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextTest.java +@@ -265,7 +265,6 @@ public class JAXBContextTest { + private void enableSM() { + System.setSecurityManager(null); + System.setProperty("java.security.policy", classesDir + "javax/xml/bind/test.policy"); +- System.setSecurityManager(new SecurityManager()); + } + + private void cleanResource(Path resource) { diff --git a/dev-java/jaxb-api/files/jaxb-api-4.0.2-dropSecurityManager.patch b/dev-java/jaxb-api/files/jaxb-api-4.0.2-dropSecurityManager.patch new file mode 100644 index 000000000000..3d78b40cdaba --- /dev/null +++ b/dev-java/jaxb-api/files/jaxb-api-4.0.2-dropSecurityManager.patch @@ -0,0 +1,12 @@ +# java.lang.UnsupportedOperationException: The Security Manager is deprecated and will be removed in a future release +# https://github.com/jakartaee/jaxb-api/issues/303#issuecomment-1962748051 +--- a/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextTest.java ++++ b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextTest.java +@@ -265,7 +265,6 @@ public class JAXBContextTest { + private void enableSM() { + System.setSecurityManager(null); + System.setProperty("java.security.policy", classesDir + "jakarta/xml/bind/test.policy"); +- System.setSecurityManager(new SecurityManager()); + } + + private void cleanResource(Path resource) { diff --git a/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild b/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild deleted file mode 100644 index 179eb6a32e3c..000000000000 --- a/dev-java/jaxb-api/jaxb-api-2.3.3-r1.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/eclipse-ee4j/jaxb-api/archive/refs/tags/2.3.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxb-api-2.3.3.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Jakarta XML Binding API" -HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api" -SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="EPL-1.0" -SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# jakarta.activation:jakarta.activation-api:1.2.2 -> >=dev-java/jakarta-activation-api-2.0.1:0 -# jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 -> >=dev-java/jaxb-api-2.3.3:0 - -CDEPEND="dev-java/jakarta-activation-api:1" -DEPEND="${CDEPEND} - >=virtual/jdk-11:*" -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" - -DOCS=( ../{LICENSE,NOTICE,README}.md ) - -S="${WORKDIR}/${P}/${PN}" - -JAVA_GENTOO_CLASSPATH="jakarta-activation-api-1" -JAVA_GENTOO_CLASSPATH_EXTRA="jaxb-api.jar" -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS="src/main/resources" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="../${PN}-test/src/test/java" -JAVA_TEST_RESOURCE_DIRS="../${PN}-test/src/test/resources" - -src_install() { - default - java-pkg-simple_src_install -} 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 new file mode 100644 index 000000000000..abe2f8cfb559 --- /dev/null +++ b/dev-java/jaxb-api/jaxb-api-2.3.3-r2.ebuild @@ -0,0 +1,42 @@ +# 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="jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Jakarta XML Binding API" +HOMEPAGE="https://github.com/jakartaee/jaxb-api" +SRC_URI="https://github.com/jakartaee/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="EPL-1.0" +SLOT="2" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +CDEPEND="dev-java/jakarta-activation-api:1" +DEPEND="${CDEPEND} + >=virtual/jdk-11:*" +RDEPEND="${CDEPEND} + >=virtual/jre-1.8:*" + +DOCS=( {LICENSE,NOTICE,README}.md ) +PATCHES=( "${FILESDIR}/jaxb-api-2.3.3-dropSecurityManager.patch" ) + +JAVA_GENTOO_CLASSPATH="jakarta-activation-api-1" +JAVA_GENTOO_CLASSPATH_EXTRA="jaxb-api.jar" +JAVA_RESOURCE_DIRS="${PN}/src/main/resources" +JAVA_SRC_DIR="${PN}/src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_RESOURCE_DIRS="${PN}-test/src/test/resources" +JAVA_TEST_SRC_DIR="${PN}-test/src/test/java" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} diff --git a/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild b/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild index 09661390a579..d0a0b6381a1a 100644 --- a/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild +++ b/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="jakarta.xml.bind:jakarta.xml.bind-api:4.0.0" +MAVEN_ID="jakarta.xml.bind:jakarta.xml.bind-api:${PV}" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Jakarta XML Binding API" -HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api" -SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/jakartaee/jaxb-api" +SRC_URI="https://github.com/jakartaee/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" LICENSE="EPL-1.0" SLOT="4" @@ -22,21 +23,21 @@ CP_DEPEND="dev-java/jakarta-activation:2" DEPEND="${CP_DEPEND} >=virtual/jdk-11:*" +# reason: '<>' with anonymous inner classes is not supported in -source 8 +# (use -source 9 or higher to enable '<>' with anonymous inner classes) RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" + >=virtual/jre-11:*" DOCS=( {CONTRIBUTING,NOTICE,README}.md ) +PATCHES=( "${FILESDIR}/jaxb-api-4.0.2-dropSecurityManager.patch" ) -S="${WORKDIR}/${P}" - -JAVA_SRC_DIR="api/src/main/java" JAVA_RESOURCE_DIRS="api/src/main/resources" - +JAVA_SRC_DIR="api/src/main/java" JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="jaxb-api-test/src/test/java" JAVA_TEST_RESOURCE_DIRS="jaxb-api-test/src/test/resources" +JAVA_TEST_SRC_DIR="jaxb-api-test/src/test/java" -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install +src_prepare() { + default #780585 + java-pkg-2_src_prepare } diff --git a/dev-java/jaxb-api/metadata.xml b/dev-java/jaxb-api/metadata.xml index 44d0d808c013..82e13368f4e7 100644 --- a/dev-java/jaxb-api/metadata.xml +++ b/dev-java/jaxb-api/metadata.xml @@ -5,7 +5,7 @@ <email>java@gentoo.org</email> </maintainer> <upstream> - <remote-id type="github">eclipse-ee4j/jaxb-api</remote-id> - <bugs-to>https://github.com/eclipse-ee4j/jaxb-api/issues</bugs-to> + <bugs-to>https://github.com/jakartaee/jaxb-api/issues</bugs-to> + <remote-id type="github">jakartaee/jaxb-api</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild index 00b7f87a10dc..a72404f111ad 100644 --- a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild +++ b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-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" MY_PN="jBitcollider" MY_P="${MY_PN}-${PV}" -JAVA_SRC_DIR="plugins/org.bitpedia.collider.core/src" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Core classes of jBitcollider: org.bitpedia.collider.core" -HOMEPAGE="http://bitcollider.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/bitcollider/jBitcollider%20%28Java%29/${PV}/${MY_P}.zip" +HOMEPAGE="https://bitcollider.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/project/bitcollider/jBitcollider%20%28Java%29/${PV}/${MY_P}.zip" +S="${WORKDIR}/${MY_P}" LICENSE="public-domain" SLOT="0" @@ -23,14 +23,9 @@ DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" BDEPEND="app-arch/unzip" -S="${WORKDIR}/${MY_P}" +JAVA_SRC_DIR="plugins/org.bitpedia.collider.core/src" src_prepare() { - default - - rm -v lib/*.jar || die - rm -v plugins/*/lib/*.jar || die - rm -v plugins/org.bitpedia.collider.*/bin/org/bitpedia/collider/*/*.class || die - rm -v plugins/org.bitpedia.collider.core/bin/org/bitpedia/util/*.class || die java-pkg-2_src_prepare + java-pkg_clean } diff --git a/dev-java/jboss-jms-api/metadata.xml b/dev-java/jboss-jms-api/metadata.xml index 75321cfb5598..754269297a20 100644 --- a/dev-java/jboss-jms-api/metadata.xml +++ b/dev-java/jboss-jms-api/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">jboss/jboss-jms-api_spec</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/jcalendar/jcalendar-1.4-r1.ebuild b/dev-java/jcalendar/jcalendar-1.4-r1.ebuild deleted file mode 100644 index c0de4b6cfb3e..000000000000 --- a/dev-java/jcalendar/jcalendar-1.4-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java date chooser bean for graphically picking a date" -HOMEPAGE="https://www.toedter.com/en/jcalendar/" -SRC_URI="https://www.toedter.com/download/${P}.zip" - -LICENSE="LGPL-2.1" -SLOT="1.2" -KEYWORDS="amd64 x86" - -CDEPEND="dev-java/jgoodies-looks:2.6" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.8:*" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}" - -RESTRICT="test" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="jgoodies-looks-2.6" -EANT_BUILD_XML="src/build.xml" -EANT_BUILD_TARGET="jar" -EANT_DOC_TARGET="" - -src_prepare() { - default - java-pkg_clean -} - -src_install() { - java-pkg_newjar lib/${P}.jar - - dodoc readme.txt - - use doc && java-pkg_dohtml -r doc/* - use source && java-pkg_dosrc src/com -} diff --git a/dev-java/jcalendar/jcalendar-1.4-r2.ebuild b/dev-java/jcalendar/jcalendar-1.4-r2.ebuild new file mode 100644 index 000000000000..2985f2ad4db0 --- /dev/null +++ b/dev-java/jcalendar/jcalendar-1.4-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java date chooser bean for graphically picking a date" +HOMEPAGE="https://toedter.com/jcalendar/" +SRC_URI="https://www.toedter.com/download/${P}.zip" + +LICENSE="LGPL-2.1" +SLOT="1.2" +KEYWORDS="amd64 x86" + +BDEPEND="app-arch/unzip" + +CP_DEPEND="dev-java/jgoodies-looks:2.6" + +DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-1.8:*" + +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:*" + +JAVA_MAIN_CLASS="com.toedter.calendar.demo.JCalendarDemo" +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR="src" + +src_prepare() { + java-pkg-2_src_prepare + java-pkg_clean + mkdir -p res/META-INF || die + mv src/jcalendar.manifest res/META-INF/MANIFEST.MF || die + pushd src > /dev/null || die + find com -type f ! -name '*.java' \ + | xargs cp --parents -t ../res || die + popd > /dev/null || die +} diff --git a/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild b/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild index fe2e13524222..52ae935d3ef8 100644 --- a/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild +++ b/dev-java/jchart2d/jchart2d-3.2.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 @@ -11,7 +11,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="A minimalistic realtime charting library for Java" HOMEPAGE="http://jchart2d.sourceforge.net" -SRC_URI="mirror://sourceforge/project/jchart2d/jchart2d/sources/jchart2d-eclipse-project-${PV}.zip" +SRC_URI="https://downloads.sourceforge.net/project/jchart2d/jchart2d/sources/jchart2d-eclipse-project-${PV}.zip" LICENSE="LGPL-2.1+" SLOT="0" diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest index cce5c24db238..dc7d15805cb7 100644 --- a/dev-java/jctools-core/Manifest +++ b/dev-java/jctools-core/Manifest @@ -1,2 +1 @@ -DIST jctools-4.0.1.tar.gz 4234647 BLAKE2B 652cfc70d92a37e04056e306050b156632ba92b2cacd9b759556ea92e1b9b6dda3d766e33936cdd92ec690abb6fb51a562305f82746f500f89d9d797e27f9c54 SHA512 9c8f55be4640f7b1315e7f93c20cf6b4b8d84c542103d69a2e34c0abe00c25fb362b6d8c4042feb4462559e5f6babd90ab0a59a66c3d407e13004ff02ce95c8f -DIST jctools-4.0.2.tar.gz 4237275 BLAKE2B 9bac4f8442f7a64aac47208ecf98799506244783d71a5444b6a3ff74ddca4e16232cf19dd5e7a9243dfcc3510674717982ef915759c8b6b2de74d4711d996302 SHA512 d19237929ab18360427efdf2844adc08589fc8ba2838b1f983118e1d6f1270bacad34477cb000e6bc85aeab38e7e337c397181b4351681f18977547c5b2e8f37 +DIST jctools-4.0.3.tar.gz 4237279 BLAKE2B be74c2b0997ec68b90249c8d2b841737fffa4e09724a25b5f5e15b8c4bbf811215023358bc674ed20f81d06a10db3ac2428b29d159ac99ef6dff7e6c36bf7fe2 SHA512 3d7cede6beba54871365cc2f49dc30f014a6f36a5e1f66e9cebd523d202806d49f24c23dbfd6bef0c25cbea0ca230b5d1afefd2b83b0150d335e8e99b6cec90f diff --git a/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch b/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch new file mode 100644 index 000000000000..6eccce942b62 --- /dev/null +++ b/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/863977 +https://bugs.gentoo.org/924135 +--- a/src/test/java/org/jctools/util/TestUtil.java ++++ b/src/test/java/org/jctools/util/TestUtil.java +@@ -19,7 +19,7 @@ import static org.jctools.util.UnpaddedQueueFactory.newUnpaddedQueue; + public class TestUtil { + public static final int CONCURRENT_TEST_DURATION = Integer.getInteger("org.jctools.concTestDurationMs", 500); + public static final int CONCURRENT_TEST_THREADS = Integer.getInteger("org.jctools.concTestThreads", Math.min(4, Runtime.getRuntime().availableProcessors())); +- public static final int TEST_TIMEOUT = 30000; ++ public static final int TEST_TIMEOUT = 60000; + private static final AtomicInteger threadIndex = new AtomicInteger(); + public static void sleepQuietly(long timeMs) { + LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(timeMs)); diff --git a/dev-java/jctools-core/jctools-core-4.0.1.ebuild b/dev-java/jctools-core/jctools-core-4.0.1.ebuild deleted file mode 100644 index f72f40a764d5..000000000000 --- a/dev-java/jctools-core/jctools-core-4.0.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/JCTools/JCTools/archive/v4.0.1.tar.gz --slot 3 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jctools-core-4.0.1.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.jctools:jctools-core:4.0.1" -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" - -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=">=virtual/jdk-1.8:* - test? ( - dev-java/guava-testlib:0 - dev-java/hamcrest-library:1.3 - )" - -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( ../{README,RELEASE-NOTES}.md ) - -S="${WORKDIR}/JCTools-${PV}/jctools-core" - -JAVA_AUTOMATIC_MODULE_NAME="org.jctools.core" -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest-library-1.3,junit-4" -JAVA_TEST_SRC_DIR="src/test/java" - -# Using the defaults of java-pkg-simple would skip more than half the number of tests. -src_test() { - # org.jetbrains.kotlinx.lincheck is not yet packaged - rm -r src/test/java/org/jctools/maps/linearizability_test || die - # These tests would fail and are not run by "mvn test". - # "org.jctools.queues.MpqSanityTest" - # "org.jctools.queues.QueueSanityTest" - # "org.jctools.queues.ScQueueRemoveTest" - # "org.jctools.util.TestUtil" - # Test timeout on arm64, https://bugs.gentoo.org/863977 - # "org.jctools.queues.atomic.AtomicMpqSanityTestMpscLinked" - # "org.jctools.queues.MpqSanityTestMpscLinked" - pushd src/test/java || die - local JAVA_TEST_RUN_ONLY=$(find * \ - \( -name "*Test*.java" \ - -o -name "nbsi_tester.java" \ - -o -name "nbhs_tester.java" \)\ - ! -name "MpqSanityTest.java" \ - ! -name "QueueSanityTest.java" \ - ! -name "ScQueueRemoveTest.java" \ - ! -name "TestUtil.java" \ - ! -name "AtomicMpqSanityTestMpscLinked.java" \ - ! -name "MpqSanityTestMpscLinked.java" \ - ) - popd - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - java-pkg-simple_src_test - # OK (7226 tests) -} diff --git a/dev-java/jctools-core/jctools-core-4.0.2.ebuild b/dev-java/jctools-core/jctools-core-4.0.3.ebuild index 7b344074414a..5b54f3488a28 100644 --- a/dev-java/jctools-core/jctools-core-4.0.2.ebuild +++ b/dev-java/jctools-core/jctools-core-4.0.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}/JCTools-${PV}/jctools-core" LICENSE="Apache-2.0" SLOT="3" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=" dev-java/osgi-annotation:0 @@ -29,6 +29,7 @@ DEPEND=" 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" @@ -37,6 +38,11 @@ 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 @@ -46,9 +52,6 @@ src_test() { # "org.jctools.queues.QueueSanityTest" # "org.jctools.queues.ScQueueRemoveTest" # "org.jctools.util.TestUtil" - # Test timeout on arm64, https://bugs.gentoo.org/863977 - # "org.jctools.queues.atomic.AtomicMpqSanityTestMpscLinked" - # "org.jctools.queues.MpqSanityTestMpscLinked" pushd src/test/java || die local JAVA_TEST_RUN_ONLY=$(find * \ \( -name "*Test*.java" \ @@ -58,12 +61,10 @@ src_test() { ! -name "QueueSanityTest.java" \ ! -name "ScQueueRemoveTest.java" \ ! -name "TestUtil.java" \ - ! -name "AtomicMpqSanityTestMpscLinked.java" \ - ! -name "MpqSanityTestMpscLinked.java" \ ) popd JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" java-pkg-simple_src_test - # OK (7226 tests) + # OK (8746 tests) } diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest index b39662917f89..27c5a47904df 100644 --- a/dev-java/jdbc-mysql/Manifest +++ b/dev-java/jdbc-mysql/Manifest @@ -1,2 +1,4 @@ DIST mysql-connector-j-8.1.0.tar.gz 4241696 BLAKE2B 930257a876b1b512b598ebf8397125145bb9d1a438fe33bb55ca208dddfdd29bd436a365cc35b9128cdee6eee436da688dd53cc3ed6cd04efb22d1f5af731863 SHA512 f8a7c621397f49981dd7d19e880d92ee051015ad011c027380ac85760dc22ce2f4117fd27b8d72325c5e2bc40a1a9c22e9534f7200208916ee62bbf1e5ad0c75 +DIST mysql-connector-j-8.3.0.tar.gz 4255433 BLAKE2B b5cd437e4ab87052c0fd8e4da6a2612d4c068193a4fe2d207505b2f42d664a414c8a0f3131f34b471a30bfa6b6bb9e76ad0dd4779abbecb46ea014ab5d06e36d SHA512 0849ff13f4adc4ae2d2b9f64ff192435dd9560763a50c7df117a171ae1d90fc97bc36dc89097472d0a2c182492a45ca14ffcf577a9c54267be79e5b3f147dc41 DIST oci-java-sdk-common-2.47.0.jar 439209 BLAKE2B b3b28bb0cf4b8dbca37bb34df7bb48029901be5d9f7754a2ccce888a9af4a06b3348cd545d480127f942687b9b0d63336c37b5f95ecb9f96111c9388a4bc6053 SHA512 73e7376c92d47d81e0630e2ad2d510a483068664874ae31622629dad6dc016d746499c2d29682563e5cdee35ddb6e9e59a2e7557d32e1eeec5fb12206f9d1d6e +DIST oci-java-sdk-common-3.29.0.jar 453619 BLAKE2B 41a68344a9cf4733c642e3a6e4254f3991f19c13edf57b3c61352b1e6ffdfabfe29cd8dccaa9b128fae618a492fb342007d14ad65b06cd614da572c787cf35ab SHA512 b6def960e114b69d3f34706d5e293f0a05b30c31a1443a92e454631712bb633eaea3795beeeabe4eb1303b8ad42ef2b73d69880b73d360e193f8f1b532bc3430 diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild index 09f0063500d1..649d226c823b 100644 --- a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild +++ b/dev-java/jdbc-mysql/jdbc-mysql-8.1.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 @@ -27,7 +27,7 @@ KEYWORDS="amd64 ppc64 x86" CP_DEPEND=" dev-java/c3p0:0 - dev-java/protobuf-java:0 + <dev-java/protobuf-java-3.26.0:0 dev-java/slf4j-api:0 " DEPEND=" ${CP_DEPEND} diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild new file mode 100644 index 000000000000..b1f06a0b4fbd --- /dev/null +++ b/dev-java/jdbc-mysql/jdbc-mysql-8.3.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 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-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest index 974801227dbe..d4e40c50cee0 100644 --- a/dev-java/jdbc-postgresql/Manifest +++ b/dev-java/jdbc-postgresql/Manifest @@ -1 +1 @@ -DIST postgresql-jdbc-42.6.0.src.tar.gz 986703 BLAKE2B 24784805583d66f14370031015ff9c53faa2b512c5092b40294c8c1b7aa5e5128910a93f816138dc4a32fdd42dea165cc37c23c2f6d9b9aa5f36269d66e43d95 SHA512 8abf85b4be716ac94d312588d2bc69a56f803f3da573731ec66be0139b87eaa533965ad1431aa705ab17bf2b413b55a8ed038fa8181897df7c83582457449793 +DIST postgresql-jdbc-42.7.3.src.tar.gz 1005966 BLAKE2B 1c9aeae572fc983d6b86f8b552a78d1bd11cf439ca863ea4856ad470f60b6a9b4c0ae5ece60f3bc19718f288b9ce93572b522b5f5953a9b4b12558044d630959 SHA512 354e71a6da0f6b4b5282de4dd949f1824f1cd17a8dd73fbd218ff5adebd08e078fa7d59ee149cbe4133a7a149e39e71c5e075b58d72bfedd3e4b47680e86fa4b diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.6.0.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.6.0.ebuild deleted file mode 100644 index bafd90834dd0..000000000000 --- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.6.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://jdbc.postgresql.org/download/postgresql-jdbc-42.6.0.src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jdbc-postgresql-42.6.0.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.postgresql:postgresql:42.6.0" -# We don't have junit-vintage and junit-jupiter. -# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter 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" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# com.ongres.scram:client:2.1 -> >=dev-java/scram-2.1:0 -# uk.org.webcompere:system-stubs-jupiter:2.0.1 -> !!!groupId-not-found!!! - -CP_DEPEND="dev-java/scram:0" - -# Compile dependencies -# POM: pom.xml -# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4 -# test? org.junit.jupiter:junit-jupiter-api:5.8.2 -> !!!groupId-not-found!!! -# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!! -# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!! -# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!! -# test? se.jiderhamn:classloader-leak-test-framework:1.1.1 -> !!!groupId-not-found!!! - -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND}" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND}" - -S="${WORKDIR}/postgresql-${PV}-jdbc-src" - -JAVA_MAIN_CLASS="org.postgresql.util.PGJDBCMain" -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS="src/main/resources" diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild new file mode 100644 index 000000000000..ab85f684bb07 --- /dev/null +++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.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 ppc64 x86" +# 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: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 new file mode 100644 index 000000000000..dcf930ec4582 --- /dev/null +++ b/dev-java/jdepend/jdepend-2.10-r1.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 test" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Traverses Java class file directories and generates design quality metrics" +HOMEPAGE="https://github.com/clarkware/jdepend" +SRC_URI="https://github.com/clarkware/jdepend/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" +RESTRICT="test" #921147 + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" +JAVA_SRC_DIR="src" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="test" diff --git a/dev-java/jdepend/jdepend-2.10.ebuild b/dev-java/jdepend/jdepend-2.10.ebuild deleted file mode 100644 index 3c0c49c331b5..000000000000 --- a/dev-java/jdepend/jdepend-2.10.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Traverses Java class file directories and generates design quality metrics" -HOMEPAGE="https://github.com/clarkware/jdepend" -SRC_URI="https://github.com/clarkware/jdepend/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -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:*" - -src_install() { - java-pkg_newjar dist/jdepend-${PV}.jar - dodoc README.md LICENSE.md ClassFileFormat-Java5.pdf - docinto html - dodoc -r docs/* - use doc && java-pkg_dojavadoc build/docs/api - use source && java-pkg_dosrc src/* -} diff --git a/dev-java/jdepend/metadata.xml b/dev-java/jdepend/metadata.xml index 6021501589e0..df92bf507738 100644 --- a/dev-java/jdepend/metadata.xml +++ b/dev-java/jdepend/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> + <maintainer type="project"> + <email>java@gentoo.org</email> + <name>Java</name> + </maintainer> + <upstream> + <remote-id type="github">clarkware/jdepend</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/jdom/jdom-1.1.3-r1.ebuild b/dev-java/jdom/jdom-1.1.3-r1.ebuild deleted file mode 100644 index f176d2284a81..000000000000 --- a/dev-java/jdom/jdom-1.1.3-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc examples source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java API to manipulate XML data" -SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz" -HOMEPAGE="http://www.jdom.org" - -LICENSE="JDOM" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -RDEPEND=">=virtual/jre-1.8:*" -DEPEND=">=virtual/jdk-1.8:*" - -S="${WORKDIR}/${PN}" - -src_prepare() { - default - java-pkg_clean - - rm -r build/apidocs || die - - rm -v src/java/org/jdom/xpath/JaxenXPath.java \ - || die "Unable to remove Jaxen Binding class." - - sed -i -e 's|${name}-${version.impl}|${name}|g' \ - -e 's|<jar jarfile="${build.dir}/${name}-sources|<!-- <jar jarfile="${build.dir}/${name}-sources|' \ - -e 's|build.javadocs}" />|build.javadocs}" /> -->|' \ - "${S}"/build.xml || die - - if ! use doc; then - sed -i -e 's|depends="compile,javadoc"|depends="compile"|' \ - "${S}"/build.xml || die - fi -} - -EANT_BUILD_TARGET="package" - -src_install() { - java-pkg_dojar build/*.jar - dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt - use doc && java-pkg_dojavadoc build/apidocs - use examples && java-pkg_doexamples samples - use source && java-pkg_dosrc src/java/org -} diff --git a/dev-java/jdom/jdom-1.1.3-r2.ebuild b/dev-java/jdom/jdom-1.1.3-r2.ebuild new file mode 100644 index 000000000000..e4c3088a799d --- /dev/null +++ b/dev-java/jdom/jdom-1.1.3-r2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc examples source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java API to manipulate XML data" +HOMEPAGE="http://jdom.org" +SRC_URI="http://jdom.org/dist/binary/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="JDOM" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {CHANGES,COMMITTERS,README,TODO}.txt ) + +JAVA_SRC_DIR="src" + +src_prepare() { + java-pkg-2_src_prepare + java-pkg_clean + + # circular dependency with jaxen-1.2[jdom] + rm -v src/java/org/jdom/xpath/JaxenXPath.java \ + || die "Unable to remove Jaxen Binding class." +} + +src_install() { + java-pkg-simple_src_install + use examples && java-pkg_doexamples samples +} diff --git a/dev-java/jeromq/metadata.xml b/dev-java/jeromq/metadata.xml index 75321cfb5598..d82f36ba2afd 100644 --- a/dev-java/jeromq/metadata.xml +++ b/dev-java/jeromq/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">zeromq/jeromq</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r2.ebuild index 58580490d2fc..17d1b99fd468 100644 --- a/dev-java/jflex/jflex-1.6.1-r1.ebuild +++ b/dev-java/jflex/jflex-1.6.1-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" @@ -10,6 +10,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="JFlex is a lexical analyzer generator for Java" HOMEPAGE="https://www.jflex.de/" SRC_URI="https://${PN}.de/${P}.tar.gz" +S="${WORKDIR}/${P}" LICENSE="BSD" SLOT="0" @@ -17,7 +18,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos" IUSE="examples test vim-syntax" RESTRICT="!test? ( test )" -CDEPEND="dev-java/ant-core:0" +CDEPEND=">=dev-java/ant-1.10.14:0" RDEPEND=">=virtual/jre-1.8:* vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) @@ -29,7 +30,6 @@ DEPEND=">=virtual/jdk-1.8:* PDEPEND="dev-java/javacup:0" -S="${WORKDIR}/${P}" JAVA_SRC_DIR="src/main/java" src_prepare() { @@ -59,17 +59,19 @@ src_configure() { JAVACUP=$(echo lib/java-cup-*.jar) fi - JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}" + JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjar --build-only ant ant.jar):${JAVACUP}" } jflex_compile() { - java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die + java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} \ + --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die java-pkg-simple_src_compile java-pkg_addres ${PN}.jar src/main/resources } src_compile() { - java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die + java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} \ + -parser LexParse -interface src/main/cup/LexParse.cup || die # The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running # jflex. We have patched jflex to fix it but we have to run the @@ -77,8 +79,8 @@ src_compile() { # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678. use arm && local JFLEX_ARGS="-Xint" - # First compile (without doc/source) using the bundled jflex. - JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS} + # First compile using the bundled jflex. + jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS} # Then recompile using the fresh jflex. jflex_compile -cp "${PN}.jar:${JAVACUP}" diff --git a/dev-java/jflex/jflex-1.6.1-r3.ebuild b/dev-java/jflex/jflex-1.6.1-r3.ebuild new file mode 100644 index 000000000000..c0083bb42fce --- /dev/null +++ b/dev-java/jflex/jflex-1.6.1-r3.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="JFlex is a lexical analyzer generator for Java" +HOMEPAGE="https://www.jflex.de/" +SRC_URI="https://${PN}.de/${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos" +IUSE="ant-task examples test vim-syntax" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( ant-task )" + +RDEPEND=" + >=virtual/jre-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) +" + +DEPEND=" + >=virtual/jdk-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) + test? ( dev-java/junit:4 ) +" + +PDEPEND=">=dev-java/javacup-11b_p20160615:0" + +JAVA_SRC_DIR="src/main/java" + +src_prepare() { + eapply_user + java-pkg-2_src_prepare + + # See below for details. + eapply "${FILESDIR}/icedtea-arm.patch" + + # We need the bundled jflex.jar. + rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die + + # Remove the bundled java-cup.jar if unneeded. + if has_version ${PDEPEND}; then + rm -v lib/java-cup-*.jar || die + fi +} + +src_configure() { + # javacup is a cyclic dependency. Use the package if we have it, + # otherwise use the bundled version and install the package later. + if has_version ${PDEPEND}; then + # Use PORTAGE_QUIET to suppress a QA warning that is spurious + # thanks to has_version above. This is Portage-specific but + # showing the warning elsewhere isn't the end of the world. + JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar) + else + JAVACUP=$(echo lib/java-cup-*.jar) + fi + + JAVA_GENTOO_CLASSPATH_EXTRA="${JAVACUP}" + if use ant-task; then + JAVA_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant ant.jar)" + else + rm src/main/java/jflex/anttask/JFlexTask.java || die + fi +} + +jflex_compile() { + java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} \ + --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die + java-pkg-simple_src_compile + java-pkg_addres ${PN}.jar src/main/resources +} + +src_compile() { + java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} \ + -parser LexParse -interface src/main/cup/LexParse.cup || die + + # The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running + # jflex. We have patched jflex to fix it but we have to run the + # bundled version first. -Xint works around the problem. See + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678. + use arm && local JFLEX_ARGS="-Xint" + + # First compile using the bundled jflex. + jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS} + + # Then recompile using the fresh jflex. + jflex_compile -cp "${PN}.jar:${JAVACUP}" +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dolauncher ${PN} --main ${PN}.Main + + java-pkg_register-dependency javacup javacup-runtime.jar + use ant-task && java-pkg_register-ant-task + + use examples && java-pkg_doexamples examples + dodoc {changelog,README}.md + + if use doc; then + dodoc doc/*.pdf + docinto html + dodoc doc/*.{css,html,png} doc/COPYRIGHT + fi + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins lib/${PN}.vim + fi +} + +src_test() { + if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then + # This results in a StackOverflowError as of 1.8.0.65 but works + # fine on icedtea:7. Don't know about icedtea:8 yet. + rm -v src/test/java/jflex/EmitterTest.java || die + fi + + local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)" + + local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n") + TESTS="${TESTS//.java}" + TESTS="${TESTS//\//.}" + + ejavac -classpath "${CP}" $(find src/test/java -name "*.java") + ejunit4 -classpath "${CP}" ${TESTS} +} diff --git a/dev-java/jflex/metadata.xml b/dev-java/jflex/metadata.xml index 6021501589e0..3c0e0377e098 100644 --- a/dev-java/jflex/metadata.xml +++ b/dev-java/jflex/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> + <maintainer type="project"> + <email>java@gentoo.org</email> + <name>Java</name> + </maintainer> + <use> + <flag name="ant-task">Build and register the ant-task</flag> + </use> </pkgmetadata> diff --git a/dev-java/jide-oss/jide-oss-3.7.12.ebuild b/dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild index 6445ab563a08..c25d8ee7fdcc 100644 --- a/dev-java/jide-oss/jide-oss-3.7.12.ebuild +++ b/dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -17,7 +17,7 @@ DESCRIPTION="JIDE Common Layer (Professional Swing Components)" HOMEPAGE="https://github.com/jidesoft/jide-oss" SRC_URI="https://github.com/jidesoft/jide-oss/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2-with-exceptions" +LICENSE="GPL-2-with-classpath-exception" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/dev-java/jimfs/Manifest b/dev-java/jimfs/Manifest new file mode 100644 index 000000000000..b43255dddabd --- /dev/null +++ b/dev-java/jimfs/Manifest @@ -0,0 +1,2 @@ +DIST jimfs-1.3.0.tar.gz 157568 BLAKE2B 1febcf132c162ebb87ec9507bc12e05d6a9354195f36b0e198fd50faa22284608adafd1989a79390271ced4c063dda44c477fc7ae051c32960afca0f4f2ee2b7 SHA512 1c769ba74d45de1656fd30bd695b61caaa5ec9bd6c6e051310d371012fa6c746d0b2ba85d3f94490ebfb9f74ca75f173b879144673f8e3af8fde1a132725490d +DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 diff --git a/dev-java/jimfs/jimfs-1.3.0.ebuild b/dev-java/jimfs/jimfs-1.3.0.ebuild new file mode 100644 index 000000000000..bb73a2d2a856 --- /dev/null +++ b/dev-java/jimfs/jimfs-1.3.0.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.jimfs:jimfs:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="An in-memory file system for Java 7+" +HOMEPAGE="https://github.com/google/jimfs" +SRC_URI="https://github.com/google/jimfs/archive/v${PV}.tar.gz -> ${P}.tar.gz + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" +S="${WORKDIR}/${P}/jimfs" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +CP_DEPEND=" + dev-java/auto-service-annotations:0 + dev-java/error-prone-annotations:0 + dev-java/guava:0 + >=dev-java/icu4j-74.2-r1:0 + dev-java/jsr305:0 +" + +DEPEND="${CP_DEPEND} + dev-java/checker-framework-qual:0 + >=virtual/jdk-1.8:* + test? ( + dev-java/guava-testlib:0 + )" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +JAVA_CLASSPATH_EXTRA="checker-framework-qual" +JAVA_AUTOMATIC_MODULE_NAME="com.google.common.jimfs" +JAVA_RESOURCE_DIRS="src/main/res" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH="guava-testlib junit-4" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + java-pkg-2_src_prepare + mkdir -p src/main/res/META-INF/services || die + echo "com.google.common.jimfs.SystemJimfsFileSystemProvider" > \ + src/main/res/META-INF/services/java.nio.file.spi.FileSystemProvider || die +} + +src_test() { + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar" + # Using the defaults of java-pkg-simple would exclude + # several tests which are run by "mvn test". + pushd src/test/java > /dev/null || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -name "*Test.java" \ + ! -name AbstractGlob*.java \ + ! -name AbstractPathMatcherTest.java \ + ! -name AbstractJimfsIntegrationTest.java \ + ! -name AbstractAttributeProviderTest.java \ + ) + popd > /dev/null + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} diff --git a/dev-java/jimfs/metadata.xml b/dev-java/jimfs/metadata.xml new file mode 100644 index 000000000000..e1353ba1e585 --- /dev/null +++ b/dev-java/jimfs/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">google/jimfs</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/jmh-core/Manifest b/dev-java/jmh-core/Manifest index 918f4672b6dd..396f6a6ab0c2 100644 --- a/dev-java/jmh-core/Manifest +++ b/dev-java/jmh-core/Manifest @@ -1 +1 @@ -DIST jmh-core-1.35.tar.gz 645087 BLAKE2B ce33167a58c2eaf64c38148f27493c86ac9c0084cb58a438b49148b41d3e2db66d8a78e0be8a78db39aebf06fc0b5767be61100b22ce77e018ac8ca29c05c17f SHA512 53ce7300f5e10f1efcb639f0d4d01adad48cadc8daea2e00db34113e42b192e49a6a04cc2b5fd4d291ac81a73a5b30613d22390722d35f54139f14ebbb01013c +DIST jmh-1.37.tar.gz 658673 BLAKE2B 696997907f3505f84ed400d75f46625b9f2aa9faf8a6d4250e6380db9088a8d6a61792eed8163703cb0003dba6ee5a2061d08a1b09bed5c058612142cd594469 SHA512 a3aac7d2e774dd7e7457cc1dce9edbe5923fcdae266854d709b926580638a28057bd6b32b8d7dedc4707ab2ae9aa7d5cda04eb72b0116f1cb98480a8b8b02707 diff --git a/dev-java/jmh-core/jmh-core-1.35.ebuild b/dev-java/jmh-core/jmh-core-1.37.ebuild index 6d518ed16c03..0fcaad366369 100644 --- a/dev-java/jmh-core/jmh-core-1.35.ebuild +++ b/dev-java/jmh-core/jmh-core-1.37.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.openjdk.jmh:jmh-core:1.35" +MAVEN_ID="org.openjdk.jmh:jmh-core:${PV}" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Harness for building, running, and analysing nano/micro/milli/macro benchmarks" -HOMEPAGE="https://openjdk.java.net/projects/code-tools/jmh/" -SRC_URI="https://github.com/openjdk/jmh/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://openjdk.org/projects/code-tools/jmh/" +SRC_URI="https://github.com/openjdk/jmh/archive/${PV}.tar.gz -> jmh-${PV}.tar.gz" +S="${WORKDIR}/jmh-${PV}" LICENSE="Apache-2.0" SLOT="0" @@ -21,22 +22,15 @@ CP_DEPEND=" dev-java/commons-math:3 dev-java/jopt-simple:0" -DEPEND=">=virtual/jdk-1.8:* - ${CP_DEPEND}" - -RDEPEND=">=virtual/jre-1.8:* - ${CP_DEPEND}" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:*" -S="${WORKDIR}/jmh-${PV}" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" -JAVA_SRC_DIR="jmh-core/src/main/java" JAVA_RESOURCE_DIRS="jmh-core/src/main/resources" +JAVA_SRC_DIR="jmh-core/src/main/java" JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="jmh-core/src/test/java" JAVA_TEST_RESOURCE_DIRS="jmh-core/src/test/resources" - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} +JAVA_TEST_SRC_DIR="jmh-core/src/test/java" diff --git a/dev-java/jmh-generator-annprocess/Manifest b/dev-java/jmh-generator-annprocess/Manifest new file mode 100644 index 000000000000..396f6a6ab0c2 --- /dev/null +++ b/dev-java/jmh-generator-annprocess/Manifest @@ -0,0 +1 @@ +DIST jmh-1.37.tar.gz 658673 BLAKE2B 696997907f3505f84ed400d75f46625b9f2aa9faf8a6d4250e6380db9088a8d6a61792eed8163703cb0003dba6ee5a2061d08a1b09bed5c058612142cd594469 SHA512 a3aac7d2e774dd7e7457cc1dce9edbe5923fcdae266854d709b926580638a28057bd6b32b8d7dedc4707ab2ae9aa7d5cda04eb72b0116f1cb98480a8b8b02707 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 new file mode 100644 index 000000000000..a4d3d8c5c886 --- /dev/null +++ b/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.openjdk.jmh:jmh-generator-annprocess:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Harness for building, running, and analysing nano/micro/milli/macro benchmarks" +HOMEPAGE="https://openjdk.org/projects/code-tools/jmh/" +SRC_URI="https://github.com/openjdk/jmh/archive/${PV}.tar.gz -> jmh-${PV}.tar.gz" +S="${WORKDIR}/jmh-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=" + dev-java/jmh-core:0 + >=virtual/jdk-1.8:* +" +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_CLASSPATH_EXTRA="jmh-core" +JAVA_RESOURCE_DIRS="jmh-generator-annprocess/src/main/resources" +JAVA_SRC_DIR="jmh-generator-annprocess/src/main/java" diff --git a/dev-java/validation-api/metadata.xml b/dev-java/jmh-generator-annprocess/metadata.xml index 8d626a41d89c..09c955c1f8a5 100644 --- a/dev-java/validation-api/metadata.xml +++ b/dev-java/jmh-generator-annprocess/metadata.xml @@ -6,6 +6,6 @@ <name>Java</name> </maintainer> <upstream> - <remote-id type="github">eclipse-ee4j/beanvalidation-api</remote-id> + <remote-id type="github">openjdk/jmh</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest index 5a75b4046036..667bee66b18f 100644 --- a/dev-java/jna/Manifest +++ b/dev-java/jna/Manifest @@ -1 +1,2 @@ DIST jna-5.13.0.tar.gz 116027625 BLAKE2B 1f2bc7ab28adefa0bbad122957ed2c6ef55ab88e79b30c05f0d2d88e0e05152f7bb5e28097906a7e24f78304dfa2b225587adb0ada205ca3c2ceac1cdbab3f04 SHA512 aefd0becc03bb7fd753e8c5cdcbcb20f6d590125a5fb03048bef0024e826ab0254b750e22a8bb26bea38cc89262ad45e5030b666cb2c857b01b15a6a55379a0f +DIST jna-5.14.0.tar.gz 116167104 BLAKE2B 3ccb9e53e843690f9c90272c2e94fb2d903dd9bbcb7b6294a6ed3d973d3945c2b3fe5ac5e4c472830a7d07f4f32d84e781bb2ae3bd73cdd1894392331554e2cd SHA512 5758898052b3b099cd8b40046f764813377970a428e66370ba2a7125403661e25379d55fdb0ff75de32d66cbff20f0a05f438b2ca18804cc53f2edf4b1927ff0 diff --git a/dev-java/jna/jna-5.14.0-r1.ebuild b/dev-java/jna/jna-5.14.0-r1.ebuild new file mode 100644 index 000000000000..183ba4f35027 --- /dev/null +++ b/dev-java/jna/jna-5.14.0-r1.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 ~arm arm64 ~ppc64 x86" + +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 + 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/metadata.xml b/dev-java/jnacl/metadata.xml index 85fac4d279d3..4be1272c32fb 100644 --- a/dev-java/jnacl/metadata.xml +++ b/dev-java/jnacl/metadata.xml @@ -9,5 +9,6 @@ </longdescription> <upstream> <bugs-to>https://github.com/neilalexander/jnacl/issues</bugs-to> + <remote-id type="github">neilalexander/jnacl</remote-id> </upstream> </pkgmetadata> 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.ebuild index eea65095cac2..0a12a3826469 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.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -40,6 +40,16 @@ S="${WORKDIR}/jsch-agent-proxy-${MY_COMMIT}" 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" +JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}" +JAVADOC_SRC_DIRS=( + "${PN}-core" + "${PN}-jsch" + "${PN}-pageant" + "${PN}-sshagent" + "${PN}-usocket-jna" + "${PN}-usocket-nc" + "${PN}-connector-factory" +) src_compile() { JAVA_SRC_DIR="${PN}-core" @@ -77,17 +87,7 @@ src_compile() { java-pkg-simple_src_compile rm -fr target || die - JAVA_SRC_DIR=( - "${PN}-core" - "${PN}-jsch" - "${PN}-pageant" - "${PN}-sshagent" - "${PN}-usocket-jna" - "${PN}-usocket-nc" - "${PN}-connector-factory" - ) - JAVA_JAR_FILENAME="ignoreme.jar" - java-pkg-simple_src_compile + use doc && ejavadoc } src_install() { diff --git a/dev-java/jsch/jsch-0.1.55.ebuild b/dev-java/jsch/jsch-0.1.55.ebuild index 33cc6811dfc7..3b319db72cf5 100644 --- a/dev-java/jsch/jsch-0.1.55.ebuild +++ b/dev-java/jsch/jsch-0.1.55.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -13,7 +13,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="JSch is a pure Java implementation of SSH2" HOMEPAGE="http://www.jcraft.com/jsch/" -SRC_URI="mirror://sourceforge/${PN}/${P}.zip" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.zip" LICENSE="BSD" SLOT="0" 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 bed1dc2846b3..04a95c02d05f 100644 --- a/dev-java/json-smart/json-smart-2.5.0.ebuild +++ b/dev-java/json-smart/json-smart-2.5.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 @@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-v2-${PV}" LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" RESTRICT="test" #839681 DEPEND=" diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest index 549c5a166a89..d2c92e99c74d 100644 --- a/dev-java/json/Manifest +++ b/dev-java/json/Manifest @@ -1,3 +1,5 @@ -DIST json-20220320.tar.gz 229462 BLAKE2B 9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2 SHA512 1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0 DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183 +DIST json-20240205.tar.gz 245788 BLAKE2B 2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df SHA512 55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284 +DIST json-20240303.tar.gz 245665 BLAKE2B 3462398895ab6da9610dac8851f2aa4528359e255015fd59a160fe99443819fa5bb57eb30ce177238d06abe95aaae9847cc85e4eee59c90edf7732bd823d9b89 SHA512 22465216eca7e4721aacca7b519d0bf1b0fe20b2de68ef0b6c62feae811e11203bfc733d8e9c97e2aa5b6ed30c74eefc601025b31807e51d496666412516afc9 DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6 +DIST json-path-2.9.0.jar 276633 BLAKE2B bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862 SHA512 9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a diff --git a/dev-java/json/json-20220320.ebuild b/dev-java/json/json-20220320.ebuild deleted file mode 100644 index 86e62eab5ee3..000000000000 --- a/dev-java/json/json-20220320.ebuild +++ /dev/null @@ -1,57 +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://codeload.github.com/stleary/JSON-java/tar.gz/20220320 --slot 0 --keywords "~amd64 ~x86" --ebuild json-20220320.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.json:json:20220320" -# We don't have com.jayway.jsonpath:json-path -# JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A reference implementation of a JSON package in Java" -HOMEPAGE="https://github.com/stleary/JSON-java" -SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz" - -LICENSE="JSON" -SLOT="0" -KEYWORDS="amd64 x86" - -# Compile dependencies -# POM: pom.xml -# test? com.jayway.jsonpath:json-path:2.1.0 -> !!!groupId-not-found!!! -# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4 -# test? org.mockito:mockito-core:1.9.5 -> >=dev-java/mockito-1.9.5:0 - -DEPEND=" - >=virtual/jdk-1.8:*" -# test? ( -# !!!groupId-not-found!!! -# >=dev-java/mockito-1.9.5:0 -# ) -#" - -RDEPEND=" - >=virtual/jre-1.8:* -" - -DOCS=( {README,SECURITY}.md ) - -S="${WORKDIR}/JSON-java-${PV}" - -JAVA_SRC_DIR="src/main/java" - -# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,junit-4,mockito" -# JAVA_TEST_SRC_DIR="src/test/java" -# JAVA_TEST_RESOURCE_DIRS=( -# "src/test/resources" -# ) - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/json/json-20231013-r1.ebuild b/dev-java/json/json-20231013-r1.ebuild index a11eb3f69c95..33b11fb0702e 100644 --- a/dev-java/json/json-20231013-r1.ebuild +++ b/dev-java/json/json-20231013-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}/JSON-java-${PV}" LICENSE="JSON" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/json/json-20240205-r1.ebuild b/dev-java/json/json-20240205-r1.ebuild new file mode 100644 index 000000000000..49f6e727afd8 --- /dev/null +++ b/dev-java/json/json-20240205-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.json:json:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A reference implementation of a JSON package in Java" +HOMEPAGE="https://github.com/stleary/JSON-java" +JPV="2.9.0" +SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz + test? ( + https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar + )" +S="${WORKDIR}/JSON-java-${PV}" + +LICENSE="JSON" +SLOT="0" +KEYWORDS="amd64 ~x86" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/asm:9 + dev-java/json-smart:2 + dev-java/mockito:4 + dev-java/slf4j-api:0 + ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {CONTRIBUTING,README,SECURITY}.md ) + +JAVA_AUTOMATIC_MODULE_NAME="org.json" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH=" + asm-9 + json-smart-2 + junit-4 + mockito-4 + slf4j-api +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +src_test() { + JAVA_TEST_EXTRA_ARGS=( -Xss2M ) + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency + + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge 17; then + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED ) + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED ) + fi + java-pkg-simple_src_test +} diff --git a/dev-java/json/json-20240303.ebuild b/dev-java/json/json-20240303.ebuild new file mode 100644 index 000000000000..5e807e77efd0 --- /dev/null +++ b/dev-java/json/json-20240303.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.json:json:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple check-reqs + +DESCRIPTION="A reference implementation of a JSON package in Java" +HOMEPAGE="https://github.com/stleary/JSON-java" +JPV="2.9.0" +SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz + test? ( + https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar + )" +S="${WORKDIR}/JSON-java-${PV}" + +LICENSE="JSON" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/asm:9 + dev-java/json-smart:2 + dev-java/mockito:4 + dev-java/slf4j-api:0 + ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {CONTRIBUTING,README,SECURITY}.md ) + +JAVA_AUTOMATIC_MODULE_NAME="org.json" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH=" + asm-9 + json-smart-2 + junit-4 + mockito-4 + slf4j-api +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +check_env() { + if use test; then + # this is needed only for tests + CHECKREQS_MEMORY="2048M" + check-reqs_pkg_pretend + fi +} + +pkg_pretend() { + check_env +} + +pkg_setup() { + check_env + java-pkg-2_pkg_setup +} + +src_test() { + # setting Xms for bug #930723 + # gradlew: DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m" + JAVA_TEST_EXTRA_ARGS=" -Xmx${CHECKREQS_MEMORY}" + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency + + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge 17; then + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED ) + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED ) + fi + java-pkg-simple_src_test +} diff --git a/dev-java/jtds/jtds-1.3.1-r1.ebuild b/dev-java/jtds/jtds-1.3.1-r1.ebuild index d5b7dd1cd11a..650c6251d4b3 100644 --- a/dev-java/jtds/jtds-1.3.1-r1.ebuild +++ b/dev-java/jtds/jtds-1.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 @@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="jTDS - SQL Server and Sybase JDBC driver" HOMEPAGE="http://jtds.sourceforge.net" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}-src.zip" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}-src.zip" LICENSE="LGPL-2.1" SLOT="1.3" diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest index bd28d25f9377..e09ee53ded98 100644 --- a/dev-java/jtidy/Manifest +++ b/dev-java/jtidy/Manifest @@ -1,2 +1 @@ DIST jtidy-1.0.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a -DIST jtidy-r938-sources.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a diff --git a/dev-java/jtidy/files/jtidy-1.0-build.xml.patch b/dev-java/jtidy/files/jtidy-1.0-build.xml.patch deleted file mode 100644 index ba5e04a7f976..000000000000 --- a/dev-java/jtidy/files/jtidy-1.0-build.xml.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/build.xml.orig 2015-12-01 21:10:36.689000000 +0000 -+++ b/build.xml 2015-12-01 21:11:05.642000000 +0000 -@@ -9,11 +9,7 @@ - <property name="srczip" value="jtidy-${version}-sources.zip"/> - <property name="allzip" value="jtidy-${version}.zip"/> - -- <target name="clean"> -- <delete dir="${target}"/> -- </target> -- -- <target name="jar" depends="clean"> -+ <target name="jar"> - <mkdir dir="${target}"/> - <mkdir dir="${bin}"/> - <javac srcdir="${src}" destdir="${bin}" source="1.4" target="1.4"/> -@@ -30,13 +26,13 @@ - </jar> - </target> - -- <target name="javadoc" depends="clean"> -+ <target name="javadoc"> - <javadoc sourcepath="${src}" destdir="${target}/${doc}" windowtitle=" JTidy ${version} " doctitle="JTidy ${version} API documentation"> - <tag name="todo" scope="all" description="To do:"/> - </javadoc> - </target> - -- <target name="src" depends="clean"> -+ <target name="src"> - <zip destfile="${target}/${srczip}"> - <fileset dir="."> - <include name="${src}/**"/> diff --git a/dev-java/jtidy/jtidy-1.0-r1.ebuild b/dev-java/jtidy/jtidy-1.0-r1.ebuild deleted file mode 100644 index 7c227fdf5e9e..000000000000 --- a/dev-java/jtidy/jtidy-1.0-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -MY_PV="r938" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Java port of HTML Tidy, an HTML syntax checker and pretty printer" -HOMEPAGE="http://jtidy.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${PN}/JTidy/${MY_PV}/${PN}-${MY_PV}-sources.zip -> ${P}.zip" -LICENSE="HTML-Tidy W3C" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -CDEPEND="dev-java/ant-core:0" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.8:*" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -BDEPEND=" - app-arch/unzip" - -JAVA_ANT_ENCODING="UTF-8" -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_GENTOO_CLASSPATH="ant-core" -EANT_BUILD_TARGET="jar" - -S="${WORKDIR}" - -PATCHES=( - "${FILESDIR}"/"${P}-build.xml.patch" -) - -src_prepare() { - default -} - -src_install() { - java-pkg_newjar "target/${MY_P}.jar" - java-pkg_dolauncher "jtidy" --main org.w3c.tidy.Tidy - - use doc && java-pkg_dojavadoc target/javadoc/ - use source && java-pkg_dosrc src/main/java -} diff --git a/dev-java/jtidy/jtidy-938.ebuild b/dev-java/jtidy/jtidy-1.0-r2.ebuild index a358bb13a064..3121a966d659 100644 --- a/dev-java/jtidy/jtidy-938.ebuild +++ b/dev-java/jtidy/jtidy-1.0-r2.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 @@ -8,21 +8,23 @@ MAVEN_ID="net.sf.jtidy:jtidy:r${PV}" inherit java-pkg-2 java-pkg-simple +MY_PV="r938" +MY_P="${PN}-${MY_PV}" + DESCRIPTION="a Java port of HTML Tidy, a HTML syntax checker and pretty printer" HOMEPAGE="https://sourceforge.net/projects/jtidy/" -SRC_URI="https://master.dl.sourceforge.net/project/jtidy/JTidy/r${PV}/jtidy-r${PV}-sources.zip" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/JTidy/${MY_PV}/${PN}-${MY_PV}-sources.zip -> ${P}.zip" LICENSE="HTML-Tidy W3C" -SLOT="9" -KEYWORDS="~amd64" +SLOT="0" +KEYWORDS="amd64 ppc64 x86" BDEPEND="app-arch/unzip" -CP_DEPEND="dev-java/ant-core:0" - +CP_DEPEND=">=dev-java/ant-1.10.14-r3:0" DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8 " + >=virtual/jdk-1.8:*" RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8" + >=virtual/jre-1.8:*" JAVA_MAIN_CLASS="org.w3c.tidy.Tidy" JAVA_RESOURCE_DIRS="src/main/resources" diff --git a/dev-java/jtwig-core/Manifest b/dev-java/jtwig-core/Manifest new file mode 100644 index 000000000000..0f09a0671e7a --- /dev/null +++ b/dev-java/jtwig-core/Manifest @@ -0,0 +1 @@ +DIST jtwig-core-5.87.0.tar.gz 212205 BLAKE2B 4c7386e0719c05bca6a8ee977e7b936931c095a675b9c7bc83708e7603da7ac8017cdd270d76e148ddf8037da38ca6448c4b20649c47f0e26c8c949e6a6e094a SHA512 245e8e8a4be48be0ad2e803f6868dc9b7190cf4ee2ed33a1e8c7b439d56fa5eeffeb47134f96790f9d98adb664fe40c773990056aaf7c30b665612986dde5202 diff --git a/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild b/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild new file mode 100644 index 000000000000..4750629545a8 --- /dev/null +++ b/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.jtwig:jtwig-core:${PV}.RELEASE" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Jtwig Reflection Library" +HOMEPAGE="https://github.com/jtwig/jtwig-core" +SRC_URI="https://github.com/jtwig/jtwig-core/archive/${PV}.RELEASE.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}.RELEASE" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~x86" +# no tests because +# net.jperf does not exist +# org.unitils.reflectionassert does not exist +RESTRICT="test" + +DEPEND=" + dev-java/commons-lang:3.6 + dev-java/concurrentlinkedhashmap-lru:0 + dev-java/guava:0 + dev-java/jtwig-reflection:0 + dev-java/parboiled:0 + dev-java/slf4j-api:0 + >=virtual/jdk-1.8:* + test? ( + dev-java/commons-io:1 + dev-java/commons-lang:3.6 + dev-java/hamcrest:0 + dev-java/mockito:0 + ) +" + +RDEPEND=" + >=virtual/jre-1.8:* +" + +JAVA_CLASSPATH_EXTRA=" + commons-lang-3.6 + concurrentlinkedhashmap-lru + guava + jtwig-reflection + parboiled + slf4j-api +" + +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH=" + commons-io-1 + commons-lang-3.6 + hamcrest + junit-4 + mockito +" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" diff --git a/dev-java/ant-antlr/metadata.xml b/dev-java/jtwig-core/metadata.xml index 4221e170cbc0..488c6bf7458e 100644 --- a/dev-java/ant-antlr/metadata.xml +++ b/dev-java/jtwig-core/metadata.xml @@ -3,6 +3,8 @@ <pkgmetadata> <maintainer type="project"> <email>java@gentoo.org</email> - <name>Java</name> </maintainer> + <upstream> + <remote-id type="github">jtwig/jtwig</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/jtwig-reflection/Manifest b/dev-java/jtwig-reflection/Manifest new file mode 100644 index 000000000000..abbce93fde11 --- /dev/null +++ b/dev-java/jtwig-reflection/Manifest @@ -0,0 +1 @@ +DIST jtwig-reflection-5.87.0.tar.gz 70500 BLAKE2B 526e009bfabd3ed5d9034285f28980a52fafeee635e07446f32533ea7f6e4546d164ddc577fa25aabdcd80f64b953752a8c48405858534739d52c19474273fcf SHA512 87e4129833951c5c2903d574a9c4986219c7eb61d7ca2c657ecdeb9890d79149ff610ad7ad0002119ba5db0953f342d648eb46d9553185794d7bb7cb0a79e3ab diff --git a/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild new file mode 100644 index 000000000000..46276ea49c1f --- /dev/null +++ b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.jtwig:jtwig-reflection:${PV}.RELEASE" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Jtwig Reflection Library" +HOMEPAGE="https://github.com/jtwig/jtwig-reflection" +SRC_URI="https://github.com/jtwig/jtwig-reflection/archive/${PV}.RELEASE.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}.RELEASE" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~x86" + +DEPEND=" + dev-java/commons-lang:3.6 + dev-java/guava:0 + dev-java/slf4j-api:0 + >=virtual/jdk-1.8:* + test? ( + dev-java/commons-io:1 + dev-java/hamcrest:0 + dev-java/mockito:0 + ) +" + +RDEPEND=" + >=virtual/jre-1.8:* +" + +JAVA_CLASSPATH_EXTRA=" + commons-lang-3.6 + guava + slf4j-api +" + +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_EXCLUDES=( + # Invalid test class; No runnable methods + org.jtwig.reflection.integration.example.TestArgumentValueResolver + org.jtwig.reflection.integration.example.TestArgumentResolver + org.jtwig.reflection.integration.example.TestArgument +) +JAVA_TEST_GENTOO_CLASSPATH=" + commons-io-1 + hamcrest + junit-4 + mockito +" +JAVA_TEST_SRC_DIR="src/test/java" + +src_test() { + # Unable to make field private final byte[] java.lang.String.value accessible: + # module java.base does not "opens java.lang" to unnamed module @3bc9f433 + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge 17; then + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED ) + fi + java-pkg-simple_src_test +} diff --git a/dev-java/ant-apache-log4j/metadata.xml b/dev-java/jtwig-reflection/metadata.xml index 4221e170cbc0..488c6bf7458e 100644 --- a/dev-java/ant-apache-log4j/metadata.xml +++ b/dev-java/jtwig-reflection/metadata.xml @@ -3,6 +3,8 @@ <pkgmetadata> <maintainer type="project"> <email>java@gentoo.org</email> - <name>Java</name> </maintainer> + <upstream> + <remote-id type="github">jtwig/jtwig</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/junit-dataprovider/metadata.xml b/dev-java/junit-dataprovider/metadata.xml index 75321cfb5598..b37d0d1e2439 100644 --- a/dev-java/junit-dataprovider/metadata.xml +++ b/dev-java/junit-dataprovider/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">TNG/junit-dataprovider</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest index 02e2cf8a230a..7c157778f793 100644 --- a/dev-java/junit/Manifest +++ b/dev-java/junit/Manifest @@ -1,3 +1,4 @@ -DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb -DIST junit-5.9.2.tar.gz 2882173 BLAKE2B 6baf8768654b399d64237a110dcb6a821ab7dc8964254a5d00f7ffb65c789818aed51ad7042a963a47669042baaeec87b5d0453643a2b0eeeaf6393a42c75fd6 SHA512 5673577f773042b4e253241d27298a60dbac239502788e1d999fbe0d3ffe76b29c90d4fb43660f2e2e00e3e9b8d4c1b6b909ff95dc6e87ccb6f7b009ae6b0e78 +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 junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930 +DIST junit5-java18-compatibility.patch 742 BLAKE2B 89bfa36330278cdee2f7f66ed5527895e650a7b490d3f3695772a27541be1d8383c1742bab4e8494f3a84c29f93f553880a3bd5cd4d84792cf662fbc33a6e594 SHA512 5a9a562eb61a875764da369ff40da6ff95c6de8b3b3ecb612634112076741d75d6eab385743843b4fe7ca8a1827960e06550f6e90c8b7ef75b55006b41c416cd diff --git a/dev-java/junit/files/junit-4.13.2_p20240222-ignore-failing-test.patch b/dev-java/junit/files/junit-4.13.2_p20240222-ignore-failing-test.patch new file mode 100644 index 000000000000..512f680c3aaf --- /dev/null +++ b/dev-java/junit/files/junit-4.13.2_p20240222-ignore-failing-test.patch @@ -0,0 +1,85 @@ +1) lookingForStuckThread_threadGroupNotLeaked[lookingForStuckThread = true](org.junit.internal.runners.statements.FailOnTimeoutTest) +java.lang.AssertionError: the 'FailOnTimeoutGroup' thread group should be destroyed after running the test + at org.junit.Assert.fail(Assert.java:89) + at org.junit.Assert.assertTrue(Assert.java:42) + at org.junit.internal.runners.statements.FailOnTimeoutTest.lookingForStuckThread_threadGroupNotLeaked(FailOnTimeoutTest.java:207) + at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59) + at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) + at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:61) + at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) + at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) + at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100) + at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366) + at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103) + at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63) + at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) + at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) + at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) + at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) + at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) + at org.junit.runners.ParentRunner.run(ParentRunner.java:413) + at org.junit.runners.Suite.runChild(Suite.java:128) + at org.junit.runners.Suite.runChild(Suite.java:27) + at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) + at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) + at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) + at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) + at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) + at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) + at org.junit.runners.ParentRunner.run(ParentRunner.java:413) + at org.junit.runners.Suite.runChild(Suite.java:128) + at org.junit.runners.Suite.runChild(Suite.java:27) + at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) + at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) + at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) + at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) + at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) + at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) + at org.junit.runners.ParentRunner.run(ParentRunner.java:413) + at org.junit.runners.Suite.runChild(Suite.java:128) + at org.junit.runners.Suite.runChild(Suite.java:27) + at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) + at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) + at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) + at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) + at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) + at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) + at org.junit.runners.ParentRunner.run(ParentRunner.java:413) + at org.junit.runners.Suite.runChild(Suite.java:128) + at org.junit.runners.Suite.runChild(Suite.java:27) + at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) + at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) + at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) + at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) + at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) + at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) + at org.junit.runners.ParentRunner.run(ParentRunner.java:413) + at org.junit.runner.JUnitCore.run(JUnitCore.java:141) + at org.junit.runner.JUnitCore.run(JUnitCore.java:119) + at org.junit.runner.JUnitCore.runMain(JUnitCore.java:81) + at org.junit.runner.JUnitCore.runMain(JUnitCore.java:40) + at org.junit.runner.JUnitCore.main(JUnitCore.java:36) + +FAILURES!!! +Tests run: 1106, Failures: 1 +--- a/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java ++++ b/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java +@@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean; + import java.util.concurrent.atomic.AtomicReference; + + import org.junit.Test; ++import org.junit.Ignore; + import org.junit.function.ThrowingRunnable; + import org.junit.runner.RunWith; + import org.junit.runners.Parameterized; +@@ -181,7 +182,7 @@ public class FailOnTimeoutTest { + } + } + +- @Test ++ @Test @Ignore + public void lookingForStuckThread_threadGroupNotLeaked() throws Throwable { + assumeTrue(lookingForStuckThread); + final AtomicReference<ThreadGroup> innerThreadGroup = new AtomicReference<ThreadGroup>(); diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild index 2872a332ce63..79144cb8e889 100644 --- a/dev-java/junit/junit-3.8.2-r2.ebuild +++ b/dev-java/junit/junit-3.8.2-r2.ebuild @@ -1,31 +1,30 @@ -# 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="junit:junit:3.8.2" inherit java-pkg-2 java-pkg-simple -MY_P=${P/-/} - DESCRIPTION="Simple framework to write repeatable tests" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" -HOMEPAGE="http://www.junit.org/" +HOMEPAGE="https://junit.org/" +SRC_URI="https://downloads.sourceforge.net/project/junit/junit/${PV}/junit${PV}.zip" +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" +BDEPEND="app-arch/unzip" DEPEND=">=virtual/jdk-1.8" RDEPEND=">=virtual/jre-1.8" -DOCS=( README.html cpl-v10.html ) +HTML_DOCS=( README.html cpl-v10.html ) JAVA_SRC_DIR="${PN}" -S="${WORKDIR}/${MY_P}" - src_unpack() { unpack ${A} cd "${S}" || die @@ -33,11 +32,6 @@ src_unpack() { } src_prepare() { - default + java-pkg-2_src_prepare java-pkg_clean } - -src_install() { - java-pkg-simple_src_install - einstalldocs -} diff --git a/dev-java/junit/junit-4.13.2-r1.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild index af5e4f424217..6a2ce43fc405 100644 --- a/dev-java/junit/junit-4.13.2-r1.ebuild +++ b/dev-java/junit/junit-4.13.2_p20240222.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,21 +10,23 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Simple framework to write repeatable tests" HOMEPAGE="https://junit.org/junit4/" -SRC_URI="https://github.com/${PN}-team/${PN}4/archive/r${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}4-r${PV}" +MY_COMMIT="28fa2cae48b365c949935b28967ffb3f388e77ef" +SRC_URI="https://github.com/${PN}-team/${PN}4/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +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" CP_DEPEND="dev-java/hamcrest-core:1.3" -# not suitable for jdk:21 #916398 DEPEND="${CP_DEPEND} - <=virtual/jdk-17:* + >=virtual/jdk-1.8:* test? ( dev-java/hamcrest-library:1.3 )" RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" +PATCHES=( "${FILESDIR}/junit-4.13.2_p20240222-ignore-failing-test.patch" ) + JAVA_AUTOMATIC_MODULE_NAME="junit" JAVA_ENCODING="ISO-8859-1" JAVA_RESOURCE_DIRS="src/main/resources" @@ -34,6 +36,11 @@ JAVA_TEST_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3" JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS="src/test/resources" +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + src_test() { cd "${JAVA_TEST_SRC_DIR}" || die diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild index 6b6d656db44a..9429d37e25d6 100644 --- a/dev-java/junit/junit-5.9.2.ebuild +++ b/dev-java/junit/junit-5.10.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 @@ -10,19 +10,22 @@ EAPI=8 # multiple times to build multiple modules, but the eclass always # installs each module's Javadoc to the same directory, which would # trigger an error when the second module's Javadoc is installed. -JAVA_PKG_IUSE="source" -IUSE="doc migration-support suite vintage" +JAVA_PKG_IUSE="source test" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Simple framework to write repeatable tests" HOMEPAGE="https://junit.org/junit5/" -SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz" +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 @@ -45,6 +48,7 @@ DEPEND=" >=virtual/jdk-11:* ${CP_DEPEND} ${COND_DEPEND} + test? ( dev-java/jimfs:0 ) " RDEPEND=" @@ -53,6 +57,15 @@ RDEPEND=" ${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: @@ -297,6 +310,7 @@ src_test() { "@${example_sources}" local test_cp="${example_classes}:${JUNIT5_TEST_RESOURCE_DIR}:$(junit5_gen_cp)" + test_cp="${test_cp}:$(java-pkg_getjars --build-only --with-dependencies jimfs)" ejavac -d "${test_classes}" -encoding "${JAVA_ENCODING}" \ -classpath "${test_cp}" ${JAVAC_ARGS} \ "@${test_sources}" diff --git a/dev-java/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest index 573922fb97a0..61b3224c3455 100644 --- a/dev-java/leiningen-bin/Manifest +++ b/dev-java/leiningen-bin/Manifest @@ -1,2 +1,2 @@ -DIST leiningen-2.9.8-standalone.jar 12834369 BLAKE2B 6c9bc9a2f990bb4959aa06f8f8b31c1084f0d2bad2e19c8343fb7e8a02acb6f6173737cbf36b028e113577ef26e380d7ace035316dee840c6da92512afa7ac0b SHA512 de4989bf31fe86bfb943d90b683dd17a7417c267e67ac8036967ed352e47a4361b8b6ec8378a1e6cf24fd8df51bcabb9578bc8f487d812c9fb5c2f5f476016cd -DIST leiningen-2.9.8.sh 4555 BLAKE2B c876d19a4ba9a53d84c31874af442e57e6184ce1f7145512355a88b833d2d236bd73eef93f260d22b51e6200c5579c3721a8b6bcb16d516e503a98a2eaf26126 SHA512 58cba7d457c98546e530ad821273cb3f51445ed3191022d0963dd51683cb6b24d0f7d557da34313083b0df11a2c9885bf6d5bb073dea736731de95e8fbbca492 +DIST leiningen-2.11.2-standalone.jar 16481883 BLAKE2B 556e9fdcd5f8c14e046ff8e12f9c5d52c214f0c7cf8af9469e140dc21187a0cb2d5acc02b0ab48b110278d5143cdeef2b4eb8d2945d5acaf568cfe35e1877c04 SHA512 a49e82acccdaae4f619796adf1ef9d0cfc4998c01f4c918520bb3f757b9f7808fb5c65241f79aea730d1e90181c9c2983b7219ef0893103f7abcedf94afcafd5 +DIST leiningen-2.11.2.sh 7467 BLAKE2B bfd9031e1f0c2b8cedf435832f2da5f45ac4c9fbdb2684f4900b43e62c3ffec03781ca2491f1a305c480a7fa8bf5cccf9e934ecc12e6e0ce1da539d9d8fe01dd SHA512 b4e0c553148f81bced1d8df09811f337352149bba879b0828fdeb6efd176fcebf0c4f263a5c8b74241b6a2dd7df52d932271cbf8f11f71279b498f8a9e2399b4 diff --git a/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.11.2.ebuild index 182f3392805f..9b67aaa8bbc5 100644 --- a/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild +++ b/dev-java/leiningen-bin/leiningen-bin-2.11.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 EAPI=8 diff --git a/dev-java/libg/Manifest b/dev-java/libg/Manifest index 068af0665527..a890570b45c8 100644 --- a/dev-java/libg/Manifest +++ b/dev-java/libg/Manifest @@ -1 +1 @@ -DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e +DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c diff --git a/dev-java/libg/libg-2.1.0-r2.ebuild b/dev-java/libg/libg-2.1.0-r2.ebuild deleted file mode 100644 index 426364b8ed10..000000000000 --- a/dev-java/libg/libg-2.1.0-r2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Lots of small utilities for bndlib, a swiss army knife for OSGi" -HOMEPAGE="https://bnd.bndtools.org/" -SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> bndlib-${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Tests depend on biz.aQute.junit, which depends on biz.aQute.bndlib, which on -# its own turn again depends on aQute.libg again; we can temporarily assume that -# if bndlib tests pass that libg is sufficiently tested, in the future we should -# look whether it is feasible to combine the packages or otherwise temporarily -# build biz.aquite.bndlib and biz.aqute.junit in this package. -RESTRICT="test" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -S="${WORKDIR}/bnd-${PV}.REL/aQute.${PN}" - -EANT_BUILD_TARGET="build" - -src_prepare() { - default - # Move the correct build.xml into place, needed for testing. - cp ../cnf/build.xml . || die "Failed to move build file into the right place." - - # Remove bundled jar files. - find . -name '*.jar' -delete - - # Remove test files - if ! use test ; then - find src/test -name '*.java' -delete || die "Failed to remove test files." - fi -} - -src_install() { - java-pkg_newjar generated/aQute.${PN}.jar -} diff --git a/dev-java/libg/libg-7.0.0.ebuild b/dev-java/libg/libg-7.0.0.ebuild new file mode 100644 index 000000000000..7acbb7965c60 --- /dev/null +++ b/dev-java/libg/libg-7.0.0.ebuild @@ -0,0 +1,51 @@ +# 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}.tar.gz -> aQute.bnd-${PV}.tar.gz" +S="${WORKDIR}/bnd-${PV}" + +LICENSE="Apache-2.0 EPL-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" +# aQute.bnd.test.jupiter does not exist +# org.assertj.core.api.junit.jupiter does not exist +RESTRICT="test" #839681 + +CP_DEPEND=" + dev-java/slf4j-api:0 +" + +# compile error with jdk:21, restricting to jdk:17 +# aQute.libg/src/aQute/lib/collections/SortedList.java:31: error: types List<T> and SortedSet<T> are incompatible; +# public class SortedList<T> implements SortedSet<T>, List<T> { +# ^ +# both define reversed(), but with unrelated return types +# where T is a type-variable: +# T extends Object declared in class SortedList +DEPEND="${CP_DEPEND} + ~dev-java/bnd-annotation-${PV}:0 + dev-java/osgi-cmpn:8 + virtual/jdk:17 +" + +# aQute.libg/src/aQute/libg/uri/URIUtil.java:161: +# error: switch expressions are not supported in -source 11 +RDEPEND="${CP_DEPEND} + >=virtual/jre-17:* +" + +JAVA_AUTOMATIC_MODULE_NAME="aQute.libg" +JAVA_CLASSPATH_EXTRA=" + bnd-annotation + osgi-cmpn-8 +" +JAVA_SRC_DIR="aQute.libg/src" diff --git a/dev-java/libg/metadata.xml b/dev-java/libg/metadata.xml index 94feb65b0b18..cb6317e530db 100644 --- a/dev-java/libg/metadata.xml +++ b/dev-java/libg/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <upstream> - <remote-id type="github">bndtools/bnd</remote-id> - </upstream> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">bndtools/bnd</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest index 32bc29febef6..8c052711ebb3 100644 --- a/dev-java/lucene/Manifest +++ b/dev-java/lucene/Manifest @@ -1 +1,2 @@ -DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e +DIST lucene-2.4.1-src.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e +DIST lucene-2.4.1-src.tar.gz.asc 189 BLAKE2B 614fc428936d49caac1072e5c4fe5a31d86545220483f1e60fee6560b3bf1d661eb718013c8211ff701758aff37ebe3ffe18bb0a94d90b75962d1e74b8005f6b SHA512 38eee5a062ca11c638b3a0e131ffe133b49e9c759216d854f2be99e27a8445408b1097df28436e6155f551df0ddf9ca16a286652c9ce12dc114228bbd125dba2 diff --git a/dev-java/lucene/files/lucene-2.4.1-javacc.home.patch b/dev-java/lucene/files/lucene-2.4.1-javacc.home.patch new file mode 100644 index 000000000000..9668b6de1ff4 --- /dev/null +++ b/dev-java/lucene/files/lucene-2.4.1-javacc.home.patch @@ -0,0 +1,13 @@ +diff --git a/common-build.xml b/common-build.xml +index 3fa75d1..1e695cf 100644 +--- a/common-build.xml ++++ b/common-build.xml +@@ -110,7 +110,7 @@ + <available + property="javacc.present" + classname="org.javacc.parser.Main" +- classpath="${javacc.home}/bin/lib/javacc.jar" ++ classpath="${javacc.home}/javacc.jar" + /> + + <available diff --git a/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch b/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch new file mode 100644 index 000000000000..d8e3611539aa --- /dev/null +++ b/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch @@ -0,0 +1,25 @@ +[junit] +[junit] Testsuite: org.apache.lucene.index.TestIndexInput +[junit] Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.069 sec +[junit] +[junit] Testcase: testRead(org.apache.lucene.index.TestIndexInput): FAILED +[junit] expected:<[]> but was:<[��]> +[junit] junit.framework.ComparisonFailure: expected:<[]> but was:<[��]> +[junit] at org.apache.lucene.index.TestIndexInput.testRead(TestIndexInput.java:89) +[junit] +[junit] +[junit] Test org.apache.lucene.index.TestIndexInput FAILED + +https://bugs.gentoo.org/312437 + +--- a/src/test/org/apache/lucene/index/TestIndexInput.java ++++ b/src/test/org/apache/lucene/index/TestIndexInput.java +@@ -23,7 +23,7 @@ import org.apache.lucene.store.IndexInput; + import java.io.IOException; + + public class TestIndexInput extends LuceneTestCase { +- public void testRead() throws IOException { ++ public void noTestRead() throws IOException { + IndexInput is = new MockIndexInput(new byte[] { + (byte) 0x80, 0x01, + (byte) 0xFF, 0x7F, diff --git a/dev-java/lucene/lucene-2.4.1-r3.ebuild b/dev-java/lucene/lucene-2.4.1-r3.ebuild deleted file mode 100644 index 01cdd2a220ea..000000000000 --- a/dev-java/lucene/lucene-2.4.1-r3.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -JAVA_PKG_BSFIX_ALL="no" -JAVA_PKG_BSFIX_NAME="build.xml common-build.xml" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="High-performance, full-featured text search engine written entirely in Java" -HOMEPAGE="https://lucene.apache.org" -SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2.4" -KEYWORDS="amd64 x86" - -CDEPEND=" - dev-java/javacc:0" - -# Restricting to jdk:1.8 since it fails to build with openjdk-17 -# BUILD FAILED -# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: rmic does not exist under Java 15 and higher, -# use rmic of an older JDK and explicitly set the executable attribute -DEPEND=" - ${CDEPEND} - virtual/jdk:1.8 - test? ( - dev-java/junit:0 - dev-java/ant-core:0 - )" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -src_prepare() { - default - java-pkg_clean - sed -i -e '/-Xmax/ d' common-build.xml || die - - # Portage marks shese files as bogus for some reason. - find . -type f -name instruction_arrow.png -exec rm -v {} \; || die -} - -src_compile() { - # regenerate javacc files just because we can - # put javacc.jar on ant's classpath here even when <javacc> task - # doesn't use it - it's to fool the <available> test, first time - # it's useful not to have ignoresystemclasses=true... - ANT_TASKS="ant-core javacc" \ - eant \ - -Djavacc.home="${EPREFIX}"/usr/share/javacc/lib \ - javacc - ANT_TASKS="none" \ - eant \ - -Dversion=${PV} \ - jar-core \ - jar-demo \ - $(use_doc javadocs-core javadocs-demo) -} - -src_test() { - java-ant_rewrite-classpath common-build.xml - EANT_GENTOO_CLASSPATH="junit ant-core" \ - ANT_TASKS="ant-junit" \ - eant \ - test-core -} - -src_install() { - einstalldocs - java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar" - java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar" - - if use doc; then - dodoc -r docs - java-pkg_dohtml -r build/docs/api - fi - use source && java-pkg_dosrc src/java/org -} diff --git a/dev-java/lucene/lucene-2.4.1-r4.ebuild b/dev-java/lucene/lucene-2.4.1-r4.ebuild new file mode 100644 index 000000000000..c69bb031e695 --- /dev/null +++ b/dev-java/lucene/lucene-2.4.1-r4.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-2 verify-sig + +DESCRIPTION="High-performance, full-featured text search engine written entirely in Java" +HOMEPAGE="https://lucene.apache.org" +SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz + verify-sig? ( https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz.asc )" + +LICENSE="Apache-2.0" +SLOT="2.4" +KEYWORDS="~amd64 ~x86" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lucene.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-lucene )" + +# Restricting to jdk:1.8 since it fails to build with openjdk-17 +# BUILD FAILED +# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: \ +# rmic does not exist under Java 15 and higher, +# use rmic of an older JDK and explicitly set the executable attribute +DEPEND=" + dev-java/javacc:0 + virtual/jdk:1.8 + test? ( + >=dev-java/ant-1.10.14-r3:0[junit] + dev-java/junit:0 + )" + +RDEPEND=">=virtual/jre-1.8:*" + +PATCHES=( + "${FILESDIR}/lucene-2.4.1-skipFailingTest.patch" + "${FILESDIR}/lucene-2.4.1-javacc.home.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean + + cat > build.properties <<-EOF || die + junit-location.jar=$(java-pkg_getjars --build-only junit) + javacc.home=${EPREFIX}/usr/share/javacc/lib/ + EOF + # stop scrambling the build.xml + touch "${T}/java-ant-2_src_configure-run" + + rm docs/skin/images/instruction_arrow.png || die #: broken IDAT window length + rm docs/images/instruction_arrow.png || die #: broken IDAT window length +} + +src_compile() { + eant javacc + + eant \ + -Dversion=${PV} \ + jar-core \ + jar-demo \ + $(use_doc javadocs-core javadocs-demo) +} + +src_test() { + eant test-core +} + +src_install() { + einstalldocs + java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar" + java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar" + + if use doc; then + dodoc -r docs + java-pkg_dohtml -r build/docs/api + fi + use source && java-pkg_dosrc src/java/org +} diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-gentoo-classpath.xml b/dev-java/lz4-java/files/lz4-java-1.8.0-gentoo-classpath.xml deleted file mode 100644 index 2392679c4a69..000000000000 --- a/dev-java/lz4-java/files/lz4-java-1.8.0-gentoo-classpath.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<project name="gentoo-classpath"> - <path id="mvel.classpath"> - <pathelement path="${gentoo.classpath}" /> - </path> -</project> diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-print-os-props.patch b/dev-java/lz4-java/files/lz4-java-1.8.0-print-os-props.patch deleted file mode 100644 index d4363b6853e4..000000000000 --- a/dev-java/lz4-java/files/lz4-java-1.8.0-print-os-props.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b8d50d44ba1c0e4b5bf297f7499ad0fb5b82706e Mon Sep 17 00:00:00 2001 -From: Yuan Liao <liaoyuan@gmail.com> -Date: Wed, 19 Jan 2022 10:09:14 -0800 -Subject: [PATCH] build.xml: Add target that prints JVM system properties os.* - -The Gentoo custom JNI Makefile needs some of those properties. - -Signed-off-by: Yuan Liao <liaoyuan@gmail.com> ---- - build.xml | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/build.xml b/build.xml -index b7940ab..96e52ea 100644 ---- a/build.xml -+++ b/build.xml -@@ -62,6 +62,11 @@ - <javaversion atleast="10"/> - </condition> - -+ <target name="os-props" -+ description="echo values of JVM system properties os.* to file os.properties"> -+ <echoproperties prefix="os." destfile="os.properties" /> -+ </target> -+ - <target name="clean" description="clean working copy"> - <delete dir="${build}" /> - <delete dir="${dist}" /> --- -2.34.1 - diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile b/dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile deleted file mode 100644 index 4a766552c65e..000000000000 --- a/dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# Gentoo custom Makefile for the JNI portion of lz4-java -# -# Adapted from the logic for target "compile-jni" in build.xml, -# but uses lz4 installed on the system. This Makefile respects -# custom CFLAGS and LDFLAGS settings, whereas build.xml does not. - -# Java system properties read by build.xml -PLATFORM ?= linux -SRC ?= src -BUILD ?= build -JAVA_HOME ?= -# Requires lz4-java-*-print-os-props.patch -OS_ARCH := $(shell ant os-props 2>&1 > /dev/null && \ - grep 'os\.arch=' os.properties | sed -e 's/os\.arch=//') - -MKDIR_P = mkdir -p - -SRC_DIR := $(SRC)/jni -OBJS_DIR_PREFIX := $(BUILD)/objects -OBJS_DIR := $(OBJS_DIR_PREFIX)/$(SRC_DIR) -OUT_DIR := $(BUILD)/jni/net/jpountz/util/$(PLATFORM)/$(OS_ARCH) - -SRC_FILES := $(wildcard $(SRC_DIR)/*.c) -OBJS := $(addprefix $(OBJS_DIR_PREFIX)/,$(SRC_FILES:.c=.o)) -SONAME = liblz4-java.so - -# C compiler arguments may be obtained by running 'ant -v compile-jni', -# as long as dev-java/cpptasks is in the classpath -CFLAGS := -fPIC $(CFLAGS) - -$(OUT_DIR)/$(SONAME): $(OBJS) | $(OUT_DIR) - # '-llz4' must be listed after this package's objects - # https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Importance_of_linking_order - $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$(SONAME) -o $@ $^ -llz4 - -$(OBJS_DIR_PREFIX)/%.o: %.c | $(OBJS_DIR) - $(CC) $(CFLAGS) -c -o $@ \ - -I$(JAVA_HOME)/../include -I$(JAVA_HOME)/../include/$(PLATFORM) \ - -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(PLATFORM) \ - -I$(BUILD)/jni-headers \ - $< - -$(OUT_DIR): - $(MKDIR_P) $@ - -$(OBJS_DIR): - $(MKDIR_P) $@ diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-skip-ivy.patch b/dev-java/lz4-java/files/lz4-java-1.8.0-skip-ivy.patch deleted file mode 100644 index 26c09e147072..000000000000 --- a/dev-java/lz4-java/files/lz4-java-1.8.0-skip-ivy.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 95ae85542f39cecd1af6a3e661ad6120195d2304 Mon Sep 17 00:00:00 2001 -From: Yuan Liao <liaoyuan@gmail.com> -Date: Mon, 20 Dec 2021 09:57:31 -0800 -Subject: [PATCH] build.xml: Skip Ivy logic and use Gentoo classpath - -Signed-off-by: Yuan Liao <liaoyuan@gmail.com> ---- - build.xml | 22 +++++++--------------- - 1 file changed, 7 insertions(+), 15 deletions(-) - -diff --git a/build.xml b/build.xml -index b7940ab..ff321c6 100644 ---- a/build.xml -+++ b/build.xml -@@ -20,6 +20,8 @@ - xmlns:junit4="antlib:com.carrotsearch.junit4" - xmlns:mvn="antlib:org.apache.maven.artifact.ant"> - -+ <import file="gentoo-classpath.xml" /> -+ - <property name="src" location="src"/> - <property name="build" location="build"/> - <property name="dist" location="dist"/> -@@ -81,8 +83,6 @@ - </target> - - <target name="install-cpptasks" unless="cpptasks.available"> -- <ivy:cachepath organisation="ant-contrib" module="cpptasks" revision="1.0b5" -- inline="true" conf="default" transitive="true" pathid="cpptasks.classpath"/> - <taskdef uri="antlib:net.sf.antcontrib.cpptasks" resource="net/sf/antcontrib/cpptasks/antlib.xml" classpathref="cpptasks.classpath"/> - <property name="cpptasks.available" value="true"/> - </target> -@@ -117,22 +117,14 @@ - - <target name="init"> - <tstamp /> -- <ivy:resolve file="${ivy.xml.name}" conf="test" /> -- <ivy:retrieve /> - </target> - - <target name="install-junit4" depends="init" unless="junit4.available"> -- <taskdef uri="antlib:com.carrotsearch.junit4"> -- <classpath> -- <fileset dir="${lib}" includes="*.jar" /> -- </classpath> -- </taskdef> -+ <taskdef uri="antlib:com.carrotsearch.junit4" resource="com/carrotsearch/junit4/antlib.xml" classpath="${gentoo.classpath}"/> - <property name="junit4.available" value="true" /> - </target> - - <target name="generate-sources" depends="init"> -- <ivy:cachepath organisation="org.mvel" module="mvel2" revision="2.3.2.Final" -- inline="true" conf="default" transitive="true" pathid="mvel.classpath"/> - <mkdir dir="${build}/java" /> - <java - fork="true" -@@ -244,12 +236,12 @@ - <pathelement path="${build}/classes" /> - <pathelement path="${build}/unsafe-classes" /> - <pathelement path="${build}/generated-classes" /> -- <fileset dir="lib" includes="*.jar" /> -+ <pathelement path="${gentoo.classpath}" /> - </path> - - <path id="compile.tests.classpath.with.jar"> - <pathelement path="${lz4-java.jar}" /> -- <fileset dir="lib" includes="*.jar" /> -+ <pathelement path="${gentoo.classpath}" /> - </path> - - <path id="test.classpath"> -@@ -260,14 +252,14 @@ - <pathelement path="${build}/unsafe-classes" /> - <pathelement path="${build}/generated-classes" /> - <pathelement path="${build}/test-classes" /> -- <fileset dir="${lib}" includes="*.jar" /> -+ <pathelement path="${gentoo.classpath}" /> - </path> - - <path id="test.classpath.with.jar"> - <pathelement path="${lz4-java.jar}" /> - <pathelement path="${src}/test-resources" /> - <pathelement path="${build}/test-classes" /> -- <fileset dir="${lib}" includes="*.jar" /> -+ <pathelement path="${gentoo.classpath}" /> - </path> - - <target name="test" description="run tests"> --- -2.32.0 - diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild deleted file mode 100644 index 993a8803f183..000000000000 --- a/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.lz4:lz4-java:1.8.0" - -inherit java-pkg-2 java-ant-2 toolchain-funcs - -DESCRIPTION="LZ4 compression for Java" -HOMEPAGE="https://github.com/lz4/lz4-java" -SRC_URI="https://github.com/lz4/lz4-java/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Tests require com.carrotsearch.randomizedtesting:junit4-ant, which is yet to -# be packaged. Some extra steps are required before running the tests: -# 1. Download junit4-ant 2.7.x from https://mvnrepository.com/artifact/com.carrotsearch.randomizedtesting/junit4-ant -# 2. Set EANT_GENTOO_CLASSPATH_EXTRA to the path to junit4-ant-2.7.*.jar -# 3. ppc64 only: Install test dependencies that are unkeyworded -# 4. Set ALLOW_TEST="all" -RESTRICT="test" - -CDEPEND=" - app-arch/lz4:= -" - -# The version requirement on mvel is strict; mvel-2.4.* generates source files -# incorrectly, which causes build failure of this package -DEPEND=" - >=virtual/jdk-1.8:* - dev-java/mvel:2.3 - dev-libs/xxhash - test? ( - dev-java/junit:4 - !ppc64? ( - dev-java/randomized-runner:0 - ) - ) - ${CDEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND} -" - -# Ant is only needed to generate JNI headers; -# the JNI shared object will be built by the custom Makefile -EANT_BUILD_TARGET="compile-java generate-headers" -EANT_DOC_TARGET="docs" -EANT_EXTRA_ARGS="-Djava.io.tmpdir=${T}" -EANT_TEST_GENTOO_CLASSPATH="randomized-runner" - -pkg_setup() { - java-pkg-2_pkg_setup - local build_only_cp="$(java-pkg_getjars --build-only mvel-2.3)" - if [[ -z "${EANT_GENTOO_CLASSPATH_EXTRA}" ]]; then - EANT_GENTOO_CLASSPATH_EXTRA="${build_only_cp}" - else - EANT_GENTOO_CLASSPATH_EXTRA+=":${build_only_cp}" - fi -} - -src_prepare() { - eapply "${FILESDIR}/${P}-print-os-props.patch" - eapply "${FILESDIR}/${P}-skip-ivy.patch" - cp "${FILESDIR}/${P}-r1-Makefile" Makefile || die "Failed to copy Makefile" - cp "${FILESDIR}/${P}-gentoo-classpath.xml" gentoo-classpath.xml || - die "Failed to copy Gentoo classpath injection XML" - java-pkg-2_src_prepare - rm -r src/resources || die "Failed to remove pre-built shared libraries" -} - -src_compile() { - java-pkg-2_src_compile - emake CC="$(tc-getCC)" JAVA_HOME="${JAVA_HOME}" - # JNI has already been built by the Makefile at this point - # Also pretend cpptasks is available, which is required by build.xml - EANT_EXTRA_ARGS+=" -Dcpptasks.available=true -Dskip.jni=true" - # Manually call 'ant jar' to include the JNI shared object in JAR - eant jar -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS} -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar 'dist/${ivy.module}.jar' - java-pkg_doso $(find build/jni -name "*.so") - use doc && java-pkg_dojavadoc build/docs - # Ant project's 'sources' target generates a source JAR rather than a Zip - # archive; we simply let java-utils-2.eclass create the source Zip archive - # from the same source directories the 'sources' target would access - # https://github.com/lz4/lz4-java/blob/1.8.0/build.xml#L323-L330 - use source && java-pkg_dosrc src/java/* src/java-unsafe/* -} diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild index 430ed388f301..9e2b264421f8 100644 --- a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild +++ b/dev-java/lz4-java/lz4-java-1.8.0-r4.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="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=" app-arch/lz4:= @@ -69,14 +69,12 @@ src_compile() { mkdir -p build/objects/src/jni mkdir -p build/jni/net/jpountz/util/linux/amd64 "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ - -I$(java-config -O)/../include -I$(java-config -O)/../include/linux \ - -I$(java-config -O)/include -I$(java-config -O)/include/linux \ + $(java-pkg_get-jni-cflags) \ -Ibuild/jni-headers \ -c -o build/objects/src/jni/net_jpountz_lz4_LZ4JNI.o \ src/jni/net_jpountz_lz4_LZ4JNI.c "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ - -I$(java-config -O)/../include -I$(java-config -O)/../include/linux \ - -I$(java-config -O)/include -I$(java-config -O)/include/linux \ + $(java-pkg_get-jni-cflags) \ -Ibuild/jni-headers \ -c -o build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o \ src/jni/net_jpountz_xxhash_XXHashJNI.c diff --git a/dev-java/lzmajio/metadata.xml b/dev-java/lzmajio/metadata.xml index 3d4abd0c4745..5e61ef6e5b3f 100644 --- a/dev-java/lzmajio/metadata.xml +++ b/dev-java/lzmajio/metadata.xml @@ -5,4 +5,7 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> - </pkgmetadata> + <upstream> + <remote-id type="github">league/lzmajio</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest index 60cd3afc1713..bb82135cc067 100644 --- a/dev-java/maven-bin/Manifest +++ b/dev-java/maven-bin/Manifest @@ -1,2 +1,2 @@ DIST apache-maven-3.8.8-bin.tar.gz 8296049 BLAKE2B af6353193365ed33e8f2f0a7e4d31933132751f142ebbdb68aab7a74ad2dda6593bf34cef9d8d56d6c93ff93293b75517a10a5c1c048733b8c911f4ac150bdf6 SHA512 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00 -DIST apache-maven-3.9.5-bin.tar.gz 9359994 BLAKE2B d73d5bc7f5028068492ed7710897b370e4a97592bef0ff055ce2d7dea222bb348f5886b7b5e86ce2787296e90e1a35eab057208c1edbadd5c82447116a14f3f4 SHA512 4810523ba025104106567d8a15a8aa19db35068c8c8be19e30b219a1d7e83bcab96124bf86dc424b1cd3c5edba25d69ec0b31751c136f88975d15406cab3842b +DIST apache-maven-3.9.8-bin.tar.gz 9083702 BLAKE2B c636ea861d1c96938490453600cac513caf54843ffc26f45e22a655e737af93689d492e3b3055b184a33a1975aaa50a681a29412ebfd036dfd8e2c61043f6291 SHA512 7d171def9b85846bf757a2cec94b7529371068a0670df14682447224e57983528e97a6d1b850327e4ca02b139abaab7fcb93c4315119e6f0ffb3f0cbc0d0b9a2 diff --git a/dev-java/maven-bin/maven-bin-3.9.5-r1.ebuild b/dev-java/maven-bin/maven-bin-3.9.8.ebuild index 12476315273c..16060561ede9 100644 --- a/dev-java/maven-bin/maven-bin-3.9.5-r1.ebuild +++ b/dev-java/maven-bin/maven-bin-3.9.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 @@ -11,8 +11,9 @@ MY_P="${MY_PN}-${MY_PV}" MY_MV="${PV%%.*}" DESCRIPTION="Project Management and Comprehension Tool for Java" -SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" HOMEPAGE="https://maven.apache.org/" +SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0" SLOT="3.9" @@ -25,8 +26,6 @@ DEPEND=" RDEPEND=" >=virtual/jre-1.8:*" -S="${WORKDIR}/${MY_P}" - MAVEN="${PN}-${SLOT}" MAVEN_SHARE="/usr/share/${MAVEN}" diff --git a/dev-java/memoryfilesystem/metadata.xml b/dev-java/memoryfilesystem/metadata.xml index 75321cfb5598..f67c22072a32 100644 --- a/dev-java/memoryfilesystem/metadata.xml +++ b/dev-java/memoryfilesystem/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">marschall/memoryfilesystem</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest index 958c591e5812..6513dd221b48 100644 --- a/dev-java/mill-bin/Manifest +++ b/dev-java/mill-bin/Manifest @@ -1,2 +1,3 @@ -DIST mill-bin-0.11.4 61557418 BLAKE2B 712ad3df280f38b01a617fbefafad50c9c87af74ef618b8ab4e8fa8c066089087966230e005eaca55d56c1242e6380278a5fb63efc9d2438b9b0d549605dc17e SHA512 601eecf62f9f6651ccd874b02a16ff0f451b1b60861341a61e78e11d813cb1d5a938922f77942282f388b6497c6eadd4d972d1c237cdadb1b8aba3975e29050b DIST mill-bin-0.11.5 52760276 BLAKE2B 1583403fba8782d759a5d56513e2d40cd81ffb68d4947b638052cc6108d6d6516f7fc16e9cf516fc7c2c60820d2d6fcb5c15179bcef715c6d75f25c6802fe711 SHA512 673d636fc64fff01289ad642f2f861f6da18d3e652cdd645e3d2487daf1baf4616515e31540a03f67dbc354efff4f48a6881e1ceecfb966eb24d7675abb6dff7 +DIST mill-bin-0.11.6 52778046 BLAKE2B 5f05b14cafba4e6b40b89572310a2b06ddbf1839a2da0dbdfe73a63606c9b1262fed686f7ffb17dc178072242136a4b334a2ae89b2fdc7274bffee928ff3c5fe SHA512 9f187b00d37f8d0bb97b7cd08c57e59e081c835e25f83e6c65bf2ca425f4325a6c641f7082ef700dac30ab6d4f59da5492136eeab21c898f11a259b89d55e9b8 +DIST mill-bin-0.11.7 59806165 BLAKE2B bc97d64a692a33a482752828a703cb22d44bafeeb3aa329136d601058b56bf94703f97047be416bcbcfeb9633288f31e5715646aad359be59deffc957fc15b7c SHA512 c7c2cecd5cec6aab735e36182fade4e7360684795af42b528c1a7e5b0a0dc89dc4c68d47400d46121854c455f72e47f51c73ac4f8e70339ce5a7d18ae8b088de diff --git a/dev-java/mill-bin/mill-bin-0.11.4.ebuild b/dev-java/mill-bin/mill-bin-0.11.6.ebuild index b2461d64d37b..95f583ce077d 100644 --- a/dev-java/mill-bin/mill-bin-0.11.4.ebuild +++ b/dev-java/mill-bin/mill-bin-0.11.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 EAPI=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 new file mode 100644 index 000000000000..5b24c097e25e --- /dev/null +++ b/dev-java/mill-bin/mill-bin-0.11.7.ebuild @@ -0,0 +1,26 @@ +# 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://com-lihaoyi.github.io/mill/" +SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}" +KEYWORDS="~amd64 ~x86" + +LICENSE="MIT" +SLOT="0" + +RDEPEND=">=virtual/jre-1.8:*" + +S="${WORKDIR}" + +src_unpack() { + : +} + +src_install() { + newbin "${DISTDIR}"/${P} ${MY_PN} +} diff --git a/dev-java/mockito/mockito-1.9.5-r3.ebuild b/dev-java/mockito/mockito-1.9.5-r4.ebuild index b3f923f412a9..6c673f92d0ab 100644 --- a/dev-java/mockito/mockito-1.9.5-r3.ebuild +++ b/dev-java/mockito/mockito-1.9.5-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 @@ SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" CP_DEPEND=" - dev-java/ant-core:0 + >=dev-java/ant-1.10.14-r3:0 dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/objenesis:0 diff --git a/dev-java/mvel/Manifest b/dev-java/mvel/Manifest index 63212e9bcedb..41568dbf8e17 100644 --- a/dev-java/mvel/Manifest +++ b/dev-java/mvel/Manifest @@ -1,2 +1 @@ -DIST mvel2-2.3.2.Final.tar.gz 2405839 BLAKE2B 5f12652a0f4375f6e24f18313d99a02bb86463cc1acc2f8845b815c9c7afcda410d67c9f1c30544f9ab1cd50a48ce0ab72e9cca94faafab776f3704b1d5fa087 SHA512 9d1c92bfe90aa4cfe5f4bbdd7eef2060bfaec3979c5c07a5baf3ddb4d84a00632dcaec266bab675b31d5b745bfa36a89dd5969ababeb64332069939a4df23dbc DIST mvel2-2.5.0.Final.tar.gz 2182715 BLAKE2B 1e8dbde4b75e36ea4d285ab45c0040957b9af7b5819786daf6469ae509c9c1e16ba2b201a05f9f9cf1c694bac816afd2d613226a8eb3b06f9049a898c6586b85 SHA512 29ca1ef8fdc4cbb97b5847f59e7c3118e837022d7292b507869208da1798b55d0445c40214d72c159e610d7094df7002c091296b2b31775a1ad0606f622d12b5 diff --git a/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch b/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch deleted file mode 100644 index 1cfd9e8abc36..000000000000 --- a/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fcf12bd0322556b4396a72a5402124d9543781d9 Mon Sep 17 00:00:00 2001 -From: Yuan Liao <liaoyuan@gmail.com> -Date: Sun, 16 Jan 2022 09:48:48 -0800 -Subject: [PATCH] Ignore tests that fail even when run by Maven on JUnit 4.13.2 - -To reproduce the failure, make sure to edit line 249 of pom.xml to use -JUnit 4.13.2. Note that the failed tests are JUnit 3 tests, which -cannot be ignored with the @org.junit.Ignore annotation. - -When no tests are ignored, only testMapAccessWithNestedMethodCall() will -fail. However, ignoring that test will cause -testMapAccessWithNestedProperty() to fail afterwards. - -Signed-off-by: Yuan Liao <liaoyuan@gmail.com> ---- - src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java b/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java -index ea7661bb..1c92c327 100644 ---- a/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java -+++ b/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java -@@ -3431,7 +3431,7 @@ public class CoreConfidenceTests extends AbstractTest { - assertTrue(result); - } - -- public void testMapAccessWithNestedMethodCall() { -+ public void noTestMapAccessWithNestedMethodCall() { - String str = "map[aMethod(1)] == \"one\""; - - ParserConfiguration pconf = new ParserConfiguration(); -@@ -3446,7 +3446,7 @@ public class CoreConfidenceTests extends AbstractTest { - assertTrue(result); - } - -- public void testMapAccessWithNestedProperty() { -+ public void noTestMapAccessWithNestedProperty() { - String str = "map[key] == \"one\""; - - ParserConfiguration pconf = new ParserConfiguration(); --- -2.34.1 - diff --git a/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch b/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch deleted file mode 100644 index d019002cda1f..000000000000 --- a/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 04f476bbc3768d9052ae9c8a1b0aa53340a993b3 Mon Sep 17 00:00:00 2001 -From: Yuan Liao <liaoyuan@gmail.com> -Date: Sun, 16 Jan 2022 08:01:46 -0800 -Subject: [PATCH] ASMAccessorOptimizer: Update supported Java versions as of - 2.4.14 - -Squashed patch of the following commits: - -From: deaddowney <spamcontrol@mac.com> -Date: Fri, 22 Jun 2018 09:38:24 -0400 -Subject: [PATCH 1/4] Mvel not working with Java 10 (11) GH Issue #159 - -From: dieter sauvillers <dieter.sauvillers@corilus.be> -Date: Tue, 2 Apr 2019 10:20:31 +0200 -Subject: [PATCH 2/4] mvel does not work with java 12 #185 - -From: mmelko <mmelko@redhat.com> -Date: Fri, 26 Jun 2020 08:55:24 +0200 -Subject: [PATCH 3/4] Fix building on java 14 - -From: mariofusco <mario.fusco@gmail.com> -Date: Mon, 24 Aug 2020 08:54:22 +0200 -Subject: [PATCH 4/4] drop compatibility with java versions lower than 1.4 - -Signed-off-by: Yuan Liao <liaoyuan@gmail.com> ---- - .../mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java -index 45520538..4c4c876e 100644 ---- a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java -+++ b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java -@@ -118,13 +118,8 @@ public class ASMAccessorOptimizer extends AbstractOptimizer implements AccessorO - OPCODES_VERSION = Opcodes.V1_4; - } else if (javaVersion.startsWith("1.5")) { - OPCODES_VERSION = Opcodes.V1_5; -- } else if (javaVersion.startsWith("1.6") -- || javaVersion.startsWith("1.7") -- || javaVersion.startsWith("1.8") -- || javaVersion.startsWith("9")) { -- OPCODES_VERSION = Opcodes.V1_6; - } else { -- OPCODES_VERSION = Opcodes.V1_2; -+ OPCODES_VERSION = Opcodes.V1_6; - } - - String defaultNameSapce = getProperty("mvel2.namespace"); --- -2.34.1 - diff --git a/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch b/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch deleted file mode 100644 index 8b7250540b05..000000000000 --- a/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0a316a5cb0d889220fb3e730ea1471c1b4052736 Mon Sep 17 00:00:00 2001 -From: Yuan Liao <liaoyuan@gmail.com> -Date: Sun, 16 Jan 2022 10:21:47 -0800 -Subject: [PATCH] Update program version shown in program output - -Signed-off-by: Yuan Liao <liaoyuan@gmail.com> ---- - src/main/java/org/mvel2/MVEL.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main/java/org/mvel2/MVEL.java b/src/main/java/org/mvel2/MVEL.java -index eafe17fc..6bbf5f06 100644 ---- a/src/main/java/org/mvel2/MVEL.java -+++ b/src/main/java/org/mvel2/MVEL.java -@@ -45,7 +45,7 @@ import static org.mvel2.util.ParseTools.optimizeTree; - public class MVEL { - public static final String NAME = "MVEL (MVFLEX Expression Language)"; - public static final String VERSION = "2.3"; -- public static final String VERSION_SUB = "0"; -+ public static final String VERSION_SUB = "2"; - public static final String CODENAME = "liberty"; - static boolean DEBUG_FILE = getBoolean("mvel2.debug.fileoutput"); - static String ADVANCED_DEBUGGING_FILE = System.getProperty("mvel2.debugging.file") == null ? "mvel_debug.txt" : System.getProperty("mvel2.debugging.file"); --- -2.34.1 - diff --git a/dev-java/mvel/mvel-2.3.2-r1.ebuild b/dev-java/mvel/mvel-2.3.2-r1.ebuild deleted file mode 100644 index 2fc29e17956e..000000000000 --- a/dev-java/mvel/mvel-2.3.2-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.mvel:mvel2:2.3.2.Final" - -# Note: This package has a mixture of JUnit 3 and JUnit 4 tests, all of which -# can be run with JUnit 4. As of January 2022, JUnit 3 test launcher will only -# run 2 tests out of nearly 1100 JUnit 3 tests in total, whereas JUnit 4 test -# launcher can run all of them -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="MVFLEX Expression Language" -HOMEPAGE="https://github.com/mvel/mvel" -SRC_URI="https://github.com/mvel/mvel/archive/refs/tags/mvel2-${PV}.Final.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2.3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=" - >=virtual/jdk-1.8:* -" - -RDEPEND=" - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${PN}-${PN}2-${PV}.Final" - -JAVA_SRC_DIR="src/main/java" -# Required due to use of '_' as identifiers in source files -JAVADOC_ARGS="-source 8" -# https://github.com/mvel/mvel/blob/mvel2-2.3.2.Final/pom.xml#L131 -JAVA_MAIN_CLASS="org.mvel2.sh.Main" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" ) -JAVA_TEST_EXCLUDES=( - # No runnable methods - org.mvel2.tests.perftests.CompiledPerformanceTests - org.mvel2.tests.perftests.SimpleTests - org.mvel2.tests.core.MVELThreadTest - org.mvel2.tests.core.res.TestClass - org.mvel2.tests.core.res.TestInterface - org.mvel2.tests.core.res.TestMVEL197 - org.mvel2.tests.templates.tests.res.TestPluginNode -) -# Significantly speed up test execution -# https://github.com/mvel/mvel/blob/mvel2-2.3.2.Final/pom.xml#L158-L171 -JAVA_TEST_EXTRA_ARGS=( - -Dfile.encoding=UTF-8 - -Dmvel.disable.jit=true - -Dmvel.tests.quick=true -) - -pkg_setup() { - java-pkg-2_pkg_setup - # Fix org.mvel2.tests.core.PropertyAccessTests.testMVEL308 failure - # on Java 17, caused by java.lang.reflect.InaccessibleObjectException: - # module java.base does not "opens java.util" to unnamed module - # https://github.com/mvel/mvel/issues/282 - ver_test "$(java-config -g PROVIDES_VERSION)" -ge 17 && \ - JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED ) -} - -src_prepare() { - # Clean up bundled JARs "manually" to prevent - # removal of JARs under JAVA_TEST_RESOURCE_DIRS - rm -r lib/ || die "Failed to remove bundled JARs" - - eapply "${FILESDIR}/${P}-update-supported-java-versions.patch" - eapply "${FILESDIR}/${P}-update-version-in-output.patch" - use test && eapply "${FILESDIR}/${P}-ignore-failing-tests.patch" - java-pkg-2_src_prepare -} diff --git a/dev-java/mvel/mvel-2.5.0.ebuild b/dev-java/mvel/mvel-2.5.0.ebuild index 79dbf2350f51..dc7079a91c1c 100644 --- a/dev-java/mvel/mvel-2.5.0.ebuild +++ b/dev-java/mvel/mvel-2.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}2-${PV}.Final" LICENSE="Apache-2.0" SLOT="2.5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=" dev-java/asm:9 diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest index b0ce2ae92307..01440f8fe234 100644 --- a/dev-java/openjdk-bin/Manifest +++ b/dev-java/openjdk-bin/Manifest @@ -1,22 +1,49 @@ -DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.20.1_1.tar.gz 191278260 BLAKE2B e3ed7bb97a8b244f7aaa7ced808a55d632634d8c6422c44b7bb37d5e51ac1cc8b1e03f2b404a3654bd5cfeecdc1051cad57ef6617c908a52f04f5bcd8f55c545 SHA512 72db8438ec936d2594bc62cc02cfeca348cdf4854c162ea6cdb5ae6051120e771d48cb510d2c0145e5a243f544f8963e9210efa6f57edc6f667c5761b0088b5b -DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.20.1_1.tar.gz 182177832 BLAKE2B 404d628e2ad7392ad6ee5906a9ddccff82778fc1303a7877738b7646c4c50fc1eda4b98212d43b200c00ca49090216f9609608f2e1356a74d483e9ed1d90bda0 SHA512 802c39f52d941905997f5b975a69a74d937aaee14eb7ab3825d764e76d65681bdcea366fe2f34b581b6a96e9fa91bcf82164ead1fbbefe936f7e86ee7bcebd42 -DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.20.1_1.tar.gz 176708583 BLAKE2B b88652df8c51648243525f2f6a5f127a764ca9caf140eb3c8b70783acc4b8146418800bb239ffd34d5039daace3fef4930f605692bde7f96d43229f9cb802d9b SHA512 12c6c638456a7031138f8f8ca91b24dc400a6cb792ee47e2a0d526a193a030762b223cd1652a9363141219cac13df5cdf4b096f879f84f0ec59f2358d89809e2 -DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.20.1_1.tar.gz 193412811 BLAKE2B e790ad546350ae4a4c1b59dfe9641ce4ea2c89f71276f684d7535ad0d2cb0dfc2c42f21d420bf3c7b370bbbe9a342cd1cb073f3f051bcb082ecf310923914a33 SHA512 f39357c0c25e69241c67647ffddd143eb01979d332d6ec98d89ff8e0f19b0fed9e1cffa5155bb995441ae33bc50357fbf9381080bb652caea39d4166f491ae35 -DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.20.1_1.tar.gz 194530299 BLAKE2B 295c1e78cde1dbc18f906b9b355cd433bfa61e9f60fa9648ab3b58bc5fca2c19f6f64569eeb51f44066e21d0e39952773deb22d39011d79b8dda6490b6ba3a46 SHA512 2286aa5a26093bba55360e5fea14942bd2ddc1011f1db28529e7ddf2f879125b5c910aa14cc21b24dc1235b22f7052d912af7b6c4986834f813ec04c9e98c141 -DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.20.1_1.tar.gz 186910284 BLAKE2B 701e498de41831387cb1e72d08e4b50b63daa04a8bcaa81a928a67572c73dd9ace4aecf82eeb572463bb00a10b320ee539ef20418fde6252acfebf14eeccb973 SHA512 b47123db2480d5533da6231a808a66cf7f1844e9343d540152d60473675e43af01352d00fc396801a6221dfe6a4fa3a717ceb0df6d0fa2c03242878e53bb6804 -DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.8.1_1.tar.gz 190656874 BLAKE2B 43846cf6c7962e7e30a90d945db0c93835d38e51f5459b10a1adb291c7f7aa1e14f0b58997f0d146376260976713aa2dae2494eef3310d8c80978c4b02662bb9 SHA512 674a49bb0a52a6f880c829287ed80aa663e864a11586bf21ad3deef40755d1be0a711d6e26cc3d532d1cb4843cd091aeb4bd52d06fb6bef838e1f5be4d361114 -DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.8.1_1.tar.gz 177735753 BLAKE2B df5dba287781b84e67ae99345bc96dbd64bd85c6dda5317a7dd12f522111c80601492640f6ed4ac60b683e14ce23df625f7de49faf18e4d74344855a83d33545 SHA512 ab2fa97f8fe2b94fe3f91ffbe0f9a99bd6cca2a85d5d8434c80b0f3bf0cc5890e90c38591600cc0bd210400790be6b7fa118df4a8583ad349535886a7eee6ea0 -DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.8.1_1.tar.gz 188790162 BLAKE2B f3d69f13542a55aff361041539ef1a1d2eeda02ae8b37c94b377d5bed0fef2000e407fa02e7efb3e7fcf93e8716349d36f19d35ddbd8de2b54053d0687c3b356 SHA512 480f814d7ff517d6c970ee98dd99312eb9d2367e21bba788ca4ef3e1f7772419f4aa66bedce60e216e50a094c5d6bde8362613dd6ade86b1532daac38aea875a -DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.8.1_1.tar.gz 191404507 BLAKE2B 9fd93378c3a0e42b7af5e2d1c5af240aa2854a0e84ae4a66aad897686e90fda62a630a85d6765046a759f0ee8477d009937b6a6102317cc48a4c8d601f15b318 SHA512 7bb83ed8e9990413e363d8d62f9424b9057896220f820d7b71c95112a46a1f9cfba9c67eda3fb20082dc630acc0c139928d64534bc4ee34e9650caab1e81ef4b -DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.8.1_1.tar.gz 191374032 BLAKE2B f7f6eb577cc9cffd8e9326a7cf262adeb35e18bd4262973c81030c2fddb8077101968161a7d8239f8b78265925ba03fad393e60054a6e3651702d983c98e4f03 SHA512 c68d3ccacbe5d065b41948e3d02257185185679747d803e9c6387a8ce0e8e51a38757d1a43d15a19a27228b7b10629d64dfb274f882a0abca8781ac71ec4aae9 -DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.8.1_1.tar.gz 192053612 BLAKE2B bd59524805f7af5883b7fd20ff13b77594ec6841c28b028ff589419ff31cc7f152c6b177bc133b7749c413c22a7e8bdeab6e2f705ceb49617bb89dd6be6727a4 SHA512 3856cea7abfacfeda499200ff09427ce7f2e96f25eb556cb27eecc83f0f8c5b3fcb831a00dcf0202d6dbb191e2a23e2d0f928dcfc503dbfc582193245ecd2522 -DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.8.1_1.tar.gz 187618128 BLAKE2B 0413bb2bb928906f8aa09a6dae161fd91b4cc17a81ec822d4553322f1505f8141d10d308ddfb632c1678d2685dd95d999d09de5888aee056ca95847cca26b29e SHA512 b2ba614ca966acc6c03563a248638051abe0851b9b6932e8d93748307250f32b5fd8cef70c8c308aba4f97c02c4791cc7193b19f5b2f407f6c2d003fcf2416a6 -DIST OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.1_12.tar.gz 205976031 BLAKE2B 86b00c0c8da5c7ef97e993c1a863c715eca4384f892bf184e094ea4abdeac5e47a54159d1aadedd420e3c4e0d3644ce33589aa8bd1f83f5d67bd19c340951a8d SHA512 ed05b9733e8270fe73dab86fb9320689a6613dd2d6a5807a47a2e22f081feefd9729e39521c85f3f443687bd103918850a9bd3a27d1a64b8519bb37c7454e5e8 -DIST OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.1_12.tar.gz 206892255 BLAKE2B f51f7093e3c94c3ae766a36d2ab9da83e5789a6eb586b5ca2f6417c1b58134a1debe80a64fcd80ca7ec8605670bd73ba6cfca2e6a299b12423b7f8a5fcc46f22 SHA512 28dc24c8023c06f1ca765b81d06ea17a6ba2448ac0a2190633266211b82a78be03e3a0f27e52ee9a23919696b8c744ba9e2cf1a325f99b7a29fb276a9428735a -DIST OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz 207852818 BLAKE2B 294b849b8a0e851c034d63533fe844e528b05886a4803b3f5c73e0e9b5db1a79462963d0c90da2ae5967f1b7eac1521ddc199cdbff8fadd1875bace5a0f0d2f5 SHA512 496ed15dcba607cd1b9e6786932429f9d213d2ea22203bf8cbed61880655ee046bfc4c07b7b0d54285081ddf242fd8957ba34c8be75f5fb2ae0aac16f9b8ef3a -DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u382b05.tar.gz 102105707 BLAKE2B 5edec97bb60d983bcc299914c5bad8e89aef70f31ff1f5b26cbd430cbacc8b41c6d04906a9ea3a1eb6cf2601ae81279a871a1eb77c3297abb5454e213f2583b0 SHA512 11219c825f8ac0fcdd16120f89b2e7951c651595eb0be762cb511bad8cf44d3bc3136ba6f71b5ded8a9745fe5a143416b0ef4422c1cbbe62f110e4fa5f39c7ed -DIST OpenJDK8U-jdk_arm_linux_hotspot_8u382b05.tar.gz 98311130 BLAKE2B b2158aca6fef4e8a404b9dace05817f5fefd0b201281351126d422f35d66d733510943246c22a47f03e65d711f25d424935ae8788057722c71cbb30a4f7a4a1e SHA512 70d79c385ebb1cfe286781eb8da0d622a61140a0abc3b6bc559c8213ace93b9ce2a77aa55a3ef32936ee512b406044c1708624b4d040b62dd2462b4ea6e71572 -DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u382b05.tar.gz 100512595 BLAKE2B e2d0c97d0b68e649e11755fe258035a307ab8b96331ec0e6e431ec126857b60869d9c2bae966955a929fe87572b59e898603b32284bc76ce49c8086b06b838e6 SHA512 04a58d50c4fe0ced94b48e3018a6853c836a4f53cb4f310bad2ca7e913380a023655230ff5bb421f012cf2cdc037767f9e11aaa8f5b1b9f722b100c4417ccca4 -DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u382b05.tar.gz 100894343 BLAKE2B 78d7551652b10d71a3bfaf6639ab5cd6fc169d9cbb9010e93812d32863fc3556eaae93ccc8ad8c0bf1002feb0ae7715433dabeff62bbf91e1bd5a248b1204768 SHA512 ef82b9604994348ecf2a55c02e717af88beb616abd87482de9b9afc2ef832e29d1338839910bc64d0de07fb0b5b420eff9ce6718795c4abdf409475b17c01a3e -DIST OpenJDK8U-jdk_x64_linux_hotspot_8u382b05.tar.gz 102988783 BLAKE2B 3aa9b47e0e1dcf8fc67ebbb8d2bf70987fa7d527fbbd2cd15d43385922851d6144b96549e77b8060809a6eabf057353593e5efe9f5c02cc991bdf9c0dd734b01 SHA512 13c78f78d14856d58f692ad032664d363fb1063bdb0b16e19cd68587c9d16df152c5fc9d4ec15b53691c9146345936aab1a6c5b79a4c43740a418fa2c3871ca9 -DIST OpenJDK8U-jdk_x64_mac_hotspot_8u382b05.tar.gz 107309922 BLAKE2B 94a06fc998e57901b79396c47e4c1a4c82a7fb338d454267a1f8e4270665486ec259675458e24f7d2c3d55d1d206e91f46d1e4c5de7ef235f12aad93a32564c5 SHA512 5259772daa999e0668c380e8d436c3e99012b6c7c6ba09cff206efb54a102a30d9279ec6d4386927579b6e9d478fee74fc7f6266957ae4425aa29148eb5936e4 +DIST OpenJDK-jdk_aarch64_linux_hotspot_24_7-ea.tar.gz 212546172 BLAKE2B ce975ebf5800ab7bbde914f5c61955489d59f53a72d7b8316a68f23e6901f74be465b5ec59c00812514c3e77227638e5839d3ad1c2c0081fc3702286d13cd448 SHA512 1d43f8360aa591ad6f6cc3793b4cda0a0ce0280cd1336a74e1dd87ccfd2923f471317a830fdb3ed5045d15dee67d06c14b12f83a141d5e02641ee75c73dd0d1e +DIST OpenJDK-jdk_ppc64le_linux_hotspot_24_7-ea.tar.gz 95876480 BLAKE2B ffc898fbe4cf721fe91366ed43b79d01a498f0c3b9f83db472a5f982a8c8cf98eda2ab37755b3cbd74c3b09c1c00a60723a328bb93d50123b47f4dcb44369ef0 SHA512 85d174a5f3b1f3f30a0ae47a32713e7825d5c12f41b72324dacacfe652835743ed3dc0341394ffe0be74d7f1daab8f41486828f7ab757bf6f2d02c080e427313 +DIST OpenJDK-jdk_riscv64_linux_hotspot_24_7-ea.tar.gz 210505644 BLAKE2B 77d5d61e1a08929ec6599abadb49cb7a819a527fc5b3d0869f04d611d5f8a957f49791d0acb041ab6188d3ad9c018d84933d7265094955681a5a615299406d0f SHA512 87ab806150e0dfe2343ee8c3403a4757a6d59ad87edd8fa821f1d44fb786cbd9908118a46067268f5f06fde51d687cd4f4de47e4dafbdac5757fa83480a5571b +DIST OpenJDK-jdk_x64_alpine-linux_hotspot_24_7-ea.tar.gz 214860505 BLAKE2B 57b49ba138393aaacdb1ea5ac4017dd4c6665340285cb5ed82b546199e0fd97d1ca7e8b706341e471005668ccce9a50cc29691ea76b0fcf998d2a6b237748fd1 SHA512 af36e0432c1f1c2e3c7cef83f5be10fb75542f72a73b5f07d02c7c87f02288948db6123c918bf5791edafcc2535864b7897a304a92b70bc14079c05791f54c18 +DIST OpenJDK-jdk_x64_linux_hotspot_24_7-ea.tar.gz 214650918 BLAKE2B 5af39f2df2914594a7a69b12081c1afc5c0d33b385b7481545899cfb898c1ce67d306fd55595ed4bc39d3d786c47aa3ed0f7865e3205a4f1e8dd4ad296d95aee SHA512 40dea2f03e63c5d56c3dff31212db382914be22254d32f18311560b7b4ba58a2591ba65d2c93e77e11ba5dae77896768707978101755af4ba0e552b3f76ae9b1 +DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.23_9.tar.gz 192013902 BLAKE2B 6a4b47b9a3397d3436bd55a16a459a3cab3f8a2a7dc3285b3bde8db13f0e66d5e094803df0c5901a17272e6378161caada6f27845184e2efd17a6761661299c8 SHA512 90e53418efc7c34d7cf0691d566f07a84f02bd2d34cdee0c9c343e27c8d9bfd4d1bf86f104ae33a47274932ab8ba6ec8071a35e7d613129d03e439ae3382452c +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.23_9.tar.gz 182785851 BLAKE2B 453ca29859e749a9050f8b6627696ab6d38ee5e83ab69b1d159eb3b7c0bae68104cf68ca21b87123b4fc61059e528ba4ed0ee29fa4759f33a3cf46182f52a48a SHA512 af8ed3659f8ff07f5e5c135d96a7368d326f5b19e3d73077a3fa701716f6e415d4a784ff6c5f81267eb1b3d2e171a688126253f1c3197fc80ea260826ebad5a0 +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.23_9.tar.gz 177453532 BLAKE2B aa98f381f2ac4f208ced4dac4f4b01d20cfd27c8ccc75a0c41db6a57b67ca11d87b8133cb0af96283f646e5e90612f9ad69db5129e6f50518ad2eb0a53c86db1 SHA512 c590fa032593db48531d49977c95d1f884fe751472d927d0d0bc15f36ec35f71ea53c9acafa3dc00c4b25e88d4c18ab590b42f8057a277e16947c3ce31362381 +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.23_9.tar.gz 193956832 BLAKE2B bc334b59bbb021812ee7064b1915b6106923d41a74a3acf5b5d8fbcf50f6e0d467a96da22f996252422b08f5c7864418c552a102a18f3bd9cb14e5b4904656e5 SHA512 f0992a7fdb1acadf8cb19a94822e7a75f7453033cc0a3432f9efface7827b4a7ebb1ff67a81774da83844afdb046461415f50ddf11192863e88ab06889c86836 +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.23_9.tar.gz 195220527 BLAKE2B b2f024fdd2d72e78c86f562fbd37684c9d9639472d66e15b4b882c35241c500c09467e97440249bf69f4e63ef99d3f057b0e79852b67d55c5518d041cba2d657 SHA512 ccccb5003b78cff0cbf471d9b885ebd5805b5a21dd71afdb03a0d447cd6715e781dbf01f11970f7632b8181147fe0090f7fe8fc46c8732d2b17f0978f01934a4 +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.23_9.tar.gz 187689918 BLAKE2B c1ccebd2bfeccdf64f1ab0c781e4ba5f2701f6c70de81486c6b4d91bb1d1df367f58fa66bf8f073ed47413649905a306ad3f75c6696e1d0510ce02fe3453d255 SHA512 93974938c10d58b182a7bda49e21e26806a01a03fe72915ca559df3e02c694b3b88ed11c49987bc2ca7c1acabda0892d8c22a4ab19ed8b796dd02f29c44dbff0 +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.11_9.tar.gz 191052267 BLAKE2B 837cd3f3e9cdff7b66d1a8e10e2e8ebb9db1168fad2982fd523eb8067ca017efdc05e577b93af74623558d04a8458dc1d790c9626e7ed2d6568bf7fc22a44925 SHA512 eeeacbd0f8daa1d62663f7ec95fb7dd3ff855a0187347e3c1ddb4a5d13e494c1a940b43b5fdf75480963d65dd4d94330570b751fa7cde540124ed2164c176870 +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.11_9.tar.gz 178367345 BLAKE2B 7f1c8f77ab8ce9ce401947e51cc3051491df1579409f7ecb73107f091b58d6e7fce2004604951dfad019cd60e8da84fd4ee9f8987f92c9363889b310ee098e54 SHA512 0283452e56b3fbd85af33a7939ec8ae69624241ef07224152de55c5aafb1a5cb8423b8a211b5fadf8f5ea50aa0e5ed8211d02abf1398473ddf3ef13f2ba3f1c4 +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.11_9.tar.gz 189349607 BLAKE2B 2508ca965c27b1cf6457a595418ee9cd0450f9633a2fb80605a58a4bb7546cebb95b04c0d66bb14107c75fdff9fb678d78cdb879316929a3da6863579d4df9dd SHA512 bb76dcc65f65bbd3a256a54cea00eddb25312f1a1e2ed30fd3088bd44e9f8db7bb2ff3a6776b5ff6733ea7afc02928ef9e2bae296325fb1b8eb9b66b4e6f4a87 +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.11_9.tar.gz 191737628 BLAKE2B d78a0a64bf936bf85a4f9fe1c9299d1db4773e10cd308afa5167d61ce35ea7415d2a94a1dc160345fa5aa3d3a7b730235801789db147d62dae621572ca060fe7 SHA512 9ae308f12b5c74b48aed4ef2312d7e0b23e9fa73b7d78eb3576037b0fcbcfc3a5381ebc448fb41279e770d5994c46bdda6822b97181fa3d3365da63c8b0ecadf +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.11_9.tar.gz 191615499 BLAKE2B 4b342ebf3da0cf49d448b95dec6b04819d2ab2e31327b793b9d9aef86b4e78ce33a54995a5d0608d14214f3d0fde73d0ad334c9b0e3c5d2cbb6d40c4bb22637f SHA512 7773843e3b2a02ccb70c3ea49639c723f5da715dcb3e27ed85dbd2182648621a5822c49728436377c8e8af4d20231ba5b861e45be17efe44a5a81a92c225a851 +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.11_9.tar.gz 192396023 BLAKE2B 1e5f12041d9c17195f242d7d36edf6995b1f71cb52ca211773faaa0cca6af983ec8c7885d58d4b87b38a0a26f71d088c104cdbcb84fdfffd97643f2a09a2a4ed SHA512 f11e61d91ad27ca31196ded87d06b5e379e4e652c09ffdd5c3d73cdc9fe6c46cd7785838c70514897645213ff6c6948227be27d7fd773949f1055338966ba275 +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.11_9.tar.gz 180563846 BLAKE2B f9bf368e39d95cce40413caeb98192f88f90cad7dcb486ef5e1d7369cfc346603d37de88c049930b958043621e44c103e020354eb80faff0cf83fac8dc7497a7 SHA512 999ad1fb7c822e9000e734c86e70e73aa572ec1a75d14219b391e9d358d1dba1fd0d9d568df4c28d8ca88fd4341e24feee2f840b6c35c4c530d2cd174dd797b1 +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 OpenJDK8U-jdk_aarch64_linux_hotspot_8u412b08.tar.gz 102116126 BLAKE2B 19f8deee04fe5521323ead5193ff7b383979afa32c4375bdef7ce53b868dd7cb317bcd208b94d373c353f5480433cb3a28beeacbb7f42b501058acdfe6917079 SHA512 e2c5e17eda6a25b8f12c8fe5a50b5c58a9b52bf9cdac7213e2b0eb7ea0c99ba0d3c31ecbaea834443fac12adacfe506ecbe3a487abd16846c6619678ac24c4ee +DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u422b05.tar.gz 102132553 BLAKE2B b59a2d99f9999f86eac2ab15617ee7c58d179a7db2e3606b3296b4bee8bbfaaee2f3cd1f441d90b7462ef9a502f4f351bdb4acc8e723d6b16f208827b813e8a7 SHA512 3856d2e711fd0f93f5efb73ffe5dc115d03dbd0cd015e903b7c2d02b6a3940b10793243edd6a372d7f84306f10c7a41cf13d7b787a33d525f1e86e9975453d06 +DIST OpenJDK8U-jdk_arm_linux_hotspot_8u412b08.tar.gz 98318417 BLAKE2B 11ec1cb2e793da8252511dee62ad193b67b3bc5c8aa91dbd6b1e8aa2d2f7e2e342528d145e0eb9e26b17b7e81c9ff17586f068b4d146f6789b157026aff67099 SHA512 84eab7b032fb55e02870013f9a87d0898ece12c52c560c0600d8d2ecb4901cc64e6e5cd44375ec6785a5c8f139263e8b6b32d348149e22200c962438fabea9fe +DIST OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz 98342561 BLAKE2B e34d6c959a2100b7c1817ad0fa213331e1cca75229edccf68ed4fcbd3b9bdeb0852dfdf59dac3e9cdae0179af38edc64ff7329af9f44fadcfaa7cf301f8f4e13 SHA512 a667d531b3318e7f75d3d4d9a32248c5c9ae7c1d4bd9bfcbcb5f11418016c1faa179ed748c3eae09c8693885a9401a80de8f3530891883b9f6e9de0b50002ed5 +DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u412b08.tar.gz 100529230 BLAKE2B 1498ff1c4d89f65a41a565cf3d6949f715bc8783a33b70e6cf7b44e513ddf7ade1242e2a0a95b582813ab212fb2367a5f17f794f54b5e458f0e23dd22e74123d SHA512 cf80eb66063559d4fbe062d8a198490468e4936c9e0b27ffe04912b4468a2d1f4d12fffe5df5fede38b44870b65a7f0cd85545f7031957b12a7d1a368a7770c6 +DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u422b05.tar.gz 100533202 BLAKE2B b83b926e5bf0fe45bce9a79489422b96c6ab321227a56d8b3c683a26e5b71cbf9ec80a4dc2706aa4853095a4ee3174591cba8725b9e1b645f4c275137a97abee SHA512 e345de1325f9807d1cc3e4b043d650d655ad8a3672edec304023af54c7dd1d8fea0e671781ed46e6d7459909afedb2458c1b45966b55957389ec62449aec6469 +DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u412b08.tar.gz 100923084 BLAKE2B 9c9b0d7f95983a44f040efa83c69100163b1450d04102000d4f75361e9164024697380c055fdb31bac2ef4dabc05df592bbf342e716d8f438954b89236ff0986 SHA512 07b721e57225165d3dbc51c1d8f79f269e75fa3fe946ab76e933d1d3645dd19b3e7e8ea924d4f510382b5bcebbf073e262010c0e4655e0282379cce9d411eeab +DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u422b05.tar.gz 100948020 BLAKE2B db92e2d9ef5bd15816d2fb3cd6a6dc0accd250fa16ec9b3eea9b23a72e73a32be43527d8f520f39aea1b7a84723e07d24e3de136b6888b869d8e75e446fc04cd SHA512 20b47a527c1b19d6f2779e619507a250316ee3d95d7ad7b5fa45c86e26e90515cace468a0ec6fd37be108f473f92d70eadd0a61ee901594ff0309272af4f61e5 +DIST OpenJDK8U-jdk_x64_linux_hotspot_8u412b08.tar.gz 103005511 BLAKE2B f3df80c160d723df67700363ed6f40f3308a7625635b5afcb1656c77c9f78cc2796c5878aac0bda6cbde8d6551371ed15223de6aa8e75c01ba3e4848285a88eb SHA512 6f7df3fbb34c5971b7bbc4bafbe0179983abfa0aee212cc810e2656697cf0a7f4736cbbf6755cc88cc885d7beb5c15482a21d5287c52bae560988cf80908ca05 +DIST OpenJDK8U-jdk_x64_linux_hotspot_8u422b05.tar.gz 103022651 BLAKE2B e144aee88326b4ed539324d8dfa35db461a3595c23a3bfdf0af557b4402ac4dd65d9000fa875b6570d7475ca7fef90d2e7021938f04918d40a04c04029e2e1bf SHA512 d44bdb72e616771d6b465abb66228f08968afdc0e8e40f73e892ea5c5c441f554d793f1e1643f1f682e0c0f4e25d24ee3f9ddec8c6191c43e77a3820c9f3d2a1 +DIST OpenJDK8U-jdk_x64_mac_hotspot_8u412b08.tar.gz 109506799 BLAKE2B bdf043df0df0f0fe100e80a464a0fe8c60e7c80ab7ca5e7481c8f7458b793a24b0f2d93ec482b5f0de7a65b3d068322b7b3a9e9c9ec5c5b61342cb85232db847 SHA512 4d774c3f0794d7403dfbf953e7e9d635b71c463bb193ffb4cc98e98455ff7a448f0bbf290a28c9290e3d9affc7390eeb4be88ad48cbfb60d9f605e57158f5058 +DIST OpenJDK8U-jdk_x64_mac_hotspot_8u422b05.tar.gz 109522911 BLAKE2B 37472be9a5f061ade8e27318ef2a7782f0fd4aa38362c2d19eae47cf18ac0d4085a84aab4630b97e0162d6b8288e3bcce2b1fb1a8f1bc25e8a129137f5407657 SHA512 e6718c635d42d2662a404ac71f5c4cae45714f7e1e7f92af28191dfb5f01ac3c4c9c5335073386a7cf7a0c628d9dd0ae211fc4e9c0bc953e3827362f1fc39344 diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml index c09a0d4ca3e7..0c01c4d5dd44 100644 --- a/dev-java/openjdk-bin/metadata.xml +++ b/dev-java/openjdk-bin/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> <maintainer type="project"> <email>java@gentoo.org</email> <name>Java</name> @@ -18,4 +14,10 @@ <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> <flag name="source">Install JVM sources</flag> </use> + <upstream> + <remote-id type="github">adoptium/temurin8-binaries</remote-id> + <remote-id type="github">adoptium/temurin11-binaries</remote-id> + <remote-id type="github">adoptium/temurin17-binaries</remote-id> + <remote-id type="github">adoptium/temurin21-binaries</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.20.1_p1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.23_p9.ebuild index dfe26d9c3c3a..879465da18c0 100644 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.20.1_p1.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.23_p9.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 diff --git a/dev-java/openjdk-bin/openjdk-bin-21.0.1_p12.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.24_p8.ebuild index 3d125fc60923..602158ffbaf9 100644 --- a/dev-java/openjdk-bin/openjdk-bin-21.0.1_p12.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.24_p8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 inherit java-vm-2 toolchain-funcs abi_uri() { - local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/" + local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV}/" local musl= local os=linux @@ -22,23 +22,27 @@ abi_uri() { echo "${2-$1}? ( ${musl:+ elibc_musl? ( } - ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz + ${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz ${musl:+ ) } )" } MY_PV=${PV/_p/+} -SLOT=$(ver_cut 1) +DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptium.net" SRC_URI=" $(abi_uri aarch64 arm64) + $(abi_uri arm) + $(abi_uri ppc64le ppc64) $(abi_uri x64 amd64) + $(abi_uri x64 x64-macos) $(abi_uri x64 amd64 musl) " +S="${WORKDIR}/jdk-${MY_PV}" -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptium.net" LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm64" +SLOT=$(ver_cut 1) +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos" IUSE="alsa cups headless-awt selinux source" RDEPEND=" @@ -65,8 +69,6 @@ RDEPEND=" RESTRICT="preserve-libs splitdebug" QA_PREBUILT="*" -S="${WORKDIR}/jdk-${MY_PV}" - pkg_pretend() { if [[ "$(tc-is-softfloat)" != "no" ]]; then die "These binaries require a hardfloat system." diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.8.1_p1.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.ebuild index b0024619e0fe..43345bca275a 100644 --- a/dev-java/openjdk-bin/openjdk-bin-17.0.8.1_p1.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.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 diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.12_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.12_p7.ebuild new file mode 100644 index 000000000000..79896f0974c5 --- /dev/null +++ b/dev-java/openjdk-bin/openjdk-bin-17.0.12_p7.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 toolchain-funcs + +abi_uri() { + local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV}/" + local musl= + local os=linux + + case ${2} in + *-macos) os=mac ;; + *-solaris) os=solaris ;; + esac + + if [[ ${3} == musl ]]; then + os=alpine-linux + musl=true + fi + + echo "${2-$1}? ( + ${musl:+ elibc_musl? ( } + ${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz + ${musl:+ ) } )" +} + +MY_PV=${PV/_p/+} + +DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptium.net" +SRC_URI=" + $(abi_uri aarch64 arm64) + $(abi_uri aarch64 arm64-macos) + $(abi_uri arm) + $(abi_uri ppc64le ppc64) + $(abi_uri x64 amd64) + $(abi_uri x64 amd64 musl) + $(abi_uri x64 x64-macos) +" +S="${WORKDIR}/jdk-${MY_PV}" + +LICENSE="GPL-2-with-classpath-exception" +SLOT=$(ver_cut 1) +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos" +IUSE="alsa cups headless-awt selinux source" + +RDEPEND=" + >=sys-apps/baselayout-java-0.1.0-r1 + kernel_linux? ( + media-libs/fontconfig:1.0 + media-libs/freetype:2 + media-libs/harfbuzz + elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) + elibc_musl? ( sys-libs/musl ) + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +pkg_pretend() { + if [[ "$(tc-is-softfloat)" != "no" ]]; then + die "These binaries require a hardfloat system." + fi +} + +src_unpack() { + default + if [[ ${A} == *_mac_* ]] ; then + mv -v "${S}/Contents/Home/"* "${S}" || die + rm -Rf "${S}/Contents" # drop macOS executable + fi +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}/${dest#/}" + + # on macOS if they would exist they would be called .dylib, but most + # importantly, there are no different providers, so everything + # that's shipped works. + if [[ ${A} != *_mac_* ]] ; then + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # prefer system copy # https://bugs.gentoo.org/776676 + rm -vf lib/libharfbuzz.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if use headless-awt ; then + rm -v lib/lib*{[jx]awt,splashscreen}* || die + fi + fi + + if ! use source ; then + rm -v lib/src.zip || die + fi + + rm -v lib/security/cacerts || die + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + # provide stable symlink + dosym "${P}" "/opt/${PN}-${SLOT}" + + java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_set-pax-markings "${ddest}" + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter +} + +pkg_postinst() { + java-vm-2_pkg_postinst +} diff --git a/dev-java/openjdk-bin/openjdk-bin-21.0.4_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-21.0.4_p7.ebuild new file mode 100644 index 000000000000..7fc34d184029 --- /dev/null +++ b/dev-java/openjdk-bin/openjdk-bin-21.0.4_p7.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 toolchain-funcs + +abi_uri() { + local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV}/" + local musl= + local os=linux + + case ${2} in + *-macos) os=mac ;; + *-solaris) os=solaris ;; + esac + + if [[ ${3} == musl ]]; then + os=alpine-linux + musl=true + fi + + echo "${2-$1}? ( + ${musl:+ elibc_musl? ( } + ${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz + ${musl:+ ) } )" +} + +MY_PV=${PV/_p/+} + +DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptium.net" +SRC_URI=" + $(abi_uri aarch64 arm64) + $(abi_uri aarch64 arm64 musl) + $(abi_uri ppc64le ppc64) + $(abi_uri x64 amd64) + $(abi_uri x64 amd64 musl) + $(abi_uri riscv64 riscv) +" +S="${WORKDIR}/jdk-${MY_PV}" + +LICENSE="GPL-2-with-classpath-exception" +SLOT=$(ver_cut 1) +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +IUSE="alsa cups headless-awt selinux source" + +RDEPEND=" + >=sys-apps/baselayout-java-0.1.0-r1 + kernel_linux? ( + media-libs/fontconfig:1.0 + media-libs/freetype:2 + media-libs/harfbuzz + elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) + elibc_musl? ( sys-libs/musl ) + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +pkg_pretend() { + if [[ "$(tc-is-softfloat)" != "no" ]]; then + die "These binaries require a hardfloat system." + fi +} + +src_unpack() { + default + if [[ ${A} == *_mac_* ]] ; then + mv -v "${S}/Contents/Home/"* "${S}" || die + rm -Rf "${S}/Contents" # drop macOS executable + fi +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}/${dest#/}" + + # on macOS if they would exist they would be called .dylib, but most + # importantly, there are no different providers, so everything + # that's shipped works. + if [[ ${A} != *_mac_* ]] ; then + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # prefer system copy # https://bugs.gentoo.org/776676 + rm -vf lib/libharfbuzz.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if use headless-awt ; then + # do not die if not available, -f for bug #934974 + rm -fv lib/lib*{[jx]awt,splashscreen}* || die + fi + fi + + if ! use source ; then + rm -v lib/src.zip || die + fi + + rm -v lib/security/cacerts || die + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + # provide stable symlink + dosym "${P}" "/opt/${PN}-${SLOT}" + + java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_set-pax-markings "${ddest}" + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter +} + +pkg_postinst() { + java-vm-2_pkg_postinst +} diff --git a/dev-java/openjdk-bin/openjdk-bin-24_p7_beta.ebuild b/dev-java/openjdk-bin/openjdk-bin-24_p7_beta.ebuild new file mode 100644 index 000000000000..72e3e2f5c768 --- /dev/null +++ b/dev-java/openjdk-bin/openjdk-bin-24_p7_beta.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 toolchain-funcs + +abi_uri() { + local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV1}/" + local musl= + local os=linux + + case ${2} in + *-macos) os=mac ;; + *-solaris) os=solaris ;; + esac + + if [[ ${3} == musl ]]; then + os=alpine-linux + musl=true + fi + + echo "${2-$1}? ( + ${musl:+ elibc_musl? ( } + ${baseuri}/OpenJDK-jdk_${1}_${os}_hotspot_${MY_PV2//+/_}.tar.gz + ${musl:+ ) } )" +} + +MY_PV=${PV/_p/+} +MY_PV1=${MY_PV/_beta/-ea-beta} +MY_PV2=${MY_PV1/-beta/} + +DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptium.net" +SRC_URI=" + $(abi_uri aarch64 arm64) + $(abi_uri ppc64le ppc64) + $(abi_uri x64 amd64) + $(abi_uri x64 amd64 musl) + $(abi_uri riscv64 riscv) +" +S="${WORKDIR}/jdk-${MY_PV%_beta}" + +LICENSE="GPL-2-with-classpath-exception" +SLOT=$(ver_cut 1) +# KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +IUSE="alsa cups headless-awt selinux source" + +RDEPEND=" + >=sys-apps/baselayout-java-0.1.0-r1 + kernel_linux? ( + media-libs/fontconfig:1.0 + media-libs/freetype:2 + media-libs/harfbuzz + elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) + elibc_musl? ( sys-libs/musl ) + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +pkg_pretend() { + if [[ "$(tc-is-softfloat)" != "no" ]]; then + die "These binaries require a hardfloat system." + fi +} + +src_unpack() { + default + if [[ ${A} == *_mac_* ]] ; then + mv -v "${S}/Contents/Home/"* "${S}" || die + rm -Rf "${S}/Contents" # drop macOS executable + fi +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}/${dest#/}" + + # on macOS if they would exist they would be called .dylib, but most + # importantly, there are no different providers, so everything + # that's shipped works. + if [[ ${A} != *_mac_* ]] ; then + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # prefer system copy # https://bugs.gentoo.org/776676 + rm -vf lib/libharfbuzz.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if use headless-awt ; then + rm -v lib/lib*{[jx]awt,splashscreen}* || die + fi + fi + + if ! use source ; then + rm -v lib/src.zip || die + fi + + rm -v lib/security/cacerts || die + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + # provide stable symlink + dosym "${P}" "/opt/${PN}-${SLOT}" + + java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_set-pax-markings "${ddest}" + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter +} + +pkg_postinst() { + java-vm-2_pkg_postinst +} diff --git a/dev-java/openjdk-bin/openjdk-bin-8.382_p05.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild index 83dddfd00e50..f93a2a4afad5 100644 --- a/dev-java/openjdk-bin/openjdk-bin-8.382_p05.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-8.412_p08.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 diff --git a/dev-java/openjdk-bin/openjdk-bin-8.422_p05.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.422_p05.ebuild new file mode 100644 index 000000000000..f362abc652e7 --- /dev/null +++ b/dev-java/openjdk-bin/openjdk-bin-8.422_p05.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 + +abi_uri() { + local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk${MY_PV}" + local musl= + local os=linux + + case ${2} in + *-macos) os=mac ;; + *-solaris) os=solaris ;; + esac + + if [[ ${3} == musl ]]; then + os=alpine-linux + musl=true + fi + + echo "${2-$1}? ( + ${musl:+ elibc_musl? ( } + ${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//-/}.tar.gz + ${musl:+ ) } )" +} + +MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) + +DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptium.net" +SRC_URI=" + $(abi_uri aarch64 arm64) + $(abi_uri arm) + $(abi_uri ppc64le ppc64) + $(abi_uri x64 amd64) + $(abi_uri x64 amd64 musl) + $(abi_uri x64 x64-macos) +" +S="${WORKDIR}/jdk${MY_PV}" + +LICENSE="GPL-2-with-classpath-exception" +SLOT=$(ver_cut 1) +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos" + +IUSE="alsa cups examples headless-awt selinux source" + +RDEPEND=" + >=sys-apps/baselayout-java-0.1.0-r1 + kernel_linux? ( + media-libs/fontconfig:1.0 + media-libs/freetype:2 + elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) + elibc_musl? ( sys-libs/musl ) + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + arm? ( dev-libs/libffi-compat:6 ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) + ) +" + +RESTRICT="preserve-libs strip" +QA_PREBUILT="*" + +src_unpack() { + default + # 753575 + if use arm; then + mv -v "${S}"* "${S}" || die + elif [[ ${A} == *_mac_* ]] ; then + mv -v "${S}/Contents/Home/"* "${S}" || die + rm -Rf "${S}/Contents" # drop macOS executable + fi +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}/${dest#/}" + + rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die + + # on macOS if they would exist they would be called .dylib, but most + # importantly, there are no different providers, so everything + # that's shipped works. + if [[ ${A} != *_mac_* ]] ; then + # this does not exist on arm64 hence -f + rm -fv jre/lib/*/libfreetype.so* || die + + if ! use alsa ; then + rm -v jre/lib/*/libjsoundalsa.so* || die + fi + + if ! use examples ; then + rm -vr sample || die + fi + + if use headless-awt ; then + rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \ + {,jre/}bin/policytool bin/appletviewer || die + fi + fi + + if ! use source ; then + rm -v src.zip || die + fi + + rm -v jre/lib/security/cacerts || die + dosym ../../../../../etc/ssl/certs/java/cacerts \ + "${dest}"/jre/lib/security/cacerts + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + # provide stable symlink + dosym "${P}" "/opt/${PN}-${SLOT}" + + java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + java-vm_set-pax-markings "${ddest}" + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter +} diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest index 94d314d5a60d..0fdfd5362f70 100644 --- a/dev-java/openjdk-jre-bin/Manifest +++ b/dev-java/openjdk-jre-bin/Manifest @@ -1,4 +1,4 @@ -DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.20.1_1.tar.gz 43033465 BLAKE2B 484ec2b8512e2c759840157608ae4b7cdd2729533589a8ad1ba718779e88319fa02da4c9f59b56dea93123646ca7a55e84675985679a25f5163d7511b8147f66 SHA512 4a962e2ee8c885753b7bc25c3a30af307bee2c8829438eb85b9a7b20abd72fa22b340cfb9b6a0721e8fb00379bd3a230653daa52f5f1e3e6d5ed028ea2066c99 -DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.8.1_1.tar.gz 46332104 BLAKE2B cd27d457ecb64a17cd86fb7f348e7868b6a5e4bb59a98971dabfcdc213e4afc70dc7c1c912dcf209c9a3931ce2abece961480cc06039b565e09f70e55269ceb9 SHA512 773f39ec8f66d1285df74706014c690f3ade9c960bc27c5032bd4c100b2e89c3d4a23150af548128bdf499d64ba1567aa065f4a39f5e583600d86414d283f66f -DIST OpenJDK21U-jre_x64_linux_hotspot_21.0.1_12.tar.gz 52453828 BLAKE2B d53bf2929431c9ce4026ae2fb9b950fedc9e756f52013a2ecdad804ccf28e33447f5278f159fb881791d1a0952d959232085549f2ef1b563979c3f15713a00e6 SHA512 568844305c490abbd9a20aa89b48b8ece4bb1b75145d6e6dc89220bdb6049bc70f8bd8c6a789983d7bbbdbc64d78129515443fe86c03064592354b455869e8af -DIST OpenJDK8U-jre_x64_linux_hotspot_8u382b05.tar.gz 41389960 BLAKE2B e79d0d6b08a0f2066c877b3f970742a209f1b56a46dd4e5bc3b3942b590ae4eb0e72ac9b909d2e0d9b61bee76d507d9df8def88c16ec87930152b8375c6272e5 SHA512 536e2b3f87907aa2d79938dae3f92efa5d6402ae252e147beb9ddc3f81b1001a8031e4eba7132b0640dad36652fb619b761e038a88246442fc8592d5fe8a9c41 +DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.23_9.tar.gz 43361001 BLAKE2B 7f5fe24de2f0967ceeaee783430fc1aa9d8c510d955eff2e10c9d94058a2985308e99a57f1dffb3adb3cee9d90d0a553abcb5438a41a0cda054b0a260e435f31 SHA512 82b4b021b7fb136a9016623cd6ab7b4ac1f5fc3bff69594b74c8b2b0305d6b0c7d20d12759062826dc27ce0b50ea176bcec76960d3d458549e11a5452b7df014 +DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz 46382823 BLAKE2B 79612a8a73cee7a8ac022779a12077fa613ff7b18d8d5d198c42ae886cba21c46a1919422249696a74b5e5491542b88b57244eaa74f3b1bc8ae63ae851d10d40 SHA512 a98534b49a71a1bb6488aff4f1d2fc4fdcadfbaa17ef1ca3003568aed8498b3d3618c065334dd6bd9cffab0af15b6cbc980353e09da66c5ac69f0c96f9b0a889 +DIST OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz 52430722 BLAKE2B 32a969bfd1a6e334db34db6f12317810a81b60b0f6c4c978aee3fb588ed30daca0b54089feba7721a51f71d2ebb89d453aba8e7ded29f524d5923a3804828d88 SHA512 2fefc61c36f4cf4bbe722aef93aced8dc4b76d2fddeb91ad8687dc54f7afd9dff03df25ff12214bbd66fcbd637ff0ca5a21a1d839e60da9622904284bc2abfee +DIST OpenJDK8U-jre_x64_linux_hotspot_8u412b08.tar.gz 41415973 BLAKE2B 1372ef4f608eaecd4a82c8e5598e67b91d4b200818a896c2977f40d7c228377ad033187e5afda7cd812b37950b998bc764c155d952a62b7bf7c625299b9477d9 SHA512 f1e3a168724fd9826262d1f4e895d0809618414231e246750f96522bc89fb4f27fed83f83dd548ddd859b519512ac7a080c6a3482a9d129275102aed973eab28 diff --git a/dev-java/openjdk-jre-bin/metadata.xml b/dev-java/openjdk-jre-bin/metadata.xml index f60a999cf34f..b4bbaa93f791 100644 --- a/dev-java/openjdk-jre-bin/metadata.xml +++ b/dev-java/openjdk-jre-bin/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> <maintainer type="project"> <email>java@gentoo.org</email> <name>Java</name> diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.20.1_p1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.23_p9.ebuild index 7e2efc602026..4bac8986b66a 100644 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.20.1_p1.ebuild +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.23_p9.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 @@ SRC_URI=" " DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptopenjdk.net" +HOMEPAGE="https://adoptium.net/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="amd64" IUSE="alsa cups headless-awt selinux" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.8.1_p1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.11_p9.ebuild index 7e2efc602026..4bac8986b66a 100644 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.8.1_p1.ebuild +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.11_p9.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 @@ SRC_URI=" " DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptopenjdk.net" +HOMEPAGE="https://adoptium.net/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="amd64" IUSE="alsa cups headless-awt selinux" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.1_p12.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.3_p9.ebuild index 1aba636df50a..9fe0d3158b43 100644 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.1_p12.ebuild +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.3_p9.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 @@ SRC_URI=" " DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptopenjdk.net" +HOMEPAGE="https://adoptium.net/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64" IUSE="alsa cups headless-awt selinux" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.382_p05.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.ebuild index 1071fa2afe06..30f0a4d988c1 100644 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.382_p05.ebuild +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.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 @@ MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) SLOT="$(ver_cut 1)" DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptium.net" +HOMEPAGE="https://adoptium.net/" SRC_URI=" $(abi_uri x64 amd64) " diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index 4bda6b86f359..8a000540d5c9 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -1,9 +1,11 @@ -DIST java17-riscv64.patch 2253475 BLAKE2B a10a257f0b8bf590cdc011cf0c5af4854d49d6bbdf68dd74b2f996b70e0ecdd2b87bc4a02394f67ded5e664efb41f8dd03bb312fbfcffd84c289afdcbf7868de SHA512 06230b121e1f28189877025a4eab99e6d8cba176a17c88f073498fec6c73ab26130ce1500ea4f83235cc6abbc1742e47b227d60b5ff77465740048abdc52d165 DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f2823772a5d9a18447a435f191daf78c5429a15c2e9ea64758dc9b26ee2a88275532b4f27714b2a7e4489f920c0ed2f5003b SHA512 c0426f243c5aa581d90366cb01ce811e34883a9d8a0298cab420378470e8eb427a56932ca1fbb5ed57e7430be2b38c6bc4491028ebaa25be0a938ba0bb2baf45 -DIST openjdk-11.0.20.1_p1.tar.gz 116165519 BLAKE2B 3f3627d6535770c6654226ca2c188ac4aa0f332c7f66d79ab1991274e019ee4aee5194b285bace03175593543017a2ec75494e8e50b5488df82c7d437bf31398 SHA512 765f90a24629e5db5afb23b09edc38a3d460ba27d1de53980942e711783fe9fdf1c4ef29a75d2ffd6d93864611ffce60d515e032180917cd053967a0d4ecfc69 -DIST openjdk-17.0.8.1_p1.tar.gz 105878760 BLAKE2B e4d752dc87717855bfe4bd84c97056f0d93b554c67bdbb3e750e20479e2156628c85aea7b404577ea6ff40d49669d5f53aab06d0c4cf9aa926b060a0cd93cd03 SHA512 0d8e9e54173be855c15d121d4d6cd36996700e1e2fb194ad93ba8ad794a342c87b7d2f81a32d0bb215e45f1dc1f4efdfe1be5e8de99395730902d443ac773813 -DIST openjdk-21.0.1_p12.tar.gz 112241360 BLAKE2B 68a542a1dd65cf74b826e255d08350ec662c37337e45aec18d91e0dbdcce5c6e50172ad482cc21f1aacbf356722e009d4b6431aecf5a1d6b67b74a5007ca702a SHA512 def4b6688f063758235bc454bbbdb4caefa45d2724a9f2296af11d684801f05f1375f0be771b52d9235676e7f89dec816a34b3a1a1cc972662ee50de89600455 -DIST openjdk-8.382_p05.tar.gz 93105951 BLAKE2B 07e2961dbbd8de153650a1f92fd88960e6b1b39e7d212cc158bd943d35da5fdab0595583226ac12134eb176b1c550576e7aef5dfaf4a76ac0060daa42f4b4495 SHA512 5879cfbd5795f0260897c52fe2503754767faf1e229832e0c4c6dd9957055fd7105d14403d82ccf92eed0adfecc5bc858a89643e68d3c81d437fd543fbfce49a +DIST openjdk-11.0.23_p9.tar.gz 116316363 BLAKE2B a3745b2afe9d2529daf89aceed43025aca72a353210b0987aacb32af971262077411e9a2b6cfd938ca9d0c93c8762759b9207a13cee0808288674671164e3a36 SHA512 3851063289042ed467a9cb636eba7170a0feeaa3e5d19bda6c30a186ea624e4ae1b308006652acb9c9820c2065382bd719ee130b7a1a0524fe25ecd639f8a51d +DIST openjdk-11.0.24_p8.tar.gz 116418943 BLAKE2B cb768b202b42f426f4edaead16ba09800d86c10da4a664176842ee396332284d410191a55dbb35d7604272231e5b3daf8a75ddc03bb819d670622b7682eec7f6 SHA512 ce45efd934b9bacc56c468d92083a85de311b4436a519ae1d6038aff025c2fa8a811abca4cdd99aeb8c09455effff53500f96c287976cd2ae90d4e11da2385a3 +DIST openjdk-17.0.11_p9.tar.gz 106574173 BLAKE2B 3db4763527d1acb83a2d492c3e94dc571065b844cf2ac56b7377a821cf2cb48af405b9fef73f477502bedc2c119ac57a115315140af04d51dbab5a78dfa6c789 SHA512 77baa3ec3ff2d06b28121342357311d1d5ca2ddd9ac7982b1aa5fc745b49519d2f95d14226ad4ac413d9a0ecf0e49d15078cabbba0b2897d0c6883b92ef0b5e9 +DIST openjdk-17.0.12_p7.tar.gz 106597045 BLAKE2B f0e9baec472ecefbf28359abfc10757dc7cb2a6ddf8428086a6565831f1c13ee1a7cdb87b67d6b3840860ddbf2c74e80ece55f09238fddc2cb8fa77208695b9b SHA512 cc99e9742123f7d8ac7ad78abab0fbe5cff37999b9c06ad14851009a95c9868968e97dd0f3e4dea8bfa8578f8f903fccaa37134466a778375cdf24344138f1fc +DIST openjdk-21.0.4_p7.tar.gz 112506384 BLAKE2B d58636bc9221d56afcf118a91e41326d2e086c9fe22675429ec50d0b62fefd9e2040140a9d99682547e8bf0d40fa4ca2cbcdf8be55b9a0556b95c90fc0a08d56 SHA512 507524d842fb7c371cf7d3163cdce87e9266d613998b797f2828178b35c087354ae30941384d5afd1d6e3982eddf5c9067553bc2b918a9e223b93893f7f27e76 +DIST openjdk-8.412_p08.tar.gz 93003614 BLAKE2B 71a3825bf69bb196ae219f5125e8452f634be2ff7b9f42a4829f6581f0a143bfec95013971c6f6b8f402c11efa34443f55a7f89d4133eac0b05a6d1cd6e0324d SHA512 d198f26474a4bd0b5e09c3c3aa53fbf77f217b8cd23499f7e661224048e925e0e020b28264b6ce7401baf83f8ffd8e3247788e2f5e7188509dea8b06f9fa0572 +DIST openjdk-8.422_p05.tar.gz 93034877 BLAKE2B 2489fea62fbc5a7e3735055656ae89c67caf63e5bc6d5385ee811d0707d056bc3d10dd83f7eae5a5a86b7f57b8da47a9c1a77405f127b6f506bbf3b310ecd2ae SHA512 706db67f9be7509380e96ae2187bdb928e40c4382fd7073dd310da2981eeff324a5871702b087d4466911dbbea8376d5f9fed7029562ca62c9a1a193d931833e DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f DIST openjdk-bootstrap-11.0.14_p9-riscv.tar.xz 104601676 BLAKE2B 5f976e8a626a829fae70ad6c007f10bfeff79e29c85d6c75fb2f5ff8984fd2a2bd44ee6e07958dbbdaaed761c6839d375e1b5ba6cffc63b02ad9e2c9178310db SHA512 580dec81626553fe3e7afd0f6385a733ba80a0502cf0f9e8bdc973048887290c9ab6171267d61d8838c4ece4de58c9ca8b78540bd52b1757495a27175057ec64 @@ -13,3 +15,5 @@ DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab07808 DIST openjdk-bootstrap-17.0.3_p7-riscv.tar.xz 113344052 BLAKE2B 69ae326c600ecf1840a0874b1e26545779434b979e195a3bc7975615f873cd9ffce324f291e56a2800edc304447845baec774b2a08964afde274bd8e0dd3f704 SHA512 4a483faa32b26758f6fae605fdb3d3b77814c627a3a560e91ca88e2d36a88543a53f019a59b5a6456b87ca671e8b7129d5766210bd5cd52125cb3a040ec2a23f DIST openjdk-bootstrap-21.0.0_p35-ppc64.tar.xz 125375264 BLAKE2B 28802995f393dc76362dae766f8b598fd56085051418075d4c426293e6431b441ea38a2d2e4676fc89173d10324e3aafac52c97a5d9459bb0199168a07807e16 SHA512 cbd3992450c44764373c25313f6ce32f0c8a47abec557e4a10f7f8517435bf450ba5ac9fa9c8cdfb41f1536b55829d733426dc12dc2b5a2eebf5a94e9094752a DIST openjdk-bootstrap-21.0.0_p35-x86.tar.xz 120906212 BLAKE2B c3a56f4e51a8aca1c318b9c32bebdb4c09e42d80416ce1843bc80077f09466b7f54627ab6992f9149fdabdb4d5557c3cad6b5e93b37ba3d89d84f736fc07a57a SHA512 40f0cf60adaebd0c6ae11badb6b71727a5cc64c89077731b0f7cc82f203297b9b780ae43ec74eca9dd5a64de1209f519c2ad0f9083c017cf474d1020206f762c +DIST openjdk-bootstrap-8.402_p06-ppc64.tar.xz 34476368 BLAKE2B 1f896772f5e40a2793c5d9294e65e429c94204f91e91bfd76ff780e1d6318741c2052c3f20e59abcfb7018924983b5c9f386f14f912660e3e86296185f348482 SHA512 7bace068c5ac7604ad9db3ed655a52a4a90195efbf2fc342389cf7929d82d3f7b861fe700c16f513599bf9c064a87c9aa5966d7bd45aa7ed5e55ec317667be6a +DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c158c7e7d9fae9741112230dcd6e314163911921d63e3222cd3f4ab9d08bbaacbf6d9bfce9a1a9336e21088fba6396613489a701b30797 SHA512 fe5719e0bbf9bcd6eb9790ebd4da34e7f6c99fe4b7d41de2b5d00b20ebe76a77d857c726d1a71b7f40657ca2a9aa08eaa9efc1ab4be60016f66af95530b454b5 diff --git a/dev-java/openjdk/files/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch b/dev-java/openjdk/files/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch new file mode 100644 index 000000000000..317f1aa226b3 --- /dev/null +++ b/dev-java/openjdk/files/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch @@ -0,0 +1,41 @@ +From cc568d4d246ffc9bf08a96db0889d3b89c852718 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 6 Mar 2024 11:22:11 +0000 +Subject: [PATCH 1/4] Fix -Wint-conversion +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Backport of upstream commit https://github.com/openjdk/jdk21u-dev/commit/7b1455163ed893639059b3d62b71b2ff347c2e3f. + +Fixes the following warning/error: +``` +jdk8u-jdk8u402-ga/jdk/src/share/bin/splashscreen_stubs.c:64:5: error: returning ‘void *’ from a function with return type ‘int’ makes integer from pointer without a cast [-Wint-conversion] +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- + jdk/src/share/bin/splashscreen_stubs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/jdk/src/share/bin/splashscreen_stubs.c b/jdk/src/share/bin/splashscreen_stubs.c +index 9c1f514..666634f 100644 +--- a/jdk/src/share/bin/splashscreen_stubs.c ++++ b/jdk/src/share/bin/splashscreen_stubs.c +@@ -61,11 +61,11 @@ typedef char* (*SplashGetScaledImageName_t)(const char* fileName, + #define INVOKEV(name) _INVOKE(name, ,;) + + int DoSplashLoadMemory(void* pdata, int size) { +- INVOKE(SplashLoadMemory, NULL)(pdata, size); ++ INVOKE(SplashLoadMemory, 0)(pdata, size); + } + + int DoSplashLoadFile(const char* filename) { +- INVOKE(SplashLoadFile, NULL)(filename); ++ INVOKE(SplashLoadFile, 0)(filename); + } + + void DoSplashInit(void) { +-- +2.44.0 + diff --git a/dev-java/openjdk/files/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch b/dev-java/openjdk/files/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch new file mode 100644 index 000000000000..3e8a5d17113c --- /dev/null +++ b/dev-java/openjdk/files/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch @@ -0,0 +1,48 @@ +From 57b8fef20b090ffdf99bcf2c3f5fc8d0d4472788 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 6 Mar 2024 11:54:24 +0000 +Subject: [PATCH 2/4] Fix -Wincompatible-pointer-types +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Backport https://github.com/openjdk/jdk17u/commit/6632e6c6ca74101b45b052fb7962376fbe97605e. + +``` +jdk8u-jdk8u402-ga/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c: In function ‘Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage’: +jdk8u-jdk8u402-ga/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c:2853:19: error: passing argument 1 of ‘freeArray’ from incompatible pointer type [-Wincompatible-pointer-types] + 2853 | freeArray(scale, numBands); + | ^~~~~ + | | + | UINT8 ** {aka unsigned char **} +jdk8u-jdk8u402-ga/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c:2689:30: note: expected ‘void **’ but argument is of type ‘UINT8 **’ {aka ‘unsigned char **’} + 2689 | static void freeArray(void** arr, jint size) { + | ~~~~~~~^~~ +jdk8u-jdk8u402-ga/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c:2860:19: error: passing argument 1 of ‘freeArray’ from incompatible pointer type [-Wincompatible-pointer-types] + 2860 | freeArray(scale, numBands); + | ^~~~~ + | | + | UINT8 ** {aka unsigned char **} +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- + jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c +index 7e1d8c9..163003c 100644 +--- a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c ++++ b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c +@@ -2686,7 +2686,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeTables + RELEASE_ARRAYS(env, data, NULL); + } + +-static void freeArray(void** arr, jint size) { ++static void freeArray(UINT8** arr, jint size) { + int i; + if (arr != NULL) { + for (i = 0; i < size; i++) { +-- +2.44.0 + diff --git a/dev-java/openjdk/files/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch b/dev-java/openjdk/files/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch new file mode 100644 index 000000000000..3e4296d21aac --- /dev/null +++ b/dev-java/openjdk/files/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch @@ -0,0 +1,38 @@ +From 685bf942bdf5b265a3b343c2b682b01b11b6e58a Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 6 Mar 2024 12:20:03 +0000 +Subject: [PATCH 3/4] Fix negative value left shift +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Backport of https://github.com/openjdk/jdk17u/commit/51be7db96f3fc32a7ddb24f8af19fb4fc0577aaf. + +``` +jdk/src/share/native/com/sun/java/util/jar/pack/constants.h:226:37: error: left operand of shift expression ‘(-1 << 13)’ is negative [-fpermissive] +jdk/src/share/native/com/sun/java/util/jar/pack/constants.h:226:39: error: enumerator value for ‘AO_UNUSED_MBZ’ is not an integer constant + 226 | AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use. + | ^~ +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- + jdk/src/share/native/com/sun/java/util/jar/pack/constants.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h b/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h +index f1a1f73..536003b 100644 +--- a/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h ++++ b/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h +@@ -223,7 +223,7 @@ enum { + AO_HAVE_FIELD_FLAGS_HI = 1<<10, + AO_HAVE_METHOD_FLAGS_HI = 1<<11, + AO_HAVE_CODE_FLAGS_HI = 1<<12, +- AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use. ++ AO_UNUSED_MBZ = (int)((~0U)<<13), // options bits reserved for future use. + + #define ARCHIVE_BIT_DO(F) \ + F(AO_HAVE_SPECIAL_FORMATS) \ +-- +2.44.0 + diff --git a/dev-java/openjdk/files/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch b/dev-java/openjdk/files/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch new file mode 100644 index 000000000000..44c5268646d8 --- /dev/null +++ b/dev-java/openjdk/files/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch @@ -0,0 +1,61 @@ +From 24f51a75b79aec29bd1631d320e051a646b9fae4 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 6 Mar 2024 12:23:41 +0000 +Subject: [PATCH 4/4] Fix misc. warnings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Backport of https://github.com/openjdk/jdk11u/commit/49dec121161c162f4aa94caf8c09413253d89377. + +``` +jdk8u-jdk8u402-ga/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp: In function ‘_jobject* Java_com_sun_java_util_jar_Unpack_getUnusedInput(JNIEnv*, jobject)’: +jdk8u-jdk8u402-ga/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp:295:12: error: cannot convert ‘bool’ to ‘jobject’ {aka ‘_jobject*’} in return + 295 | return false; + | ^~~~~ +jdk8u-jdk8u402-ga/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp: In function ‘jlong Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv*, jobject)’: +jdk8u-jdk8u402-ga/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp:315:3: warning: converting to non-pointer type ‘long int’ from NULL [-Wconversion-null] + 315 | CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ +jdk8u-jdk8u402-ga/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp:315:3: warning: converting to non-pointer type ‘long int’ from NULL [-Wconversion-null] +[...] +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- + jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp +index 5fbc726..4c002e7 100644 +--- a/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp ++++ b/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp +@@ -292,7 +292,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_getUnusedInput(JNIEnv *env, jobject + + if (uPtr->aborting()) { + THROW_IOE(uPtr->get_abort_message()); +- return false; ++ return null; + } + + // We have fetched all the files. +@@ -312,7 +312,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) { + // There's no need to create a new unpacker here if we don't already have one + // just to immediatly free it afterwards. + unpacker* uPtr = get_unpacker(env, pObj, /* noCreate= */ true); +- CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL); ++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0); + size_t consumed = uPtr->input_consumed(); + // free_unpacker() will set the unpacker field on 'pObj' to null + free_unpacker(env, pObj, uPtr); +@@ -323,6 +323,7 @@ JNIEXPORT jboolean JNICALL + Java_com_sun_java_util_jar_pack_NativeUnpack_setOption(JNIEnv *env, jobject pObj, + jstring pProp, jstring pValue) { + unpacker* uPtr = get_unpacker(env, pObj); ++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false); + const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE); + CHECK_EXCEPTION_RETURN_VALUE(prop, false); + const char* value = env->GetStringUTFChars(pValue, JNI_FALSE); +-- +2.44.0 + diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml index 201e1fe75f50..543587cc5399 100644 --- a/dev-java/openjdk/metadata.xml +++ b/dev-java/openjdk/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> <maintainer type="project"> <email>java@gentoo.org</email> <name>Java</name> @@ -23,7 +19,6 @@ <flag name="javafx" restrict="<=dev-java/openjdk-9">Provide JavaFX support via <pkg>dev-java/openjfx</pkg></flag> <flag name="javafx" restrict=">=dev-java/openjdk-11">Import OpenJFX modules at build time, via <pkg>dev-java/openjfx</pkg></flag> <flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag> - <flag name="lto">Enable Link Time Optimization (LTO)</flag> <flag name="source">Install JVM sources</flag> <flag name="system-bootstrap">Bootstrap using installed openjdk</flag> <flag name="systemtap" restrict=">=dev-java/openjdk-11">Enable SystemTAP/DTrace tracing</flag> @@ -32,5 +27,6 @@ <remote-id type="github">openjdk/jdk8u</remote-id> <remote-id type="github">openjdk/jdk11u</remote-id> <remote-id type="github">openjdk/jdk17u</remote-id> + <remote-id type="github">openjdk/jdk21u</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild b/dev-java/openjdk/openjdk-11.0.23_p9-r1.ebuild index 9c455e1a1a45..7b836738329f 100644 --- a/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild +++ b/dev-java/openjdk/openjdk-11.0.23_p9-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs # don't change versioning scheme # to find correct _p number, look at @@ -14,7 +14,6 @@ inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing # we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to # set build version properly MY_PV="${PV%_p*}-ga" -SLOT="${MY_PV%%[.+]*}" # variable name format: <UPPERCASE_KEYWORD>_XPAK PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball @@ -38,7 +37,7 @@ bootstrap_uri() { DESCRIPTION="Open source implementation of the Java programming language" HOMEPAGE="https://openjdk.org" SRC_URI=" - https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz + https://github.com/${PN}/jdk11u/archive/jdk-${MY_PV}.tar.gz -> ${P}.tar.gz !system-bootstrap? ( $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian) @@ -47,8 +46,10 @@ SRC_URI=" ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.18-riscv.patch.xz ) " +S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" LICENSE="GPL-2-with-classpath-exception" +SLOT="${MY_PV%%[.+]*}" KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86" IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap" @@ -66,7 +67,7 @@ COMMON_DEPEND=" media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) " # Many libs are required to build, but not to run, make is possible to remove @@ -110,8 +111,6 @@ DEPEND=" ) " -S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" - # The space required to build varies wildly depending on USE flags, # ranging from 2GB to 16GB. This function is certainly not exact but # should be close enough to be useful. @@ -167,8 +166,8 @@ src_configure() { # Work around stack alignment issue, bug #647954. use x86 && append-flags -mincoming-stack-boundary=2 - # Work around -fno-common ( GCC10 default ), bug #713180 - append-flags -fcommon + # bug 906987; append-cppflags doesnt work + use elibc_musl && append-flags -D_LARGEFILE64_SOURCE # Strip some flags users may set, but should not. #818502 filter-flags -fexceptions @@ -255,7 +254,7 @@ src_compile() { $(usex doc docs '') $(usex jbootstrap bootcycle-images product-images) ) - emake "${myemakeargs[@]}" -j1 #nowarn + emake "${myemakeargs[@]}" -j1 } src_install() { @@ -288,7 +287,7 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts # must be done before running itself java-vm_set-pax-markings "${ddest}" @@ -303,7 +302,7 @@ src_install() { if use doc ; then docinto html dodoc -r "${S}"/build/*-release/images/docs/* - dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" + dosym -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" fi } diff --git a/dev-java/openjdk/openjdk-11.0.24_p8.ebuild b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild new file mode 100644 index 000000000000..7a870e1198b5 --- /dev/null +++ b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild @@ -0,0 +1,311 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs + +# don't change versioning scheme +# to find correct _p number, look at +# https://github.com/openjdk/jdk${SLOT}u/tags +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point +# to exact same commit sha. we should always use the full version. +# -ga tag is just for humans to easily identify General Availability release tag. +# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to +# set build version properly +MY_PV="${PV%_p*}-ga" + +# variable name format: <UPPERCASE_KEYWORD>_XPAK +PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball +RISCV_XPAK="11.0.14_p9" # lp64d bootstrap tarball +X86_XPAK="11.0.13_p8" + +# Usage: bootstrap_uri <keyword> <version> [extracond] +# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian) +# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) ) +bootstrap_uri() { + local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap" + local suff="tar.xz" + local kw="${1:?${FUNCNAME[0]}: keyword not specified}" + local ver="${2:?${FUNCNAME[0]}: version not specified}" + local cond="${3-}" + + # here be dragons + echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })" +} + +DESCRIPTION="Open source implementation of the Java programming language" +HOMEPAGE="https://openjdk.org" +SRC_URI=" + https://github.com/${PN}/jdk11u/archive/jdk-${MY_PV}.tar.gz + -> ${P}.tar.gz + !system-bootstrap? ( + $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian) + $(bootstrap_uri riscv ${RISCV_XPAK}) + $(bootstrap_uri x86 ${X86_XPAK}) + ) + riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.18-riscv.patch.xz ) +" +S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" + +LICENSE="GPL-2-with-classpath-exception" +SLOT="${MY_PV%%[.+]*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + +IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap" + +REQUIRED_USE=" + javafx? ( alsa !headless-awt ) + !system-bootstrap? ( jbootstrap ) +" + +COMMON_DEPEND=" + media-libs/freetype:2= + media-libs/giflib:0/7 + media-libs/harfbuzz:= + media-libs/libpng:0= + media-libs/lcms:2= + sys-libs/zlib + media-libs/libjpeg-turbo:0= + systemtap? ( dev-debug/systemtap ) +" + +# Many libs are required to build, but not to run, make is possible to remove +# by listing conditionally in RDEPEND unconditionally in DEPEND +RDEPEND=" + ${COMMON_DEPEND} + >=sys-apps/baselayout-java-0.1.0-r1 + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) +" + +DEPEND=" + ${COMMON_DEPEND} + app-arch/zip + media-libs/alsa-lib + net-print/cups + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + javafx? ( dev-java/openjfx:${SLOT}= ) + system-bootstrap? ( + || ( + dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)] + dev-java/openjdk:${SLOT}[gentoo-vm(+)] + ) + ) +" + +# The space required to build varies wildly depending on USE flags, +# ranging from 2GB to 16GB. This function is certainly not exact but +# should be close enough to be useful. +openjdk_check_requirements() { + local M + M=2048 + M=$(( $(usex jbootstrap 2 1) * $M )) + M=$(( $(usex debug 3 1) * $M )) + M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) + + CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} +} + +pkg_pretend() { + openjdk_check_requirements + if [[ ${MERGE_TYPE} != binary ]]; then + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" + fi +} + +pkg_setup() { + openjdk_check_requirements + java-vm-2_pkg_setup + + [[ ${MERGE_TYPE} == "binary" ]] && return + + JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" + JAVA_PKG_WANT_SOURCE="${SLOT}" + JAVA_PKG_WANT_TARGET="${SLOT}" + + if use system-bootstrap; then + for vm in ${JAVA_PKG_WANT_BUILD_VM}; do + if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then + java-pkg-2_pkg_setup + return + fi + done + fi +} + +src_prepare() { + use riscv && eapply "${WORKDIR}"/openjdk-11.0.18-riscv.patch + default + chmod +x configure || die +} + +src_configure() { + if ! use system-bootstrap; then + local xpakvar="${ARCH^^}_XPAK" + export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" + fi + + # Work around stack alignment issue, bug #647954. + use x86 && append-flags -mincoming-stack-boundary=2 + + # bug 906987; append-cppflags doesnt work + use elibc_musl && append-flags -D_LARGEFILE64_SOURCE + + # Strip some flags users may set, but should not. #818502 + filter-flags -fexceptions + + # Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt + # https://bugs.gentoo.org/833097 + # https://bugs.gentoo.org/833098 + filter-lto + filter-flags -fdevirtualize-at-ltrans + + # Enabling full docs appears to break doc building. If not + # explicitly disabled, the flag will get auto-enabled if pandoc and + # graphviz are detected. pandoc has loads of dependencies anyway. + + local myconf=( + --disable-ccache + --disable-precompiled-headers + --enable-full-docs=no + --with-boot-jdk="${JDK_HOME}" + --with-extra-cflags="${CFLAGS}" + --with-extra-cxxflags="${CXXFLAGS}" + --with-extra-ldflags="${LDFLAGS}" + --with-freetype="${XPAK_BOOTSTRAP:-system}" + --with-giflib="${XPAK_BOOTSTRAP:-system}" + --with-harfbuzz="${XPAK_BOOTSTRAP:-system}" + --with-lcms="${XPAK_BOOTSTRAP:-system}" + --with-libjpeg="${XPAK_BOOTSTRAP:-system}" + --with-libpng="${XPAK_BOOTSTRAP:-system}" + --with-native-debug-symbols=$(usex debug internal none) + --with-vendor-name="Gentoo" + --with-vendor-url="https://gentoo.org" + --with-vendor-bug-url="https://bugs.gentoo.org" + --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" + --with-vendor-version-string="${PVR}" + --with-version-pre="" + --with-version-string="${PV%_p*}" + --with-version-build="${PV#*_p}" + --with-zlib="${XPAK_BOOTSTRAP:-system}" + --enable-dtrace=$(usex systemtap yes no) + --enable-headless-only=$(usex headless-awt yes no) + $(tc-is-clang && echo "--with-toolchain-type=clang") + ) + ! use riscv && myconf+=( --with-jvm-features=shenandoahgc ) + + use lto && myconf+=( --with-jvm-features=link-time-opt ) + + if use javafx; then + # this is not useful for users, just for upstream developers + # build system compares mesa version in md file + # https://bugs.gentoo.org/822612 + export LEGAL_EXCLUDES=mesa3d.md + + local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" + if [[ -r ${zip} ]]; then + myconf+=( --with-import-modules="${zip}" ) + else + die "${zip} not found or not readable" + fi + fi + + if use !system-bootstrap ; then + addpredict /dev/random + addpredict /proc/self/coredump_filter + fi + + ( + unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS + CFLAGS= CXXFLAGS= LDFLAGS= \ + CONFIG_SITE=/dev/null \ + econf "${myconf[@]}" + ) +} + +src_compile() { + # Too brittle - gets confused by e.g. -Oline + export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)" + unset GNUMAKEFLAGS MAKEFLAGS + + local myemakeargs=( + JOBS=$(makeopts_jobs) + LOG=debug + CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror + NICE= # Use PORTAGE_NICENESS, don't adjust further down + $(usex doc docs '') + $(usex jbootstrap bootcycle-images product-images) + ) + emake "${myemakeargs[@]}" -j1 +} + +src_install() { + local dest="/usr/$(get_libdir)/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + cd "${S}"/build/*-release/images/jdk || die + + # Create files used as storage for system preferences. + mkdir .systemPrefs || die + touch .systemPrefs/.system.lock || die + touch .systemPrefs/.systemRootModFile || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but OpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if ! use examples ; then + rm -vr demo/ || die + fi + + if ! use source ; then + rm -v lib/src.zip || die + fi + + rm -v lib/security/cacerts || die + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + + # must be done before running itself + java-vm_set-pax-markings "${ddest}" + + einfo "Creating the Class Data Sharing archives and disabling usage tracking" + "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die + + java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter + + if use doc ; then + docinto html + dodoc -r "${S}"/build/*-release/images/docs/* + dosym -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" + fi +} + +pkg_postinst() { + java-vm-2_pkg_postinst +} diff --git a/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild b/dev-java/openjdk/openjdk-17.0.11_p9.ebuild index 2d8881fa4e09..0bd209de601f 100644 --- a/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild +++ b/dev-java/openjdk/openjdk-17.0.11_p9.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs # variable name format: <UPPERCASE_KEYWORD>_XPAK ARM64_XPAK="17.0.2_p8" # musl bootstrap install @@ -33,12 +33,11 @@ bootstrap_uri() { # to exact same commit sha. we should always use the full version. # -ga tag is just for humans to easily identify General Availability release tag. MY_PV="${PV%_p*}-ga" -SLOT="${MY_PV%%[.+]*}" DESCRIPTION="Open source implementation of the Java programming language" HOMEPAGE="https://openjdk.org" SRC_URI=" - https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz + https://github.com/${PN}/jdk17u/archive/jdk-${MY_PV}.tar.gz -> ${P}.tar.gz !system-bootstrap? ( $(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl) @@ -46,12 +45,11 @@ SRC_URI=" $(bootstrap_uri x86 ${X86_XPAK}) $(bootstrap_uri riscv ${RISCV_XPAK}) ) - riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch ) " -# riscv patch origin: -# https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch +S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}" LICENSE="GPL-2-with-classpath-exception" +SLOT="${MY_PV%%[.+]*}" KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86" IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap" @@ -69,7 +67,7 @@ COMMON_DEPEND=" media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) " # Many libs are required to build, but not to run, make is possible to remove @@ -113,8 +111,6 @@ DEPEND=" ) " -S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}" - # The space required to build varies wildly depending on USE flags, # ranging from 2GB to 16GB. This function is certainly not exact but # should be close enough to be useful. @@ -163,7 +159,6 @@ pkg_setup() { } src_prepare() { - use riscv && eapply "${DISTDIR}"/java17-riscv64.patch default chmod +x configure || die } @@ -185,8 +180,8 @@ src_configure() { # Work around stack alignment issue, bug #647954. in case we ever have x86 use x86 && append-flags -mincoming-stack-boundary=2 - # Work around -fno-common ( GCC10 default ), bug #713180 - append-flags -fcommon + # bug 906987; append-cppflags doesnt work + use elibc_musl && append-flags -D_LARGEFILE64_SOURCE # Strip some flags users may set, but should not. #818502 filter-flags -fexceptions @@ -231,8 +226,6 @@ src_configure() { $(tc-is-clang && echo "--with-toolchain-type=clang") ) - use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" ) - use lto && myconf+=( --with-jvm-features=link-time-opt ) if use javafx; then @@ -270,7 +263,7 @@ src_compile() { $(usex doc docs '') $(usex jbootstrap bootcycle-images product-images) ) - emake "${myemakeargs[@]}" -j1 #nowarn + emake "${myemakeargs[@]}" -j1 } src_install() { @@ -303,7 +296,7 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts # must be done before running itself java-vm_set-pax-markings "${ddest}" diff --git a/dev-java/openjdk/openjdk-17.0.12_p7.ebuild b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild new file mode 100644 index 000000000000..1c4f51f66acd --- /dev/null +++ b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild @@ -0,0 +1,320 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs + +# variable name format: <UPPERCASE_KEYWORD>_XPAK +ARM64_XPAK="17.0.2_p8" # musl bootstrap install +PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball +RISCV_XPAK="17.0.3_p7" +X86_XPAK="17.0.1_p12" + +# Usage: bootstrap_uri <keyword> <version> [extracond] +# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian) +# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) ) +bootstrap_uri() { + local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap" + local suff="tar.xz" + local kw="${1:?${FUNCNAME[0]}: keyword not specified}" + local ver="${2:?${FUNCNAME[0]}: version not specified}" + local cond="${3-}" + [[ ${cond} == elibc_musl* ]] && local musl=yes + + # here be dragons + echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })" +} + +# don't change versioning scheme +# to find correct _p number, look at +# https://github.com/openjdk/jdk${SLOT}u/tags +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point +# to exact same commit sha. we should always use the full version. +# -ga tag is just for humans to easily identify General Availability release tag. +MY_PV="${PV%_p*}-ga" + +DESCRIPTION="Open source implementation of the Java programming language" +HOMEPAGE="https://openjdk.org" +SRC_URI=" + https://github.com/${PN}/jdk17u/archive/jdk-${MY_PV}.tar.gz + -> ${P}.tar.gz + !system-bootstrap? ( + $(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl) + $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian) + $(bootstrap_uri x86 ${X86_XPAK}) + $(bootstrap_uri riscv ${RISCV_XPAK}) + ) +" +S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}" + +LICENSE="GPL-2-with-classpath-exception" +SLOT="${MY_PV%%[.+]*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + +IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap" + +REQUIRED_USE=" + javafx? ( alsa !headless-awt ) + !system-bootstrap? ( jbootstrap ) +" + +COMMON_DEPEND=" + media-libs/freetype:2= + media-libs/giflib:0/7 + media-libs/harfbuzz:= + media-libs/libpng:0= + media-libs/lcms:2= + sys-libs/zlib + media-libs/libjpeg-turbo:0= + systemtap? ( dev-debug/systemtap ) +" + +# Many libs are required to build, but not to run, make is possible to remove +# by listing conditionally in RDEPEND unconditionally in DEPEND +RDEPEND=" + ${COMMON_DEPEND} + >=sys-apps/baselayout-java-0.1.0-r1 + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) +" + +DEPEND=" + ${COMMON_DEPEND} + app-arch/zip + media-libs/alsa-lib + net-print/cups + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + javafx? ( dev-java/openjfx:${SLOT}= ) + system-bootstrap? ( + || ( + dev-java/openjdk-bin:${SLOT} + dev-java/openjdk:${SLOT} + ) + ) +" + +# The space required to build varies wildly depending on USE flags, +# ranging from 2GB to 16GB. This function is certainly not exact but +# should be close enough to be useful. +openjdk_check_requirements() { + local M + M=2048 + M=$(( $(usex jbootstrap 2 1) * $M )) + M=$(( $(usex debug 3 1) * $M )) + M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) + + CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} +} + +pkg_pretend() { + openjdk_check_requirements + if [[ ${MERGE_TYPE} != binary ]]; then + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" + fi +} + +pkg_setup() { + openjdk_check_requirements + java-vm-2_pkg_setup + + [[ ${MERGE_TYPE} == "binary" ]] && return + + JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" + JAVA_PKG_WANT_SOURCE="${SLOT}" + JAVA_PKG_WANT_TARGET="${SLOT}" + + # The nastiness below is necessary while the gentoo-vm USE flag is + # masked. First we call java-pkg-2_pkg_setup if it looks like the + # flag was unmasked against one of the possible build VMs. If not, + # we try finding one of them in their expected locations. This would + # have been slightly less messy if openjdk-bin had been installed to + # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env + # file but disable it so that it would not normally be selectable. + + local vm + for vm in ${JAVA_PKG_WANT_BUILD_VM}; do + if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then + java-pkg-2_pkg_setup + return + fi + done +} + +src_prepare() { + default + chmod +x configure || die +} + +src_configure() { + if has_version dev-java/openjdk:${SLOT}; then + export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT} + elif use !system-bootstrap ; then + local xpakvar="${ARCH^^}_XPAK" + export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" + else + JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT}) + [[ -n ${JDK_HOME} ]] || die "Build VM not found!" + JDK_HOME=${JDK_HOME#*/} + JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*} + export JDK_HOME + fi + + # Work around stack alignment issue, bug #647954. in case we ever have x86 + use x86 && append-flags -mincoming-stack-boundary=2 + + # bug 906987; append-cppflags doesnt work + use elibc_musl && append-flags -D_LARGEFILE64_SOURCE + + # Strip some flags users may set, but should not. #818502 + filter-flags -fexceptions + + # Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt + # https://bugs.gentoo.org/833097 + # https://bugs.gentoo.org/833098 + filter-lto + filter-flags -fdevirtualize-at-ltrans + + # Enabling full docs appears to break doc building. If not + # explicitly disabled, the flag will get auto-enabled if pandoc and + # graphviz are detected. pandoc has loads of dependencies anyway. + + local myconf=( + --disable-ccache + --disable-precompiled-headers + --disable-warnings-as-errors + --enable-full-docs=no + --with-boot-jdk="${JDK_HOME}" + --with-extra-cflags="${CFLAGS}" + --with-extra-cxxflags="${CXXFLAGS}" + --with-extra-ldflags="${LDFLAGS}" + --with-freetype="${XPAK_BOOTSTRAP:-system}" + --with-giflib="${XPAK_BOOTSTRAP:-system}" + --with-harfbuzz="${XPAK_BOOTSTRAP:-system}" + --with-lcms="${XPAK_BOOTSTRAP:-system}" + --with-libjpeg="${XPAK_BOOTSTRAP:-system}" + --with-libpng="${XPAK_BOOTSTRAP:-system}" + --with-native-debug-symbols=$(usex debug internal none) + --with-vendor-name="Gentoo" + --with-vendor-url="https://gentoo.org" + --with-vendor-bug-url="https://bugs.gentoo.org" + --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" + --with-vendor-version-string="${PVR}" + --with-version-pre="" + --with-version-string="${PV%_p*}" + --with-version-build="${PV#*_p}" + --with-zlib="${XPAK_BOOTSTRAP:-system}" + --enable-jvm-feature-dtrace=$(usex systemtap yes no) + --enable-headless-only=$(usex headless-awt yes no) + $(tc-is-clang && echo "--with-toolchain-type=clang") + ) + + use lto && myconf+=( --with-jvm-features=link-time-opt ) + + if use javafx; then + local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" + if [[ -r ${zip} ]]; then + myconf+=( --with-import-modules="${zip}" ) + else + die "${zip} not found or not readable" + fi + fi + + if use !system-bootstrap ; then + addpredict /dev/random + addpredict /proc/self/coredump_filter + fi + + ( + unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS + CFLAGS= CXXFLAGS= LDFLAGS= \ + CONFIG_SITE=/dev/null \ + econf "${myconf[@]}" + ) +} + +src_compile() { + # Too brittle - gets confused by e.g. -Oline + export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)" + unset GNUMAKEFLAGS MAKEFLAGS + + local myemakeargs=( + JOBS=$(makeopts_jobs) + LOG=debug + CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror + NICE= # Use PORTAGE_NICENESS, don't adjust further down + $(usex doc docs '') + $(usex jbootstrap bootcycle-images product-images) + ) + emake "${myemakeargs[@]}" -j1 +} + +src_install() { + local dest="/usr/$(get_libdir)/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + cd "${S}"/build/*-release/images/jdk || die + + # Create files used as storage for system preferences. + mkdir .systemPrefs || die + touch .systemPrefs/.system.lock || die + touch .systemPrefs/.systemRootModFile || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but OpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if ! use examples ; then + rm -vr demo/ || die + fi + + if ! use source ; then + rm -v lib/src.zip || die + fi + + rm -v lib/security/cacerts || die + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + + # must be done before running itself + java-vm_set-pax-markings "${ddest}" + + einfo "Creating the Class Data Sharing archives and disabling usage tracking" + "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die + + java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter + + if use doc ; then + docinto html + dodoc -r "${S}"/build/*-release/images/docs/* + dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" + fi +} + +pkg_postinst() { + java-vm-2_pkg_postinst +} diff --git a/dev-java/openjdk/openjdk-21.0.1_p12.ebuild b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild index 7332163ebc89..943ac23576da 100644 --- a/dev-java/openjdk/openjdk-21.0.1_p12.ebuild +++ b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs # variable name format: <UPPERCASE_KEYWORD>_XPAK PPC64_XPAK="21.0.0_p35" # big-endian bootstrap tarball @@ -31,20 +31,21 @@ bootstrap_uri() { # to exact same commit sha. we should always use the full version. # -ga tag is just for humans to easily identify General Availability release tag. MY_PV="${PV%_p*}-ga" -SLOT="${MY_PV%%[.+]*}" DESCRIPTION="Open source implementation of the Java programming language" HOMEPAGE="https://openjdk.org" SRC_URI=" - https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz + https://github.com/${PN}/jdk21u/archive/jdk-${MY_PV}.tar.gz -> ${P}.tar.gz !system-bootstrap? ( $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian) $(bootstrap_uri x86 ${X86_XPAK}) ) " +S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}" LICENSE="GPL-2-with-classpath-exception" +SLOT="${MY_PV%%[.+]*}" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source +system-bootstrap systemtap" @@ -63,7 +64,7 @@ COMMON_DEPEND=" media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) " # Many libs are required to build, but not to run, make is possible to remove @@ -107,8 +108,6 @@ DEPEND=" ) " -S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}" - # The space required to build varies wildly depending on USE flags, # ranging from 2GB to 16GB. This function is certainly not exact but # should be close enough to be useful. @@ -178,8 +177,8 @@ src_configure() { # Work around stack alignment issue, bug #647954. in case we ever have x86 use x86 && append-flags -mincoming-stack-boundary=2 - # Work around -fno-common ( GCC10 default ), bug #713180 - append-flags -fcommon + # bug 906987; append-cppflags doesnt work + use elibc_musl && append-flags -D_LARGEFILE64_SOURCE # Strip some flags users may set, but should not. #818502 filter-flags -fexceptions @@ -263,7 +262,7 @@ src_compile() { $(usex doc docs '') $(usex jbootstrap bootcycle-images product-images) ) - emake "${myemakeargs[@]}" -j1 #nowarn + emake "${myemakeargs[@]}" -j1 } src_install() { @@ -296,7 +295,7 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts # must be done before running itself java-vm_set-pax-markings "${ddest}" diff --git a/dev-java/openjdk/openjdk-8.382_p05.ebuild b/dev-java/openjdk/openjdk-8.412_p08.ebuild index 9b1632baec83..d006b5c56f80 100644 --- a/dev-java/openjdk/openjdk-8.382_p05.ebuild +++ b/dev-java/openjdk/openjdk-8.412_p08.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs # don't change versioning scheme # to find correct _p number, look at @@ -14,15 +14,41 @@ inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing # we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to # set build version properly MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)" -SLOT="${PV%%[.+]*}" + +# variable name format: <UPPERCASE_KEYWORD>_XPAK +X86_XPAK="8.402_p06" +PPC64_XPAK="8.402_p06" + +# Usage: bootstrap_uri <keyword> <version> [extracond] +# Example: $(bootstrap_uri x86 8.402_p06) +# Output: ppc64? ( big-endian? ( https://...8.402_p06-x86.tar.xz ) ) +bootstrap_uri() { + local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap" + local suff="tar.xz" + local kw="${1:?${FUNCNAME[0]}: keyword not specified}" + local ver="${2:?${FUNCNAME[0]}: version not specified}" + local cond="${3-}" + + # here be dragons + echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })" +} DESCRIPTION="Open source implementation of the Java programming language" HOMEPAGE="https://openjdk.org" -SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz" +SRC_URI=" + https://github.com/openjdk/jdk8u/archive/jdk${MY_PV}.tar.gz + -> ${P}.tar.gz + !system-bootstrap? ( + $(bootstrap_uri x86 ${X86_XPAK}) + $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian) + ) +" +S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" LICENSE="GPL-2-with-classpath-exception" +SLOT="${PV%%[.+]*}" KEYWORDS="amd64 arm64 ppc64 x86" -IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source" +IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source" COMMON_DEPEND=" media-libs/freetype:2= @@ -60,11 +86,11 @@ DEPEND=" x11-libs/libXrender x11-libs/libXt x11-libs/libXtst - || ( - dev-java/openjdk-bin:${SLOT} - dev-java/icedtea-bin:${SLOT} - dev-java/openjdk:${SLOT} - dev-java/icedtea:${SLOT} + system-bootstrap? ( + || ( + dev-java/openjdk-bin:${SLOT} + dev-java/openjdk:${SLOT} + ) ) " @@ -74,9 +100,13 @@ BDEPEND=" PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )" -S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" - -PATCHES=( "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" ) +PATCHES=( + "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" + "${FILESDIR}/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch" + "${FILESDIR}/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch" + "${FILESDIR}/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch" + "${FILESDIR}/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch" +) # The space required to build varies wildly depending on USE flags, # ranging from 2GB to 16GB. This function is certainly not exact but @@ -100,13 +130,22 @@ pkg_pretend() { pkg_setup() { openjdk_check_requirements + java-vm-2_pkg_setup + + [[ ${MERGE_TYPE} == "binary" ]] && return - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}" + JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" JAVA_PKG_WANT_SOURCE="${SLOT}" JAVA_PKG_WANT_TARGET="${SLOT}" - java-vm-2_pkg_setup - java-pkg-2_pkg_setup + if use system-bootstrap; then + for vm in ${JAVA_PKG_WANT_BUILD_VM}; do + if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then + java-pkg-2_pkg_setup + return + fi + done + fi } src_prepare() { @@ -120,15 +159,20 @@ src_prepare() { } src_configure() { + if ! use system-bootstrap; then + local xpakvar="${ARCH^^}_XPAK" + export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" + fi + # general build info found here: - #https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html + # https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html + + # -Wregister use (bug #918655) + append-cxxflags -std=gnu++14 # Work around stack alignment issue, bug #647954. use x86 && append-flags -mincoming-stack-boundary=2 - # Work around -fno-common ( GCC10 default ), bug #706638 - append-flags -fcommon - # Strip some flags users may set, but should not. #818502 filter-flags -fexceptions @@ -151,7 +195,7 @@ src_configure() { --with-extra-ldflags="${LDFLAGS}" --with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )" --with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2" - --with-giflib=system + --with-giflib="${XPAK_BOOTSTRAP:-system}" --with-jtreg=no --with-jobs=1 --with-num-cores=1 @@ -162,7 +206,7 @@ src_configure() { --with-vendor-url="https://gentoo.org" --with-vendor-bug-url="https://bugs.gentoo.org" --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" - --with-zlib=system + --with-zlib="${XPAK_BOOTSTRAP:-system}" --with-native-debug-symbols=$(usex debug internal none) $(usex headless-awt --disable-headful '') $(tc-is-clang && echo "--with-toolchain-type=clang") @@ -190,7 +234,7 @@ src_compile() { $(usex doc docs '') $(usex jbootstrap bootcycle-images images) ) - emake "${myemakeargs[@]}" -j1 #nowarn + emake "${myemakeargs[@]}" -j1 } src_install() { @@ -220,7 +264,7 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh java-vm_set-pax-markings "${ddest}" diff --git a/dev-java/openjdk/openjdk-8.422_p05.ebuild b/dev-java/openjdk/openjdk-8.422_p05.ebuild new file mode 100644 index 000000000000..6280651782d6 --- /dev/null +++ b/dev-java/openjdk/openjdk-8.422_p05.ebuild @@ -0,0 +1,283 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs + +# don't change versioning scheme +# to find correct _p number, look at +# https://github.com/openjdk/jdk${SLOT}u/tags +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point +# to exact same commit sha. we should always use the full version. +# -ga tag is just for humans to easily identify General Availability release tag. +# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to +# set build version properly +MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)" + +# variable name format: <UPPERCASE_KEYWORD>_XPAK +X86_XPAK="8.402_p06" +PPC64_XPAK="8.402_p06" + +# Usage: bootstrap_uri <keyword> <version> [extracond] +# Example: $(bootstrap_uri x86 8.402_p06) +# Output: ppc64? ( big-endian? ( https://...8.402_p06-x86.tar.xz ) ) +bootstrap_uri() { + local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap" + local suff="tar.xz" + local kw="${1:?${FUNCNAME[0]}: keyword not specified}" + local ver="${2:?${FUNCNAME[0]}: version not specified}" + local cond="${3-}" + + # here be dragons + echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })" +} + +DESCRIPTION="Open source implementation of the Java programming language" +HOMEPAGE="https://openjdk.org" +SRC_URI=" + https://github.com/openjdk/jdk8u/archive/jdk${MY_PV}.tar.gz + -> ${P}.tar.gz + !system-bootstrap? ( + $(bootstrap_uri x86 ${X86_XPAK}) + $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian) + ) +" +S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" + +LICENSE="GPL-2-with-classpath-exception" +SLOT="${PV%%[.+]*}" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source" + +COMMON_DEPEND=" + media-libs/freetype:2= + media-libs/giflib:0/7 + sys-libs/zlib +" +# Many libs are required to build, but not to run, make is possible to remove +# by listing conditionally in RDEPEND unconditionally in DEPEND +RDEPEND=" + ${COMMON_DEPEND} + >=sys-apps/baselayout-java-0.1.0-r1 + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) +" + +DEPEND=" + ${COMMON_DEPEND} + app-arch/zip + media-libs/alsa-lib + net-print/cups + virtual/pkgconfig + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + system-bootstrap? ( + || ( + dev-java/openjdk-bin:${SLOT} + dev-java/openjdk:${SLOT} + ) + ) +" + +BDEPEND=" + virtual/pkgconfig +" + +PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )" + +PATCHES=( + "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" + "${FILESDIR}/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch" + "${FILESDIR}/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch" + "${FILESDIR}/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch" + "${FILESDIR}/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch" +) + +# The space required to build varies wildly depending on USE flags, +# ranging from 2GB to 16GB. This function is certainly not exact but +# should be close enough to be useful. +openjdk_check_requirements() { + local M + M=2048 + M=$(( $(usex debug 3 1) * $M )) + M=$(( $(usex jbootstrap 2 1) * $M )) + M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) + + CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} +} + +pkg_pretend() { + openjdk_check_requirements + if [[ ${MERGE_TYPE} != binary ]]; then + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" + fi +} + +pkg_setup() { + openjdk_check_requirements + java-vm-2_pkg_setup + + [[ ${MERGE_TYPE} == "binary" ]] && return + + JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" + JAVA_PKG_WANT_SOURCE="${SLOT}" + JAVA_PKG_WANT_TARGET="${SLOT}" + + if use system-bootstrap; then + for vm in ${JAVA_PKG_WANT_BUILD_VM}; do + if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then + java-pkg-2_pkg_setup + return + fi + done + fi +} + +src_prepare() { + default + + # new warnings in new gcc https://bugs.gentoo.org/685426 + sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \ + hotspot/make/linux/makefiles/gcc.make || die + + chmod +x configure || die +} + +src_configure() { + if ! use system-bootstrap; then + local xpakvar="${ARCH^^}_XPAK" + export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" + fi + + # general build info found here: + # https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html + + # -Wregister use (bug #918655) + append-cxxflags -std=gnu++14 + + # Work around stack alignment issue, bug #647954. + use x86 && append-flags -mincoming-stack-boundary=2 + + # Strip some flags users may set, but should not. #818502 + filter-flags -fexceptions + + # Strip lto related flags, no support in this version. + # https://bugs.gentoo.org/833097 + # https://bugs.gentoo.org/833098 + filter-lto + filter-flags -fdevirtualize-at-ltrans + + tc-export_build_env CC CXX PKG_CONFIG STRIP + + local myconf=( + --disable-ccache + --disable-freetype-bundling + --disable-precompiled-headers + --enable-unlimited-crypto + --with-boot-jdk="${JDK_HOME}" + --with-extra-cflags="${CFLAGS}" + --with-extra-cxxflags="${CXXFLAGS}" + --with-extra-ldflags="${LDFLAGS}" + --with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )" + --with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2" + --with-giflib="${XPAK_BOOTSTRAP:-system}" + --with-jtreg=no + --with-jobs=1 + --with-num-cores=1 + --with-update-version="$(ver_cut 2)" + --with-build-number="b$(ver_cut 4)" + --with-milestone="fcs" # magic variable that means "release version" + --with-vendor-name="Gentoo" + --with-vendor-url="https://gentoo.org" + --with-vendor-bug-url="https://bugs.gentoo.org" + --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" + --with-zlib="${XPAK_BOOTSTRAP:-system}" + --with-native-debug-symbols=$(usex debug internal none) + $(usex headless-awt --disable-headful '') + $(tc-is-clang && echo "--with-toolchain-type=clang") + ) + + ( + unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS + CFLAGS= CXXFLAGS= LDFLAGS= \ + CONFIG_SITE=/dev/null \ + CONFIG_SHELL="${BROOT}/bin/bash" + econf "${myconf[@]}" + ) +} + +src_compile() { + # Too brittle - gets confused by e.g. -Oline + export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)" + unset GNUMAKEFLAGS MAKEFLAGS + + local myemakeargs=( + JOBS=$(makeopts_jobs) + LOG=debug + CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror + NICE= # Use PORTAGE_NICENESS, don't adjust further down + $(usex doc docs '') + $(usex jbootstrap bootcycle-images images) + ) + emake "${myemakeargs[@]}" -j1 +} + +src_install() { + local dest="/usr/$(get_libdir)/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + cd "${S}"/build/*-release/images/j2sdk-image || die + + if ! use alsa; then + rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die + fi + + # build system does not remove that + if use headless-awt ; then + rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \ + {,jre/}bin/policytool bin/appletviewer || die + fi + + if ! use examples ; then + rm -vr demo/ || die + fi + + if ! use source ; then + rm -v src.zip || die + fi + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts + + java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + java-vm_set-pax-markings "${ddest}" + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter + + if use doc ; then + docinto html + dodoc -r "${S}"/build/*-release/docs/* + fi +} + +pkg_postinst() { + java-vm-2_pkg_postinst + einfo "JavaWebStart functionality provided by icedtea-web package" +} diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest index 65b4b0f82bef..63028b364713 100644 --- a/dev-java/openjfx/Manifest +++ b/dev-java/openjfx/Manifest @@ -8,6 +8,5 @@ DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500 DIST openjfx-11.0.11_p1.tar.bz2 65017753 BLAKE2B ea5834e469bb0bd3a70595a91cc298f6091bc45de4c471ee9d0bcd45700ab3966a3396781ace2666bf94decd1219a83f01b277116cf23baeb6dd34a1a0f44191 SHA512 a1f94b3166aca50344f8af77ec2a5f52be1b0abc1c65fd3ff97f98017377ab772262502af00ad8cd4a6c44281ea459aff43a9cb7e30a1c35b822da8fb39b94fb -DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236 DIST openjfx-8.1000-backports.tar.bz2 9142182 BLAKE2B 58ea420ec015c49d2755105a3d11675a92ecab337c7bda5a1ad72e84d0b35f04ed4252cee24da89b1e7b1b5b8b8b9fea7db93364434800246b87827b21970cc3 SHA512 077392368947cb9da1b5c7e14b641d6edcddd9821eb4f16dbea33e8986568211e93799aca29e70b490c8ef2125d69f8372abd1b1ce428a95420f62ff15c414d6 DIST openjfx-8.1000.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32 diff --git a/dev-java/openjfx/files/11/0001-c99.patch b/dev-java/openjfx/files/11/0001-c99.patch new file mode 100644 index 000000000000..f553d2858801 --- /dev/null +++ b/dev-java/openjfx/files/11/0001-c99.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/919413 +https://src.fedoraproject.org/rpms/openjfx/c/9e893037f3a20273c79603220b7a18a44be60fcc?branch=rawhide + +commit 42321838b98d2ebb3d8384c88a764ff2b4d70581 +Author: Florian Weimer <fweimer@openjdk.org> +Date: Fri Jun 16 12:19:10 2023 +0000 + + 8307542: Call to FcConfigAppFontAddFile uses wrong prototype, arguments + + Reviewed-by: kcr + +--- a/modules/javafx.graphics/src/main/native-font/pango.c ++++ b/modules/javafx.graphics/src/main/native-font/pango.c +@@ -243,7 +243,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(FcConfigAppFontAddFile) + if (text) { + // rc = (jboolean)FcConfigAppFontAddFile(arg0, text); + if (fp) { +- rc = (jboolean)((jboolean (*)(void *, const char *))fp)(arg0, text); ++ rc = (jboolean)((int (*)(void *, const char *))fp)((void *)arg0, text); + } + (*env)->ReleaseStringUTFChars(env, arg1, text); + } diff --git a/dev-java/openjfx/files/11/0002-c99.patch b/dev-java/openjfx/files/11/0002-c99.patch new file mode 100644 index 000000000000..4cdc5ed35e50 --- /dev/null +++ b/dev-java/openjfx/files/11/0002-c99.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/919413 +https://src.fedoraproject.org/rpms/openjfx/c/9e893037f3a20273c79603220b7a18a44be60fcc?branch=rawhide + +8323078: Incorrect length argument to g_utf8_strlen in pango.c + +Submitted upstream: <https://github.com/openjdk/jfx/pull/1320> + +--- a/modules/javafx.graphics/src/main/native-font/pango.c ++++ b/modules/javafx.graphics/src/main/native-font/pango.c +@@ -402,7 +402,7 @@ JNIEXPORT jlong JNICALL OS_NATIVE(g_1utf8_1strlen) + (JNIEnv *env, jclass that, jlong str, jlong pos) + { + if (!str) return 0; +- return (jlong)g_utf8_strlen((const gchar *)str, (const gchar *)pos); ++ return (jlong)g_utf8_strlen((const gchar *)str, (gssize)pos); + } + + JNIEXPORT jlong JNICALL OS_NATIVE(g_1utf16_1to_1utf8) diff --git a/dev-java/openjfx/files/11/0003-c99.patch b/dev-java/openjfx/files/11/0003-c99.patch new file mode 100644 index 000000000000..8779f882b799 --- /dev/null +++ b/dev-java/openjfx/files/11/0003-c99.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/919413 +https://src.fedoraproject.org/rpms/openjfx/c/9e893037f3a20273c79603220b7a18a44be60fcc?branch=rawhide + +8323077: C type error (incompatible function pointer) in X11GLContext.c + +Submitted upstream: <https://github.com/openjdk/jfx/pull/1319> + +--- a/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLContext.c ++++ b/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLContext.c +@@ -275,7 +275,8 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_X11GLContext_nInitialize + dlsym(RTLD_DEFAULT, "glXSwapIntervalSGI"); + + if (ctxInfo->glXSwapIntervalSGI == NULL) { +- ctxInfo->glXSwapIntervalSGI = glXGetProcAddress("glXSwapIntervalSGI"); ++ ctxInfo->glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC) ++ glXGetProcAddress((const GLubyte *)"glXSwapIntervalSGI"); + } + + } diff --git a/dev-java/openjfx/files/11/11.0.9_p0-version.patch b/dev-java/openjfx/files/11/11.0.9_p0-version.patch index fbcbb3890499..558423e3ab6d 100644 --- a/dev-java/openjfx/files/11/11.0.9_p0-version.patch +++ b/dev-java/openjfx/files/11/11.0.9_p0-version.patch @@ -7,9 +7,8 @@ 8252067: Change JavaFX release version in 11-dev to 11.0.9 Reviewed-by: kcr -diff -r 38425dc30b9a -r c0fe72db97a8 build.properties ---- a/build.properties Thu Aug 20 10:24:03 2020 +0200 -+++ b/build.properties Thu Aug 20 14:48:02 2020 +0200 +--- a/build.properties ++++ b/build.properties @@ -41,7 +41,7 @@ # UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE jfx.release.major.version=11 diff --git a/dev-java/openjfx/files/11/disable-architecture-verification.patch b/dev-java/openjfx/files/11/disable-architecture-verification.patch index 9e5a3fc3b750..3cddae50595c 100644 --- a/dev-java/openjfx/files/11/disable-architecture-verification.patch +++ b/dev-java/openjfx/files/11/disable-architecture-verification.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 19 Sep 2020 18:38:05 -0700 Subject: [PATCH] disable architecture verification ---- - build.gradle | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/build.gradle b/build.gradle -index 66a4b3c..f66ee01 100644 --- a/build.gradle +++ b/build.gradle @@ -302,6 +302,7 @@ ext.MAVEN_GROUP_ID = "org.openjfx" diff --git a/dev-java/openjfx/files/11/don-t-force-msse-11.0.11.patch b/dev-java/openjfx/files/11/don-t-force-msse-11.0.11.patch index aa04c15aa778..be635a2d6367 100644 --- a/dev-java/openjfx/files/11/don-t-force-msse-11.0.11.patch +++ b/dev-java/openjfx/files/11/don-t-force-msse-11.0.11.patch @@ -3,17 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 19 Sep 2020 18:30:58 -0700 Subject: [PATCH] don't force -msse ---- - .../src/main/native/gstreamer/projects/linux/avplugin/Makefile | 1 - - .../main/native/gstreamer/projects/linux/fxplugins/Makefile | 1 - - .../src/main/native/gstreamer/projects/mac/fxplugins/Makefile | 3 +-- - .../main/native/gstreamer/projects/mac/gstreamer-lite/Makefile | 3 +-- - .../src/main/native/jfxmedia/projects/linux/Makefile | 1 - - .../src/main/native/jfxmedia/projects/mac/Makefile | 3 +-- - 6 files changed, 3 insertions(+), 9 deletions(-) - -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index 682f1da..6222e29 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -24,7 +24,6 @@ CFLAGS = -fPIC \ @@ -24,8 +13,6 @@ index 682f1da..6222e29 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index c2cd04d..bb815fe 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -21,7 +21,6 @@ CFLAGS = -fPIC \ @@ -36,8 +23,6 @@ index c2cd04d..bb815fe 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile -index 9f80434..659ab1c 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile @@ -30,8 +30,7 @@ CFLAGS += -fPIC \ @@ -50,8 +35,6 @@ index 9f80434..659ab1c 100644 ifeq ($(BUILD_TYPE), Release) CFLAGS += -Os -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile -index 2020404..34bdf42 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile @@ -51,8 +51,7 @@ CFLAGS += -fPIC \ @@ -64,8 +47,6 @@ index 2020404..34bdf42 100644 ifeq ($(BUILD_TYPE), Release) CFLAGS += -Os -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile -index aaef98e..f5b06c6 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile @@ -42,7 +42,6 @@ ifdef HOST_COMPILE @@ -76,8 +57,6 @@ index aaef98e..f5b06c6 100644 -DGSTREAMER_LITE PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile -index 5ffd9ea..a7b3ddb 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile @@ -30,8 +30,7 @@ CFLAGS += -pipe \ diff --git a/dev-java/openjfx/files/11/don-t-force-msse.patch b/dev-java/openjfx/files/11/don-t-force-msse.patch index f3d62c8e26f2..b3f1e4fee774 100644 --- a/dev-java/openjfx/files/11/don-t-force-msse.patch +++ b/dev-java/openjfx/files/11/don-t-force-msse.patch @@ -3,17 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 19 Sep 2020 18:30:58 -0700 Subject: [PATCH] don't force -msse ---- - .../src/main/native/gstreamer/projects/linux/avplugin/Makefile | 1 - - .../main/native/gstreamer/projects/linux/fxplugins/Makefile | 1 - - .../src/main/native/gstreamer/projects/mac/fxplugins/Makefile | 3 +-- - .../main/native/gstreamer/projects/mac/gstreamer-lite/Makefile | 3 +-- - .../src/main/native/jfxmedia/projects/linux/Makefile | 1 - - .../src/main/native/jfxmedia/projects/mac/Makefile | 3 +-- - 6 files changed, 3 insertions(+), 9 deletions(-) - -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index f27b9479..4e229f20 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -23,7 +23,6 @@ CFLAGS := -fPIC \ @@ -24,8 +13,6 @@ index f27b9479..4e229f20 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index 627865f9..a4d99299 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -20,7 +20,6 @@ CFLAGS := -fPIC \ @@ -36,8 +23,6 @@ index 627865f9..a4d99299 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile -index 9f80434d..659ab1c1 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile @@ -30,8 +30,7 @@ CFLAGS += -fPIC \ @@ -50,8 +35,6 @@ index 9f80434d..659ab1c1 100644 ifeq ($(BUILD_TYPE), Release) CFLAGS += -Os -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile -index 2020404c..34bdf42c 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile @@ -51,8 +51,7 @@ CFLAGS += -fPIC \ @@ -64,8 +47,6 @@ index 2020404c..34bdf42c 100644 ifeq ($(BUILD_TYPE), Release) CFLAGS += -Os -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile -index c9500236..175be13e 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile @@ -43,7 +43,6 @@ ifdef HOST_COMPILE @@ -76,8 +57,6 @@ index c9500236..175be13e 100644 -DGSTREAMER_LITE PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile -index 5ffd9eac..a7b3ddbb 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile @@ -30,8 +30,7 @@ CFLAGS += -pipe \ diff --git a/dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch b/dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch index 600f1cb84640..ffcc0cb10f20 100644 --- a/dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch +++ b/dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch @@ -9,12 +9,6 @@ enough data left to read the frame size. Closes https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/876 Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1066> ---- - gst-libs/gst/tag/id3v2frames.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst-libs/gst/tag/id3v2frames.c b/gst-libs/gst/tag/id3v2frames.c -index 8e9f78254..f39659bf7 100644 --- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/id3v2frames.c +++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/id3v2frames.c @@ -109,7 +109,7 @@ id3v2_parse_frame (ID3TagsWorking * work) diff --git a/dev-java/openjfx/files/11/missing-casts.patch b/dev-java/openjfx/files/11/missing-casts.patch new file mode 100644 index 000000000000..82e3f3b4f78b --- /dev/null +++ b/dev-java/openjfx/files/11/missing-casts.patch @@ -0,0 +1,31 @@ +--- a/modules/javafx.graphics/src/main/native-font/pango.c ++++ b/modules/javafx.graphics/src/main/native-font/pango.c +@@ -243,7 +243,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(FcConfigAppFontAddFile) + if (text) { + // rc = (jboolean)FcConfigAppFontAddFile(arg0, text); + if (fp) { +- rc = (jboolean)((jboolean (*)(void *, const char *))fp)(arg0, text); ++ rc = (jboolean)((jboolean (*)(void *, const char *))fp)((void *)(intptr_t)arg0, text); + } + (*env)->ReleaseStringUTFChars(env, arg1, text); + } +@@ -402,7 +402,7 @@ JNIEXPORT jlong JNICALL OS_NATIVE(g_1utf8_1strlen) + (JNIEnv *env, jclass that, jlong str, jlong pos) + { + if (!str) return 0; +- return (jlong)g_utf8_strlen((const gchar *)str, (const gchar *)pos); ++ return (jlong)g_utf8_strlen((const gchar *)str, (gssize)(const gchar *)pos); + } + + JNIEXPORT jlong JNICALL OS_NATIVE(g_1utf16_1to_1utf8) +--- a/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLContext.c ++++ b/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLContext.c +@@ -275,7 +275,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_X11GLContext_nInitialize + dlsym(RTLD_DEFAULT, "glXSwapIntervalSGI"); + + if (ctxInfo->glXSwapIntervalSGI == NULL) { +- ctxInfo->glXSwapIntervalSGI = glXGetProcAddress("glXSwapIntervalSGI"); ++ ctxInfo->glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)glXGetProcAddress("glXSwapIntervalSGI"); + } + + } diff --git a/dev-java/openjfx/files/11/respect-cc.patch b/dev-java/openjfx/files/11/respect-cc.patch new file mode 100644 index 000000000000..a1b9bf106e24 --- /dev/null +++ b/dev-java/openjfx/files/11/respect-cc.patch @@ -0,0 +1,13 @@ +--- a/buildSrc/linux.gradle ++++ b/buildSrc/linux.gradle +@@ -214,8 +214,8 @@ setupTools("linux_freetype_tools", + } + ) + +-def compiler = IS_COMPILE_PARFAIT ? "parfait-gcc" : "${toolchainDir}gcc"; +-def linker = IS_STATIC_BUILD ? "ar" : IS_COMPILE_PARFAIT ? "parfait-g++" : "${toolchainDir}g++"; ++def compiler = IS_COMPILE_PARFAIT ? "parfait-gcc" : System.getenv("CC"); ++def linker = IS_STATIC_BUILD ? "ar" : IS_COMPILE_PARFAIT ? "parfait-g++" : System.getenv("CXX"); + + LINUX.glass = [:] + LINUX.glass.variants = ["glass", "glassgtk2", "glassgtk3"] diff --git a/dev-java/openjfx/files/11/respect-user-cflags-11.0.11.patch b/dev-java/openjfx/files/11/respect-user-cflags-11.0.11.patch index 458305608903..4564a0502cd3 100644 --- a/dev-java/openjfx/files/11/respect-user-cflags-11.0.11.patch +++ b/dev-java/openjfx/files/11/respect-user-cflags-11.0.11.patch @@ -3,16 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 1 Jun 2019 00:12:55 -0700 Subject: [PATCH] respect user cflags ---- - buildSrc/linux.gradle | 7 ++++++- - .../gstreamer/projects/linux/avplugin/Makefile | 16 ++++++---------- - .../gstreamer/projects/linux/fxplugins/Makefile | 17 ++++++----------- - .../projects/linux/gstreamer-lite/Makefile | 16 ++++++---------- - .../native/jfxmedia/projects/linux/Makefile | 16 ++++++---------- - 5 files changed, 30 insertions(+), 42 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index 7a7cbc72..6705a0f3 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${name}.so" as String } @@ -45,8 +35,6 @@ index 7a7cbc72..6705a0f3 100644 LINUX.iio.lib = "javafx_iio" LINUX.prismES2 = [:] -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index 450b55d3..f27b9479 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -17,7 +17,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so @@ -89,8 +77,6 @@ index 450b55d3..f27b9479 100644 ifneq ($(strip $(LIBAV_DIR)),) INCLUDES += -I$(LIBAV_DIR)/include -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index 1e58d4d3..627865f9 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -14,7 +14,7 @@ DIRLIST = progressbuffer \ @@ -132,8 +118,6 @@ index 1e58d4d3..627865f9 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile -index 5baa30a1..ddf0e521 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile @@ -37,7 +37,7 @@ DIRLIST = gstreamer/gst \ @@ -174,8 +158,6 @@ index 5baa30a1..ddf0e521 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile -index ecbd859f..5881cf53 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile @@ -17,7 +17,7 @@ DIRLIST = jni \ diff --git a/dev-java/openjfx/files/11/respect-user-cflags.patch b/dev-java/openjfx/files/11/respect-user-cflags.patch index 6ffb039467c3..d1483a2a1303 100644 --- a/dev-java/openjfx/files/11/respect-user-cflags.patch +++ b/dev-java/openjfx/files/11/respect-user-cflags.patch @@ -3,16 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 1 Jun 2019 00:12:55 -0700 Subject: [PATCH] respect user cflags ---- - buildSrc/linux.gradle | 7 ++++++- - .../gstreamer/projects/linux/avplugin/Makefile | 16 ++++++---------- - .../gstreamer/projects/linux/fxplugins/Makefile | 17 ++++++----------- - .../projects/linux/gstreamer-lite/Makefile | 16 ++++++---------- - .../native/jfxmedia/projects/linux/Makefile | 16 ++++++---------- - 5 files changed, 30 insertions(+), 42 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index 7a7cbc72..6705a0f3 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${name}.so" as String } @@ -45,8 +35,6 @@ index 7a7cbc72..6705a0f3 100644 LINUX.iio.lib = "javafx_iio" LINUX.prismES2 = [:] -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index 450b55d3..f27b9479 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -17,7 +17,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so @@ -89,8 +77,6 @@ index 450b55d3..f27b9479 100644 ifneq ($(strip $(LIBAV_DIR)),) INCLUDES += -I$(LIBAV_DIR)/include -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index 1e58d4d3..627865f9 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -14,7 +14,7 @@ DIRLIST = progressbuffer \ @@ -132,8 +118,6 @@ index 1e58d4d3..627865f9 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile -index 5baa30a1..ddf0e521 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile @@ -37,7 +37,7 @@ DIRLIST = gstreamer/gst \ @@ -174,8 +158,6 @@ index 5baa30a1..ddf0e521 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile -index ecbd859f..5881cf53 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile @@ -17,7 +17,7 @@ DIRLIST = jni \ diff --git a/dev-java/openjfx/files/11/strip-blank-elements-flags.patch b/dev-java/openjfx/files/11/strip-blank-elements-flags.patch new file mode 100644 index 000000000000..87f0279979f7 --- /dev/null +++ b/dev-java/openjfx/files/11/strip-blank-elements-flags.patch @@ -0,0 +1,29 @@ +Without this, you'll get bizarre errors where linking fails because it looks for +a literal "" arg. + +https://bugs.gentoo.org/715092 +https://bugs.gentoo.org/719484 +https://bugs.gentoo.org/799227 +https://bugs.gentoo.org/915727 +--- a/buildSrc/linux.gradle ++++ b/buildSrc/linux.gradle +@@ -47,7 +47,8 @@ def commonFlags = [ + "-Wno-error=cast-function-type", + "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=trampolines"] // warning flags + +-commonFlags.addAll(System.getenv("CFLAGS").trim().split(" ")) ++commonFlags.addAll(System.getenv("CFLAGS").strip().split(" ")) ++commonFlags.removeAll([""]) + + if (!IS_64) { + commonFlags += "-m32" +@@ -75,7 +76,8 @@ def staticLinkFlags = [].flatten() + + def linkFlags = IS_STATIC_BUILD ? staticLinkFlags : dynamicLinkFlags; + +-linkFlags.addAll(System.getenv("LDFLAGS").trim().split(" ")) ++linkFlags.addAll(System.getenv("LDFLAGS").strip().split(" ")) ++linkFlags.removeAll([""]) + + if (IS_DEBUG_NATIVE) { + linkFlags += "-g" diff --git a/dev-java/openjfx/files/11/use-system-swt-jar.patch b/dev-java/openjfx/files/11/use-system-swt-jar.patch index 34b4245bf0a0..39e2980f0147 100644 --- a/dev-java/openjfx/files/11/use-system-swt-jar.patch +++ b/dev-java/openjfx/files/11/use-system-swt-jar.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 1 Jun 2019 00:36:04 -0700 Subject: [PATCH] use system swt jar ---- - build.gradle | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build.gradle b/build.gradle -index 1e414b7..3d967bb 100644 --- a/build.gradle +++ b/build.gradle @@ -2477,7 +2477,7 @@ project(":swt") { diff --git a/dev-java/openjfx/files/11/wno-error-11.0.11.patch b/dev-java/openjfx/files/11/wno-error-11.0.11.patch index 639b3c117889..184f8775a5f6 100644 --- a/dev-java/openjfx/files/11/wno-error-11.0.11.patch +++ b/dev-java/openjfx/files/11/wno-error-11.0.11.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Wed, 17 Nov 2021 19:52:13 -0800 Subject: [PATCH] no -Werror ---- - buildSrc/linux.gradle | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index 00a3bca..2295566 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -231,7 +231,7 @@ FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-g diff --git a/dev-java/openjfx/files/11/wno-error.patch b/dev-java/openjfx/files/11/wno-error.patch index eb354c6f9fad..4c8dd6e8f247 100644 --- a/dev-java/openjfx/files/11/wno-error.patch +++ b/dev-java/openjfx/files/11/wno-error.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Thu, 19 Mar 2020 09:50:22 -0700 Subject: [PATCH] remove werror ---- - buildSrc/linux.gradle | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index 7a7cbc7..6955155 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -223,7 +223,7 @@ FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-g diff --git a/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch b/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch index fee211fd8770..4a482240dc6b 100644 --- a/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch +++ b/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch @@ -1,5 +1,5 @@ ---- rt-8u202-b02/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp 2018-10-29 16:26:04.000000000 +0100 -+++ rt-8u202-b02-patched/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp 2018-11-27 15:34:52.170181958 +0100 +--- rt-8u202-b02/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp ++++ rt-8u202-b02-patched/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp @@ -232,10 +232,7 @@ pid_t wpid = 0; diff --git a/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch b/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch index 011e952b9440..7095841498a1 100644 --- a/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch +++ b/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch @@ -3,13 +3,6 @@ From: Mat Booth <mat.booth@redhat.com> Date: Thu, 21 Jun 2018 15:57:01 +0100 Subject: [PATCH 4/4] fix cast between incompatible function types ---- - modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp | 8 ++++++-- - .../src/main/native-glass/gtk/glass_window_ime.cpp | 9 +++------ - 2 files changed, 9 insertions(+), 8 deletions(-) - -diff --git a/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp b/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp -index f85b1dae..3b9225f7 100644 --- a/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp +++ b/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp @@ -556,7 +556,7 @@ static GdkDragContext *get_drag_context() { @@ -41,8 +34,6 @@ index f85b1dae..3b9225f7 100644 } } } -diff --git a/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp b/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp -index 82e54d11..51af2a6a 100644 --- a/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp +++ b/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp @@ -122,15 +122,12 @@ bool WindowContextBase::filterIME(GdkEvent * event) { diff --git a/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch b/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch index 883c3da57e72..cabb36eefe54 100644 --- a/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch +++ b/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Thu, 30 May 2019 12:07:30 -0700 Subject: [PATCH] don't include xlocale.h ---- - .../gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c -index 72dc1301..32669789 100644 --- a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c +++ b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c @@ -39,7 +39,7 @@ diff --git a/dev-java/openjfx/files/8/99-sysdeps.patch b/dev-java/openjfx/files/8/99-sysdeps.patch index 367d9392d95e..abcdbab67ef3 100644 --- a/dev-java/openjfx/files/8/99-sysdeps.patch +++ b/dev-java/openjfx/files/8/99-sysdeps.patch @@ -1,5 +1,3 @@ -diff --git a/build.gradle b/build.gradle -index 0914d7d..6bd9e78 100644 --- a/build.gradle +++ b/build.gradle @@ -1309,6 +1309,7 @@ project(":graphics") { @@ -10,8 +8,6 @@ index 0914d7d..6bd9e78 100644 } // Create a single "native" task which will depend on all the individual native tasks for graphics -diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle -index 25f88d1..642450d 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -82,10 +82,13 @@ getConfigurations().create("antlr3"); diff --git a/dev-java/openjfx/files/8/Wno-error.patch b/dev-java/openjfx/files/8/Wno-error.patch index edc9389ee9ce..771da0707088 100644 --- a/dev-java/openjfx/files/8/Wno-error.patch +++ b/dev-java/openjfx/files/8/Wno-error.patch @@ -3,18 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sun, 26 Apr 2020 21:15:36 -0700 Subject: [PATCH] Wno-error ---- - buildSrc/armv5sf.gradle | 1 - - buildSrc/armv6hf.gradle | 1 - - buildSrc/armv6sf.gradle | 1 - - buildSrc/armv7hf.gradle | 1 - - buildSrc/armv7sf.gradle | 1 - - buildSrc/linux.gradle | 6 +++--- - buildSrc/x86egl.gradle | 1 - - 7 files changed, 3 insertions(+), 9 deletions(-) - -diff --git a/buildSrc/armv5sf.gradle b/buildSrc/armv5sf.gradle -index ee154182..bee6003e 100644 --- a/buildSrc/armv5sf.gradle +++ b/buildSrc/armv5sf.gradle @@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"] @@ -25,8 +13,6 @@ index ee154182..bee6003e 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() def glassCFlags = ["-ffast-math"] -diff --git a/buildSrc/armv6hf.gradle b/buildSrc/armv6hf.gradle -index dfdff237..0f090f23 100644 --- a/buildSrc/armv6hf.gradle +++ b/buildSrc/armv6hf.gradle @@ -131,7 +131,6 @@ def extraLFlags = [ @@ -37,8 +23,6 @@ index dfdff237..0f090f23 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() -diff --git a/buildSrc/armv6sf.gradle b/buildSrc/armv6sf.gradle -index ee6615f0..6ebbdd90 100644 --- a/buildSrc/armv6sf.gradle +++ b/buildSrc/armv6sf.gradle @@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"] @@ -49,8 +33,6 @@ index ee6615f0..6ebbdd90 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() def glassCFlags = ["-ffast-math"] -diff --git a/buildSrc/armv7hf.gradle b/buildSrc/armv7hf.gradle -index e75bf8a9..092be817 100644 --- a/buildSrc/armv7hf.gradle +++ b/buildSrc/armv7hf.gradle @@ -131,7 +131,6 @@ def extraLFlags = [ @@ -61,8 +43,6 @@ index e75bf8a9..092be817 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() -diff --git a/buildSrc/armv7sf.gradle b/buildSrc/armv7sf.gradle -index 0bb8a530..38e98303 100644 --- a/buildSrc/armv7sf.gradle +++ b/buildSrc/armv7sf.gradle @@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"] @@ -73,8 +53,6 @@ index 0bb8a530..38e98303 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() def glassCFlags = ["-ffast-math"] -diff --git a/buildSrc/x86egl.gradle b/buildSrc/x86egl.gradle -index 6bf6196b..ff24207d 100644 --- a/buildSrc/x86egl.gradle +++ b/buildSrc/x86egl.gradle @@ -118,7 +118,6 @@ def extraLFlags = [ diff --git a/dev-java/openjfx/files/8/disable-online-repos.patch b/dev-java/openjfx/files/8/disable-online-repos.patch index 6b0afe4bf070..6dd2db128e90 100644 --- a/dev-java/openjfx/files/8/disable-online-repos.patch +++ b/dev-java/openjfx/files/8/disable-online-repos.patch @@ -1,5 +1,3 @@ -diff --git a/build.gradle b/build.gradle -index df82f63..3f920b6 100644 --- a/build.gradle +++ b/build.gradle @@ -1135,17 +1135,17 @@ allprojects { diff --git a/dev-java/openjfx/files/8/don-t-force-msse.patch b/dev-java/openjfx/files/8/don-t-force-msse.patch index 2f5d56718cca..6cdb19e5a002 100644 --- a/dev-java/openjfx/files/8/don-t-force-msse.patch +++ b/dev-java/openjfx/files/8/don-t-force-msse.patch @@ -3,15 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sun, 26 Apr 2020 20:57:39 -0700 Subject: [PATCH] don't force msse ---- - .../main/native/gstreamer/projects/linux/avplugin/Makefile | 1 - - .../native/gstreamer/projects/linux/fxplugins/Makefile | 1 - - .../media/src/main/native/jfxmedia/projects/linux/Makefile | 1 - - modules/web/src/main/native/Tools/Scripts/webkitdirs.pm | 7 ------- - 4 files changed, 10 deletions(-) - -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index df9f7f21..f82f0537 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -28,7 +28,6 @@ CFLAGS = -fPIC \ @@ -22,8 +13,6 @@ index df9f7f21..f82f0537 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index fd3847d0..3887ac6d 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -25,7 +25,6 @@ CFLAGS = -fPIC \ @@ -34,8 +23,6 @@ index fd3847d0..3887ac6d 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile -index 3d089501..10fad68f 100644 --- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile @@ -44,7 +44,6 @@ ifdef HOST_COMPILE diff --git a/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch b/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch index a01dd05494fe..6fd0a9852012 100644 --- a/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch +++ b/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Fri, 18 Sep 2020 21:43:57 -0700 Subject: [PATCH] fxpackager: don't include obsolete sys/sysctl.h ---- - .../fxpackager/src/main/native/library/common/PosixPlatform.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp -index 5ea3bc6..b5d167b 100644 --- a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp +++ b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp @@ -43,7 +43,6 @@ diff --git a/dev-java/openjfx/files/8/missing-casts.patch b/dev-java/openjfx/files/8/missing-casts.patch new file mode 100644 index 000000000000..c3d45f4f07df --- /dev/null +++ b/dev-java/openjfx/files/8/missing-casts.patch @@ -0,0 +1,22 @@ +--- a/modules/graphics/src/main/native-font/pango.c ++++ b/modules/graphics/src/main/native-font/pango.c +@@ -225,7 +225,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(FcConfigAppFontAddFile) + if (text) { + // rc = (jboolean)FcConfigAppFontAddFile(arg0, text); + if (fp) { +- rc = (jboolean)((jboolean (*)(void *, const char *))fp)(arg0, text); ++ rc = (jboolean)((jboolean (*)(void *, const char *))fp)((void *)(intptr_t)arg0, text); + } + (*env)->ReleaseStringUTFChars(env, arg1, text); + } +--- a/modules/graphics/src/main/native-prism-es2/x11/X11GLContext.c ++++ b/modules/graphics/src/main/native-prism-es2/x11/X11GLContext.c +@@ -275,7 +275,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_X11GLContext_nInitialize + dlsym(RTLD_DEFAULT, "glXSwapIntervalSGI"); + + if (ctxInfo->glXSwapIntervalSGI == NULL) { +- ctxInfo->glXSwapIntervalSGI = glXGetProcAddress("glXSwapIntervalSGI"); ++ ctxInfo->glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)glXGetProcAddress("glXSwapIntervalSGI"); + } + + } diff --git a/dev-java/openjfx/files/8/respect_flags.patch b/dev-java/openjfx/files/8/respect_flags.patch index 2a1b7701b9c4..b8a0975965a8 100644 --- a/dev-java/openjfx/files/8/respect_flags.patch +++ b/dev-java/openjfx/files/8/respect_flags.patch @@ -3,17 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Thu, 25 Mar 2021 10:06:49 -0700 Subject: [PATCH] respect flags ---- - buildSrc/linux.gradle | 4 ++++ - .../gstreamer/projects/linux/avplugin/Makefile | 16 ++++++---------- - .../gstreamer/projects/linux/fxplugins/Makefile | 17 ++++++----------- - .../gstreamer/projects/linux/glib-lite/Makefile | 11 +++-------- - .../projects/linux/gstreamer-lite/Makefile | 16 ++++++---------- - .../gstreamer/projects/linux/libffi/Makefile | 6 ------ - 6 files changed, 25 insertions(+), 45 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index a8886c16..e2397a54 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -46,6 +46,9 @@ def commonFlags = [ @@ -34,8 +23,6 @@ index a8886c16..e2397a54 100644 def toolchainDir if (hasProperty('toolchainDir')) { -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index f82f0537..01e069b1 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -22,7 +22,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so @@ -78,8 +65,6 @@ index f82f0537..01e069b1 100644 ifneq ($(strip $(LIBAV_DIR)),) INCLUDES += -I$(LIBAV_DIR)/include -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index 3887ac6d..99c82718 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -19,7 +19,7 @@ DIRLIST = progressbuffer \ @@ -121,8 +106,6 @@ index 3887ac6d..99c82718 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile -index c5b4b0a6..b0e6d6f9 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile @@ -40,20 +40,15 @@ CFLAGS += -fPIC \ @@ -149,8 +132,6 @@ index c5b4b0a6..b0e6d6f9 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile -index 8634b559..109375f5 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile @@ -41,7 +41,7 @@ DIRLIST = gstreamer/gst \ @@ -191,8 +172,6 @@ index 8634b559..109375f5 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile -index 62f1b802..54e0a63b 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile @@ -20,12 +20,6 @@ CFLAGS += -c \ diff --git a/dev-java/openjfx/metadata.xml b/dev-java/openjfx/metadata.xml index 06173f63487a..ea592d9837e1 100644 --- a/dev-java/openjfx/metadata.xml +++ b/dev-java/openjfx/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> diff --git a/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild b/dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild index 34f91df33673..7f64ad304cdd 100644 --- a/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild +++ b/dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,12 +7,13 @@ MY_PV="${PV/_p/+}" SLOT="${MY_PV%%[.+]*}" EGRADLE_VER="4.10.3" -inherit flag-o-matic java-pkg-2 multiprocessing +inherit flag-o-matic java-pkg-2 multiprocessing toolchain-funcs DESCRIPTION="Java OpenJFX client application platform" HOMEPAGE="https://openjfx.io" -SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2 +SRC_URI=" + https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2 https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar @@ -61,7 +62,7 @@ RDEPEND=" DEPEND="${RDEPEND} app-arch/unzip app-arch/zip - >=dev-java/ant-core-1.10.7-r1:0 + dev-java/ant:0 dev-java/antlr:0 dev-java/antlr:3.5 dev-java/hamcrest-core:0 @@ -80,6 +81,9 @@ PATCHES=( "${FILESDIR}"/11/disable-architecture-verification.patch "${FILESDIR}"/11/gstreamer-CVE-2021-3522.patch "${FILESDIR}"/11/ffmpeg5.patch + "${FILESDIR}"/11/respect-cc.patch + "${FILESDIR}"/11/strip-blank-elements-flags.patch + "${FILESDIR}"/11/missing-casts.patch ) egradle() { @@ -93,6 +97,7 @@ egradle() { --offline --gradle-user-home "${T}/gradle_user_home" --project-cache-dir "${T}/gradle_project_cache" + #--debug ) export GRADLE_HOME @@ -173,11 +178,15 @@ src_prepare() { src_configure() { append-flags -Wno-error -fcommon + # This package is ridiculously brittle and fails when building e.g. + # bundled gstreamer with LTO. + filter-lto + tc-export AR CC CXX - #FIXME: still calls gcc, pkg-config etc by name without chost prefix - #FIXME: should we enable webkit? doubt so + # FIXME: still calls pkg-config etc by name without chost prefix + # FIXME: should we enable webkit? doubt so - # build is very sensetive to doc presense, take extra steps + # build is very sensitive to doc presence, take extra steps if use doc; then local jdk_doc if has_version -b dev-java/openjdk:${SLOT}[doc]; then diff --git a/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild deleted file mode 100644 index 0f4c3e85b629..000000000000 --- a/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild +++ /dev/null @@ -1,223 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PV="${PV/_p/+}" -SLOT="${MY_PV%%[.+]*}" -EGRADLE_VER="4.10.3" - -inherit flag-o-matic java-pkg-2 multiprocessing - -DESCRIPTION="Java OpenJFX client application platform" -HOMEPAGE="https://openjfx.io" - -SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2 - https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar - https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar - https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar - https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar -" - -S="${WORKDIR}/rt-${MY_PV}" - -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="-* ~amd64 ~ppc64" -IUSE="cpu_flags_x86_sse2 debug doc source +media" -REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" - -RDEPEND=" - app-accessibility/at-spi2-core - dev-java/swt:4.10[cairo,opengl] - dev-libs/glib:2 - dev-libs/libxml2:2 - dev-libs/libxslt - media-libs/freetype:2 - media-libs/fontconfig:1.0 - media-libs/libjpeg-turbo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/gtk+:3 - x11-libs/cairo[glib] - x11-libs/libX11 - x11-libs/libXtst - x11-libs/libXxf86vm - x11-libs/pango - virtual/opengl - doc? ( dev-java/openjdk:${SLOT}[doc] ) - !doc? ( - || ( - dev-java/openjdk-bin:${SLOT} - dev-java/openjdk:${SLOT} - ) - ) -" - -DEPEND="${RDEPEND} - app-arch/unzip - app-arch/zip - >=dev-java/ant-core-1.10.7-r1:0 - dev-java/antlr:0 - dev-java/antlr:3.5 - dev-java/hamcrest-core:0 - dev-java/stringtemplate:0 - virtual/ttf-fonts - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/11/disable-buildSrc-tests.patch - "${FILESDIR}"/11/glibc-compatibility.patch - "${FILESDIR}"/11/respect-user-cflags.patch - "${FILESDIR}"/11/use-system-swt-jar.patch - "${FILESDIR}"/11/wno-error.patch - "${FILESDIR}"/11/don-t-force-msse.patch - "${FILESDIR}"/11/disable-architecture-verification.patch - "${FILESDIR}"/11/ffmpeg5.patch - "${FILESDIR}/11/${PV}-version.patch" -) - -egradle() { - local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}" - local gradle="${GRADLE_HOME}/bin/gradle" - local gradle_args=( - --info - --stacktrace - --no-build-cache - --no-daemon - --offline - --gradle-user-home "${T}/gradle_user_home" - --project-cache-dir "${T}/gradle_project_cache" - ) - - export GRADLE_HOME - - # FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist - unset ANT_HOME - - einfo "gradle "${gradle_args[@]}" ${@}" - # TERM needed, otherwise gradle may fail on terms it does not know about - TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed" -} - -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" - JAVA_PKG_WANT_SOURCE="${SLOT}" - JAVA_PKG_WANT_TARGET="${SLOT}" - - # The nastiness below is necessary while the gentoo-vm USE flag is - # masked. First we call java-pkg-2_pkg_setup if it looks like the - # flag was unmasked against one of the possible build VMs. If not, - # we try finding one of them in their expected locations. This would - # have been slightly less messy if openjdk-bin had been installed to - # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env - # file but disable it so that it would not normally be selectable. - - local vm - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then - java-pkg-2_pkg_setup - return - fi - done - - if has_version -b dev-java/openjdk:${SLOT}; then - export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} - export JDK_HOME="${JAVA_HOME}" - export ANT_RESPECT_JAVA_HOME=true - else - if [[ ${MERGE_TYPE} != "binary" ]]; then - JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT}) - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" - JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} - export JDK_HOME - export JAVA_HOME="${JDK_HOME}" - export ANT_RESPECT_JAVA_HOME=true - fi - fi -} - -src_unpack() { - unpack "${P}.tar.bz2" - unpack "gradle-${EGRADLE_VER}-bin.zip" - - mkdir "${T}/jars" || die - - local line jar - for line in ${SRC_URI}; do - if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then - jar=$(basename "${BASH_REMATCH[-1]}") - cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die - fi - done -} - -src_prepare() { - default - - local d="${T}/jars" - - java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr - java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5 - java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate - java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core - - sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die -} - -src_configure() { - append-flags -Wno-error -fcommon - - #FIXME: still calls gcc, pkg-config etc by name without chost prefix - #FIXME: should we enable webkit? doubt so - - # build is very sensetive to doc presense, take extra steps - if use doc; then - local jdk_doc - if has_version -b dev-java/openjdk:${SLOT}[doc]; then - jdk_doc="${EPREFIX}/usr/share/doc/openjdk-${SLOT}/html/api" - fi - [[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early" - fi - - cat <<- _EOF_ > "${S}"/gradle.properties - COMPILE_TARGETS = linux - COMPILE_WEBKIT = false - COMPILE_MEDIA = $(usex media true false) - JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api - JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "") - BUILD_LIBAV_STUBS = false - GRADLE_VERSION_CHECK = false - LINT = none - CONF = $(usex debug DebugNative Release) - NUM_COMPILE_THREADS = $(makeopts_jobs) - JFX_DEPS_URL = ${T}/jars - COMPANY_NAME = "Gentoo" - _EOF_ -} - -src_compile() { - egradle zips $(usex doc "" "--exclude-task javadoc") -} - -src_install() { - if ! use source ; then - rm -v build/sdk/lib/src.zip || die - fi - - insinto "/usr/$(get_libdir)/${PN}-${SLOT}" - doins -r build/sdk/. - doins build/javafx-exports.zip - - if use doc; then - docinto html - dodoc -r build/javadoc/. - dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" - fi -} diff --git a/dev-java/openjfx/openjfx-8.1000-r1.ebuild b/dev-java/openjfx/openjfx-8.1000-r2.ebuild index 66e046c74241..303971b7904b 100644 --- a/dev-java/openjfx/openjfx-8.1000-r1.ebuild +++ b/dev-java/openjfx/openjfx-8.1000-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,14 +29,14 @@ RESTRICT="test" # needs junit version we don't have, fragile DEPEND=" app-arch/unzip - >=dev-java/ant-core-1.8.2:0 + >=dev-java/ant-1.10.14:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/antlr:3 dev-java/openjdk:8 dev-java/stringtemplate:0 dev-java/swt:4.10[cairo,opengl] - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex virtual/jdk:1.8 virtual/pkgconfig " @@ -67,6 +67,7 @@ PATCHES=( "${FILESDIR}"/8/Wno-error.patch "${FILESDIR}"/8/don-t-force-msse.patch "${FILESDIR}"/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch + "${FILESDIR}"/8/missing-casts.patch ) egradle() { @@ -120,8 +121,8 @@ src_prepare() { done local swt_file_name="$(java-pkg_getjars swt-4.10)" - java-pkg_jar-from --build-only --into "${d}" ant-core ant.jar ant-1.8.2.jar - java-pkg_jar-from --build-only --into "${d}" ant-core ant-launcher.jar ant-launcher-1.8.2.jar + java-pkg_jar-from --build-only --into "${d}" ant ant.jar ant-1.8.2.jar + java-pkg_jar-from --build-only --into "${d}" ant ant-launcher.jar ant-launcher-1.8.2.jar java-pkg_jar-from --build-only --into "${d}" antlr antlr.jar antlr-2.7.7.jar java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-tool.jar antlr-3.1.3.jar java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-runtime.jar antlr-runtime-3.1.3.jar diff --git a/dev-java/osgi-compendium/Manifest b/dev-java/osgi-compendium/Manifest deleted file mode 100644 index d6df9666bf82..000000000000 --- a/dev-java/osgi-compendium/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST osgi.cmpn-4.3.1.jar 741615 BLAKE2B 6f6058c07fd7744f0369d05cdf607b4d4fe51bbdf567c6a6c951413b0627eb1dbb6e56f65641a8472198d0aedca378da4715c26ebe05aa4e7ef80adb1020175f SHA512 803e929b4b7cfee13a3ffa2c60ad03775afd8409c972bf26e3f79abc590466c2d885bdc339d9af2a3e8fda9cdf082d23a298362ac37935b0ede0719dee27e9f9 diff --git a/dev-java/osgi-compendium/metadata.xml b/dev-java/osgi-compendium/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/osgi-compendium/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/osgi-compendium/osgi-compendium-4.3.1-r4.ebuild b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r4.ebuild deleted file mode 100644 index 0ca616b9fb7c..000000000000 --- a/dev-java/osgi-compendium/osgi-compendium-4.3.1-r4.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="OSGi Service Platform Compendium API (Companion Code)" -HOMEPAGE="https://docs.osgi.org" -SRC_URI="https://docs.osgi.org/download/r4v43/osgi.cmpn-${PV}.jar" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -CP_DEPEND=" - dev-java/glassfish-persistence:0 - dev-java/osgi-core-api:0 - dev-java/osgi-foundation:0 - dev-java/jakarta-servlet-api:4" - -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8:*" - -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" - -BDEPEND="app-arch/unzip" - -JAVA_SRC_DIR="OSGI-OPT/src" - -src_prepare() { - default - rm -r org || die -} diff --git a/dev-java/osgi-core-api/Manifest b/dev-java/osgi-core-api/Manifest deleted file mode 100644 index 2560625ee59f..000000000000 --- a/dev-java/osgi-core-api/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST osgi.core-5.0.0.jar 418232 BLAKE2B d7cfb8b2c6ff955ffc8252f248eb7bec562d16598e1a56fb50f12c099adae8b5268bc26003e166794eaee8fa6cb116ce388eb1981ef5a09394c05b7ea8655f0d SHA512 de7c5aa327a4361b81d953951488b84071e525cfd3e50f0334450b8c1b25733248de9459239ee7091f8961ac8b047a0492d692fb7cd408a0ec07df090ea9e2c3 diff --git a/dev-java/osgi-core-api/metadata.xml b/dev-java/osgi-core-api/metadata.xml deleted file mode 100644 index 6021501589e0..000000000000 --- a/dev-java/osgi-core-api/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild deleted file mode 100644 index 36af959c037c..000000000000 --- a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.osgi:org.osgi.core:5.0.0" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="OSGi Service Platform Core API (Companion Code)" -HOMEPAGE="http://www.osgi.org/Specifications/HomePage" -SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x64-macos" - -RDEPEND=">=virtual/jre-1.8:*" - -DEPEND=">=virtual/jdk-1.8:* - app-arch/unzip" - -JAVA_SRC_DIR="OSGI-OPT/src" - -src_prepare() { - default - rm -r org || die -} diff --git a/dev-java/osgi-enterprise-api/Manifest b/dev-java/osgi-enterprise-api/Manifest deleted file mode 100644 index 02c8f1895e3e..000000000000 --- a/dev-java/osgi-enterprise-api/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST osgi.enterprise-5.0.0.jar 479506 BLAKE2B 2bd53b50e469388d132a6d3ebd78d4040093f8c1d79299fd87412853d959f7559f04287567eeea47635fe287a3e9d3812ac9303a5d39ec35135ab3c58bd0b010 SHA512 0404c05afd8cb3ef8b826b0f08deeb03b0027ca99e091953d39ef69674809c5b899e0f2c8efb685df5fce070c2aafcf813e470fbb538d4ec3b480a8060351144 diff --git a/dev-java/osgi-enterprise-api/metadata.xml b/dev-java/osgi-enterprise-api/metadata.xml deleted file mode 100644 index 6021501589e0..000000000000 --- a/dev-java/osgi-enterprise-api/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild deleted file mode 100644 index bf8943b5ed02..000000000000 --- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="OSGi Enterprise Release 5 Companion Code" -HOMEPAGE="http://www.osgi.org/Main/HomePage" -SRC_URI="https://docs.osgi.org/download/r5/osgi.enterprise-${PV}.jar" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -RESTRICT="bindist" - -CP_DEPEND="dev-java/glassfish-persistence:0 - dev-java/osgi-core-api:0 - dev-java/javax-servlet-api:2.5" - -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" - -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8:*" - -BDEPEND="app-arch/unzip" - -JAVA_SRC_DIR="OSGI-OPT/src" - -src_prepare() { - default - rm -r org || die -} diff --git a/dev-java/osgi-foundation/Manifest b/dev-java/osgi-foundation/Manifest deleted file mode 100644 index cfeb1169a491..000000000000 --- a/dev-java/osgi-foundation/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST osgi-foundation-1.2.0.tar.xz 45176 BLAKE2B 4b5432dfaad9134f402b5f448a8d7ba5f626a7b160bbc953914352a28f745725da851b6c5f2122f820b52f2fd8ad463c2df5c8ae3e2b46ef8bb9d56d89d90f1b SHA512 6523dd6b4cd8205aa3359fae4640ff6b17a1944aec6bf23acf0d6e4eb33839a9b9049e8df0c55a4f35013b40b1df2391a53ed68df682a317c35dca504e9b996b diff --git a/dev-java/osgi-foundation/files/osgi-foundation-1.2.0-build.xml b/dev-java/osgi-foundation/files/osgi-foundation-1.2.0-build.xml deleted file mode 100644 index a33f09709ada..000000000000 --- a/dev-java/osgi-foundation/files/osgi-foundation-1.2.0-build.xml +++ /dev/null @@ -1,218 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> -<!-- ====================================================================== --> - -<!-- ====================================================================== --> -<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== --> -<!-- ====================================================================== --> -<!-- --> -<!-- Any modifications will be overwritten. --> -<!-- --> -<!-- Generated by Maven Ant Plugin on 5/11/13 9:36 AM --> -<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ --> -<!-- --> -<!-- ====================================================================== --> - -<project name="org.osgi.foundation-from-maven" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Build environment properties --> - <!-- ====================================================================== --> - - <property file="${user.home}/.m2/maven.properties"/> - <property file="maven-build.properties"/> - - <property name="maven.build.finalName" value="org.osgi.foundation-1.2.0"/> - <property name="maven.build.dir" value="target"/> - <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> - <property name="maven.build.srcDir.0" value="src/main/java"/> - <property name="maven.build.resourceDir.0" value="src/main/resources"/> - <property name="maven.build.resourceDir.1" value="."/> - <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/> - <property name="maven.build.testDir.0" value="src/test/java"/> - <property name="maven.build.testResourceDir.0" value="src/test/resources"/> - <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/> - <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/> - - <property name="maven.repo.local" value="${user.home}/.m2/repository"/> - <property name="maven.settings.offline" value="false"/> - <property name="maven.settings.interactiveMode" value="true"/> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"/> - <path id="build.test.classpath"> - <pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"/> - <pathelement location="${maven.repo.local}/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar"/> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${maven.build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" depends="get-deps" description="Compile the code"> - <mkdir dir="${maven.build.outputDir}"/> - <javac destdir="${maven.build.outputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="1.3" - verbose="false" - fork="false" - source="1.3"> - <src> - <pathelement location="${maven.build.srcDir.0}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <mkdir dir="${maven.build.outputDir}/META-INF"/> - <copy todir="${maven.build.outputDir}/META-INF"> - <fileset dir="${maven.build.resourceDir.1}"> - <include name="LICENSE*"/> - <include name="NOTICE*"/> - </fileset> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" - depends="compile" - description="Compile the test code" - unless="maven.test.skip"> - <mkdir dir="${maven.build.testOutputDir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" - depends="compile-tests, junit-missing" - unless="junit.skipped" - description="Run the test cases"/> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present"/> - </target> - - <target name="test-junit-status" - depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}"/> - <isfalse value="${maven.test.skip}"/> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}"/> - <istrue value="${maven.test.skip}"/> - </or> - </condition> - </target> - - <target name="junit-missing" - depends="test-junit-status" - if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${maven.build.srcDir.0}" - packagenames="*" - destdir="${maven.reporting.outputDirectory}/apidocs" - access="protected" - old="false" - verbose="false" - version="true" - use="true" - author="true" - splitindex="false" - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - charset="ISO-8859-1" - linksource="false" - breakiterator="false"/> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="compile,test" description="Package the application"> - <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" - compress="true" - index="false" - basedir="${maven.build.outputDir}" - excludes="**/package.html"/> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application"/> - - <!-- ====================================================================== --> - <!-- Download dependencies target --> - <!-- ====================================================================== --> - - <target name="test-offline"> - <condition property="maven.mode.offline"> - <equals arg1="${maven.settings.offline}" arg2="true"/> - </condition> - </target> - - <target name="get-deps" - depends="test-offline" - description="Download all dependencies" - unless="maven.mode.offline"> - <mkdir dir="${maven.repo.local}"/> - <mkdir dir="${maven.repo.local}/junit/junit/3.8.1"/> - <get src="http://people.apache.org/repo/m2-snapshot-repository/junit/junit/3.8.1/junit-3.8.1.jar" - dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" - usetimestamp="false" - ignoreerrors="true"/> - <get src="http://repo.maven.apache.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" - dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" - usetimestamp="false" - ignoreerrors="true"/> - <mkdir dir="${maven.repo.local}/easymock/easymock/1.2_Java1.3"/> - <get src="http://people.apache.org/repo/m2-snapshot-repository/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" - dest="${maven.repo.local}/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" - usetimestamp="false" - ignoreerrors="true"/> - <get src="http://repo.maven.apache.org/maven2/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" - dest="${maven.repo.local}/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" - usetimestamp="false" - ignoreerrors="true"/> - </target> - -</project> diff --git a/dev-java/osgi-foundation/metadata.xml b/dev-java/osgi-foundation/metadata.xml deleted file mode 100644 index 4221e170cbc0..000000000000 --- a/dev-java/osgi-foundation/metadata.xml +++ /dev/null @@ -1,8 +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> -</pkgmetadata> diff --git a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild deleted file mode 100644 index 7adbb2f51fdd..000000000000 --- a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="OSGi R4 Foundation EE by Apache Felix" -HOMEPAGE="http://felix.apache.org/" -SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz" - -LICENSE="Apache-2.0 OSGi-Specification-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -src_prepare() { - default - cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die -} - -src_install() { - java-pkg_newjar target/org.osgi.foundation-${PV}.jar org.osgi.foundation.jar -} diff --git a/dev-java/osgi-service-log/Manifest b/dev-java/osgi-service-log/Manifest new file mode 100644 index 000000000000..cd0e597315ba --- /dev/null +++ b/dev-java/osgi-service-log/Manifest @@ -0,0 +1 @@ +DIST org.osgi.service.log-1.3.0-sources.jar 12012 BLAKE2B 005f7e71b2a16bee5b097ffd207667d59a0743bb278669c59e6cf56c183a8dd063190ddff2071c2945c41410fbb86c4534ad7116fb56d4d621bbbbc0659b54ef SHA512 06757188027245690b0655105acd94534844d2e118b9ec4ab7ac0c910fcebb22dcf0fd53e20ad053b4c6e97461bfe4ffddf1b2b11045f2659518afec0baef105 diff --git a/dev-java/aqute-bnd-annotation/metadata.xml b/dev-java/osgi-service-log/metadata.xml index 75321cfb5598..75321cfb5598 100644 --- a/dev-java/aqute-bnd-annotation/metadata.xml +++ b/dev-java/osgi-service-log/metadata.xml diff --git a/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild b/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild new file mode 100644 index 000000000000..ed34ecd1a58d --- /dev/null +++ b/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild @@ -0,0 +1,31 @@ +# 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="org.osgi:org.osgi.service.log:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="OSGi Companion Code for org.osgi.service.log" +HOMEPAGE="https://www.osgi.org/" +SRC_URI="https://repo1.maven.org/maven2/org/osgi/org.osgi.service.log/${PV}/org.osgi.service.log-${PV}-sources.jar" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +CP_DEPEND="dev-java/osgi-core:0" + +DEPEND="${CP_DEPEND} + dev-java/osgi-annotation:0 + >=virtual/jdk-1.8:*" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +BDEPEND="app-arch/unzip" + +JAVA_AUTOMATIC_MODULE_NAME="org.osgi.service.log" +JAVA_CLASSPATH_EXTRA="osgi-annotation" diff --git a/dev-java/osgi-service-subsystem/Manifest b/dev-java/osgi-service-subsystem/Manifest new file mode 100644 index 000000000000..0b9e27d8c3c1 --- /dev/null +++ b/dev-java/osgi-service-subsystem/Manifest @@ -0,0 +1 @@ +DIST osgi-service-subsystem-1.1.0-sources.jar 24552 BLAKE2B a69fc49b88aa43baa5f56a94a4d8dc55f7ef596a4a39b86f68c652bf02f878c51a25a15cc0bad5f38b23f644137c2082011f8fd3658185ab068ea8bdd551a3d3 SHA512 d0ed0c99525d0860c24b3783902230fc05ccd830a22c16a355d7d6e851919caa64bd23082fcd5f9ebf939b4e1b86e8e52225343401552a89f1e6c1d5892fd162 diff --git a/dev-java/ant-apache-bcel/metadata.xml b/dev-java/osgi-service-subsystem/metadata.xml index 4221e170cbc0..75321cfb5598 100644 --- a/dev-java/ant-apache-bcel/metadata.xml +++ b/dev-java/osgi-service-subsystem/metadata.xml @@ -3,6 +3,5 @@ <pkgmetadata> <maintainer type="project"> <email>java@gentoo.org</email> - <name>Java</name> </maintainer> </pkgmetadata> diff --git a/dev-java/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild b/dev-java/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild new file mode 100644 index 000000000000..d0c03f8e0c0a --- /dev/null +++ b/dev-java/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild @@ -0,0 +1,32 @@ +# 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="org.osgi:org.osgi.service.subsystem:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="OSGi Companion Code for org.osgi.service.subsystem" +HOMEPAGE="https://www.osgi.org/" +SRC_URI="https://repo1.maven.org/maven2/org/osgi/org.${PN//-/.}/${PV}/org.${PN//-/.}-${PV}-sources.jar -> ${P}-sources.jar" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~x86" + +BDEPEND="app-arch/unzip" + +CP_DEPEND=" + dev-java/osgi-annotation:0 + dev-java/osgi-core:0 +" + +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* +" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:* +" diff --git a/dev-java/parboiled/Manifest b/dev-java/parboiled/Manifest new file mode 100644 index 000000000000..ef31eb68bb3d --- /dev/null +++ b/dev-java/parboiled/Manifest @@ -0,0 +1 @@ +DIST parboiled-1.4.1.tar.gz 230536 BLAKE2B 99e8e99d9b1b5de7420491967213be94c5895ba6abfd797f4f681834b3773784fc94c5a7d000574cd65dd0dff46857cc19c9430691899f82edf324c764c193dd SHA512 3c502013168f76178398861e2b23089a5c3df0ec36f44830300dc935844026df9f6d5dd7c40babcd4c6a58bff84c0f2134930a19ef49bcd61efbdab3c093ef9c diff --git a/dev-java/parboiled/metadata.xml b/dev-java/parboiled/metadata.xml new file mode 100644 index 000000000000..c48f3cb552ec --- /dev/null +++ b/dev-java/parboiled/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <doc>https://github.com/sirthias/parboiled/wiki/</doc> + <remote-id type="github">sirthias/parboiled</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/parboiled/parboiled-1.4.1.ebuild b/dev-java/parboiled/parboiled-1.4.1.ebuild new file mode 100644 index 000000000000..483a65d41c3c --- /dev/null +++ b/dev-java/parboiled/parboiled-1.4.1.ebuild @@ -0,0 +1,68 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_PROVIDES=" + org.parboiled:parboiled-core:${PV} + org.parboiled:parboiled-java:${PV} +" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful" +HOMEPAGE="https://github.com/sirthias/parboiled" +SRC_URI="https://github.com/sirthias/parboiled/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~x86" + +CP_DEPEND="dev-java/asm:9" +DEPEND="${CP_DEPEND} + >=virtual/jdk-11:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +src_compile() { + einfo "Compiling parboiled-core" + JAVA_JAR_FILENAME="parboiled-core.jar" + JAVA_SRC_DIR="parboiled-core/src/main/java" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":parboiled-core.jar" + rm -r target || die + + einfo "Compiling parboiled-java" + JAVA_JAR_FILENAME="parboiled-java.jar" + JAVA_SRC_DIR="parboiled-java/src/main/java" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":parboiled-java.jar" + rm -r target || die + + if use doc; then + JAVA_SRC_DIR=( + "parboiled-core/src/main/java" + "parboiled-java/src/main/java" + ) + JAVA_JAR_FILENAME="ignoreme.jar" + java-pkg-simple_src_compile + fi +} + +src_install() { + default + + java-pkg_dojar "parboiled-core.jar" + java-pkg_dojar "parboiled-java.jar" + + if use doc; then + java-pkg_dojavadoc target/api + fi + + if use source; then + java-pkg_dosrc "parboiled-core/src/main/java/*" + java-pkg_dosrc "parboiled-java/src/main/java/*" + fi +} diff --git a/dev-java/plexus-classworlds/Manifest b/dev-java/plexus-classworlds/Manifest index 048135928211..444a9642dc6e 100644 --- a/dev-java/plexus-classworlds/Manifest +++ b/dev-java/plexus-classworlds/Manifest @@ -1,2 +1 @@ -DIST plexus-classworlds-2.6.0.tar.gz 57221 BLAKE2B 7cef274981101eab85247c1a19420ebbb626b671312579ea665fc3d82e9eb8caba55955ccbc38ccd54e19c55ec1683b6a99a2cd96b08bf7ace57355a8e958d1f SHA512 d6ef17a4651da99975bcfc04f89ba128d891efc9047dc9b8afa52bd092d07268d44a7424a3a3700209bb56452f035ac1071c58ae6dc961b7e991efee1c0e117e DIST plexus-classworlds-2.7.0.tar.gz 60221 BLAKE2B 8adbad24c057982dd3da6ce221175cf0b3e6585316de02434214d7d470b24220edaa94f4191cb2febfc4e3006a78cd3be5cc0f793438a5009ee20ef8c602768b SHA512 625d83c1a08a15e0d85984518eaec36bf001e562c49df4d5028e9fec1a9fdc69faa88066441da3cedd803fc20932fcaef9f2e924a485e0a0dcde60a600b32c7f diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild deleted file mode 100644 index d5eca2023894..000000000000 --- a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.codehaus.plexus:plexus-classworlds:2.6.0" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="The class loader framework of the Plexus project" -HOMEPAGE="https://codehaus-plexus.github.io/plexus-classworlds/" -SRC_URI="https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-${PV}.tar.gz" - -LICENSE="Apache-2.0" - -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/commons-logging - dev-java/xml-commons-external:1.4 - ) -" -RDEPEND=">=virtual/jre-1.8:*" - -S="${WORKDIR}/${PN}-${P}" - -JAVA_MAIN_CLASS="org.codehaus.plexus.classworlds.launcher.Launcher" -JAVA_SRC_DIR="src/main/java/" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/test-data" -JAVA_TEST_EXCLUDES="org.codehaus.plexus.classworlds.TestUtil" - -src_prepare() { - default - # Ignore one test case testing the presence of ant-core - sed \ - -e '/testConfigure_Valid/i @Ignore' \ - -e '/import org.junit.Test/a import org.junit.Ignore;' \ - -i src/test/java/org/codehaus/plexus/classworlds/launcher/ConfiguratorTest.java || die -} - -src_test(){ - mkdir -p target/test-lib || die - # https://github.com/codehaus-plexus/plexus-classworlds/blob/plexus-classworlds-2.6.0/pom.xml#L159-L161 - ln -s "$(java-pkg_getjars --build-only xml-commons-external-1.4)" \ - target/test-lib/xml-apis-1.3.02.jar || die - # symlinking works only if java-pkg_getjars finds only one file - # but commons-logging has multiple jar files. - ln -s "${SYSROOT}"/usr/share/commons-logging/lib/commons-logging.jar \ - target/test-lib/commons-logging-1.0.3.jar || die - java-pkg-simple_src_test -} diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild index 1c6f4ade8267..b61697448e9a 100644 --- a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild +++ b/dev-java/plexus-classworlds/plexus-classworlds-2.7.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 @@ -16,12 +16,12 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=" >=virtual/jdk-1.8:* test? ( - dev-java/ant-core:0 + >=dev-java/ant-1.10.14-r3:0 dev-java/commons-logging:0 dev-java/xml-commons-external:1.4 ) @@ -41,7 +41,7 @@ src_test(){ # java.io.FileNotFoundException: target/test-lib/xml-apis-1.3.02.jar mkdir -p target/test-lib || die java-pkg_jar-from --into target/test-lib xml-commons-external-1.4 xml-commons-external.jar xml-apis-1.3.02.jar - java-pkg_jar-from --into target/test-lib ant-core ant.jar ant-1.9.0.jar + java-pkg_jar-from --into target/test-lib ant ant.jar ant-1.9.0.jar java-pkg_jar-from --into target/test-lib commons-logging commons-logging.jar commons-logging-1.0.3.jar java-pkg-simple_src_test } diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest index 60307769f3dc..ca41b581cd27 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -1,3 +1,6 @@ DIST protobuf-23.0.tar.gz 5039837 BLAKE2B 63e02590b03fd9206cdfc4a26edeb2fa55dac902f5365c33c9e9340a722f552e4a5c82d1a0b25b84fcb675d5d06b768fd92cf472743d2361295129ae9faa02f3 SHA512 46c263fab189fdc310c7310d1a3d9e76472e5d96f16228bc4b946d4211afc64188d563ec70250c11a3dd05d18158b72ccf173567bd59aa45310eff62cd5f194d -DIST protobuf-24.2.tar.gz 5179130 BLAKE2B a1e3da4e95072391fa4abf671a9eb77806f1b3864219e1e0c024156558e2ecd9e3cabee367efaf15626a199ae413dced3f29f601820611d37dd733c92ffc06c0 SHA512 fee9f5fc0e615e49347320e37b560112f43d13c63050701e25b3348e9d4aa59e80c7d810f7da12764b1b9eeee8efa35be7743c5ebbb0a12c78f5924f1544c356 +DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b +DIST protobuf-25.3.tar.gz 5878962 BLAKE2B 9268f9bd993a1cfd6d3937a2ad56ba4cfe3d84923756513841cbf13039d4a07acb260468745cb1294f30334cb34b45c6fde272f5c40d9de63ac6a4ce5c263077 SHA512 1f73e237c919082e5423ae9e2ea8813dccf672c059051d1531fe89ffaa45872d3cf3052b8c3af26f674296ec17d7dc861c67b8f0834ed80261ce4a6a14ed7115 +DIST protobuf-26.1.tar.gz 5957903 BLAKE2B 1a7faab2f56aa0995801a80f73a812c7fc38a00af0bf25bdd5eecf7aec27a86a575ea2fb8484787d19c9ac6e46007c9864e79464f529c446f31af732981feed1 SHA512 0363ac09f92d8e040491425d444c8dca0b9b430e02d2dff6e2b28a0c2b2bea0d33a47f50bc9e2e2d4e8e22b65a02009a20c0066fb89c75df93a7b703dda42ed4 +DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 diff --git a/dev-java/protobuf-java/files/protobuf-java-3.26.0-unittest.protos.patch b/dev-java/protobuf-java/files/protobuf-java-3.26.0-unittest.protos.patch new file mode 100644 index 000000000000..76b227a4e71a --- /dev/null +++ b/dev-java/protobuf-java/files/protobuf-java-3.26.0-unittest.protos.patch @@ -0,0 +1,23 @@ +--- a/java/core/generate-test-sources-build.xml ++++ b/java/core/generate-test-sources-build.xml +@@ -8,10 +8,12 @@ + <arg value="${protobuf.source.dir}/google/protobuf/unittest.proto"/> + <arg value="${protobuf.source.dir}/google/protobuf/unittest_custom_options.proto"/> + <arg value="${protobuf.source.dir}/google/protobuf/unittest_enormous_descriptor.proto"/> ++ <arg value="${protobuf.source.dir}/google/protobuf/unittest_features.proto"/> + <arg value="${protobuf.source.dir}/google/protobuf/unittest_import.proto"/> + <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_lite.proto"/> + <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_public.proto"/> + <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_public_lite.proto"/> ++ <arg value="${protobuf.source.dir}/google/protobuf/unittest_legacy_features.proto"/> + <arg value="${protobuf.source.dir}/google/protobuf/unittest_lite.proto"/> + <arg value="${protobuf.source.dir}/google/protobuf/unittest_mset.proto"/> + <arg value="${protobuf.source.dir}/google/protobuf/unittest_mset_wire_format.proto"/> +@@ -19,6 +21,7 @@ + <arg value="${protobuf.source.dir}/google/protobuf/unittest_optimize_for.proto"/> + <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3.proto"/> + <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3_optional.proto"/> ++ <arg value="${protobuf.source.dir}/google/protobuf/unittest_retention.proto"/> + <arg value="${protobuf.source.dir}/google/protobuf/unittest_well_known_types.proto"/> + <arg value="${test.proto.dir}/com/google/protobuf/any_test.proto"/> + <arg value="${test.proto.dir}/com/google/protobuf/cached_field_size_test.proto"/> diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml index 20b09444fc60..8b9311211599 100644 --- a/dev-java/protobuf-java/metadata.xml +++ b/dev-java/protobuf-java/metadata.xml @@ -1,14 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arfrever.fta@gmail.com</email> - <name>Arfrever Frehtes Taifersar Arahesis</name> - </maintainer> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> diff --git a/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild new file mode 100644 index 000000000000..ae709f9e7ea1 --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild @@ -0,0 +1,164 @@ +# Copyright 2008-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.protobuf:protobuf-java:3.23.3" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple cmake + +DESCRIPTION="Core Protocol Buffers library" +HOMEPAGE="https://protobuf.dev" +# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. +# And we build artifact 3.23.3 from the 23.3 tarball in order to allow sharing the tarball with +# dev-libs/protobuf. +SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" +S="${WORKDIR}/protobuf-${PV#3.}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="system-protoc" + +BDEPEND=" + system-protoc? ( ~dev-libs/protobuf-${PV#3.}:0 ) + !system-protoc? ( >=dev-cpp/abseil-cpp-20230125.3 ) +" +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/guava:0 + dev-java/mockito:4 + ) +" +RDEPEND=">=virtual/jre-1.8:*" + +PATCHES=( + "${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch" +) + +JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" +JAVA_JAR_FILENAME="protobuf.jar" +JAVA_RESOURCE_DIRS="java/core/src/main/resources" +JAVA_SRC_DIR="java/core/src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" +JAVA_TEST_SRC_DIR="java/core/src/test/java" + +run-protoc() { + if use system-protoc; then + protoc $1 + else + "${BUILD_DIR}"/protoc $1 + fi +} + +src_prepare() { + # If the corrsponding version of system-protoc is not available we build protoc locally + if use system-protoc; then + default # apply patches + else + cmake_src_prepare + fi + java-pkg-2_src_prepare + + mkdir "${JAVA_RESOURCE_DIRS}" || die + # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/pom.xml#L43-L62 + PROTOS=( $(sed \ + -n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \ + "${S}/java/core/pom.xml") ) || die + pushd src > /dev/null || die + cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die + popd > /dev/null || die + + # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/generate-sources-build.xml + einfo "Replace variables in generate-sources-build.xml" + sed \ + -e 's:${generated.sources.dir}:java/core/src/main/java:' \ + -e 's:${protobuf.source.dir}:src:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|echo\|mkdir\|exec/d' \ + -i java/core/generate-sources-build.xml || die "sed to sources failed" + + # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/generate-test-sources-build.xml + einfo "Replace variables in generate-test-sources-build.xml" + sed \ + -e 's:${generated.testsources.dir}:java/core/src/test/java:' \ + -e 's:${protobuf.source.dir}:src:' \ + -e 's:${test.proto.dir}:java/core/src/test/proto:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|mkdir\|exec\|Also generate/d' \ + -i java/core/generate-test-sources-build.xml || die "sed to test sources failed" + + # Split the file in two parts, one for each run-protoc call + awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \ + java/core/generate-test-sources-build.xml || die +} + +src_configure() { + local mycmakeargs=( + -Dprotobuf_BUILD_TESTS=OFF + -Dprotobuf_ABSL_PROVIDER=package + ) + if use system-protoc; then + : + else + cmake_src_configure + fi +} + +src_compile() { + if use system-protoc; then + : + else + cmake_src_compile + fi + + einfo "Run protoc to generate sources" + run-protoc \ + @java/core/generate-sources-build.xml \ + || die "protoc sources failed" + + java-pkg-simple_src_compile +} + +src_test() { + # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/pom.xml#L63-L71 + jar cvf testdata.jar \ + -C src google/protobuf/testdata/golden_message_oneof_implemented \ + -C src google/protobuf/testdata/golden_packed_fields_message || die + + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" + + einfo "Running protoc on first part of generate-test-sources-build.xml" + run-protoc @test-sources-build-1 \ + || die "run-protoc test-sources-build-1 failed" + + einfo "Running protoc on second part of generate-test-sources-build.xml" + run-protoc @test-sources-build-2 \ + || die "run-protoc test-sources-build-2 failed" + + einfo "Running tests" + # Invalid test class 'map_test.MapInitializationOrderTest': + # 1. Test class should have exactly one public constructor + # Invalid test class 'protobuf_unittest.CachedFieldSizeTest': + # 1. Test class should have exactly one public constructor + pushd "${JAVA_TEST_SRC_DIR}" || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -path "**/*Test.java" \ + ! -path "**/Abstract*Test.java" \ + ! -name "MapInitializationOrderTest.java" \ + ! -path '*protobuf_unittest/CachedFieldSizeTest.java' + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install +} diff --git a/dev-java/protobuf-java/protobuf-java-3.24.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild index cbedc3f3e508..5415eb83ec8c 100644 --- a/dev-java/protobuf-java/protobuf-java-3.24.2.ebuild +++ b/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 2008-2023 Gentoo Authors +# Copyright 2008-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.google.protobuf:protobuf-java:3.24.2" +MAVEN_ID="com.google.protobuf:protobuf-java:${PV}" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple cmake @@ -12,7 +12,7 @@ inherit java-pkg-2 java-pkg-simple cmake DESCRIPTION="Core Protocol Buffers library" HOMEPAGE="https://protobuf.dev" # Currently we bundle the binary version of truth.jar used only for tests, we don't install it. -# And we build artifact 3.24.0 from the 24.0 tarball in order to allow sharing the tarball with +# And we build artifact 3.25.3 from the 25.3 tarball in order to allow sharing the tarball with # dev-libs/protobuf. MY_PV3="${PV#3.}" MY_PV="${MY_PV3/_rc/-rc}" @@ -25,20 +25,19 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="system-protoc" +BDEPEND=" + system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 ) + !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 ) +" DEPEND=" >=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 - ) + ) " RDEPEND=">=virtual/jre-1.8:*" -BDEPEND=" - system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 ) - !system-protoc? ( >=dev-cpp/abseil-cpp-20230125.3 ) -" - PATCHES=( "${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch" ) @@ -69,7 +68,7 @@ src_prepare() { java-pkg-2_src_prepare mkdir "${JAVA_RESOURCE_DIRS}" || die - # https://github.com/protocolbuffers/protobuf/blob/v24.2/java/core/pom.xml#L43-L62 + # https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/pom.xml#L43-L62 PROTOS=( $(sed \ -n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \ "${S}/java/core/pom.xml") ) || die @@ -77,7 +76,7 @@ src_prepare() { cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die popd > /dev/null || die - # https://github.com/protocolbuffers/protobuf/blob/v24.2/java/core/generate-sources-build.xml + # https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/generate-sources-build.xml einfo "Replace variables in generate-sources-build.xml" sed \ -e 's:${generated.sources.dir}:java/core/src/main/java:' \ @@ -86,7 +85,7 @@ src_prepare() { -e '/project\|echo\|mkdir\|exec/d' \ -i java/core/generate-sources-build.xml || die "sed to sources failed" - # https://github.com/protocolbuffers/protobuf/blob/v24.2/java/core/generate-test-sources-build.xml + # https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/generate-test-sources-build.xml einfo "Replace variables in generate-test-sources-build.xml" sed \ -e 's:${generated.testsources.dir}:java/core/src/test/java:' \ @@ -129,7 +128,7 @@ src_compile() { } src_test() { - # https://github.com/protocolbuffers/protobuf/blob/v24.2/java/core/pom.xml#L63-L71 + # https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/pom.xml#L63-L71 jar cvf testdata.jar \ -C src google/protobuf/testdata/golden_message_oneof_implemented \ -C src google/protobuf/testdata/golden_packed_fields_message || die diff --git a/dev-java/protobuf-java/protobuf-java-4.26.1.ebuild b/dev-java/protobuf-java/protobuf-java-4.26.1.ebuild new file mode 100644 index 000000000000..cbf117e3173e --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-4.26.1.ebuild @@ -0,0 +1,158 @@ +# Copyright 2008-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.protobuf:protobuf-java:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple cmake + +DESCRIPTION="Core Protocol Buffers library" +HOMEPAGE="https://protobuf.dev" +# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. +# And we build artifact 4.26.1 from the 26.1 tarball in order to allow sharing the tarball with +# dev-libs/protobuf. +MY_PV4="${PV#4.}" +MY_PV="${MY_PV4/_rc/-rc}" +SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" +S="${WORKDIR}/protobuf-${MY_PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="system-protoc" + +BDEPEND=" + system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0 ) + !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 ) +" +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/guava:0 + dev-java/mockito:4 + ) +" +RDEPEND=">=virtual/jre-1.8:*" + +PATCHES=( + "${FILESDIR}/protobuf-java-3.26.0-unittest.protos.patch" +) + +JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" +JAVA_JAR_FILENAME="protobuf.jar" +JAVA_RESOURCE_DIRS="java/core/src/main/resources" +JAVA_SRC_DIR="java/core/src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" +JAVA_TEST_SRC_DIR="java/core/src/test/java" + +run-protoc() { + if use system-protoc; then + protoc $1 + else + "${BUILD_DIR}"/protoc $1 + fi +} + +src_prepare() { + # If the corrsponding version of system-protoc is not available we build protoc locally + if use system-protoc; then + default # apply patches + else + cmake_src_prepare + fi + java-pkg-2_src_prepare + + # https://github.com/protocolbuffers/protobuf/blob/v26.1/java/core/generate-sources-build.xml + einfo "Replace variables in generate-sources-build.xml" + sed \ + -e 's:${generated.sources.dir}:java/core/src/main/java:' \ + -e 's:${protobuf.java_source.dir}:java/core/src/main/resources:' \ + -e 's:${protobuf.source.dir}:src:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|echo\|mkdir\|exec/d' \ + -i java/core/generate-sources-build.xml || die "sed to sources failed" + + # https://github.com/protocolbuffers/protobuf/blob/v26.1/java/core/generate-test-sources-build.xml + einfo "Replace variables in generate-test-sources-build.xml" + sed \ + -e 's:${generated.testsources.dir}:java/core/src/test/java:' \ + -e 's:${protobuf.source.dir}:src:' \ + -e 's:${test.proto.dir}:java/core/src/test/proto:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|mkdir\|exec\|Also generate/d' \ + -i java/core/generate-test-sources-build.xml || die "sed to test sources failed" + + # Split the file in two parts, one for each run-protoc call + awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \ + java/core/generate-test-sources-build.xml || die +} + +src_configure() { + local mycmakeargs=( + -Dprotobuf_BUILD_TESTS=OFF + -Dprotobuf_ABSL_PROVIDER=package + ) + if use system-protoc; then + : + else + cmake_src_configure + fi +} + +src_compile() { + if use system-protoc; then + : + else + cmake_src_compile + fi + + einfo "Run protoc to generate sources" + run-protoc \ + @java/core/generate-sources-build.xml \ + || die "protoc sources failed" + + java-pkg-simple_src_compile +} + +src_test() { + # https://github.com/protocolbuffers/protobuf/blob/v26.1/java/core/pom.xml#L63-L71 + jar cvf testdata.jar \ + -C src google/protobuf/testdata/golden_message_oneof_implemented \ + -C src google/protobuf/testdata/golden_packed_fields_message || die + + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" + + einfo "Running protoc on first part of generate-test-sources-build.xml" + run-protoc @test-sources-build-1 \ + || die "run-protoc test-sources-build-1 failed" + + einfo "Running protoc on second part of generate-test-sources-build.xml" + run-protoc @test-sources-build-2 \ + || die "run-protoc test-sources-build-2 failed" + + einfo "Running tests" + # Invalid test class 'map_test.MapInitializationOrderTest': + # 1. Test class should have exactly one public constructor + # Invalid test class 'protobuf_unittest.CachedFieldSizeTest': + # 1. Test class should have exactly one public constructor + pushd "${JAVA_TEST_SRC_DIR}" || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -path "**/*Test.java" \ + ! -path "**/Abstract*Test.java" \ + ! -name "MapInitializationOrderTest.java" \ + ! -path '*protobuf_unittest/CachedFieldSizeTest.java' + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install +} diff --git a/dev-java/protobuf-java/protobuf-java-4.27.2.ebuild b/dev-java/protobuf-java/protobuf-java-4.27.2.ebuild new file mode 100644 index 000000000000..039b497e7f28 --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-4.27.2.ebuild @@ -0,0 +1,161 @@ +# Copyright 2008-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.protobuf:protobuf-java:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple cmake + +DESCRIPTION="Core Protocol Buffers library" +HOMEPAGE="https://protobuf.dev" +# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. +# And we build artifact 4.27.2 from the 27.2 tarball in order to allow sharing the tarball with +# dev-libs/protobuf. +MY_PV4="${PV#4.}" +MY_PV="${MY_PV4/_rc/-rc}" +SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" +S="${WORKDIR}/protobuf-${MY_PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="system-protoc" + +BDEPEND=" + system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0 ) + !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 ) +" +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/guava:0 + dev-java/mockito:4 + ) +" +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" +JAVA_JAR_FILENAME="protobuf.jar" +JAVA_RESOURCE_DIRS="java/core/src/main/resources" +JAVA_SRC_DIR="java/core/src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" +JAVA_TEST_SRC_DIR="java/core/src/test/java" + +run-protoc() { + if use system-protoc; then + protoc $1 + else + "${BUILD_DIR}"/protoc $1 + fi +} + +src_prepare() { + # If the corrsponding version of system-protoc is not available we build protoc locally + if use system-protoc; then + default # apply patches + else + cmake_src_prepare + fi + java-pkg-2_src_prepare + + # https://github.com/protocolbuffers/protobuf/blob/v27.2/java/core/generate-sources-build.xml + einfo "Replace variables in generate-sources-build.xml" + sed \ + -e 's:${generated.sources.dir}:java/core/src/main/java:' \ + -e 's:${protobuf.java_source.dir}:java/core/src/main/resources:' \ + -e 's:${protobuf.source.dir}:src:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|echo\|mkdir\|exec/d' \ + -i java/core/generate-sources-build.xml || die "sed to sources failed" + + # https://github.com/protocolbuffers/protobuf/blob/v27.2/java/core/generate-test-sources-build.xml + einfo "Replace variables in generate-test-sources-build.xml" + sed \ + -e 's:${generated.testsources.dir}:java/core/src/test/java:' \ + -e 's:${protobuf.source.dir}:src:' \ + -e 's:${test.proto.dir}:java/core/src/test/proto:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|mkdir\|exec\|Also generate/d' \ + -i java/core/generate-test-sources-build.xml || die "sed to test sources failed" + + # Split the file in two parts, one for each run-protoc call + awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \ + java/core/generate-test-sources-build.xml || die +} + +src_configure() { + local mycmakeargs=( + -Dprotobuf_BUILD_TESTS=OFF + -Dprotobuf_ABSL_PROVIDER=package + ) + if use system-protoc; then + : + else + cmake_src_configure + fi +} + +src_compile() { + if use system-protoc; then + : + else + cmake_src_compile + fi + + einfo "Run protoc to generate sources" + run-protoc \ + @java/core/generate-sources-build.xml \ + || die "protoc sources failed" + + java-pkg-simple_src_compile +} + +src_test() { + # https://github.com/protocolbuffers/protobuf/blob/v27.2/java/core/pom.xml#L63-L71 + jar cvf testdata.jar \ + -C src google/protobuf/testdata/golden_message_oneof_implemented \ + -C src google/protobuf/testdata/golden_packed_fields_message || die + + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" + + # google/protobuf/java_features.proto: File not found. + cp {java/core/src/main/resources,src}/google/protobuf/java_features.proto || die + + einfo "Running protoc on first part of generate-test-sources-build.xml" + run-protoc @test-sources-build-1 \ + || die "run-protoc test-sources-build-1 failed" + + einfo "Running protoc on second part of generate-test-sources-build.xml" + run-protoc @test-sources-build-2 \ + || die "run-protoc test-sources-build-2 failed" + + # java/core/src/test/java/editions_unittest/TestDelimited.java:2867: + # error: package editions_unittest.MessageImport does not exist + rm java/core/src/test/java/com/google/protobuf/TextFormatTest.java || die + + einfo "Running tests" + # Invalid test class 'map_test.MapInitializationOrderTest': + # 1. Test class should have exactly one public constructor + # Invalid test class 'protobuf_unittest.CachedFieldSizeTest': + # 1. Test class should have exactly one public constructor + pushd "${JAVA_TEST_SRC_DIR}" || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -path "**/*Test.java" \ + ! -path "**/Abstract*Test.java" \ + ! -name "MapInitializationOrderTest.java" \ + ! -path '*protobuf_unittest/CachedFieldSizeTest.java' + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install +} diff --git a/dev-java/qdox/metadata.xml b/dev-java/qdox/metadata.xml index f00a4317cac4..fe50d6ed9393 100644 --- a/dev-java/qdox/metadata.xml +++ b/dev-java/qdox/metadata.xml @@ -12,4 +12,7 @@ <upstream> <remote-id type="github">paul-hammant/qdox</remote-id> </upstream> + <use> + <flag name="ant-task">Build the ant-task</flag> + </use> </pkgmetadata> diff --git a/dev-java/qdox/qdox-1.12.1-r3.ebuild b/dev-java/qdox/qdox-1.12.1-r5.ebuild index 9f0982c09a7e..a4419f6cf68e 100644 --- a/dev-java/qdox/qdox-1.12.1-r3.ebuild +++ b/dev-java/qdox/qdox-1.12.1-r5.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,31 +11,35 @@ inherit java-pkg-2 DESCRIPTION="Parser for extracting class/interface/method definitions" HOMEPAGE="https://github.com/codehaus/qdox" SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${PN}-${PV}" LICENSE="Apache-2.0" SLOT="1.12" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos" +IUSE="ant-task" +REQUIRED_USE="test? ( ant-task )" -S="${WORKDIR}/${PN}-${PN}-${PV}" - -CDEPEND="dev-java/ant-core:0" - -DEPEND=">=virtual/jdk-1.8:* +DEPEND=" + >=virtual/jdk-1.8:* dev-java/byaccj:0 - >=dev-java/jflex-1.6.1:0 + dev-java/jflex:0 dev-java/jmock:1.0 + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) test? ( dev-java/junit:0 ) - ${CDEPEND}" +" -RDEPEND=">=virtual/jre-1.8:* - ${CDEPEND}" +RDEPEND=" + >=virtual/jre-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) +" PATCHES=( "${FILESDIR}/jflex-1.6.1.patch" ) src_prepare() { - default + default #780585 + java-pkg-2_src_prepare if ! use test ; then rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java @@ -52,12 +56,18 @@ src_compile() { # create jar mkdir -p build/classes || die - local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)" + local cp="$(java-pkg_getjars --build-only jmock-1.0)" if use test ; then cp="${cp}:$(java-pkg_getjars --build-only junit)" fi + if use ant-task ; then + cp="${cp}:$(java-pkg_getjars --build-only ant)" + else + rm src/java/com/thoughtworks/qdox/ant/AbstractQdoxTask.java || die + fi + ejavac -sourcepath . -d build/classes -classpath "${cp}" \ $(find . -name "*.java") || die "Cannot compile sources" @@ -74,7 +84,7 @@ src_compile() { } src_test() { - java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \ + java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant,junit,jmock-1.0) \ com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!" } diff --git a/dev-java/reflections/reflections-0.9.12-r5.ebuild b/dev-java/reflections/reflections-0.9.12-r6.ebuild index 4b2b9ab7668c..630e94c431ca 100644 --- a/dev-java/reflections/reflections-0.9.12-r5.ebuild +++ b/dev-java/reflections/reflections-0.9.12-r6.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: @@ -22,7 +22,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Common dependencies # POM: pom.xml -# com.google.code.gson:gson:2.8.6 -> >=dev-java/gson-2.8.8:2.6 +# com.google.code.gson:gson:2.8.6 -> >=dev-java/gson-2.8.8:0 # org.dom4j:dom4j:2.1.1 -> >=dev-java/dom4j-2.1.3:1 # org.javassist:javassist:3.26.0-GA -> !!!suitable-mavenVersion-not-found!!! # org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0 @@ -30,7 +30,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86" CP_DEPEND=" dev-java/dom4j:1 - dev-java/gson:2.6 + dev-java/gson:0 dev-java/javassist:3 dev-java/slf4j-api:0 dev-java/slf4j-simple:0 diff --git a/dev-java/relaxng-datatype/Manifest b/dev-java/relaxng-datatype/Manifest index d03c886f2cbc..826bed701f04 100644 --- a/dev-java/relaxng-datatype/Manifest +++ b/dev-java/relaxng-datatype/Manifest @@ -1,2 +1 @@ -DIST relaxng-datatype-1.0.zip 74033 BLAKE2B 15b488e914cab28fb9ade71b491d961ffa4f683f66759e96cd53dcf69edd39d423b5562831698bb3e03191396c86a2a93369f14d278f3c55a90728031d1921d3 SHA512 712b99209e927e8929c46797cf3733993cc2740bfbafb458c518e5e130a7860a19dee45acd360a9d7179137f9340c3edeb514cacf501233cca515b38e60d6b79 DIST relaxngDatatype-20020414-sources.jar 11666 BLAKE2B b2505d61dc36a12d7b31ad84db6813dbfac04aedd6805568103a310ee88586995cc98dbeecc38744bd767f8dd2ced5257400365aaab859b05676949abd187316 SHA512 6d3335d08b620a1b5d401871b1e92dbbea6b9d954e5c7eba1a4f535afe8c6ddf51a5f07db69805409525f4dfdbe34d13cc3392acd8e7e16b100f7e708cee0380 diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild deleted file mode 100644 index 5d093ae064b9..000000000000 --- a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -MY_PN="relaxngDatatype" -MY_P="${MY_PN}-${PV}" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Interface between RELAX NG validators and datatype libraries" -HOMEPAGE="https://relaxng.org/" -SRC_URI="mirror://sourceforge/relaxng/${MY_P}.zip -> ${P}.zip" - -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -LICENSE="BSD" -SLOT="0" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" -BDEPEND="app-arch/unzip" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - java-pkg_clean -} - -src_install() { - java-pkg-simple_src_install - einstalldocs -} diff --git a/dev-java/rhino/rhino-1.7.14.ebuild b/dev-java/rhino/rhino-1.7.14-r1.ebuild index 0826d783bf62..8676a8e192ab 100644 --- a/dev-java/rhino/rhino-1.7.14.ebuild +++ b/dev-java/rhino/rhino-1.7.14-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 @@ -30,7 +30,7 @@ RESTRICT="test" DEPEND=">=virtual/jdk-1.8:* test? ( - dev-java/ant-junit:0 + >=dev-java/ant-1.10.14-r3:0[junit] dev-java/emma:0 dev-java/jakarta-xml-soap-api:1 dev-java/jmh-core:0 @@ -50,7 +50,7 @@ JAVA_SRC_DIR=( "src" "toolsrc" "xmlimplsrc" ) JAVA_RESOURCE_DIRS="res" JAVA_MAIN_CLASS="org.mozilla.javascript.tools.shell.Main" -JAVA_TEST_GENTOO_CLASSPATH="ant-junit,emma,hamcrest-core-1.3,jakarta-xml-soap-api-1,jmh-core,junit-4,snakeyaml" +JAVA_TEST_GENTOO_CLASSPATH="ant,emma,hamcrest-core-1.3,jakarta-xml-soap-api-1,jmh-core,junit-4,snakeyaml" JAVA_TEST_SRC_DIRS="testsrc" JAVA_TEST_RESOURCE_DIRS="testres" diff --git a/dev-java/saslprep/metadata.xml b/dev-java/saslprep/metadata.xml index 75321cfb5598..e870bae78b8b 100644 --- a/dev-java/saslprep/metadata.xml +++ b/dev-java/saslprep/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="gitlab">ongresinc/stringprep</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/sax/sax-2.2.1-r5.ebuild b/dev-java/sax/sax-2.2.1-r5.ebuild index d367d673cb21..5bda68b0b794 100644 --- a/dev-java/sax/sax-2.2.1-r5.ebuild +++ b/dev-java/sax/sax-2.2.1-r5.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,7 +11,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="SAX: Simple API for XML in Java" HOMEPAGE="http://sax.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip -> ${P}.zip" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}.zip -> ${P}.zip" LICENSE="public-domain" SLOT="0" diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest index 4f96b04522b3..38e8f07647f7 100644 --- a/dev-java/saxon/Manifest +++ b/dev-java/saxon/Manifest @@ -1,2 +1 @@ -DIST saxon6-5-5.zip 3346162 BLAKE2B 63d49545d101c3b595ff3f3db6d781158b8a51862ccdc294e782ac0935010a841405fb21663bd35853042c53548991dfefa7f789be292fe8497a29253c87ee09 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e diff --git a/dev-java/saxon/metadata.xml b/dev-java/saxon/metadata.xml index 4a2440bdfc71..796069569107 100644 --- a/dev-java/saxon/metadata.xml +++ b/dev-java/saxon/metadata.xml @@ -8,4 +8,7 @@ <upstream> <remote-id type="sourceforge">saxon</remote-id> </upstream> + <use> + <flag name="ant-task">BUILD and register the ant-task</flag> + </use> </pkgmetadata> diff --git a/dev-java/saxon/saxon-6.5.5-r3.ebuild b/dev-java/saxon/saxon-6.5.5-r3.ebuild deleted file mode 100644 index 3562e1307373..000000000000 --- a/dev-java/saxon/saxon-6.5.5-r3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc examples source" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Set of tools for processing XML documents" -HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/saxon/saxon6/${PV}/saxon${PV//./-}.zip" - -LICENSE="MPL-1.1" -SLOT="6.5" -KEYWORDS="amd64 x86" - -CP_DEPEND="dev-java/jdom:0" - -# Restricting to jdk:1.8 for following reason: -# src/org/w3c/dom/UserDataHandler.java:1: error: package exists in another module: java.xml -# package org.w3c.dom; -DEPEND="${CP_DEPEND} - virtual/jdk:1.8" - -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" - -BDEPEND="app-arch/unzip" - -JAVA_ENCODING="ISO-8859-1" -JAVA_SRC_DIR="src" - -src_unpack() { - unpack ${A} - unzip -qq source.zip -d src || die "failed to unpack" -} - -src_prepare() { - default - java-pkg_clean -} - -src_install() { - default - java-pkg-simple_src_install - use examples && java-pkg_doexamples samples -} diff --git a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild deleted file mode 100644 index 54b7feedaeb0..000000000000 --- a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="A XSLT and XQuery Processor" -HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV//./-}source.zip" - -LICENSE="MPL-1.0" -SLOT="9" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -CDEPEND=" - dev-java/xom:0 - dev-java/jdom:0 - dev-java/dom4j:1 - dev-java/ant-core" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.8:*" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}" - -# prepare eclass variables -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_CLASSPATH_TAGS="javac javadoc" - -src_prepare() { - default - - # Fedora-inspired removal. - - # deadNET. - rm -rv net/sf/saxon/dotnet || die - - # Depends on XQJ (javax.xml.xquery). - rm -rv net/sf/saxon/xqj || die - - # This requires a EE edition feature (com.saxonica.xsltextn). - rm -v net/sf/saxon/option/sql/SQLElementFactory.java || die - - # <major>.<minor> version - local version="$(ver_cut 1-2)" - - # generate build.xml with external javadoc links - sed -e "s:@JDK@:1.6:" \ - -e "s:@JDOM@:1:" \ - < "${FILESDIR}/${version}-build.xml" \ - > "${S}/build.xml" \ - || die "build.xml generation failed!" - - # prepare creates the dir for properties - eant prepare - - # properties - cp -v \ - "${FILESDIR}/${version}-edition.properties" \ - "${S}/build/classes/edition.properties" || die -} - -src_compile() { - local gcp="$(java-pkg_getjars dom4j-1,jdom,xom)" - gcp="${gcp}:$(java-pkg_getjars --build-only ant-core)" - eant -Dgentoo.classpath="${gcp}" jar $(use_doc) -} - -src_install() { - java-pkg_dojar build/lib/${PN}.jar - - java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform - java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query - - java-pkg_register-ant-task - - use doc && java-pkg_dojavadoc build/api - - use source && java-pkg_dosrc src -} diff --git a/dev-java/saxon/saxon-9.2.0.6-r5.ebuild b/dev-java/saxon/saxon-9.2.0.6-r5.ebuild new file mode 100644 index 000000000000..f8d7b5719895 --- /dev/null +++ b/dev-java/saxon/saxon-9.2.0.6-r5.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A XSLT and XQuery Processor" +HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV//./-}source.zip" + +LICENSE="MPL-1.0" +SLOT="9" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" +IUSE="ant-task" + +BDEPEND="app-arch/unzip" +CP_DEPEND=" + dev-java/dom4j:1 + dev-java/jdom:0 + dev-java/xom:0 +" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 )" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 )" + +JAVA_ENCODING="iso-8859-1" +JAVA_RESOURCE_DIRS="resources" + +src_prepare() { + java-pkg-2_src_prepare + + # Fedora-inspired removal. + + # deadNET. + rm -rv net/sf/saxon/dotnet || die + + # Depends on XQJ (javax.xml.xquery). + rm -rv net/sf/saxon/xqj || die + + # This requires a EE edition feature (com.saxonica.xsltextn). + rm -v net/sf/saxon/option/sql/SQLElementFactory.java || die + + if use ant-task; then + JAVA_GENTOO_CLASSPATH+="ant" + else + rm net/sf/saxon/ant/AntTransform.java || die + fi + + mkdir resources || die + cat > "resources/edition.properties" <<-EOF + config=net.sf.saxon.Configuration + platform=net.sf.saxon.java.JavaPlatform + EOF +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform + java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query + use ant-task && java-pkg_register-ant-task +} diff --git a/dev-java/sbt-bin/Manifest b/dev-java/sbt-bin/Manifest index 8999c0c43a4e..dcd62703e35c 100644 --- a/dev-java/sbt-bin/Manifest +++ b/dev-java/sbt-bin/Manifest @@ -1,2 +1 @@ -DIST sbt-1.3.10.tgz 57609786 BLAKE2B 35285d141d8ad38a8e15cc3dd18947fa34dbe307ce1fbdd267a0902ff7f5757a0ab80d56eb241c8bea79c4a13c270efb65a552a039416a6f571b6cd214739819 SHA512 93832c0eec51422d6db63078c722578cbad21e4611ca868e835471fb988ad225e8abdea47c6dcf6e19117db9598bc75296100d9dc7ba0d605b70adc592efb925 DIST sbt-1.8.0.tgz 29165245 BLAKE2B 7b2895e2f748cefd76bd4db12b9903448b77345bfa2c7be9fdf55e959a72828eb73d7b560885c8fb3c691571330fb6b94526820b611e3daf5a4e5f8f093656c9 SHA512 e53817cc7a15a37883ea3cef094e297a813388116e3f0c4bf29c70021c5df01f1e08bccfd20f20cfae007b88fd6c2915f82478ee44274bf5ddcea12df2de7f49 diff --git a/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild b/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild deleted file mode 100644 index e492707aeaf3..000000000000 --- a/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit java-pkg-2 - -DESCRIPTION="sbt, a build tool for Scala" -HOMEPAGE="https://www.scala-sbt.org/" -SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tgz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64" - -RDEPEND=" - >=virtual/jre-1.7 - !dev-java/sbt" - -src_unpack() { - default - mv "${WORKDIR}/sbt" "${S}" || die -} - -src_prepare() { - default - java-pkg_init_paths_ -} - -src_compile() { - :; -} - -src_install() { - local dest="${JAVA_PKG_SHAREPATH}" - - rm -v bin/sbt.bat || die - sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \ - bin/sbt || die - - insinto "${dest}/lib" - doins bin/* - - insinto "${dest}" - doins -r conf - - fperms 0755 "${dest}/lib/sbt" - dosym "${dest}/lib/sbt" /usr/bin/sbt -} diff --git a/dev-java/sbt-bin/sbt-bin-1.8.0.ebuild b/dev-java/sbt-bin/sbt-bin-1.8.0.ebuild index 5df89d429600..aa7d16b69b39 100644 --- a/dev-java/sbt-bin/sbt-bin-1.8.0.ebuild +++ b/dev-java/sbt-bin/sbt-bin-1.8.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 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tg LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" RDEPEND=" >=virtual/jre-1.8 diff --git a/dev-java/sbt/metadata.xml b/dev-java/sbt/metadata.xml index 1f19867ca177..9844fcc90ace 100644 --- a/dev-java/sbt/metadata.xml +++ b/dev-java/sbt/metadata.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>gienah@gentoo.org</email> -</maintainer> +<!-- maintainer-needed --> <longdescription lang="en"> The interactive build tool. Use Scala to define your tasks. Then run them in parallel from the shell. </longdescription> <use><flag name="binary">Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.</flag></use> +<upstream> +<remote-id type="github">sbt/sbt</remote-id> +</upstream> </pkgmetadata> diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest index 8b1096cfe80b..97b63d254284 100644 --- a/dev-java/scala-cli-bin/Manifest +++ b/dev-java/scala-cli-bin/Manifest @@ -1,6 +1,15 @@ -DIST scala-cli-amd64-1.0.2.gz 33215510 BLAKE2B 288475cbd346260423188b4db038dd8cce2f5885bf0346e8a74b08cd02a2c44204fec37aaf6207ff6447beb4740df725bae6a0a129682ebedc1028ae5f0ec316 SHA512 ac18b43bd37717b2aab6b1056b727aba40f57eed33d1fc5f1903c3729f0344ed30ed595f2a60bff2c65ee3a6d4439e8ee4bcf95fc38baf059d4a66de9696cded DIST scala-cli-amd64-1.0.4.gz 33291617 BLAKE2B bd97626e7e95fb6b2a82fd424673078b89f5f4270087c667193e4de1ceff614076e73b728ba1f0334d5f9d7aa6f52c660487d52bf8fb49a786f7fe4ce18a0428 SHA512 447acafd47041cd173a06b5d113cd30adee76a2c161b2efc98b8ece60082d5b98189fd9b3da1f048061d306343cacb9b67566daa78ce8fe54dc82dd90a1e34bc -DIST scala-cli-arm64-1.0.2.gz 33058672 BLAKE2B a82b18eec6235100cbbd7ff1503283e5ef29ba0798f67b44f69b329aa0f1f525cc910a7b4a923f98c8b113d06bac6e1c5ba963d62204462635ef4eed3d0b7f85 SHA512 b1dc9de26d30336f283202aa23ba1c76baddcea21d4c8c4c0e5114de979c62ba3e2b483302d4f396c84e802497127a36d589dae2826f76e1d02760314f6f0765 +DIST scala-cli-amd64-1.1.0.gz 33673708 BLAKE2B 332f5a974949af49914de8fdb3129b0937fbce842616d6fefe16f7aff89baf6be1ba536d0ee6ff9bc1dd2b5ebfa51943bd0c6279ef83b95bd25a337530fa1295 SHA512 ba7ebb321a27e95f786027257c3f50dac1d12e0cc33abde24dc7c5dffb2f57a11c3ea67d92ed487968c49ff9ec3eaf5d1d62065beda5b6fa373d09b9126f4529 +DIST scala-cli-amd64-1.1.1.gz 33754319 BLAKE2B 91fb5e9b828a2c6c6dd984b421bb101ea1ae03c85d94eda14ba79433d29a88cb2850cb376c212f677c1b8167a0a21b320aeb0e4e63a29e6c8502d76babc1543d SHA512 1e0cd5eee280e208090961e4b6d216d472fef360f13e0f4e28412b9a52883d65c97e3fe70c8ce5cf96e6cd866f14b175454175be9df3bdc5c229fb2f121c925a +DIST scala-cli-amd64-1.2.1.gz 33851353 BLAKE2B 31c92901f970ec2c0a74cb45d94b98e6d8f282c175cf8deb1a806db4b6d2e9a8b2150bca9fc9e373948e5092bf4bb7d5d1145a133d3b1c234d3cbe383ff9a270 SHA512 169c81bee582c6144501e8bd5436bae0bd3447ed89856a4d4763d13d3083ad26d948729b71bea864986f2c676e50855b8fb036d3a69ed0a316e2c6af0f98ef5f +DIST scala-cli-amd64-1.2.2.gz 33871512 BLAKE2B ef9328b26afb52ada07739539d560239d6ce2ffd72d1e353ce94d45c7358b6789aa0019804e249584ca497d5d15c96caab12eb31fab5b84a14162c00ca30c181 SHA512 02da0915ee140a129f622f973291c98c7dd7b7f16f5a2a5250ac825e09876b616a315fe5e6af43691f43870fa68234efeff73eadd4f6060d2d90fe937302eae7 DIST scala-cli-arm64-1.0.4.gz 33185346 BLAKE2B 2b0131a56ed3f67fb5d5f25db6c511dc7d9e9128089e6826fa7d859b1457f03a99e290cc63f185820ea849a857f40d667d5db7a378dabcf545cdcdefded6a577 SHA512 3ff1c025a1035aa6a8550de17e85bc5c483007d5f07f03e0d792d6dc9ed1b18eb26909b3c7195fde12056a3b84ffa69dc53c01ec21b34187c1d7188a0a023aaa -DIST scala-cli-non-native-1.0.2 9633113 BLAKE2B d63fe324533393158ac945c3070843787c844584c3f8bdc141f6106fa22adf244c2ca5e010801c549b0a56ecf500495c754ed9e6186f74359b373c4d776645ff SHA512 c6e6262af236a315960a3d16dfebc7adaf88f830d43e68f89220f2cf250d57d083bd2b9231fd13a0b3adc723ed17200592b55a2a17ccd582b9cc3ceebf52a29b +DIST scala-cli-arm64-1.1.0.gz 33575885 BLAKE2B ebccbe86044b4708a356060a16f06bb94df01d261ab7dabe8eba8e644c121864cdee99debf95468d936cbff670413ec47e1ef903a9071b267a61c5fe46738c1a SHA512 6a85529be06a8d43d729c5a795bb0dcdb2680bd7ef3de471fee908e91249401262e8322019c640d4eb45d0a15ed0073ff51b24d61846228f46c36bfb48731408 +DIST scala-cli-arm64-1.1.1.gz 33656505 BLAKE2B b943f370c9375fec5cec3c63628ecd9e416b569ec2d692422f217b2506c104a1c3bb415569581d68c9476bf892b4a087e7b95b2310955dd0f9af52edc90af2e9 SHA512 79836261613bafe4710c1d904ec39e88c1862b3021f7b37ac5004c6079c762e68550522fbb7240e48e7408f844f648ab92c12cb568ebc63bb3e01f1992a7eaf3 +DIST scala-cli-arm64-1.2.1.gz 33769006 BLAKE2B 4bc2c830d17e235a3eba7029bfd018ee4cd12f8ee27a3574b1c2195ab8ad22b79c452a0660fb55f1be99a610be1f4ea38f8e2de622f10277be7f5403b540778a SHA512 90a8f6b4ae2fa90dcdd3c88fdbbd1079db1cbbde80f496da8663223ad79dc4b499b6ae43835067d8fde945d4fb5ed079dec850f688b9d1b62602d186d426f7cb +DIST scala-cli-arm64-1.2.2.gz 33766128 BLAKE2B d5b2d7ab8157f3874b1cfe0b0647ab30f5dd191337e575056eb758d52eda30871c54b20a08a1cda3e28c51afd744b4b8320aee6aef056b39b98f2534184739ba SHA512 004ca188e4ddd01c0e46277fa514b1c9bd061ea26d4318b8daff3ffaae5bb7cc9f4746509401da19774537c7e56f8a5a7da846cd4b5f90c61a3ab1f8d3ed0493 DIST scala-cli-non-native-1.0.4 7553232 BLAKE2B 9299b20dddec80d12e738af4b283e816de5bae23262510146cd33a9b175f2a343f52932fbd3254974bd4219d2903f32772409f234423d3a027b6b0f02268e584 SHA512 4e5281ef7f8a886ad79746477d852f485ccad317568a64ee513e691dcd9a9121c2aed51f6170b959f0226fb81efe9aa1f8ecf1d94a84a0b387c349adfb756762 +DIST scala-cli-non-native-1.1.0 7728727 BLAKE2B 05deb93b91029721a21bac729aa9b370e05909e67bbade921e00d09c3a37e851e519188bff73dc614c3f5768834ae56f94623347735e756a6bcb0c4c81c8713c SHA512 13e426915794df757b6eb029d2545316bd9f4b9ba6f58cf59a546227d6997741cf681ce0c5e721e8e95cb9e420702f2d28f004df1780637dc9b39fd3bc4c884a +DIST scala-cli-non-native-1.1.1 7779964 BLAKE2B 08849ce4a6fbf1e6eb2e4fafd2e29522e535c0795d6f1acbcd25ec4523d14dcae4a746f3729786db8f62a3770e6fdbd78a76477b182b32945454ac19a2f8217c SHA512 61c2a1a325f83e19102cd2f5d6b89d37b9914d64f86da6218258f064a6a8e5ab927d28b278363316446611e2cbdc8e4687616ea2b001da00ecbafb4207eabeb2 +DIST scala-cli-non-native-1.2.1 7836408 BLAKE2B a7c191020a65a4420ef7cc9d8fe5f9c6d1548c1cfb14dea94c0d9a798f608c038083bb678bd1a4fbdc9bd3de58f02a11e970cfebec4ac755f7f12af21eeb4dbc SHA512 d889ad3fa96953423fc1d948b6e260f55ffc4234d6e9da05299afe0a6cbc2b66c42a7a65113f887d1bf41a699679d09e02aed6686150551d1e1171d7c1c7331b +DIST scala-cli-non-native-1.2.2 7837019 BLAKE2B 799ed83805ba767b687cf9a041a3e23f008e20e3ca55b8c52a9361c0b2465141abb7c17ca7dca59c9307af5a5a07a0cfe0d8035eea14a2adf2580913d67d6a10 SHA512 40aa43ee601c52238989a81884b6acc7a023599abb561bed1c9d31dff6053eff0f3477097a228bc30aab4df22d81b10fbbb64b5557d3067b4715c821c4eacb3e diff --git a/dev-java/scala-cli-bin/metadata.xml b/dev-java/scala-cli-bin/metadata.xml index c4efbfd85748..27dc5e6617c8 100644 --- a/dev-java/scala-cli-bin/metadata.xml +++ b/dev-java/scala-cli-bin/metadata.xml @@ -6,6 +6,7 @@ <name>Florian Schmaus</name> </maintainer> <upstream> + <changelog>https://github.com/VirtusLab/scala-cli/releases</changelog> <remote-id type="github">VirtusLab/scala-cli</remote-id> <bugs-to>https://github.com/VirtusLab/scala-cli/issues</bugs-to> </upstream> diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.0.2.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild index 67f4eefef2f4..d73c7e68ad79 100644 --- a/dev-java/scala-cli-bin/scala-cli-bin-1.0.2.ebuild +++ b/dev-java/scala-cli-bin/scala-cli-bin-1.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 diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild new file mode 100644 index 000000000000..dc0659cfd5ec --- /dev/null +++ b/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 + +UPSTREAM_PV=${PV/_/-} +UPSTREAM_PV=${UPSTREAM_PV/rc/RC} + +DESCRIPTION="CLI to interact with Scala and Java" +HOMEPAGE="https://scala-cli.virtuslab.org/" +SRC_URI=" + !amd64? ( !arm64? ( + https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli + -> scala-cli-non-native-${UPSTREAM_PV} + ) ) + amd64? ( + https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz + -> scala-cli-amd64-${UPSTREAM_PV}.gz + ) + arm64? ( + https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz + -> scala-cli-arm64-${UPSTREAM_PV}.gz + ) +" + +KEYWORDS="~amd64 ~arm64" +LICENSE="Apache-2.0" +SLOT="0" + +S="${WORKDIR}" + +# A JRE is not strictly required if native images of scala-cli are used +# (amd64, arm64). However we may want a system JRE anyway, and having JRE +# in RDEPEND reduces the chances that scala-cli needs to install one +# for the user. +RDEPEND=" + >=virtual/jre-11 + sys-libs/zlib +" +BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )" + +QA_TEXTRELS="*" +QA_FLAGS_IGNORED="/usr/bin/scala-cli" + +src_prepare() { + default + + if use amd64; then + mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die + elif use arm64; then + mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die + else + mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die + fi + + chmod +x scala-cli || die +} + +src_compile() { + for shell in bash zsh; do + ./scala-cli install-completions \ + --shell ${shell} \ + --env \ + --output "${S}" \ + > ${shell}-completion || die + done +} + +src_install() { + dobin scala-cli + + newbashcomp bash-completion scala-cli + + insinto /usr/share/zsh/site-functions + doins zsh/_scala-cli +} diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.2.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.2.1.ebuild new file mode 100644 index 000000000000..dc0659cfd5ec --- /dev/null +++ b/dev-java/scala-cli-bin/scala-cli-bin-1.2.1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 + +UPSTREAM_PV=${PV/_/-} +UPSTREAM_PV=${UPSTREAM_PV/rc/RC} + +DESCRIPTION="CLI to interact with Scala and Java" +HOMEPAGE="https://scala-cli.virtuslab.org/" +SRC_URI=" + !amd64? ( !arm64? ( + https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli + -> scala-cli-non-native-${UPSTREAM_PV} + ) ) + amd64? ( + https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz + -> scala-cli-amd64-${UPSTREAM_PV}.gz + ) + arm64? ( + https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz + -> scala-cli-arm64-${UPSTREAM_PV}.gz + ) +" + +KEYWORDS="~amd64 ~arm64" +LICENSE="Apache-2.0" +SLOT="0" + +S="${WORKDIR}" + +# A JRE is not strictly required if native images of scala-cli are used +# (amd64, arm64). However we may want a system JRE anyway, and having JRE +# in RDEPEND reduces the chances that scala-cli needs to install one +# for the user. +RDEPEND=" + >=virtual/jre-11 + sys-libs/zlib +" +BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )" + +QA_TEXTRELS="*" +QA_FLAGS_IGNORED="/usr/bin/scala-cli" + +src_prepare() { + default + + if use amd64; then + mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die + elif use arm64; then + mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die + else + mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die + fi + + chmod +x scala-cli || die +} + +src_compile() { + for shell in bash zsh; do + ./scala-cli install-completions \ + --shell ${shell} \ + --env \ + --output "${S}" \ + > ${shell}-completion || die + done +} + +src_install() { + dobin scala-cli + + newbashcomp bash-completion scala-cli + + insinto /usr/share/zsh/site-functions + doins zsh/_scala-cli +} diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild new file mode 100644 index 000000000000..dc0659cfd5ec --- /dev/null +++ b/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 + +UPSTREAM_PV=${PV/_/-} +UPSTREAM_PV=${UPSTREAM_PV/rc/RC} + +DESCRIPTION="CLI to interact with Scala and Java" +HOMEPAGE="https://scala-cli.virtuslab.org/" +SRC_URI=" + !amd64? ( !arm64? ( + https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli + -> scala-cli-non-native-${UPSTREAM_PV} + ) ) + amd64? ( + https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz + -> scala-cli-amd64-${UPSTREAM_PV}.gz + ) + arm64? ( + https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz + -> scala-cli-arm64-${UPSTREAM_PV}.gz + ) +" + +KEYWORDS="~amd64 ~arm64" +LICENSE="Apache-2.0" +SLOT="0" + +S="${WORKDIR}" + +# A JRE is not strictly required if native images of scala-cli are used +# (amd64, arm64). However we may want a system JRE anyway, and having JRE +# in RDEPEND reduces the chances that scala-cli needs to install one +# for the user. +RDEPEND=" + >=virtual/jre-11 + sys-libs/zlib +" +BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )" + +QA_TEXTRELS="*" +QA_FLAGS_IGNORED="/usr/bin/scala-cli" + +src_prepare() { + default + + if use amd64; then + mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die + elif use arm64; then + mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die + else + mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die + fi + + chmod +x scala-cli || die +} + +src_compile() { + for shell in bash zsh; do + ./scala-cli install-completions \ + --shell ${shell} \ + --env \ + --output "${S}" \ + > ${shell}-completion || die + done +} + +src_install() { + dobin scala-cli + + newbashcomp bash-completion scala-cli + + insinto /usr/share/zsh/site-functions + doins zsh/_scala-cli +} diff --git a/dev-java/scram/Manifest b/dev-java/scram/Manifest index 42494f4d9f77..5ba3c94824d5 100644 --- a/dev-java/scram/Manifest +++ b/dev-java/scram/Manifest @@ -1 +1 @@ -DIST scram-2.1.tar.gz 64263 BLAKE2B 59b71ee0faa32d2478e38e4275b7c83efb3f7a3ede0c068a8c0a6fe970248d22b539c50b97127b1b757839758d119b395fedd85d85425bd019e0972c2df20ef4 SHA512 e0757b306db03c56f03fa0907e46693337854c152a321cae1b109a1c16b0cb5be2482a92d64a420432a3ea31371990cbac444f965abde89c04083005b30012ef +DIST scram-2.1.tar.bz2 52442 BLAKE2B e9ec2367251770c4adb3d4bf62702c8ca13264fd12270dfb4f138c740536eb508a383486a81e1ab2bb0f8d4792642d033180c0e43ac287917543249fd16c8a76 SHA512 e2807d2c4b7984b5d9f53cb5ea6f9b2c2d5b48b5e695f25fb775cb3f22672851a9299cfe95912f109205c74817cf9f2fd706f8d49e473257e2571f409ec34044 diff --git a/dev-java/scram/metadata.xml b/dev-java/scram/metadata.xml index 75321cfb5598..0feb6155dbc1 100644 --- a/dev-java/scram/metadata.xml +++ b/dev-java/scram/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="gitlab">ongresinc/scram</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild index c29fd451b086..6e7eeccf9430 100644 --- a/dev-java/scram/scram-2.1.ebuild +++ b/dev-java/scram/scram-2.1.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 common/pom.xml --download-uri https://gitlab.com/ongresinc/scram/-/archive/2.1/scram-2.1.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild scram-2.1.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" @@ -14,43 +11,36 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Java Implementation of the Salted Challenge Response Authentication Mechanism" HOMEPAGE="https://gitlab.com/ongresinc/scram" -SRC_URI="https://gitlab.com/ongresinc/${PN}/-/archive/${PV}/${P}.tar.gz" +SRC_URI="https://gitlab.com/ongresinc/${PN}/-/archive/${PV}/${P}.tar.bz2" +S="${WORKDIR}/${P}" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ppc64 x86" -# Common dependencies -# POM: common/pom.xml -# com.ongres.stringprep:saslprep:1.1 -> >=dev-java/stringprep-2.0:0 - -CP_DEPEND=" - dev-java/saslprep:0 -" - -# Compile dependencies -# POM: common/pom.xml -# com.google.code.findbugs:annotations:3.0.1 -> !!!artifactId-not-found!!! -# com.google.code.findbugs:jsr305:3.0.1 -> >=dev-java/jsr305-3.0.2:0 -# POM: common/pom.xml -# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4 +CP_DEPEND="dev-java/saslprep:0" -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND} +DEPEND="${CP_DEPEND} dev-java/findbugs-annotations:0 dev-java/jsr305:0 + >=virtual/jdk-1.8:* test? ( dev-java/stringprep:0 ) " -RDEPEND=" +RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:* - ${CP_DEPEND}" +" DOCS=( CHANGELOG NOTICE README.md ) -S="${WORKDIR}/${P}" - +JAVADOC_CLASSPATH=" + findbugs-annotations + saslprep +" +JAVADOC_SRC_DIRS=( + "common/src/main/java" + "client/src/main/java" +) JAVA_CLASSPATH_EXTRA="findbugs-annotations,jsr305" JAVA_TEST_GENTOO_CLASSPATH="junit-4,stringprep" @@ -69,21 +59,11 @@ src_compile() { JAVA_GENTOO_CLASSPATH_EXTRA+=":client.jar" rm -r target || die - if use doc; then - einfo "Compiling javadocs" - JAVA_SRC_DIR=( - "common/src/main/java" - "client/src/main/java" - ) - JAVA_JAR_FILENAME="ignoreme.jar" - java-pkg-simple_src_compile - fi + use doc && ejavadoc } src_test() { - einfo "Testing module common" - JAVA_TEST_SRC_DIR="common/src/test/java" - java-pkg-simple_src_test + cp -r {common,client}/src/test/java || die einfo "Testing module cwclientcommon" JAVA_TEST_SRC_DIR="client/src/test/java" @@ -91,12 +71,9 @@ src_test() { } src_install() { - default + JAVA_JAR_FILENAME="client.jar" + java-pkg-simple_src_install java-pkg_dojar "common.jar" - java-pkg_dojar "client.jar" - if use doc; then - java-pkg_dojavadoc target/api - fi if use source; then java-pkg_dosrc "common/src/main/java/*" java-pkg_dosrc "client/src/main/java/*" diff --git a/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch b/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch deleted file mode 100644 index 6113019be3ea..000000000000 --- a/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/Makefile b/Makefile -index 0821c87..04f0435 100644 ---- a/Makefile -+++ b/Makefile -@@ -8,7 +8,8 @@ - - SNAPPY_OUT:=$(TARGET)/snappy-$(SNAPPY_VERSION)-$(os_arch) - SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(SNAPPY_VERSION).tar.gz --SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc -+#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc -+SNAPPY_CC:= - SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(SNAPPY_VERSION) - SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC)) - SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy -@@ -100,7 +101,8 @@ - - $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class - --$(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED) -+$(SNAPPY_SRC): -+# $(SNAPPY_GIT_UNPACKED) - - # aarch64 can use big-endian optimzied code - ifeq ($(OS_ARCH),aarch64) -@@ -122,7 +124,7 @@ - $(CXX) $(CXXFLAGS) -c $< -o $@ - - $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) -- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy - # Workaround for strip Protocol error when using VirtualBox on Mac - cp $@ /tmp/$(@F) - $(STRIP) /tmp/$(@F) -@@ -140,9 +142,9 @@ - #snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d") - snappy-jar-version:=snappy - --native: jni-header snappy-header $(NATIVE_DLL) --native-nocmake: jni-header $(NATIVE_DLL) --snappy: native $(TARGET)/$(snappy-jar-version).jar -+native: $(NATIVE_DLL) -+native-nocmake: $(NATIVE_DLL) -+snappy: native - - native-all: native win32 win64 native-arm linux32 linux64 linux-ppc64le - -@@ -151,6 +153,7 @@ - cp $(SNAPPY_OUT)/$(LIBNAME) $@ - @mkdir -p $(NATIVE_TARGET_DIR) - cp $(SNAPPY_OUT)/$(LIBNAME) $(NATIVE_TARGET_DIR)/$(LIBNAME) -+ cp $< $(TARGET)/ - - package: $(TARGET)/$(snappy-jar-version).jar - diff --git a/dev-java/snappy/snappy-1.1.10.5.ebuild b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild index 9f690d9c4df7..6e719db54841 100644 --- a/dev-java/snappy/snappy-1.1.10.5.ebuild +++ b/dev-java/snappy/snappy-1.1.10.5-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 @@ -33,7 +33,7 @@ DEPEND=">=virtual/jdk-1.8:* ${CP_DEPEND} ${CDEPEND} test? ( - dev-java/ant-junit4:0 + >=dev-java/ant-1.10.14:0[junit4] dev-java/commons-io:1 dev-java/commons-lang:3.6 dev-java/plexus-classworlds:0 diff --git a/dev-java/stax2-api/metadata.xml b/dev-java/stax2-api/metadata.xml index 995e89fc3df7..fc17369a40da 100644 --- a/dev-java/stax2-api/metadata.xml +++ b/dev-java/stax2-api/metadata.xml @@ -9,5 +9,6 @@ </longdescription> <upstream> <bugs-to>https://github.com/FasterXML/stax2-api/issues</bugs-to> + <remote-id type="github">FasterXML/stax2-api</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/stringprep/metadata.xml b/dev-java/stringprep/metadata.xml index 75321cfb5598..e870bae78b8b 100644 --- a/dev-java/stringprep/metadata.xml +++ b/dev-java/stringprep/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>java@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="gitlab">ongresinc/stringprep</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest index 3e6c9904de13..99391fd2990b 100644 --- a/dev-java/stringtemplate/Manifest +++ b/dev-java/stringtemplate/Manifest @@ -1,3 +1,4 @@ -DIST ST4-4.3.2-sources.jar 198754 BLAKE2B 667953642ed2721d1a7c7e94d90a1f8690cfa9c31c391e9b5089f04c64728dac75edc9cd0e529607cad4c1b07abaf45719c2cbab9e962a5feef657b59c3baccc SHA512 7de339d34adf6b9207a23e8936092ea4fde78bf1faa63cee869673e91ba73d0fcbaa555602d0905c7347e894985613c63ff4ce04825decc34c896da5a687d42f +DIST ST4-4.3.4-sources.jar 198780 BLAKE2B 25f9b4baf43075ddbc946933a517e8361f88d152c4caba29a88770ab229c1b40636ebc4ccdf52a2132d94974e0d81dd114e4018658d178a2c44228007450ab7d SHA512 83ff2e17659c37407b91c83e7fcd3b5d44b206f6fdaaf8034122a3c9490778aeb24ecf90778b9dc9d6836bc59a01d75bacce71e27aadb8a5fa22b9373f7f7878 +DIST ST4-4.3.4.tar.gz 436814 BLAKE2B 40aba1cb009b669ad00285b4cdffa66632c38267f42b6b973bdb0a2f57f3c46fc13d1a929ac4745c104d658f127a63081ed5dde4c813c10e60ce7df3490d3517 SHA512 5061663c3130a50b03aaf1800a04103afae7db59758bc7957914b07718e50a139c5d486f90098368500c46d3d751ea1659c63531126fb146fb77eaeb6e244ea2 +DIST stringtemplate-3.2.1-4-java21-compatibility.patch 1973 BLAKE2B b48891549f1d9a3386b0a44a78f453a7938122e5b0b5eeba98888bfa843aea4e5732b4dbcf6aac66272c9fe5aeb9ed98aabcf3edcd155f43d5ad0c1d4d4cdd57 SHA512 8dcf841affc0e7da006b13bf4c5d44fc5315aa4790926e8598650b519fd57a4c322e4292ba58561c921308697a4be1b8b6528931eb79e6a9f2e9f7d1370599cc DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435 SHA512 76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25 -DIST stringtemplate-4.3.2.tar.gz 437013 BLAKE2B 0fb0fd62314a1fa5045285966b28aaf8f18579261722c0383e4ec8b3198aff59fd0e9760dcd43d8ecddf795ce3b2a882f3f339ec56d117a4b5b22e9c2718d679 SHA512 d6150f86ce458b5c74d533016bc3168fad969fc1d814d01c5ad3be2f866f7aa531357a903565f31afa3ba62423acc760b7762865e0ee5dd3af4ea546f6be25e1 diff --git a/dev-java/stringtemplate/files/stringtemplate-3.2.1-TestStringTemplate.patch b/dev-java/stringtemplate/files/stringtemplate-3.2.1-TestStringTemplate.patch new file mode 100644 index 000000000000..e12b3c63b26a --- /dev/null +++ b/dev-java/stringtemplate/files/stringtemplate-3.2.1-TestStringTemplate.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/916571 +--- a/test/org/antlr/stringtemplate/test/TestStringTemplate.java ++++ b/test/org/antlr/stringtemplate/test/TestStringTemplate.java +@@ -28,6 +28,7 @@ + package org.antlr.stringtemplate.test; + + import org.antlr.stringtemplate.*; ++import org.antlr.stringtemplate.StringTemplate; + import org.antlr.stringtemplate.language.AngleBracketTemplateLexer; + import org.antlr.stringtemplate.language.DefaultTemplateLexer; + import org.junit.Test; diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.4-BaseTest-javac-source-target.patch index 5824425ce35b..7c31d6b5a893 100644 --- a/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch +++ b/dev-java/stringtemplate/files/stringtemplate-4.3.4-BaseTest-javac-source-target.patch @@ -10,10 +10,8 @@ Signed-off-by: Yuan Liao <liaoyuan@gmail.com> test/org/stringtemplate/v4/test/BaseTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/test/org/stringtemplate/v4/test/BaseTest.java b/test/org/stringtemplate/v4/test/BaseTest.java -index 536d686..74a3949 100644 ---- a/test/org/stringtemplate/v4/test/BaseTest.java -+++ b/test/org/stringtemplate/v4/test/BaseTest.java +--- a/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/BaseTest.java ++++ b/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/BaseTest.java @@ -258,7 +258,7 @@ public abstract class BaseTest { fileManager.getJavaFileObjectsFromFiles(files); diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch new file mode 100644 index 000000000000..22b271671b8d --- /dev/null +++ b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch @@ -0,0 +1,41 @@ +there are different space characters used in java 21 (narrow space) + +--- a/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestRenderers.java ++++ b/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestRenderers.java +@@ -77,6 +77,8 @@ public class TestRenderers extends BaseTest { + String expecting = "datetime: 7/5/05, 12:00 AM"; + if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { + expecting = "datetime: 7/5/05 12:00 AM"; ++ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) { ++ expecting = "datetime: 7/5/05, 12:00 AM"; + } + String result = st.render(); + assertEquals(expecting, result); +@@ -106,6 +108,8 @@ public class TestRenderers extends BaseTest { + String expecting = " datetime: 7/5/05, 12:00 AM "; + if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { + expecting = " datetime: 7/5/05 12:00 AM "; ++ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) { ++ expecting = " datetime: 7/5/05, 12:00 AM "; + } + String result = st.render(); + assertEquals(expecting, result); +@@ -126,6 +130,8 @@ public class TestRenderers extends BaseTest { + String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time "; + if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { + expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT "; ++ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) { ++ expecting = " datetime: Tuesday, July 5, 2005, 12:00:00 AM Pacific Daylight Time "; + } + String result = st.render(); + assertEquals(expecting, result); +@@ -160,6 +166,9 @@ public class TestRenderers extends BaseTest { + ST st = group.getInstanceOf("dateThing"); + st.add("created", new GregorianCalendar(2005, 7 - 1, 5)); + String expecting = " time: 12:00:00 AM "; ++ if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) { ++ expecting = " time: 12:00:00 AM "; ++ } + String result = st.render(); + assertEquals(expecting, result); + } diff --git a/dev-java/stringtemplate/metadata.xml b/dev-java/stringtemplate/metadata.xml index fb8783e44aee..b4aba6185def 100644 --- a/dev-java/stringtemplate/metadata.xml +++ b/dev-java/stringtemplate/metadata.xml @@ -6,6 +6,7 @@ <name>Java</name> </maintainer> <upstream> + <remote-id type="github">antlr/stringtemplate3</remote-id> <remote-id type="github">antlr/stringtemplate4</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild index 12ea0035a6ed..544099d09244 100644 --- a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild +++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild @@ -1,59 +1,52 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/antlr/stringtemplate3/archive/68f2a42e8038f8e716e9666909ea485ee8aff45a.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild stringtemplate-3.2.1-r2.ebuild - -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.antlr:stringtemplate:3.2.2" +MAVEN_ID="org.antlr:stringtemplate:${PV}" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple -MY_COMMIT="68f2a42e8038f8e716e9666909ea485ee8aff45a" DESCRIPTION="A Java template engine" HOMEPAGE="https://www.stringtemplate.org/" -SRC_URI="https://github.com/antlr/stringtemplate3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +MY_COMMIT="68f2a42e8038f8e716e9666909ea485ee8aff45a" +DEB="3.2.1-4" +SRC_URI="https://github.com/antlr/stringtemplate3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz + https://sources.debian.org/data/main/s/${PN}/${DEB}/debian/patches/java21-compatibility.patch \ + -> ${PN}-${DEB}-java21-compatibility.patch" +S="${WORKDIR}/${PN}3-${MY_COMMIT}" LICENSE="BSD-1" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris" -# Common dependencies -# POM: pom.xml -# antlr:antlr:2.7.7 -> >=dev-java/antlr-2.7.7:0 - -CDEPEND=" - dev-java/antlr:0 -" - -DEPEND=" - >=virtual/jdk-1.8:* - ${CDEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND} -" +CP_DEPEND="dev-java/antlr:0" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" DOCS=( {CHANGES,README}.txt ) +PATCHES=( + "${DISTDIR}/stringtemplate-${DEB}-java21-compatibility.patch" + "${FILESDIR}/stringtemplate-3.2.1-TestStringTemplate.patch" +) -S="${WORKDIR}/${PN}3-${MY_COMMIT}" - -JAVA_GENTOO_CLASSPATH="antlr" JAVA_SRC_DIR="src" - JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_SRC_DIR="test" JAVA_TEST_RESOURCE_DIRS="test" +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + src_compile() { local G; for G in action template angle.bracket.template eval group interface; do # from build.xml antlr -o src/org/antlr/stringtemplate/language/{,${G}.g} || die done - java-pkg-simple_src_compile } diff --git a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild index 86fa55098e53..0ed931834169 100644 --- a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild +++ b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.antlr:ST4:4.3.2" +MAVEN_ID="org.antlr:ST4:${PV}" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple @@ -16,8 +16,10 @@ HOMEPAGE="https://www.stringtemplate.org/" # Tarball for the test suite and DOCS files SRC_URI=" https://repo1.maven.org/maven2/org/antlr/ST4/${PV}/ST4-${PV}-sources.jar - https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/antlr/stringtemplate4/archive/ST4-${PV}.tar.gz " +S="${WORKDIR}" +TARBALL_S="${S}/${PN}4-ST4-${PV}" LICENSE="BSD" SLOT="4" @@ -44,9 +46,6 @@ RDEPEND=" ${CP_DEPEND} " -S="${WORKDIR}" -TARBALL_S="${S}/${PN}4-${PV}" - JAVA_SRC_DIR="org" JAVA_TEST_GENTOO_CLASSPATH="junit-4,antlr-tool-3.5" @@ -54,18 +53,16 @@ JAVA_TEST_SRC_DIR="${TARBALL_S}/test" JAVA_TEST_RESOURCE_DIRS=( "${TARBALL_S}/test/resources" ) DOCS=( "${TARBALL_S}/"{CHANGES.txt,README.md} ) +PATCHES=( + "${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch" + "${FILESDIR}/stringtemplate-4.3.4-Java21+-TestRenderers.patch" +) src_prepare() { - # Do not call java-pkg_clean; otherwise, it would remove - # ${TARBALL_S}/test/test.jar, which is merely used as a - # test resource file, does not contain any *.class files, - # and is required to pass the tests as of version 4.3.2 - pushd "${TARBALL_S}" > /dev/null || - die "Failed to enter directory storing tarball contents" - eapply "${FILESDIR}/${PN}-4.3.1-BaseTest-javac-source-target.patch" - popd > /dev/null || - die "Failed to leave directory storing tarball contents" + default #780585 java-pkg-2_src_prepare + # keep test.jar - it is required to pass the tests as of version 4.3.2 + java-pkg_clean ! -path */test.jar # Some of these tests requires a graphical display. rm -v "${JAVA_TEST_SRC_DIR}/org/stringtemplate/v4/test/TestEarlyEvaluation.java" || die } @@ -96,8 +93,3 @@ src_test() { JAVA_GENTOO_CLASSPATH_EXTRA+="${new_test_cp}" java-pkg-simple_src_test } - -src_install() { - java-pkg-simple_src_install - einstalldocs # https://bugs.gentoo.org/789582 -} diff --git a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild index 92355258c5ef..3900e1d0a5c4 100644 --- a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild +++ b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild @@ -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,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Utilities and widgets to integrate Swing GUIs with web applications" HOMEPAGE="https://java.net/projects/swingx-ws/" -SRC_URI="mirror://sourceforge/bt747/Development/${MY_P}.zip" +SRC_URI="https://downloads.sourceforge.net/bt747/Development/${MY_P}.zip" LICENSE="LGPL-2.1" SLOT="bt747" KEYWORDS="~amd64 ~x86" diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index c05938dd3fbb..166e78f0c03c 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -3,9 +3,15 @@ DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6 DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7 DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0 -DIST swt-4.28-gtk-linux-aarch64.zip 3836289 BLAKE2B 3460e8bcde76cae74d3fba94198b2f0a6b8ed21c4f123003a216421db4af03686f43a26ce00cf4c59c56f8a31b88626482ae5f13f2e92c06e2147658fa482aeb SHA512 d91ff48ca384de057d70f3a886691193bd88960c6da0e37fb4ef695c32399c0d3ab87f6174075e5637046e7b2b22a73e4b03e0133a2bdb7ee584d4fa53baa11c -DIST swt-4.28-gtk-linux-ppc64le.zip 3860453 BLAKE2B 8de275767f1bd0b68a58744804c71314760fb3d56a396db32917376583830bb0307b5169f0f8c56a200180aaf7e871a1ab01e2ed682c16a49d2d236d1ae3bc3a SHA512 56d7f82b249924966184be29d4cdac454308169247b5c7819b77f592eef7f434ba5e913d95688411667940c354cb9d9db023935925914053e04117a654e2ad91 -DIST swt-4.28-gtk-linux-x86_64.zip 3856600 BLAKE2B 6725d0a261444d113af74e36d8bc451d2a8f3fbecb13f137877d4ac3acf427944b4eeb782967bddbd30c0af88ab0c8976020731c2c70c318012053ccdde83b17 SHA512 81c42fc08432c031f8c2d862fde5ac59c96ff0b70109fb1a65b00c22f136c696d7aa9ec02416660cb71691f3c9d36de553a68315cb4e9aeee86290114e69a829 DIST swt-4.29-gtk-linux-aarch64.zip 3836724 BLAKE2B 8c905df298688686ee22c9f2021560856f7ac7b6a92dad744b27cd30530c6ff76470fdcbb79b91ada01f28c43b8f694c334ff1337d692366ae9dc0319f7e46e2 SHA512 44ff572b57631b1b6a98192f60624758d90f54a2b2272c6bbb140ece39e65bb4086cf08fbc50c5f2e388e7b410b28fc014b87a8560062053b4c131970fa38b17 DIST swt-4.29-gtk-linux-ppc64le.zip 3860955 BLAKE2B f24f8224581425dc86926a147f2f4c644f086cb7907e03bfca64df93ef5ce8341f519acc91e90c0af4eede65797ac019c17a410ff0312306714fa26ddb4234b4 SHA512 09326b5204970d9db2cede4aebf11c7f24a47c30b6bc49764dda1d0a33fa83c7c4755797cac387d1814a29ad2574e45244b994e5df0c7ef2fd1375fc7877814b DIST swt-4.29-gtk-linux-x86_64.zip 3857122 BLAKE2B ac4416044f93eaed396ac10edb74eb5ebcbb967797109f57580bd0ac7c1e3752e8895c5ff1b315aa32b5d5b5ce8e1440badb8b9c3138a0eaeb4df63098919a8c SHA512 c92381e4d1479c219e174c027e54af781e674b266334a5e087f5821935e0a87696f40afbc9fe6f9ffaa00b5204165d9ff6476031b5e4e2df8aea1a54aeb2e65e +DIST swt-4.30-gtk-linux-aarch64.zip 3836637 BLAKE2B 4cedb6eae73e03c32f6c226560f8e7bcbde5b6fc57579255e793fd5d01a5ff80f8b673dd7035eb7f2693abadd98bd0cfdb2eec632c05995552a9a1f1b673b8cc SHA512 dfdddd12ba30373d3ee7f0337b42d3a4f55a55dc898be9c97fbcc3d841c082d00190a75513272076c5709ee626e8af3f77c7c2dc518aa9289e80e33f4b134907 +DIST swt-4.30-gtk-linux-ppc64le.zip 3860636 BLAKE2B a535c1bcc6c668905f4d4aaa8c5ae7f3b8f48fc95004522d09924ae54d5172b18f80169d78633e960ce0c5141e5b34492d1dd05188a0b1f48d9f79d286bd2982 SHA512 5a17bd7752343da638466ac28de460d9fa9f0e777d1e48625ddb6c5538704e36cd97439d1bf8f07ad34a32b7d5f27f19d8877e8a9bb9094b4a74bdbb1dc126f7 +DIST swt-4.30-gtk-linux-x86_64.zip 3856990 BLAKE2B 0ea29a5f286fb4bb362758629226bcd6f27716afae7abb80cb37e7d4b72f0c835d63a196384465d3bc74135c42454a74c75455c094204e6329229ad8ca1fda78 SHA512 3802bd1dc84c7d684dac6b0b21de6b4958dd0c736a6b42176cf734806f04ae9dfdb18515ec5249eeff5f6bb716bf327a7a10e79d68cc487a1ad02267394507a1 +DIST swt-4.31-gtk-linux-aarch64.zip 4019864 BLAKE2B 597f9c2ce1382aacd4667c7d1fc350b2318d8b1577dfc32a0139efb9d26e7c32703a0fb2507876ef441c47901d46ba522ea40714f9b88f1d517e3d9d24c2416a SHA512 636e3a4e7adc21ab8ee3ecdc3f85bbd0ad5786836492cf0096f99177716043150b41807cc456f4813ebb1797092761bb227809e8594bf64155b438973cc84bfc +DIST swt-4.31-gtk-linux-ppc64le.zip 4036590 BLAKE2B da9ad8a7e0bf168b024c4e1fbdbcc01154ec0d7e8b38b2912ba7edf1bf8239f05a9ce1f08790174158ebb788c9cc3adf754d13942fc8aa0fe9d4a53177a814ff SHA512 bf8f3f45b4229db383839a64b7d08294340ab2f0c623be8e382609b5ff9a59683229bb308d49480ffb01596ab050d45f97894fec99c0d4eb710e60c40b864531 +DIST swt-4.31-gtk-linux-x86_64.zip 4039479 BLAKE2B 6f7e434acf57cd03dd5e938b1b1c578339b3d7817202681a15420ebdec3be10b95b1bf5eca6f1cf71de9a5a0c390d2d6ee903c2a71e8974e03987cc52322e44d SHA512 da61610ce00fc46893ec3ee6d5d7ed5cc59312002c6946a3748cff1a776af75bad0026512b412ef1622ca0bee124764ed8ee7f5f87364cff945b296feb86e74b +DIST swt-4.32-gtk-linux-aarch64.zip 3991281 BLAKE2B 99fece9547e801661bb65f699780eb95cb626efd78e1bd79dec15d5fb63e03805ab6c6f75b98648cfad194d800c11cbe6a3c23250f4c4084072aea2aa4cde10c SHA512 adf5d207ba35bfa43fad2c4c64d72a4b56e8830efa0f817b158ad0bd4508eca9c83c43ebebb843c4fb75cb33835a6490b8b0b2a993bfa3507b62fba50345607a +DIST swt-4.32-gtk-linux-ppc64le.zip 4028301 BLAKE2B 1ed2590ffe01836dc9209b8323db25204c157a829f4af10f20509c30f268c88e89a9e252aebd9a4a0d3337fa20b1a3d76040b768918f7a2f7c8a6313314d14b8 SHA512 713f762fab2d5eea125844912fafdc3eb42bfb76c2caac5612972714e07b66de0e2a71ae29a51c86b2ad76c32761842ad209f8b59c931ea727dc03b2161b40f2 +DIST swt-4.32-gtk-linux-x86_64.zip 4011746 BLAKE2B 5d2784f9a18684d539ea576560bb5fecbbf59960cbd8ce901c9b152df087decb2db28ebf9fbf12c710f6dde71583e9002ca0ac85d5ca7a7ce17286ad1666c5c8 SHA512 f4d511595cccf104cda35c6f314e3689508e18e5da85bb2e8bdd408d9b8d4ab3371e851b3b96ba0f835b3ff0a079c4ed887661e586ab0ce06a52abf69ba243be diff --git a/dev-java/swt/files/build.xml b/dev-java/swt/files/build.xml deleted file mode 100644 index ea775871bf09..000000000000 --- a/dev-java/swt/files/build.xml +++ /dev/null @@ -1,17 +0,0 @@ -<project name="SWT" default="jar" basedir="."> - <property name="src" location="."/> - <property name="build" location="build"/> - - <target name="init"> - <tstamp/> - <mkdir dir="${build}"/> - </target> - - <target name="compile" depends="init" description="Compile the SWT toolset"> - <javac srcdir="${src}" destdir="${build}"/> - </target> - - <target name="jar"> - <jar destfile="swt.jar" basedir="${build}"/> - </target> -</project> diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r4.ebuild index eb993b82f314..18bc97088217 100644 --- a/dev-java/swt/swt-3.7.2-r3.ebuild +++ b/dev-java/swt/swt-3.7.2-r4.ebuild @@ -1,16 +1,18 @@ -# 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 -inherit java-pkg-2 java-ant-2 java-osgi toolchain-funcs +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple java-osgi toolchain-funcs MY_PV="${PV/_rc/RC}" MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800" MY_P="${PN}-${MY_PV}" DESCRIPTION="GTK based SWT Library" -HOMEPAGE="https://www.eclipse.org/" +HOMEPAGE="https://www.eclipse.org/swt/" SRC_URI=" amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip ) @@ -22,84 +24,101 @@ SLOT="3.7" KEYWORDS="amd64 ppc64 x86" IUSE="cairo opengl" +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" COMMON_DEPEND=" - >=dev-libs/atk-1.10.2 - >=dev-libs/glib-2.6 + app-accessibility/at-spi2-core:2 + dev-libs/glib >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst - cairo? ( >=x11-libs/cairo-1.4.14 ) + cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl )" -BDEPEND=" - app-arch/unzip - virtual/pkgconfig -" DEPEND="${COMMON_DEPEND} - virtual/jdk:1.8 + >=virtual/jdk-1.8:*[-headless-awt] x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt - >=x11-libs/libXtst-1.1.0" + x11-libs/libXtst" RDEPEND="${COMMON_DEPEND} - >=virtual/jre-1.4" - -S="${WORKDIR}" + >=virtual/jre-1.8:*" # JNI libraries don't need SONAME, bug #253756 QA_SONAME="usr/lib.*/libswt-.*.so" +JAVA_RESOURCE_DIRS="resources" +JAVA_SRC_DIR="src" + PATCHES=( # Fix Makefiles to respect flags and work with --as-needed "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch ) src_unpack() { - local DISTFILE=${A} - unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile" + default unpack "./src.zip" - - # Cleanup the redirtied directory structure - rm -rf about_files/ || die } src_prepare() { - # Replace the build.xml to allow compilation without Eclipse tasks - cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml" - mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" + default #780585 + java-pkg-2_src_prepare + java-pkg_clean + + mkdir resources src || die "mkdir failed" + mv org src || die "moving java sources failed" case ${ARCH} in ppc|x86) eapply "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;; *) eapply "${FILESDIR}"/${P}-gio_launch-URI.patch ;; esac - default + pushd src > /dev/null || die + find -type f ! -name '*.java' \ + | xargs \ + cp --parent -t ../resources -v \ + || die "copying resources failed" + popd > /dev/null || die + cp version.txt resources || die "adding version.txt failed" } src_compile() { - # Drop jikes support as it seems to be unfriendly with SWT - java-pkg_filter-compiler jikes - local AWT_ARCH local JAWTSO="libjawt.so" - if [[ $(tc-arch) == 'x86' ]] ; then - AWT_ARCH="i386" - elif [[ $(tc-arch) == 'ppc' ]] ; then - AWT_ARCH="ppc" - elif [[ $(tc-arch) == 'ppc64' ]] ; then - AWT_ARCH="ppc64" - else - AWT_ARCH="amd64" - fi - if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then - export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}" - elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then - export AWT_LIB_PATH="${JAVA_HOME}/jre/bin" - elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then - export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)" - else +# if [[ $(tc-arch) == 'x86' ]] ; then +# AWT_ARCH="i386" +# elif [[ $(tc-arch) == 'ppc' ]] ; then +# AWT_ARCH="ppc" +# elif [[ $(tc-arch) == 'ppc64' ]] ; then +# AWT_ARCH="ppc64" +# else +# AWT_ARCH="amd64" +# fi +# if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then +# export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}" +# elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then +# export AWT_LIB_PATH="${JAVA_HOME}/jre/bin" +# elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then +# export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)" +# else + IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH) + + for libpath in "${ldpaths[@]}"; do + if [[ -f "${libpath}/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${libpath}" + break + # this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10 + elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${libpath}/$(tc-arch)" + break + fi + done + + if [[ -z "${AWT_LIB_PATH}" ]]; then eerror "${JAWTSO} not found in the JDK being used for compilation!" die "cannot build AWT library" fi @@ -128,16 +147,7 @@ src_compile() { ${make} make_glx fi - einfo "Building JNI libraries" - eant compile - - einfo "Copying missing files" - cp -i "${S}/version.txt" "${S}/build/version.txt" || die - cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \ - "${S}/build/org/eclipse/swt/internal/" || die - - einfo "Packing JNI libraries" - eant jar + java-pkg-simple_src_compile } src_install() { diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r4.ebuild index 4e117a49acf6..9c3211738446 100644 --- a/dev-java/swt/swt-4.10-r2.ebuild +++ b/dev-java/swt/swt-4.10-r4.ebuild @@ -1,16 +1,18 @@ -# 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 -inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi +JAVA_PKG_IUSE="doc source" + +inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs java-osgi MY_PV="${PV/_rc/RC}" MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815" MY_P="${PN}-${MY_PV}" DESCRIPTION="GTK based SWT Library" -HOMEPAGE="https://www.eclipse.org/" +HOMEPAGE="https://www.eclipse.org/swt/" SRC_URI=" amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" @@ -20,13 +22,17 @@ SLOT="4.10" KEYWORDS="amd64 ppc64" IUSE="cairo opengl webkit" +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" COMMON_DEP=" - >=dev-libs/atk-1.10.2 - >=dev-libs/glib-2.32 + app-accessibility/at-spi2-core:2 + dev-libs/glib >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst - cairo? ( >=x11-libs/cairo-1.4.14 ) - opengl? ( + cairo? ( x11-libs/cairo ) + opengl? ( virtual/glu virtual/opengl ) @@ -39,54 +45,54 @@ DEPEND="${COMMON_DEP} x11-libs/libX11 x11-libs/libXrender x11-libs/libXt - >=x11-libs/libXtst-1.1.0" + x11-libs/libXtst" RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8:*" -BDEPEND=" - app-arch/unzip - virtual/pkgconfig -" - -S="${WORKDIR}" + >=virtual/jre-1.8:* + x11-libs/libX11" # JNI libraries don't need SONAME, bug #253756 QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so' +JAVA_RESOURCE_DIRS="resources" +JAVA_SRC_DIR="src" + PATCHES=( "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch ) src_unpack() { - local DISTFILE=${A} - unzip -jq "${DISTDIR}"/${DISTFILE} swt.jar src.zip || die "Unable to extract distfile" + default unpack "./src.zip" - - # Cleanup the redirtied directory structure - rm -rf about_files/ || die } src_prepare() { - # Replace the build.xml to allow compilation without Eclipse tasks - cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml" - mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" - - # Apply patches - default + default #780585 + java-pkg-2_src_prepare + # .css stuff is essential at least for running net-p2p/biglybt + unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d resources || die + java-pkg_clean # Define missing g_thread_supported() to be already started. sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die # Webext is also in the library directory sed -i 's|findResource([^,]\+|findResource("swt"|' \ - "${S}"/src/org/eclipse/swt/browser/WebKit.java || die + org/eclipse/swt/browser/WebKit.java || die + + mkdir src || die "mkdir failed" + mv org src || die "moving java sources failed" + pushd src > /dev/null || die + find -type f ! -name '*.java' \ + | xargs \ + cp --parent -t ../resources -v \ + || die "copying resources failed" + popd > /dev/null || die + cp version.txt resources || die "adding version.txt failed" } src_compile() { append-cflags -fcommon # https://bugs.gentoo.org/707838 - # Drop jikes support as it seems to be unfriendly with SWT - java-pkg_filter-compiler jikes - local JAWTSO="libjawt.so" IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH) @@ -115,6 +121,7 @@ src_compile() { local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" einfo "Building AWT library" + export SWT_JAVA_HOME="$(java-config -g JAVA_HOME)" ${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`" einfo "Building SWT library" @@ -135,20 +142,10 @@ src_compile() { if use webkit ; then einfo "Building WebKit component" - ${make} make_webkit make_webkit2extension + ${make} make_webkit fi - einfo "Building JNI libraries" - eant compile - - einfo "Copying missing files" - cp -i "${S}/version.txt" "${S}/build/version.txt" || die - cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \ - "${S}/build/org/eclipse/swt/internal/" || die - unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d build || die - - einfo "Packing JNI libraries" - eant jar + java-pkg-simple_src_compile } src_install() { diff --git a/dev-java/swt/swt-4.29.ebuild b/dev-java/swt/swt-4.29-r1.ebuild index 6f8aaa2c1780..6dbc30c768f9 100644 --- a/dev-java/swt/swt-4.29.ebuild +++ b/dev-java/swt/swt-4.29-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.27" -KEYWORDS="~amd64 arm64 ppc64" +KEYWORDS="amd64 arm64 ppc64" IUSE="cairo opengl webkit" COMMON_DEP=" @@ -44,7 +44,8 @@ DEPEND="${COMMON_DEP} x11-libs/libXt x11-libs/libXtst" RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8:*" + >=virtual/jre-1.8:* + x11-libs/libX11" BDEPEND=" app-arch/unzip virtual/pkgconfig diff --git a/dev-java/swt/swt-4.28-r1.ebuild b/dev-java/swt/swt-4.30-r2.ebuild index 8868a156b623..61d849831270 100644 --- a/dev-java/swt/swt-4.28-r1.ebuild +++ b/dev-java/swt/swt-4.30-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 @@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source" inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs MY_PV="${PV/_rc/RC}" -MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202306050440" +MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202312010110" MY_P="${PN}-${MY_PV}" DESCRIPTION="GTK based SWT Library" @@ -19,7 +19,7 @@ SRC_URI=" ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -SLOT="4.27" +SLOT="4.30" KEYWORDS="amd64 arm64 ppc64" IUSE="cairo opengl webkit" @@ -37,14 +37,16 @@ COMMON_DEP=" net-libs/webkit-gtk:4.1 )" DEPEND="${COMMON_DEP} - >=virtual/jdk-11:*[-headless-awt] + >=virtual/jdk-17:*[-headless-awt] x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt x11-libs/libXtst" +# error: pattern matching in instanceof is not supported in -source 11 RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8:*" + >=virtual/jre-17:* + x11-libs/libX11" BDEPEND=" app-arch/unzip virtual/pkgconfig @@ -72,8 +74,12 @@ src_prepare() { java-pkg_clean mkdir src || die "mkdir failed" mv org src || die "moving java sources failed" - find src -type f ! -name '*.java' | xargs \ - cp --parent -t resources -v || die "copying resources failed" + pushd src > /dev/null || die + find -type f ! -name '*.java' \ + | xargs \ + cp --parent -t ../resources -v \ + || die "copying resources failed" + popd > /dev/null || die cp version.txt resources || die "adding version.txt failed" } diff --git a/dev-java/swt/swt-4.31-r1.ebuild b/dev-java/swt/swt-4.31-r1.ebuild new file mode 100644 index 000000000000..382a538ccff2 --- /dev/null +++ b/dev-java/swt/swt-4.31-r1.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs + +MY_PV="${PV/_rc/RC}" +MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202402290520" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="GTK based SWT Library" +HOMEPAGE="https://www.eclipse.org/swt/" +SRC_URI=" + amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) + arm64? ( ${MY_DMF}/${MY_P}-gtk-linux-aarch64.zip ) + ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" +S="${WORKDIR}/library" + +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +SLOT="4.31" +KEYWORDS="amd64 arm64 ppc64" +IUSE="cairo opengl webkit" + +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" +COMMON_DEP=" + app-accessibility/at-spi2-core:2 + dev-libs/glib + x11-libs/gtk+:3 + x11-libs/libXtst + cairo? ( x11-libs/cairo ) + opengl? ( + virtual/glu + virtual/opengl + ) + webkit? ( + net-libs/webkit-gtk:4.1 + )" +DEPEND="${COMMON_DEP} + >=virtual/jdk-17:*[-headless-awt] + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst" +# error: pattern matching in instanceof is not supported in -source 11 +RDEPEND="${COMMON_DEP} + >=virtual/jre-17:* + x11-libs/libX11" + +HTML_DOCS=( ../about.html ) + +JAVA_RESOURCE_DIRS="../resources" +JAVA_SRC_DIR="../src" + +PATCHES=( + "${FILESDIR}/swt-4.27-as-needed-and-flag-fixes.patch" +) + +src_unpack() { + default + unpack "./src.zip" +} + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + # .css stuff is essential at least for running net-p2p/biglybt + unzip ../swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d resources || die + java-pkg_clean + cd .. || die + mkdir resources src || die "mkdir failed" + find org -type f -name '*.java' \ + | xargs \ + cp --parent -t src -v \ + || die "copying resources failed" + find org -type f ! -name '*.java' \ + | xargs \ + cp --parent -t resources -v \ + || die "copying resources failed" + cp version.txt resources || die "adding version.txt failed" +} + +src_compile() { + append-cflags -fcommon # https://bugs.gentoo.org/707838 + + local JAWTSO="libjawt.so" + IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH) + + for libpath in "${ldpaths[@]}"; do + if [[ -f "${libpath}/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${libpath}" + break + # this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10 + elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${libpath}/$(tc-arch)" + break + fi + done + + if [[ -z "${AWT_LIB_PATH}" ]]; then + eerror "${JAWTSO} not found in the JDK being used for compilation!" + die "cannot build AWT library" + fi + + # Fix the pointer size for AMD64 + export SWT_PTR_CFLAGS=-DJNI64 + + # Bug #461784, g_thread_init is deprecated since glib-2.32. + append-cflags -DNO__1g_1thread_1init + + local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" + + einfo "Building AWT library" + export SWT_JAVA_HOME="$(java-config -g JAVA_HOME)" + ${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`" + + einfo "Building SWT library" + ${make} make_swt + + einfo "Building JAVA-AT-SPI bridge" + ${make} make_atk + + if use cairo ; then + einfo "Building CAIRO support" + ${make} make_cairo + fi + + if use opengl ; then + einfo "Building OpenGL component" + ${make} make_glx + fi + + if use webkit ; then + einfo "Building WebKit component" + ${make} make_webkit + fi + + java-pkg-simple_src_compile +} + +src_install() { + java-pkg-simple_src_install + + java-pkg_sointo "/usr/$(get_libdir)/swt" + java-pkg_doso *.so +} diff --git a/dev-java/swt/swt-4.32.ebuild b/dev-java/swt/swt-4.32.ebuild new file mode 100644 index 000000000000..5e0f6d998c9b --- /dev/null +++ b/dev-java/swt/swt-4.32.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs + +MY_PV="${PV/_rc/RC}" +MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202406010610" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="GTK based SWT Library" +HOMEPAGE="https://www.eclipse.org/swt/" +SRC_URI=" + amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) + arm64? ( ${MY_DMF}/${MY_P}-gtk-linux-aarch64.zip ) + ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" +S="${WORKDIR}/library" + +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +SLOT="4.32" +KEYWORDS="amd64 arm64 ppc64" +IUSE="cairo opengl webkit" + +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" +COMMON_DEP=" + app-accessibility/at-spi2-core:2 + dev-libs/glib + x11-libs/gtk+:3 + x11-libs/libXtst + cairo? ( x11-libs/cairo ) + opengl? ( + virtual/glu + virtual/opengl + ) + webkit? ( + net-libs/webkit-gtk:4.1 + )" +DEPEND="${COMMON_DEP} + >=virtual/jdk-17:*[-headless-awt] + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst" +# error: pattern matching in instanceof is not supported in -source 11 +RDEPEND="${COMMON_DEP} + >=virtual/jre-17:* + x11-libs/libX11" + +HTML_DOCS=( ../about.html ) + +JAVA_RESOURCE_DIRS="../resources" +JAVA_SRC_DIR="../src" + +PATCHES=( + "${FILESDIR}/swt-4.27-as-needed-and-flag-fixes.patch" +) + +src_unpack() { + default + unpack "./src.zip" +} + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + # .css stuff is essential at least for running net-p2p/biglybt + unzip ../swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d resources || die + java-pkg_clean + cd .. || die + mkdir resources src || die "mkdir failed" + find org -type f -name '*.java' \ + | xargs \ + cp --parent -t src -v \ + || die "copying resources failed" + find org -type f ! -name '*.java' \ + | xargs \ + cp --parent -t resources -v \ + || die "copying resources failed" + cp version.txt resources || die "adding version.txt failed" +} + +src_compile() { + append-cflags -fcommon # https://bugs.gentoo.org/707838 + + local JAWTSO="libjawt.so" + IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH) + + for libpath in "${ldpaths[@]}"; do + if [[ -f "${libpath}/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${libpath}" + break + # this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10 + elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${libpath}/$(tc-arch)" + break + fi + done + + if [[ -z "${AWT_LIB_PATH}" ]]; then + eerror "${JAWTSO} not found in the JDK being used for compilation!" + die "cannot build AWT library" + fi + + # Fix the pointer size for AMD64 + export SWT_PTR_CFLAGS=-DJNI64 + + # Bug #461784, g_thread_init is deprecated since glib-2.32. + append-cflags -DNO__1g_1thread_1init + + local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" + + einfo "Building AWT library" + export SWT_JAVA_HOME="$(java-config -g JAVA_HOME)" + ${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`" + + einfo "Building SWT library" + ${make} make_swt + + einfo "Building JAVA-AT-SPI bridge" + ${make} make_atk + + if use cairo ; then + einfo "Building CAIRO support" + ${make} make_cairo + fi + + if use opengl ; then + einfo "Building OpenGL component" + ${make} make_glx + fi + + if use webkit ; then + einfo "Building WebKit component" + ${make} make_webkit + fi + + java-pkg-simple_src_compile +} + +src_install() { + java-pkg-simple_src_install + + java-pkg_sointo "/usr/$(get_libdir)/swt" + java-pkg_doso *.so +} diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest index aaf68f18ad4d..0c4ed92063e4 100644 --- a/dev-java/testng/Manifest +++ b/dev-java/testng/Manifest @@ -3,4 +3,3 @@ DIST groovy-all-2.4.7.jar 7015434 BLAKE2B 23d22ddd78229c485ed9384169acee15425864 DIST jquery-3.5.1.jar 313070 BLAKE2B 76abfbd21d83f72a3cfcb666f3a2fcfcf5975e723a462996bac9701caf6b59cb9998746af713ebb1f6bfe49cce91544216cc65dc6819e95e8a15930744685415 SHA512 9f560415b36875958ff1d3c6d37fa79d6d134c5f5fc7719dd21db36d1f24dec39787834b2a9ffb104ec6b56e725ccc524a8ff9b189ced3d68e24296b2daae720 DIST spock-core-1.0-groovy-2.4.jar 588030 BLAKE2B 68d8fad8b6ffb45a18778797ea23d4f3b09256bf4e9f207ee666d07572399cd13522e6f1590219a80e23f6906a2e9eaf1f22c6a3c01717e8c1e99b5d37b89210 SHA512 078c0b16688eaa3134043e58ed4273981797ea92f08723b5508c7d7e4f635278dd5ca731fb294da2a1f35674623d969ee423d4344c2c822e1d4cb8d4f3383790 DIST testng-6.11.tar.gz 677522 BLAKE2B 2e7bf30fcf805cce5a7ec42f22c39e9f4678642fcde9752c51d118e655189805661edeeff1a3db0e960c79e7542fe25ab8fa6995f142da12b3adc8753fd8a361 SHA512 996d7a18399e16626756b7a790182c7b6bf3453280209d0a09d4a509d698fcad1a80e58ec36702de95bd59c90c237463719ad44934c14390620fc9655d871252 -DIST testng-6.9.10.tar.gz 6271781 BLAKE2B 5b77f4b1d9bfdca6749a1d33f465a30bcd9ab9dd9fc37abf8148301c24d6bf287224d9886c0f681deac54e12f9460139ce2a2058b3d160c05cf8fcb9f7808373 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e diff --git a/dev-java/testng/testng-6.11.ebuild b/dev-java/testng/testng-6.11-r1.ebuild index 92baedcd8ee8..78aaa96fb37f 100644 --- a/dev-java/testng/testng-6.11.ebuild +++ b/dev-java/testng/testng-6.11-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 @@ -32,7 +32,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86" SLOT="0" CP_DEPEND=" - dev-java/ant-core:0 + >=dev-java/ant-1.10.14-r3:0 dev-java/bsh:0 dev-java/guice:4 dev-java/jcommander:1.64 diff --git a/dev-java/testng/testng-6.9.10-r1.ebuild b/dev-java/testng/testng-6.9.10-r1.ebuild deleted file mode 100644 index 46111b7f50e8..000000000000 --- a/dev-java/testng/testng-6.9.10-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features" -HOMEPAGE="https://testng.org/" -SRC_URI="https://github.com/testng-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" -SLOT="0" -IUSE="test" -RESTRICT="test" # Occasionally fail or run *REALLY* slowly. - -CDEPEND="dev-java/bsh:0 - dev-java/guice:4 - dev-java/junit:4 - dev-java/ant-core:0 - dev-java/snakeyaml:0 - dev-java/jcommander:0" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.8:* - test? ( dev-java/assertj-core:2 )" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" - -S="${WORKDIR}/${P}" -JAVA_SRC_DIR="src/main/java" -JAVA_GENTOO_CLASSPATH="ant-core,bsh,guice-4,jcommander,junit-4,snakeyaml" - -src_prepare() { - default - java-pkg_clean ! -path "./src/*" - - cp -v src/generated/java/org/testng/internal/VersionTemplateJava \ - src/main/java/org/testng/internal/Version.java || die -} - -src_compile() { - java-pkg-simple_src_compile - java-pkg_addres ${PN}.jar src/main/resources -} - -src_test() { - local DIR=src/test/java - local RES=src/test/resources - local CP=${PN}.jar:$(java-pkg_getjars --with-dependencies "${JAVA_GENTOO_CLASSPATH},assertj-core-2") - - ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java") - java -cp "${RES}:${DIR}:${CP}" -Dtest.resources.dir=${RES} org.testng.TestNG -listener test.invokedmethodlistener.MyListener src/test/resources/testng.xml || die -} - -src_install() { - java-pkg-simple_src_install - java-pkg_dolauncher ${PN} --main org.testng.TestNG - java-pkg_register-ant-task - - dodoc {ANNOUNCEMENT,CHANGES,TODO}.txt - - if use doc; then - docinto html - dodoc -r doc - fi -} diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest index cf8dae797115..4b202bf1b541 100644 --- a/dev-java/tomcat-native/Manifest +++ b/dev-java/tomcat-native/Manifest @@ -1,8 +1,8 @@ -DIST tomcat-native-1.2.38-src.tar.gz 439234 BLAKE2B 603a905db25b86792717023707598abb4da125ad16b7e69e4a48ec0eb9056bc0b566520d4df004566bbc15c8bcfe843992baebb6bd1c86b210ce9f0fc0733ca0 SHA512 973c0dc8d241827aa98f72026d4de67928344c221570abbb7f97380fe56a9ad602b159a5448c6048d88d73fa0ade8c1ab12df293fee513d0e4896847b16206e6 -DIST tomcat-native-1.2.38-src.tar.gz.asc 873 BLAKE2B 6b7ccf31b7b0b7ac9493c4751309c6b62c269332f5fd49a9df391846a140f2797e1587e3c644b4aa65fa6eef8dfea8fe19b7f5714ffb5ddcf836c601f281bc5b SHA512 b6a7c12ac7387c4ee17e5b5d50d588b16470874f70bcb49b96a25159bab8b51ff5a5dc7d33fa73c8eb33e673e2b947aad4b603b1e8755f7e186052763c2575f5 -DIST tomcat-native-1.2.39-src.tar.gz 438209 BLAKE2B 499e2221be7a3aac47950530b044242dd308e943cdffd4af29d35121b60bd9b7040a404e8a70320cc853d41e4a06b41cad66a87d665e3692791299a0f16658f4 SHA512 b90c72255406f48552025a2e78dbd8c30a3492be2c283875c86a0b4a0f1f71b0420d4f91fb5ba181ef29d528824b2d5dfc63f51ee68e8d04fe6e67bd89e397f7 -DIST tomcat-native-1.2.39-src.tar.gz.asc 873 BLAKE2B 59976744119c03771b597d3d4f5d84a5a9e5feb81c0efe351e827b5e06e84c8adde8407ef4d27ec3b201763806e74804a51e9a209641c127328d44b79e22351e SHA512 78144c9ce5d5acc9d051b6d41fff2016d37062a11011ecad8ba52569c910efe5bcd5f177e576601ab4e7f7e53ce9dfe54f6a2c42cb87651ca5c2fedcf284eb21 -DIST tomcat-native-2.0.5-src.tar.gz 539017 BLAKE2B 405a4064bcf49ee04a7670c516adc64b19ebebbbfdc50735952c057d36b475c785bd9976778f491796b3fce5bd5aa158199ec624f20e8adbc65f920974543533 SHA512 03ed1951597bb6a6ade8d715546a0d635d261381737abd27b63aa552c69f9ca49405d0252b6bc2d878bfd64e87439f146ecd84ccbfc82661ba16379c493615a4 -DIST tomcat-native-2.0.5-src.tar.gz.asc 873 BLAKE2B 2e043d011f482ab963088441a37d2cfddec973253f7c909a747afac71393b76bc2e33ff37e9a18e8f9b6caac8ba86ab3a076ea722577416e4b409d8e44d56e24 SHA512 22a87c14c31bc62383cfb227e8dbd106fe017f84d802ec0e4d22d48af6ad4dd0d020bc59bed3a8335e2b4b15e0fd44ec3a4062bf86c73bbf00151c4ff0d12d7c -DIST tomcat-native-2.0.6-src.tar.gz 539277 BLAKE2B 4a1ee7a87ff72b449a3638d38cdd40185e02ee09aa8ee9ea26ff6cfdc3f54b1e8aec6fb0296b51f8a72a72de7a9c504410d1df4d3547b709deebfb005ebbdd01 SHA512 d714fb96f880d0d565c58d25bb803fa9a144a6d87e825ad8d00aeac833b40a5512f888b94b3109853f8ee28b176b24fde95fb2d2a70ce65181a51ca7fc60cdab -DIST tomcat-native-2.0.6-src.tar.gz.asc 873 BLAKE2B f78fb9c67632fc6fd6768fb699fa4c875db0364537ef41f6aa8c099eb05260a43ed7e2dd7b0f501c6814aff3b7d0928f318473ba78bfac7bcac3092952c08edc SHA512 6601bb1f731ad3b8ef1dbd6d2522952223d794568d42cce363ed95e05e641b2c742ed696ce65d546fcb3d0f80b362befc9cdaa060d1bd77beb90749c3a417a08 +DIST tomcat-native-1.3.0-src.tar.gz 345276 BLAKE2B 73e8433e12bdd88036509f4ffbd2c0ed25b367567728829a56918d082627d43643865c492f4bc8eac4551e2ed82648ada71e6decfb45c173a856ab2fda6e01a5 SHA512 5a6c7337280774525c97e36e24d7d278ba15edd63c66cec1b3e5ecdc472f8d0535e31eac83cf0bdc68810eb779e2a118d6b4f6238b509f69a71d037c905fa433 +DIST tomcat-native-1.3.0-src.tar.gz.asc 833 BLAKE2B b7e05447643000ffda0d66143c199192b41843f10ae89874c353d613f612a6d481be3081aa971b640a3bedc6c903be7d052c418e2abc2d7d6db42924c7b3cf91 SHA512 9cfc137cd13086ccf421376a006164e6e6e14844636457db0cf7c0f699a1b1ceab28a52bd80da71dc9e190bdf84676abfdbe07a0cabecfc59b7845ac82a171e5 +DIST tomcat-native-1.3.1-src.tar.gz 346588 BLAKE2B 3b979845dd10a0c74c7ed2e6404b217c7bdebf2d432ac904b50f8288cd3cf3b1489b4e5111ce02eca442c45deb805523062862225130386a6d47853cd972d788 SHA512 06951c67d2739ab9205a537d24345e13e4472f192602fc52015ea84612c6e2c9334404b30a82be7d1e7d4ce470ea9df8b1b8ca1a3b8674d82706ff432280724f +DIST tomcat-native-1.3.1-src.tar.gz.asc 833 BLAKE2B d7483efea5dc4d9cc069a667896950526e22a6b4b0ee1fd6739754196d1b9e84a2b16f766f68419faf2c3fcc87d1fa83c9985de7149849d4f761d2c5b7e45af7 SHA512 3550e38556dab5594aea469cd8ae43505deceeab25bf60ecd61c26ed1106ce88e35634f936cb36e7fc766f30b5c5f0f19dd01a1513ed219ae7f68c8c10e960f1 +DIST tomcat-native-2.0.7-src.tar.gz 538131 BLAKE2B ef973c830e3e3e04f4bf7bd711915b1ac5f28e34832edd0750117a5d6b00f9a7fa9e390858d23bfaeeb08ad825d7dcc1e95967c00d4ada96cac83377fca7bea6 SHA512 625b334271494f7c86c06d6a8c6d13c06d9d6094f65cccbdc8d3df13ee2aae4cb42ad326e20bcbf8a8f141240111778991882f9bf87793b09a2920433d6c8c85 +DIST tomcat-native-2.0.7-src.tar.gz.asc 833 BLAKE2B 081f40de6fdc5ad819a167e0150a2e03ab8d4fd679be0dbabac9a9f2aabffd2fa36fd6a9c764deefd419576dcda07bc1b22ea2f14c04eddbfa7f94e4834bec7e SHA512 16a96a3c3b55d258ad0820c30392f37643f433c563b74a983109492569d06a399471acc42c7f07b87b50bff8711bc10ed278bfa183807bcdde1355e6b8058605 +DIST tomcat-native-2.0.8-src.tar.gz 471386 BLAKE2B 7fb5e3c4671e4b56bfa5eb546ac1f87fdf1e33b350533ffcadb9005c1f3054013d61d15f4212923d9ec9370d15fd2717e2b446c80818c82d83cd9f1497e321c4 SHA512 fd45533b9c34b008717d18ed49334c7286b93c849c487c1c42746f2998cc4a6ff0362e536a8b5124c6539847a92a9f7631c7638a21cd5d22134fe1a9bb0f0702 +DIST tomcat-native-2.0.8-src.tar.gz.asc 833 BLAKE2B b438034baf5191ce2af55087d1fcd55f196c3cfa75dc2c7fc9d1bfa8fa5b5289181dad6a02e55674e7d685482228df603478ba1f73a9b67169f50390cdd198a7 SHA512 64879cd6f02a6213a2b6cd102dc175d968a7c20bc821877e9f6f5bbaa11069e5cb672b584c47e3a7563a6c872d56646535a59e42331a2ad524c7f85e628085df diff --git a/dev-java/tomcat-native/files/tomcat-native-1.2.39-slibtool.patch b/dev-java/tomcat-native/files/tomcat-native-1.2.39-slibtool.patch new file mode 100644 index 000000000000..e193a0ffd905 --- /dev/null +++ b/dev-java/tomcat-native/files/tomcat-native-1.2.39-slibtool.patch @@ -0,0 +1,26 @@ +From 54dccd3a4dc01801d9311b3160808305ec9fc2cf Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Thu, 21 Jul 2022 17:59:14 -0700 +Subject: [PATCH] native: Fix the build with rlibtool + +When building tomcat-native with slibtool using the rlibtool symlink the +build will fail. This is because rlibtool requires the generated libtool +script to determine if the build is shared, static or both. + +Gentoo bug: https://bugs.gentoo.org/778914 +--- + native/configure.in | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/configure.in ++++ b/configure.in +@@ -50,6 +50,9 @@ AC_SUBST(TCN_CONFIG_LOCATION) + AC_CANONICAL_TARGET + AC_PROG_INSTALL + ++dnl Generate the libtool script which is needed for rlibtool ++LT_INIT ++ + dnl + dnl compute the top directory of the build + dnl note: this is needed for LIBTOOL and exporting the bundled Expat diff --git a/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild index 13489020d644..d560c27c933d 100644 --- a/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild +++ b/dev-java/tomcat-native/tomcat-native-1.3.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 @@ -6,13 +6,13 @@ EAPI=8 JAVA_PKG_IUSE="doc source test" JAVA_TESTING_FRAMEWORKS="junit-4" -inherit autotools java-pkg-2 java-pkg-simple verify-sig +inherit java-pkg-2 java-pkg-simple verify-sig DESCRIPTION="Allows Tomcat to use certain native resources for better performance" HOMEPAGE="https://tomcat.apache.org/native-doc/" SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz verify-sig? ( - https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc + https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz.asc )" S=${WORKDIR}/${P}-src/native @@ -38,8 +38,10 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_SRC_DIR="../test" DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} ) +PATCHES=( "${FILESDIR}/tomcat-native-1.2.39-slibtool.patch" ) src_prepare() { + default #780585 java-pkg-2_src_prepare mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \ diff --git a/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild index 171f99f2468b..f3d7eb0760fe 100644 --- a/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild +++ b/dev-java/tomcat-native/tomcat-native-1.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 @@ -12,13 +12,13 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc HOMEPAGE="https://tomcat.apache.org/native-doc/" SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz verify-sig? ( - https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc + https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz.asc )" S=${WORKDIR}/${P}-src/native -KEYWORDS="~amd64 ~x86" LICENSE="Apache-2.0" SLOT="0" +KEYWORDS="~amd64 ~x86" IUSE="static-libs" DEPEND=" @@ -38,8 +38,10 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_SRC_DIR="../test" DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} ) +PATCHES=( "${FILESDIR}/tomcat-native-1.2.39-slibtool.patch" ) src_prepare() { + default #780585 java-pkg-2_src_prepare mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \ diff --git a/dev-java/tomcat-native/tomcat-native-2.0.5.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild index 31e7d134cca8..9507ee4750e0 100644 --- a/dev-java/tomcat-native/tomcat-native-2.0.5.ebuild +++ b/dev-java/tomcat-native/tomcat-native-2.0.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 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 JAVA_PKG_IUSE="doc source test" JAVA_TESTING_FRAMEWORKS="junit-4" -inherit autotools java-pkg-2 java-pkg-simple verify-sig +inherit java-pkg-2 java-pkg-simple verify-sig DESCRIPTION="Allows Tomcat to use certain native resources for better performance" HOMEPAGE="https://tomcat.apache.org/native-doc/" diff --git a/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild index cdae6f3d9fd3..8bddbdc05820 100644 --- a/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild +++ b/dev-java/tomcat-native/tomcat-native-2.0.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,9 +16,9 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t )" S=${WORKDIR}/${P}-src/native -KEYWORDS="~amd64 ~x86" LICENSE="Apache-2.0" SLOT="2" +KEYWORDS="~amd64 ~x86" IUSE="static-libs" DEPEND=" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild index 4cddc788557a..d782f8ef763d 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild @@ -1,38 +1,35 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source" -inherit java-pkg-2 java-ant-2 +inherit java-pkg-2 java-pkg-simple MY_P="apache-${P/-servlet-api/}-src" DESCRIPTION="Tomcat's Servlet API 2.3/JSP API 1.2 implementation" HOMEPAGE="https://tomcat.apache.org/" SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-4/v${PV}/src/${MY_P}.tar.gz" -DEPEND=">=virtual/jdk-1.8" -RDEPEND=">=virtual/jre-1.8" + +S="${WORKDIR}/${MY_P}/servletapi" + LICENSE="Apache-2.0" SLOT="2.3" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="" -S="${WORKDIR}/${MY_P}/servletapi" -src_unpack() { - unpack ${A} - cd "${S}" - - einfo "Removing bundled jars and classes" - find "${WORKDIR}/${MY_P}" '(' -name '*.class' -o -name '*.jar' ')' -delete -} - -EANT_BUILD_TARGET="all" - -src_install() { - java-pkg_dojar dist/lib/servlet.jar +DEPEND=">=virtual/jdk-1.8" +RDEPEND=">=virtual/jre-1.8" - use doc && java-pkg_dohtml -r dist/docs/* - use source && java-pkg_dosrc src/share/javax - dodoc dist/README.txt +JAVA_RESOURCE_DIRS="res/src/share" +JAVA_SRC_DIR="src/share" + +src_prepare() { + java-pkg-2_src_prepare + mkdir src/share/javax/servlet/{,jsp/}resources || die + mv src/share/dtd/web-app* src/share/javax/servlet/resources || die + mv src/share/dtd/* src/share/javax/servlet/jsp/resources || die + mkdir res || die + find src -type f ! -name '*.java' ! -name '*.gif' \ + | xargs cp --parent -t res || die } diff --git a/dev-java/validation-api/Manifest b/dev-java/validation-api/Manifest deleted file mode 100644 index 30458ba26cd4..000000000000 --- a/dev-java/validation-api/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST validation-api-1.0.0.GA-sources.jar 65220 BLAKE2B cee01d9979671bc2d64a22f21d608d50ddf6eca730a7c0d1fee3c4c05fab0af200153a48491b8d54a5a29b84a220f841c85264446117e25e89bd306bdd764843 SHA512 88bcde2fc9446b09cb24e73137cd16ed54953a6d93f33e8500ca196e4cec07ac03ebc446f4629291e6437d2f3757802236e56974cd3023bb25886e69e2330fc0 -DIST validation-api-1.1.0.jar 94671 BLAKE2B c28f6b2ca52094f33e82d2e7c71e52ef57c503c5d50f34646ee28a9f61ea7e4da7f494f41b5f8a34ce6108ca1b75fa2d0f08eb9aab15cf033e825afc2eefdf19 SHA512 aa15184ff004357f1cdee693008587a3aa180a8f24392847258672c4a2e5a537cf189049ef95febb1a87968a42223f7736e22e00fe9307678c117f7ab6b944a8 diff --git a/dev-java/validation-api/validation-api-1.0.0-r1.ebuild b/dev-java/validation-api/validation-api-1.0.0-r1.ebuild deleted file mode 100644 index 316ac36886b4..000000000000 --- a/dev-java/validation-api/validation-api-1.0.0-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Bean Validation (JSR-303) API" -HOMEPAGE="https://beanvalidation.org/" -SRC_URI="https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/${PN}/${PV}.GA/${P}.GA-sources.jar" - -LICENSE="Apache-2.0" -SLOT="1.0" -KEYWORDS="~amd64 ~x86" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" -BDEPEND="app-arch/unzip" diff --git a/dev-java/validation-api/validation-api-1.1.0-r1.ebuild b/dev-java/validation-api/validation-api-1.1.0-r1.ebuild deleted file mode 100644 index 1f63794e937b..000000000000 --- a/dev-java/validation-api/validation-api-1.1.0-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Bean Validation (JSR-303) API" -HOMEPAGE="https://beanvalidation.org/" -SRC_URI="https://repo1.maven.org/maven2/javax/validation/${PN}/${PV}.Final/${P}.Final-sources.jar -> ${P}.jar" - -LICENSE="Apache-2.0" -SLOT="1.0" -KEYWORDS="amd64 x86" - -IUSE="" - -BDEPEND="app-arch/unzip" -RDEPEND=">=virtual/jre-1.8" -DEPEND=">=virtual/jdk-1.8" diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest index 7b243dc27a93..7920653cd469 100644 --- a/dev-java/velocity/Manifest +++ b/dev-java/velocity/Manifest @@ -1 +1 @@ -DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb +DIST velocity-2.3_p20240314.tar.gz 440967 BLAKE2B c5fcea7af49d6c46d5c0943efe82f3c04d921afc2c53201b97842ae71714e7035d075c147b3bea71e959db12dd970b7879ade73bbc23bab09a1fd262e21f2fc6 SHA512 9055e780d2a3c798bfe30e5c7859a7311c4984b551d7b2ffa68c57c076549326d0ddae31eabff8009ea021c749331d34c71eee8cab55599dea5f3c8dba841a02 diff --git a/dev-java/velocity/metadata.xml b/dev-java/velocity/metadata.xml index 6021501589e0..8e49c08df5a1 100644 --- a/dev-java/velocity/metadata.xml +++ b/dev-java/velocity/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> + <maintainer type="project"> + <email>java@gentoo.org</email> + <name>Java</name> + </maintainer> + <upstream> + <remote-id type="github">apache/velocity-engine</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild deleted file mode 100644 index 0a414c4fb11f..000000000000 --- a/dev-java/velocity/velocity-2.3.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/apache/velocity-engine/archive/refs/tags/2.3.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild velocity-2.3.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.velocity:velocity-engine-core:2.3" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Apache Velocity is a general purpose template engine" -HOMEPAGE="https://velocity.apache.org" -SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1 -# org.apache.commons:commons-lang3:3.11 -> >=dev-java/commons-lang-3.11:3.6 -# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0 - -CDEPEND=" - >=dev-java/commons-io-2.8.0:1 - >=dev-java/commons-lang-3.11:3.6 - >=dev-java/slf4j-api-1.7.30:0 -" - -# Compile dependencies -# POM: pom.xml -# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4 -# test? org.hsqldb:hsqldb:2.5.1 -> !!!groupId-not-found!!! -# test? org.slf4j:slf4j-simple:1.7.30 -> >=dev-java/slf4j-simple-1.7.30:0 - -DEPEND=" - >=virtual/jdk-1.8:* - ${CDEPEND} - test? ( - dev-db/hsqldb:0 - >=dev-java/slf4j-simple-1.7.30:0 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND} -" - -BDEPEND=" - dev-java/javacc:0 -" - -S="${WORKDIR}/${PN}-engine-${PV}/${PN}-engine-core" - -JAVA_GENTOO_CLASSPATH="commons-io-1,commons-lang-3.6,slf4j-api" -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS="src/main/resources" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" - -JAVA_TEST_EXCLUDES=( - # org.junit.runners.model.InvalidTestClassError: Invalid test class, No runnable methods - "org.apache.velocity.test.RenderVelocityTemplateTest" - "org.apache.velocity.test.provider.TestNumber" - "org.apache.velocity.test.provider.TestProvider" - "org.apache.velocity.test.sql.TestDataSource" - "org.apache.velocity.test.misc.TestContext" - - # java.lang.IllegalArgumentException: Test class can only have one constructor - "org.apache.velocity.test.misc.TestLogger" - - # junit.framework.AssertionFailedError: Class org.apache.velocity.test.sql.BaseSQLTest has no public constructor TestCase(String name) or TestCase() - "org.apache.velocity.test.sql.BaseSQLTest" - - # requires configured jdbc - # junit.framework.AssertionFailedError: Exception in constructor: testSimpleTemplate (java.lang.NullPointerException - # junit.framework.AssertionFailedError: Exception in constructor: testNullTimestamp (java.lang.NullPointerException - # junit.framework.AssertionFailedError: Exception in constructor: testMacroInvocation (java.lang.NullPointerException - # junit.framework.AssertionFailedError: Exception in constructor: testRenderTool (java.lang.NullPointerException - "org.apache.velocity.test.sql.DataSourceResourceLoaderTestCase" -) - -src_prepare() { - default - - cp -v "${JAVA_SRC_DIR}-templates/org/apache/velocity/runtime/VelocityEngineVersion.java" \ - "${JAVA_SRC_DIR}/org/apache/velocity/runtime/VelocityEngineVersion.java" || die - - sed -i "s/\${project.version}/${PV}/g" \ - "${JAVA_SRC_DIR}/org/apache/velocity/runtime/VelocityEngineVersion.java" || die - - # fix paths for tests - sed -i \ - -e "s%System.getProperty(\"test.compare.dir\")%\"${S}/target/test-classes\"%g" \ - -e "s%System.getProperty(\"test.result.dir\")%\"${S}/results\"%g" \ - "${JAVA_TEST_SRC_DIR}/org/apache/velocity/test/TemplateTestBase.java" || die - - sed -i \ - -e 's/\${parser.basename}/Standard/g' \ - -e 's/\${parser.package}/org.apache.velocity.runtime.parser/g' \ - -e 's/\${parser.char.asterisk}/\*/g' \ - -e 's/\${parser.char.at}/\@/g' \ - -e 's/\${parser.char.dollar}/\$/g' \ - -e 's/\${parser.char.hash}/\#/g' \ - "${S}/src/main/parser/Parser.jjt" || die - - # File "StandardParserTreeConstants.java" does not exist. Will create one. - # File "StandardParserVisitor.java" does not exist. Will create one. - # File "JJTStandardParserState.java" does not exist. Will create one. - jjtree -GRAMMAR_ENCODING=UTF-8 \ - -JDK_VERSION=1.8 \ - -BUILD_NODE_FILES=false \ - -MULTI=true \ - -NODE_PACKAGE=org.apache.velocity.runtime.parser.node \ - -NODE_USES_PARSER=true \ - -STATIC=false \ - -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node" \ - "${S}/src/main/parser/Parser.jjt" \ - || die "Code generation via jjtree failed" - - javacc -GRAMMAR_ENCODING=UTF-8 \ - -JDK_VERSION=1.8 \ - -STATIC=false \ - -DEBUG_PARSER=false \ - -DEBUG_LOOKAHEAD=false \ - -DEBUG_TOKEN_MANAGER=false \ - -BUILD_PARSER=true \ - -TOKEN_MANAGER_USES_PARSER=true \ - -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}" \ - "${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node/Parser.jj" \ - || die "Parser.java code generation via javacc failed" - - # Avoid "error: duplicate class: org.apache.velocity.runtime.parser...." - rm -v "${JAVA_SRC_DIR}/CharStream.java" || die "cannot remove 'CharStream.java'" - rm -v "${JAVA_SRC_DIR}/ParseException.java" || die "cannot remove 'ParseException.java'" -} diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild new file mode 100644 index 000000000000..948e71a0394d --- /dev/null +++ b/dev-java/velocity/velocity-2.3_p20240314.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.apache.velocity:velocity-engine-core:2.3" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Apache Velocity is a general purpose template engine" +HOMEPAGE="https://velocity.apache.org" +MY_COMMIT="86cfcf41105f8a25db11ca6483e33c20fc0804d9" +SRC_URI="https://github.com/apache/${PN}-engine/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-engine-${MY_COMMIT}/${PN}-engine-core" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +CP_DEPEND=" + >=dev-java/commons-io-2.8.0:1 + >=dev-java/commons-lang-3.11:3.6 + >=dev-java/slf4j-api-1.7.30:0 +" +DEPEND=" + >=virtual/jdk-1.8:* + ${CP_DEPEND} + test? ( + dev-db/hsqldb:0 + >=dev-java/slf4j-simple-1.7.30:0 + ) +" +RDEPEND=" + >=virtual/jre-1.8:* + ${CP_DEPEND} +" +JAVACC_SLOT="7.0.13" +BDEPEND="dev-java/javacc:${JAVACC_SLOT}" + +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_EXTRA_ARGS="-Dtest.compare.dir=target/test-classes -Dtest.result.dir=results" +JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + java-pkg-2_src_prepare + + sed -e "s/\${project.version}/${PV}/" \ + src/main/java-templates/org/apache/velocity/runtime/VelocityEngineVersion.java > \ + src/main/java/org/apache/velocity/runtime/VelocityEngineVersion.java || die + + sed -i \ + -e 's/\${parser.basename}/Standard/g' \ + -e 's/\${parser.package}/org.apache.velocity.runtime.parser/g' \ + -e 's/\${parser.char.asterisk}/\*/g' \ + -e 's/\${parser.char.at}/\@/g' \ + -e 's/\${parser.char.dollar}/\$/g' \ + -e 's/\${parser.char.hash}/\#/g' \ + "${S}/src/main/parser/Parser.jjt" || die + + # File "StandardParserTreeConstants.java" does not exist. Will create one. + # File "StandardParserVisitor.java" does not exist. Will create one. + # File "JJTStandardParserState.java" does not exist. Will create one. + "jjtree-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \ + -JDK_VERSION=1.8 \ + -BUILD_NODE_FILES=false \ + -MULTI=true \ + -NODE_PACKAGE=org.apache.velocity.runtime.parser.node \ + -NODE_USES_PARSER=true \ + -STATIC=false \ + -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node" \ + "${S}/src/main/parser/Parser.jjt" \ + || die "Code generation via jjtree failed" + + "javacc-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \ + -JDK_VERSION=1.8 \ + -STATIC=false \ + -DEBUG_PARSER=false \ + -DEBUG_LOOKAHEAD=false \ + -DEBUG_TOKEN_MANAGER=false \ + -BUILD_PARSER=true \ + -TOKEN_MANAGER_USES_PARSER=true \ + -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}" \ + "${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node/Parser.jj" \ + || die "Parser.java code generation via javacc failed" + + # Avoid "error: duplicate class: org.apache.velocity.runtime.parser...." + rm -v "${JAVA_SRC_DIR}/CharStream.java" || die "cannot remove 'CharStream.java'" + rm -v "${JAVA_SRC_DIR}/ParseException.java" || die "cannot remove 'ParseException.java'" +} + +src_test() { + pushd src/test/java || die + # DataSourceResourceLoaderTestCase.java requires configured jdbc + local JAVA_TEST_RUN_ONLY=$(find * \ + -name "*TestCase.java" \ + ! -name "BaseTestCase.java" \ + ! -name "DataSourceResourceLoaderTestCase.java" \ + ) + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + popd + java-pkg-simple_src_test +} diff --git a/dev-java/waffle-jna/Manifest b/dev-java/waffle-jna/Manifest new file mode 100644 index 000000000000..de2a4d7a3e97 --- /dev/null +++ b/dev-java/waffle-jna/Manifest @@ -0,0 +1 @@ +DIST waffle-parent-3.3.0.tar.gz 2147273 BLAKE2B a4f9c06898c50616013870bb383632d0b97e4f527da9b7b1acad9945f275181844d94b6533891a371f588115f60efdf791d5f64e03f938950a8dd48415f1f56f SHA512 e09154761dc5902e97b9dc57c9523bffe401fce33797346bbd5595390db3adaf5eed27d2ac7f98b7504aeb471c5f1a0c0a5104bd819a937e15c67123ecdd5891 diff --git a/dev-java/waffle-jna/metadata.xml b/dev-java/waffle-jna/metadata.xml new file mode 100644 index 000000000000..a9d1f1367512 --- /dev/null +++ b/dev-java/waffle-jna/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">Waffle/waffle</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild b/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild new file mode 100644 index 000000000000..7d9114ca8512 --- /dev/null +++ b/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.github.waffle:waffle-jna:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Enable drop-in Windows Single Sign On for popular Java web servers" +HOMEPAGE="https://waffle.github.io/waffle/" +SRC_URI="https://github.com/Waffle/waffle/archive/waffle-parent-${PV}.tar.gz" +S="${WORKDIR}/waffle-waffle-parent-${PV}/Source/JNA/waffle-jna" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ppc64 x86" +RESTRICT="test" #839681 + +DEPEND=" + dev-java/caffeine:0 + dev-java/checker-framework-qual:0 + dev-java/jakarta-servlet-api:4 + dev-java/jna:4 + dev-java/slf4j-api:0 + >=virtual/jdk-1.8:* + test? ( dev-java/junit:5 ) +" +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="waffle.jna" +JAVA_CLASSPATH_EXTRA=" + caffeine + checker-framework-qual + jakarta-servlet-api-4 + jna-4 + slf4j-api +" +JAVA_RESOURCE_DIR="src/main/resources" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH=" + assertj-core-3 + junit-5 +" +JAVA_TEST_SRC_DIR="src/test/java" diff --git a/dev-java/woodstox-core/woodstox-core-6.4.0.ebuild b/dev-java/woodstox-core/woodstox-core-6.4.0-r1.ebuild index e3ac3d714258..f709dc1853a1 100644 --- a/dev-java/woodstox-core/woodstox-core-6.4.0.ebuild +++ b/dev-java/woodstox-core/woodstox-core-6.4.0-r1.ebuild @@ -43,7 +43,7 @@ CP_DEPEND=" DEPEND="${CP_DEPEND} >=virtual/jdk-11:* - dev-java/aqute-bnd-annotation:0 + dev-java/bnd-annotation:0 dev-java/osgi-core:0" RDEPEND="${CP_DEPEND} @@ -53,7 +53,7 @@ DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION} ) S="${WORKDIR}/woodstox-${P}" -JAVA_CLASSPATH_EXTRA="aqute-bnd-annotation,osgi-core" +JAVA_CLASSPATH_EXTRA="bnd-annotation,osgi-core" JAVA_SRC_DIR=( "src/main/java" "src/moditect" ) JAVA_RESOURCE_DIRS="src/main/resources" diff --git a/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild index bcb97bf3f850..d3a6b474d0af 100644 --- a/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild +++ b/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Web Services Description Language for Java Toolkit (WSDL4J)" HOMEPAGE="https://wsdl4j.sourceforge.net" TCK_V="1.2" -SRC_URI="mirror://sourceforge/project/wsdl4j/WSDL4J/${PV}/wsdl4j-src-${PV}.zip" +SRC_URI="https://downloads.sourceforge.net/project/wsdl4j/WSDL4J/${PV}/wsdl4j-src-${PV}.zip" LICENSE="CPL-1.0" SLOT="0" diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild index ac8cfa2b4bc9..d3a34a76b1ca 100644 --- a/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild +++ b/dev-java/xalan-serializer/xalan-serializer-2.7.3-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 @@ 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" +DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xalan-j )" diff --git a/dev-java/xalan/xalan-2.7.3.ebuild b/dev-java/xalan/xalan-2.7.3-r1.ebuild index 523e44d542b7..c49a110bfdde 100644 --- a/dev-java/xalan/xalan-2.7.3.ebuild +++ b/dev-java/xalan/xalan-2.7.3-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 @@ -27,7 +27,7 @@ CP_DEPEND=" " DEPEND="${CP_DEPEND} - virtual/jdk:1.8" + >=virtual/jdk-1.8:*" RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" diff --git a/dev-java/xerces/xerces-2.12.2-r1.ebuild b/dev-java/xerces/xerces-2.12.2-r2.ebuild index c74ab4cdedaa..6aed07e1a9e0 100644 --- a/dev-java/xerces/xerces-2.12.2-r1.ebuild +++ b/dev-java/xerces/xerces-2.12.2-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 @@ -21,16 +21,9 @@ CP_DEPEND=" dev-java/xml-commons-external:1.4 dev-java/xml-commons-resolver:0" -# JDK 11+ already privides the following file and the compilation -# fails if xerces provides it too. On contrary, compilation on 1.8 -# fails if we don't provide the file because it's not part of 1.8. -# By restricting compilation to 1.8 and providing the file we build -# a jar that should work both on 1.8 and also on the newer versions -# of JDK. -# the file: "org/w3c/dom/html/HTMLDOMImplementation.class" DEPEND=" ${CP_DEPEND} - virtual/jdk:1.8" + >=virtual/jdk-1.8:*" RDEPEND=" ${CP_DEPEND} @@ -44,6 +37,7 @@ HTML_DOCS=( {LICENSE.DOM-documentation,LICENSE.DOM-software,LICENSE-SAX,Readme}. S="${WORKDIR}/${P//./_}" +JAVADOC_ARGS="-source 8" #922332 JAVA_SRC_DIR="src" JAVA_RESOURCE_DIRS="resources" diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest index 012eebd4866a..2abe373cdc3b 100644 --- a/dev-java/xmlgraphics-commons/Manifest +++ b/dev-java/xmlgraphics-commons/Manifest @@ -1,4 +1,2 @@ -DIST xmlgraphics-commons-2.8-src.tar.gz 2243271 BLAKE2B 86456adf4b9610e580b3b4f87c362dc1259c2f2bb4d4abb0dc3d765ee2cc5fb3df54597f5a5fa620a813dee83cd7549771d2b4116d20077103e389f1942903a0 SHA512 3e6c397a7444c4ce1d1aeda96a7c9abfd3d8d57a0997d7d6ae2be36303dd17550b7b92fd86eac832566bbeefccdd06619e31c0d907cd6b953a8eb934d7fa618b -DIST xmlgraphics-commons-2.8-src.tar.gz.asc 833 BLAKE2B d68b6fe36b44764c44b67baca02a50f01644aaf2e8ed6571caeffd7724b6284860bd81d5a2ddcbefde6411bd5c9ed072f853cd178f862541f9f49aea3e023e21 SHA512 6e17a628ddd253c44d62a7f08d615f5a484bb6433482e6e217e794620396150b327f2e89836f62aafde3050ac0677432e0b12b645c57ae74cc11e093d86ac43c DIST xmlgraphics-commons-2.9-src.tar.gz 2236891 BLAKE2B 5071418eb2773ade7d48faa00a45834ee392603adb7844ce7b7ffc6ab41f0d655ce29265fc56326093b06b7e2cb1b1f4b95ab5e0f339c05cca4e0eb71d59f368 SHA512 896a5fe41277783021075df0de1aa109a7f05416af6b0141301a2452197d85df0daef28f5c2a71802644cbff3bfe79579a1544000a4c1b5cec4c211d8effd521 DIST xmlgraphics-commons-2.9-src.tar.gz.asc 833 BLAKE2B e85533d2509dc49f42346e373a416c8215600ff84a393ca6de545fce6e73d704a8146a257522e66a254248ebdbc6770e0040658223582184e0d8fd71f95bd941 SHA512 e52f02efba535192455b47a4adbb903426e51163083297eb7be83146e2c7ead913f4c0a51345681123afa64fbb3bffcea982a81fd2b92be2aa4c135082ed8e17 diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild deleted file mode 100644 index 9ff492354a4c..000000000000 --- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild +++ /dev/null @@ -1,72 +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/xmlgraphics/commons/source/2.8-src.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmlgraphics-commons-2.8.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.xmlgraphics:xmlgraphics-commons:2.8" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple verify-sig - -DESCRIPTION="XML Graphics Commons" -HOMEPAGE="https://xmlgraphics.apache.org/commons/" -SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz - verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-${PV}-src.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="amd64 arm64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1 -# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 - -CP_DEPEND=" - dev-java/commons-io:1 - dev-java/commons-logging:0 -" - -# Compile dependencies -# POM: pom.xml -# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4 -# test? org.mockito:mockito-core:2.28.2 -> >=dev-java/mockito-4.8.0:4 -# test? xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0 - -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8:* - test? ( - dev-java/mockito:4 - dev-java/xml-commons-resolver:0 - )" - -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" - -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-commons )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-commons.apache.org.asc" - -DOCS=( NOTICE README ) - -S="${WORKDIR}/${P}" - -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_EXTRA_ARGS=( -ea ) -JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4,xml-commons-resolver" -# Some *.{png,tiff,txt,xmp} are misplaced in "src/main/java". -JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "src/test/java" ) -JAVA_TEST_SRC_DIR="src/test/java" - -src_test() { - local vm_version="$(java-config -g PROVIDES_VERSION)" - if ver_test "${vm_version}" -ge 11; then - JAVA_TEST_EXCLUDES="org.apache.xmlgraphics.image.loader.CorruptImagesTestCase" - fi - java-pkg-simple_src_test -} diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild index a64ec681a815..2c0a190b489a 100644 --- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild +++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="~amd64 arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ppc64 x86" CP_DEPEND=" dev-java/commons-io:1 diff --git a/dev-java/xmlunit/xmlunit-1.6-r1.ebuild b/dev-java/xmlunit/xmlunit-1.6-r1.ebuild deleted file mode 100644 index 5f464a7ad02a..000000000000 --- a/dev-java/xmlunit/xmlunit-1.6-r1.ebuild +++ /dev/null @@ -1,56 +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="xmlunit:xmlunit:1.6" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="XMLUnit extends JUnit and NUnit to enable unit testing of XML" -HOMEPAGE="https://sourceforge.net/projects/xmlunit/ https://www.xmlunit.org" -SRC_URI="mirror://sourceforge/project/xmlunit/xmlunit%20for%20Java/XMLUnit%20for%20Java%20${PV}/${P}-src.zip" - -LICENSE="BSD" -SLOT="1" -KEYWORDS="amd64 ~arm64 ppc64 x86" - -CDEPEND="dev-java/junit:0" - -DEPEND=">=virtual/jdk-1.8:* - app-arch/unzip:0 - doc? ( app-text/docbook-xsl-stylesheets:0 ) - test? ( - dev-java/ant-junit:0 - dev-java/ant-core:0 - ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.8:* - ${CDEPEND}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="junit" - -EANT_DOC_TARGET="users-guide-html javadocs" -EANT_ANT_TASKS="ant-core" -EANT_EXTRA_ARGS="-Ddb5.xsl=/usr/share/sgml/docbook/xsl-stylesheets" - -src_test() { - ANT_TASKS="ant-junit ant-core" eant test -} - -src_install() { - java-pkg_newjar "build/lib/${P}.jar" - - dodoc README.txt - - if use doc; then - java-pkg_dojavadoc build/doc/api - docinto html - dodoc -r build/doc/userguide/html/ - fi - - use source && java-pkg_dosrc src/java/org -} diff --git a/dev-java/xmlunit/xmlunit-1.6-r2.ebuild b/dev-java/xmlunit/xmlunit-1.6-r2.ebuild new file mode 100644 index 000000000000..d94ddaaab432 --- /dev/null +++ b/dev-java/xmlunit/xmlunit-1.6-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="xmlunit:xmlunit:1.6" +JAVA_TESTING_FRAMEWORKS="junit" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="XMLUnit extends JUnit and NUnit to enable unit testing of XML" +HOMEPAGE="https://sourceforge.net/projects/xmlunit/ https://www.xmlunit.org" +SRC_URI="https://downloads.sourceforge.net/project/xmlunit/xmlunit%20for%20Java/XMLUnit%20for%20Java%20${PV}/${P}-src.zip" +S="${WORKDIR}/${P}" + +LICENSE="BSD" +SLOT="1" +KEYWORDS="amd64 ~arm64 ppc64 x86" + +BDEPEND="app-arch/unzip" +CP_DEPEND="dev-java/junit:0" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + doc? ( app-text/docbook-xsl-stylesheets:0 ) + test? ( >=dev-java/ant-1.10.14:0[junit] ) +" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +JAVA_SRC_DIR="src/java" +JAVA_TEST_EXTRA_ARGS=( -Dbasedir="." ) +JAVA_TEST_RESOURCE_DIRS="tests/etc" +JAVA_TEST_SRC_DIR="tests/java" + +src_install() { + java-pkg-simple_src_install + if use doc; then + docinto html + dodoc -r userguide + fi +} diff --git a/dev-java/xpp2/xpp2-2.1.10-r3.ebuild b/dev-java/xpp2/xpp2-2.1.10-r3.ebuild deleted file mode 100644 index c4b5aaa7a88b..000000000000 --- a/dev-java/xpp2/xpp2-2.1.10-r3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="pull-parser:pull-parser:2" - -inherit java-pkg-2 java-ant-2 - -MY_PN="PullParser" -MY_P="${MY_PN}${PV}" - -DESCRIPTION="A streaming pull XML parser used to quickly process input elements" -HOMEPAGE="https://web.archive.org/web/20130904163229/http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/" -SRC_URI="https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/${MY_P}.tgz" - -LICENSE="Apache-1.1 IBM" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="test" - -# Some failures, partly because we haven't patched Xerces but probably -# also because this software is ancient. :( -RESTRICT="test" - -CDEPEND="dev-java/xerces:2" -DEPEND=">=virtual/jdk-1.8:* - test? ( dev-java/junit:4 ) - ${CDEPEND}" -RDEPEND=">=virtual/jre-1.8:* - ${CDEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${P}-fix-java5+.patch" -) - -EANT_GENTOO_CLASSPATH="xerces-2" -EANT_EXTRA_ARGS="-Dx2_present=true -Djunit.present=true" -EANT_BUILD_TARGET="intf intf_jar impl x2impl" -EANT_DOC_TARGET="api" -EANT_TEST_TARGET="junit" - -src_prepare() { - default - - rm -r build/ lib/ || die - - # Our usual rewriting stomps over the existing classpath, which - # isn't helpful here. - sed -i -r \ - -e 's/\bclasspath="/\0${gentoo.classpath}:/g' \ - -e 's/\$\{java\.class\.path\}/${gentoo.classpath}/g' \ - build.xml || die -} - -src_install() { - local suffix - - for suffix in "" -intf -standard -x2; do - java-pkg_newjar build/lib/${MY_PN}${suffix}-${PV}.jar ${MY_PN}${suffix}.jar - done - - dodoc README.html - use doc && java-pkg_dojavadoc doc/api - use source && java-pkg_dosrc $(find src/java -name org -o -name javax) -} - -src_test() { - java-pkg-2_src_test -} diff --git a/dev-java/xpp2/xpp2-2.1.10-r4.ebuild b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild new file mode 100644 index 000000000000..cc77774f1703 --- /dev/null +++ b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="pull-parser:pull-parser:2" + +inherit java-pkg-2 java-pkg-simple + +MY_PN="PullParser" +MY_P="${MY_PN}${PV}" + +DESCRIPTION="A streaming pull XML parser used to quickly process input elements" +HOMEPAGE="https://web.archive.org/web/20130904163229/http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/" +SRC_URI="https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/${MY_P}.tgz" +S="${WORKDIR}/${MY_P}" + +LICENSE="Apache-1.1 IBM" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +# Some failures, partly because we haven't patched Xerces but probably +# also because this software is ancient. :( +RESTRICT="test" + +CP_DEPEND="dev-java/xerces:2" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + test? ( dev-java/junit:4 )" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +PATCHES=( "${FILESDIR}/${P}-fix-java5+.patch" ) + +JAVADOC_ARGS="-source 8" +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR="src/java" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean + mkdir res || die + cp -r src/java/impl/factory/META-INF res || die + touch "res/PullParser${PV}_VERSION" || die + + mv src/{java/,}tests || die + mv src/{java/,}samples || die +} + +src_compile() { + java-pkg-simple_src_compile + rm xpp2.jar || die + JAVA_JAR_FILENAME="PullParser.jar" + + cp -r target/classes parser || die + rm -r parser/org/gjt/xpp/x2impl || die + rm parser/org/gjt/xpp/impl/PullParserFactorySmallImpl.class || die + jar cvf PullParser.jar -C parser . || die + + cp -r target/classes standard || die + rm -r standard/{javax,org/xml} || die + rm -r standard/org/gjt/xpp/{jaxp11,sax2,x2impl} || die + rm standard/org/gjt/xpp/impl/PullParserFactorySmallImpl.class || die + jar cvf PullParser-standard.jar -C standard . || die + + cp -r target/classes intf || die + rm -r intf/{javax,org/xml,org/gjt/xpp/{impl,jaxp11,sax2,x2impl}} || die + rm -r intf/META-INF || die + jar cvf PullParser-intf.jar -C intf . || die + + cp -r target/classes x2 || die + rm -r x2/org/gjt/xpp/impl/{pullparser,tokenizer} || die + rm x2/org/gjt/xpp/impl/PullParserFactory* || die + jar cvf PullParser-x2.jar -C x2 . || die +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dojar PullParser-{standard,intf,x2}.jar +} diff --git a/dev-java/xz-java/metadata.xml b/dev-java/xz-java/metadata.xml index 4221e170cbc0..312995bd9c40 100644 --- a/dev-java/xz-java/metadata.xml +++ b/dev-java/xz-java/metadata.xml @@ -5,4 +5,7 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> + <upstream> + <remote-id type="github">tukaani-project/xz-java</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/xz-java/xz-java-1.9-r1.ebuild b/dev-java/xz-java/xz-java-1.9-r2.ebuild index 0b7ed480b07a..8d285914f327 100644 --- a/dev-java/xz-java/xz-java-1.9-r1.ebuild +++ b/dev-java/xz-java/xz-java-1.9-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -DEPEND=">=virtual/jdk-1.8:*" +DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" BDEPEND=" @@ -28,10 +28,15 @@ BDEPEND=" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lassecollin.asc" -JAVA_SRC_DIR="src/org" +JAVA_SRC_DIR="src9" DOCS=( README NEWS COPYING THANKS ) +src_prepare() { + java-pkg-2_src_prepare + mv src{,9}/org || die +} + src_install() { java-pkg-simple_src_install use examples && java-pkg_doexamples src/*Demo.java |