diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-22 20:47:41 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-22 20:47:41 +0100 |
| commit | 5deadca7219297a3c1f90eca00544a00e33efdbc (patch) | |
| tree | 1cf7fc930e051b39dbd0d7921edad5f94f729500 /eclass | |
| parent | 614dee2f9d146b148d9c54dd480e7df81ba2f3a7 (diff) | |
gentoo auto-resync : 22:07:2022 - 20:47:41
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 36792 -> 36789 bytes | |||
| -rw-r--r-- | eclass/java-pkg-simple.eclass | 12 | ||||
| -rw-r--r-- | eclass/vala.eclass | 5 |
3 files changed, 14 insertions, 3 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 38b877f1d62c..ecfcb94d2a23 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 1e101a828c40..c0a6b4d21df9 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -134,6 +134,12 @@ fi # JAVA_MAIN_CLASS="org.gentoo.java.ebuilder.Main" # @CODE +# @ECLASS_VARIABLE: JAVA_AUTOMATIC_MODULE_NAME +# @DEFAULT_UNSET +# @DESCRIPTION: +# The value of the Automatic-Module-Name entry, which is going to be added to +# MANIFEST.MF. + # @ECLASS_VARIABLE: JAVADOC_ARGS # @DEFAULT_UNSET # @DESCRIPTION: @@ -418,6 +424,12 @@ java-pkg-simple_src_compile() { jar_args="cf ${JAVA_JAR_FILENAME}" fi jar ${jar_args} -C ${classes} . || die "jar failed" + if [[ -v JAVA_AUTOMATIC_MODULE_NAME ]]; then + cat > "${T}/add-to-MANIFEST.MF" <<< "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \ + || die "add-to-MANIFEST.MF failed" + jar ufmv ${JAVA_JAR_FILENAME} "${T}/add-to-MANIFEST.MF" \ + || die "updating MANIFEST.MF failed" + fi } # @FUNCTION: java-pkg-simple_src_install diff --git a/eclass/vala.eclass b/eclass/vala.eclass index 076ef9066067..4e668d939fac 100644 --- a/eclass/vala.eclass +++ b/eclass/vala.eclass @@ -49,11 +49,10 @@ vala_api_versions() { local minimal_supported_minor_version minor_version # Dependency atoms are not generated for Vala versions older than 0.${minimal_supported_minor_version}. - minimal_supported_minor_version="46" + minimal_supported_minor_version="50" for ((minor_version = ${VALA_MAX_API_VERSION#*.}; minor_version >= ${VALA_MIN_API_VERSION#*.}; minor_version = minor_version - 2)); do - # 0.42 is EOL and removed from tree; remove special case once minimal_support_minor_version >= 44 - if ((minor_version >= minimal_supported_minor_version)) && ((minor_version != 42)); then + if ((minor_version >= minimal_supported_minor_version)); then echo "0.${minor_version}" fi done |