gentoo auto-resync : 08:10:2023 - 06:02:21

7 files changed, 35 insertions, 61 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index f6f0abe3f4fe..6e006968c9bf 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index b8cedbc4b851..0e2aae281919 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1,3 +1,5 @@
 DIST loksh-7.1.tar.xz 211636 BLAKE2B 7604d6a5d3d3bce7dc51cde1d53ec10b927411afe700192e243e8dc022011cb3d89668768ba7940af22e97d95fd074638860e7b74fcacc8c83de4ad995654da4 SHA512 f46221f765f2799856049fbfe1650e6f3d13d597cf97843d4b54b9803b9ecedbf8a8c9364e1ba9b981b667004a8fe4da043006945f8b61f094678d3578518716
+DIST loksh-7.3.tar.xz 212120 BLAKE2B 2c1c56dcbfa664aa894b1f09f145b28f6861bf28f06274f32697eace30f24660dbcecdcf58938f6cae106e654d200ef0cb4cb2ecd309f3d60be4afc7fa6a6b9c SHA512 a054917c975f65dfb5f8eb35665044ddacacdbd2d1e1113e6bf62d5cd8d5f4fd775ff5f20e28191d2417016684a310f23115af102b834aa33083e2be41034477
 EBUILD loksh-7.1.ebuild 608 BLAKE2B 80bac748b60c62a27d1a315da1b9e0488631891098d6d42fd59f924455204171ca5820d5c4d84785f207c02b11ce9d9615f919a1626883f542387e0fe33184c9 SHA512 015cd9b16cdd263a776f897188cd6624fa9838001f144574238cc938ea4afccc58a88ab492b87f69b8b26de9db34e25c78ed1b440fbea515764b18c723b1d9ce
+EBUILD loksh-7.3.ebuild 608 BLAKE2B 5bd751bdfd45126c9893f6ab14549ef48accc6da3a14e3b5234a8318a3f2ec35916a91137e1d8b079261dc0312d79273dcba718355f3edfe418bc4e6c6d408a5 SHA512 36a8e5a2e704b673c0ea6ba0905e9c5e88ba612f6034e56201b2a4703faf5f579acc0280f73bd9d5f5e607a223698c8f02a408468dd4cfe5dd7694d8d3c2bc92
 MISC metadata.xml 249 BLAKE2B 142b02b03c614d9c821dc6367b16318494fecdb5b0f172c52661feb0239a404b6de757087be48910eeccba582942fcf4fc8adc95b665446d2d82d858536ec0e6 SHA512 cb8b29b51403536e9e2dad9337a0310d1f57123c9684c8372dacefccb23e389ba32c7e090efdb6404d1641b2b5a356bf11dd4f48b70f99f233700ce4b10db9aa
diff --git a/app-shells/loksh/loksh-7.3.ebuild b/app-shells/loksh/loksh-7.3.ebuild
new file mode 100644
index 000000000000..f591c53b2237
--- /dev/null
+++ b/app-shells/loksh/loksh-7.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Linux port of OpenBSD's ksh"
+HOMEPAGE="https://github.com/dimkr/loksh"
+SRC_URI="https://github.com/dimkr/loksh/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="
+	${DEPEND}
+	!app-shells/ksh
+"
+
+src_prepare() {
+	default
+	sed -i "/install_dir/s@loksh@${PF}@" meson.build || die
+}
+
+src_configure() {
+	# we want it as /bin/ksh
+	meson_src_configure --bindir=../bin
+}
diff --git a/app-shells/pwsh-bin/Manifest b/app-shells/pwsh-bin/Manifest
index c9b22b8e5134..166e2bc048d8 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.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
 DIST powershell-7.3.7-linux-arm32.tar.gz 66617447 BLAKE2B be80d24a4cda6a59ca220c8a05c9a0c9b9770720f5f8db3184b120edb92f4d1a52f4d59328ff0b821e835aed55cc69d9191ee64913db0d8a1aa3f0ac62f82051 SHA512 49d81476d4d4aa7a1138b605baaadcdecbbfd768161c1cc7f0f448dd8038e55dca71290f3e3842ed526b18df7b5e4ac959f13eea04584e11a6a0f2de1af9c711
 DIST powershell-7.3.7-linux-arm64.tar.gz 65519990 BLAKE2B 133264c94d0103faa14f65744abfc7837fe09bf878c85d50b7bc949bb784c6df3e8dc15a674c0c72cc1e91a8499e79a44cd8608affa5b7a2b8d46fa82cd74275 SHA512 fd7530a8ae6a81d13193f8e9da46ef598b5e0e13054f63350c8cf6d41bccff0764566eff6114287da88c2de0ed5b3e37cfc104547528b060a0a217420e0ac889
 DIST powershell-7.3.7-linux-x64.tar.gz 69092859 BLAKE2B 9db34b8dd6f5254a8f8f2a87daa72cb8e3f12aecb5f9967f7e21646dad4a6af61bedf3387cc9eaf12382d1fe899195a294b59f6e63d43fb0f701bc2973aa82d5 SHA512 42e148a737afed971e61929e8315d59e1f6a118fc8f2982b0bf0a1d05d73628e99d77d4b4b12b99805f40e9c2425e8bf9dfae2fc7fd04b5b8ba4de236df1cd8f
