diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-06-29 08:00:25 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-29 08:00:25 +0100 |
| commit | d855918b46ba8714cf1320fe63b55fd0ed1748a6 (patch) | |
| tree | 4d7d0e86122a07796a660310d507f93e1b7747b9 /eclass | |
| parent | b8325835c82367d22428eb41afa0f2d375338d3c (diff) | |
gentoo auto-resync : 29:06:2024 - 08:00:25
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39054 -> 39057 bytes | |||
| -rw-r--r-- | eclass/java-utils-2.eclass | 22 |
2 files changed, 16 insertions, 6 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 84f46c3b3df5..35b2bd313e94 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 3c2d190c4c15..91f8fba8790b 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -2033,13 +2033,23 @@ java-utils-2_pkg_preinst() { eant() { debug-print-function ${FUNCNAME} $* - if [[ ${EBUILD_PHASE} = compile ]]; then - java-ant-2_src_configure - fi + if [[ ${!JAVA_PKG_BSFIX*} ]] \ + || [[ ${JAVA_ANT_BSFIX_EXTRA_ARGS} ]] \ + || [[ ${JAVA_ANT_CLASSPATH_TAGS} ]] \ + || [[ ${JAVA_ANT_JAVADOC_INPUT_DIRS} ]] \ + || [[ ${JAVA_ANT_REWRITE_CLASSPATH} ]] \ + || [[ ${EANT_BUILD_XML} ]] \ + || [[ ${!EANT_GENTOO_CLASSPATH*} ]] \ + || [[ ${EANT_TEST_GENTOO_CLASSPATH} ]] + then + if [[ ${EBUILD_PHASE} = compile ]]; then + java-ant-2_src_configure + fi - if ! has java-ant-2 ${INHERITED}; then - local msg="You should inherit java-ant-2 when using eant" - java-pkg_announce-qa-violation "${msg}" + if ! has java-ant-2 ${INHERITED}; then + local msg="You should inherit java-ant-2 when using eant" + java-pkg_announce-qa-violation "${msg}" + fi fi local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore" |