summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Barć <xgqt@gentoo.org>2022-07-21 01:26:14 +0200
committerMaciej Barć <xgqt@gentoo.org>2022-07-21 01:26:14 +0200
commita990931de535384d4d29cb8f48af828b12fa8ad8 (patch)
tree568f3f94084eaa9bd36b68833a2db07be51be90a /dev-dotnet/dotnet-sdk-bin
parentdev-dotnet/dotnet-sdk-bin: icu optfeature (diff)
downloadgentoo-a990931de535384d4d29cb8f48af828b12fa8ad8.tar.gz
gentoo-a990931de535384d4d29cb8f48af828b12fa8ad8.tar.bz2
gentoo-a990931de535384d4d29cb8f48af828b12fa8ad8.zip
dev-dotnet/dotnet-sdk-bin: fix location of the workloads file
Closes: https://bugs.gentoo.org/841896 Signed-off-by: Maciej Barć <xgqt@gentoo.org>
Diffstat (limited to 'dev-dotnet/dotnet-sdk-bin')
-rw-r--r--dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.301-r1.ebuild (renamed from dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.301.ebuild)9
-rw-r--r--dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.302-r1.ebuild (renamed from dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.302.ebuild)9
2 files changed, 8 insertions, 10 deletions
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.301.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.301-r1.ebuild
index 5983f350bfe8..bfdeb499a7c5 100644
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.301.ebuild
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.301-r1.ebuild
@@ -40,12 +40,11 @@ src_install() {
local dest="opt/${PN}-${SLOT}"
dodir "${dest%/*}"
- # 6.0.100 is SDK feature band which will not change between minor increases, so 6.0.101, 6.102
- # will still have same 6.0.100 SDK feature band in the name. Thus I have to hard code this
- # https://github.com/dotnet/sdk/pull/18823#issuecomment-915603684
- local workloads="metadata/workloads/${SLOT}.100"
-
+ # Create a magic workloads file, bug #841896
+ local featureband="$(ver_cut 3 | sed "s/[0-9]/0/2g")"
+ local workloads="metadata/workloads/${SLOT}.${featureband}"
{ mkdir -p "${S}/${workloads}" && touch "${S}/${workloads}/userlocal"; } || die
+
{ mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die
dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.302.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.302-r1.ebuild
index 5983f350bfe8..bfdeb499a7c5 100644
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.302.ebuild
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.302-r1.ebuild
@@ -40,12 +40,11 @@ src_install() {
local dest="opt/${PN}-${SLOT}"
dodir "${dest%/*}"
- # 6.0.100 is SDK feature band which will not change between minor increases, so 6.0.101, 6.102
- # will still have same 6.0.100 SDK feature band in the name. Thus I have to hard code this
- # https://github.com/dotnet/sdk/pull/18823#issuecomment-915603684
- local workloads="metadata/workloads/${SLOT}.100"
-
+ # Create a magic workloads file, bug #841896
+ local featureband="$(ver_cut 3 | sed "s/[0-9]/0/2g")"
+ local workloads="metadata/workloads/${SLOT}.${featureband}"
{ mkdir -p "${S}/${workloads}" && touch "${S}/${workloads}/userlocal"; } || die
+
{ mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die
dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"