gentoo resync : 29.12.2022

4 files changed, 142 insertions, 96 deletions

diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index 98036b008b57..5666c09db695 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1,3 +1,3 @@
-DIST discord-0.0.17.deb 77105376 BLAKE2B b11d9d6798beb3dbb36892c9c948535fee453c258a91f48b04a686813fb82dc43f7872fcb4e68d17e6fb366a84825aa0e7b4f1ad45ab4efec403a05fb88c4f2a SHA512 b51d8e019b9c8c365aedbc7c77e53febec95d0c0f1b773e008d4d72e3880303b6f2d3381f363eedc8e08492ee2d2e8ef6d65353e852a8db9d708a70caabbb3cb
-EBUILD discord-bin-0.0.17.ebuild 2048 BLAKE2B 68683bc15f12d875161c75d382b8e4fe4547ad4b1b57566b28a56577b0dc118a92e908c355b55bbf1c5cfa8907a01150a1e9bf01f77a2573a8240db7de387ffb SHA512 7da8315c5467e4f4c83308fdc372843f61663445c9a1d9b62cedf36dec395e4bde2366f7bf5e9b7cd118a526c0ffbeccb0b97ea50632842b1764ac54e90398ce
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+DIST discord-0.0.18.tar.gz 77398558 BLAKE2B e25ad448dd9f89e460a4380cde850506298a443be2b70fb243b92ab6a139815fea36260b879ece044c5c607561fde6adf36a188c186c48c34052ec105b23d732 SHA512 a9c5de48186542fa4385c5cf4ffb54484dee008cde5230a9f8a0e71a84e1e7ce680e170aca2018ad2217618ed2d4a4882836a408a5d0a5cab054c0954c1b55be
+EBUILD discord-bin-0.0.18.ebuild 3217 BLAKE2B e81d1de7ed447d25fb0c8d4c4f97466cfa66af58ca1d2477edbd8c99c3c2e04247a4b7e7880357d8360507b8461a214022c408ed9883cc3dc30d5729ffc980d7 SHA512 d1a222d6abece6e3ee4af7af3735a136d5b3dcb7ed67ee01909f790e8746bcf366e4e04b6ed85d1bb6241fd263112a1b79a75d137f06daf097d9c319cf89d74d
+MISC metadata.xml 401 BLAKE2B bfadde60f5ced8839f9268c03217b5908e6f5cf4ecf3069cbca236b1d8f7c56a3a887655a4afebc74f18cc11584079620828ebe15b9e2ee6879730d90fc603e7 SHA512 77bc1c0db6255f39790b7a9a87dabcec7352142f341b9d7a41c7e073118a7613948e63f65dad9ec672f6ed5026188cdbf1b09cb4073ff67c49ddac3fff2301dd
diff --git a/net-im/discord-bin/discord-bin-0.0.17.ebuild b/net-im/discord-bin/discord-bin-0.0.17.ebuild
deleted file mode 100644
index 542c2a913ed1..000000000000
--- a/net-im/discord-bin/discord-bin-0.0.17.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN%-bin}"
-MY_BIN="${MY_PN^}"
-
-inherit desktop linux-info optfeature pax-utils unpacker
-
-DESCRIPTION="All-in-one voice and text chat for gamers"
-HOMEPAGE="https://discordapp.com"
-SRC_URI="https://dl.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb"
-S="${WORKDIR}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64"
-RESTRICT="mirror bindist"
-
-# libXScrnSaver is used through dlopen (bug #825370)
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-"
-
-QA_PREBUILT="
-	opt/discord/${MY_BIN}
-	opt/discord/chrome-sandbox
-	opt/discord/libffmpeg.so
-	opt/discord/libvk_swiftshader.so
-	opt/discord/libvulkan.so
-	opt/discord/libEGL.so
-	opt/discord/libGLESv2.so
-	opt/discord/libVkICD_mock_icd.so
-	opt/discord/swiftshader/libEGL.so
-	opt/discord/swiftshader/libGLESv2.so
-	opt/discord/swiftshader/libvk_swiftshader.so
-"
-
-CONFIG_CHECK="~USER_NS"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:/usr/share/discord/Discord:discord:" \
-		usr/share/${MY_PN}/${MY_PN}.desktop || die
-}
-
-src_install() {
-	doicon usr/share/${MY_PN}/${MY_PN}.png
-	domenu usr/share/${MY_PN}/${MY_PN}.desktop
-
-	insinto /opt/${MY_PN}
-	doins -r usr/share/${MY_PN}/.
-	fperms +x /opt/${MY_PN}/${MY_BIN}
-	dosym -r /opt/${MY_PN}/${MY_BIN} /usr/bin/${MY_PN}
-
-	pax-mark -m "${ED}"/opt/${MY_PN}/${MY_PN}
-}
-
-pkg_postinst() {
-	optfeature "sound support" \
-		media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire
-	optfeature "system tray support" dev-libs/libappindicator
-}
diff --git a/net-im/discord-bin/discord-bin-0.0.18.ebuild b/net-im/discord-bin/discord-bin-0.0.18.ebuild
new file mode 100644
index 000000000000..e40d2077e427
--- /dev/null
+++ b/net-im/discord-bin/discord-bin-0.0.18.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN/-bin}"
+MY_PV="${PV/-r*}"
+
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh-CN zh-TW
+"
+
+inherit chromium-2 desktop linux-info optfeature unpacker xdg
+
+DESCRIPTION="All-in-one voice and text chat for gamers"
+HOMEPAGE="https://discordapp.com"
+SRC_URI="https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# libXScrnSaver is used through dlopen (bug #825370)
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+"
+
+RESTRICT="bindist mirror strip test"
+
+DESTDIR="/opt/${MY_PN}"
+
+QA_PREBUILT="
+	${DESTDIR#/}/${MY_PN^}
+	${DESTDIR#/}/chrome-sandbox
+	${DESTDIR#/}/libffmpeg.so
+	${DESTDIR#/}/libvk_swiftshader.so
+	${DESTDIR#/}/libvulkan.so
+	${DESTDIR#/}/libEGL.so
+	${DESTDIR#/}/libGLESv2.so
+	${DESTDIR#/}/libVkICD_mock_icd.so
+	${DESTDIR#/}/swiftshader/libEGL.so
+	${DESTDIR#/}/swiftshader/libGLESv2.so
+	${DESTDIR#/}/swiftshader/libvk_swiftshader.so
+"
+
+CONFIG_CHECK="~USER_NS"
+
+S="${WORKDIR}/${MY_PN^}"
+
+pkg_pretend() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	unpack ${MY_PN}-${MY_PV}.tar.gz
+}
+
+src_configure() {
+	chromium_suid_sandbox_check_kernel_config
+
+	default
+}
+
+src_prepare() {
+	default
+	# remove post-install script
+	rm postinst.sh || die "the removal of the unneeded post-install script failed"
+	# cleanup languages
+	pushd "locales/" || die "location change for language cleanup failed"
+	chromium_remove_language_paks
+	popd || die "location reset for language cleanup failed"
+	# fix .desktop exec location
+	sed -i -e "s:/usr/share/discord/Discord:${DESTDIR}/${MY_PN^}:" ${MY_PN}.desktop || die "fixing of exec location on .desktop failed"
+}
+
+src_install() {
+	doicon -s 256 ${MY_PN}.png
+
+	# install .desktop file
+	domenu ${MY_PN}.desktop
+
+	exeinto "${DESTDIR}"
+	doexe ${MY_PN^} chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so
+
+	insinto "${DESTDIR}"
+	doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin v8_context_snapshot.bin
+	insopts -m0755
+	doins -r locales resources swiftshader
+
+	# Chrome-sandbox requires the setuid bit to be specifically set.
+	# see https://github.com/electron/electron/issues/17972
+	fperms 4755 "${DESTDIR}"/chrome-sandbox
+
+	dosym "${DESTDIR}"/${MY_PN^} /usr/bin/${MY_PN}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "sound support" \
+		media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire
+	optfeature "system tray support" dev-libs/libappindicator
+}
diff --git a/net-im/discord-bin/metadata.xml b/net-im/discord-bin/metadata.xml
index 115e9d64a669..f485c452f77f 100644
--- a/net-im/discord-bin/metadata.xml
+++ b/net-im/discord-bin/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>ran.dall@icloud.com</email>
+		<name>Randall T. Vasquez</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>