diff options
| -rw-r--r-- | app-shells/pwsh/pwsh-7.4.1-r2.ebuild (renamed from app-shells/pwsh/pwsh-7.4.1-r1.ebuild) | 11 | ||||
| -rw-r--r-- | app-shells/pwsh/pwsh-7.4.5-r2.ebuild (renamed from app-shells/pwsh/pwsh-7.4.5-r1.ebuild) | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/app-shells/pwsh/pwsh-7.4.1-r1.ebuild b/app-shells/pwsh/pwsh-7.4.1-r2.ebuild index 6953d1d14729..029b12e0dff1 100644 --- a/app-shells/pwsh/pwsh-7.4.1-r1.ebuild +++ b/app-shells/pwsh/pwsh-7.4.1-r2.ebuild @@ -7,7 +7,7 @@ EAPI=8 -DOTNET_PKG_COMPAT=8.0 +DOTNET_PKG_COMPAT="8.0" NUGET_APIS=( "https://api.nuget.org/v3-flatcontainer" "https://www.powershellgallery.com/api/v2" @@ -260,7 +260,7 @@ SRC_URI=" LICENSE="MIT" SLOT="$(ver_cut 1-2)" KEYWORDS="amd64 arm arm64" -IUSE="gui" +IUSE="gui vanilla" # TODO: "LibraryImports.g.cs", "PSVersionInfo.g.cs" not found. RESTRICT="test" @@ -291,7 +291,6 @@ DOTNET_PKG_PROJECTS=( ) PATCHES=( "${FILESDIR}/pwsh-7.3.3-disable-update-check.patch" - "${FILESDIR}/pwsh-7.4.0-disable-telemetry.patch" ) DOCS=( CHANGELOG CHANGELOG.md CODE_OF_CONDUCT.md README.md docs ) @@ -342,6 +341,12 @@ pkg_setup() { } src_prepare() { + if ! use vanilla ; then + PATCHES+=( + "${FILESDIR}/pwsh-7.4.0-disable-telemetry.patch" + ) + fi + dotnet-pkg_src_prepare # This is guarded by "RegexGitVersion" in "PowerShell.Common.props". diff --git a/app-shells/pwsh/pwsh-7.4.5-r1.ebuild b/app-shells/pwsh/pwsh-7.4.5-r2.ebuild index 8cf2a585c24f..4f2443ed89d9 100644 --- a/app-shells/pwsh/pwsh-7.4.5-r1.ebuild +++ b/app-shells/pwsh/pwsh-7.4.5-r2.ebuild @@ -7,7 +7,7 @@ EAPI=8 -DOTNET_PKG_COMPAT=8.0 +DOTNET_PKG_COMPAT="8.0" NUGET_APIS=( "https://api.nuget.org/v3-flatcontainer" "https://www.powershellgallery.com/api/v2" @@ -265,7 +265,7 @@ SRC_URI=" LICENSE="MIT" SLOT="$(ver_cut 1-2)" KEYWORDS="~amd64 ~arm ~arm64" -IUSE="gui" +IUSE="gui vanilla" # TODO: "LibraryImports.g.cs", "PSVersionInfo.g.cs" not found. RESTRICT="test" @@ -296,7 +296,6 @@ DOTNET_PKG_PROJECTS=( ) PATCHES=( "${FILESDIR}/pwsh-7.3.3-disable-update-check.patch" - "${FILESDIR}/pwsh-7.4.0-disable-telemetry.patch" "${FILESDIR}/pwsh-7.4.5-downgrade-codeanalysis.patch" ) @@ -348,6 +347,12 @@ pkg_setup() { } src_prepare() { + if ! use vanilla ; then + PATCHES+=( + "${FILESDIR}/pwsh-7.4.0-disable-telemetry.patch" + ) + fi + dotnet-pkg_src_prepare # This is guarded by "RegexGitVersion" in "PowerShell.Common.props". |