1 |
commit: 50423e6b368afd6810517933807f693275c4fde6 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 9 18:40:42 2020 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 9 18:40:42 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50423e6b |
7 |
|
8 |
net-im/teams: Version bump |
9 |
|
10 |
* let's try again without gnome-keyring |
11 |
* remove keytar3 entirely |
12 |
* add useflags system-ffmpeg, system-mesa |
13 |
|
14 |
Closes: https://bugs.gentoo.org/729064 |
15 |
Closes: https://bugs.gentoo.org/747190 |
16 |
Closes: https://bugs.gentoo.org/743793 |
17 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
18 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
19 |
|
20 |
net-im/teams/Manifest | 1 + |
21 |
net-im/teams/metadata.xml | 4 ++ |
22 |
net-im/teams/teams-1.3.00.25560.ebuild | 101 +++++++++++++++++++++++++++++++++ |
23 |
3 files changed, 106 insertions(+) |
24 |
|
25 |
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest |
26 |
index f5a5a91341f..51d9a769cac 100644 |
27 |
--- a/net-im/teams/Manifest |
28 |
+++ b/net-im/teams/Manifest |
29 |
@@ -1 +1,2 @@ |
30 |
DIST teams_1.3.00.16851_amd64.deb 70105596 BLAKE2B cbadd17aac8722248eb01a51ee709ea51aad4a88a5e1b4e13ba86608af41b409f556d010dfcb03deb63a672730d96b92cb835d533183525e7a7b87f273cac175 SHA512 be2f9f37e1eb283c6f2c57fede83482eb5f2bbe0f5107ab2fb9054135375de6fcf43cf128fe3b43a21353d0105f092e5b5755ff708c0874d40c7eb4153a3b3a4 |
31 |
+DIST teams_1.3.00.25560_amd64.deb 71805276 BLAKE2B b39d8f62653d303451e306290bdf0ea492b59b84fc87abefc8c9cbdf5462a917247d7dd9eda8c9c51e70e5ce3bc2db6ebd1eeda1c6b16c372cf154a8d81166aa SHA512 91f90f321118faef0d1a619feb213f0d8af9380a75fffa01b3fcc62570c5a2984cbfc415595e5fabc4f683250517a88064b038897e476410709b35de770c8043 |
32 |
|
33 |
diff --git a/net-im/teams/metadata.xml b/net-im/teams/metadata.xml |
34 |
index 80a71f59785..a141f350b4f 100644 |
35 |
--- a/net-im/teams/metadata.xml |
36 |
+++ b/net-im/teams/metadata.xml |
37 |
@@ -5,4 +5,8 @@ |
38 |
<email>dilfridge@g.o</email> |
39 |
<name>Andreas K. Huettel</name> |
40 |
</maintainer> |
41 |
+ <use> |
42 |
+ <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> instead of bundled.</flag> |
43 |
+ <flag name="system-mesa">Use the system-wide <pkg>media-libs/mesa</pkg> instead of bundled.</flag> |
44 |
+ </use> |
45 |
</pkgmetadata> |
46 |
|
47 |
diff --git a/net-im/teams/teams-1.3.00.25560.ebuild b/net-im/teams/teams-1.3.00.25560.ebuild |
48 |
new file mode 100644 |
49 |
index 00000000000..3e8e3cbe1ad |
50 |
--- /dev/null |
51 |
+++ b/net-im/teams/teams-1.3.00.25560.ebuild |
52 |
@@ -0,0 +1,101 @@ |
53 |
+# Copyright 1999-2020 Gentoo Authors |
54 |
+# Distributed under the terms of the GNU General Public License v2 |
55 |
+ |
56 |
+EAPI=7 |
57 |
+ |
58 |
+inherit desktop unpacker xdg-utils |
59 |
+ |
60 |
+DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release" |
61 |
+HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/" |
62 |
+SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb" |
63 |
+ |
64 |
+LICENSE="ms-teams-pre" |
65 |
+SLOT="0" |
66 |
+KEYWORDS="-* ~amd64" |
67 |
+RESTRICT="bindist mirror splitdebug test" |
68 |
+IUSE="system-ffmpeg system-mesa" |
69 |
+ |
70 |
+QA_PREBUILT="*" |
71 |
+ |
72 |
+# 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), |
73 |
+# 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 |
74 |
+# (>= 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, |
75 |
+# 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, |
76 |
+# 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) |
77 |
+RDEPEND=" |
78 |
+ app-accessibility/at-spi2-atk |
79 |
+ app-crypt/libsecret |
80 |
+ dev-libs/atk |
81 |
+ dev-libs/expat |
82 |
+ dev-libs/glib |
83 |
+ dev-libs/nspr |
84 |
+ dev-libs/nss |
85 |
+ media-libs/alsa-lib |
86 |
+ media-libs/fontconfig |
87 |
+ net-print/cups |
88 |
+ sys-apps/dbus |
89 |
+ sys-apps/util-linux |
90 |
+ x11-libs/cairo |
91 |
+ x11-libs/cairo |
92 |
+ x11-libs/gdk-pixbuf |
93 |
+ x11-libs/gtk+:3 |
94 |
+ x11-libs/libX11 |
95 |
+ x11-libs/libXScrnSaver |
96 |
+ x11-libs/libXcomposite |
97 |
+ x11-libs/libXcursor |
98 |
+ x11-libs/libXdamage |
99 |
+ x11-libs/libXext |
100 |
+ x11-libs/libXfixes |
101 |
+ x11-libs/libXi |
102 |
+ x11-libs/libXrandr |
103 |
+ x11-libs/libXrender |
104 |
+ x11-libs/libXtst |
105 |
+ x11-libs/libxcb |
106 |
+ x11-libs/libxkbfile |
107 |
+ x11-libs/pango |
108 |
+ system-mesa? ( media-libs/mesa ) |
109 |
+ system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] ) |
110 |
+" |
111 |
+ |
112 |
+S="${WORKDIR}" |
113 |
+ |
114 |
+src_install() { |
115 |
+ rm _gpgorigin || die |
116 |
+ doins -r . |
117 |
+ |
118 |
+ fperms +x /usr/bin/teams |
119 |
+ fperms +x /usr/share/teams/teams |
120 |
+ |
121 |
+ if use system-ffmpeg ; then |
122 |
+ rm -f "${D}"/usr/share/teams/libffmpeg.so || die |
123 |
+ |
124 |
+ cat > 99teams <<-EOF |
125 |
+ LDPATH=${EROOT}/usr/$(get_libdir)/chromium |
126 |
+ EOF |
127 |
+ doenvd 99teams |
128 |
+ elog "Using system ffmpeg. This is experimental and may lead to crashes." |
129 |
+ fi |
130 |
+ |
131 |
+ if use system-mesa ; then |
132 |
+ rm -f "${D}"/usr/share/teams/libEGL.so || die |
133 |
+ rm -f "${D}"/usr/share/teams/libGLESv2.so || die |
134 |
+ rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die |
135 |
+ rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die |
136 |
+ elog "Using system mesa. This is experimental and may lead to crashes." |
137 |
+ fi |
138 |
+ |
139 |
+ rm -f "${D}"/usr/share/teams/resources/app.asar.unpacked/node_modules/keytar3 || die |
140 |
+ |
141 |
+ sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die |
142 |
+ domenu usr/share/applications/teams.desktop |
143 |
+} |
144 |
+ |
145 |
+pkg_postinst() { |
146 |
+ xdg_desktop_database_update |
147 |
+ xdg_icon_cache_update |
148 |
+} |
149 |
+ |
150 |
+pkg_postrm() { |
151 |
+ xdg_desktop_database_update |
152 |
+ xdg_icon_cache_update |
153 |
+} |