gentoo auto-resync : 16:12:2022 - 15:36:37

2 files changed, 22 insertions, 13 deletions

diff --git a/dev-dotnet/dotnet-sdk-bin/Manifest b/dev-dotnet/dotnet-sdk-bin/Manifest
index a765446ac14d..4b4c1ab372bc 100644
--- a/dev-dotnet/dotnet-sdk-bin/Manifest
+++ b/dev-dotnet/dotnet-sdk-bin/Manifest
@@ -1,7 +1,3 @@
-DIST dotnet-sdk-3.1.422-linux-arm.tar.gz 128580438 BLAKE2B 8f334b67bf5a9059ed8e5556b82c8ab1c9d8d5f497ec94399dff51c963574141099d4438b8308a73dedcf80d8d1f1627d5853b130160282e0c8bf3d6d9446b9d SHA512 9cbccaf303f693657f797ae81eec2bd2ea55975b7ae71a8add04175a0104545208fa2f9c536b97d91fa48c6ea890678eb0772a448977bce4acbc97726ac47f83
-DIST dotnet-sdk-3.1.422-linux-arm64.tar.gz 123321453 BLAKE2B 56c2be5f1a788277d7d863343d00b3d60866bf2daee8a94d2754d407b798094ffafe7d82de619a4feb2ad7c681a8602eb0f8b4ed6a07835380219f4a5940c423 SHA512 3eb7e066568dfc0135f2b3229d0259db90e1920bb413f7e175c9583570146ad593b50ac39c77fb67dd3f460b4621137f277c3b66c44206767b1d28e27bf47deb
-DIST dotnet-sdk-3.1.422-linux-musl-x64.tar.gz 123347309 BLAKE2B 3d32108962c7632540d8923cdb589761710e88900dd7d9877104c2effa8b4382001fd0d62a6d0bf9a4aa716aa8ef9b244dd0bd1f30ca380134108dcd96f72182 SHA512 8ac9004d6d6f8c679746de18ee24ac99d1a0d2a3da2fa490adc75462da70c057fd1375debc0d5fd2369aa82bafd8f65d02df04ac497199d13cd71682db09ebd0
-DIST dotnet-sdk-3.1.422-linux-x64.tar.gz 123397283 BLAKE2B 13ba2cacb06c47449ee4329ea556e08b80d88027bbbf0601666f7d02e47fd322ac1b10f5442db830b33fc21eae154994a6a0b8f38263d3e6166113dbb6e13775 SHA512 690759982b12cce7a06ed22b9311ec3b375b8de8600bd647c0257c866d2f9c99d7c9add4a506f4c6c37ef01db85c0f7862d9ae3de0d11e9bec60958bd1b3b72c
 DIST dotnet-sdk-3.1.423-linux-arm.tar.gz 128565109 BLAKE2B b6693073769517dd61fe3122ea43f48cf854080a671bcdd228bd92d6985bcc53b03a3b16bf58fc255fc3c4d858545e6bed0c097d30ebca96a3e35c8f94f43065 SHA512 6b615ec6c1d66280c44ff28de0532ff6a4c21c77caf188101b04bdd58e8935436cb2b049ad9d831799476d421e25795184615c7e1caff8e550855e2f6ed5efd9
 DIST dotnet-sdk-3.1.423-linux-arm64.tar.gz 123539848 BLAKE2B 816ed88d48eb1899874704bec9ab86e415354e2a5da17044da7ffea609b59ae245bda401be374774f3e11fae7d7d21cf3b3de1bbe44cf14cfee83ed4da5afe86 SHA512 ba4f82e939be43ed863f059f69cdfb80b6dfe7cf99638bd6e787b060c2c1c4934440b599c133f61e3a0995f73675ae5d927bb047597cdd6a15b9074891dfd62e
 DIST dotnet-sdk-3.1.423-linux-musl-x64.tar.gz 123438492 BLAKE2B dbc719333d7f11740e39acdd0312afe306abc7b8859c2e90e43a60b8c3957bd45f50a3c4b9224b24d69a96ae12d899328589e0b7a6a760e9de20649770d7b61f SHA512 e3e887c029535c7566437e5e6bb3a2cac44cdf103c247ac528e02c535b3efd860ee9bbd0ef9c570daac91e4012ddc84dca509e1ce23ab293ed7c744edbc9107b
