gentoo auto-resync : 16:09:2023 - 11:00:10

5 files changed, 76 insertions, 113 deletions

diff --git a/app-shells/pwsh-bin/Manifest b/app-shells/pwsh-bin/Manifest
index 64f775ed6984..591d7f40bc45 100644
--- a/app-shells/pwsh-bin/Manifest
+++ b/app-shells/pwsh-bin/Manifest
@@ -1,13 +1,9 @@
 DIST powershell-7.3.1-linux-arm32.tar.gz 69113434 BLAKE2B 12f1124543eddc64b9d7bc51d14cb994ca24eb64332ef9b10e65eeaff5d61d72e0d307e6fe86771b809fa3e5e7f2ba3526b5b9fcfc397e829f1fe5ffb172674e SHA512 796b14da987260deb20bd01bab9e197776218c5c6cb4f7de78529b234239842ee5dd4ea8fded5e0d00795fe8cd226856cda606a3995095e352ed48f2e6310f77
 DIST powershell-7.3.1-linux-arm64.tar.gz 68034071 BLAKE2B 626218a9936713be19795dec46f7fb9c0b90b7cdc1821497a1438cca27d4e4e3ee56504c40ac1c2d70a4c58a5dc29ce6189724fa3126a3fc737002ccb191e9fb SHA512 3fca8b04dbac991f4419a64de4372aad9aa490a4750894b1ae0052f55e229be8406ed227db047381c5cfbaae78c406f272c4a30737468cb8cfde4fb51782895a
 DIST powershell-7.3.1-linux-x64.tar.gz 71616643 BLAKE2B 16ecc1211f796f92d5cf64ac0dea08da353ff4dad8d6fff5ba22d5347fd74b056c25e7682356c23af1ee1bc9b660bf0df7133848e2b9db280cf7ee7796532d28 SHA512 69c7756252b6958faf8b9c962301ea83eaeddf2c05de6d249e20529b2a5cfe09bcb76b5ac60d47ec3260cdd3ab6981d5d5115fc5379512ff2c2f78c3451cec61
