dev-dotnet/dotnet-runtime-bin: upgrade, add musl

4 files changed, 41 insertions, 23 deletions

diff --git a/dev-dotnet/dotnet-runtime-bin/Manifest b/dev-dotnet/dotnet-runtime-bin/Manifest
index 146e455..78805a8 100644
--- a/dev-dotnet/dotnet-runtime-bin/Manifest
+++ b/dev-dotnet/dotnet-runtime-bin/Manifest
@@ -1,9 +1,15 @@
 DIST dotnet-runtime-3.1.32-linux-arm.tar.gz 31846724 BLAKE2B c3515a186492cebe9fc5d094c5d983fe7cc9eb6747d3ef2600fcf5fa628c1e17fc1a05c32cb5679a819702c92250e53bfe29c8e6932cfd1abdd392231363d042 SHA512 eaa5e439e9a70ca72a1de731e4b2b7b97e59c8d60bc694e0a08c8da6246aaecc3498dc14729c83140039a285a8cda8fcd334bdc81e507d97c2f92b9dffcf0140
 DIST dotnet-runtime-3.1.32-linux-arm64.tar.gz 30300088 BLAKE2B c6ff1d6e3b451712df38ebe8694bc9a3b9b3ebc5125b73c274f823c25bc755083b49134e3d10ff4a3a75516cb2f6c72ce1162bd2135749506e6fa56e906d4f08 SHA512 ff311df0db488f3b5cc03c7f6724f8442de7e60fa0a503ec8f536361ce7a357ad26d09d2499d68c50ebdfa751a5520bba4aaa77a38b191c892d5a018561ce422
 DIST dotnet-runtime-3.1.32-linux-x64.tar.gz 30466403 BLAKE2B 0e79d0bc3319529f6ebf00b6b7bb0010b7f62cee89aabab22758e3f9935926415a00351169dc96fb9286c244ca59b55215c8da8e318e6750c7eddb7defe0d5c6 SHA512 a1de9bbc3d2e3a4f5f52b7742c678b182a58a724d36232997511e390027044d60144a7e010a29d6ee016ec91f2911daef28ac5712a827fff8bdde73314b7e002