@@ -30,10 +26,16 @@ DIST dotnet-sdk-7.0.100-linux-musl-arm.tar.gz 187501762 BLAKE2B 861f20bce117a76f
 DIST dotnet-sdk-7.0.100-linux-musl-arm64.tar.gz 187585944 BLAKE2B 634d1de263e064640fa28a26f47de243edc328f27a2ad4d2897688aaf834af70d4e326e71323acebd3341e9fff819063e7b424be33bb0c7991f99435c46c2b43 SHA512 8b3e95cc3e80eb05c7a0bc7ede1033320e03c78f4ecb7cc99b85fa99f56d72bc06342f342fe957e4aadacf9fb83fff15e658ae62c8fa8b29051898929c5ea833
 DIST dotnet-sdk-7.0.100-linux-musl-x64.tar.gz 191649364 BLAKE2B 83fe85dd6ed31b2430f88b2e8e3dd5bd1bd44b1dd95bb3c6430fed5141ea8efea5e2af61c210e8ceaf0508ce3c684008ab9c5149ac141e417796785e29019cf5 SHA512 2ee0a055a3e46c6d9ced3cada5f91141b3966e76f4c4b11e58cd4c89ea69408a5b0efaaa21aaa04f743add38f1435f5a5852271a4222d5cd858907ec44f0af2e
 DIST dotnet-sdk-7.0.100-linux-x64.tar.gz 192029252 BLAKE2B 9fceb9e02866115dddc10395edcec5223f3a0694c844b8c242134029e751b8ab9e0999be35cdd73491b23ebcbf7ace1214395379153143c2553d8d999212e810 SHA512 0a2e74486357a3ee16abb551ecd828836f90d8744d6e2b6b83556395c872090d9e5166f92a8d050331333d07d112c4b27e87100ba1af86cac8a37f1aee953078
-EBUILD dotnet-sdk-bin-3.1.422-r3.ebuild 1732 BLAKE2B 0867707fcd127173f5b8bc709b1164d23d928bccff73fd8c012ead19125bf63d713e1152c429a421a1f244d18c45067e732200ca449a90c6108f1b73d4512ab9 SHA512 8cbe88e566ab1bd0b6bb31231fa0f117f71f115b8a9e1acea0fb40f8fefabecd6dd85622c1010a531fec35943354ef38597c1691a1108656ec4c1b5af5bd2172
+DIST dotnet-sdk-7.0.101-linux-arm.tar.gz 190305220 BLAKE2B 0369de215924cb78ce1b2d27549966b4c61b1c0e409dffcd67266e613fb4a4c414db6bc829fa843f56e9f2dbbc1c55a069c56e1f7c3f98b8870039ed826013f0 SHA512 e8aed900dc127c035d21d13d4600a9fb5e921da23d578b3e7c130951e4feb434f6017cd37eb96fbdfb1bae964a364c6981213c3dd358ec9ddd1f7437a394d4de
+DIST dotnet-sdk-7.0.101-linux-arm64.tar.gz 190350115 BLAKE2B 082930153f00b26938d0eeebfc15d3e23480d5defbff2fd823464bfb5c58e99f6521f9c24acc88a3ab634eaa6ab731b4d45d106380bcc477fdffe223e3284957 SHA512 b0874f4167e9792802b46a7ddcf3a7f7bf7329eb3699d4308b1cdd45ef32678962bbd0ccfd186e48e11cac3b198c4415ceac2f5e546d5fcdf0cecb05810863f7
+DIST dotnet-sdk-7.0.101-linux-musl-arm.tar.gz 190310312 BLAKE2B 985f1893d92b82ee18d6ccc03e4cdd0c058675b424716708828bff753457be9c68c3a072763a9e4f50f0bd6fb3750a11d60f77f3dda87b04247c1d89d9af3ed3 SHA512 a454cbffb42b218d3d2d37fdb68f2a15fc32319472abc61d018701b7845d9828c65bb1157eab0789c7073a411fd4744e969bec912e0a4b737c31714acd80006f
+DIST dotnet-sdk-7.0.101-linux-musl-arm64.tar.gz 190224525 BLAKE2B ae4b08eaecf280344b1392939f433cc9ebe10d299a0a5e6919ef778b2f17732a0182a39838de34a5656180cf40ef4d7cc84781b792d74736dd2f1ae694e4bda4 SHA512 341819fe59a7eb2199bafd4e01bd329f522d20e9f8f796676dfd7cdbfe59e1344eeeca6aadbce70fab44d655036ab86bd2b34135c732ebec068009b63f8f510f
+DIST dotnet-sdk-7.0.101-linux-musl-x64.tar.gz 194287688 BLAKE2B c7f14deae3f8f5573b5a22f97db6ed334614915012678ec1c34cb4053ff82a81253b139ed1b90295092b531817f4be0239f29f582e1eb7b9b3cc844c27f7596e SHA512 e487532682df94378387acf07a11583a982418a46ccd07a20258ae8850fd549153d468771d9e44171790322f5fb3571be0ea242863853c5f95ca6697463f7262
+DIST dotnet-sdk-7.0.101-linux-x64.tar.gz 195065284 BLAKE2B 47fb1327c472bc0e530b9424465fe707a7d126ef743bdb98d03fc6a28fbe44c75d8198b775141401eac436ed21acae48497744ebc55312abeb3546a457a09774 SHA512 cf289ad0e661c38dcda7f415b3078a224e8347528448429d62c0f354ee951f4e7bef9cceaf3db02fb52b5dd7be987b7a4327ca33fb9239b667dc1c41c678095c
 EBUILD dotnet-sdk-bin-3.1.423-r4.ebuild 1732 BLAKE2B 0867707fcd127173f5b8bc709b1164d23d928bccff73fd8c012ead19125bf63d713e1152c429a421a1f244d18c45067e732200ca449a90c6108f1b73d4512ab9 SHA512 8cbe88e566ab1bd0b6bb31231fa0f117f71f115b8a9e1acea0fb40f8fefabecd6dd85622c1010a531fec35943354ef38597c1691a1108656ec4c1b5af5bd2172
 EBUILD dotnet-sdk-bin-5.0.408-r4.ebuild 1891 BLAKE2B e2f5d0658820d8af24708e718621f46af9c600d0fe67cff8ec821901be001bf50f50dbcf5253f8946c41512362661d51a8dcceb0d346b1414241457ff719cb47 SHA512 51936436fd9d462c5735a58093fab480e1ae97eee32b13f192eaafd3601fc045c2f1ba2a96ccb3e5c4a940ec7ba8435dfc3d5d759b4cdb18fda43c84343250f7
 EBUILD dotnet-sdk-bin-6.0.401-r4.ebuild 2135 BLAKE2B 7b870eb78cc0d80275f4fa32df51dc87e3aa8a029ae45c4e73ecdee8d25429ffa0f3cf7b802cb049a09a3e49acdaa4c76367e0fd32c982830708d71773ff3b78 SHA512 4e7d1151590306a6e52b33d2f4629a3ec9b3a4c3b7c760f1981a95929ec00079580af34c2d1836a81e9513a61337dd9c2bcb316c2599a77caf0714a637430054
 EBUILD dotnet-sdk-bin-6.0.402-r2.ebuild 2135 BLAKE2B 7b870eb78cc0d80275f4fa32df51dc87e3aa8a029ae45c4e73ecdee8d25429ffa0f3cf7b802cb049a09a3e49acdaa4c76367e0fd32c982830708d71773ff3b78 SHA512 4e7d1151590306a6e52b33d2f4629a3ec9b3a4c3b7c760f1981a95929ec00079580af34c2d1836a81e9513a61337dd9c2bcb316c2599a77caf0714a637430054
 EBUILD dotnet-sdk-bin-7.0.100-r1.ebuild 2135 BLAKE2B 411600fc6879e9bbd2532ac66d93629f2f4fe7fbb44ea9eb977f21869f34e2e3e73f2d6d72f904d7f3754c3115c7155dd30006bbe9b9af46e7abf9db67bf6fa7 SHA512 27a4fa9beed88ad13fe91cc9e2531fbff04430894863c161d58b77aab62f0268d49b22a79a979b78d460b51c52dbc0ba21bdc6ca2aef722d1d2c18495192c8de