-DIST powershell-7.3.2-linux-arm32.tar.gz 69012331 BLAKE2B d905870e2ba8679057ebc057152d400607be089503b0acec76125644ddd01aa18da0da5f52444fa4cd160df93b1f61ba35e16593cc4d1695346fcf87737b219b SHA512 4ac407ebbf0b38ae7d17011390f759a7998343707fa3b412e1fbd710486fbaa04167941491f781b11c91df2abef0ae3fcc07be5300c1d35d4a62f073810ad1b4
-DIST powershell-7.3.2-linux-arm64.tar.gz 67914800 BLAKE2B 594893f484f5c7831538d402ea2bdd3114f5e3625db527ba92df0eabfc5c24e6f9af1502518cb5b6a3b163302482c9c08be692f44e9a1e343218d815f588e0e2 SHA512 b7f134311747c0f66dac37cce813015cb0ce6ff3d35732effb4d8150b2357fa559e13c69cfe33445acbfc1c73a4e02268fb0307fd1d9319449895579420a6842
-DIST powershell-7.3.2-linux-x64.tar.gz 71500527 BLAKE2B 10e6715f3e96de17b8d1bacc34cdd9711490738323a756ec462960731debf556cb1ed2212647c8ff312c2c7d93a4670c2be5f292117d7eb3f164f30511b11e49 SHA512 c42cd23c0a1fd416d9f1c7b639428af70ef71339cd70629ee459cb5cec940a2376317fef3e251f8dca5fa11ac872a319b96d7472b9d359e102c79d8c47a6ffc9
-DIST powershell-7.3.3-linux-arm32.tar.gz 69047872 BLAKE2B 864ff7619290cb509f46e635afd74043c488922a7fe26585a4221b6d9f9780a10c2abb221d8db1c93ca86119956f7bfa0aedcb64fa2bea37a87fa604692d30bd SHA512 99b2eb2b6d420c84be24491b04b3f2aa2602b473187d55cf55e5fd826cbd34d6da5fa04ea28a026fe6eb852d88d2106ddab8ac24e29d539893daf91cc8a96eb6
-DIST powershell-7.3.3-linux-arm64.tar.gz 67958251 BLAKE2B 86ad243deeabb7173ba61ea51e7b66b2201301c210a56dad5b72d2e389f1430b6a361c7cc895edcd8028034cefab61d8c00d2a90a2c6bf02ffd2b77ce19515de SHA512 62ef16ac9d376af91d47b51d18bedd932ea7886c19b84d16657e9080f6b07e215057cf1588ad7816760b73395545e2f436d40b8a323d3c1b608ce056bb6c6ee0
-DIST powershell-7.3.3-linux-x64.tar.gz 71548865 BLAKE2B ab09580a57371fcbe1638b14d86531a74953c8d8093f2c88f2d13f0611459660ca41d05a92f2333f6086c9ed94fa5c865a066a4e17d195f034de77c75fd7e80b SHA512 e53ebe4eb3dc2e4fcd63b997a819828a8234c37334aafff158af98bcaaef743bfe64c00247224c35ddc04a3d227c8cf859a3f1f261f3cf4f9f57257008f59b86
-EBUILD pwsh-bin-7.3.1.ebuild 1240 BLAKE2B e4f47efbdcb57fd8506401b458b1823beabb2788672d300b7caa12ca6be6e59f5c0fec4775239a8ec549fb9f1bc7dc5fc12c35c03192c7f41e4266c434defd1e SHA512 f953dfe495db0d0067ad6261963836758670edd52afbf0dce65a6018525bb9ad96beeb2d390957ea51fdef38daac4b5860c2be652a6458abb17d1924b2110266
-EBUILD pwsh-bin-7.3.2.ebuild 1241 BLAKE2B ae06b08edc55cd0748a3a6094266e3364b2fe023c7255b2aa263ff13a47e93d88ba52c6861b25b26647418685b59ba362e02c0a9176102b45729428874ffcfa7 SHA512 d48c87e006e2107b3c44f4dc1bae0e3ff9509e70dfcb6674bc30c62479ea7d6c7794ef649b8764b6f1ee11d6a5d110efab37cc8018757a6d300a2df69565e199
-EBUILD pwsh-bin-7.3.3.ebuild 1241 BLAKE2B ae06b08edc55cd0748a3a6094266e3364b2fe023c7255b2aa263ff13a47e93d88ba52c6861b25b26647418685b59ba362e02c0a9176102b45729428874ffcfa7 SHA512 d48c87e006e2107b3c44f4dc1bae0e3ff9509e70dfcb6674bc30c62479ea7d6c7794ef649b8764b6f1ee11d6a5d110efab37cc8018757a6d300a2df69565e199
+DIST powershell-7.3.6-linux-arm32.tar.gz 66514877 BLAKE2B 3ea314d0353e5688bcf51288271da472cc3120436779cfee6a248646e82b9730a6136da12daf1127777232b559d81306f50aac006e5c50fb0375a63f9c4f1de9 SHA512 a97f9a34d64d46664bca1c3963858bdcc84d6e6a67c81df8398faf134d86f459466f0b27f969ab18a1158c60eb7652a49106a654ff3ca5bb296e5d4093df771b
+DIST powershell-7.3.6-linux-arm64.tar.gz 65416423 BLAKE2B dd3855a9e092092930761ef1db9b5fdad523ced69943c57827980e483b61b21229043638c3e620f76827167905d61f23f240a8b128a294197e457ed4a478ace4 SHA512 7a2c1c7ead3cbda7edf6672a241c7f8368ca58b44d1baa634b28a278c154a75bc1f0bc14a0945fcc3dadfe21c1518577901dc765659476856be3575768a161a8
+DIST powershell-7.3.6-linux-x64.tar.gz 68984703 BLAKE2B 36df952abcf1bc116a4a0734313877ae432120b77fe36e6fe68d6db164f6a73809a6f494169e3a4515594356f1d2812379524c6b6c1d90ba4429d87b570ee95c SHA512 da2d19fef2dc056f5012c1e8e3a027f0c3b6fb35f1d5d4bb0a17dc8ddbc015c38269c5b4459a56280bf3191d85bf4513b53d51ea3202bf071df439374a5a5870
+EBUILD pwsh-bin-7.3.1-r1.ebuild 1255 BLAKE2B 26aaffd1d33bc5d6c28a4b54d33b99cc59d7002a97473ea1b9a062526eaaa7fbf2d30f576fdafc5dd30b9321637f8a1af0db936c4d25a49a30662043e9d2abf5 SHA512 96a2545c91723b35a8738625e61d8442c6af6e0ab68e704a9e1a581d23569d8be250441b167b055cd681ee107ea5e5c72f1325b38e7515b807f5f8d8d9a2af9c
+EBUILD pwsh-bin-7.3.6.ebuild 1565 BLAKE2B f66876b4ff5c9418c891eb193df202e7325b04cd2e92c2b2bcee9f32e4db474ebfe43405a4d32868174651b1242e930ade2ac0072940239e4a1017f0aaffb219 SHA512 35332223652a2558361373255f4c794a8b988fdf85480e4d0a974d18b39a94e22f84b5d4f2937e23c87c322df23708a8a694d1f1a0e62e66debc151403851c01
 MISC metadata.xml 1082 BLAKE2B 3e1c57488ad6b31f13445a9480cc9bd8ece18c74862f4ca351ca8f51e9988826bfedb7f7db454736e7ec4d87b8a88b1d03ddfd8220ceda489f804b0fd3f4772a SHA512 d3dae7c30399deef091ed6f7a80e6de1af9b96cd31a3170d4774bd961460b279d94b516af057c4045dfc8346d7e1dd97238c1652e2f5ba7e0039f6fb9b2203c8
