gentoo resync : 28.04.2021

4 files changed, 11 insertions, 122 deletions

diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index b084a227dcd5..3e5d2f3be05b 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,7 +1,6 @@
 AUX fix-url-opening-1.4.00.4855.patch 439 BLAKE2B 57c5a432cf829c58942ac5b9910fee17fe6e08c7bd200d72e474e3919a46258f169b364c999c9b177236e55c318da20d9527475859e55e7f76d919563b3653d9 SHA512 a06d8e576b8a687e552173cff26071778f75b85a5ce3e36c40ba15b7d21d4c9e8323a07dbac2e6d7a5e834d9cbdc359c31868aaef796e4a17e968771d8aa070e
-DIST teams_1.3.00.30857_amd64.deb 76334658 BLAKE2B 486ee2945f46e7a7c7bfe1d2a6edf29f8cac5a7827c0a8bcf121d25ce95fde2caf31fed520c2f036e27b399c986ac1acc1531aaa1a9caf5a5d6848b10ac0d204 SHA512 5a8be75bfe752347bd36bf2abc2de74ad069cbf4a6430bfcad9ca7396d5b5bf8196a74798a0595908a33ebcb2fcdbedc403c7ff31eec76d07246a3d1c46eeab4
 DIST teams_1.4.00.4855_amd64.deb 76579552 BLAKE2B 3b03451d5a333a0e3736fd48d21252498a0b08041104a97b33a6166263ee8a5d2149f138e5598356bb42aa0c8d7a0619c6b1cd954d2ac5793b063c9bdbb3b929 SHA512 5596db57e8019068e8dac94cc6da8df2b1b6c813e8b67b4a61717fb7775f28973b09b49d77d001ab2dfd65ffe99ef2aaeaba8bc722f1348a474677b3d7a84df8
-EBUILD teams-1.3.00.30857-r1.ebuild 3212 BLAKE2B 1f2ef2fe7193200b0ff0eabddc7ad0766b9dddb974c6fd48428a1f2dea3ace7cc0a13a32131e26b193ffd81a4a3e3d1ed67d0a5976745e2c459ac2ad4100dd24 SHA512 26a97d7d21c5834497917e9d4e70d39e690997c4dd647b6b0940c4a3eec40fef28a1ae5b7c6ec9d1a1644bf64a45312d57d5e6416083c2484db7d6a2a63d20cf
-EBUILD teams-1.4.00.4855-r1.ebuild 3274 BLAKE2B f2b4ffcb749f47df42549691f5f734a29f01424ed717a3ee51c37d3187a694df60aea52a594f5b9fabe06b4daeed3767f528af5be7559e473d486b914b16bc8e SHA512 ecffc012b0898e711b1b5846f3838f9773e7826fbf0951fd5bff24e4ae4a9df483449bcae6632c7e03bfa7765e5f0709a132deff1793c4cda453cbcfb9e09c6d
-EBUILD teams-1.4.00.4855.ebuild 3212 BLAKE2B 1f2ef2fe7193200b0ff0eabddc7ad0766b9dddb974c6fd48428a1f2dea3ace7cc0a13a32131e26b193ffd81a4a3e3d1ed67d0a5976745e2c459ac2ad4100dd24 SHA512 26a97d7d21c5834497917e9d4e70d39e690997c4dd647b6b0940c4a3eec40fef28a1ae5b7c6ec9d1a1644bf64a45312d57d5e6416083c2484db7d6a2a63d20cf
+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.7556.ebuild 3222 BLAKE2B 9f3cf836f60bd9560525b2551a41db63fffcbc0918f7dbb383f08c4c6a30a0f3558fb135c008eb4bbb0ef92bf27ab70eaa1f6a52a7f04125562ce44b4d61d08f SHA512 7d92835f11d66c694a291ae8c89187304c86c5db314b66e5c7ecd0e6f7d8358e80580497dc415db7e8b9198250224c812e48235c40b135a7b99053bc191d2906
 MISC metadata.xml 488 BLAKE2B 8a110d1b3cf045e0a0fb8d53252534752a7b561a32c7f1e15a46585aaeafe025272f682dc857f9ee42098b3db7fbcacf7720f16f42af145f05d7a55edbaf1d9f SHA512 25b924038e4c4bf04267cd6c945254203f7d70ae19b9f7ffe7c7c777b58083758bc71849282ef89ef1c16e5cbbc8c1d7d3bb81268ece2d4825143dd4dbca0e2a
diff --git a/net-im/teams/teams-1.4.00.4855-r1.ebuild b/net-im/teams/teams-1.4.00.4855-r1.ebuild
index 574fa6e8d2b1..12ce91e2eb97 100644
--- a/net-im/teams/teams-1.4.00.4855-r1.ebuild
+++ b/net-im/teams/teams-1.4.00.4855-r1.ebuild
@@ -83,7 +83,7 @@ src_install() {
 		rm -f "${D}"/usr/share/teams/libffmpeg.so || die
 
 		cat > 99teams <<-EOF
-		LDPATH=${EROOT}/usr/$(get_libdir)/chromium
+		LDPATH="${EPREFIX}/usr/$(get_libdir)/chromium"
 		EOF
 		doenvd 99teams
 		elog "Using system ffmpeg. This is experimental and may lead to crashes."
diff --git a/net-im/teams/teams-1.4.00.4855.ebuild b/net-im/teams/teams-1.4.00.4855.ebuild
deleted file mode 100644
index 93fe30a5e8b7..000000000000
--- a/net-im/teams/teams-1.4.00.4855.ebuild
+++ /dev/null
@@ -1,110 +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}"
-
-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=${EROOT}/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
-}
diff --git a/net-im/teams/teams-1.3.00.30857-r1.ebuild b/net-im/teams/teams-1.4.00.7556.ebuild
index 93fe30a5e8b7..dcee637a6d44 100644
--- a/net-im/teams/teams-1.3.00.30857-r1.ebuild
+++ b/net-im/teams/teams-1.4.00.7556.ebuild
@@ -76,24 +76,24 @@ src_install() {
 	fperms +x /usr/share/teams/teams
 
 	if use system-ffmpeg ; then
-		rm -f "${D}"/usr/share/teams/libffmpeg.so || die
+		rm -f "${ED}"/usr/share/teams/libffmpeg.so || die
 
 		cat > 99teams <<-EOF
-		LDPATH=${EROOT}/usr/$(get_libdir)/chromium
+		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
+		rm -f "${ED}"/usr/share/teams/libEGL.so || die
+		rm -f "${ED}"/usr/share/teams/libGLESv2.so || die
+		rm -f "${ED}"/usr/share/teams/swiftshader/libEGL.so || die
+		rm -f "${ED}"/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
+	rm -rf "${ED}"/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