gentoo resync : 22.12.2021

5 files changed, 63 insertions, 2 deletions

diff --git a/dev-dotnet/Manifest.gz b/dev-dotnet/Manifest.gz
index 8fa9ba4365b1..56f0f5d3d866 100644
--- a/dev-dotnet/Manifest.gz
+++ b/dev-dotnet/Manifest.gz
diff --git a/dev-dotnet/dotnet-sdk-bin/Manifest b/dev-dotnet/dotnet-sdk-bin/Manifest
index c570a9039ba3..deac35c883d2 100644
--- a/dev-dotnet/dotnet-sdk-bin/Manifest
+++ b/dev-dotnet/dotnet-sdk-bin/Manifest
@@ -4,6 +4,10 @@ DIST dotnet-sdk-5.0.301-linux-x64.tar.gz 142255332 BLAKE2B 172888e2eb78d2f768cff
 DIST dotnet-sdk-6.0.100-linux-arm.tar.gz 170285721 BLAKE2B b15484a3dd3472cd1b26b88b766b9bcc23bb9191cecde3052c619ef70337fae533b87610fb124d898d9c91645a76183ae27c4e073dcb3d9f599c2708305b3b5e SHA512 c1e555893c48c4f4256d3e6b1d36b31d8a4d7763a6e958fb63dd31436c660648d481612b5e25d79a613e84a1954f5eac2c9c2b740bf410958172780f7bbeaeb3
 DIST dotnet-sdk-6.0.100-linux-arm64.tar.gz 168213476 BLAKE2B ae16caed1a9b7b50f1141dafd8b47001d7e8d1d166809c7db143d3386d420b43728c01e010cf14757290032dc7779997d28a5ed168ffe40e9ea7f2aed53cc9d1 SHA512 e5983c1c599d6dc7c3c7496b9698e47c68247f04a5d0d1e3162969d071471297bce1c2fd3a1f9fb88645006c327ae79f880dcbdd8eefc9166fd717331f2716e7
 DIST dotnet-sdk-6.0.100-linux-x64.tar.gz 173759744 BLAKE2B fea1754290fbdbeb1e46a1e1e1f0b210010a5bee648d5a1e4a39cbe3d95d9903ba1f992ee5e3a9e410b622f9c058e316f16567f2df524dfbe8d230b383567b64 SHA512 cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b
+DIST dotnet-sdk-6.0.101-linux-arm.tar.gz 169694030 BLAKE2B 71b13ebe3e7a108a808011c0ac9cae55cdc9c321a6884a194e26aa564dc421d7c2ee671f7fce1c18a6e06eea16837d54db0bdf9c93334a73245f8e8be412bbcd SHA512 f9e212dc4cccbe665d9aac23da6bdddce4957ae4e4d407cf3f1d6da7e79784ebd408c3a59b3ecc6ceaa930b37cf01a4a91c6b38517970d49227e96e50658cc46
+DIST dotnet-sdk-6.0.101-linux-arm64.tar.gz 167474911 BLAKE2B fed8915bd9564c271265b3f517ece94f3e5929fc8700d0a043e2dc1ccd8aa5fa3377371bf65d490c6c061be5409f61b66b91b4377f154450fd305fdb0d2f61ff SHA512 04cd89279f412ae6b11170d1724c6ac42bb5d4fae8352020a1f28511086dd6d6af2106dd48ebe3b39d312a21ee8925115de51979687a9161819a3a29e270a954
+DIST dotnet-sdk-6.0.101-linux-x64.tar.gz 173671008 BLAKE2B 340ddcfae67f2bbe4dd915c53977bb9b7b32c86837412a4fcb7edc78bb19584df94a893ae894141654547f4969486114addb0074383a5f09ff89c4534554c854 SHA512 ca21345400bcaceadad6327345f5364e858059cfcbc1759f05d7df7701fec26f1ead297b6928afa01e46db6f84e50770c673146a10b9ff71e4c7f7bc76fbf709
 EBUILD dotnet-sdk-bin-5.0.301.ebuild 1348 BLAKE2B 1a3fcf60fee6bc0054330f1f1e5522203a83402f82558499cb6c8fefb47419b617e155018f3dfebf25974bbb3c1caa5dedc1ddcdc483fd47de62f55e5eeec2f8 SHA512 43b1f9c46ebda1e582fae02be5fe24c9299351c0529446465fd8164bf36e3917f82890d8a3a95f0036f0d0e1ebdcf750ef47d648e9c055d05c6f937277595cfa
 EBUILD dotnet-sdk-bin-6.0.100.ebuild 1790 BLAKE2B 819af57f6b27c7a0c63a604bc8b663b27159c8d79296be1b63a07c0946fdf11321d2be98d4eaf2c8d44fc7176652a200c2c64e232fb0eb2c7f9acc6f850d59f0 SHA512 97744a8917fb4a94ed26bd61a9bc5c1587421efd18afa428b1d62d25676e081f627b80caa53d335387ab966ad8a6cddda477016bc2fd918b5e265d2b6eac3e23