diff --git a/app-shells/pwsh-bin/pwsh-bin-7.3.1.ebuild b/app-shells/pwsh-bin/pwsh-bin-7.3.1-r1.ebuild
index b987b3df5a27..3390990bf0a2 100644
--- a/app-shells/pwsh-bin/pwsh-bin-7.3.1.ebuild
+++ b/app-shells/pwsh-bin/pwsh-bin-7.3.1-r1.ebuild
@@ -11,10 +11,10 @@ SRC_URI="
 	arm?   ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-arm32.tar.gz )
 	arm64? ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-arm64.tar.gz )
 "
-S=${WORKDIR}
+S="${WORKDIR}"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="amd64 ~arm ~arm64"
 IUSE="+pwsh-symlink"
 REQUIRED_USE="elibc_glibc"
diff --git a/app-shells/pwsh-bin/pwsh-bin-7.3.2.ebuild b/app-shells/pwsh-bin/pwsh-bin-7.3.2.ebuild
deleted file mode 100644
index c0d59b29fa41..000000000000
--- a/app-shells/pwsh-bin/pwsh-bin-7.3.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="PowerShell - binary precompiled for glibc"
-HOMEPAGE="https://microsoft.com/powershell"
-BASE_URI="https://github.com/PowerShell/PowerShell/releases/download"
-SRC_URI="
-	amd64? ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-x64.tar.gz )
-	arm?   ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-arm32.tar.gz )
-	arm64? ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-arm64.tar.gz )
-"
-S=${WORKDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="+pwsh-symlink"
-REQUIRED_USE="elibc_glibc"
-
-RDEPEND="
-	app-crypt/mit-krb5:0/0
-	dev-util/lttng-ust:0/2.12
-	sys-libs/pam:0/0
-	sys-libs/zlib:0/1
-	|| (
-		dev-libs/openssl-compat:1.0.0
-		=dev-libs/openssl-1.0*:0/0
-	)
-	pwsh-symlink? ( !app-shells/pwsh )
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	local dest=opt/pwsh
-	dodir ${dest}
-
-	local broken_symlinks=( libcrypto.so.1.0.0 libssl.so.1.0.0 )
-	local symlink
-	for symlink in "${broken_symlinks[@]}" ; do
-		[[ -L ${symlink} ]] && { rm "${symlink}" || die ; }
-	done
-
-	mv "${S}/"* "${ED}"/${dest}/ || die
-	fperms 0755 /${dest}/pwsh
-
-	dosym ../../${dest}/pwsh /usr/bin/pwsh-bin
-	use pwsh-symlink && dosym ../../${dest}/pwsh /usr/bin/pwsh
-}
diff --git a/app-shells/pwsh-bin/pwsh-bin-7.3.3.ebuild b/app-shells/pwsh-bin/pwsh-bin-7.3.3.ebuild
deleted file mode 100644
index c0d59b29fa41..000000000000
--- a/app-shells/pwsh-bin/pwsh-bin-7.3.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="PowerShell - binary precompiled for glibc"
-HOMEPAGE="https://microsoft.com/powershell"
-BASE_URI="https://github.com/PowerShell/PowerShell/releases/download"
-SRC_URI="
-	amd64? ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-x64.tar.gz )
-	arm?   ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-arm32.tar.gz )
-	arm64? ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-arm64.tar.gz )
-"
-S=${WORKDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="+pwsh-symlink"
-REQUIRED_USE="elibc_glibc"
-
-RDEPEND="
-	app-crypt/mit-krb5:0/0
-	dev-util/lttng-ust:0/2.12
-	sys-libs/pam:0/0
-	sys-libs/zlib:0/1
-	|| (
-		dev-libs/openssl-compat:1.0.0
-		=dev-libs/openssl-1.0*:0/0
-	)
-	pwsh-symlink? ( !app-shells/pwsh )
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	local dest=opt/pwsh
-	dodir ${dest}
-
-	local broken_symlinks=( libcrypto.so.1.0.0 libssl.so.1.0.0 )
-	local symlink
-	for symlink in "${broken_symlinks[@]}" ; do
-		[[ -L ${symlink} ]] && { rm "${symlink}" || die ; }
-	done
-
-	mv "${S}/"* "${ED}"/${dest}/ || die
-	fperms 0755 /${dest}/pwsh
-
-	dosym ../../${dest}/pwsh /usr/bin/pwsh-bin
-	use pwsh-symlink && dosym ../../${dest}/pwsh /usr/bin/pwsh
-}
diff --git a/app-shells/pwsh-bin/pwsh-bin-7.3.6.ebuild b/app-shells/pwsh-bin/pwsh-bin-7.3.6.ebuild
new file mode 100644
index 000000000000..187d91e3a723
--- /dev/null
+++ b/app-shells/pwsh-bin/pwsh-bin-7.3.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit wrapper
+
+DESCRIPTION="Cross-platform automation and configuration tool (binary package)"
+HOMEPAGE="https://microsoft.com/powershell/
+	https://github.com/PowerShell/PowerShell/"
+
+BASE_URI="https://github.com/PowerShell/PowerShell/releases/download/"
+SRC_URI="
+	amd64? ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-x64.tar.gz )
+	arm64? ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-arm64.tar.gz )
+	arm?   ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-arm32.tar.gz )
+"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+REQUIRED_USE="elibc_glibc"
+
+RDEPEND="
+	app-crypt/mit-krb5:0/0
+	dev-libs/icu
+	dev-util/lttng-ust:0/2.12
+	sys-libs/pam:0/0
+	sys-libs/zlib:0/1
+	|| (
+		dev-libs/openssl-compat:1.0.0
+		=dev-libs/openssl-1.0*:0/0
+	)
+"
+IDEPEND="app-eselect/eselect-pwsh"
+
+QA_PREBUILT="*"
+
+src_install() {
+	local -a broken_symlinks
+	broken_symlinks=( libcrypto.so.1.0.0 libssl.so.1.0.0 )
+
+	local symlink
+	for symlink in "${broken_symlinks[@]}" ; do
+		if [[ -L "${symlink}" ]] ; then
+			rm "${symlink}" || die "failed to remove ${symlink}"
+		fi
+	done
+
+	local dest="opt/${PN}-${SLOT}"
+	local dest_root="/${dest}"
+
+	insinto "${dest_root}"
+	doins -r .
+
+	fperms 0755 "${dest_root}/pwsh"
+
+	local gentoo_path='PSModulePath="${PSModulePath}:/usr/share/GentooPowerShell/Modules:"'
+	make_wrapper "${PN}-${SLOT}" "env ${gentoo_path} ${dest_root}/pwsh"
+}
+
+pkg_postinst() {
+	eselect pwsh update ifunset
+}
+
+pkg_postrm() {
+	eselect pwsh update ifunset
+}