-DIST dotnet-runtime-6.0.12-linux-arm.tar.gz 28624442 BLAKE2B 7b0c0f8f0a15e870cd087d2989ceffc9a39f16155d8256b4a7a5d748da37f80bccceaac0f9ddd5771589c5fe9ce2547e39b184e728cae535b5f1c6a73e169705 SHA512 c3bf5d831ed36a42f8b775923eb7f039fc2bd36d87f13228ef2005dad74744c8f49f1359bcd34bba244eed64d365eb40d35e76bd3dd41faa47428c1c652ebef4
-DIST dotnet-runtime-6.0.12-linux-arm64.tar.gz 28387811 BLAKE2B f792d474aafa21058e63eebc4d5268f13bd863f46e39c4fceaa2a63475c7320bc3ed4fd2545d9ac334fbf8b919094792d14b1186200ab49a95badddd2f4b020b SHA512 4fc1b7ca6429abcf586a2d106b2b7e345d024c174a303a607c21f7a00071362ca9f7f85e2c583db18caa597a0404af379a740c0fd180045051ab081d571a9a25
-DIST dotnet-runtime-6.0.12-linux-x64.tar.gz 30688050 BLAKE2B 3d9e061de584f73054e5de9ffc36fec640b5264dea95dc07fea3ee24457989a3742c88f2dcf19ea89d23f784e5d0b5c32b09b6d0570b9e5e97fe0fd7363f2a1f SHA512 74fc12712a1ab29f864592c21252db9710bebc965f502d0eb2ae5473da1d9bd3381195859cc452e3beec0ac91094e1c034c6a51c0378dada65fb2581efb73f13
-DIST dotnet-runtime-7.0.1-linux-arm.tar.gz 29655058 BLAKE2B 4af51ca6c22084d6e59948370e88a9adf538fc3aa259ef0cc460af940e28a4cbf8b284cb2ec548e571be5c9d2bf1c4a6ab2fa744680e2e1ac9f08f305b3b9664 SHA512 2ff35a40fe8809743eacea8d38c15aaffa54f17aaaaa07914c437e912c7253ae7d143fb8a968ed98238af8cb6d14f36b5b062a6a4297c16bae75b46f3b040e26
-DIST dotnet-runtime-7.0.1-linux-arm64.tar.gz 29764670 BLAKE2B 424e5d505d1a2795b3f2794bc4db9522b3f89d243e5a59b3e15688a6f40a9651561bd783a15a0293e4469f8095b3e8c900bf7f5db4870dac6c25ae332b69b950 SHA512 53e9b03326c2fdb8d2366a97f3cfbeca4f0f497b82cf665d5d4543f5d0fa8a177c53e8f48597f79072e962e3c7ef6baaca96143c2f775be52071e8ebbae88f34
-DIST dotnet-runtime-7.0.1-linux-x64.tar.gz 31479781 BLAKE2B 050b7826799d05a59b436fda9144f2ca629f033b77e9c46454fbd855c986176ef81dce25ed0abd6158575f80533e24c83d4d5494c7ac3634d81e6c48128b73a2 SHA512 db79b221f6bfa4d56fe0e2b7c237612bd74a81deb18f038ab7226b9e06eaea6e90909f1493f0ab4cf7778b6544b8aaa1295ece1c4a9f1fe39ca44bbfaced46c7
+DIST dotnet-runtime-6.0.21-linux-arm.tar.gz 28658107 BLAKE2B 48d44a8116c631c8d9c14d81825cf9800631de8cc63c86451f47a3e18aad180ae5f1c5ba5c13cf47737074e003307bd2707a819603545667fcf098fa03fdb9f8 SHA512 a265c05ff50bee5e6d2b46f6117bab812e5348f56914945d09694627a2ea6f309fbd9f5a2656ff90c566fa0208a6119bb87a3fcf26417d64de5549d650c262b6
+DIST dotnet-runtime-6.0.21-linux-arm64.tar.gz 28407878 BLAKE2B 6be0a9643af7c6257b2acef367a231dd7cefde1f8b3589022983e81e0776d6471be481e32783c35ca8cf30c1b8138cb802bd7b88247daef1b729ad589d0cd021 SHA512 f34e1319ded1e1115ceb63eab16a4ac7096e36e3236f8117f61ec9f0e19dd50adb473e1213a1018abfaedc4da57519b85058e7b14187a33e0b91e79af4dabf63
+DIST dotnet-runtime-6.0.21-linux-musl-arm.tar.gz 28680123 BLAKE2B df3c551354009897cbe84236c35e096ff8840d2e881940563407ddeecdf8a0d65fc9e9bde26e1efb8473cfc4d3add761139e7e07cb2fbc3a50abf78f487b173c SHA512 e021f7a2290358ffa130cfb356831ebb06cf6582dccec85a8b1e6004c100972dfb60854e0a2d7f31d09a579ebfa125d4c44e7a150a89e9040f08c06f963624f5
+DIST dotnet-runtime-6.0.21-linux-musl-arm64.tar.gz 28430445 BLAKE2B 437b297e3eacf9c25c71882164fa9dc2f5cc3b17f800132da8b347be16df36956119796e17884934e6c3732948d147ad5341119a430dc21c73e09abfcb1c657f SHA512 827bd3b6117ed674ae290b2b80598551b91e67766533895fbd375b121e813f9d7927797fc91aafe3bf2cac927173703c7dbb4fd18dcc6a2648bf1f973dc86fec
+DIST dotnet-runtime-6.0.21-linux-musl-x64.tar.gz 30254930 BLAKE2B 120466ea08604c4c1727b8be3c58a4e7e6042f5fa0a5524e34b93b55955ec6f99657fbc100ae120aa53e8dd5f315c09c8918ecabd34f3c69c874530dc9dc8411 SHA512 f5205bd0703a8c6db5dc4157849a734103bf2495ae10b15dce38cc03f12195b1a615367bc1f87a2ec4a05472753cd99858b8be2b74adfb93c3b558ebe1f045a1
+DIST dotnet-runtime-6.0.21-linux-x64.tar.gz 30707364 BLAKE2B f2492c46341ffbce60d69c0f24effd857d1895f9a92aa4b5d065f4f849edb7317905fbbebe7ae2ca29774c8938803986f9072ebbfbe8d403fa018f19015276ca SHA512 9b1573f7a42d6c918447b226fda4173b7db891a7290b51ce36cf1c1583f05643a3dda8a13780b5996caa2af36719a910377e71149f538a6fa30c624b8926e0cd
+DIST dotnet-runtime-7.0.10-linux-arm.tar.gz 29657370 BLAKE2B 7c0550f8bb0e8b61d977f58f8d5d3ac015ef1accfcb1277daea49e5f5b4996f6e90b91ae6f71ac1666e8dc6c796316325d66997118fa6e4577136447312d99bd SHA512 15538acaa6799c37d1caf493bd5d94e567c70e6e17dd0b538f4a7ad795d060960181fa8a82c553466cb0ee58b21f4021246395f2b4a27a6dc6d6fe0dfbf53c74
+DIST dotnet-runtime-7.0.10-linux-arm64.tar.gz 29770350 BLAKE2B 9c6f160d608c5afad2e730975348c578f269017b4804bfd7a4dc57109c5e4dc47a9bd0e863a3f620762fdcce7b83c3ec90e1950d4ffdb2f4272cfdd4a6582337 SHA512 e90b68b272d5db7cf8665bf052fb0300d50a69818d70675442dc891654d140f7f84527b849860589bf152de1d00aa55dc15ee32f5678d46ea0069210fd002b03
+DIST dotnet-runtime-7.0.10-linux-musl-arm.tar.gz 29674697 BLAKE2B 8ecf0dd1cdeb757f764cf25684fc854c2740dace757b537443ac007aea6b50063ee72361615948f5e95e34e538fc374e084e9254536a259829954474ea6838dc SHA512 c2280801d61774ac7243d6507aca9134d6757b49513523bca8f31b0f068793c66b4eed6a352607e63e73d5cc6fff26ac05157ec5d25160ac2269c1ecef6bdad1
+DIST dotnet-runtime-7.0.10-linux-musl-arm64.tar.gz 29768438 BLAKE2B af0fff73973b94b487318019639e56ed261345a2e08a3ec3d25fe9d23179e0b5a6d906afbb8be96382a31c84ba4e5cf2fcf7a91af2e3592d5d73874e15672ddd SHA512 660033371ee3a5ae06d64c366a1e1811c19da22eb8e23d67b5fd1c16dda2e52c9650d8c1c9bab6c289a76f89cc61ae97490c01de2f4e908de9e9b82777e97ef0
+DIST dotnet-runtime-7.0.10-linux-musl-x64.tar.gz 31050507 BLAKE2B d6b884269f84c7219cf4a1b842bc0307df61e96bd6a67109caa5edabe3b072db149cf311ad9a135e7c6920cb3fb49fc0cf4044f79616cc665f58e4b91b3a4de8 SHA512 9d494a4748298c494609112d695439c114a42480f58d5b4cadd78a889ecb1b00ff10898cd7c3455589ac367d5a877bdc03621f74901355f063139778ae044c8b
+DIST dotnet-runtime-7.0.10-linux-x64.tar.gz 31493010 BLAKE2B 871559081bfe172dee03796513904c97fae80ee9144c1899479e2f3429229306a1dd988862d52705f11b67ac46111d0fa5dc000b97c2232e438abdff4331522a SHA512 f15b6bf0ef0ce48901880bd89a5fa4b3ae6f6614ab416b23451567844448f2510cf5beeeef6c2ac33400ea013cda7b6d2a4477e7aa0f36461b94741161424c3e
diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.32.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.32.ebuild
index 701889a..fd5ec0d 100644
--- a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.32.ebuild
+++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.32.ebuild
@@ -18,14 +18,14 @@ KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="dotnet-symlink kerberos lttng"
 REQUIRED_USE="elibc_glibc"
 QA_PREBUILT="*"
