From 653c8465dd10f77b548d8db437771e4297cceadc Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 12 Apr 2021 14:30:51 -0400 Subject: [PATCH 1/2] net-im/teams: replace EROOT with EPREFIX in env.d file Signed-off-by: Mike Gilbert --- net-im/teams/teams-1.4.00.4855-r1.ebuild | 2 +- net-im/teams/teams-1.4.00.7556.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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.7556.ebuild b/net-im/teams/teams-1.4.00.7556.ebuild index 93fe30a5e8b7..46649526cfa5 100644 --- a/net-im/teams/teams-1.4.00.7556.ebuild +++ b/net-im/teams/teams-1.4.00.7556.ebuild @@ -79,7 +79,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." -- 2.31.1 From 7b13a55c2a911b626a254e2eeaacbf87ced54cfc Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 12 Apr 2021 14:33:42 -0400 Subject: [PATCH 2/2] net-im/teams: use ED when removing installed files Signed-off-by: Mike Gilbert --- net-im/teams/teams-1.4.00.7556.ebuild | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net-im/teams/teams-1.4.00.7556.ebuild b/net-im/teams/teams-1.4.00.7556.ebuild index 46649526cfa5..dcee637a6d44 100644 --- a/net-im/teams/teams-1.4.00.7556.ebuild +++ b/net-im/teams/teams-1.4.00.7556.ebuild @@ -76,7 +76,7 @@ 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="${EPREFIX}/usr/$(get_libdir)/chromium" @@ -86,14 +86,14 @@ src_install() { 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 -- 2.31.1