gentoo auto-resync : 19:02:2024 - 17:39:34

3 files changed, 10 insertions, 112 deletions

diff --git a/dev-util/azuredatastudio/Manifest b/dev-util/azuredatastudio/Manifest
index 9b8b3c6dbcc8..dafd5bb0f8f6 100644
--- a/dev-util/azuredatastudio/Manifest
+++ b/dev-util/azuredatastudio/Manifest
@@ -1,5 +1,3 @@
-DIST azuredatastudio-1.47.0-amd64.deb 138852252 BLAKE2B 20598aefb8ade4f1022213de1dfa17feddfb41ee0a241f8e9919e7573d00f3c3f81bbab947c9fec885a08b1e032a61616b1f49b943f3388c1edeb5502717e773 SHA512 7de1f1bafee735cfe7d52cb32324e38497ccb919a6322463b60bf2002af64546972f4ed207fdf0d9e55c48e33d7f5d7a9a3d10781c9c458edd4d18880ee5d310
 DIST azuredatastudio-1.47.1-amd64.deb 138850108 BLAKE2B f99374c00595f18f4a62e676235e1c5f71a47f14351ef3dc60c0bc84a69d15c325309be77613a4ba564e0f1322aed4fccc840ca871b83d0bbe2d48150e735afb SHA512 ad310cbb9955b8e46f8fdbcceb45ada6e61e2de8c0c40ff93312e7510f43fe675f1239ac07e095fee5573f034efc6fefbde13ebf70bae2f75e297a0e0e95df32
-EBUILD azuredatastudio-1.47.0.ebuild 2246 BLAKE2B 1908333c121ef082fa8e38fa4fde1b77be3f87ebea08df44fc11a955df755076f9e01817e181947a938ae9bbc4f43c237884b0f2b80526b158388c489b6e446f SHA512 ccfccf2a915fc5415e4ad80d0da1709803938d8e360ed0975573a74e1d744ec78a375fad6a3ab6283f90de6772d293d086ad0303633e20d41cd34fe8517230c6
-EBUILD azuredatastudio-1.47.1.ebuild 2306 BLAKE2B 053c55df942e363de0ce243b9f90769cf3dd5c2fc47bab6562cb8d20d6723844ef9be743ec0e01769e296e14106f028c309ab9804f2195a38aa86d9af5d40201 SHA512 0a193f146caeab8f7c8e7a2f9f2dafb78f472e2ba3b8321128d8b5bb6a432c0ecfd904ef9d25fa8f535b4c00329d0eb1b7eb22c743c93b1f218271fdc30a6fdf
+EBUILD azuredatastudio-1.47.1-r1.ebuild 2398 BLAKE2B e4044061e59375a5014aa0f8d9128fd7adc694c7b115a1f0bcde46a6d963477f5b1336356e0d953b7216d0640b67dce33742ea59492dd6be987584c654ad232b SHA512 9e8825f451259637c710e29fa69739235c3e89874e3501b163f3692b7913edc015c7f737488cf9347d29062931c7bb6eaf8b0fd2383cad008ed13d90b53de587
 MISC metadata.xml 822 BLAKE2B 72cadf27f137f7276f8cd3b3fc81afd0ac1eefa9f12e39aea8d81705454a17aa8d2b49de9d61c0523fda304dcf0363ef463d0b2fdbd04a524aa63a2ced6a6a6a SHA512 27dbc8a269df130994b8d59cefb193440b276638ef460f68d72e887dc02d40473218febc1ecf242a51f55593d90a3ea42255e4a8d8ce4237421c9e56e52c7030