-RESTRICT="splitdebug"
+RESTRICT+=" splitdebug"
 RDEPEND="
 	kerberos? ( app-crypt/mit-krb5:0/0 )
 	lttng? ( dev-util/lttng-ust:0 )
 	sys-libs/zlib:0/1
 	dotnet-symlink? (
 		!dev-dotnet/dotnet-sdk[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)]
+		!dev-dotnet/dotnet-sdk-bin
 		!dev-dotnet/dotnet-runtime[dotnet-symlink(+)]
 	)
 "
@@ -46,11 +46,11 @@ src_install() {
 	dodir "${dest%/*}"
 
 	{ mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die
-	dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
 
 	if use dotnet-symlink; then
 		dosym "../../${dest}/dotnet" "/usr/bin/dotnet"
 		dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}"
+		dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
 
 		# set an env-variable for 3rd party tools
 		echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die
diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.12.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.21.ebuild
index c12d54c..3d47925 100644
--- a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.12.ebuild
+++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.21.ebuild
@@ -7,25 +7,31 @@ DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
 HOMEPAGE="https://dotnet.microsoft.com/"
 LICENSE="MIT"
 
+gen_src_uri() {
+	echo "$1? (
+		elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-${2:-$1}.tar.gz )
+		elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-musl-${2:-$1}.tar.gz )
+	)"
+}
+
 SRC_URI="
