commit: b092319cd82a7964a72aa85ba8184c56ad5e8d2d Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Apr 17 10:31:19 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Thu Apr 18 07:44:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b092319c
www-servers/tomcat: add bnd-annotation to runtime-classpath There wre some "Class files not found via DEPEND in package.env" Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/36293 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../tomcat/{tomcat-9.0.88.ebuild => tomcat-9.0.88-r1.ebuild} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www-servers/tomcat/tomcat-9.0.88.ebuild b/www-servers/tomcat/tomcat-9.0.88-r1.ebuild similarity index 97% rename from www-servers/tomcat/tomcat-9.0.88.ebuild rename to www-servers/tomcat/tomcat-9.0.88-r1.ebuild index 2d8069b5c3da..5e19c3cce87d 100644 --- a/www-servers/tomcat/tomcat-9.0.88.ebuild +++ b/www-servers/tomcat/tomcat-9.0.88-r1.ebuild @@ -24,7 +24,8 @@ RESTRICT="test" # can we run them on a production system? ECJ_SLOT="4.20" -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/wsdl4j:0" RDEPEND="${COMMON_DEP} @@ -34,7 +35,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 @@ -65,7 +65,7 @@ src_prepare() { 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)
