gentoo resync : 29.06.2021

4 files changed, 111 insertions, 119 deletions

diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index 3e5d2f3be05b..c7a42e4dceae 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,6 +1,6 @@
 AUX fix-url-opening-1.4.00.4855.patch 439 BLAKE2B 57c5a432cf829c58942ac5b9910fee17fe6e08c7bd200d72e474e3919a46258f169b364c999c9b177236e55c318da20d9527475859e55e7f76d919563b3653d9 SHA512 a06d8e576b8a687e552173cff26071778f75b85a5ce3e36c40ba15b7d21d4c9e8323a07dbac2e6d7a5e834d9cbdc359c31868aaef796e4a17e968771d8aa070e
-DIST teams_1.4.00.4855_amd64.deb 76579552 BLAKE2B 3b03451d5a333a0e3736fd48d21252498a0b08041104a97b33a6166263ee8a5d2149f138e5598356bb42aa0c8d7a0619c6b1cd954d2ac5793b063c9bdbb3b929 SHA512 5596db57e8019068e8dac94cc6da8df2b1b6c813e8b67b4a61717fb7775f28973b09b49d77d001ab2dfd65ffe99ef2aaeaba8bc722f1348a474677b3d7a84df8
+DIST teams_1.4.00.13653_amd64.deb 83232268 BLAKE2B bc59aa1f4b9d5f1740fedc7bfc3c2cec6f8b4c1979a55e5a68742c36ea4399ba0e8c276de2d9e5b8de39363a9359136a5d1be59a6019af8bd5ac9922a5aab2c9 SHA512 d15b6cca0321e5e569e6a1f4ad0801f7a2de1e9312e8f584f07a4bc8bcac8a55626eb060a41baf31b9f4cfcd1cf2757e2f2b946f671f0e4c95c81f9eea0f8e2c
 DIST teams_1.4.00.7556_amd64.deb 77232550 BLAKE2B f663a79a9edb29aecb240722f46cb29aa6f4e2cca6dbe1a29801aee2e9c408b1ad00ab0d2b8fac3c7c4c227429b0382a06b46114921d2f435fbe1c80415ea9d4 SHA512 0afe2714e290e8b2d30039e27a2af4d22cbd03bc4bfe90d6979714ae1cc75bc5226af8932dc38528a5dc5bd6b4820c4b9d9444abcb558a76438c62cff285ffac
-EBUILD teams-1.4.00.4855-r1.ebuild 3278 BLAKE2B eb3309642ec7d762ed86415f95e4eedea20b36eaf6f188714c399f7896eb4a54aef1c8daffbcc96ab680b5882456f086fc5a0fc5a9d382a85162c59a1f6872f6 SHA512 4df12fb0bce9bd38bd6094e3c8269a5d59291b57a63a35412b30f5e7bf9a1cfe0fe1955033864780431ecff44dbfef8af5c3e8dc7fdfa83f4afda79565e93475
+EBUILD teams-1.4.00.13653.ebuild 3457 BLAKE2B e01bf0f83107de551fdf6228a71b4734468c9401d6726fc0b78ce8ec4fd148104086404d4b1f8265c006c9bc6409a9279518e0ebdc1a398806a907785bbd51bb SHA512 b11f8411ac7073a7027f491ba5521cb4776d7569bcba4e86764f03023f4e479c104fb79ed8d1fa3836f73a4f75d33f07f75abd45e991322fe72b13a1cadc3dc4
 EBUILD teams-1.4.00.7556.ebuild 3222 BLAKE2B 9f3cf836f60bd9560525b2551a41db63fffcbc0918f7dbb383f08c4c6a30a0f3558fb135c008eb4bbb0ef92bf27ab70eaa1f6a52a7f04125562ce44b4d61d08f SHA512 7d92835f11d66c694a291ae8c89187304c86c5db314b66e5c7ecd0e6f7d8358e80580497dc415db7e8b9198250224c812e48235c40b135a7b99053bc191d2906
