From 3a60b38f14fa81df8e18aa67d1634fbffca17d14 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 14 Jan 2023 05:50:43 +0000
Subject: gentoo auto-resync : 14:01:2023 - 05:50:42

---
 net-im/Manifest.gz                           | Bin 10099 -> 10099 bytes
 net-im/discord-bin/Manifest                  |   4 ++--
 net-im/discord-bin/discord-bin-0.0.23.ebuild |  16 ++--------------
 net-im/discord-bin/metadata.xml              |   3 ---
 4 files changed, 4 insertions(+), 19 deletions(-)

(limited to 'net-im')

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index dc2e09289639..9aa1f8d86164 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index ee0d09de78b9..02c945b861d3 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1,3 +1,3 @@
 DIST discord-0.0.23.tar.gz 82116322 BLAKE2B 5ed0d4d20d20a5bdb2e5bfc31b0a9c47baeaca976ee0f0861fdb436d89eccd4f5d50df9bd366f996cdbc767ce6d06bddf5992574329c7b5c01b47a9c154a37c4 SHA512 d03b27180c95ca74c93323090ce5c1e4351577d27184cfbf5525439052505ba198fafbd4b1489f97ce4c103bc35d1cfb4cdb1c32fc9c80bc55e2373b7a894a39
-EBUILD discord-bin-0.0.23.ebuild 3551 BLAKE2B 3a4c91b7f3d5c089445cf8ebf9e923e9792b1fd7f2655cfba67101b023bdeebbe8da955872d8b02d78cebda4d1ccbecf6a3ad688dc250e3a545b288ea558e77a SHA512 25643031794bb0f99fd358f1bfd8bec289ee5ff7c14fb9e20e9474fde0e8c0a8806c0f6e56ac9f8338264e6c750e853de3cd4fdf0a9bb2caacf3f5857b00fe48
-MISC metadata.xml 521 BLAKE2B d35802fb6784e2029bd0478c24ec5d4c43f7183c4c94c3aea0c7c3e172855d1f4fe1ee5e163b7d5d1b41d2cdcf9bc5b9ecc56e4556e2ab8ffdc5503f19f0ee87 SHA512 3d0e4099b7881affc0a6e6cc6bb13d68a83df833db8def22d60d441f27ad576f88651f6f4133b82146e9e346cc646c2d347c517ec5e90d01118e1a1f9d2bdfa1
+EBUILD discord-bin-0.0.23.ebuild 3159 BLAKE2B a06be4567f6e07bda8778e1b52e4bccf49cebb6a7c9136e1b3c27fe3ceed29a6d1cddbedd92f08659d80926c52320412c4a0990e4066feb9a0fb7140b91e0fc1 SHA512 0a6f9d9aa8327a3ae3fa03ff3c58640a1a3c672250ade47a204fb30ca6055959c0fc4e64af6921bf9b913f26b3975fdc94ec0254ffc1c89519f4bd73054af813
+MISC metadata.xml 401 BLAKE2B bfadde60f5ced8839f9268c03217b5908e6f5cf4ecf3069cbca236b1d8f7c56a3a887655a4afebc74f18cc11584079620828ebe15b9e2ee6879730d90fc603e7 SHA512 77bc1c0db6255f39790b7a9a87dabcec7352142f341b9d7a41c7e073118a7613948e63f65dad9ec672f6ed5026188cdbf1b09cb4073ff67c49ddac3fff2301dd
diff --git a/net-im/discord-bin/discord-bin-0.0.23.ebuild b/net-im/discord-bin/discord-bin-0.0.23.ebuild
index 6c222472fcfe..a34a015dfead 100644
--- a/net-im/discord-bin/discord-bin-0.0.23.ebuild
+++ b/net-im/discord-bin/discord-bin-0.0.23.ebuild
@@ -23,7 +23,7 @@ LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="amd64"
 RESTRICT="bindist mirror strip test"
-IUSE="+seccomp system-ffmpeg"
+IUSE="+seccomp"
 
 RDEPEND="
 		|| (
@@ -57,7 +57,6 @@ RDEPEND="
 	x11-libs/libxkbcommon
 	x11-libs/libxshmfence
 	x11-libs/pango
-	system-ffmpeg? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
 "
 
 DESTDIR="/opt/${MY_PN}"
@@ -95,11 +94,6 @@ src_prepare() {
 			"${MY_PN}.desktop" ||
 			die "sed failed for seccomp"
 	fi
-	# USE system-ffmpeg
-	if use system-ffmpeg; then
-		rm libffmpeg.so || die
-		elog "Using system ffmpeg. This is experimental and may lead to crashes."
-	fi
 }
 
 src_install() {
@@ -110,13 +104,7 @@ src_install() {
 
 	exeinto "${DESTDIR}"
 
-	doexe "${MY_PN^}" chrome_crashpad_handler chrome-sandbox libEGL.so libGLESv2.so libvk_swiftshader.so
-
-	if use system-ffmpeg; then
-		dosym "../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION}" "${DESTDIR}/libffmpeg.so" || die
-	else
-		doexe libffmpeg.so
-	fi
+	doexe "${MY_PN^}" chrome_crashpad_handler 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
diff --git a/net-im/discord-bin/metadata.xml b/net-im/discord-bin/metadata.xml
index 9388cb8e95f9..f485c452f77f 100644
--- a/net-im/discord-bin/metadata.xml
+++ b/net-im/discord-bin/metadata.xml
@@ -9,7 +9,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> instead of bundled</flag>
-	</use>
 </pkgmetadata>
-- 
cgit v1.2.3