From 100ef123aadd47f03fdb6aab4603888c56323fcb Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Tue, 7 Jul 2026 22:25:58 +0200 Subject: [PATCH 1/5] www-servers/tomcat: add 9.0.120 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkmar W. Pogatzki Part-of: https://codeberg.org/gentoo/gentoo/pulls/1344 Signed-off-by: Miroslav Šulc --- www-servers/tomcat/Manifest | 2 + www-servers/tomcat/tomcat-9.0.120.ebuild | 181 +++++++++++++++++++++++ 2 files changed, 183 insertions(+) create mode 100644 www-servers/tomcat/tomcat-9.0.120.ebuild diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 21ac3b609eb22..732606985dc29 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -10,3 +10,5 @@ DIST apache-tomcat-9.0.118-src.tar.gz 7506319 BLAKE2B f4a829a7479e21137fba9dc5f1 DIST apache-tomcat-9.0.118-src.tar.gz.asc 833 BLAKE2B 1e877c130402ceabffc3aa96589a524439a97299d82ba8bd16c9d6782fec2513c1937c7dfcf62f16b1fe3d039f44d131486f137b6156f92b1e9ff2df27cc6e50 SHA512 6f08e9156760e01328411a1526b5d113793302820de1a7efaea235f2f0a05c426e17352dec62ae33627ff00633ad494597d119a28f212aac20357a04a4081e38 DIST apache-tomcat-9.0.119-src.tar.gz 7711738 BLAKE2B 554a86637c5106ba735d22d26e65df829283f494bb8d71eab38f09ca85f686b659a7585eb734a2e617a9e8f225ae888d4b082a290ffa289c084790bbd785d145 SHA512 573fdc6336cefe11ad2bbcb2a0c32b2389e55e76715aa9db794e5159ba134aa6411205d0bf9d09af860603124f456006b9312a230f5f08fede3536a389442047 DIST apache-tomcat-9.0.119-src.tar.gz.asc 833 BLAKE2B 96de5a25ae815fb00d4e6fd1b75dc633465f08bc9e314c01fca9084dc83561fe03f72d16b685f5558899f36b130bfa0f71552115bd470f35fe1ceca42c9b0a95 SHA512 59cb74300ce3a9d72c2919ff00d2e365dcdc5ba07859a2916c6c79e254a218def5568efa21aca5dc57ec4b53d43c35867b8f66a864b6ea77f01d73bdfbaa4223 +DIST apache-tomcat-9.0.120-src.tar.gz 7724604 BLAKE2B 016d3ab4cd04d57ddcdf6866012001138457072a4404e33f28ce9147561857d3ea0ed24262c104431798ffec26fc5b3159cbd7beaf9ba2ab21287ceb733e0ff7 SHA512 db8230bb08b1c33ea710b71fbba1de3d0c84c6416a784921333c03ef6526c1b022b0b2ad18686b734babba538500da795e46bf5bbbd789d8a7a251ffb3665a59 +DIST apache-tomcat-9.0.120-src.tar.gz.asc 833 BLAKE2B 28423f6f7b79daf7d848b5cbc8ce8bf85197d0cd2ee91a03f9c4ffbeffda953061d394bef477a8566325fb9424c7aed45edca32335ae7466e72de9dae06a2749 SHA512 d1e30b57f108561d95eb755843a1372ad2daa33cd0eb079b4f81da62ddd89259774b7938287a0752628f332e75f4551009c2108c463220d6084be08b95530afd diff --git a/www-servers/tomcat/tomcat-9.0.120.ebuild b/www-servers/tomcat/tomcat-9.0.120.ebuild new file mode 100644 index 0000000000000..48c5fd4c1933e --- /dev/null +++ b/www-servers/tomcat/tomcat-9.0.120.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2026 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 prefix verify-sig + +MY_P="apache-${P}-src" + +DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz + verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" +S=${WORKDIR}/${MY_P} + +LICENSE="Apache-2.0" +SLOT="9" +KEYWORDS="~amd64 ~arm64" +IUSE="extra-webapps" + +RESTRICT="test" # can we run them on a production system? + +BND_MIN="7.2.3" +ECJ_SLOT="4.20" + +COMMON_DEP=" + >=dev-java/bnd-annotation-${BND_MIN}:0 + dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/jax-rpc-api:0 + >=dev-java/wsdl4j-1.6.3-r1:0 +" + +RDEPEND=" + ${COMMON_DEP} + acct-group/tomcat + acct-user/tomcat + dev-java/javax-persistence-api:0 + >=virtual/jre-1.8:* +" + +DEPEND=" + ${COMMON_DEP} + app-admin/pwgen + >=dev-java/ant-1.10.15:0 + >=dev-java/bnd-${BND_MIN}:0 + >=dev-java/bnd-ant-${BND_MIN}:0 + >=dev-java/bnd-util-${BND_MIN}:0 + >=dev-java/bndlib-${BND_MIN}:0 + >=dev-java/libg-${BND_MIN}:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + dev-java/slf4j-api:0 + || ( virtual/jdk:21 virtual/jdk:17 ) + test? ( + >=dev-java/ant-1.10.15-r1:0[junit] + dev-java/easymock:3.2 + ) +" + +BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-$(ver_cut 1) )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-$(ver_cut 1).apache.org.asc" + +PATCHES=( + "${FILESDIR}/tomcat-9.0.104-build.xml.patch" + "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean + + cat > build.properties <<-EOF || die + compile.debug=false + execute.download=false + exist=true # skip target="downloadfile-2" + version=${PV}-gentoo + version.number=${PV} + ant.jar=$(java-pkg_getjar --build-only ant ant.jar) + bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) + bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) + bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) + bnd.jar=$(java-pkg_getjars --build-only bnd) + bndlib.jar=$(java-pkg_getjars --build-only bndlib) + jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) + jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) + libg.jar=$(java-pkg_getjars --build-only libg) + osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) + osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) + slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) + wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) + EOF + if use test; then + echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ + >> build.properties || die "easymock" + fi + + # For use of catalina.sh in netbeans + sed -i -e "/^# ----- Execute The Requested Command/ a\ + CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ + bin/catalina.sh || die +} + +# revisions of the scripts +IM_REV="-r2" +INIT_REV="-r1" + +src_compile() { + LC_ALL=C eant deploy $(usev doc javadoc) +} + +src_test() { + eant test +} + +src_install() { + local dest="/usr/share/${PN}-${SLOT}" + + java-pkg_jarinto "${dest}"/bin + java-pkg_dojar output/build/bin/*.jar + exeinto "${dest}"/bin + doexe output/build/bin/*.sh + + java-pkg_jarinto "${dest}"/lib + java-pkg_dojar output/build/lib/*.jar + + dodoc RELEASE-NOTES RUNNING.txt + use doc && java-pkg_dojavadoc output/dist/webapps/docs/api + use source && java-pkg_dosrc java/* + + ### Webapps ### + + # add missing docBase + local apps="host-manager manager" + for app in ${apps}; do + sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ + output/build/webapps/${app}/META-INF/context.xml || die + done + + insinto "${dest}"/webapps + doins -r output/build/webapps/{host-manager,manager,ROOT} + use extra-webapps && doins -r output/build/webapps/{docs,examples} + + ### Config ### + + # create "logs" directory in $CATALINA_BASE + # and set correct perms, see #458890 + dodir "${dest}"/logs + fperms 0750 "${dest}"/logs + + # replace the default pw with a random one, see #92281 + local randpw="$(pwgen -s -B 15 1)" + sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die + + # prepend gentoo.classpath to common.loader, see #453212 + sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die + + insinto "${dest}" + doins -r output/build/conf + + ### rc ### + + cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die + eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} + sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die + + insinto "${dest}"/gentoo + doins "${T}"/tomcat.conf + exeinto "${dest}"/gentoo + newexe "${T}"/tomcat${INIT_REV}.init tomcat.init + newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash +} + +pkg_postinst() { + einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" + einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" + + einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" +} From 482d517f2191a5186a808d05bea81d301ae70e9b Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Tue, 7 Jul 2026 22:38:37 +0200 Subject: [PATCH 2/5] www-servers/tomcat: add 10.1.57 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkmar W. Pogatzki Part-of: https://codeberg.org/gentoo/gentoo/pulls/1344 Signed-off-by: Miroslav Šulc --- www-servers/tomcat/Manifest | 2 + www-servers/tomcat/tomcat-10.1.57.ebuild | 185 +++++++++++++++++++++++ 2 files changed, 187 insertions(+) create mode 100644 www-servers/tomcat/tomcat-10.1.57.ebuild diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 732606985dc29..5d5bbea5908e3 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -2,6 +2,8 @@ DIST apache-tomcat-10.1.55-src.tar.gz 7362901 BLAKE2B 2b2850347b576ad4473e0786e1 DIST apache-tomcat-10.1.55-src.tar.gz.asc 833 BLAKE2B fb6b6cc647888d08fe9b29e07a9a8e4fe64f0ff68e813e957c70358415d20af2765e1cbc7531d157a89040ab09a456e537c03b737a40b0a51e447221483ccc8c SHA512 d6175f65b7e4edd267b47afcc14934f26e5a045d61f74f86f0c141a4a7616a4d1d747a55ef11f5de1f0c7bb5fae988c1314eebc3709a507f9ea7f25e6a2d4af4 DIST apache-tomcat-10.1.56-src.tar.gz 7595358 BLAKE2B c17e691509728058b381088b54c51341a76f40e671d0c6fcdc72217fcf692a73075b00adeb787ef7fafb7e5bb58a8ca5ffc4cea98fbb45c116b7ed00738f7e81 SHA512 cbbb81ffeea3c4b12f6b3a8bfe14ec8c0e12637a9c4296b5bcaf463371b64c2a4c9539a4cde42ebb4711925e666de7f9ce9d0031bfda3c113f5f976a8542971e DIST apache-tomcat-10.1.56-src.tar.gz.asc 833 BLAKE2B 3c0fdd238476879b210ae1df8da4540ccc171c964aa3ee2bbe55afb0e6fc427bc4d82fedf3636a82972b05c5db24e593239c7d9ba0b69d172ff78f788eea6899 SHA512 658146304215b125b543773fdc2146a9f8a5f3a83626b0370f225fef49b800e30db794f516940d605a1cf967571253c63a74f7b8f4959848d635388d121fc0dc +DIST apache-tomcat-10.1.57-src.tar.gz 7606363 BLAKE2B a7c94300d0eadb9a1bf747066a10ec55e093097c5e053f7bc1ea7cbe1bdc693861dd4140fc6caa494a248ea8b75f068414ba0789f3b34fe19d987ca1b17a32cd SHA512 4a1f60784f2502022cacdce99a2e9a15c462da17f9b1fa4f523693115490f6ffeabbd3febcd8be7c109bb524f29693b0b4ffe521f939a55b9a4708d185a6402e +DIST apache-tomcat-10.1.57-src.tar.gz.asc 833 BLAKE2B 79c1736ebb855940b292d4e299ed930ec2735b65022666e738ee99a023e9ea06941a5b675e78c84c19d65adff38c6bb304716f1eb9494117bf52c0e5570f5d6c SHA512 439173b27280dea2b09ff49556de3acc3f5195804b2ef18407dd3f2f7e1c147ac619e72513a6f96ea58d330e4c51dedfc594f8c0d813c18844f11e7abdd0d010 DIST apache-tomcat-11.0.22-src.tar.gz 7289785 BLAKE2B a8417b0f6abb1f3f41bd6441d53f8701c8de1bbb525a19706bd270dddf1732c8e570adc086a5b152558ef32893018e6011c9c1c73fe808ae1e4c4823067e0161 SHA512 35867e670c89d9ead1a7e4545b26f708849de3c7b56f21e1f4c124fd83b3d3ec37d65e42dcf2a0adeda260436811de6f6b27199ff747ef099a62e11eab1f7cbc DIST apache-tomcat-11.0.22-src.tar.gz.asc 849 BLAKE2B bb6b08f1ed49391dcfbac75a57c7f91909b3ac48caed808808b06f9ab4715629fc84f15e80bd2c99d194c3992bdf5d9b7e7bacabd842bfdc8f6464f6685220ae SHA512 a1619100695da4f6a5c0fc62d2243619d5c11b0535ea557aea18a79fa7471a12ba16512745abbd43b552f93fdb1176c3ecd1541b2fa04710c10ebd069530d4e2 DIST apache-tomcat-11.0.23-src.tar.gz 7524074 BLAKE2B 99433677cb3466517be0264d3a6b6fb742e04874ff2b86ec4e9558913707f35a41c1da5d1e15430295e7469de7a5ba5eef9f33d53bf5b21dcf4a86313e2993c8 SHA512 781eec414f306e57c35047e0db8be02df6813a6661e22b01928777b633f85938f61cd228b32e8b682bd2b581d9e107c18ab6529a86ec74bf7dd7f0a8b1d5fa8d diff --git a/www-servers/tomcat/tomcat-10.1.57.ebuild b/www-servers/tomcat/tomcat-10.1.57.ebuild new file mode 100644 index 0000000000000..8d8ef29df40bc --- /dev/null +++ b/www-servers/tomcat/tomcat-10.1.57.ebuild @@ -0,0 +1,185 @@ +# Copyright 1999-2026 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 prefix verify-sig + +MY_P="apache-${P}-src" + +DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz + verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" +S=${WORKDIR}/${MY_P} + +LICENSE="Apache-2.0" +SLOT="10.1" +KEYWORDS="~amd64 ~arm64" +IUSE="extra-webapps" + +RESTRICT="test" # can we run them on a production system? + +BND_MIN="7.2.3" +ECJ_SLOT="4.26" + +COMMON_DEP=" + >=dev-java/ant-1.10.15-r1:0 + >=dev-java/bnd-annotation-${BND_MIN}:0 + dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/jax-rpc-api:0 + >=dev-java/jakartaee-migration-1.0.10:0 + >=dev-java/wsdl4j-1.6.3-r1:0" + +# jre-17:* because of line 1081, build.xml +# +RDEPEND=" + ${COMMON_DEP} + acct-group/tomcat + acct-user/tomcat + >=virtual/jre-11:*" +DEPEND=" + ${COMMON_DEP} + app-admin/pwgen + >=dev-java/bnd-${BND_MIN}:0 + >=dev-java/bnd-ant-${BND_MIN}:0 + >=dev-java/bnd-util-${BND_MIN}:0 + >=dev-java/bndlib-${BND_MIN}:0 + >=dev-java/libg-${BND_MIN}:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + dev-java/slf4j-api:0 + || ( virtual/jdk:21 virtual/jdk:17 ) + test? ( + >=dev-java/ant-1.10.15:0[junit] + dev-java/easymock:3.2 + )" + +BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-$(ver_cut 1) )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-$(ver_cut 1).apache.org.asc" + +PATCHES=( + "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch" + "${FILESDIR}/tomcat-10.1.20-offline.patch" + "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean + + cat > build.properties <<-EOF || die + compile.debug=false + execute.download=false + exist=true # skip target="downloadfile-2" + version=${PV}-gentoo + version.number=${PV} + ant.jar=$(java-pkg_getjar --build-only ant ant.jar) + bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) + bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) + bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) + bnd.jar=$(java-pkg_getjars --build-only bnd) + bndlib.jar=$(java-pkg_getjars --build-only bndlib) + jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) + jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) + libg.jar=$(java-pkg_getjars --build-only libg) + migration-lib.jar=$(java-pkg_getjars jakartaee-migration) + osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) + osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) + slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) + wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) + EOF + if use test; then + echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ + >> build.properties || die "easymock" + fi + + # For use of catalina.sh in netbeans + sed -i -e "/^# ----- Execute The Requested Command/ a\ + CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ + bin/catalina.sh || die +} + +# revisions of the scripts +IM_REV="-r2" +INIT_REV="-r1" + +src_compile() { + LC_ALL=C eant deploy $(usev doc javadoc) +} + +src_test() { + eant test +} + +src_install() { + local dest="/usr/share/${PN}-${SLOT}" + + java-pkg_jarinto "${dest}"/bin + java-pkg_dojar output/build/bin/*.jar + exeinto "${dest}"/bin + doexe output/build/bin/*.sh + + java-pkg_jarinto "${dest}"/lib + java-pkg_dojar output/build/lib/*.jar + + dodoc RELEASE-NOTES RUNNING.txt + use doc && java-pkg_dojavadoc output/dist/webapps/docs/api + use source && java-pkg_dosrc java/* + + ### Webapps ### + + # add missing docBase + local apps="host-manager manager" + for app in ${apps}; do + sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ + output/build/webapps/${app}/META-INF/context.xml || die + done + + insinto "${dest}"/webapps + doins -r output/build/webapps/{host-manager,manager,ROOT} + use extra-webapps && doins -r output/build/webapps/{docs,examples} + + ### Config ### + + # create "logs" directory in $CATALINA_BASE + # and set correct perms, see #458890 + dodir "${dest}"/logs + fperms 0750 "${dest}"/logs + + # replace the default pw with a random one, see #92281 + local randpw="$(pwgen -s -B 15 1)" + sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die + + # prepend gentoo.classpath to common.loader, see #453212 + sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die + + insinto "${dest}" + doins -r output/build/conf + + ### rc ### + + cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die + eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} + sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die + + insinto "${dest}"/gentoo + doins "${T}"/tomcat.conf + exeinto "${dest}"/gentoo + newexe "${T}"/tomcat${INIT_REV}.init tomcat.init + newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash +} + +pkg_postinst() { + einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" + einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" + + ewarn "Please note that since version 10 the primary package for all implemented APIs" + ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" + ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." + + einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" +} From fc41d859137a15129b64ca927308e633fb612ae0 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Wed, 8 Jul 2026 17:20:09 +0200 Subject: [PATCH 3/5] www-servers/tomcat: add 11.0.24 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkmar W. Pogatzki Part-of: https://codeberg.org/gentoo/gentoo/pulls/1344 Signed-off-by: Miroslav Šulc --- www-servers/tomcat/Manifest | 2 + www-servers/tomcat/tomcat-11.0.24.ebuild | 186 +++++++++++++++++++++++ 2 files changed, 188 insertions(+) create mode 100644 www-servers/tomcat/tomcat-11.0.24.ebuild diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 5d5bbea5908e3..82da4a18823b0 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -8,6 +8,8 @@ DIST apache-tomcat-11.0.22-src.tar.gz 7289785 BLAKE2B a8417b0f6abb1f3f41bd6441d5 DIST apache-tomcat-11.0.22-src.tar.gz.asc 849 BLAKE2B bb6b08f1ed49391dcfbac75a57c7f91909b3ac48caed808808b06f9ab4715629fc84f15e80bd2c99d194c3992bdf5d9b7e7bacabd842bfdc8f6464f6685220ae SHA512 a1619100695da4f6a5c0fc62d2243619d5c11b0535ea557aea18a79fa7471a12ba16512745abbd43b552f93fdb1176c3ecd1541b2fa04710c10ebd069530d4e2 DIST apache-tomcat-11.0.23-src.tar.gz 7524074 BLAKE2B 99433677cb3466517be0264d3a6b6fb742e04874ff2b86ec4e9558913707f35a41c1da5d1e15430295e7469de7a5ba5eef9f33d53bf5b21dcf4a86313e2993c8 SHA512 781eec414f306e57c35047e0db8be02df6813a6661e22b01928777b633f85938f61cd228b32e8b682bd2b581d9e107c18ab6529a86ec74bf7dd7f0a8b1d5fa8d DIST apache-tomcat-11.0.23-src.tar.gz.asc 833 BLAKE2B f744a66dfdf661a7e1bdf66ebc72748a370c35d7d0f05e5092ba5a303758fc469819fa748358009a6008d19e0645ccde0f84e53b1df74efd761d9a3da6b0a8dd SHA512 2093673404527fcf7fb42ecf3f8a8370ae700ae002733a8a86006bb13b6a71bef0978c2a668795f9fc833f80f7b4e19e6b32fca4a5489c09bfa0b3e9b6d4dea7 +DIST apache-tomcat-11.0.24-src.tar.gz 7533492 BLAKE2B 6ba7c73cfcc9d75dd541b0b1bbf303ed390852f4fc2cd3c5d52dc630f1367f69e85864e25efba5886c3b1e789f63ffe55e38ea288603b111e761eb7b4671e026 SHA512 7487af14b81c6f21741e44bcbeb2a63766c4e4fbba856710a3934da96432e573544ce719b56c1a8e133dcbc131f6fc3019a60a0d737ce65e2cf05d60ef11e885 +DIST apache-tomcat-11.0.24-src.tar.gz.asc 849 BLAKE2B aac77fa7a2f53a2233667b6192505700dfdb913648d4a23f0fce9f826fbd57d63d39c61317545320c7c22772c675a53ddf7810a23367050b575bf11b57d92c02 SHA512 33261f4263aa3e883d01b40e1bbd450cfcaa34baa9912a4faecf0b63ae92da50a314d61e0467410bc2f419b541dc982283ca63097ec65135a8c81349c53925a2 DIST apache-tomcat-9.0.118-src.tar.gz 7506319 BLAKE2B f4a829a7479e21137fba9dc5f15f09ebfda3547d1b2c716dc2bddd5d91cb0002450d22d439019e6789d708f61aaa66f50153b3c4b25c2c153440cd70969f8b55 SHA512 021bb2fffce2a3ca163ddf01fd1cf6d5c5c5799bff773af32b2f767e40d2d5825ab295701e4c7cef947d98dea2f8d17d47b599237c70b55622aafbb054cefa4c DIST apache-tomcat-9.0.118-src.tar.gz.asc 833 BLAKE2B 1e877c130402ceabffc3aa96589a524439a97299d82ba8bd16c9d6782fec2513c1937c7dfcf62f16b1fe3d039f44d131486f137b6156f92b1e9ff2df27cc6e50 SHA512 6f08e9156760e01328411a1526b5d113793302820de1a7efaea235f2f0a05c426e17352dec62ae33627ff00633ad494597d119a28f212aac20357a04a4081e38 DIST apache-tomcat-9.0.119-src.tar.gz 7711738 BLAKE2B 554a86637c5106ba735d22d26e65df829283f494bb8d71eab38f09ca85f686b659a7585eb734a2e617a9e8f225ae888d4b082a290ffa289c084790bbd785d145 SHA512 573fdc6336cefe11ad2bbcb2a0c32b2389e55e76715aa9db794e5159ba134aa6411205d0bf9d09af860603124f456006b9312a230f5f08fede3536a389442047 diff --git a/www-servers/tomcat/tomcat-11.0.24.ebuild b/www-servers/tomcat/tomcat-11.0.24.ebuild new file mode 100644 index 0000000000000..477a4824e0571 --- /dev/null +++ b/www-servers/tomcat/tomcat-11.0.24.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2026 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 prefix verify-sig + +MY_P="apache-${P}-src" + +DESCRIPTION="Tomcat Servlet-6.1/JSP-4.0/EL-6.0/WebSocket-2.2/JASPIC-3.1 Container" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz + verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" +S=${WORKDIR}/${MY_P} + +LICENSE="Apache-2.0" +SLOT="11" + +KEYWORDS="~amd64 ~arm64" +IUSE="extra-webapps" + +RESTRICT="test" # can we run them on a production system? + +BND_MIN="7.2.3" +ECJ_SLOT="4.40" + +COMMON_DEP=" + >=dev-java/ant-1.10.15-r1:0 + >=dev-java/bnd-annotation-${BND_MIN}:0 + dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/jax-rpc-api:0 + >=dev-java/jakartaee-migration-1.0.12:0 + >=dev-java/wsdl4j-1.6.3-r1:0" + +# jre-17:* because of line 1081, build.xml +# +RDEPEND=" + ${COMMON_DEP} + acct-group/tomcat + acct-user/tomcat + >=virtual/jre-17:*" +DEPEND=" + ${COMMON_DEP} + app-admin/pwgen + >=dev-java/bnd-${BND_MIN}:0 + >=dev-java/bnd-ant-${BND_MIN}:0 + >=dev-java/bnd-util-${BND_MIN}:0 + >=dev-java/bndlib-${BND_MIN}:0 + >=dev-java/libg-${BND_MIN}:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + dev-java/slf4j-api:0 + || ( virtual/jdk:21 virtual/jdk:17 ) + test? ( + >=dev-java/ant-1.10.15-r1:0[junit] + dev-java/easymock:3.2 + )" + +BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-$(ver_cut 1) )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-$(ver_cut 1).apache.org.asc" + +PATCHES=( + "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch" + "${FILESDIR}/tomcat-11.0.0-offline.patch" + "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean + + cat > build.properties <<-EOF || die + compile.debug=false + execute.download=false + exist=true # skip target="downloadfile-2" + version=${PV}-gentoo + version.number=${PV} + ant.jar=$(java-pkg_getjar --build-only ant ant.jar) + bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) + bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) + bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) + bnd.jar=$(java-pkg_getjars --build-only bnd) + bndlib.jar=$(java-pkg_getjars --build-only bndlib) + jaxrpc-lib.jar=$(java-pkg_getjars --build-only jax-rpc-api) + jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) + libg.jar=$(java-pkg_getjars --build-only libg) + migration-lib.jar=$(java-pkg_getjars jakartaee-migration) + osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) + osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) + slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) + wsdl4j-lib.jar=$(java-pkg_getjars --build-only wsdl4j) + EOF + if use test; then + echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ + >> build.properties || die "easymock" + fi + + # For use of catalina.sh in netbeans + sed -i -e "/^# ----- Execute The Requested Command/ a\ + CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ + bin/catalina.sh || die +} + +# revisions of the scripts +IM_REV="-r2" +INIT_REV="-r1" + +src_compile() { + LC_ALL=C eant deploy $(usev doc javadoc) +} + +src_test() { + eant test +} + +src_install() { + local dest="/usr/share/${PN}-${SLOT}" + + java-pkg_jarinto "${dest}"/bin + java-pkg_dojar output/build/bin/*.jar + exeinto "${dest}"/bin + doexe output/build/bin/*.sh + + java-pkg_jarinto "${dest}"/lib + java-pkg_dojar output/build/lib/*.jar + + dodoc RELEASE-NOTES RUNNING.txt + use doc && java-pkg_dojavadoc output/dist/webapps/docs/api + use source && java-pkg_dosrc java/* + + ### Webapps ### + + # add missing docBase + local apps="host-manager manager" + for app in ${apps}; do + sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ + output/build/webapps/${app}/META-INF/context.xml || die + done + + insinto "${dest}"/webapps + doins -r output/build/webapps/{host-manager,manager,ROOT} + use extra-webapps && doins -r output/build/webapps/{docs,examples} + + ### Config ### + + # create "logs" directory in $CATALINA_BASE + # and set correct perms, see #458890 + dodir "${dest}"/logs + fperms 0750 "${dest}"/logs + + # replace the default pw with a random one, see #92281 + local randpw="$(pwgen -s -B 15 1)" + sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die + + # prepend gentoo.classpath to common.loader, see #453212 + sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die + + insinto "${dest}" + doins -r output/build/conf + + ### rc ### + + cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die + eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} + sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die + + insinto "${dest}"/gentoo + doins "${T}"/tomcat.conf + exeinto "${dest}"/gentoo + newexe "${T}"/tomcat${INIT_REV}.init tomcat.init + newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash +} + +pkg_postinst() { + einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" + einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" + + ewarn "Please note that since version 10 the primary package for all implemented APIs" + ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" + ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." + + einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" +} From dfd1f11a1848e40bfb49f34f4893f569e2618448 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Thu, 9 Jul 2026 09:49:15 +0200 Subject: [PATCH 4/5] www-servers/tomcat: drop 9.0.119, 10.1.56, 11.0.23 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are regressions caused by these versions. Signed-off-by: Volkmar W. Pogatzki Part-of: https://codeberg.org/gentoo/gentoo/pulls/1344 Merges: https://codeberg.org/gentoo/gentoo/pulls/1344 Signed-off-by: Miroslav Šulc --- www-servers/tomcat/Manifest | 6 - www-servers/tomcat/tomcat-10.1.56.ebuild | 185 ---------------------- www-servers/tomcat/tomcat-11.0.23.ebuild | 186 ----------------------- www-servers/tomcat/tomcat-9.0.119.ebuild | 181 ---------------------- 4 files changed, 558 deletions(-) delete mode 100644 www-servers/tomcat/tomcat-10.1.56.ebuild delete mode 100644 www-servers/tomcat/tomcat-11.0.23.ebuild delete mode 100644 www-servers/tomcat/tomcat-9.0.119.ebuild diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 82da4a18823b0..e4980262ff0b9 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,18 +1,12 @@ DIST apache-tomcat-10.1.55-src.tar.gz 7362901 BLAKE2B 2b2850347b576ad4473e0786e1b3abe0dbde702db0dceeb393500e03108669a4fd4141900ed1d610a7779917a60a4c20fc1292d60fc9400eaf79afe79a936ad5 SHA512 baa9f2ddd836725fef3d56542e67307c886353d340e0c3c2ccfaa0e1bb7eafc7a729624d2ba8bc03dd631367192b21afa9a825033d82d7a2fe5e54a5e9e3a9de DIST apache-tomcat-10.1.55-src.tar.gz.asc 833 BLAKE2B fb6b6cc647888d08fe9b29e07a9a8e4fe64f0ff68e813e957c70358415d20af2765e1cbc7531d157a89040ab09a456e537c03b737a40b0a51e447221483ccc8c SHA512 d6175f65b7e4edd267b47afcc14934f26e5a045d61f74f86f0c141a4a7616a4d1d747a55ef11f5de1f0c7bb5fae988c1314eebc3709a507f9ea7f25e6a2d4af4 -DIST apache-tomcat-10.1.56-src.tar.gz 7595358 BLAKE2B c17e691509728058b381088b54c51341a76f40e671d0c6fcdc72217fcf692a73075b00adeb787ef7fafb7e5bb58a8ca5ffc4cea98fbb45c116b7ed00738f7e81 SHA512 cbbb81ffeea3c4b12f6b3a8bfe14ec8c0e12637a9c4296b5bcaf463371b64c2a4c9539a4cde42ebb4711925e666de7f9ce9d0031bfda3c113f5f976a8542971e -DIST apache-tomcat-10.1.56-src.tar.gz.asc 833 BLAKE2B 3c0fdd238476879b210ae1df8da4540ccc171c964aa3ee2bbe55afb0e6fc427bc4d82fedf3636a82972b05c5db24e593239c7d9ba0b69d172ff78f788eea6899 SHA512 658146304215b125b543773fdc2146a9f8a5f3a83626b0370f225fef49b800e30db794f516940d605a1cf967571253c63a74f7b8f4959848d635388d121fc0dc DIST apache-tomcat-10.1.57-src.tar.gz 7606363 BLAKE2B a7c94300d0eadb9a1bf747066a10ec55e093097c5e053f7bc1ea7cbe1bdc693861dd4140fc6caa494a248ea8b75f068414ba0789f3b34fe19d987ca1b17a32cd SHA512 4a1f60784f2502022cacdce99a2e9a15c462da17f9b1fa4f523693115490f6ffeabbd3febcd8be7c109bb524f29693b0b4ffe521f939a55b9a4708d185a6402e DIST apache-tomcat-10.1.57-src.tar.gz.asc 833 BLAKE2B 79c1736ebb855940b292d4e299ed930ec2735b65022666e738ee99a023e9ea06941a5b675e78c84c19d65adff38c6bb304716f1eb9494117bf52c0e5570f5d6c SHA512 439173b27280dea2b09ff49556de3acc3f5195804b2ef18407dd3f2f7e1c147ac619e72513a6f96ea58d330e4c51dedfc594f8c0d813c18844f11e7abdd0d010 DIST apache-tomcat-11.0.22-src.tar.gz 7289785 BLAKE2B a8417b0f6abb1f3f41bd6441d53f8701c8de1bbb525a19706bd270dddf1732c8e570adc086a5b152558ef32893018e6011c9c1c73fe808ae1e4c4823067e0161 SHA512 35867e670c89d9ead1a7e4545b26f708849de3c7b56f21e1f4c124fd83b3d3ec37d65e42dcf2a0adeda260436811de6f6b27199ff747ef099a62e11eab1f7cbc DIST apache-tomcat-11.0.22-src.tar.gz.asc 849 BLAKE2B bb6b08f1ed49391dcfbac75a57c7f91909b3ac48caed808808b06f9ab4715629fc84f15e80bd2c99d194c3992bdf5d9b7e7bacabd842bfdc8f6464f6685220ae SHA512 a1619100695da4f6a5c0fc62d2243619d5c11b0535ea557aea18a79fa7471a12ba16512745abbd43b552f93fdb1176c3ecd1541b2fa04710c10ebd069530d4e2 -DIST apache-tomcat-11.0.23-src.tar.gz 7524074 BLAKE2B 99433677cb3466517be0264d3a6b6fb742e04874ff2b86ec4e9558913707f35a41c1da5d1e15430295e7469de7a5ba5eef9f33d53bf5b21dcf4a86313e2993c8 SHA512 781eec414f306e57c35047e0db8be02df6813a6661e22b01928777b633f85938f61cd228b32e8b682bd2b581d9e107c18ab6529a86ec74bf7dd7f0a8b1d5fa8d -DIST apache-tomcat-11.0.23-src.tar.gz.asc 833 BLAKE2B f744a66dfdf661a7e1bdf66ebc72748a370c35d7d0f05e5092ba5a303758fc469819fa748358009a6008d19e0645ccde0f84e53b1df74efd761d9a3da6b0a8dd SHA512 2093673404527fcf7fb42ecf3f8a8370ae700ae002733a8a86006bb13b6a71bef0978c2a668795f9fc833f80f7b4e19e6b32fca4a5489c09bfa0b3e9b6d4dea7 DIST apache-tomcat-11.0.24-src.tar.gz 7533492 BLAKE2B 6ba7c73cfcc9d75dd541b0b1bbf303ed390852f4fc2cd3c5d52dc630f1367f69e85864e25efba5886c3b1e789f63ffe55e38ea288603b111e761eb7b4671e026 SHA512 7487af14b81c6f21741e44bcbeb2a63766c4e4fbba856710a3934da96432e573544ce719b56c1a8e133dcbc131f6fc3019a60a0d737ce65e2cf05d60ef11e885 DIST apache-tomcat-11.0.24-src.tar.gz.asc 849 BLAKE2B aac77fa7a2f53a2233667b6192505700dfdb913648d4a23f0fce9f826fbd57d63d39c61317545320c7c22772c675a53ddf7810a23367050b575bf11b57d92c02 SHA512 33261f4263aa3e883d01b40e1bbd450cfcaa34baa9912a4faecf0b63ae92da50a314d61e0467410bc2f419b541dc982283ca63097ec65135a8c81349c53925a2 DIST apache-tomcat-9.0.118-src.tar.gz 7506319 BLAKE2B f4a829a7479e21137fba9dc5f15f09ebfda3547d1b2c716dc2bddd5d91cb0002450d22d439019e6789d708f61aaa66f50153b3c4b25c2c153440cd70969f8b55 SHA512 021bb2fffce2a3ca163ddf01fd1cf6d5c5c5799bff773af32b2f767e40d2d5825ab295701e4c7cef947d98dea2f8d17d47b599237c70b55622aafbb054cefa4c DIST apache-tomcat-9.0.118-src.tar.gz.asc 833 BLAKE2B 1e877c130402ceabffc3aa96589a524439a97299d82ba8bd16c9d6782fec2513c1937c7dfcf62f16b1fe3d039f44d131486f137b6156f92b1e9ff2df27cc6e50 SHA512 6f08e9156760e01328411a1526b5d113793302820de1a7efaea235f2f0a05c426e17352dec62ae33627ff00633ad494597d119a28f212aac20357a04a4081e38 -DIST apache-tomcat-9.0.119-src.tar.gz 7711738 BLAKE2B 554a86637c5106ba735d22d26e65df829283f494bb8d71eab38f09ca85f686b659a7585eb734a2e617a9e8f225ae888d4b082a290ffa289c084790bbd785d145 SHA512 573fdc6336cefe11ad2bbcb2a0c32b2389e55e76715aa9db794e5159ba134aa6411205d0bf9d09af860603124f456006b9312a230f5f08fede3536a389442047 -DIST apache-tomcat-9.0.119-src.tar.gz.asc 833 BLAKE2B 96de5a25ae815fb00d4e6fd1b75dc633465f08bc9e314c01fca9084dc83561fe03f72d16b685f5558899f36b130bfa0f71552115bd470f35fe1ceca42c9b0a95 SHA512 59cb74300ce3a9d72c2919ff00d2e365dcdc5ba07859a2916c6c79e254a218def5568efa21aca5dc57ec4b53d43c35867b8f66a864b6ea77f01d73bdfbaa4223 DIST apache-tomcat-9.0.120-src.tar.gz 7724604 BLAKE2B 016d3ab4cd04d57ddcdf6866012001138457072a4404e33f28ce9147561857d3ea0ed24262c104431798ffec26fc5b3159cbd7beaf9ba2ab21287ceb733e0ff7 SHA512 db8230bb08b1c33ea710b71fbba1de3d0c84c6416a784921333c03ef6526c1b022b0b2ad18686b734babba538500da795e46bf5bbbd789d8a7a251ffb3665a59 DIST apache-tomcat-9.0.120-src.tar.gz.asc 833 BLAKE2B 28423f6f7b79daf7d848b5cbc8ce8bf85197d0cd2ee91a03f9c4ffbeffda953061d394bef477a8566325fb9424c7aed45edca32335ae7466e72de9dae06a2749 SHA512 d1e30b57f108561d95eb755843a1372ad2daa33cd0eb079b4f81da62ddd89259774b7938287a0752628f332e75f4551009c2108c463220d6084be08b95530afd diff --git a/www-servers/tomcat/tomcat-10.1.56.ebuild b/www-servers/tomcat/tomcat-10.1.56.ebuild deleted file mode 100644 index 8d8ef29df40bc..0000000000000 --- a/www-servers/tomcat/tomcat-10.1.56.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2026 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 prefix verify-sig - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="10.1" -KEYWORDS="~amd64 ~arm64" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -BND_MIN="7.2.3" -ECJ_SLOT="4.26" - -COMMON_DEP=" - >=dev-java/ant-1.10.15-r1:0 - >=dev-java/bnd-annotation-${BND_MIN}:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - >=dev-java/jakartaee-migration-1.0.10:0 - >=dev-java/wsdl4j-1.6.3-r1:0" - -# jre-17:* because of line 1081, build.xml -# -RDEPEND=" - ${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-11:*" -DEPEND=" - ${COMMON_DEP} - app-admin/pwgen - >=dev-java/bnd-${BND_MIN}:0 - >=dev-java/bnd-ant-${BND_MIN}:0 - >=dev-java/bnd-util-${BND_MIN}:0 - >=dev-java/bndlib-${BND_MIN}:0 - >=dev-java/libg-${BND_MIN}:0 - dev-java/osgi-cmpn:8 - dev-java/osgi-core:0 - dev-java/slf4j-api:0 - || ( virtual/jdk:21 virtual/jdk:17 ) - test? ( - >=dev-java/ant-1.10.15:0[junit] - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-$(ver_cut 1) )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-$(ver_cut 1).apache.org.asc" - -PATCHES=( - "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch" - "${FILESDIR}/tomcat-10.1.20-offline.patch" - "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - java-pkg_clean - - cat > build.properties <<-EOF || die - compile.debug=false - execute.download=false - exist=true # skip target="downloadfile-2" - version=${PV}-gentoo - version.number=${PV} - ant.jar=$(java-pkg_getjar --build-only ant ant.jar) - bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) - bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) - bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) - bnd.jar=$(java-pkg_getjars --build-only bnd) - bndlib.jar=$(java-pkg_getjars --build-only bndlib) - jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) - jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) - libg.jar=$(java-pkg_getjars --build-only libg) - migration-lib.jar=$(java-pkg_getjars jakartaee-migration) - osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) - osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) - slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) - wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) - EOF - if use test; then - echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ - >> build.properties || die "easymock" - fi - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ - bin/catalina.sh || die -} - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C eant deploy $(usev doc javadoc) -} - -src_test() { - eant test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### Webapps ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - insinto "${dest}"/webapps - doins -r output/build/webapps/{host-manager,manager,ROOT} - use extra-webapps && doins -r output/build/webapps/{docs,examples} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - ewarn "Please note that since version 10 the primary package for all implemented APIs" - ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" - ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" -} diff --git a/www-servers/tomcat/tomcat-11.0.23.ebuild b/www-servers/tomcat/tomcat-11.0.23.ebuild deleted file mode 100644 index e62a7b4006d3b..0000000000000 --- a/www-servers/tomcat/tomcat-11.0.23.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2026 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 prefix verify-sig - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-6.1/JSP-4.0/EL-6.0/WebSocket-2.2/JASPIC-3.1 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="11" - -KEYWORDS="~amd64 ~arm64" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -BND_MIN="7.2.3" -ECJ_SLOT="4.39" - -COMMON_DEP=" - >=dev-java/ant-1.10.15-r1:0 - >=dev-java/bnd-annotation-${BND_MIN}:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - >=dev-java/jakartaee-migration-1.0.12:0 - >=dev-java/wsdl4j-1.6.3-r1:0" - -# jre-17:* because of line 1081, build.xml -# -RDEPEND=" - ${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-17:*" -DEPEND=" - ${COMMON_DEP} - app-admin/pwgen - >=dev-java/bnd-${BND_MIN}:0 - >=dev-java/bnd-ant-${BND_MIN}:0 - >=dev-java/bnd-util-${BND_MIN}:0 - >=dev-java/bndlib-${BND_MIN}:0 - >=dev-java/libg-${BND_MIN}:0 - dev-java/osgi-cmpn:8 - dev-java/osgi-core:0 - dev-java/slf4j-api:0 - || ( virtual/jdk:21 virtual/jdk:17 ) - test? ( - >=dev-java/ant-1.10.15-r1:0[junit] - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-$(ver_cut 1) )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-$(ver_cut 1).apache.org.asc" - -PATCHES=( - "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch" - "${FILESDIR}/tomcat-11.0.0-offline.patch" - "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - java-pkg_clean - - cat > build.properties <<-EOF || die - compile.debug=false - execute.download=false - exist=true # skip target="downloadfile-2" - version=${PV}-gentoo - version.number=${PV} - ant.jar=$(java-pkg_getjar --build-only ant ant.jar) - bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) - bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) - bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) - bnd.jar=$(java-pkg_getjars --build-only bnd) - bndlib.jar=$(java-pkg_getjars --build-only bndlib) - jaxrpc-lib.jar=$(java-pkg_getjars --build-only jax-rpc-api) - jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) - libg.jar=$(java-pkg_getjars --build-only libg) - migration-lib.jar=$(java-pkg_getjars jakartaee-migration) - osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) - osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) - slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) - wsdl4j-lib.jar=$(java-pkg_getjars --build-only wsdl4j) - EOF - if use test; then - echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ - >> build.properties || die "easymock" - fi - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ - bin/catalina.sh || die -} - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C eant deploy $(usev doc javadoc) -} - -src_test() { - eant test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### Webapps ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - insinto "${dest}"/webapps - doins -r output/build/webapps/{host-manager,manager,ROOT} - use extra-webapps && doins -r output/build/webapps/{docs,examples} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - ewarn "Please note that since version 10 the primary package for all implemented APIs" - ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" - ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" -} diff --git a/www-servers/tomcat/tomcat-9.0.119.ebuild b/www-servers/tomcat/tomcat-9.0.119.ebuild deleted file mode 100644 index 48c5fd4c1933e..0000000000000 --- a/www-servers/tomcat/tomcat-9.0.119.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2026 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 prefix verify-sig - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="9" -KEYWORDS="~amd64 ~arm64" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -BND_MIN="7.2.3" -ECJ_SLOT="4.20" - -COMMON_DEP=" - >=dev-java/bnd-annotation-${BND_MIN}:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - >=dev-java/wsdl4j-1.6.3-r1:0 -" - -RDEPEND=" - ${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - dev-java/javax-persistence-api:0 - >=virtual/jre-1.8:* -" - -DEPEND=" - ${COMMON_DEP} - app-admin/pwgen - >=dev-java/ant-1.10.15:0 - >=dev-java/bnd-${BND_MIN}:0 - >=dev-java/bnd-ant-${BND_MIN}:0 - >=dev-java/bnd-util-${BND_MIN}:0 - >=dev-java/bndlib-${BND_MIN}:0 - >=dev-java/libg-${BND_MIN}:0 - dev-java/osgi-cmpn:8 - dev-java/osgi-core:0 - dev-java/slf4j-api:0 - || ( virtual/jdk:21 virtual/jdk:17 ) - test? ( - >=dev-java/ant-1.10.15-r1:0[junit] - dev-java/easymock:3.2 - ) -" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-$(ver_cut 1) )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-$(ver_cut 1).apache.org.asc" - -PATCHES=( - "${FILESDIR}/tomcat-9.0.104-build.xml.patch" - "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - java-pkg_clean - - cat > build.properties <<-EOF || die - compile.debug=false - execute.download=false - exist=true # skip target="downloadfile-2" - version=${PV}-gentoo - version.number=${PV} - ant.jar=$(java-pkg_getjar --build-only ant ant.jar) - bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) - bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) - bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) - bnd.jar=$(java-pkg_getjars --build-only bnd) - bndlib.jar=$(java-pkg_getjars --build-only bndlib) - jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) - jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) - libg.jar=$(java-pkg_getjars --build-only libg) - osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) - osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) - slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) - wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) - EOF - if use test; then - echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ - >> build.properties || die "easymock" - fi - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ - bin/catalina.sh || die -} - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C eant deploy $(usev doc javadoc) -} - -src_test() { - eant test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### Webapps ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - insinto "${dest}"/webapps - doins -r output/build/webapps/{host-manager,manager,ROOT} - use extra-webapps && doins -r output/build/webapps/{docs,examples} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" -} From fddba71c17955344cc9fd1a2d03f3e2575ed2871 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Sun, 12 Jul 2026 06:19:51 +0200 Subject: [PATCH 5/5] dev-java/asm: drop 9.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkmar W. Pogatzki Part-of: https://codeberg.org/gentoo/gentoo/pulls/1394 Merges: https://codeberg.org/gentoo/gentoo/pulls/1394 Signed-off-by: Miroslav Šulc --- dev-java/asm/Manifest | 1 - dev-java/asm/asm-9.9.1.ebuild | 100 ---------------------------------- 2 files changed, 101 deletions(-) delete mode 100644 dev-java/asm/asm-9.9.1.ebuild diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest index c714dc737d231..bb9860d239f67 100644 --- a/dev-java/asm/Manifest +++ b/dev-java/asm/Manifest @@ -1,3 +1,2 @@ DIST asm-ASM_9_10_1.tar.bz2 1387133 BLAKE2B d7c74c3504cc269f6b2cf1ad1718ac19db25c34b27abece797c5d094dacd0e1c5ed4457cbbd7d0a3c95d3d72149090e558187bf8a8649d7e3ef92bb59811f313 SHA512 5f89d2bb560cfd282a4e347f436cdccd44b63fbd9b2c56c9a8dbd51604b271bb655b9ad8a25bd05c474171f09d428f2ebc3f0275b1438c06dffb880e1ef1941f DIST asm-ASM_9_7_1.tar.bz2 1378103 BLAKE2B f7da3a9c1bcf76398c9e9b9b86d60f8854e5248632a8b2d76605851e29ee1807713fb28c9e76012ec8f9444c44e3a151ed409cd120c34ab8d3495fdc9c84edcb SHA512 77ae76464eec97dbc8129c4a746d13f0d286d2033f909b65e0e34858e1785616b7bee22faa92128b91eb39cbd849e262efe574b73ed2859920add457d6422dd0 -DIST asm-ASM_9_9_1.tar.bz2 1387005 BLAKE2B 535f8df7e8c8047e3c32983f685e4a13228b5e9dac91018ea209d44d05ec1d509a08fc89606d4a68069cb7e6ed5e70177a26d3ac3fcadb8fc8221a6e0dc052fe SHA512 14b07af7e55035cdc2fa5b0808b6062c2e006b9fc389ef7765ca03353bb33b5cd73ab4c8ecfcf7a62b8e5475bdf13e09988bd156a586ac396b8419414f6f0553 diff --git a/dev-java/asm/asm-9.9.1.ebuild b/dev-java/asm/asm-9.9.1.ebuild deleted file mode 100644 index 8660442ab725c..0000000000000 --- a/dev-java/asm/asm-9.9.1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# tests not enabled because of missing eclass support of junit-jupiter -JAVA_PKG_IUSE="doc source" -MAVEN_PROVIDES=" - org.ow2.asm:asm-bom:${PV} - org.ow2.asm:asm:${PV} - org.ow2.asm:asm-analysis:${PV} - org.ow2.asm:asm-commons:${PV} - org.ow2.asm:asm-tree:${PV} - org.ow2.asm:asm-util:${PV} -" - -# Avoid circular dependency -JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Bytecode manipulation framework for Java" -HOMEPAGE="https://asm.ow2.io" -MY_P="ASM_${PV//./_}" -SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.bz2" -S="${WORKDIR}/asm-${MY_P}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64 ~x64-macos" - -DEPEND=">=virtual/jdk-11:*" -RDEPEND=">=virtual/jre-1.8:*" - -ASM_MODULES=( "asm" "asm-tree" "asm-analysis" "asm-commons" "asm-util" ) -JAVADOC_SRC_DIRS=( - asm/src/main/java - asm-tree/src/main/java - asm-analysis/src/main/java - asm-commons/src/main/java - asm-util/src/main/java -) - -src_prepare() { - default - local module - touch asm.module || die - for module in "${ASM_MODULES[@]}"; do - module=${module/-/.} - cat > ${module/./-}/src/main/java/module-info.java <<-EOF || die - open module org.objectweb.${module/analysis/tree.analysis} { - $(cat asm.module) - requires java.base; - exports org.objectweb.${module/analysis/tree.analysis}; - } - EOF - echo "requires transitive org.objectweb.${module/analysis/tree.analysis};" \ - >> asm.module || die - done - sed -e '/^$/d' \ - -e '/asm;/p;s:\(asm\)\(;\):\1.signature\2:' \ - -i asm/src/main/java/module-info.java || die - sed -e '/analysis/d' \ - -i asm-commons/src/main/java/module-info.java || die - sed -e '/commons/d' \ - -i asm-util/src/main/java/module-info.java || die -} - -src_compile() { - local module - for module in "${ASM_MODULES[@]}"; do - einfo "Compiling ${module}" - JAVA_JAR_FILENAME="${module}.jar" - JAVA_SRC_DIR="${module}/src/main/java" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar" - rm -r target || die - done - - if use doc; then - einfo "Compiling javadocs" - for module in "${ASM_MODULES[@]}"; do - rm "${module}/src/main/java/module-info.java" || die - JAVA_SRC_DIR+=("${module}/src/main/java") - done - ejavadoc - fi -} - -src_install() { - JAVA_JAR_FILENAME="asm.jar" - java-pkg-simple_src_install - local module - for module in asm-{analysis,commons,tree,util}; do - java-pkg_dojar ${module}.jar - if use source; then - java-pkg_dosrc "${module}/src/main/java/*" - fi - done -}