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 DF406158064 for ; Mon, 13 May 2024 07:07:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27659E2A0B; Mon, 13 May 2024 07:07:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 0B715E2A0B for ; Mon, 13 May 2024 07:07:27 +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 05275335CB9 for ; Mon, 13 May 2024 07:07:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 617C81A28 for ; Mon, 13 May 2024 07:07:24 +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: <1715584037.0a8b1dd5b29020e81f14a5aeb13fd5a73d850e23.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/ant-tasks.eclass X-VCS-Directories: eclass/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 0a8b1dd5b29020e81f14a5aeb13fd5a73d850e23 X-VCS-Branch: master Date: Mon, 13 May 2024 07:07:24 +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: 83096e21-885c-4394-a297-0ef3baa1c7af X-Archives-Hash: 2a2678d1dc5fce9d2ce713863124b3c3 commit: 0a8b1dd5b29020e81f14a5aeb13fd5a73d850e23 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Mon May 13 05:17:22 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Mon May 13 07:07:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a8b1dd5 ant-tasks.eclass: drop ant-tasks.eclass Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/36659 Signed-off-by: Miroslav Šulc gentoo.org> eclass/ant-tasks.eclass | 172 ------------------------------------------------ 1 file changed, 172 deletions(-) diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass deleted file mode 100644 index 2b10e0f3e1e0..000000000000 --- a/eclass/ant-tasks.eclass +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 2007-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# @DEAD -# @ECLASS: ant-tasks.eclass -# @MAINTAINER: -# java@gentoo.org -# @AUTHOR: -# Vlastimil Babka -# @SUPPORTED_EAPIS: 7 -# @PROVIDES: java-utils-2 -# @BLURB: Eclass for building dev-java/ant-* packages -# @DESCRIPTION: -# This eclass provides functionality and default ebuild variables for building -# dev-java/ant-* packages easily. - -case ${EAPI} in - 7) ;; - *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; -esac - -if [[ -z ${_ANT_TASKS_ECLASS} ]]; then -_ANT_TASKS_ECLASS=1 - -# we set ant-core dep ourselves, restricted -JAVA_ANT_DISABLE_ANT_CORE_DEP=true -# rewriting build.xml for are the testcases has no reason atm -JAVA_PKG_BSFIX_ALL=no -inherit java-pkg-2 java-ant-2 - -# @ECLASS_VARIABLE: ANT_TASK_JDKVER -# @PRE_INHERIT -# @DESCRIPTION: -# Affects the >=virtual/jdk version set in DEPEND string. Defaults to 1.8, can -# be overridden from ebuild BEFORE inheriting this eclass. -ANT_TASK_JDKVER=${ANT_TASK_JDKVER-1.8} - -# @ECLASS_VARIABLE: ANT_TASK_JREVER -# @PRE_INHERIT -# @DESCRIPTION: -# Affects the >=virtual/jre version set in DEPEND string. Defaults to 1.8, can -# be overridden from ebuild BEFORE inheriting this eclass. -ANT_TASK_JREVER=${ANT_TASK_JREVER-1.8} - -# @ECLASS_VARIABLE: ANT_TASK_NAME -# @DESCRIPTION: -# The name of this ant task as recognized by ant's build.xml, derived from $PN -# by removing the ant- prefix. Read-only. -ANT_TASK_NAME="${PN#ant-}" - -# @ECLASS_VARIABLE: ANT_TASK_DEPNAME -# @PRE_INHERIT -# @DESCRIPTION: -# Specifies JAVA_PKG_NAME (PN{-SLOT} used with java-pkg_jar-from) of the package -# that this one depends on. Defaults to the name of ant task, ebuild can -# override it before inheriting this eclass. In case there is more than one -# dependency, the variable can be specified as bash array with multiple strings, -# one for each dependency. -ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}} - -# @ECLASS_VARIABLE: ANT_TASK_DISABLE_VM_DEPS -# @PRE_INHERIT -# @DEFAULT_UNSET -# @DESCRIPTION: -# If set, no JDK/JRE deps are added. - -# @VARIABLE: ANT_TASK_PV -# @INTERNAL -# @DESCRIPTION: -# Version of ant-core this task is intended to register and thus load with. -ANT_TASK_PV="${PV}" - -# default for final releases -MY_PV=${PV} - -UPSTREAM_PREFIX="mirror://apache/ant/source" -GENTOO_PREFIX="https://dev.gentoo.org/~fordfrog/distfiles" - -# source/workdir name -MY_P="apache-ant-${MY_PV}" - -# Default values for standard ebuild variables, can be overridden from ebuild. -DESCRIPTION="Apache Ant's optional tasks depending on ${ANT_TASK_DEPNAME}" -HOMEPAGE="https://ant.apache.org/" -SRC_URI="${UPSTREAM_PREFIX}/${MY_P}-src.tar.bz2 - ${GENTOO_PREFIX}/ant-${PV}-gentoo.tar.bz2" -LICENSE="Apache-2.0" -SLOT="0" - -RDEPEND="~dev-java/ant-core-${PV}:0" -DEPEND="${RDEPEND}" - -if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then - RDEPEND+=" >=virtual/jre-${ANT_TASK_JREVER}" - DEPEND+=" >=virtual/jdk-${ANT_TASK_JDKVER}" -fi - -# Would run the full ant test suite for every ant task -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -# @FUNCTION: ant-tasks_src_unpack -# @USAGE: [ base ] [ jar-dep ] [ all ] -# @DESCRIPTION: -# The function Is split into two parts, defaults to both of them ('all'). -# -# base: performs the unpack, build.xml replacement and symlinks ant.jar from -# ant-core -# -# jar-dep: symlinks the jar file(s) from dependency package(s) -ant-tasks_src_unpack() { - [[ -z "${1}" ]] && ant-tasks_src_unpack all - - while [[ -n "${1}" ]]; do - case ${1} in - base) - unpack ${A} - cd "${S}" - - # replace build.xml with our modified for split building - if [ -e "${WORKDIR}"/${PV}-build.patch ] ; then - eapply "${WORKDIR}"/${PV}-build.patch - else - mv -f "${WORKDIR}"/build.xml . - fi - - cd lib - # remove bundled xerces - rm -f *.jar - - # ant.jar to build against - java-pkg_jar-from --build-only ant-core ant.jar;; - jar-dep) - # get jar from the dependency package(s) - if [[ -n "${ANT_TASK_DEPNAME}" ]]; then - for depname in "${ANT_TASK_DEPNAME[@]}"; do - java-pkg_jar-from ${depname} - done - fi;; - all) - ant-tasks_src_unpack base jar-dep;; - esac - shift - done - -} - -# @FUNCTION: ant-tasks_src_compile -# @DESCRIPTION: -# Compiles the jar with installed ant-core. -ant-tasks_src_compile() { - ANT_TASKS="none" eant -Dbuild.dep=${ANT_TASK_NAME} jar-dep -} - -# @FUNCTION: ant-tasks_src_install -# @DESCRIPTION: -# Installs the jar and registers its presence for the ant launcher script. -# Version param ensures it won't get loaded (thus break) when ant-core is -# updated to newer version. -ant-tasks_src_install() { - java-pkg_dojar build/lib/${PN}.jar - java-pkg_register-ant-task --version "${ANT_TASK_PV}" - - # create the compatibility symlink - dodir /usr/share/ant/lib - dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant/lib/${PN}.jar -} - -fi - -EXPORT_FUNCTIONS src_unpack src_compile src_install