commit: 679c816adee5cfd206657872d055cc25dfa21124 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Wed Apr 21 10:00:27 2021 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Apr 21 10:00:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=679c816a
dev-java/commons-logging: switched 1.2-r3 to tomcat-servlet-api:4.0 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/commons-logging/commons-logging-1.2-r3.ebuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild index c81c87a1e7e..43b5a612518 100644 --- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild +++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild @@ -14,15 +14,15 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="avalon-framework avalon-logkit log4j servletapi test" RESTRICT="!test? ( test ) !servletapi? ( test )" CDEPEND=" - log4j? ( dev-java/log4j:0 ) - servletapi? ( java-virtuals/servlet-api:3.1 ) avalon-logkit? ( dev-java/avalon-logkit:2.0 ) - avalon-framework? ( dev-java/avalon-framework:4.2 )" + avalon-framework? ( dev-java/avalon-framework:4.2 ) + log4j? ( dev-java/log4j:0 ) + servletapi? ( dev-java/tomcat-servlet-api:4.0 )" RDEPEND=" ${CDEPEND} @@ -62,7 +62,7 @@ src_prepare() { fi if use servletapi; then - echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties || die + echo "servletapi.jar=$(java-pkg_getjar tomcat-servlet-api-4.0 servlet-api.jar)" >> build.properties || die fi }