diff --git a/dev-util/azuredatastudio/azuredatastudio-1.47.0.ebuild b/dev-util/azuredatastudio/azuredatastudio-1.47.0.ebuild
deleted file mode 100644
index 73c7edc071a7..000000000000
--- a/dev-util/azuredatastudio/azuredatastudio-1.47.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit unpacker xdg
-
-DESCRIPTION="Data management and development tool from Microsoft"
-HOMEPAGE="https://learn.microsoft.com/sql/azure-data-studio/
-	https://github.com/microsoft/azuredatastudio/"
-SRC_URI="
-	amd64? (
-		https://azuredatastudio-update.azurewebsites.net/${PV}/linux-deb-x64/stable
-			-> ${P}-amd64.deb
-	)
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="kerberos"
-RESTRICT="bindist"
-
-# This is based on VSCode/VSCodium, so just copy their "RDEPEND".
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/libcanberra[gtk3]
-	media-libs/libglvnd
-	media-libs/mesa
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/zlib
-	sys-process/lsof
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libnotify
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-	x11-misc/xdg-utils
-	kerberos? ( app-crypt/mit-krb5 )
-"
-DEPEND="
-	dev-libs/openssl-compat:1.0.0
-"
-BDEPEND="
-	dev-util/patchelf
-"
-
-QA_PREBUILT="*"
-
-src_unpack() {
-	unpack_deb "${A}"
-}
-
-src_prepare() {
-	default
-
-	cd "${S}/usr/share" || die
-
-	mv appdata metainfo || die
-	mv zsh/vendor-completions zsh/site-functions || die
-
-	cd "${PN}" || die
-
-	# Kerberos libs, same issue as VSCode/VSCodium.
-	if ! use kerberos ; then
-		rm -r resources/app/node_modules.asar.unpacked/kerberos || die
-	fi
-
-	# Patch "System.Security.Cryptography.Native.OpenSsl.so": *.so.10 -> *.so.1.0.0
-	local lib=System.Security.Cryptography.Native.OpenSsl.so
-	cd resources/app/extensions/mssql/sqltoolsservice/Linux/4.10.1.3 || die
-	patchelf --add-needed libcrypto.so.1.0.0 "${lib}" || die
-	patchelf --add-needed libssl.so.1.0.0 "${lib}" || die
-	patchelf --remove-needed libcrypto.so.10 "${lib}" || die
-	patchelf --remove-needed libssl.so.10 "${lib}" || die
-}
-
-src_install() {
-	cp -r . "${ED}" || die
-
-	dosym -r "/usr/share/${PN}/${PN}" "/usr/bin/${PN}"
-}
diff --git a/dev-util/azuredatastudio/azuredatastudio-1.47.1.ebuild b/dev-util/azuredatastudio/azuredatastudio-1.47.1-r1.ebuild
index e59de53fa0ee..882c2abf947b 100644
--- a/dev-util/azuredatastudio/azuredatastudio-1.47.1.ebuild
+++ b/dev-util/azuredatastudio/azuredatastudio-1.47.1-r1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
+	dev-util/lttng-ust:0/2.12
 	media-libs/alsa-lib
 	media-libs/libcanberra[gtk3]
 	media-libs/libglvnd
@@ -87,13 +88,14 @@ src_prepare() {
 	fi
 
 	# Patch "System.Security.Cryptography.Native.OpenSsl.so": *.so.10 -> *.so.1.0.0
-	local mssql_extension_version=4.10.2.1
-	local lib=System.Security.Cryptography.Native.OpenSsl.so
-	cd "resources/app/extensions/mssql/sqltoolsservice/Linux/${mssql_extension_version}" || die
-	patchelf --add-needed libcrypto.so.1.0.0 "${lib}" || die
-	patchelf --add-needed libssl.so.1.0.0 "${lib}" || die
-	patchelf --remove-needed libcrypto.so.10 "${lib}" || die
-	patchelf --remove-needed libssl.so.10 "${lib}" || die
+	local mssql_ext_version=4.10.2.1
+	local mssql_ext_lib=System.Security.Cryptography.Native.OpenSsl.so
+	cd "resources/app/extensions/mssql/sqltoolsservice/Linux/${mssql_ext_version}" || die
+	patchelf --add-needed libcrypto.so.1.0.0 "${mssql_ext_lib}" || die
+	patchelf --add-needed libssl.so.1.0.0 "${mssql_ext_lib}" || die
+	patchelf --remove-needed libcrypto.so.10 "${mssql_ext_lib}" || die
+	patchelf --remove-needed libssl.so.10 "${mssql_ext_lib}" || die
+	rm System.Native.a || die
 }
 
 src_install() {