From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- net-im/teams/Manifest | 6 +- net-im/teams/metadata.xml | 4 ++ net-im/teams/teams-1.3.00.16851-r2.ebuild | 96 ---------------------------- net-im/teams/teams-1.3.00.25560.ebuild | 101 ++++++++++++++++++++++++++++++ 4 files changed, 108 insertions(+), 99 deletions(-) delete mode 100644 net-im/teams/teams-1.3.00.16851-r2.ebuild create mode 100644 net-im/teams/teams-1.3.00.25560.ebuild (limited to 'net-im/teams') diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest index cbca05e60e6f..664c6f29d586 100644 --- a/net-im/teams/Manifest +++ b/net-im/teams/Manifest @@ -1,3 +1,3 @@ -DIST teams_1.3.00.16851_amd64.deb 70105596 BLAKE2B cbadd17aac8722248eb01a51ee709ea51aad4a88a5e1b4e13ba86608af41b409f556d010dfcb03deb63a672730d96b92cb835d533183525e7a7b87f273cac175 SHA512 be2f9f37e1eb283c6f2c57fede83482eb5f2bbe0f5107ab2fb9054135375de6fcf43cf128fe3b43a21353d0105f092e5b5755ff708c0874d40c7eb4153a3b3a4 -EBUILD teams-1.3.00.16851-r2.ebuild 2764 BLAKE2B 7b85ba3edb7dde83b06a3e3680138b773d17f0284f556ce5f768bfa7969c46a51f2d1f9caa37131f86fc918ffb9d0ec516bc594344ac1c3ff1143608c43e22b4 SHA512 119bde21b42d0369e4144ff4d085f9979b3ee394842336c6d3e7b635b311697b0fbab861440b196c8a190cd34dd0fe17ca2deac11fdf44e5f77e8fb5e6615517 -MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2 +DIST teams_1.3.00.25560_amd64.deb 71805276 BLAKE2B b39d8f62653d303451e306290bdf0ea492b59b84fc87abefc8c9cbdf5462a917247d7dd9eda8c9c51e70e5ce3bc2db6ebd1eeda1c6b16c372cf154a8d81166aa SHA512 91f90f321118faef0d1a619feb213f0d8af9380a75fffa01b3fcc62570c5a2984cbfc415595e5fabc4f683250517a88064b038897e476410709b35de770c8043 +EBUILD teams-1.3.00.25560.ebuild 3066 BLAKE2B ef03a90372ff5656324941c85a914e88b34afe53559e23a72e1a9c7a7a0c575328fccc07d91ff05a5598bce3fcea8a2a7b429c2e8088b6fd3761c00bc666b1c4 SHA512 296f01c8cccc3b2336be234f91339b44016c41c8eb21e0d988e4b027f6ca53b429c97a4add3fd83fe67a1474c37e1b8b6d8134b3ea45c6de2b76cda0c938ed76 +MISC metadata.xml 488 BLAKE2B 8a110d1b3cf045e0a0fb8d53252534752a7b561a32c7f1e15a46585aaeafe025272f682dc857f9ee42098b3db7fbcacf7720f16f42af145f05d7a55edbaf1d9f SHA512 25b924038e4c4bf04267cd6c945254203f7d70ae19b9f7ffe7c7c777b58083758bc71849282ef89ef1c16e5cbbc8c1d7d3bb81268ece2d4825143dd4dbca0e2a diff --git a/net-im/teams/metadata.xml b/net-im/teams/metadata.xml index 80a71f597854..a141f350b4fe 100644 --- a/net-im/teams/metadata.xml +++ b/net-im/teams/metadata.xml @@ -5,4 +5,8 @@ dilfridge@gentoo.org Andreas K. Huettel + + Use the system-wide media-video/ffmpeg instead of bundled. + Use the system-wide media-libs/mesa instead of bundled. + diff --git a/net-im/teams/teams-1.3.00.16851-r2.ebuild b/net-im/teams/teams-1.3.00.16851-r2.ebuild deleted file mode 100644 index 66e5820e6c66..000000000000 --- a/net-im/teams/teams-1.3.00.16851-r2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# 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="" - -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 - gnome-base/libgnome-keyring - media-libs/alsa-lib - media-libs/fontconfig - media-libs/mesa - 99teams <<-EOF - LDPATH=${EROOT}/usr/$(get_libdir)/chromium - EOF - doenvd 99teams - - # use system mesa - 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 - - 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.25560.ebuild b/net-im/teams/teams-1.3.00.25560.ebuild new file mode 100644 index 000000000000..6f18946cc3f1 --- /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? ( 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 +} -- cgit v1.2.3