commit: fd9d2b11d305bd2578d7324d045ca09fbf0ecac9 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sun Apr 21 17:44:44 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Apr 22 07:29:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd9d2b11
www-servers/tomcat: slot 10.1 add bnd-annotation to runtime-classpath Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/36346/commits/d0cecbada17de23ba623335d21eb774b7dce8c64 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../tomcat/{tomcat-10.1.20-r1.ebuild => tomcat-10.1.20-r2.ebuild} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www-servers/tomcat/tomcat-10.1.20-r1.ebuild b/www-servers/tomcat/tomcat-10.1.20-r2.ebuild similarity index 96% rename from www-servers/tomcat/tomcat-10.1.20-r1.ebuild rename to www-servers/tomcat/tomcat-10.1.20-r2.ebuild index fd4d47830b18..d046512b71c9 100644 --- a/www-servers/tomcat/tomcat-10.1.20-r1.ebuild +++ b/www-servers/tomcat/tomcat-10.1.20-r2.ebuild @@ -24,7 +24,8 @@ RESTRICT="test" # can we run them on a production system? ECJ_SLOT="4.27" -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} +COMMON_DEP="dev-java/bnd-annotation:0 + dev-java/eclipse-ecj:${ECJ_SLOT} dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.7-r2:0 dev-java/wsdl4j:0" @@ -35,7 +36,6 @@ RDEPEND="${COMMON_DEP} DEPEND="${COMMON_DEP} app-admin/pwgen >=dev-java/ant-1.10.14-r3:0 - dev-java/bnd-annotation:0 dev-java/bnd-ant:0 dev-java/bnd-util:0 dev-java/bndlib:0 @@ -61,13 +61,13 @@ PATCHES=( src_prepare() { default #780585 java-pkg-2_src_prepare - find -name '*.jar' -type f -delete -print || die + java-pkg_clean cat > build.properties <<-EOF || die execute.download=false exist=true # skip target="downloadfile-2" ant.jar=$(java-pkg_getjar --build-only ant ant.jar) - bnd-annotation.jar=$(java-pkg_getjars --build-only bnd-annotation) + 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)
