gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 06:48:18 -07:00
Code Issues Projects Releases Wiki Activity

Revert "java-utils-2.eclass: automatic dependency on java-dep-check"

Browse Source 
This reverts commit e7bcf9b350.
The approach does not work for ::gentoo.

[sam: Dependencies cannot vary based on environment variables.]

Bug: https://bugs.gentoo.org/831341
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1205
Merges: https://codeberg.org/gentoo/gentoo/pulls/1205
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Volkmar W. Pogatzki
2026-06-21 11:07:48 +02:00
committed by Sam James
parent 812393b699
commit 3a2e7877cb
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
eclass/java-utils-2.eclass
View File

@@ -1,4 +1,4 @@
# Copyright 2004-2025 Gentoo Authors
# Copyright 2004-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: java-utils-2.eclass
@@ -295,13 +295,6 @@ JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/com
# )
# @CODE
# @ECLASS_VARIABLE: JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK
# @PRE_INHERIT
# @DEFAULT_UNSET
# @DESCRIPTION:
# Helper variable to be used in packages which would otherwise have circular
# dependencies with dev-java/java-dep-check once this is forced to BDEPEND.
# @FUNCTION: java-pkg_doexamples
# @USAGE: [--subdir <subdir>] <file1/dir1> [<file2> ...]
# @DESCRIPTION:
@@ -3003,16 +2996,6 @@ is-java-strict() {
return $?
}
# Avoid having to emerge them separately every time
if is-java-strict; then
# Needed for java-pkg_verify-classes
BDEPEND="${BDEPEND} dev-java/javatoolkit"
if [[ -z "${JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK}" ]]; then
# Needed for java-utils-2_pkg_preinst
BDEPEND="${BDEPEND} dev-java/java-dep-check:0" || die
fi
fi
# @FUNCTION: java-pkg_clean
# @DESCRIPTION:
# Java package cleaner function. This will remove all *.class and *.jar