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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 58C21158086 for ; Sat, 4 Dec 2021 20:08:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C9B22BC015; Sat, 4 Dec 2021 20:08:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 EFDD52BC015 for ; Sat, 4 Dec 2021 20:08:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 ABB33342F04 for ; Sat, 4 Dec 2021 20:08:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2DB2A200 for ; Sat, 4 Dec 2021 20:08:00 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1638648468.b8c18f5e5717d32105547c60950e1e4925b797f7.zmedico@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.100.ebuild X-VCS-Directories: dev-dotnet/dotnet-sdk-bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b8c18f5e5717d32105547c60950e1e4925b797f7 X-VCS-Branch: master Date: Sat, 4 Dec 2021 20:08:00 +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: 807821a3-4931-4f20-ad70-bd0688767a3f X-Archives-Hash: b59f19807d8206f3138190dcf4d7b221 commit: b8c18f5e5717d32105547c60950e1e4925b797f7 Author: Andrii Kurdiumov gmail com> AuthorDate: Sat Dec 4 17:31:56 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Dec 4 20:07:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8c18f5e dev-dotnet/dotnet-sdk-bin: Add workload definition for 6.0.100 Add /opt/dotnet-sdk-bin-6.0/metadata/workloads/6.0.100/userlocal file which used to indicate which workloads are installed. Without that file Nuget think this is broken installation and attempt to create that file which become a problem for ebuilds which depends on dotnet. See: https://github.com/dotnet/sdk/pull/18823#issuecomment-915603684 Closes: https://github.com/gentoo/gentoo/pull/23182 Closes: https://bugs.gentoo.org/827712 Signed-off-by: Andrii Kurdiumov gmail.com> Signed-off-by: Zac Medico gentoo.org> dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.100.ebuild | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.100.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.100.ebuild index 8f0c1a6de55f..a52d40cfec34 100644 --- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.100.ebuild +++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.100.ebuild @@ -37,6 +37,12 @@ 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" + + { 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}"