commit: 50423e6b368afd6810517933807f693275c4fde6 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Fri Oct 9 18:40:42 2020 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Fri Oct 9 18:40:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50423e6b
net-im/teams: Version bump * let's try again without gnome-keyring * remove keytar3 entirely * add useflags system-ffmpeg, system-mesa Closes: https://bugs.gentoo.org/729064 Closes: https://bugs.gentoo.org/747190 Closes: https://bugs.gentoo.org/743793 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> net-im/teams/Manifest | 1 + net-im/teams/metadata.xml | 4 ++ net-im/teams/teams-1.3.00.25560.ebuild | 101 +++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest index f5a5a91341f..51d9a769cac 100644 --- a/net-im/teams/Manifest +++ b/net-im/teams/Manifest @@ -1 +1,2 @@ DIST teams_1.3.00.16851_amd64.deb 70105596 BLAKE2B cbadd17aac8722248eb01a51ee709ea51aad4a88a5e1b4e13ba86608af41b409f556d010dfcb03deb63a672730d96b92cb835d533183525e7a7b87f273cac175 SHA512 be2f9f37e1eb283c6f2c57fede83482eb5f2bbe0f5107ab2fb9054135375de6fcf43cf128fe3b43a21353d0105f092e5b5755ff708c0874d40c7eb4153a3b3a4 +DIST teams_1.3.00.25560_amd64.deb 71805276 BLAKE2B b39d8f62653d303451e306290bdf0ea492b59b84fc87abefc8c9cbdf5462a917247d7dd9eda8c9c51e70e5ce3bc2db6ebd1eeda1c6b16c372cf154a8d81166aa SHA512 91f90f321118faef0d1a619feb213f0d8af9380a75fffa01b3fcc62570c5a2984cbfc415595e5fabc4f683250517a88064b038897e476410709b35de770c8043 diff --git a/net-im/teams/metadata.xml b/net-im/teams/metadata.xml index 80a71f59785..a141f350b4f 100644 --- a/net-im/teams/metadata.xml +++ b/net-im/teams/metadata.xml @@ -5,4 +5,8 @@ <email>[email protected]</email> <name>Andreas K. Huettel</name> </maintainer> + <use> + <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> </pkgmetadata> diff --git a/net-im/teams/teams-1.3.00.25560.ebuild b/net-im/teams/teams-1.3.00.25560.ebuild new file mode 100644 index 00000000000..3e8e3cbe1ad --- /dev/null +++ b/net-im/teams/teams-1.3.00.25560.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop unpacker xdg-utils + +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}" + +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 -f "${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 +}
