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 998A7158083 for ; Wed, 11 Sep 2024 09:30:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7A5EE29EB; Wed, 11 Sep 2024 09:29:54 +0000 (UTC) Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.74]) (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 584ACE29D5 for ; Wed, 11 Sep 2024 09:29:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pogatzki.net; s=s1-ionos; t=1726046993; x=1726651793; i=gentoo@pogatzki.net; bh=2dMI76r+OYWReGRX1yKxouwhj63zxoziyUgvbO8QZXc=; h=X-UI-Sender-Class:From:To:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=cdJa/qAyiv+MXgDpvc9ke5KKCS6g9AFZeNfTsuCitRqqz6L99gAdeeQ9S9So1lbT xem/ZBx7Res0SIEtmJDl0Wb1PWPwmSl5A0qboszvOkfo7ZqjIs7d6IXqGHxW/y+mh 38zCzokA1Pjc/8PpEpl7QaM9xZj7Rtu1Ddmowr/wuBl/cDm4xR6UYbN5ePriDPGy1 z+HFzyHqJkRb6xeW7aCh7W9BwjayUFU8nz16kku4E6poy7q7TA1FZX7S3mLTSvj/H YhM/iTuwIBXrxMseuIzofTlzR//25YtEN9VpyWYLUE2J3G289ivS7Vt3Hk/qmgJeq 0rmOjMaLKkHBU0RXIQ== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from CYRTRY1.fritz.box ([92.117.119.32]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.146]) with ESMTPSA (Nemesis) id 1M2OIy-1ssB5d0moo-008cDh for ; Wed, 11 Sep 2024 11:17:11 +0200 From: "Volkmar W. Pogatzki" To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH 3/3] java-pkg-2.eclass: remove unused eclass functions java-pkg-2_src_{compile,test} Date: Wed, 11 Sep 2024 11:17:10 +0200 Message-ID: <20240911091710.8391-3-gentoo@pogatzki.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240911091710.8391-1-gentoo@pogatzki.net> References: <20240911091710.8391-1-gentoo@pogatzki.net> 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:2l4hE7qJ8B3SVN0UBkuqRkepJ4uY/KMPR+B8Huar+/izmZQdV87 a/LxzYhqkgk+443ExKB9CK24t7+GUQoLLNd2pb4goZvYr6ehNU0aDSr1Q3s26+4DFgets/b 07bEWkvZgaSaRFJ+ZeUjRMGbKXZ+JzhN78HJS4/QQzhZC8TVrnrC2/lfSEz07MYH0s/DHnp 98XRCsI5/TZDhL++lSA6A== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:+mt1vmUw3Lw=;paFK1wI/XPFNquGvul4XYc4JL1I HifwChQPv3nvS6R8sZA0XDEvsY309k1Uf/7JY+xKz3Ffm/24z+zKWKEfogfUuqTc3x+P6NTOJ OikSTpX0rF2MuBnPAo2H7wPPwPr9qk2zkUL2FaRp5cZpkXg+58o2kBWB223CpCaDv9oIoz1Ba e32xInwuA5P4kV4BFAnqFqjgnUttGC1tU7+R0AIXEn1n1ZW7NjLD7QEO0lH8Lx3iT0TtEp8AM SlA+lrTcsg2okemFmsKgLcjUoVs7qYvvVyPGT5qD9eeA/ymPoFkCpU1d5NjaJii/wXQf3Zagb qi1BCim7CrheQGx7TvaNMvuB7+VHyJaaYv/FBOZQydkGkIHTI0qcHTaoSMk2mcp8aMqHfTtwA +bxk6MXBMgKxtLW8slR4FeE1V1qjz0RxXVSetpE2qdIyzPKumjQzr0UaG7aAogobPyckcHSA4 2uGXZdKoXdEdNFXJjJuaRa+9CxR37zamPpeOhITXkh3r9iD/JvK31Ti65c7V4oqR5BATiC/Dv QdAKROjzFLMKVnCLKG3ACZFjWOr5ziy25OLuavOcyOKEQ/JxO1D4OGa68nEmVkXvPKMsu8pHe O60wApLhS+wjfrLWpuFo2ijjfIJV6PLvaT83VKEV7YUg3lTH/M6O+1KCOkpiyTFtq1h1vPZIz eSDkHvq4vQ8T3MAT20jDQO2LNkGAQA8JNGK6rP4aCrMEpp+8UE8hCYZbRhEIcm+7IMKGA+Wlo PjGk+IrkksO8LANFrKgWMhBGbAfKrc0Sw== X-Archives-Salt: e06220a1-dba0-421e-bd2a-5fdce9f37363 X-Archives-Hash: 6d787e2befc60d893ac382851daca3df The last ebuild using these functions was net-vpn/i2p-2.5.2-r1 Signed-off-by: Volkmar W. Pogatzki =2D-- eclass/java-pkg-2.eclass | 92 +--------------------------------------- 1 file changed, 1 insertion(+), 91 deletions(-) diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index 6da4efd222c2..2b2a298cfe74 100644 =2D-- a/eclass/java-pkg-2.eclass +++ b/eclass/java-pkg-2.eclass @@ -59,96 +59,6 @@ java-pkg-2_src_prepare() { java-utils-2_src_prepare } - -# @FUNCTION: java-pkg-2_src_compile -# @DEPRECATED: none -# @DESCRIPTION: -# Default src_compile for java packages -# -# @CODE -# Variables: -# EANT_BUILD_XML - controls the location of the build.xml (default: ./b= uild.xml) -# EANT_FILTER_COMPILER - Calls java-pkg_filter-compiler with the value -# EANT_BUILD_TARGET - the ant target/targets to execute (default: jar) -# EANT_DOC_TARGET - the target to build extra docs under the doc use fl= ag -# (default: javadoc; declare empty to disable complet= ely) -# EANT_GENTOO_CLASSPATH - @see eant documentation in java-utils-2.eclas= s -# EANT_EXTRA_ARGS - extra arguments to pass to eant -# EANT_ANT_TASKS - modifies the ANT_TASKS variable in the eant environm= ent -# @CODE -java-pkg-2_src_compile() { - if [[ -e "${EANT_BUILD_XML:=3Dbuild.xml}" ]]; then - # auto generate classpath - java-pkg_gen-cp EANT_GENTOO_CLASSPATH - - [[ "${EANT_FILTER_COMPILER}" ]] && \ - java-pkg_filter-compiler ${EANT_FILTER_COMPILER} - local antflags=3D"${EANT_BUILD_TARGET:=3Djar}" - if has doc ${IUSE} && [[ -n "${EANT_DOC_TARGET=3Djavadoc}" ]]; then - antflags=3D"${antflags} $(use_doc ${EANT_DOC_TARGET})" - fi - local tasks - [[ ${EANT_ANT_TASKS} ]] && tasks=3D"${ANT_TASKS} ${EANT_ANT_TASKS}" - ANT_TASKS=3D"${tasks:-${ANT_TASKS}}" \ - eant ${antflags} -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS} "${@}" - else - echo "${FUNCNAME}: ${EANT_BUILD_XML} not found so nothing to do." - fi -} - -# @FUNCTION: java-pkg-2_src_test -# @DEPRECATED: none -# @DESCRIPTION: -# src_test, not exported. -java-pkg-2_src_test() { - [[ -e "${EANT_BUILD_XML:=3Dbuild.xml}" ]] || return - - if [[ ${EANT_TEST_TARGET} ]] || < "${EANT_BUILD_XML}" tr -d "\n" | grep = -Eq "]*\bname=3D[\"']test[\"']"; then - local opts task_re junit_re pkg - - if [[ ${EANT_TEST_JUNIT_INTO} ]]; then - java-pkg_jar-from --into "${EANT_TEST_JUNIT_INTO}" junit - fi - - if [[ ${EANT_TEST_GENTOO_CLASSPATH} ]]; then - EANT_GENTOO_CLASSPATH=3D"${EANT_TEST_GENTOO_CLASSPATH}" - fi - - ANT_TASKS=3D${EANT_TEST_ANT_TASKS:-${ANT_TASKS:-${EANT_ANT_TASKS}}} - - task_re=3D"\bdev-java/ant-junit(4)?(-[^:]+)?(:\S+)\b" - junit_re=3D"\bdev-java/junit(-[^:]+)?(:\S+)\b" - - if [[ ${DEPEND} =3D~ ${task_re} ]]; then - pkg=3D"ant-junit${BASH_REMATCH[1]}${BASH_REMATCH[3]}" - pkg=3D"${pkg%:0}" - - if [[ ${ANT_TASKS} && "${ANT_TASKS}" !=3D none ]]; then - ANT_TASKS=3D"${ANT_TASKS} ${pkg}" - else - ANT_TASKS=3D"${pkg}" - fi - elif [[ ${DEPEND} =3D~ ${junit_re} ]]; then - pkg=3D"junit${BASH_REMATCH[2]}" - pkg=3D"${pkg%:0}" - - opts=3D"-Djunit.jar=3D\"$(java-pkg_getjar ${pkg} junit.jar)\"" - - if [[ ${EANT_GENTOO_CLASSPATH} ]]; then - EANT_GENTOO_CLASSPATH+=3D",${pkg}" - else - EANT_GENTOO_CLASSPATH=3D"${pkg}" - fi - fi - - eant ${opts} -f "${EANT_BUILD_XML}" \ - ${EANT_EXTRA_ARGS} ${EANT_TEST_EXTRA_ARGS} ${EANT_TEST_TARGET:-test} - - else - echo "${FUNCNAME}: No test target in ${EANT_BUILD_XML}" - fi -} - # @FUNCTION: java-pkg-2_pkg_preinst # @DESCRIPTION: # wrapper for java-utils-2_pkg_preinst @@ -158,4 +68,4 @@ java-pkg-2_pkg_preinst() { fi -EXPORT_FUNCTIONS pkg_setup src_prepare src_compile pkg_preinst +EXPORT_FUNCTIONS pkg_setup src_prepare pkg_preinst =2D- 2.41.0