gentoo resync : 25.11.2020

6 files changed, 149 insertions, 118 deletions

diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 4eba45999917..0248d4387df8 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,13 +1,12 @@
 AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e
 AUX zoom-videocam.svg 284 BLAKE2B fa118d489cafa1c14841c27ab4962c41d52987ee49b8ad0fb3e4c33d7cf376920e16a8f7358807d0809231fbf7ef8cafd4752ac90e85cc7395a56fbe07f6340d SHA512 a60345de0c86003dc49484fd5d3d22e3228b8b1c107796690289a7779769436809dd22b02b4951df2fc1e3a98c541dec4b0788ab7d112b2b9c8c29a46493a98d
 AUX zoom-videocam.xpm 806 BLAKE2B dcb9d7e2a90f564ed6b7f0b733efb72867ecf2418177b25ecd5a00e204ab9f0f89c2b1f3b3078b3cf326c8c523480f183170a82d896b73848e7596b32a351a9b SHA512 a49e7cce25e6b3a1492b2ed834f7fe8f533b5374b0c4eea4089003459ac011ef264175c5c2322cceb77f8fb67e939e90e9abddeef415d2f570add8301cd10a48
-DIST zoom-5.2.458699.0906_i686.tar.xz 39597652 BLAKE2B 594dde9f4246e3a1f52bdf0fe45df1557c476a64167f7aa879c8cee39b7a46f65d86265f7b4c18de8028f96b3c74d7e2d6af0d53e8ffea95dc8fc1e0a9e3d679 SHA512 d987913c1680f772eb13362d9b356ee3deb99c67f267a7d15c6907a8693901439e1309e4e6f9eaebd22b2480ca4fa6e68fea96c6e2642a0a7e717211dac90e22
-DIST zoom-5.2.458699.0906_x86_64.tar.xz 38982472 BLAKE2B 45645ffd3a105e2e3c801750490ba57a5b509748d7c6f12699bab540410e08b4dd677d3be3f581ea94a66a0e80348ad1dfd739eeb5c543d2d68d172ab6b85154 SHA512 c9f73bb58eaf591df0675c9518bf97bb1c0a7a902107411e6c6ba4d06e51081155abc50f950a0bf234bf1d1a234cc4476dfbf95d08ac8f7dc0b08abc40c7564c
-DIST zoom-5.3.465578.0920_i686.tar.xz 39756188 BLAKE2B c14efb485096af16dfcbd80bcbd643e48fcea784568d231a37e9dd7bf57337f0171981de209ebc1482518cc6f7216c425e43fcd36c43c30732b39928057ec7cc SHA512 cbdc35e8124a558a084e89483e0150cfb9585668f6e259e75b7d6f6323849c3dcdae75b1525c5e86eba5cf05867e8ce8a0cb2f4e8406a16fcb5a30673aa7102c
-DIST zoom-5.3.465578.0920_x86_64.tar.xz 40086928 BLAKE2B 78df8a807a951b2d82806a46a90f12ce0287adf77bfd31ead5bd11b642c24012b1692e1dd4bd8c83208c091581040d245b05f518318f9aa175046a0e000ff75b SHA512 b98e6783e5189c296857dd7b19708c70004fd38b1bc68f4ecf53d531b4209cdbce1348b8bdb601df78113d38bdc669271ccb267fc2ae1b2d7683abf8d95ad550
-DIST zoom-5.3.469451.0927_i686.tar.xz 39797144 BLAKE2B 74e7eb541e1ac4c304f5d1faae342078f7ede92e0af84efa2150b9be0db3d69bf78ead639225cba4017a684f94dc505e28aad481ccd0cbeacbfa30ac1aa38faa SHA512 8593d66e214df2c8b6038ce32e2561b035eab6408affcb6bf4ec1f61113a422ec2e710cb2c6ed178034500f96900685bdb10994bc7554462f2899561e54f2e47
-DIST zoom-5.3.469451.0927_x86_64.tar.xz 40206068 BLAKE2B 82a97ad9a908767edddb6ef3b5331b502e5644ce7116d6683ddd810b442080790a4745493e40d7dc82d63515373f3dc6af4cd1665622022f8a8e61d2f65891fc SHA512 922903e576325754b8d7814866c1a06a17e8bfcaee872b6e72f6645a3655832ff6e1f244b5635305ad9286f8472dc82168d3567e816c998981042de00acb574d
-EBUILD zoom-5.2.458699.0906.ebuild 2908 BLAKE2B 11dba4e86f91f2c42976643926371c739b27cc3c8a7c233cefac4c68a0569f209b91d7aca6cf4d8e1add4856ee00c507ed90f235c6f143079d7c67654d805287 SHA512 4c2741fa72ea2de0211ec5aa26dd63800ca36bdcb637df41b35a1aad60db85de5b0c2b4479c2dde68610a4319e343807662a1d4fe1bb4bc1053e7025177f6b3d
-EBUILD zoom-5.3.465578.0920-r1.ebuild 2921 BLAKE2B ce06deca03f557717e6b83e93afb80b67be000820cdeb05de5817facf7f929b795359f3d9e9f950a0446943c5e1a4881c0f6143d4adf694c4d169296fd6be482 SHA512 4b65221249b5da35388d240a546c0998a047517d877966e066fedb2f6450b65f7f2329f35f7d52c34df7721b88d89c64c81942ef5b7ddc52d2a9d5f115c8a649
-EBUILD zoom-5.3.469451.0927.ebuild 2877 BLAKE2B e477df27c26d6b7db8026f8120437bf2db5388acfc0074c497e3a7777de258c25a0d2415f9af04dfc7d49b5b183e70d25b6c53885cd0b45d5d57f86e02105c29 SHA512 fcf0c2c6d8864c30746ecd724fde4147639a62df59d5681f0b5b69cb1552a8df8971e9ed69ee064e1313cc1db6f029fd598675c37982ea66d52a607d3e368933
-MISC metadata.xml 523 BLAKE2B f258ebdf8e4a2e067f202ede6324203b640c6a7fce843cc4b42cf4eef6efd97620e50c22c80f885d09254e403f016758d7dd3ba1deeef0c26692487a2ca9ba35 SHA512 9746752364f19f9e17516315231c8efef278f4d77ddcbfde213b5a65b012d6e320a20536e44ac5a111b2370a21cb59eb7a88c5c3fd2a1dd44064702d5e7bca38
+DIST zoom-5.3.472687.1012_i686.tar.xz 39774708 BLAKE2B 3cd80244168bfee3b92ffc5be1763eb9e205c6119cabc64d91dfdb9b22a3a5515c7f397a938982e0de80a51512ff0c47a9812ca4969619a0b403b99d0b385963 SHA512 d0fecb64a50594376b1a9747e9532153ffba8d541ef1b705a3e7ccd1acfd1611fbad6308ec576d2dad99fb4a26a730f283e0eda512afe8939c1f90e3c6636b6d
+DIST zoom-5.3.472687.1012_x86_64.tar.xz 40046644 BLAKE2B a05255bcefcf0a0f44055ef5f89797ef8c62082732fc7e1a68c9601b34ece01989216a8b68fb6d42ec51976159d9f2766de50f25db4dd53120a303c1b6bd26d0 SHA512 c355073ce73ae047bc4aad952432e85ab0464bc3bb68dc20c121243bc719b3bd3337382bd3a283a44724d68b28a6e64c7bd8eb0f6598c2ecb6d4ddcb7193eab0
+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.54779.1115_x86_64.tar.xz 45216096 BLAKE2B a65c7db96ac0ea5a99b6edba0145d766395ebd67402f28ee276e1a2ed87ca9c9c01bedef12eb4d99a6525f0ec0698de1471c3ca620e32ec29ada5b8edd55416c SHA512 e859060592dc110ccb42760fff54f632b079124ff2b8988e55dfd27d70b132b035d6b0ef8eec83b7d90ddf56a6e675dac4d04c29bec9faab377db4926fb2462d
+EBUILD zoom-5.3.472687.1012.ebuild 2877 BLAKE2B e477df27c26d6b7db8026f8120437bf2db5388acfc0074c497e3a7777de258c25a0d2415f9af04dfc7d49b5b183e70d25b6c53885cd0b45d5d57f86e02105c29 SHA512 fcf0c2c6d8864c30746ecd724fde4147639a62df59d5681f0b5b69cb1552a8df8971e9ed69ee064e1313cc1db6f029fd598675c37982ea66d52a607d3e368933
+EBUILD zoom-5.4.53391.1108.ebuild 2907 BLAKE2B 2ffd91cf8d742abf204d28736f2a63d3de3c370f465bdae217abb3a105fc7119d48e885f00c60bfc3303d4a4b3f678f2d406638c9dcd6b97db11840b5ec3b5e0 SHA512 5342ac23469035178db2ff8bb889f056ea7274929951c54c5e3700e8da8b1c8de96e7f6ea5478ebdfd57ee6134ea799c270c453165ee71c3d83903dcdc86bf53
+EBUILD zoom-5.4.54779.1115-r1.ebuild 3900 BLAKE2B 33906c5a537a6ddb3c0e63f6870a3ea50bb044bc3f733f87c435d76d9c12f2637016bcfe2bbcff52fdbd7ef89e6450dbd27666b1cae9a8eb4f330cd2c9532c5b SHA512 624e27abc2ef8f2a3237216a7b8d5cc89f6f7dbc99b0265d3fd74b4f45afa0bdc8a250c0d9942c3a02943917cccaa25e4dcc3291c12b9528064cc3cdace67b98
+MISC metadata.xml 615 BLAKE2B 4f6cae417f6fbf1f0670f5d0c750dfd4928eb09b3753e4dcd5b3ecf884ed39013ab88de2a0225f223a1655c7ece1fd41fce93e092b5fbaec3aee52fe69a7ffa3 SHA512 5aebbb40b7089db87e30b98500aad5116b70495f3563a1e362a81f3f5036b9ac73556631550966e48aaae39f05264c6d13eea9ff2734bd929e933b05c1c09425
diff --git a/net-im/zoom/metadata.xml b/net-im/zoom/metadata.xml
index df9fc1aee0d0..e6786c75fd45 100644
--- a/net-im/zoom/metadata.xml
+++ b/net-im/zoom/metadata.xml
@@ -13,5 +13,7 @@
   <use>
     <flag name="bundled-libjpeg-turbo">Use bundled libturbojpeg
       instead of <pkg>media-libs/libjpeg-turbo</pkg></flag>
