net-im/teams-insiders: Bump to 1.5.00.10453

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sven Eden <sven.eden@prydeworx.com>

4 files changed, 107 insertions, 153 deletions

diff --git a/net-im/teams-insiders/Manifest b/net-im/teams-insiders/Manifest
index 9e93e9f..cd4baf5 100644
--- a/net-im/teams-insiders/Manifest
+++ b/net-im/teams-insiders/Manifest
@@ -1 +1 @@
-DIST teams-insiders_1.4.00.26453_amd64.deb 84486014 SHA256 8f5ead0d979eaf4c7fe248d2837ff81b9c56418c4305616b27b070a1aaeb0fc8 SHA512 8c2bdf772bb01474dd7876be2a6339296f9a5b717d30dca82fcfaeea882a4b4140971c7ac0e59f6df4879c2e13aa6419a5123b99f0ff14139c6fafd17e9f0b9c WHIRLPOOL 95a79b8e6e52967e7785edc9133ece85e10beabb867ee1418d7b69d69874a8b8268aef0b72391ff9975638777cb16483faabb11df0630ca57ab9d844e3189dcf
+DIST teams-insiders_1.5.00.10453_amd64.deb 84480508 SHA256 0395208e61bbe0747cf029d100331d78a5c6b8d42b7619db8786f14a4dc69b54 SHA512 68c78aba41120170fe08c43a53831ba415ae331f213e32803d0c77615b18a9bd7fbd6bd2479771cfc3d020cdc725f7257aa6f3eba0d1faa4a6a20ccd9f74370e WHIRLPOOL 909b7b1d9d5f867905e1f24a496b61f03b5f4934f96529c7dd124a0ca823a89c029c09ba697317876dcdacd6140f014fbb01cd08674151d85596f2ffc106e385
diff --git a/net-im/teams-insiders/metadata.xml b/net-im/teams-insiders/metadata.xml
index 5528346..565dd24 100644
--- a/net-im/teams-insiders/metadata.xml
+++ b/net-im/teams-insiders/metadata.xml
@@ -38,15 +38,8 @@
  By downloading this app, you agree to the license and privacy terms (see aka.ms/privacy).
  .
  To learn more, please visit aka.ms/microsoftteams</longdescription>
