commit: b0903636aa7c45062ad3ad298e79b46e799fc7d7 Author: Gergely Nagy <ngg <AT> ngg <DOT> hu> AuthorDate: Thu Dec 16 14:57:56 2021 +0000 Commit: Gergely Nagy <ngg <AT> ngg <DOT> hu> CommitDate: Thu Dec 16 14:57:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/dotnet.git/commit/?id=b0903636
dev-dotnet/dotnetcore-sdk-bin{-common}: bump to 3.1.416, 5.0.404, 6.0.101 and small fixes Signed-off-by: Gergely Nagy <ngg <AT> ngg.hu> .../dotnetcore-sdk-bin-common-2.1.818.ebuild | 6 +++++- ...mmon-3.1.415.ebuild => dotnetcore-sdk-bin-common-3.1.416.ebuild} | 6 +++++- ...mmon-5.0.403.ebuild => dotnetcore-sdk-bin-common-5.0.404.ebuild} | 6 +++++- ...mmon-6.0.100.ebuild => dotnetcore-sdk-bin-common-6.0.101.ebuild} | 6 +++++- ...ore-sdk-bin-3.1.415.ebuild => dotnetcore-sdk-bin-3.1.416.ebuild} | 0 ...ore-sdk-bin-5.0.403.ebuild => dotnetcore-sdk-bin-5.0.404.ebuild} | 0 ...ore-sdk-bin-6.0.100.ebuild => dotnetcore-sdk-bin-6.0.101.ebuild} | 6 ++++++ 7 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-2.1.818.ebuild b/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-2.1.818.ebuild index a8590c7..7e88c91 100644 --- a/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-2.1.818.ebuild +++ b/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-2.1.818.ebuild @@ -26,7 +26,11 @@ RESTRICT="splitdebug" # The sdk includes the runtime-bin and aspnet-bin so prevent from installing at the same time # dotnetcore-sdk is the source based build -RDEPEND="~dev-dotnet/dotnetcore-sdk-bin-${PV}" +RDEPEND=" + ~dev-dotnet/dotnetcore-sdk-bin-${PV} + !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] + !dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)] +" S=${WORKDIR} diff --git a/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-3.1.415.ebuild b/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-3.1.416.ebuild similarity index 93% rename from dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-3.1.415.ebuild rename to dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-3.1.416.ebuild index 9977e01..eab918a 100644 --- a/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-3.1.415.ebuild +++ b/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-3.1.416.ebuild @@ -26,7 +26,11 @@ RESTRICT="splitdebug" # The sdk includes the runtime-bin and aspnet-bin so prevent from installing at the same time # dotnetcore-sdk is the source based build -RDEPEND="~dev-dotnet/dotnetcore-sdk-bin-${PV}" +RDEPEND=" + ~dev-dotnet/dotnetcore-sdk-bin-${PV} + !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] + !dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)] +" S=${WORKDIR} diff --git a/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-5.0.403.ebuild b/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-5.0.404.ebuild similarity index 93% rename from dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-5.0.403.ebuild rename to dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-5.0.404.ebuild index 9977e01..eab918a 100644 --- a/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-5.0.403.ebuild +++ b/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-5.0.404.ebuild @@ -26,7 +26,11 @@ RESTRICT="splitdebug" # The sdk includes the runtime-bin and aspnet-bin so prevent from installing at the same time # dotnetcore-sdk is the source based build -RDEPEND="~dev-dotnet/dotnetcore-sdk-bin-${PV}" +RDEPEND=" + ~dev-dotnet/dotnetcore-sdk-bin-${PV} + !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] + !dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)] +" S=${WORKDIR} diff --git a/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-6.0.100.ebuild b/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-6.0.101.ebuild similarity index 93% rename from dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-6.0.100.ebuild rename to dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-6.0.101.ebuild index 9977e01..eab918a 100644 --- a/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-6.0.100.ebuild +++ b/dev-dotnet/dotnetcore-sdk-bin-common/dotnetcore-sdk-bin-common-6.0.101.ebuild @@ -26,7 +26,11 @@ RESTRICT="splitdebug" # The sdk includes the runtime-bin and aspnet-bin so prevent from installing at the same time # dotnetcore-sdk is the source based build -RDEPEND="~dev-dotnet/dotnetcore-sdk-bin-${PV}" +RDEPEND=" + ~dev-dotnet/dotnetcore-sdk-bin-${PV} + !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] + !dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)] +" S=${WORKDIR} diff --git a/dev-dotnet/dotnetcore-sdk-bin/dotnetcore-sdk-bin-3.1.415.ebuild b/dev-dotnet/dotnetcore-sdk-bin/dotnetcore-sdk-bin-3.1.416.ebuild similarity index 100% rename from dev-dotnet/dotnetcore-sdk-bin/dotnetcore-sdk-bin-3.1.415.ebuild rename to dev-dotnet/dotnetcore-sdk-bin/dotnetcore-sdk-bin-3.1.416.ebuild diff --git a/dev-dotnet/dotnetcore-sdk-bin/dotnetcore-sdk-bin-5.0.403.ebuild b/dev-dotnet/dotnetcore-sdk-bin/dotnetcore-sdk-bin-5.0.404.ebuild similarity index 100% rename from dev-dotnet/dotnetcore-sdk-bin/dotnetcore-sdk-bin-5.0.403.ebuild rename to dev-dotnet/dotnetcore-sdk-bin/dotnetcore-sdk-bin-5.0.404.ebuild diff --git a/dev-dotnet/dotnetcore-sdk-bin/dotnetcore-sdk-bin-6.0.100.ebuild b/dev-dotnet/dotnetcore-sdk-bin/dotnetcore-sdk-bin-6.0.101.ebuild similarity index 84% rename from dev-dotnet/dotnetcore-sdk-bin/dotnetcore-sdk-bin-6.0.100.ebuild rename to dev-dotnet/dotnetcore-sdk-bin/dotnetcore-sdk-bin-6.0.101.ebuild index 44a6af8..c79026b 100644 --- a/dev-dotnet/dotnetcore-sdk-bin/dotnetcore-sdk-bin-6.0.100.ebuild +++ b/dev-dotnet/dotnetcore-sdk-bin/dotnetcore-sdk-bin-6.0.101.ebuild @@ -56,6 +56,12 @@ src_prepare() { # Skip the common files find . -maxdepth 1 -type f -exec rm -f {} \; || die rm -rf ./packs/NETStandard.Library.Ref || die + + # 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 "${workloads}" && touch "${workloads}/userlocal"; } || die } src_install() {