commit: cdc11496e40e896aa34ce4f71af6f3b19b22f6f9 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Tue Feb 20 00:03:50 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Feb 20 10:22:16 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc11496
dev-java/ant: adjust conditional dependency Closes: https://bugs.gentoo.org/925013 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/35432 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/ant/{ant-1.10.14-r1.ebuild => ant-1.10.14-r2.ebuild} | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dev-java/ant/ant-1.10.14-r1.ebuild b/dev-java/ant/ant-1.10.14-r2.ebuild similarity index 98% rename from dev-java/ant/ant-1.10.14-r1.ebuild rename to dev-java/ant/ant-1.10.14-r2.ebuild index 1df865e20886..c06cf4bd6631 100644 --- a/dev-java/ant/ant-1.10.14-r1.ebuild +++ b/dev-java/ant/ant-1.10.14-r2.ebuild @@ -45,7 +45,10 @@ DEPEND=" commonsnet? ( dev-java/commons-net:0 ) jai? ( dev-java/sun-jai-bin:0 ) jakartamail? ( dev-java/jakarta-mail:0 ) - javamail? ( dev-java/javax-mail:0 ) + javamail? ( + dev-java/jakarta-activation-api:1 + dev-java/javax-mail:0 + ) jdepend? ( >=dev-java/jdepend-2.10-r1:0 ) jsch? ( dev-java/jsch:0 ) junit4? ( dev-java/junit:4 ) @@ -293,7 +296,7 @@ src_compile() { taskdeps ant-commons-net commons-net taskdeps ant-jai sun-jai-bin taskdeps ant-jakartamail jakarta-mail - taskdeps ant-javamail javax-mail + taskdeps ant-javamail 'javax-mail jakarta-activation-api-1' taskdeps ant-jdepend jdepend taskdeps ant-jsch jsch taskdeps ant-junit junit-4 ant-junit/src/resources
