commit:     74969e04323ddb6034a3581b93ec292a9304e767
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun May 18 15:53:34 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct  3 16:24:35 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74969e04

java-utils-2.eclass: re-enable PORTAGE_QUIET

There are packages like javacup and jflex which cannot be built from
source without using a pre-built runtime version of itself. Re-emerging
these packages using the installed instead of the bundled pre-built
version was causing the java-pkg_getjar() function to trigger
java-pkg_ensure-dep() to issue a "QA Notice: java-pkg_ensure-dep:"
message.

This commit ports the PORTAGE_QUIET variable to java-pkg_getjar() so
that it works again as it did in the past for ant-based ebuilds.

Bug: https://bugs.gentoo.org/937047
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Part-of: https://github.com/gentoo/gentoo/pull/44017
Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/java-utils-2.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 3b2b9d6a5b24..20d189ff8cfd 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -1305,7 +1305,7 @@ java-pkg_getjar() {
        classpath=$(java-config --classpath=${pkg})
        [[ $? != 0 ]] && die ${error_msg}
 
-       java-pkg_ensure-dep "${build_only}" "${pkg}"
+       [[ -z ${PORTAGE_QUIET} ]] && java-pkg_ensure-dep "${build_only}" 
"${pkg}"
 
        # Record the package(Virtual) as a dependency and then set build_only
        # So that individual jars are not recorded.
@@ -1325,7 +1325,7 @@ java-pkg_getjar() {
 
                if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
                        # Only record jars that aren't build-only
-                       if [[ -z "${record_jar}" ]]; then
+                       if [[ -z "${record_jar}" && -z ${PORTAGE_QUIET} ]]; then
                                if [[ -z "${build_only}" ]]; then
                                        java-pkg_record-jar_ "${pkg}" "${jar}"
                                else

Reply via email to