summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolkmar W. Pogatzki <gentoo@pogatzki.net>2024-09-11 07:55:59 +0200
committerMiroslav Šulc <fordfrog@gentoo.org>2024-10-02 11:01:39 +0200
commitcb2cde8fccc89412e914986153bf706e3c16a63a (patch)
tree1c468521296195982012c2a84dc6f434c2711997 /eclass/java-pkg-2.eclass
parentmail-client/thunderbird: add 128.3.0 (diff)
downloadgentoo-cb2cde8fccc89412e914986153bf706e3c16a63a.tar.gz
gentoo-cb2cde8fccc89412e914986153bf706e3c16a63a.tar.bz2
gentoo-cb2cde8fccc89412e914986153bf706e3c16a63a.zip
java-pkg-2.eclass: remove unused eclass functions java-pkg-2_src_{compile,test}
The last ebuild using these functions was net-vpn/i2p-2.5.2-r1 Closes: https://bugs.gentoo.org/940526 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'eclass/java-pkg-2.eclass')
-rw-r--r--eclass/java-pkg-2.eclass92
1 files changed, 1 insertions, 91 deletions
diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index 6da4efd222c2..2b2a298cfe74 100644
--- 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: ./build.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 flag
-# (default: javadoc; declare empty to disable completely)
-# EANT_GENTOO_CLASSPATH - @see eant documentation in java-utils-2.eclass
-# EANT_EXTRA_ARGS - extra arguments to pass to eant
-# EANT_ANT_TASKS - modifies the ANT_TASKS variable in the eant environment
-# @CODE
-java-pkg-2_src_compile() {
- if [[ -e "${EANT_BUILD_XML:=build.xml}" ]]; then
- # auto generate classpath
- java-pkg_gen-cp EANT_GENTOO_CLASSPATH
-
- [[ "${EANT_FILTER_COMPILER}" ]] && \
- java-pkg_filter-compiler ${EANT_FILTER_COMPILER}
- local antflags="${EANT_BUILD_TARGET:=jar}"
- if has doc ${IUSE} && [[ -n "${EANT_DOC_TARGET=javadoc}" ]]; then
- antflags="${antflags} $(use_doc ${EANT_DOC_TARGET})"
- fi
- local tasks
- [[ ${EANT_ANT_TASKS} ]] && tasks="${ANT_TASKS} ${EANT_ANT_TASKS}"
- ANT_TASKS="${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:=build.xml}" ]] || return
-
- if [[ ${EANT_TEST_TARGET} ]] || < "${EANT_BUILD_XML}" tr -d "\n" | grep -Eq "<target\b[^>]*\bname=[\"']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="${EANT_TEST_GENTOO_CLASSPATH}"
- fi
-
- ANT_TASKS=${EANT_TEST_ANT_TASKS:-${ANT_TASKS:-${EANT_ANT_TASKS}}}
-
- task_re="\bdev-java/ant-junit(4)?(-[^:]+)?(:\S+)\b"
- junit_re="\bdev-java/junit(-[^:]+)?(:\S+)\b"
-
- if [[ ${DEPEND} =~ ${task_re} ]]; then
- pkg="ant-junit${BASH_REMATCH[1]}${BASH_REMATCH[3]}"
- pkg="${pkg%:0}"
-
- if [[ ${ANT_TASKS} && "${ANT_TASKS}" != none ]]; then
- ANT_TASKS="${ANT_TASKS} ${pkg}"
- else
- ANT_TASKS="${pkg}"
- fi
- elif [[ ${DEPEND} =~ ${junit_re} ]]; then
- pkg="junit${BASH_REMATCH[2]}"
- pkg="${pkg%:0}"
-
- opts="-Djunit.jar=\"$(java-pkg_getjar ${pkg} junit.jar)\""
-
- if [[ ${EANT_GENTOO_CLASSPATH} ]]; then
- EANT_GENTOO_CLASSPATH+=",${pkg}"
- else
- EANT_GENTOO_CLASSPATH="${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