summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolkmar W. Pogatzki <gentoo@pogatzki.net>2024-02-20 01:03:50 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2024-02-20 11:22:16 +0100
commitcdc11496e40e896aa34ce4f71af6f3b19b22f6f9 (patch)
treeda4a256845da08eab0bbeb08a5587e2e8fbc69ba /dev-java
parentnet-fs/nfs-utils: stabilize 2.6.4-r4 for hppa, ppc (diff)
downloadgentoo-cdc11496e40e896aa34ce4f71af6f3b19b22f6f9.tar.gz
gentoo-cdc11496e40e896aa34ce4f71af6f3b19b22f6f9.tar.bz2
gentoo-cdc11496e40e896aa34ce4f71af6f3b19b22f6f9.zip
dev-java/ant: adjust conditional dependency
Closes: https://bugs.gentoo.org/925013 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/35432 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ant/ant-1.10.14-r2.ebuild (renamed from dev-java/ant/ant-1.10.14-r1.ebuild)7
1 files 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
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