From 90a73bb153519a9eac2a23eb9029b99b759e7892 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Dec 2023 11:11:11 +0000 Subject: gentoo auto-resync : 09:12:2023 - 11:11:11 --- eclass/Manifest.gz | Bin 38941 -> 38943 bytes eclass/java-ant-2.eclass | 5 ++--- eclass/java-pkg-2.eclass | 4 ++-- eclass/java-pkg-opt-2.eclass | 8 +++----- eclass/java-utils-2.eclass | 29 +++++------------------------ eclass/kernel-build.eclass | 7 +------ 6 files changed, 13 insertions(+), 40 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 8a98eedd8e58..7a32b4a9d4d9 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 2513ded70a30..35fe84997563 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -54,8 +54,7 @@ inherit java-utils-2 multilib # Setting this variable non-empty before inheriting java-ant-2 disables adding # dev-java/ant-core into DEPEND. if [[ -z "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]]; then - JAVA_ANT_E_DEPEND+=" >=dev-java/ant-core-1.8.2" - [[ "${EAPI:-0}" != 0 ]] && JAVA_ANT_E_DEPEND+=":0" + JAVA_ANT_E_DEPEND+=" >=dev-java/ant-core-1.8.2:0" fi # add ant tasks specified in WANT_ANT_TASKS to DEPEND @@ -121,7 +120,7 @@ JAVA_ANT_CLASSPATH_TAGS="javac xjavac" # @FUNCTION: java-ant-2_src_configure # @DESCRIPTION: -# src_configure rewrites the build.xml files automatically, unless EAPI is undefined, 0 or 1. +# src_configure rewrites the build.xml files automatically. java-ant-2_src_configure() { # if java support is optional, don't perform this when the USE flag is off if has java-pkg-opt-2 ${INHERITED}; then diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index 3a5c846a18e6..c17a9db26b3b 100644 --- a/eclass/java-pkg-2.eclass +++ b/eclass/java-pkg-2.eclass @@ -13,8 +13,8 @@ # This eclass should be inherited for pure Java packages, or by packages which # need to use Java. -case ${EAPI:-0} in - [678]) ;; +case ${EAPI} in + 6|7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass index 0caba1d40e07..7b3e79749fb6 100644 --- a/eclass/java-pkg-opt-2.eclass +++ b/eclass/java-pkg-opt-2.eclass @@ -13,8 +13,8 @@ # Inherit this eclass instead of java-pkg-2 if you only need optional Java # support. -case ${EAPI:-0} in - [78]) ;; +case ${EAPI} in + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -49,9 +49,7 @@ java-pkg-opt-2_pkg_setup() { java-pkg-opt-2_src_prepare() { use ${JAVA_PKG_OPT_USE} && java-utils-2_src_prepare - case "${EAPI:-0}" in - [78]) use ${JAVA_PKG_OPT_USE} || eapply_user ;; - esac + use ${JAVA_PKG_OPT_USE} || eapply_user } diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 129402b256d5..31b8ab8df60a 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -17,17 +17,17 @@ # that have optional Java support. In addition you can inherit java-ant-2 for # Ant-based packages. -case ${EAPI:-0} in - [678]) ;; +case ${EAPI} in + 6|7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac if [[ -z ${_JAVA_UTILS_2_ECLASS} ]] ; then _JAVA_UTILS_2_ECLASS=1 -# EAPI 7 has version functions built-in. Use eapi7-ver for all earlier eclasses. +# 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 eutils multilib versionator +[[ ${EAPI} == 6 ]] && inherit eapi7-ver eqawarn multilib versionator # Make sure we use java-config-2 export WANT_JAVA_CONFIG="2" @@ -1703,16 +1703,6 @@ java-pkg_get-jni-cflags() { echo ${flags} } -java-pkg_ensure-gcj() { - # was enforcing sys-devel/gcc[gcj] - die "${FUNCNAME} was removed. Use use-deps available as of EAPI 2 instead. #261562" -} - -java-pkg_ensure-test() { - # was enforcing USE=test if FEATURES=test - die "${FUNCNAME} was removed. Package mangers handle this already. #278965" -} - # @FUNCTION: java-pkg_register-ant-task # @USAGE: [--version x.y] [] # @DESCRIPTION: @@ -1942,10 +1932,7 @@ etestng() { # src_prepare Searches for bundled jars # Don't call directly, but via java-pkg-2_src_prepare! java-utils-2_src_prepare() { - case ${EAPI:-0} in - [678]) eapply_user ;; - *) default_src_prepare ;; - esac + eapply_user # Check for files in JAVA_RM_FILES array. if [[ ${JAVA_RM_FILES[@]} ]]; then @@ -1960,12 +1947,6 @@ java-utils-2_src_prepare() { find "${WORKDIR}" -name "*.class" echo "Search done." fi - - # Delete bundled .class and .jar files. - case ${EAPI:-0} in - [678]) ;; - *) java-pkg_clean ;; - esac } # @FUNCTION: java-utils-2_pkg_preinst diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index 4f7e4d047739..f5529c319f9f 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -218,11 +218,6 @@ kernel-build_src_compile() { # from kernel-install.eclass with the correct paths. kernel-build_src_test() { debug-print-function ${FUNCNAME} "${@}" - local targets=( modules_install ) - # on arm or arm64 you also need dtb - if use arm || use arm64 || use riscv; then - targets+=( dtbs_install ) - fi # Use the kernel build system to strip, this ensures the modules # are stripped *before* they are signed or compressed. @@ -233,7 +228,7 @@ kernel-build_src_test() { emake O="${WORKDIR}"/build "${MAKEARGS[@]}" \ INSTALL_MOD_PATH="${T}" INSTALL_MOD_STRIP="${strip_args}" \ - "${targets[@]}" + modules_install local dir_ver=${PV}${KV_LOCALVERSION} local relfile=${WORKDIR}/build/include/config/kernel.release -- cgit v1.2.3