diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2022-10-11 11:20:07 +0200 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2022-10-11 11:20:21 +0200 |
| commit | c62777ac210d1e42a14d354da9db9fdd000b8b97 (patch) | |
| tree | e9c21a99fea0640d1e9e56ad86491253c4a0dbc8 /www-servers/tomcat | |
| parent | */*: dropped 10.1.0 to favor the split version with -r1 (diff) | |
| download | gentoo-c62777ac210d1e42a14d354da9db9fdd000b8b97.tar.gz gentoo-c62777ac210d1e42a14d354da9db9fdd000b8b97.tar.bz2 gentoo-c62777ac210d1e42a14d354da9db9fdd000b8b97.zip | |
www-servers/tomcat: in 10.1.0-r1 using split servlet jars
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'www-servers/tomcat')
| -rw-r--r-- | www-servers/tomcat/tomcat-10.1.0-r1.ebuild | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/www-servers/tomcat/tomcat-10.1.0-r1.ebuild b/www-servers/tomcat/tomcat-10.1.0-r1.ebuild index a1647adfb4d0..3084adcd874c 100644 --- a/www-servers/tomcat/tomcat-10.1.0-r1.ebuild +++ b/www-servers/tomcat/tomcat-10.1.0-r1.ebuild @@ -29,12 +29,16 @@ IUSE="extra-webapps" RESTRICT="test" # can we run them on a production system? ECJ_SLOT="4.22" -SAPI_SLOT="6.0" +SERVLET_API_SLOT="6.0" +JSP_API_SLOT="3.1" +EL_API_SLOT="5.0" COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 - ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} + ~dev-java/tomcat-el-api-${PV}:${EL_API_SLOT} + ~dev-java/tomcat-jsp-api-${PV}:${JSP_API_SLOT} + ~dev-java/tomcat-servlet-api-${PV}:${SERVLET_API_SLOT} dev-java/wsdl4j:0" RDEPEND="${COMMON_DEP} acct-group/tomcat @@ -87,7 +91,7 @@ src_prepare() { JAVA_ANT_REWRITE_CLASSPATH="true" EANT_BUILD_TARGET="deploy" -EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j" +EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SERVLET_API_SLOT},tomcat-jsp-api-${JSP_API_SLOT},tomcat-el-api-${EL_API_SLOT},wsdl4j" EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" EANT_NEEDS_TOOLS="true" |