diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-09-19 17:09:22 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-19 17:09:22 +0100 |
| commit | 590c04803f88a968b4a750c0f420eb314e1fe968 (patch) | |
| tree | a6d2f2550cb2a6ad9254aa1467aef77488ad32ad /eclass | |
| parent | 66d92fc8569d87a09ac014780528dcad2a12b6c6 (diff) | |
gentoo auto-resync : 19:09:2023 - 17:09:22
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39146 -> 39136 bytes | |||
| -rw-r--r-- | eclass/java-pkg-simple.eclass | 6 | ||||
| -rw-r--r-- | eclass/perl-module.eclass | 9 |
3 files changed, 14 insertions, 1 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 3306f9d6fd7e..bd7d5c479dad 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 77038c708256..14650ea7e8d3 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -162,7 +162,11 @@ fi # If ${JAVA_MAIN_CLASS} is set, we will create a launcher to # execute the jar, and ${JAVA_LAUNCHER_FILENAME} will be the # name of the script. -: "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}" +if [[ ${SLOT} = 0 ]]; then + : "${JAVA_LAUNCHER_FILENAME:=${PN}}" +else + : "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}" +fi # @ECLASS_VARIABLE: JAVA_TESTING_FRAMEWORKS # @DEFAULT_UNSET diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass index e2b66e3b6f7d..c9b690992f22 100644 --- a/eclass/perl-module.eclass +++ b/eclass/perl-module.eclass @@ -220,6 +220,8 @@ perl-module_src_configure() { [[ -z ${pm_echovar} ]] && export PERL_MM_USE_DEFAULT=1 # Disable ExtUtils::AutoInstall from prompting export PERL_EXTUTILS_AUTOINSTALL="--skipdeps" + # Noisy and not really appropriate to show to the user in a PM + export PERL_CANARY_STABILITY_DISABLE=1 if [[ $(declare -p myconf 2>&-) != "declare -a myconf="* ]]; then local myconf_local=(${myconf}) @@ -358,6 +360,13 @@ perl-module_src_test() { export NO_NETWORK_TESTING=1 fi + # See https://www.perlmonks.org/?node_id=1225311 + # * AUTOMATES_TESTING appears inappropriate for us, as it affects + # exit codes and might mask failures if configuration is wrong. + # * EXTENDED_TESTING is something we could consider if we had + # some way to opt-in to expensive tests. + export NONINTERACTIVE_TESTING=1 + case ${EAPI} in 7) ;; |