+EBUILD dotnet-sdk-bin-7.0.101.ebuild 2135 BLAKE2B 411600fc6879e9bbd2532ac66d93629f2f4fe7fbb44ea9eb977f21869f34e2e3e73f2d6d72f904d7f3754c3115c7155dd30006bbe9b9af46e7abf9db67bf6fa7 SHA512 27a4fa9beed88ad13fe91cc9e2531fbff04430894863c161d58b77aab62f0268d49b22a79a979b78d460b51c52dbc0ba21bdc6ca2aef722d1d2c18495192c8de
 MISC metadata.xml 507 BLAKE2B 96e92550a2ac2c11513a17315a424385cb5466209fe7348402f0935016e5a93f93ffd568cc662d3573f1af5112fce00fa0c73b089e7677379d89310d2e4a7e2a SHA512 c97b4295e23709f30552808f8448ee005ec220aa445af831d7691faf7f8548c5fb9b37e2632468878b95382276f7c4be39bc3a0dfe9731cd4839d8d5821f39dd
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.422-r3.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-7.0.101.ebuild
index 22838fd6af44..36bbf0f46d11 100644
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.422-r3.ebuild
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-7.0.101.ebuild
@@ -14,17 +14,19 @@ amd64? (
 	elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-x64.tar.gz )
 	elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-musl-x64.tar.gz )
 )
-arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm.tar.gz )
-arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm64.tar.gz )
+arm? (
+	elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm.tar.gz )
+	elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-musl-arm.tar.gz )
+)
+arm64? (
+	elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm64.tar.gz )
+	elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-musl-arm64.tar.gz )
+)
 "
 
-SLOT="3.1"
+SLOT="7.0"
 KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="+dotnet-symlink"
-REQUIRED_USE="
-amd64? ( || ( elibc_musl elibc_glibc ) )
-arm? ( elibc_glibc )
-arm64? ( elibc_glibc )"
 QA_PREBUILT="*"
 RESTRICT+=" splitdebug"
 RDEPEND="
@@ -34,9 +36,9 @@ RDEPEND="
 	sys-libs/zlib:0/1
 	dotnet-symlink? (
 		!dev-dotnet/dotnet-sdk[dotnet-symlink(+)]
+		!dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)]
 		!dev-dotnet/dotnet-sdk-bin:5.0[dotnet-symlink(+)]
 		!dev-dotnet/dotnet-sdk-bin:6.0[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-sdk-bin:7.0[dotnet-symlink(+)]
 	)
 "
 
@@ -46,6 +48,11 @@ src_install() {
 	local dest="opt/${PN}-${SLOT}"
 	dodir "${dest%/*}"
 
+	# 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}"