From d47ab5f3d39aecb97eaa4f4ab856f0625aebbed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Fri, 16 Feb 2024 23:29:30 +0100 Subject: [PATCH] dev-dotnet/dotnet-sdk-bin: format; sync MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maciej Barć --- .../dotnet-sdk-bin-6.0.417-r4.ebuild | 8 +++---- .../dotnet-sdk-bin-7.0.404-r4.ebuild | 22 ++++++++++++----- .../dotnet-sdk-bin-8.0.100-r4.ebuild | 24 +++++++++++++------ .../dotnet-sdk-bin-8.0.101-r3.ebuild | 24 +++++++++++++------ 4 files changed, 54 insertions(+), 24 deletions(-) diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.417-r4.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.417-r4.ebuild index 0714019b21556..f3e305f5c58e6 100644 --- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.417-r4.ebuild +++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.417-r4.ebuild @@ -3,6 +3,9 @@ EAPI=8 +SDK_SLOT="$(ver_cut 1-2)" +RUNTIME_SLOT="${SDK_SLOT}.25" + DESCRIPTION=".NET is a free, cross-platform, open-source developer platform" HOMEPAGE="https://dotnet.microsoft.com/ https://github.com/dotnet/dotnet/" @@ -22,11 +25,8 @@ arm64? ( " S="${WORKDIR}" -SDK_SLOT="$(ver_cut 1-2)" -RUNTIME_SLOT="${SDK_SLOT}.25" -SLOT="${SDK_SLOT}/${RUNTIME_SLOT}" - LICENSE="MIT" +SLOT="${SDK_SLOT}/${RUNTIME_SLOT}" KEYWORDS="amd64 arm arm64" # STRIP="llvm-strip" corrupts some executables when using the patchelf hack, diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-7.0.404-r4.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-7.0.404-r4.ebuild index 3e3f048ac1ab2..5b132bbcc2c9f 100644 --- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-7.0.404-r4.ebuild +++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-7.0.404-r4.ebuild @@ -3,6 +3,9 @@ EAPI=8 +SDK_SLOT="$(ver_cut 1-2)" +RUNTIME_SLOT="${SDK_SLOT}.14" + DESCRIPTION=".NET is a free, cross-platform, open-source developer platform" HOMEPAGE="https://dotnet.microsoft.com/ https://github.com/dotnet/dotnet/" @@ -22,17 +25,25 @@ arm64? ( " S="${WORKDIR}" -SDK_SLOT="$(ver_cut 1-2)" -RUNTIME_SLOT="${SDK_SLOT}.14" -SLOT="${SDK_SLOT}/${RUNTIME_SLOT}" - LICENSE="MIT" +SLOT="${SDK_SLOT}/${RUNTIME_SLOT}" KEYWORDS="amd64 arm arm64" # STRIP="llvm-strip" corrupts some executables when using the patchelf hack, # bug https://bugs.gentoo.org/923430 RESTRICT="splitdebug strip" +CURRENT_NUGETS_DEPEND=" + ~dev-dotnet/dotnet-runtime-nugets-${RUNTIME_SLOT} +" +EXTRA_NUGETS_DEPEND=" + ~dev-dotnet/dotnet-runtime-nugets-6.0.25 +" +NUGETS_DEPEND=" + ${CURRENT_NUGETS_DEPEND} + ${EXTRA_NUGETS_DEPEND} +" + RDEPEND=" app-crypt/mit-krb5:0/0 dev-libs/icu @@ -46,8 +57,7 @@ IDEPEND=" app-eselect/eselect-dotnet " PDEPEND=" - ~dev-dotnet/dotnet-runtime-nugets-${RUNTIME_SLOT} - ~dev-dotnet/dotnet-runtime-nugets-6.0.25 + ${NUGETS_DEPEND} " QA_PREBUILT="*" diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.100-r4.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.100-r4.ebuild index 06710163ef351..fdbb81c6c024f 100644 --- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.100-r4.ebuild +++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.100-r4.ebuild @@ -3,6 +3,9 @@ EAPI=8 +SDK_SLOT="$(ver_cut 1-2)" +RUNTIME_SLOT="${SDK_SLOT}.0" + DESCRIPTION=".NET is a free, cross-platform, open-source developer platform" HOMEPAGE="https://dotnet.microsoft.com/ https://github.com/dotnet/dotnet/" @@ -22,17 +25,26 @@ arm64? ( " S="${WORKDIR}" -SDK_SLOT="$(ver_cut 1-2)" -RUNTIME_SLOT="${SDK_SLOT}.0" -SLOT="${SDK_SLOT}/${RUNTIME_SLOT}" - LICENSE="MIT" +SLOT="${SDK_SLOT}/${RUNTIME_SLOT}" KEYWORDS="amd64 arm arm64" # STRIP="llvm-strip" corrupts some executables when using the patchelf hack, # bug https://bugs.gentoo.org/923430 RESTRICT="splitdebug strip" +CURRENT_NUGETS_DEPEND=" + ~dev-dotnet/dotnet-runtime-nugets-${RUNTIME_SLOT} +" +EXTRA_NUGETS_DEPEND=" + ~dev-dotnet/dotnet-runtime-nugets-6.0.25 + ~dev-dotnet/dotnet-runtime-nugets-7.0.14 +" +NUGETS_DEPEND=" + ${CURRENT_NUGETS_DEPEND} + ${EXTRA_NUGETS_DEPEND} +" + RDEPEND=" app-crypt/mit-krb5:0/0 dev-libs/icu @@ -46,9 +58,7 @@ IDEPEND=" app-eselect/eselect-dotnet " PDEPEND=" - ~dev-dotnet/dotnet-runtime-nugets-${RUNTIME_SLOT} - ~dev-dotnet/dotnet-runtime-nugets-6.0.25 - ~dev-dotnet/dotnet-runtime-nugets-7.0.14 + ${NUGETS_DEPEND} " QA_PREBUILT="*" diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.101-r3.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.101-r3.ebuild index 81675d234044d..c12f37a86041f 100644 --- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.101-r3.ebuild +++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.101-r3.ebuild @@ -3,6 +3,9 @@ EAPI=8 +SDK_SLOT="$(ver_cut 1-2)" +RUNTIME_SLOT="${SDK_SLOT}.1" + DESCRIPTION=".NET is a free, cross-platform, open-source developer platform" HOMEPAGE="https://dotnet.microsoft.com/ https://github.com/dotnet/dotnet/" @@ -22,17 +25,26 @@ arm64? ( " S="${WORKDIR}" -SDK_SLOT="$(ver_cut 1-2)" -RUNTIME_SLOT="${SDK_SLOT}.1" -SLOT="${SDK_SLOT}/${RUNTIME_SLOT}" - LICENSE="MIT" +SLOT="${SDK_SLOT}/${RUNTIME_SLOT}" KEYWORDS="~amd64 ~arm ~arm64" # STRIP="llvm-strip" corrupts some executables when using the patchelf hack, # bug https://bugs.gentoo.org/923430 RESTRICT="splitdebug strip" +CURRENT_NUGETS_DEPEND=" + ~dev-dotnet/dotnet-runtime-nugets-${RUNTIME_SLOT} +" +EXTRA_NUGETS_DEPEND=" + ~dev-dotnet/dotnet-runtime-nugets-6.0.26 + ~dev-dotnet/dotnet-runtime-nugets-7.0.15 +" +NUGETS_DEPEND=" + ${CURRENT_NUGETS_DEPEND} + ${EXTRA_NUGETS_DEPEND} +" + RDEPEND=" app-crypt/mit-krb5:0/0 dev-libs/icu @@ -46,9 +58,7 @@ IDEPEND=" app-eselect/eselect-dotnet " PDEPEND=" - ~dev-dotnet/dotnet-runtime-nugets-${RUNTIME_SLOT} - ~dev-dotnet/dotnet-runtime-nugets-6.0.26 - ~dev-dotnet/dotnet-runtime-nugets-7.0.15 + ${NUGETS_DEPEND} " QA_PREBUILT="*"