Merge updates from master

8 files changed, 14 insertions, 196 deletions

diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 49bfebfac5db..2e92bda0256f 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,3 +1,2 @@
-DIST zoom-6.0.12.5501_x86_64.tar.xz 202090468 BLAKE2B 4f8320897028f346d270fa2bc0ab390bec8bcfca01d9cb741788a76d3f0e458c469162e908064cec51ab693c2e57014ad60b7f8c85d9f09c2f3d6375f9ca83f7 SHA512 b2dbc31e2c96e8012f1e644b783c5cc36a96b0b7aea68947139b0f6017b7ba821d0c190254ee6559e2c472a4f7c6a18e06c8177c7b226a9187683f09e64bd368
-DIST zoom-6.2.3.2056_x86_64.tar.xz 208218464 BLAKE2B a270defbe8a0b485f2e4b69971740f9c0fc784bf7b1a9204b9c4fa4fdd30ca12c2db439f562419d856bdb5dd156b345d0043172067497fefbc81d999b8fac959 SHA512 51923f101454d64d70e5927cc2557eab483518f7f76d2d9578f4d8f9beae71ffc821b7d0d3ef0e38ff7c213b10dd63acd931935d10c9d1a47690afe34bfc9023
+DIST zoom-6.2.10.4983_x86_64.tar.xz 210613920 BLAKE2B 2828ffe9205720490175054496d104b7146287a2aff13f81f37185e2943f514d228d4c11e9fc3c63f1e705f8698b15100db073e58ba5721eeafa34f1d9d9e8e2 SHA512 545770cfc4634d953ef778f60738ad8d0ed19a79d2422948d81288216762fe336edb0b77123c1dadf6b495bb64b8c097760446c0ce266c80a568a2efd3516088
 DIST zoom-6.2.6.2503_x86_64.tar.xz 208744168 BLAKE2B 73e5b6a6e2b26396ff56d2318541d6a09e7c7101d5ce87a821ed07d1f760a7bf5a92dd52460b453cc841cd76f106228df3acd7559e0ed09a7bb0da7a8f15013e SHA512 9aa1ed215d6f94889fc7d164135186fe8efb065b0727a3eb863cffb5a47e67790aa11de9d0035b805ec36529d376810120eaa821329dbba36af16610885b68c5
