From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- net-im/zoom/Manifest | 6 +- net-im/zoom/zoom-5.4.53391.1108-r1.ebuild | 18 ++-- net-im/zoom/zoom-5.4.56259.1207-r2.ebuild | 146 ------------------------------ net-im/zoom/zoom-5.4.57862.0110.ebuild | 144 +++++++++++++++++++++++++++++ 4 files changed, 155 insertions(+), 159 deletions(-) delete mode 100644 net-im/zoom/zoom-5.4.56259.1207-r2.ebuild create mode 100644 net-im/zoom/zoom-5.4.57862.0110.ebuild (limited to 'net-im/zoom') diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest index e8c3c1fa4a83..0245c50b7777 100644 --- a/net-im/zoom/Manifest +++ b/net-im/zoom/Manifest @@ -1,9 +1,9 @@ AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e DIST zoom-5.4.53391.1108_i686.tar.xz 40384800 BLAKE2B 0d449103e16799e6e6bcaf6ef1c105d6a75ce8728bfedb5107a9c6deedd9e8ef1988e19ddc33da43de8eb925d386460a84b5efe13c0709de6901239a688b4fb0 SHA512 d77357ab669ade90d4b8ae99116372db8b8b9a251625ed0566e89a8cc4d3f7aced07fd08d4646a223fad58f588e1dc2484464bd70e203b875ac9866fb92fe2ea DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971f507bc70d5b77e8edd558f311e67f0e2ab127967cdd15c90b92ca95735b2fad3e11d692b206c32c5f7d65cd116050e8e6579fcdd SHA512 f52e2fda15a29c2232656e8f34a5d65c3c401eb50f249d5436a949c09efd5b821d1c5e1f59dc4c27b5f4aadc1c24f474854498664b5d333d340d03f4998c59ba -DIST zoom-5.4.56259.1207_x86_64.tar.xz 46333580 BLAKE2B e3603db12af4ecc88eee88715976d6944cf566f6c1afa35a36840ceba49da85d21cdf4c04216b76d30b700b07a098aea48b7f61c48ee3836168323adede5789f SHA512 b7567f8e01486dfe31118da9c6168be70ea0b6dc21ea07972d39a3ced360068ff2e7423663e74fb65387be18fa2a1bca7ebd2599c49b3c064872ae9d82266192 DIST zoom-5.4.57450.1220_x86_64.tar.xz 45788732 BLAKE2B 932187da18c52baeaba90114b7d7115bb973787fe690f94482d53527fbd4ded327eecee6d3097831a5e3c164c79b46dcb32ee3a28223f8b1543e166ea282d44f SHA512 cf8581f175518fdc83c6780bd6a1154d58db1c012bcaf14228e32d839532e741d8eaae4883f7905d181b7d2f0c1e2efe125377dd85eb5ebb742cc5252bbc4b54 -EBUILD zoom-5.4.53391.1108-r1.ebuild 3277 BLAKE2B 87dc8b01f6e9a1fa22800213151a90d05b0363d2bd1e8b50fc824d155646f4ef20c06b9ae74e128e35b9aebdce56e3a39d59096eda2867d4ce3df8b528c32ce2 SHA512 31bc281c49f9b5c6c9f8cfb03033fb759a5819240846c748386d66fa38c15b460ece32dab65992717bfaa979be661b8d799634dbebc855b0ae75524b82a655ca -EBUILD zoom-5.4.56259.1207-r2.ebuild 4224 BLAKE2B 03e5a160745625da2ffc3afd9db10de7609ebbdce30c1854506d3e0c28f9db4b7100691d3cbdb5ea6e3bd1aa94efa7ddca6c11c4e57301babb1c584ea3ae16d1 SHA512 b1a937c3aaee6ad41cda81b7420882c365d2e0d9eeff18f28ea0ad60969d70b7836bab2e9e26b209c6fd7162b0c65b989f792ea4074acaace87ff7ea39a9d8b3 +DIST zoom-5.4.57862.0110_x86_64.tar.xz 45850484 BLAKE2B 987efd8b0d75c3ff6dae43e7175b1c2967a554c5ac04baf1f634c5298d8e976129665a7b69943f6a2e5207f027f29612ddb2c3d8464995d2802fa457982e04d5 SHA512 69441864d7b413b76d6e1cd97808491aa4776988a1ffe30ac7ae1ab13f562fc43b27f810814155972f576b92a7d3ce13f90ed2a754bc374d20b6ee3ddcfbf40d +EBUILD zoom-5.4.53391.1108-r1.ebuild 3058 BLAKE2B 6e007b223d2075ac20f99237b27a9d38c611890c8c53c614ba20ef3ea20ae1335a2cad714fbfa2e120bdd96b21dbc1d4169125cb66988b423c86410d3e4d6f67 SHA512 99f09c38ecb0c26c6daaad5983ca5bedf68a510f69a6c5d4dd7931ef847cb235220abe30de06a68dc3a9274ed78ea22f751864a78bf9ac7aaef43b7a92c3717a EBUILD zoom-5.4.57450.1220.ebuild 4216 BLAKE2B 5686d389e8001afb71e2ba8768d6b30be62663c7eb231dea7e782e40294d6e7205a93af23dc2427a5646c9312ffacd41a63063c44263e9aa6bf1f13ab001db75 SHA512 f48332855183836ff75dd0a14eb6b8468e1130131048c0f26392453d86615246e2cc313fc2ea4a3dea4d1692095e66351f90804ccd628f56bebdea06766d3127 +EBUILD zoom-5.4.57862.0110.ebuild 3997 BLAKE2B 9077fd3a8892144dcb3daeaaffcd792fa897a5f95b62261f51de5b8fe37799838dd32876b94cbf9d2639f548edc71e4d111cf486c731165578377bb6aadaae2a SHA512 d9378b92ac93eee7996f14c58a774e4ebf553c0875736585aa29cefffb553d3037f8f52c1394950de7bb9db7dd5d68691c03ce93eb096e67d61e8696c525b149 MISC metadata.xml 615 BLAKE2B 4f6cae417f6fbf1f0670f5d0c750dfd4928eb09b3753e4dcd5b3ecf884ed39013ab88de2a0225f223a1655c7ece1fd41fce93e092b5fbaec3aee52fe69a7ffa3 SHA512 5aebbb40b7089db87e30b98500aad5116b70495f3563a1e362a81f3f5036b9ac73556631550966e48aaae39f05264c6d13eea9ff2734bd929e933b05c1c09425 diff --git a/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild b/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild index 3d3b63c3854b..07911c9877c9 100644 --- a/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild +++ b/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -48,7 +48,8 @@ RDEPEND="!games-engines/zoom pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-libs/alsa-lib )" -BDEPEND="dev-util/bbe" +BDEPEND="dev-util/bbe + bundled-libjpeg-turbo? ( dev-util/patchelf )" QA_PREBUILT="opt/zoom/*" @@ -67,6 +68,11 @@ src_prepare() { bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die mv zoom.tmp zoom || die fi + + if use bundled-libjpeg-turbo; then + # Remove insecure RPATH from bundled lib + patchelf --remove-rpath libturbojpeg.so || die + fi } src_install() { @@ -101,14 +107,6 @@ pkg_postinst() { ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1 done readme.gentoo_print_elog - - if use bundled-libjpeg-turbo; then - ewarn "If the \"bundled-libjpeg-turbo\" flag is enabled, you may see a" - ewarn "QA notice about insecure RPATHs in the libturbojpeg.so library" - ewarn "bundled with the upstream package. Please report this problem" - ewarn "directly to Zoom upstream. Do *not* file a Gentoo bug for it." - ewarn "See https://bugs.gentoo.org/715106 for further details." - fi } pkg_postrm() { diff --git a/net-im/zoom/zoom-5.4.56259.1207-r2.ebuild b/net-im/zoom/zoom-5.4.56259.1207-r2.ebuild deleted file mode 100644 index 73b7d52fa301..000000000000 --- a/net-im/zoom/zoom-5.4.56259.1207-r2.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop eapi8-dosym readme.gentoo-r1 wrapper xdg-utils - -DESCRIPTION="Video conferencing and web conferencing service" -HOMEPAGE="https://zoom.us/" -SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz" -S="${WORKDIR}/${PN}" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="bundled-libjpeg-turbo +bundled-qt pulseaudio wayland" -RESTRICT="mirror bindist strip" - -RDEPEND="!games-engines/zoom - dev-libs/glib:2 - dev-libs/quazip - media-libs/fontconfig - media-libs/freetype - media-sound/mpg123 - sys-apps/dbus - sys-apps/util-linux - virtual/opengl - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libxkbcommon[X] - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - pulseaudio? ( media-sound/pulseaudio ) - !pulseaudio? ( media-libs/alsa-lib ) - wayland? ( dev-libs/wayland ) - !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) - !bundled-qt? ( - dev-libs/icu - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5[widgets] - dev-qt/qtdiag:5 - dev-qt/qtgraphicaleffects:5 - dev-qt/qtgui:5 - dev-qt/qtlocation:5 - dev-qt/qtnetwork:5 - dev-qt/qtquickcontrols:5[widgets] - dev-qt/qtquickcontrols2:5 - dev-qt/qtscript:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - wayland? ( dev-qt/qtwayland ) - )" - -BDEPEND="dev-util/bbe" - -QA_PREBUILT="opt/zoom/*" - -src_prepare() { - default - - # The tarball doesn't contain an icon, so extract it from the binary - bbe -s -b '/\n/' -e 'J 1;D' zoom \ - >zoom-videocam.svg && [[ -s zoom-videocam.svg ]] \ - || die "Extraction of icon failed" - - if ! use pulseaudio; then - # For some strange reason, zoom cannot use any ALSA sound devices if - # it finds libpulse. This causes breakage if media-sound/apulse[sdk] - # is installed. So, force zoom to ignore libpulse. - bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die - mv zoom.tmp zoom || die - fi -} - -src_install() { - insinto /opt/zoom - exeinto /opt/zoom - doins -r json ringtone sip timezones translations - doins *.pcm *.sh Embedded.properties version.txt - doexe zoom zoom.sh zopen ZoomLauncher - dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so - dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so - - if use bundled-libjpeg-turbo; then - doexe libturbojpeg.so - else - dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so - fi - - if use bundled-qt; then - doexe libicu*.so.56 libQt5*.so.5 - doins qt.conf - - local dirs="Qt* generic iconengines imageformats \ - platforminputcontexts platforms wayland* xcbglintegrations" - doins -r ${dirs} - find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \ - -printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die - - ( # Remove libs and plugins with unresolved soname dependencies - cd "${ED}"/opt/zoom || die - rm -r Qt/labs/location QtQml/RemoteObjects \ - QtQuick/LocalStorage QtQuick/Particles.2 QtQuick/Scene2D \ - QtQuick/Scene3D QtQuick/Shapes QtQuick/XmlListModel \ - platforms/libqeglfs.so platforms/libqlinuxfb.so || die - use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \ - platforms/libqwayland*.so || die - ) - fi - - make_wrapper zoom /opt/zoom{/zoom,} $(usex bundled-qt /opt/zoom "") - make_desktop_entry "zoom %U" Zoom zoom-videocam "" \ - "MimeType=x-scheme-handler/zoommtg;application/x-zoom;" - doicon zoom-videocam.svg - doicon -s scalable zoom-videocam.svg - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - - local FORCE_PRINT_ELOG v - for v in ${REPLACING_VERSIONS}; do - ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1 - done - readme.gentoo_print_elog - - if use bundled-libjpeg-turbo; then - ewarn "If the \"bundled-libjpeg-turbo\" flag is enabled, you may see a" - ewarn "QA notice about insecure RPATHs in the libturbojpeg.so library" - ewarn "bundled with the upstream package. Please report this problem" - ewarn "directly to Zoom upstream. Do *not* file a Gentoo bug for it." - ewarn "See https://bugs.gentoo.org/715106 for further details." - fi -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/net-im/zoom/zoom-5.4.57862.0110.ebuild b/net-im/zoom/zoom-5.4.57862.0110.ebuild new file mode 100644 index 000000000000..6e49d223e0fc --- /dev/null +++ b/net-im/zoom/zoom-5.4.57862.0110.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop eapi8-dosym readme.gentoo-r1 wrapper xdg-utils + +DESCRIPTION="Video conferencing and web conferencing service" +HOMEPAGE="https://zoom.us/" +SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz" +S="${WORKDIR}/${PN}" + +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="bundled-libjpeg-turbo +bundled-qt pulseaudio wayland" +RESTRICT="mirror bindist strip" + +RDEPEND="!games-engines/zoom + dev-libs/glib:2 + dev-libs/quazip + media-libs/fontconfig + media-libs/freetype + media-sound/mpg123 + sys-apps/dbus + sys-apps/util-linux + virtual/opengl + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libxkbcommon[X] + x11-libs/libXrender + x11-libs/libXtst + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + pulseaudio? ( media-sound/pulseaudio ) + !pulseaudio? ( media-libs/alsa-lib ) + wayland? ( dev-libs/wayland ) + !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) + !bundled-qt? ( + dev-libs/icu + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5[widgets] + dev-qt/qtdiag:5 + dev-qt/qtgraphicaleffects:5 + dev-qt/qtgui:5 + dev-qt/qtlocation:5 + dev-qt/qtnetwork:5 + dev-qt/qtquickcontrols:5[widgets] + dev-qt/qtquickcontrols2:5 + dev-qt/qtscript:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + wayland? ( dev-qt/qtwayland ) + )" + +BDEPEND="dev-util/bbe + bundled-libjpeg-turbo? ( dev-util/patchelf )" + +QA_PREBUILT="opt/zoom/*" + +src_prepare() { + default + + # The tarball doesn't contain an icon, so extract it from the binary + bbe -s -b '/\n/' -e 'J 1;D' zoom \ + >zoom-videocam.svg && [[ -s zoom-videocam.svg ]] \ + || die "Extraction of icon failed" + + if ! use pulseaudio; then + # For some strange reason, zoom cannot use any ALSA sound devices if + # it finds libpulse. This causes breakage if media-sound/apulse[sdk] + # is installed. So, force zoom to ignore libpulse. + bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die + mv zoom.tmp zoom || die + fi + + if use bundled-libjpeg-turbo; then + # Remove insecure RPATH from bundled lib + patchelf --remove-rpath libturbojpeg.so || die + fi +} + +src_install() { + insinto /opt/zoom + exeinto /opt/zoom + doins -r json ringtone sip timezones translations + doins *.pcm *.sh Embedded.properties version.txt + doexe zoom zopen ZoomLauncher + dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so + dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so + + if use bundled-libjpeg-turbo; then + doexe libturbojpeg.so + else + dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so + fi + + if use bundled-qt; then + doexe libicu*.so.56 libQt5*.so.5 + doins qt.conf + + local dirs="Qt* generic iconengines imageformats \ + platforminputcontexts platforms wayland* xcbglintegrations" + doins -r ${dirs} + find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \ + -printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die + + ( # Remove libs and plugins with unresolved soname dependencies + cd "${ED}"/opt/zoom || die + rm -r Qt/labs/location QtQml/RemoteObjects \ + QtQuick/LocalStorage QtQuick/Particles.2 QtQuick/Scene2D \ + QtQuick/Scene3D QtQuick/Shapes QtQuick/XmlListModel \ + platforms/libqeglfs.so platforms/libqlinuxfb.so || die + use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \ + platforms/libqwayland*.so || die + ) + fi + + make_wrapper zoom /opt/zoom{/zoom,} $(usex bundled-qt /opt/zoom "") + make_desktop_entry "zoom %U" Zoom zoom-videocam "" \ + "MimeType=x-scheme-handler/zoommtg;application/x-zoom;" + doicon zoom-videocam.svg + doicon -s scalable zoom-videocam.svg + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + + local FORCE_PRINT_ELOG v + for v in ${REPLACING_VERSIONS}; do + ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1 + done + readme.gentoo_print_elog +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} -- cgit v1.2.3