- <use>
-        <flag name="system-ffmpeg">
-                Use media-video/ffmpeg instead of the bundled lib. Might crash MS Teams!
-        </flag>
-        <flag name="system-mesa">
-                Use media-libs/mesa instead of the bundled EGL and GLESv2 libs. Might crash MS Teams!
-        </flag>
-        <flag name="system-vulkan" restrict="&gt;net-im/teams-insiders-1.4.0.26452">
-                Use media-libs/vulkan-loader instead of the bundled vulkan lib. Might crash MS Teams!
-        </flag>
-</use>
+  <use>
+    <flag name="swiftshader">Install SwiftShader OpenGL libaries.</flag>
+    <flag name="system-ffmpeg">Use media-video/ffmpeg instead of the bundled lib. Might crash MS Teams!</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-im/teams-insiders/teams-insiders-1.4.00.26453-r1.ebuild b/net-im/teams-insiders/teams-insiders-1.4.00.26453-r1.ebuild
deleted file mode 100644
index c58953b..0000000
--- a/net-im/teams-insiders/teams-insiders-1.4.00.26453-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit chromium-2 desktop unpacker xdg-utils
-
-DESCRIPTION="Microsoft Teams Linux Client (Insiders Build)"
-HOMEPAGE="https://teams.microsoft.com/"
-SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
-
-LICENSE="ms-teams-pre"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-RESTRICT="bindist mirror splitdebug test"
-IUSE="system-ffmpeg system-mesa system-vulkan"
-
-QA_PREBUILT="*"
-
-RDEPEND="
-	!net-im/teams
-	app-accessibility/at-spi2-atk
-	app-crypt/libsecret
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	x11-libs/pango
-	system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
-	system-mesa? ( media-libs/mesa[gles2] )
-	system-vulkan? ( media-libs/vulkan-loader )
-"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_configure() {
-	chromium_suid_sandbox_check_kernel_config
-	default
-}
-
-src_install() {
-	local dest=/usr
-
-	# Remove keytar3, it needs libgnome-keyring. keytar4 uses libsecret and is used instead
-	rm -rf "${WORKDIR}/usr/share/teams-insiders/resources/app.asar.unpacked/node_modules/keytar3" || die
-
-	insinto ${dest}/share
-	doins -r "${S}"${dest}/share/applications
-	doins -r "${S}"${dest}/share/pixmaps
-	doins -r "${S}"${dest}/share/${PN}
-
-	exeinto ${dest}/bin
-	doexe "${S}"${dest}/bin/${PN}
-
-	exeinto ${dest}/share/${PN}
-	doexe "${S}"${dest}/share/${PN}/${PN}
-	doexe "${S}"${dest}/share/${PN}/chrome-sandbox
-
-	# Use system ffmpeg, if wanted. Might crash MS Teams!
-	if use system-ffmpeg; then
-		rm -f "${D}"/${dest}/share/${PN}/libffmpeg.so
-		dosym "${dest}/$(get_libdir)/chromium/libffmpeg.so" "${dest}/share/${PN}/libffmpeg.so"
-		elog "Using system ffmpeg. This is experimental and may lead to crashes."
-	else
-		# Otherwise keep the executable bit on the bundled lib
-		doexe "${S}"${dest}/share/${PN}/libffmpeg.so
-	fi
-
-	# Use system mesa, if wanted.
-	if use system-mesa; then
-		rm -f "${D}"/${dest}/share/${PN}/libEGL.so
-		rm -f "${D}"/${dest}/share/${PN}/libGLESv2.so
-		elog "Using system mesa. This is experimental."
-	else
-		# Otherwise keep original executable flag
-		doexe "${S}"/${dest}/share/${PN}/libEGL.so
-		doexe "${S}"/${dest}/share/${PN}/libGLESv2.so
-	fi
-
-	# Use system vulkan, if wanted.
-	if use system-vulkan; then
-		rm -f "${D}"/${dest}/share/${PN}/libvulkan.so
-		elog "Using system vulkan. This is experimental."
-	else
-		# Otherwise keep original executable flag
-		doexe "${S}"/${dest}/share/${PN}/libvulkan.so
-	fi
-
-	# Keep swiftshader, used in GPU-/Head-less systems
-	exeinto ${dest}/share/${PN}/swiftshader
-	doexe "${S}"/${dest}/share/${PN}/swiftshader/libEGL.so
-	doexe "${S}"/${dest}/share/${PN}/swiftshader/libGLESv2.so
-
-	# The overlay handler seems to need executable bits
-	# See: https://microsoftteams.uservoice.com/forums/908686-bug-reports/suggestions/40805257-screen-sharing-broken-on-linux-with-1-3-00-16851#comments
-	exeinto ${dest}/share/${PN}/resources/app.asar.unpacked/node_modules/slimcore/bin
-	doexe "${S}"/${dest}/share/${PN}/resources/app.asar.unpacked/node_modules/slimcore/bin/platform.node
-	doexe "${S}"/${dest}/share/${PN}/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay
-	doexe "${S}"/${dest}/share/${PN}/resources/app.asar.unpacked/node_modules/slimcore/bin/sharing-indicator.node
-	doexe "${S}"/${dest}/share/${PN}/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-	doexe "${S}"/${dest}/share/${PN}/resources/app.asar.unpacked/node_modules/slimcore/bin/trouter-client.node
-
-	sed -i '/OnlyShowIn=/d' "${S}"${dest}/share/applications/${PN}.desktop
-	domenu "${S}"${dest}/share/applications/${PN}.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/teams-insiders/teams-insiders-1.5.00.10453.ebuild b/net-im/teams-insiders/teams-insiders-1.5.00.10453.ebuild
new file mode 100644
index 0000000..124bfd6
--- /dev/null
+++ b/net-im/teams-insiders/teams-insiders-1.5.00.10453.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit chromium-2 desktop unpacker xdg
+
+DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, Insiders Build"
+HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
+SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
+
+LICENSE="ms-teams-pre"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror splitdebug test"
+IUSE="swiftshader system-ffmpeg"
+
+QA_PREBUILT="*"
+
+RDEPEND="
+	!net-im/teams
+	app-accessibility/at-spi2-core:2
+	app-accessibility/at-spi2-atk:2
+	app-crypt/libsecret
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/mesa[gbm(+)]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	x11-libs/pango
+	system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+	sed -i '/OnlyShowIn=/d' usr/share/applications/${PN}.desktop || die
+	sed -e "s@^TEAMS_PATH=.*@TEAMS_PATH=${EPREFIX}/opt/${PN}/${PN}@" \
+		-i usr/bin/${PN} || die
+}
+
+src_install() {
+	rm _gpgorigin || die
+	rm -r "usr/share/${PN}/resources/assets/"{.gitignore,macos,tlb,windows,x86,x64,arm64} || die
+	rm -r "usr/share/${PN}/resources/tmp" || die
+	rm "usr/share/${PN}/chrome-sandbox" || die
+
+	insinto /opt
+	doins -r usr/share/${PN}
+
+	dobin usr/bin/${PN}
+	domenu usr/share/applications/${PN}.desktop
+	doicon usr/share/pixmaps/${PN}.png
+
+	pushd "${ED}/opt/${PN}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use system-ffmpeg; then
+		rm "${ED}/opt/${PN}/libffmpeg.so" || die
+		dosym "../../usr/$(get_libdir)/chromium/libffmpeg.so" "opt/${PN}/libffmpeg.so" || die
+		elog "Using system ffmpeg. This is experimental and may lead to crashes."
+	fi
+
+	if ! use swiftshader; then
+		rm -r "${ED}/opt/${PN}/swiftshader" || die
+		elog "Running without SwiftShader OpenGL implementation. If Teams doesn't start "
+		elog "or you experience graphic issues, then try with USE=swiftshader enabled."
+	fi
+
+	fperms +x /usr/bin/${PN}
+	fperms +x /opt/${PN}/${PN}
+}