From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 19036158094 for ; Wed, 20 Jul 2022 23:26:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12D89E0B7B; Wed, 20 Jul 2022 23:26:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E08CAE0B7B for ; Wed, 20 Jul 2022 23:26:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 833D0340931 for ; Wed, 20 Jul 2022 23:26:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9BBC17F for ; Wed, 20 Jul 2022 23:26:23 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1658359574.a990931de535384d4d29cb8f48af828b12fa8ad8.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-dotnet/dotnet-sdk-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.301-r1.ebuild dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.301.ebuild dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.302-r1.ebuild dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.302.ebuild X-VCS-Directories: dev-dotnet/dotnet-sdk-bin/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: a990931de535384d4d29cb8f48af828b12fa8ad8 X-VCS-Branch: master Date: Wed, 20 Jul 2022 23:26:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 613a9bc8-11e6-4c29-8ffa-72920d492cc3 X-Archives-Hash: c982621062946901a47e667bd32771a9 commit: a990931de535384d4d29cb8f48af828b12fa8ad8 Author: Maciej Barć gentoo org> AuthorDate: Wed Jul 20 23:26:14 2022 +0000 Commit: Maciej Barć gentoo org> CommitDate: Wed Jul 20 23:26:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a990931d dev-dotnet/dotnet-sdk-bin: fix location of the workloads file Closes: https://bugs.gentoo.org/841896 Signed-off-by: Maciej Barć gentoo.org> ...t-sdk-bin-6.0.301.ebuild => dotnet-sdk-bin-6.0.301-r1.ebuild} | 9 ++++----- ...t-sdk-bin-6.0.302.ebuild => dotnet-sdk-bin-6.0.302-r1.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 similarity index 85% rename from dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.301.ebuild rename to 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 similarity index 85% rename from dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.302.ebuild rename to 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}"