[gentoo-commits] repo/gentoo:master commit in: dev-lang/dafny/

[Maciej Barć]

commit:     6b0f2999c4b2a7996376971616d3552ce4d732a6
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  6 12:55:31 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Fri Oct  6 15:20:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b0f2999

dev-lang/dafny: clean environment in pkg_setup

force clean _JAVA_OPTIONS

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-lang/dafny/dafny-4.3.0.ebuild | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dev-lang/dafny/dafny-4.3.0.ebuild 
b/dev-lang/dafny/dafny-4.3.0.ebuild
index 1e7294b7512d..216aec617ebc 100644
--- a/dev-lang/dafny/dafny-4.3.0.ebuild
+++ b/dev-lang/dafny/dafny-4.3.0.ebuild
@@ -430,6 +430,15 @@ DOCS=(
 )
 
 pkg_setup() {
+       # Clean the environment.
+       unset NPM_CONFIG_USERCONFIG
+
+       if [[ -n "${_JAVA_OPTIONS}" ]] ; then
+               ewarn "Cleaning _JAVA_OPTIONS because when set compile and test 
may fail"
+
+               unset _JAVA_OPTIONS
+       fi
+
        check-reqs_pkg_setup
        dotnet-pkg_pkg_setup
        java-pkg-2_pkg_setup
@@ -449,10 +458,6 @@ src_unpack() {
 }
 
 src_prepare() {
-       # Clean the environment.
-       unset NPM_CONFIG_USERCONFIG
-       unset _JAVA_OPTIONS
-
        # Remove bad tests (recursive).
        local -a bad_tests
        bad_tests=(