-EBUILD pwsh-bin-7.3.1-r1.ebuild 1255 BLAKE2B 26aaffd1d33bc5d6c28a4b54d33b99cc59d7002a97473ea1b9a062526eaaa7fbf2d30f576fdafc5dd30b9321637f8a1af0db936c4d25a49a30662043e9d2abf5 SHA512 96a2545c91723b35a8738625e61d8442c6af6e0ab68e704a9e1a581d23569d8be250441b167b055cd681ee107ea5e5c72f1325b38e7515b807f5f8d8d9a2af9c
-EBUILD pwsh-bin-7.3.6.ebuild 1577 BLAKE2B 25209f363792f2df3b7303795e250847798c7765b1d1a05e65bce1d1c581514760b7fc56f7a9ed84e1e9c90ed37ce4eb6939637790b00ee168eaa470d3a1f8b0 SHA512 3f35062bdf0ff7b21288e72380704d955383fc30dc3c4bcefd6b225d88835d0144627b6f3ca6e167c882b7b6a0b729da405cad97349ca30711c8d49786a2b8cb
+EBUILD pwsh-bin-7.3.6.ebuild 1576 BLAKE2B 3098c557b01051628a0d87cd421d2bf64aa5c946089d68e94a16fb41d3be466e2f13527e8893fe908dd3f02b7a4f6f3ca16d0fb4b2d1888f729298c9b8d51f22 SHA512 c28128c1555fa5c93d77b5643423a1b22ddcb15267218b2a420acd0d962a70cecbd933188550674cd33d20b962255c28cafd5c5638cc5b1f17ed744b98e43828
 EBUILD pwsh-bin-7.3.7.ebuild 1577 BLAKE2B 25209f363792f2df3b7303795e250847798c7765b1d1a05e65bce1d1c581514760b7fc56f7a9ed84e1e9c90ed37ce4eb6939637790b00ee168eaa470d3a1f8b0 SHA512 3f35062bdf0ff7b21288e72380704d955383fc30dc3c4bcefd6b225d88835d0144627b6f3ca6e167c882b7b6a0b729da405cad97349ca30711c8d49786a2b8cb
-MISC metadata.xml 1082 BLAKE2B 3e1c57488ad6b31f13445a9480cc9bd8ece18c74862f4ca351ca8f51e9988826bfedb7f7db454736e7ec4d87b8a88b1d03ddfd8220ceda489f804b0fd3f4772a SHA512 d3dae7c30399deef091ed6f7a80e6de1af9b96cd31a3170d4774bd961460b279d94b516af057c4045dfc8346d7e1dd97238c1652e2f5ba7e0039f6fb9b2203c8
+MISC metadata.xml 980 BLAKE2B 645e3ca15511e0e88193911119ac54ada054ecc0ccd355bccd3c758f9d854fc4ec34af3aee4dc73edbedc8b983a71688bf2753ff3251b2f317138afb07792dc4 SHA512 e68ea742c9139352d2aa31853aaded6e26952a63971b7ce4473ab2931579b26807c127163b783f3cb602a0ddc59257034440eb337b874b3a2e8e6447a6d63b93
diff --git a/app-shells/pwsh-bin/metadata.xml b/app-shells/pwsh-bin/metadata.xml
index 91d3a1445aeb..caf160f5bd5f 100644
--- a/app-shells/pwsh-bin/metadata.xml
+++ b/app-shells/pwsh-bin/metadata.xml
@@ -13,9 +13,6 @@
     and object models. It includes a command-line shell, an associated
     scripting language and a framework for processing cmdlets.
   </longdescription>
-  <use>
-    <flag name="pwsh-symlink">Install a pwsh symlink that points to pwsh-bin.</flag>
-  </use>
   <upstream>
     <changelog>https://github.com/PowerShell/PowerShell/blob/master/CHANGELOG/7.1.md</changelog>
     <doc>https://learn.microsoft.com/en-us/powershell/</doc>
diff --git a/app-shells/pwsh-bin/pwsh-bin-7.3.1-r1.ebuild b/app-shells/pwsh-bin/pwsh-bin-7.3.1-r1.ebuild
deleted file mode 100644
index 3390990bf0a2..000000000000
--- a/app-shells/pwsh-bin/pwsh-bin-7.3.1-r1.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="$(ver_cut 1-2)"
-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
index 94b1b6ce19ec..8b0cee74b025 100644
--- a/app-shells/pwsh-bin/pwsh-bin-7.3.6.ebuild
+++ b/app-shells/pwsh-bin/pwsh-bin-7.3.6.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 REQUIRED_USE="elibc_glibc"
 
 RDEPEND="