-MISC metadata.xml 488 BLAKE2B 8a110d1b3cf045e0a0fb8d53252534752a7b561a32c7f1e15a46585aaeafe025272f682dc857f9ee42098b3db7fbcacf7720f16f42af145f05d7a55edbaf1d9f SHA512 25b924038e4c4bf04267cd6c945254203f7d70ae19b9f7ffe7c7c777b58083758bc71849282ef89ef1c16e5cbbc8c1d7d3bb81268ece2d4825143dd4dbca0e2a
+MISC metadata.xml 556 BLAKE2B 8d746368e0e1e3951e0b8541a03a46314310158809ce4324420f6b84af2efb7fe0559a1a93e17ea2c0f1f5050696405c5e06edbf3e5053eb17a09631f34c5035 SHA512 2c498682eafc737bbaf618801a4ca8fcc767bb2dc73b25599a3f8df7ff257bbf7fb5036a4403f486356d8e3cf165c7226be2dbed38067128c422e8d9040588df
diff --git a/net-im/teams/metadata.xml b/net-im/teams/metadata.xml
index a141f350b4fe..fa147c289cb9 100644
--- a/net-im/teams/metadata.xml
+++ b/net-im/teams/metadata.xml
@@ -2,10 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>dilfridge@gentoo.org</email>
-    <name>Andreas K. Huettel</name>
+    <email>sultan@gentoo.org</email>
+    <name>Stephan Hartmann</name>
   </maintainer>
   <use>
+    <flag name="swiftshader">Install SwiftShader OpenGL libaries.</flag>
     <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> instead of bundled.</flag>
     <flag name="system-mesa">Use the system-wide <pkg>media-libs/mesa</pkg> instead of bundled.</flag>
   </use>
diff --git a/net-im/teams/teams-1.4.00.13653.ebuild b/net-im/teams/teams-1.4.00.13653.ebuild
new file mode 100644
index 000000000000..2e508b9fb6ef
--- /dev/null
+++ b/net-im/teams/teams-1.4.00.13653.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 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, pre-release"
+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="*"
+# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 2.2.0), libatspi2.0-0 (>= 2.9.90), libc6 (>= 2.17), libcairo2 (>= 1.10.0),
+# libcups2 (>= 1.7.0), libdrm2 (>= 2.4.38), libexpat1 (>= 2.0.1), libgbm1 (>= 17.1.0~rc2), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0),
+# libglib2.0-0 (>= 2.39.4), libgtk-3-0 (>= 3.19.12), libnspr4 (>= 2:4.9-2~), libnss3 (>= 2:3.22), libpango-1.0-0 (>= 1.14.0),
+# libpangocairo-1.0-0 (>= 1.14.0), libx11-6 (>= 2:1.4.99.1), libx11-xcb1, libxcb-dri3-0, libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1),
+# libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxrandr2, libxrender1, libxtst6,
+# apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
+RDEPEND="
+	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
+	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/teams/teams@" \
+		-i usr/bin/teams || 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 "../../$(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}
+}
diff --git a/net-im/teams/teams-1.4.00.4855-r1.ebuild b/net-im/teams/teams-1.4.00.4855-r1.ebuild
deleted file mode 100644
index 12ce91e2eb97..000000000000
--- a/net-im/teams/teams-1.4.00.4855-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop unpacker xdg-utils chromium-2
-
-DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
-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="system-ffmpeg system-mesa"
-
-QA_PREBUILT="*"
-
-# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.17), libcairo2 (>= 1.6.0), libcups2 (>= 1.4.0),
-# libexpat1 (>= 2.0.1), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.35.8), libgtk-3-0 (>= 3.9.10), libnspr4 (>= 2:4.9-2~), libnss3
-# (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libsecret-1-0 (>= 0.7), libuuid1 (>= 2.16), libx11-6 (>= 2:1.4.99.1), libx11-xcb1,
-# libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxkbfile1,
-# libxrandr2 (>= 2:1.2.99.3), libxrender1, libxss1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
-RDEPEND="
-	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/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-mesa? ( media-libs/mesa )
-	system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
-"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}/fix-url-opening-1.4.00.4855.patch"
-)
-
-pkg_pretend() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_configure() {
-	chromium_suid_sandbox_check_kernel_config
-	default
-}
-
-src_install() {
-	rm _gpgorigin || die
-	doins -r .
-
-	fperms +x /usr/bin/teams
-	fperms +x /usr/share/teams/teams
-
-	if use system-ffmpeg ; then
-		rm -f "${D}"/usr/share/teams/libffmpeg.so || die
-
-		cat > 99teams <<-EOF
-		LDPATH="${EPREFIX}/usr/$(get_libdir)/chromium"
-		EOF
-		doenvd 99teams
-		elog "Using system ffmpeg. This is experimental and may lead to crashes."
-	fi
-
-	if use system-mesa ; then
-		rm -f "${D}"/usr/share/teams/libEGL.so || die
-		rm -f "${D}"/usr/share/teams/libGLESv2.so || die
-		rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die
-		rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die
-		elog "Using system mesa. This is experimental and may lead to crashes."
-	fi
-
-	rm -rf "${D}"/usr/share/teams/resources/app.asar.unpacked/node_modules/keytar3 || die
-
-	sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die
-	domenu usr/share/applications/teams.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}