mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-15 00:46:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

eclass/java-utils-2: Sync with Gentoo

Browse Source 
It's from Gentoo commit c8af7eb1285a2683460618b71e2e9a14ca6badcd.
This commit is contained in:
Flatcar Buildbot 2024-10-21 07:06:39 +00:00
parent f96e6f76d1
commit 8fb7c50c25
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sdk_container/src/third_party/portage-stable/eclass/java-utils-2.eclass vendored
View File

@ -6,7 +6,7 @@
# java@gentoo.org # java@gentoo.org
# @AUTHOR: # @AUTHOR:
# Thomas Matthijs <axxo@gentoo.org>, Karl Trygve Kalleberg <karltk@gentoo.org> # Thomas Matthijs <axxo@gentoo.org>, Karl Trygve Kalleberg <karltk@gentoo.org>
# @SUPPORTED_EAPIS: 6 7 8 # @SUPPORTED_EAPIS: 7 8
# @BLURB: Base eclass for Java packages # @BLURB: Base eclass for Java packages
# @DESCRIPTION: # @DESCRIPTION:
# This eclass provides functionality which is used by java-pkg-2.eclass and # This eclass provides functionality which is used by java-pkg-2.eclass and
@ -20,18 +20,10 @@ if [[ -z ${_JAVA_UTILS_2_ECLASS} ]] ; then
_JAVA_UTILS_2_ECLASS=1 _JAVA_UTILS_2_ECLASS=1
case ${EAPI} in case ${EAPI} in
6)
ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
;;
7|8) ;; 7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac esac
# EAPI 7 has version functions built-in. Use eapi7-ver for all earlier EAPIs.
# Keep versionator inheritance in case consumers are using it implicitly.
[[ ${EAPI} == 6 ]] && inherit eapi7-ver eqawarn multilib versionator
# Make sure we use java-config-2 # Make sure we use java-config-2
export WANT_JAVA_CONFIG="2" export WANT_JAVA_CONFIG="2"
@ -299,12 +291,12 @@ java-pkg_doexamples() {
( # dont want to pollute calling env ( # dont want to pollute calling env
insinto "${dest}" insinto "${dest}"
doins -r ${1}/* doins -r ${1}/*
) || die "Installing examples failed" )
else else
( # dont want to pollute calling env ( # dont want to pollute calling env
insinto "${dest}" insinto "${dest}"
doins -r "$@" doins -r "$@"
) || die "Installing examples failed" )
fi fi
# Let's make a symlink to the directory we have everything else under # Let's make a symlink to the directory we have everything else under
@ -429,7 +421,7 @@ java-pkg_dojar() {
( (
insinto "${JAVA_PKG_JARDEST}" insinto "${JAVA_PKG_JARDEST}"
doins "${jar}" doins "${jar}"
) || die "failed to install ${jar}" )
java-pkg_append_ JAVA_PKG_CLASSPATH "${EPREFIX}${JAVA_PKG_JARDEST}/${jar_basename}" java-pkg_append_ JAVA_PKG_CLASSPATH "${EPREFIX}${JAVA_PKG_JARDEST}/${jar_basename}"
debug-print "installed ${jar} to ${ED}${JAVA_PKG_JARDEST}" debug-print "installed ${jar} to ${ED}${JAVA_PKG_JARDEST}"
# make a symlink to the original jar if it's symlink # make a symlink to the original jar if it's symlink
@ -577,7 +569,7 @@ java-pkg_doso() {
insinto "${JAVA_PKG_LIBDEST}" insinto "${JAVA_PKG_LIBDEST}"
insopts -m0755 insopts -m0755
doins "${lib}" doins "${lib}"
) || die "failed to install ${lib}" )
java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
# otherwise make a symlink to the symlink's origin # otherwise make a symlink to the symlink's origin
@ -809,7 +801,7 @@ java-pkg_dosrc() {
( (
insinto "${JAVA_PKG_SOURCESPATH}" insinto "${JAVA_PKG_SOURCESPATH}"
doins ${zip_path} doins ${zip_path}
) || die "Failed to install source" )
JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}" JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}"
@ -1982,8 +1974,9 @@ etestng() {
# src_prepare Searches for bundled jars # src_prepare Searches for bundled jars
# Don't call directly, but via java-pkg-2_src_prepare! # Don't call directly, but via java-pkg-2_src_prepare!
java-utils-2_src_prepare() { java-utils-2_src_prepare() {
# have default_src_prepare starting from EAPI 9, see https://bugs.gentoo.org/780585
case ${EAPI} in case ${EAPI} in
[678]) eapply_user ;; [78]) eapply_user ;;
*) default_src_prepare ;; *) default_src_prepare ;;
esac esac
@ -3031,7 +3024,7 @@ java-pkg_clean() {
# $1 - classpath variable either EANT_GENTOO_CLASSPATH or JAVA_GENTOO_CLASSPATH # $1 - classpath variable either EANT_GENTOO_CLASSPATH or JAVA_GENTOO_CLASSPATH
# @CODE # @CODE
java-pkg_gen-cp() { java-pkg_gen-cp() {
debug-print-function ${FUNCNAME} "${@}" debug-print-function ${FUNCNAME} "$@"
local atom local atom
for atom in ${CP_DEPEND}; do for atom in ${CP_DEPEND}; do