+    <flag name="bundled-qt">Use bundled Qt and icu instead of
+      system-wide libs</flag>
   </use>
 </pkgmetadata>
diff --git a/net-im/zoom/zoom-5.2.458699.0906.ebuild b/net-im/zoom/zoom-5.2.458699.0906.ebuild
deleted file mode 100644
index c11afe99432c..000000000000
--- a/net-im/zoom/zoom-5.2.458699.0906.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Video conferencing and web conferencing service"
-HOMEPAGE="https://zoom.us/"
-SRC_URI="amd64? ( https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz )
-	x86? ( https://zoom.us/client/${PV}/${PN}_i686.tar.xz -> ${P}_i686.tar.xz )"
-S="${WORKDIR}/${PN}"
-
-LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libjpeg-turbo pulseaudio"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!games-engines/zoom
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	amd64? ( dev-qt/qtdeclarative:5[widgets] )
-	x86? ( dev-qt/qtdeclarative:5 )
-	dev-qt/qtdiag:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	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/libXtst
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	!bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo )
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-libs/alsa-lib )"
-
-BDEPEND="!pulseaudio? ( dev-util/bbe )"
-
-QA_PREBUILT="opt/zoom/*"
-
-src_prepare() {
-	default
-	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 sip timezones translations
-	doins *.pcm *.pem *.sh Embedded.properties version.txt
-	doexe zoom zoom.sh zopen ZoomLauncher
-	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-
-	if use bundled-libjpeg-turbo; then
-		doexe libturbojpeg.so.0.1.0
-		dosym libturbojpeg.so.0.1.0 /opt/zoom/libturbojpeg.so
-	else
-		dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106
-	fi
-
-	make_wrapper zoom ./zoom /opt/zoom
-	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
-		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
-	# The tarball doesn't contain an icon, so take a generic camera icon
-	# from https://github.com/google/material-design-icons, modified to be
-	# white on a blue background
-	doicon -s scalable "${FILESDIR}"/zoom-videocam.svg
-	doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm
-	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
-}
diff --git a/net-im/zoom/zoom-5.3.469451.0927.ebuild b/net-im/zoom/zoom-5.3.472687.1012.ebuild
index 58b926df6a20..58b926df6a20 100644
--- a/net-im/zoom/zoom-5.3.469451.0927.ebuild
+++ b/net-im/zoom/zoom-5.3.472687.1012.ebuild
diff --git a/net-im/zoom/zoom-5.3.465578.0920-r1.ebuild b/net-im/zoom/zoom-5.4.53391.1108.ebuild
index 63ad690a864c..b6642189422d 100644
--- a/net-im/zoom/zoom-5.3.465578.0920-r1.ebuild
+++ b/net-im/zoom/zoom-5.4.53391.1108.ebuild
@@ -23,11 +23,11 @@ RDEPEND="!games-engines/zoom
 	dev-libs/quazip
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
-	amd64? ( dev-qt/qtdeclarative:5[widgets] )
-	x86? ( dev-qt/qtdeclarative: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/qtscript:5
@@ -66,7 +66,7 @@ src_prepare() {
 src_install() {
 	insinto /opt/zoom
 	exeinto /opt/zoom
-	doins -r json sip timezones translations
+	doins -r json ringtone sip timezones translations
 	doins *.pcm *.pem *.sh Embedded.properties version.txt
 	doexe zoom zoom.sh zopen ZoomLauncher
 	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so
diff --git a/net-im/zoom/zoom-5.4.54779.1115-r1.ebuild b/net-im/zoom/zoom-5.4.54779.1115-r1.ebuild
new file mode 100644
index 000000000000..388dc20478b1
--- /dev/null
+++ b/net-im/zoom/zoom-5.4.54779.1115-r1.ebuild
@@ -0,0 +1,135 @@
+# 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 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 Apache-2.0" # Apache-2.0 for icon
+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-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/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/qtscript:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		wayland? ( dev-qt/qtwayland )
+	)"
+
+BDEPEND="!pulseaudio? ( dev-util/bbe )"
+
+QA_PREBUILT="opt/zoom/*"
+
+src_prepare() {
+	default
+	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* audio generic iconengines imageformats platform* \
+			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/Scene{2D,3D} \
+				platforms/libqeglfs.so || die
+			use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \
+				platforms/libqwayland*.so || die
+		)
+	fi
+
+	dosym8 -r /opt/zoom/ZoomLauncher /usr/bin/zoom
+	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
+		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
+	# The tarball doesn't contain an icon, so take a generic camera icon
+	# from https://github.com/google/material-design-icons, modified to be
+	# white on a blue background
+	doicon -s scalable "${FILESDIR}"/zoom-videocam.svg
+	doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm
+	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."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}