diff --git a/net-im/zoom/zoom-6.0.12.5501.ebuild b/net-im/zoom/zoom-6.0.12.5501.ebuild
deleted file mode 100644
index 141c19a15836..000000000000
--- a/net-im/zoom/zoom-6.0.12.5501.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop linux-info 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"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+bundled-qt opencl pulseaudio wayland +zoom-symlink"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="zoom-symlink? ( !games-engines/zoom )
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/mit-krb5
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/quazip-1.0:0=[qt5(+)]
-	media-libs/alsa-lib
-	media-libs/fdk-aac:0/2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa[gbm(+)]
-	media-sound/mpg123
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libxshmfence
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-renderutil
-	x11-libs/xcb-util-wm
-	opencl? ( virtual/opencl )
-	pulseaudio? ( media-libs/libpulse )
-	wayland? ( dev-libs/wayland )
-	!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/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-		wayland? ( dev-qt/qtwayland )
-	)"
-
-BDEPEND="dev-util/bbe"
-
-CONFIG_CHECK="~USER_NS ~PID_NS ~NET_NS ~SECCOMP_FILTER"
-QA_PREBUILT="opt/zoom/*"
-
-src_prepare() {
-	default
-
-	# The tarball doesn't contain an icon, so extract it from the binary
-	bbe -s -b '/<svg width="32" height="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
-		>videoconference-zoom.svg && [[ -s videoconference-zoom.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 calendar cef chatapp email json ringtone scheduler sip \
-		timezones translations
-	doins *.pcm Embedded.properties version.txt
-	doexe zoom zopen ZoomLauncher *.sh \
-		aomhost libaomagent.so libdvf.so libmkldnn.so \
-		libavcodec.so* libavformat.so* libavutil.so* libswresample.so*
-	fperms a+x /opt/zoom/cef/chrome-sandbox
-	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
-	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so
-
-	if use opencl; then
-		doexe libclDNN64.so
-		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
-	fi
-
-	if ! use wayland; then
-		# Soname dependency on libwayland-client.so.0
-		rm "${ED}"/opt/zoom/cef/libGLESv2.so || die
-	fi
-
-	if use bundled-qt; then
-		doins -r Qt
-		find Qt -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.
-			# Why does the upstream package contain such garbage? :-(
-			cd "${ED}"/opt/zoom/Qt || die
-			rm -r plugins/audio plugins/egldeviceintegrations \
-				plugins/platforms/libqeglfs.so \
-				plugins/platforms/libqlinuxfb.so \
-				plugins/platformthemes/libqgtk3.so \
-				qml/QtQml/RemoteObjects \
-				qml/QtQuick/LocalStorage qml/QtQuick/Particles.2 \
-				qml/QtQuick/Scene2D qml/QtQuick/Scene3D \
-				qml/QtQuick/XmlListModel || die
-			use wayland || rm -r lib/libQt5Wayland*.so* plugins/wayland* \
-				plugins/platforms/libqwayland*.so qml/QtWayland || die
-		)
-	else
-		local qtzoom="5.15" qtver=$(best_version dev-qt/qtcore:5)
-		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
-			ewarn "You have disabled the bundled-qt USE flag."
-			ewarn "You may experience problems when running Zoom with"
-			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
-			ewarn "See https://bugs.gentoo.org/798681 for details."
-		fi
-	fi
-
-	use zoom-symlink && dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom
-
-	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
-		"Network;VideoConference;" \
-		"MimeType=$(printf '%s;' \
-			x-scheme-handler/zoommtg \
-			x-scheme-handler/zoomus \
-			application/x-zoom)"
-	doicon videoconference-zoom.svg
-	doicon -s scalable videoconference-zoom.svg
-
-	local DOC_CONTENTS="Some of Zoom's screen share features (e.g.
-		the whiteboard) require display compositing. If you encounter
-		a black window when sharing the screen, then one of the following
-		actions should help:
-		\\n- Enable compositing in your window manager if it is supported
-		\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/zoom/zoom-6.2.3.2056.ebuild b/net-im/zoom/zoom-6.2.10.4983.ebuild
index 1df6e759f958..d2041ad48ed9 100644
--- a/net-im/zoom/zoom-6.2.3.2056.ebuild
+++ b/net-im/zoom/zoom-6.2.10.4983.ebuild
@@ -152,12 +152,13 @@ src_install() {
 
 	use zoom-symlink && dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom
 
-	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
-		"Network;VideoConference;" \
+	make_desktop_entry "${EPREFIX}/opt/zoom/ZoomLauncher %U" Zoom \
+		videoconference-zoom "Network;VideoConference;" \
 		"MimeType=$(printf '%s;' \
 			x-scheme-handler/zoommtg \
 			x-scheme-handler/zoomus \
 			application/x-zoom)"
+	mv "${ED}"/usr/share/applications/{ZoomLauncher-,}zoom.desktop || die
 	doicon videoconference-zoom.svg
 	doicon -s scalable videoconference-zoom.svg
 
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 0d7ca18c972d..180f5f210c16 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,6 +1,6 @@
-DIST vivaldi-snapshot_7.0.3495.5-1_amd64.deb 120919076 BLAKE2B ad42218cba3fb02ce193eaa47d7950b2c50c2ee0d037348ed02b488e0d473dc6442977a971f7c80f8867fd0f8b89bf0a79b6287bce459242b2a9085262cfef9a SHA512 749dea3739d3ef268c601fef2625ac9b56af2db79c3fb831e3ddfe1fc8e61d96c0ede69d9bc5955d70b91f24b06bfab0c9eba2e1b5fe40b54b99f0b7962e778d
-DIST vivaldi-snapshot_7.0.3495.5-1_arm64.deb 112790332 BLAKE2B 1b58180762c557df8c45fbc76ff79beb7e44bac224de12172642232d4e4d96642ce3624bbd6c9500e4a7dfa958acb689ddac4085fcaf89d3c198349d615e0e28 SHA512 f6967f25fdfe11be18c8ae12607b34c59938095f14a12cd6e40502cd02c48a8967e7bb78262870fe3c2b20b535caf12b4ec3a36d998b541dd76eb1033dc8eb32
-DIST vivaldi-snapshot_7.0.3495.5-1_armhf.deb 113955392 BLAKE2B 913b20cd3722aef8a2e8e77cc07b97637d0b440fb97c6ab2069e35559cf70e361a1997c88a56f12e926293d09d687f8c7ce78eb972cab3da14a165eae70651d4 SHA512 379414951a003f54334b9681c4cca08e98a2e56e204ddefcffa30110e2b7cbf21ca9fe43d851fe6f900d8b3891203e6dac8b676f31458cc850e75827ca00c090
 DIST vivaldi-snapshot_7.1.3510.4-1_amd64.deb 121045440 BLAKE2B d3cfd0e20228d1bf77ec42462ec58cf4888c0eb923ad5a6f7df86fb79b65666ecbf60f92f9adce04b31b78cce70789a26a4072982c36633c114bca2c924a1f69 SHA512 fe2464cf7b583ca6bbf2fa47060613667bc82d2ba2e54714c5189d534108af734afe5fc25ed9c4744e95593a3afaa6db115dc560c841f8d8c360157097690d80
 DIST vivaldi-snapshot_7.1.3510.4-1_arm64.deb 112938880 BLAKE2B f3931831317b918c43f9771fd454bdd09143e5e33e4d5a4236ef8c9c2aa8f911f393167c28ca6d663b7fc4a841dd8cbf0d0af2c5f834df5336840cbd5ae42c96 SHA512 cc5f8376d438be8159afcb384e7340be6f155f1c7a67492aa3f17776150e209cbdb8b984bb97a8974a54ae8ac4ceae0a08a82b5af0d0b3592e88cb669b76b425
 DIST vivaldi-snapshot_7.1.3510.4-1_armhf.deb 114060140 BLAKE2B 4984f711277bbe3127fe00f3f18a3c5984cafb68a6a127936a69bb45c587052e89fe2226e24545d03b61fb245f28a63b4c8c6739be450bea1e8cbc2543bab373 SHA512 c2eafc604cedb0e8dc00421ea0926dce5a523e9f678049565f6c74147acf963be04f5a64424dfec9c9dee2331cf52b07d112376711b18c2073ee8f3d0e50573a
+DIST vivaldi-snapshot_7.1.3527.3-1_amd64.deb 121007844 BLAKE2B aaad775ce4410d9774e96e309d5c37d75552aa533fbc2fb9a8d05482a75e9f078ef3691438089b0080202bfdce415a10e6d25ca2a383bdd56d1b89247f4e8e71 SHA512 cdd5818427dc25f3660e4e16019597ccd7229bb0d5e940852df1c7e5130fe22d94f5ade24c968534261ef9bef8913514e51286ca17b63c6ca07c3fc8a4683b6a
+DIST vivaldi-snapshot_7.1.3527.3-1_arm64.deb 112952768 BLAKE2B bed39c28f3b6029d78289f3c504de49310b5a9bcd4d3af3579bcfaba4f57f98ec6386d4df47efadeed1e736c5d5f88c8c346c5ec75655c99aa42f24395d4efb0 SHA512 22564448fff9707f1e8ed1e910db77040b83fb2f4f6e903694e1abee48278566a1c922182d412e5de92a14be6d9ea4f87850340996f5ea7ea663f461f4438356
+DIST vivaldi-snapshot_7.1.3527.3-1_armhf.deb 114104520 BLAKE2B 42140a4ba241014a12cfeab1dd00f4982bb74f031dc82f6a5e05f2c53236f8757e3f79d81351b4b71c86730e8ea6d078693e4f6d47d5e74818ff7c7ca6113e8c SHA512 134a7ff43e4e6e347444376d42bc498a7f2df48167f82cea1b204f646d565660da8feb94e073af8a1511e5d8a1093bec02ffe8b916103198aa01c0d2c3477bc4
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-7.0.3495.5.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-7.1.3527.3.ebuild
index 78e223893de8..8063fc01d0e9 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-7.0.3495.5.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-7.1.3527.3.ebuild
@@ -133,7 +133,7 @@ RDEPEND="
 	x11-libs/libXfixes
 	x11-libs/libxkbcommon
 	x11-libs/libXrandr
-	x11-libs/pango[X]
+	x11-libs/pango
 	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
 	proprietary-codecs? (
 		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index ac30989f331f..d68667052936 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,6 +1,6 @@
 DIST vivaldi-stable_7.0.3495.10-1_amd64.deb 120990972 BLAKE2B 55db6b2efd9a94cba4b016e739c89ce5a14ef0ae05ee65340c3a51e93482714716e7567941498108755e46128688417fe8793efee10eb9eafd10762d03518511 SHA512 99fb82df069daeebca6c6fc4b2ba2beabcbba6797bf838dda5dd91967c70f275b00a77fd1869345ad70253ac51fc559653c63639e0924c107256eea8113d2d7b
 DIST vivaldi-stable_7.0.3495.10-1_arm64.deb 112797448 BLAKE2B 0736c29d059fabc5b677c88d2a6ef260c11aa9ca9eb40dcc1604a763254e26a3311af9c0349b090240873a0f1e15eef4aef5fff78f0923131eedd0b5cb04c1ab SHA512 b69eddab970e10ccdf9bcb31b8e91a2a349e8c9aae55becc3313152e71459aba022f55a378a9810703c64614b44e8f4c7d3de3a56ad1e4b10d50eab17b4b051b
 DIST vivaldi-stable_7.0.3495.10-1_armhf.deb 114002332 BLAKE2B b0f9292943acdb99077a765f493a80974e8e8fce093c02f5785dd3b864cbc8acedf1c3a6d7dbc8455b937db6401becc49fd9aa5bd13bea5c17a57c23b601c36b SHA512 077d591eef251a574ce2c3ea880df510656fdf5911c771b24dd05fe4900ea499bd36ccdff7e6bebe7afdf5ac6f7c2d655df52ff5f66b7e08ff80cf09a1145c6c
-DIST vivaldi-stable_7.0.3495.6-1_amd64.deb 120922504 BLAKE2B a45944233dd3adf7704c36357212807f29dfca5a76d8e4b28ebcdc32cf05bd16b2feaa12e51174076b00dc93da82e6f6d6c0cc7570bcf8699164d35436d4f063 SHA512 bd2c70c5f0bcbe6fd617d6f622975abdf4d07891425d54e7fade9aa395e9e6e6e115be6fd88d50d0c613188b133164838cc8e621f7aecdeb718aa44c824b05e3
-DIST vivaldi-stable_7.0.3495.6-1_arm64.deb 112791276 BLAKE2B b7d94f3b3c66961fe87a0b56c8203d755b710bf7960f8a67e25beba7611d89bf820e335387fae8d6f52548188f04ec4b3c9faf06069a3ca78df6720181745b0b SHA512 963f4a14027e0d08c9b494769b00c6f6144243431afdd5270e46f5c05e8436ef81204a03940684553f1c93b92a1cf404e0717536784421f990442f8fec761692
-DIST vivaldi-stable_7.0.3495.6-1_armhf.deb 113945752 BLAKE2B ccb27a951238fde74fad992447eaab169724b4b4a09125d436168904cf87ddd43fbb037e88f3a667e529d64b110384f397c6d7a8495d8c01df4751be28d01cb5 SHA512 d96bd6baa2606d17388308292ba4ea8447f5d4bc91cdf216c9f704d4283ceaa0d4a0fee216e33611e576211b590f6bb1a40e881f8117a35370754aff287ab0c7
+DIST vivaldi-stable_7.0.3495.15-1_amd64.deb 120892368 BLAKE2B 32455bfa6762d5a1ff76ecae000f9650470e610094e6589e97dc15e53cad7a0e0f6a474ba58d9b30c73ec830dd323dbb3ab2221a90b6690882c5b977b20e7981 SHA512 b43e04258a861eb1220b2495a4e120dc364d7e2269ec0cb1cb7c84c259b5b292c409e8ef6746dfc1de43d9169b3c78edf4c452e8ecd2331655b30c6de84ed239
+DIST vivaldi-stable_7.0.3495.15-1_arm64.deb 112942544 BLAKE2B 928beea38e2a76e3d547469d9119d81fe9a8467891468849017fb70034f1a9f7bbd85ab0dff89301288ec12d61f905601b93d89e2b58bd724c09f55109b1def9 SHA512 6b8a9ada4d7ab27d705fb3cde61e6e2eb0df288e2c0bae2ec60c814037be1461ac1155f2b7a5a560e915a224d98ab420148f95a43afbb129fc672d26ed8fa8d9
+DIST vivaldi-stable_7.0.3495.15-1_armhf.deb 113982572 BLAKE2B 517f9fbc4218dc8db7356553f98b616d6a14d8a7cdf3aa6dd4ff06213efd70b845337781485a5981b9c85609a7bce01effb69a34c3e4468d9aa38b8e26865061 SHA512 a048c8f279690a9b5a003c84c11867ae1a95b7f45965c94d53d1d4731a498704ea870813cca6a21c55387cc84152d8f7c21a45be0a94f4663770a7934d24446c
diff --git a/www-client/vivaldi/vivaldi-7.0.3495.10.ebuild b/www-client/vivaldi/vivaldi-7.0.3495.10.ebuild
index 78e223893de8..a7a1e4c6d893 100644
--- a/www-client/vivaldi/vivaldi-7.0.3495.10.ebuild
+++ b/www-client/vivaldi/vivaldi-7.0.3495.10.ebuild
@@ -108,7 +108,7 @@ SRC_URI="
 S="${WORKDIR}"
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* amd64 ~arm ~arm64"
 IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine"
 RESTRICT="bindist mirror"
 #REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
diff --git a/www-client/vivaldi/vivaldi-7.0.3495.6.ebuild b/www-client/vivaldi/vivaldi-7.0.3495.15.ebuild
index a7a1e4c6d893..8063fc01d0e9 100644
--- a/www-client/vivaldi/vivaldi-7.0.3495.6.ebuild
+++ b/www-client/vivaldi/vivaldi-7.0.3495.15.ebuild
@@ -108,7 +108,7 @@ SRC_URI="
 S="${WORKDIR}"
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine"
 RESTRICT="bindist mirror"
 #REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
@@ -133,7 +133,7 @@ RDEPEND="
 	x11-libs/libXfixes
 	x11-libs/libxkbcommon
 	x11-libs/libXrandr
-	x11-libs/pango[X]
+	x11-libs/pango
 	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
 	proprietary-codecs? (
 		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )