diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-03-11 00:45:39 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-03-11 00:45:39 +0000 |
| commit | 6c988f4ed171aed46326587a0ec0d64297b20f49 (patch) | |
| tree | a1e28a95096953f81b35cb145abe37b83f20c174 /eclass | |
| parent | f50d60b8eb707b56133e594376e993b98e726b5d (diff) | |
gentoo auto-resync : 11:03:2024 - 00:45:38
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39610 -> 39617 bytes | |||
| -rw-r--r-- | eclass/ant-tasks.eclass | 3 | ||||
| -rw-r--r-- | eclass/java-ant-2.eclass | 14 |
3 files changed, 8 insertions, 9 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 39f949690005..ceb30ba31d12 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass index d599238ba253..c1a82ccbab5b 100644 --- a/eclass/ant-tasks.eclass +++ b/eclass/ant-tasks.eclass @@ -1,6 +1,7 @@ -# Copyright 2007-2023 Gentoo Authors +# Copyright 2007-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# @DEPRECATED: # @ECLASS: ant-tasks.eclass # @MAINTAINER: # java@gentoo.org diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 35fe84997563..1eccead3067f 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2023 Gentoo Authors +# Copyright 2004-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-ant-2.eclass @@ -48,14 +48,12 @@ inherit java-utils-2 multilib #The implementation of dependencies is handled by java-utils-2.eclass #WANT_ANT_TASKS -# @ECLASS_VARIABLE: JAVA_ANT_DISABLE_ANT_CORE_DEP -# @DEFAULT_UNSET +# @VARIABLE: JAVA_ANT_E_DEPEND +# @INTERNAL # @DESCRIPTION: -# Setting this variable non-empty before inheriting java-ant-2 disables adding -# dev-java/ant-core into DEPEND. -if [[ -z "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]]; then - JAVA_ANT_E_DEPEND+=" >=dev-java/ant-core-1.8.2:0" -fi +# Convenience variable adding packages to DEPEND so they need not be added +# in the ebuild. +JAVA_ANT_E_DEPEND+=" >=dev-java/ant-1.10.14-r2:0" # add ant tasks specified in WANT_ANT_TASKS to DEPEND ANT_TASKS_DEPEND="$(java-pkg_ant-tasks-depend)" |