From 8e3f5a0e42ba2822463660764321da4ed3b52ef9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 3 Oct 2023 11:48:34 +0100 Subject: gentoo auto-resync : 03:10:2023 - 11:48:34 --- dev-java/Manifest.gz | Bin 58122 -> 58121 bytes dev-java/javax-mail/Manifest | 4 +- dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild | 34 +++------ dev-java/javax-mail/metadata.xml | 3 + dev-java/tomcat-native/Manifest | 6 ++ dev-java/tomcat-native/tomcat-native-1.2.39.ebuild | 84 +++++++++++++++++++++ dev-java/tomcat-native/tomcat-native-2.0.6.ebuild | 79 +++++++++++++++++++ 7 files changed, 184 insertions(+), 26 deletions(-) create mode 100644 dev-java/tomcat-native/tomcat-native-1.2.39.ebuild create mode 100644 dev-java/tomcat-native/tomcat-native-2.0.6.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 811587ec5225..d0cd7badedb3 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/javax-mail/Manifest b/dev-java/javax-mail/Manifest index 01e94a8f5e42..a92f995097f4 100644 --- a/dev-java/javax-mail/Manifest +++ b/dev-java/javax-mail/Manifest @@ -1,3 +1,3 @@ DIST javax-mail-1.6.7.tar.gz 1854297 BLAKE2B 70dac40cdf67c413db3370f9cdf5b9786fcebce4ba12725758bf6120a2b6874e079a5beef08ee1190e30bfe2f14ad21e73ef1710c982e3f658a2f2f11e524f2e SHA512 9e8754839efb43d14ade6189428c4b86f5fc180e2e18b4e121a9463aaa52c34a431dbf05a6264ef8221faf0b09cc08f914ff758cbb3931df97cea1a897c54c08 -EBUILD javax-mail-1.6.7-r1.ebuild 2047 BLAKE2B 4187a02c47c7c7310d7d32a46dfe53b4bd52aa454f78040240bfe838f51d59ca33e94d2ed54920935bac6fe7ffa871eae1269bc04b01e68fd28789d2825297f7 SHA512 7139bc9cb731bada24a6e9cc1d694282fb5df50847c3820acafc7c0fe89b81ec76b5ce88f9c1052a5f9b824adcb6648dc6935d2d2a44aab2a585a3729771b761 -MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6 +EBUILD javax-mail-1.6.7-r1.ebuild 1571 BLAKE2B 416b7ce3d3f0fc9ab40f96e67d07af38f5f9491c761ee4724cf2fc684c3b0b1275112823971427db1a827c57e04af90e2fa563d62013eee13e01c0c1f6014e92 SHA512 94ee70a94a3913e154684fbd4b48133060698d2a37538655456f79e78d4fbc1efadc8399a68ecb313d271f6a5dd140e92f9ba9f2db1e80760adc920ce248226f +MISC metadata.xml 300 BLAKE2B 59a5cc3d098097693ee38e1552293270505f8d82025e096a6d1c331045451d5782ccc8819a2034a88a89f4490318becb96f10186766db32afad98c1546c956dc SHA512 2d1560717ededf180302c9348d112971e6d24c8745aae17f1ec59c3676ae41bb7fe396bbb57f5c88ef52bd0f7e161aefc22b9d2d5fd006ffc9873dbf42cb2df5 diff --git a/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild b/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild index c72608beb918..cb0feeaf01ef 100644 --- a/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild +++ b/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild @@ -1,9 +1,6 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom mail/pom.xml --download-uri https://github.com/eclipse-ee4j/mail/archive/refs/tags/1.6.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javax-mail-1.6.7.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" @@ -13,19 +10,16 @@ JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Jakarta Mail API" -HOMEPAGE="https://eclipse-ee4j.github.io/mail/" -SRC_URI="https://github.com/eclipse-ee4j/mail/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://jakartaee.github.io/mail-api/" +SRC_URI="https://github.com/jakartaee/mail-api/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/mail-${PV}/mail" LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -# Common dependencies -# POM: mail/pom.xml -# com.sun.activation:jakarta.activation:1.2.1 -> >=dev-java/jakarta-activation-1.2.2:1 - CDEPEND=" - >=dev-java/jakarta-activation-1.2.2:1 + dev-java/jakarta-activation:1 " DEPEND=" @@ -37,25 +31,22 @@ RDEPEND=" >=virtual/jre-1.8:* ${CDEPEND}" -DOCS=( ../{LICENSE,NOTICE,README}.md ) - -S="${WORKDIR}/mail-${PV}/mail" +DOCS=( ../{NOTICE,README}.md ) src_prepare() { - default + java-pkg-2_src_prepare mv src/main/{resources,java}/javax/mail/Version.java || die } JAVA_ENCODING="iso-8859-1" - JAVA_GENTOO_CLASSPATH="jakarta-activation-1" -JAVA_SRC_DIR="src/main/java" JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_EXTRA_ARGS=( -ea ) JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_EXTRA_ARGS=( -ea ) +JAVA_TEST_SRC_DIR="src/test/java" src_test() { pushd src/test/java || die @@ -72,8 +63,3 @@ src_test() { java-pkg-simple_src_test } - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/javax-mail/metadata.xml b/dev-java/javax-mail/metadata.xml index 75321cfb5598..53eb0003d9ca 100644 --- a/dev-java/javax-mail/metadata.xml +++ b/dev-java/javax-mail/metadata.xml @@ -4,4 +4,7 @@ java@gentoo.org + + jakartaee/mail-api + diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest index e67e6a96386e..32706ac6465b 100644 --- a/dev-java/tomcat-native/Manifest +++ b/dev-java/tomcat-native/Manifest @@ -1,7 +1,13 @@ 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 EBUILD tomcat-native-1.2.38.ebuild 2164 BLAKE2B 2efd68a9c1c26688744b26f5f6cf2791e1c2782d4625899dd49e132eb61c242dd942179e26b69d5a33934a0b06567ec0804b9cee17c93393820aa303e3dac3e5 SHA512 684f2fdf65429c7d990188a64aba88a5c8bdfe3a6065920ec115aa8f3684a87f92cd71c519d6ebfd6d871afc24cde405644547230768b6d72015417a95574e54 +EBUILD tomcat-native-1.2.39.ebuild 2155 BLAKE2B 47ec6a5ff680e904eb8e3f9a34288444f7ebfd2e0a783906e78741d82b7891ccf3f38c9a5367772370f8d1f2e52b55e3cbc03ab9e5f581c9aec9f74bc5eee60a SHA512 e3b46a89951ed9cfa5fe4fb432b4ea8bebb49996d90fa291fb569021e8c4c347fcfd369354e63c04063ce212f358cbda36172a578882b9c015394f296be343da EBUILD tomcat-native-2.0.5.ebuild 1982 BLAKE2B 068abb8ad2d7b087d19cb4efb9532689254513947ca34a26c24245c5d49fabc5d688c6ba5a08080f4591864520988ad9372867625e27a741bc48a01f4e6b316f SHA512 42de7c04a707295abe901edd0be127ad937636f8f10baaedfc6db605d1599691b9b98b17117c0739364199d2e2af72d8c145c44d28009b42560a89dd16b06d25 +EBUILD tomcat-native-2.0.6.ebuild 1973 BLAKE2B dd14cc057e7d19fd4b2555317faecb36b8d5242e99abef356f8aa6b6cae38ba07b3ef33563a0723f0d4a024c05fb9c7cbd1292da256d0634fd1c83eb1313e0c9 SHA512 0100997c6db1d4eece3986fc8d50e501b8f3f732c2a125d30dc3b11600ca4a442d35f8d0ef64cc8c8da1db694fba8420fa8ac26dc2d79d6cc5f1738ff82bc23a MISC metadata.xml 1096 BLAKE2B cc5973c26004db986d1cd7020212163380883cb3b01ed08b518d87abaf43a1e875de226064a123b9a5792e0e2285e70eeb50234654049ad22d906c4c5c454928 SHA512 f19053a4c75f84fa8491aee4f74d7334e369bb38125c69f6c839d37cc3b6c90ce348039845a3635d0b637b50c379efaee22dd811c46c49645fc6f8192e7a01cc diff --git a/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild new file mode 100644 index 000000000000..d742adac3b66 --- /dev/null +++ b/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2023 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 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 + )" +S=${WORKDIR}/${P}-src/native + +KEYWORDS="~amd64 ~x86" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="static-libs" + +DEPEND=" + >=virtual/jdk-1.8:* +" +RDEPEND=" + dev-libs/apr:1= + dev-libs/openssl:0/3 + >=virtual/jre-1.8:* +" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc" + +JAVA_RESOURCE_DIRS="../resources" +JAVA_SRC_DIR="../java" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="../test" + +DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} ) + +src_prepare() { + java-pkg-2_src_prepare + mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die + sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \ + ../build.xml \ + | sed "s:\${version}:${PV}:" \ + > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die +} + +src_configure() { + local myeconfargs=( + --with-apr="${EPREFIX}"/usr/bin/apr-1-config + --with-ssl="${EPREFIX}"/usr + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + java-pkg-simple_src_compile + default +} + +src_test() { + # Adjusting "String testFile =" path in TestFile.java:29 to match ${S} + sed \ + -e '/String testFile =/s&test/&../test/&' \ + -i ../test/org/apache/tomcat/jni/TestFile.java || die + + JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" ) + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install + java-pkg_doso .libs/*.so* + dodoc -r ../docs + ! use static-libs && find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + elog "For more information, please visit" + elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html" +} diff --git a/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild new file mode 100644 index 000000000000..83049a555648 --- /dev/null +++ b/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 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 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 + )" +S=${WORKDIR}/${P}-src/native + +KEYWORDS="~amd64 ~x86" +LICENSE="Apache-2.0" +SLOT="2" +IUSE="static-libs" + +DEPEND=" + >=virtual/jdk-1.8:* +" +RDEPEND=" + dev-libs/apr:1= + dev-libs/openssl:0/3 + >=virtual/jre-1.8:* +" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc" + +JAVA_RESOURCE_DIRS="../resources" +JAVA_SRC_DIR="../java" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="../test" + +DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} ) + +src_prepare() { + java-pkg-2_src_prepare + mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die + sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \ + ../build.xml \ + | sed "s:\${version}:${PV}:" \ + > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die +} + +src_configure() { + local myeconfargs=( + --with-apr="${EPREFIX}"/usr/bin/apr-1-config + --with-ssl="${EPREFIX}"/usr + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + java-pkg-simple_src_compile + default +} + +src_test() { + JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" ) + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install + java-pkg_doso .libs/*.so* + dodoc -r ../docs + ! use static-libs && find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + elog "For more information, please visit" + elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html" +} -- cgit v1.2.3