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 B61A815802E for ; Tue, 2 Jul 2024 07:16:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBCEBE2B03; Tue, 2 Jul 2024 07:16:02 +0000 (UTC) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) (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 667AAE2AF5 for ; Tue, 2 Jul 2024 07:16:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pogatzki.net; s=s1-ionos; t=1719904560; x=1720509360; i=gentoo@pogatzki.net; bh=SYLXDDFhglaTWAwi961IU+/36zj8dPNTPr1zx5m7YyY=; 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=z1XoVXgde9b82RsH15VJN0xaan5XmBtvvvdz+xWS/ppStfQkHeDpnbY1BZ+u54qP bekn6/lswmWh9dywhGxfFS/GsOQSmYamqSCjNCQgifDgUXGp1aEHsgvltmkdUun0K X2MJXwF6YINxRaHuJ3ZFaLHE+YmP53/pJrVYOjk/plRzI6KBYdzco6I2HTKzrI48S Cgb73Pwm3xpevOtrlMBdcpLwxWaQZrJz2exRX5DddY2r5jiwX7zfGTaMgjjwZz9Si 3u7/f+gFWwCb7NLTnkHX7dVJGNipJRL9QtOV/gVPGZUqWiMP3OzId6feLVLMe00ws YMZEP7ihj4qwIYGa1w== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from CYRTRY1.fritz.box ([89.245.64.87]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.130]) with ESMTPSA (Nemesis) id 1MtwEO-1sAAiy2V9o-010V0q for ; Tue, 02 Jul 2024 09:16:00 +0200 From: "Volkmar W. Pogatzki" To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH v2] java-pkg-simple.eclass: allow java-pkg-opt-2 Date: Tue, 2 Jul 2024 09:15:41 +0200 Message-ID: <20240702071552.19895-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:88YKwE1q2gfm4ejFmQUGCsWJin9Kp7f1nKUwHhTfmsA2rWSOqb5 ygIis8LSu+M7TStX8IHLei7yQz2I/zmqjTypaSRuAd1bNZZ/eM8f3ajOLYYa47kmlBXHCtJ cGtwuAEF0UgjYb0rscql/qdJ7O447u8Aa8OexqBn9DxkrZGddNg8h6pXBNd2hyxvSwm7oka xDS265yUmTl0v8slFBNKg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:VR5hzUE/AfQ=;ClZT0xRJiXUC+O3fQggwf8q1nMO 6lt7Rs/56Vr4y0zF6dwNTQKgNcpaS89SoARScFL85juQKdvCpFMLjIrYG8BmrjfvWq0lXoo6F ckbh7WKbyzvAb+fn1oeTaZEtoh7MZ7szStgvuFurZLRRpvhsz0wrVSG3MqjoUreCaSOaDfM4c YyO/Ai6ecfcgq11Yy0SUgQctCpz8etp822ViQ6d2TmBQljd2yn4ni/+gZ4fYtBLO9ck7YKJxU CelELSZCH/sti3YUGPdF1Q9WH9m3tYDR9p4M7gcQngbxzhUlnTL48tSWPY1r+SKmIIqkEkP1V cJcWYHKZNUHL9VfyV5JcluYe0OxnJoEDi/Dizd8UEZ764RApGoPmjX7IhpESkL5Jz0rqwYl6x UJoieN8DrEikGzwCIjF1EVi3P2MUiqOUqqz1PvXkUFRyQMMZ/5KQiNVAZ2EfCWqqHHCC+PTbM 1lydCJuAisBs02ZYl/xW82g4dGKfRikHigiFocdD/RNgNfL+dpm7Qk0zMdmgW4/HGVAUN2JKi DbIdxVD0mFW+xZ+bbGZUuUTlC8BR8Z+8FY0T/wo++bmnHrRDxhawPBR+wYtdBWH/6IZSdh4eD R4JQeCtiidQoEUP8YqS7ZuT98yiNUXknQmbZfZpJ1rn5CJd5XQvGBkwA9KtqTXUG/miJmC36S Lm1WjmlW05iB/m/WW6+YhnIgbTth8BiLWBYeJBHYyi6U6M11hWHfOmSMpWsuPpTSFFqrdMXhz hUp1NBipwwK88n5rjC/74TjHBcgdvAAP7zBHdIKo/4qKDr9cwVLoVI= X-Archives-Salt: 4bb57725-9317-425f-b646-053f62566e45 X-Archives-Hash: 0036e21185a0290b11146c81e1a23ee9 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 built with java-pkg-simple. This patch allows to inherit java-pkg-simple after any 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..5ed7e3e5b78e 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} =3D=3D 1 ]]; 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} =3D=3D 1 ]] && ! 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} =3D=3D 1 ]] && ! 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} =3D=3D 1 ]] && ! 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