From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 65EFA158041 for ; Wed, 10 Apr 2024 08:11:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D354E29EE; Wed, 10 Apr 2024 08:11:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 76EDEE29EE for ; Wed, 10 Apr 2024 08:11:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E699343282 for ; Wed, 10 Apr 2024 08:11:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E2A159B6 for ; Wed, 10 Apr 2024 08:11:12 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1712736664.672028056a6bb54d5550aaff1a09d752e772bc8d.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/java-pkg-simple.eclass X-VCS-Directories: eclass/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 672028056a6bb54d5550aaff1a09d752e772bc8d X-VCS-Branch: master Date: Wed, 10 Apr 2024 08:11:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 30f2b220-425a-4c3e-954f-22cbefc9bcda X-Archives-Hash: 504e92a000f597cb6c93a42678e22a60 commit: 672028056a6bb54d5550aaff1a09d752e772bc8d Author: Manuel Mommertz desy de> AuthorDate: Tue Feb 13 07:59:13 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed Apr 10 08:11:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67202805 java-pkg-simple.eclass: use --module-path for ejavadoc when applicable Bug: https://bugs.gentoo.org/925691 Signed-off-by: Manuel Mommertz desy.de> Closes: https://github.com/gentoo/gentoo/pull/35302 Signed-off-by: Miroslav Šulc gentoo.org> eclass/java-pkg-simple.eclass | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 1a4bcb1b0a63..6b473ed768ed 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -417,11 +417,18 @@ java-pkg-simple_src_compile() { einfo "JAVADOC_SRC_DIRS exists, you need to call ejavadoc separately" else mkdir -p ${apidoc} - ejavadoc -d ${apidoc} \ - -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ - ${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- -quiet} \ - @${sources} || die "javadoc failed" + if [[ -z ${moduleinfo} ]] || [[ ${target#1.} -lt 9 ]]; then + ejavadoc -d ${apidoc} \ + -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ + ${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- -quiet} \ + @${sources} || die "javadoc failed" + else + ejavadoc -d ${apidoc} \ + -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ + ${classpath:+--module-path ${classpath}} ${JAVADOC_ARGS:- -quiet} \ + @${sources} || die "javadoc failed" fi + fi fi # package