diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-01-19 14:07:55 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-01-19 14:07:55 +0000 |
| commit | d725480af7cbc67d784e5d96f973fa41e9030123 (patch) | |
| tree | 620bbc21e2e1384f13394c32a7294bc1c0e8bae1 /eclass | |
| parent | 0184387f6a748c74c5d29cddf20289dc94f05ddc (diff) | |
gentoo auto-resync : 19:01:2024 - 14:07:55
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38963 -> 38969 bytes | |||
| -rw-r--r-- | eclass/java-pkg-simple.eclass | 20 | ||||
| -rw-r--r-- | eclass/postgres.eclass | 4 |
3 files changed, 13 insertions, 11 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex b155e9f97578..c4083ec9cc87 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 97bad414afb7..1a4bcb1b0a63 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2023 Gentoo Authors +# Copyright 2004-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-pkg-simple.eclass @@ -367,12 +367,13 @@ java-pkg-simple_src_compile() { # gather sources # if target < 9, we need to compile module-info.java separately # as this feature is not supported before Java 9 - if [[ java-pkg_get-target -lt 9 ]]; then + local target="$(java-pkg_get-target)" + if [[ ${target#1.} -lt 9 ]]; then find "${JAVA_SRC_DIR[@]}" -name \*.java ! -name module-info.java > ${sources} - moduleinfo=$(find "${JAVA_SRC_DIR[@]}" -name module-info.java) else find "${JAVA_SRC_DIR[@]}" -name \*.java > ${sources} fi + moduleinfo=$(find "${JAVA_SRC_DIR[@]}" -name module-info.java) # create the target directory mkdir -p ${classes} || die "Could not create target directory" @@ -382,7 +383,7 @@ java-pkg-simple_src_compile() { java-pkg-simple_getclasspath java-pkg-simple_prepend_resources ${classes} "${JAVA_RESOURCE_DIRS[@]}" - if [[ -n ${moduleinfo} ]] || [[ java-pkg_get-target -lt 9 ]]; then + if [[ -z ${moduleinfo} ]] || [[ ${target#1.} -lt 9 ]]; then ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ ${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${sources} else @@ -392,7 +393,7 @@ java-pkg-simple_src_compile() { fi # handle module-info.java separately as it needs at least JDK 9 - if [[ -n ${moduleinfo} ]]; then + if [[ -n ${moduleinfo} ]] && [[ ${target#1.} -lt 9 ]]; then if java-pkg_is-vm-version-ge "9" ; then local tmp_source=${JAVA_PKG_WANT_SOURCE} tmp_target=${JAVA_PKG_WANT_TARGET} @@ -528,16 +529,17 @@ java-pkg-simple_src_test() { # gathering sources for testing # if target < 9, we need to compile module-info.java separately # as this feature is not supported before Java 9 - if [[ java-pkg_get-target -lt 9 ]]; then + local target="$(java-pkg_get-target)" + if [[ ${target#1.} -lt 9 ]]; then find "${JAVA_TEST_SRC_DIR[@]}" -name \*.java ! -name module-info.java > ${test_sources} - moduleinfo=$(find "${JAVA_TEST_SRC_DIR[@]}" -name module-info.java) else find "${JAVA_TEST_SRC_DIR[@]}" -name \*.java > ${test_sources} fi + moduleinfo=$(find "${JAVA_TEST_SRC_DIR[@]}" -name module-info.java) # compile if [[ -s ${test_sources} ]]; then - if [[ -n ${moduleinfo} ]] || [[ java-pkg_get-target -lt 9 ]]; then + if [[ -z ${moduleinfo} ]] || [[ ${target#1.} -lt 9 ]]; then ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ ${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${test_sources} else @@ -548,7 +550,7 @@ java-pkg-simple_src_test() { fi # handle module-info.java separately as it needs at least JDK 9 - if [[ -n ${moduleinfo} ]]; then + if [[ -n ${moduleinfo} ]] && [[ ${target#1.} -lt 9 ]]; then if java-pkg_is-vm-version-ge "9" ; then local tmp_source=${JAVA_PKG_WANT_SOURCE} tmp_target=${JAVA_PKG_WANT_TARGET} diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass index e10f2f7611ee..9bf84fe13118 100644 --- a/eclass/postgres.eclass +++ b/eclass/postgres.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: postgres.eclass @@ -27,7 +27,7 @@ _POSTGRES_ECLASS=1 # @DESCRIPTION: # List of versions to reverse sort POSTGRES_COMPAT slots -_POSTGRES_ALL_VERSIONS=( 9999 16 15 14 13 12 11 ) +_POSTGRES_ALL_VERSIONS=( 9999 16 15 14 13 12 ) |