-amd64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-x64.tar.gz )
-arm? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm.tar.gz )
-arm64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm64.tar.gz )
+	$(gen_src_uri amd64 x64)
+	$(gen_src_uri arm)
+	$(gen_src_uri arm64)
 "
 
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="+dotnet-symlink kerberos lttng"
-REQUIRED_USE="elibc_glibc"
+IUSE="dotnet-symlink kerberos lttng"
 QA_PREBUILT="*"
-RESTRICT="splitdebug"
+RESTRICT+=" splitdebug"
 RDEPEND="
 	kerberos? ( app-crypt/mit-krb5:0/0 )
 	lttng? ( dev-util/lttng-ust:0 )
 	sys-libs/zlib:0/1
 	dotnet-symlink? (
 		!dev-dotnet/dotnet-sdk[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)]
+		!dev-dotnet/dotnet-sdk-bin
 		!dev-dotnet/dotnet-runtime[dotnet-symlink(+)]
 	)
 "
diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-7.0.1.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-7.0.10.ebuild
index c12d54c..3d47925 100644
--- a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-7.0.1.ebuild
+++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-7.0.10.ebuild
@@ -7,25 +7,31 @@ DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
 HOMEPAGE="https://dotnet.microsoft.com/"
 LICENSE="MIT"
 
+gen_src_uri() {
+	echo "$1? (
+		elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-${2:-$1}.tar.gz )
+		elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-musl-${2:-$1}.tar.gz )
+	)"
+}
+
 SRC_URI="
-amd64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-x64.tar.gz )
-arm? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm.tar.gz )
-arm64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm64.tar.gz )
+	$(gen_src_uri amd64 x64)
+	$(gen_src_uri arm)
+	$(gen_src_uri arm64)
 "
 
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="+dotnet-symlink kerberos lttng"
-REQUIRED_USE="elibc_glibc"
+IUSE="dotnet-symlink kerberos lttng"
 QA_PREBUILT="*"
-RESTRICT="splitdebug"
+RESTRICT+=" splitdebug"
 RDEPEND="
 	kerberos? ( app-crypt/mit-krb5:0/0 )
 	lttng? ( dev-util/lttng-ust:0 )
 	sys-libs/zlib:0/1
 	dotnet-symlink? (
 		!dev-dotnet/dotnet-sdk[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)]
+		!dev-dotnet/dotnet-sdk-bin
 		!dev-dotnet/dotnet-runtime[dotnet-symlink(+)]
 	)
 "