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 9D7F915802E for ; Mon, 1 Jul 2024 06:40:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 492852BC07D; Mon, 1 Jul 2024 06:40:06 +0000 (UTC) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.134]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A64AB2BC02C for ; Mon, 1 Jul 2024 06:40:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pogatzki.net; s=s1-ionos; t=1719816004; x=1720420804; i=gentoo@pogatzki.net; bh=nOZhfh0J/VaXa2Ntr/4PwwmU5pmQuEBOf7L3cgE/Pvc=; h=X-UI-Sender-Class:From:To:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:cc:content-transfer-encoding: content-type:date:from:message-id:mime-version:reply-to:subject: to; b=iLGW+nmZ0+X/L7/YSAhUEG4Hvyvb6Y/qPq6R8BMZOe92QcxM6kDbRAD5XBo1wq7j rFQI+CGgaamyCpvZHx2zqBgdvHqkpmQQ9yqrn1YQcjqolWsxSgnBLFYEsg1Klx/FC GbUizZxJrl5vt7GxxAJOf64V2gw2xBRxOTlbqHOZJEhZeaLloiDqCp1t+Xb8Gu3Yk VaF57UOXgSqzPENfDJbcCe1wr18gGwUoXVHaFp0IAPX+wMXZYfjuzFLBu0pg0l9z8 7UowuAxJgzv+tbmXp3elCHS5ACsCazniwPUklQmuYe2KbhlPqsCMSqKtW0+Js8Oym 9aUrWbsEol84j+sWUQ== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from CYRTRY1.fritz.box ([92.117.116.224]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.130]) with ESMTPSA (Nemesis) id 1N01hu-1sBbP8273G-016Sxc for ; Mon, 01 Jul 2024 08:40:04 +0200 From: "Volkmar W. Pogatzki" To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH] java-pkg-simple.eclass: allow java-pkg-opt-2 Date: Mon, 1 Jul 2024 08:39:30 +0200 Message-ID: <20240701063944.9140-1-gentoo@pogatzki.net> X-Mailer: git-send-email 2.41.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:uKeL1nZ27NsJet6nC9+gn/IxohKJMgg0bkBZZFlEorXClicQqzI MCBZNH3guSZlTHLwZ6jo9J14erEZANKoF/1Nk3n27PilWHXxWG4eCsU0iewtuHviQSm/7xm mIwKrqd/fN5AvAvQlS6pnhykumcH0/iRRQJLpXSV6EQnI2/3UE8RtA3qomqX3O4Bfs4eDa4 0wAMqE+MZZzziDttYWAhg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:Nfj3xYC4LGc=;Tvi2t7CWiw+RZDnAyGSVZrEwyP2 /9AfO8fBFWtHAYEDHNaobBoFREtGPaNd/QD4GgU/wAyN+V3wrWZxp5m5Werh0RwLQKczdhA2U kW/8k/cDhcvHEKErRa2CHiF4j23TIGL0AwKk22maZAtu1KddZTrnsnL2r/Drlj7NWWLznv5SU AVIrS94y995dBfL/whL7/hs6K2gU7fT3Sf1kVHoCkB59qqzpxuVAF/vssxsg1KXz3rwdbyPPX 0cfHjhffJb/keyGwSw5sXK99FhITMcpuczl4aGUAEnDQZIxV4YIOCmUW4+KMPEsh4UZYmipwZ CSMxtcGWkXp8ozdqyjBIDDfQDvznAkipIOg+8R4NleIp+/QailXs464Q7Vk7sWe4DQYXjniPY Yb+l0qV+nP7H1y6grzSJ49L7NIs5o+nJlFXgEaYer9IR66YTu2M06NOSrSTYQXKIp0/lJVlXg +KBp60yqGVpQuLVwJnBOaa4Zy1mfrS92zI3xBrBeiolJeLHf9yZtfHkj2L+8Mh00Cu0+joWjD CjhKegMPHqmLzcDapiIztij7mMT9kCvd4mSUkIBiMBXEIwNEf5H7dd8GRyGgoMyNBVneE2iJm OrOczKRqAGwNwencjBbmeUSKjKOMLcD6sBGi/8Uttej2cgRUG/W1rmu3M4D3XAoaFPXFkgHSZ kVxkF6+Zq/iVss2+mdfqlHcpRfwH8Nkw1e/BV/cqRyBMcQWDUH4hDwQj2ZasIUFmWZdJfSFgq ybNhHafOfjDAc/Lmi3/TshbXbOSS3YJDdrn8LMWHhvrufbXjr68BFU= X-Archives-Salt: bfb6e1a7-b578-4955-8cb4-33844a622144 X-Archives-Hash: 896e67b67fec8116b9f90682b66fd2f4 Presently, "java-pkg-simple eclass can only be inherited AFTER java-pkg-2"= . This prevents packages with optional Java like dev-lang/cxprolog to be build with java-pkg-simple. This patch allows to inherit java-pkg-simple after either of java-pkg-2 and java-pkg-opt-2. Poposed by Alfred Wingate on #gentoo-dev-help on 2024-04-25 Closes: https://bugs.gentoo.org/930550 Signed-off-by: Volkmar W. Pogatzki =2D-- eclass/java-pkg-simple.eclass | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 6b473ed768ed..181b4f3606ec 100644 =2D-- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -26,8 +26,12 @@ _JAVA_PKG_SIMPLE_ECLASS=3D1 inherit java-utils-2 -if ! has java-pkg-2 ${INHERITED}; then - eerror "java-pkg-simple eclass can only be inherited AFTER java-pkg-2" +if has java-pkg-2 ${INHERITED}; then + JAVA_PKG_OPT=3D0 +elif has java-pkg-opt-2 ${INHERITED}; then + JAVA_PKG_OPT=3D1 +else + eerror "java-pkg-simple eclass can only be inherited AFTER java-pkg-2 or= java-pkg-opt-2" fi # We are only interested in finding all java source files, wherever they = may be. @@ -50,7 +54,12 @@ if has test ${JAVA_PKG_IUSE}; then test_deps+=3D" dev-java/testng:0";; esac done - [[ ${test_deps} ]] && DEPEND=3D"test? ( ${test_deps} )" + if [[ ${JAVA_PKG_OPT} ]]; then + [[ ${test_deps} ]] && DEPEND=3D"test? ( ${JAVA_PKG_OPT_USE}? ( ${test_d= eps} ) )" + else + [[ ${test_deps} ]] && DEPEND=3D"test? ( ${test_deps} )" + fi + unset test_deps fi @@ -347,6 +356,7 @@ java-pkg-simple_prepend_resources() { # If USE FLAG 'binary' exists and is set, it will just copy # ${JAVA_BINJAR_FILENAME} to ${S} and skip the rest of src_compile. java-pkg-simple_src_compile() { + [[ ${JAVA_PKG_OPT} ]] && ! use ${JAVA_PKG_OPT_USE} && return local sources=3Dsources.lst classes=3Dtarget/classes apidoc=3Dtarget/api= moduleinfo # do not compile if we decide to install binary jar @@ -461,6 +471,7 @@ java-pkg-simple_src_compile() { # ${JAVA_JAR_FILENAME}. It will also install a launcher if # ${JAVA_MAIN_CLASS} is set. Also invokes einstalldocs. java-pkg-simple_src_install() { + [[ ${JAVA_PKG_OPT} ]] && ! use ${JAVA_PKG_OPT_USE} && return local sources=3Dsources.lst classes=3Dtarget/classes apidoc=3Dtarget/api # install the jar file that we need @@ -503,6 +514,7 @@ java-pkg-simple_src_install() { # in the "generated-test" directory as content of this directory is prese= rved, # whereas content of target/test-classes is removed. java-pkg-simple_src_test() { + [[ ${JAVA_PKG_OPT} ]] && ! use ${JAVA_PKG_OPT_USE} && return local test_sources=3Dtest_sources.lst classes=3Dtarget/test-classes modu= leinfo local tests_to_run classpath =2D- 2.41.0