+EBUILD dotnet-sdk-bin-6.0.101.ebuild 1790 BLAKE2B 819af57f6b27c7a0c63a604bc8b663b27159c8d79296be1b63a07c0946fdf11321d2be98d4eaf2c8d44fc7176652a200c2c64e232fb0eb2c7f9acc6f850d59f0 SHA512 97744a8917fb4a94ed26bd61a9bc5c1587421efd18afa428b1d62d25676e081f627b80caa53d335387ab966ad8a6cddda477016bc2fd918b5e265d2b6eac3e23
 MISC metadata.xml 409 BLAKE2B 9ca816be38e5b6ac61e3f2878f767404078167aa8e7e25286427319878b499e6430204141579b409253f17c7438933edab377fff5747859c08cf8bc7ac937f17 SHA512 2124293e53d388f13be1789e342c9743b5a17ed96fa9a7364ac207fc391e52e8ff26b2dea9f39eb9fa43a89fc6ff14004c4443fa56a1c57af5451d98dabd148c
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.101.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.101.ebuild
new file mode 100644
index 000000000000..a52d40cfec34
--- /dev/null
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.101.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV="${PV}"
+
+DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
+HOMEPAGE="https://dotnet.microsoft.com/"
+LICENSE="MIT"
+
+SRC_URI="
+amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-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 )
+"
+
+SLOT="6.0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+dotnet-symlink"
+REQUIRED_USE="elibc_glibc"
+QA_PREBUILT="*"
+RESTRICT+=" splitdebug"
+RDEPEND="
+	app-crypt/mit-krb5:0/0
+	dev-util/lttng-ust:0
+	sys-libs/zlib:0/1
+	dotnet-symlink? (
+		!dev-dotnet/dotnet-sdk[dotnet-symlink(+)]
+		!dev-dotnet/dotnet-sdk-bin:5.0[dotnet-symlink(+)]
+	)
+"
+
+S=${WORKDIR}
+
+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}"
+
+	if use dotnet-symlink; then
+		dosym "../../${dest}/dotnet" "/usr/bin/dotnet"
+		dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}"
+
+		# set an env-variable for 3rd party tools
+		echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die
+		doenvd "${T}/90${PN}-${SLOT}"
+	fi
+}
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index b8316c95eac7..cfcc94c58293 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -1,4 +1,4 @@
 DIST libgdiplus-6.0.2.tar.gz 1377140 BLAKE2B 5c639a14371eadee0bfa2ad135284089c65212bde0909d21af8f80fd5bdf7283a8aa688ed88df374a0eac0696a377ba05419b12d9a93b37550c020d2b9961ee0 SHA512 b334846cf9471e6f81a3e0a2d6b68c9a39f52e6b22833432e34d3823ae12e3aa9d481806ea9a078463a77f56f3265633447d6709c5ade86ea117d3690f16472c
-EBUILD libgdiplus-6.0.2-r1.ebuild 1417 BLAKE2B 6c3c66e220174c9915491fa9aeb26727c6d1ec5375ee508a8b5cc1397a0c56f55415f534b6fef956d5755fa3b49513a0d80574ffed7b0218cdeffafee82b9d6b SHA512 3e03de23d55b8338b2f976de6d417e9c50faac8c2ad9b2a96c4ff09e96f09eba5c762be57723ef339737738102b1a4704164aa32f780d0a1e4c1b6f00071c8da
+EBUILD libgdiplus-6.0.2-r1.ebuild 1415 BLAKE2B 52c1ac02b7022726c564f83e5bb25c09d7ced2c2a3c0e44281871d386fd8814a95165fe343b5ac6836de2a1a87d0d562d8d75c5d3460aaa6e8f824a3d510cdc4 SHA512 f546a8be74334a50c68872ee4e53bcb33f766ba5966a08890db04ea1a92645e168e604bf02849467a5d0bf20b46a04495189222db2e8317795c3d8b1aa3b1177
 EBUILD libgdiplus-6.0.2.ebuild 1133 BLAKE2B 15cb434158f957ca1835d8dd5a53e809af2819fd02df156b11b6c6b0a6ceb3568a878f22c6a58e75cdb863c1912624b0d95d73743ed79a1b0d38dfc3e5515ff1 SHA512 37b67bda8d89a34633c446dba3770aec4efbf5a684c68ed1b4cb38364553c29bb18da7fd1a4e18d076d4c4b176be5c868e5603f1404f3b95a927165c4489b00b
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-dotnet/libgdiplus/libgdiplus-6.0.2-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-6.0.2-r1.ebuild
index 6de35495da5d..204f30e68564 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-6.0.2-r1.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-6.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.mono-project.com/sources/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cairo"
 #skip tests due https://bugs.gentoo.org/687784
 RESTRICT="test"