[gentoo-commits] repo/proj/guru:dev commit in: net-im/discord-canary-bin/

["Andrew Ammerlaan" <andrewammerlaan@riseup.net>]

commit:     ba3a93397818f16cbfac6ad5d10980f8b59ce0c6
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Mar 24 09:03:11 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Mar 24 09:04:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ba3a9339

net-im/discord-canary-bin: sync with net-im/discord::gentoo

fixes the desktop file

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 net-im/discord-canary-bin/Manifest                 |  2 +-
 .../discord-canary-bin-0.0.119-r1.ebuild           | 89 ++++++++++++++++++++++
 .../discord-canary-bin-0.0.119.ebuild              | 89 ----------------------
 3 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/net-im/discord-canary-bin/Manifest b/net-im/discord-canary-bin/Manifest
index 52f5b1938..d127675dd 100644
--- a/net-im/discord-canary-bin/Manifest
+++ b/net-im/discord-canary-bin/Manifest
@@ -1 +1 @@
-DIST discord-canary-0.0.119.tar.gz 71822214 BLAKE2B 9c98f263f540bdb720597daa9ab7a77de4cdbeea45dfc47bb8bf14f8e7b4a69d2c366140efffeb6cfc951e9ee02f10e63007dfbc93eb58c3e8e45ff23ca261b7 SHA512 6f6d7175ecd6f2992caa8b29c28d1533fb15aa9b201fec9c5822500104f161c55cbbe3e698af8ab98a4bd152c96759f5d18583c5db472c777666a9c4eb72de83
+DIST discord-canary-0.0.119.deb 71512470 BLAKE2B a5c89940427b7d4fe228e1929cbe5d1e9f4bf47818b7e4f70fbdd772359c0db81bbfaa7b7b228a975bf73119084674cd03a902d668f189b995e94c2d97c39c8c SHA512 d19fe621ee13aecb19eacb4bda87d4e2e4342399173d1c1a4e9f9864fb8670f05254a966dc7f2f968b4dc7031e30f696d45c21affc83e7de8d96ca501da4482e

diff --git a/net-im/discord-canary-bin/discord-canary-bin-0.0.119-r1.ebuild b/net-im/discord-canary-bin/discord-canary-bin-0.0.119-r1.ebuild
new file mode 100644
index 000000000..8f9b07348
--- /dev/null
+++ b/net-im/discord-canary-bin/discord-canary-bin-0.0.119-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=${PN/-bin/}
+MY_BIN="D${MY_PN/d/}"
+MY_BIN="${MY_BIN/-canary/}Canary"
+
+inherit desktop linux-info pax-utils unpacker xdg
+
+DESCRIPTION="All-in-one voice and text chat"
+HOMEPAGE="https://discordapp.com/"
+SRC_URI="https://dl-canary.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror bindist"
+
+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/fontconfig:1.0
+	media-libs/freetype:2
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/discord-canary/${MY_BIN}
+	opt/discord-canary/chrome-sandbox
+	opt/discord-canary/libffmpeg.so
+	opt/discord-canary/libvk_swiftshader.so
+	opt/discord-canary/libvulkan.so
+	opt/discord-canary/libEGL.so
+	opt/discord-canary/libGLESv2.so
+	opt/discord-canary/libVkICD_mock_icd.so
+	opt/discord-canary/swiftshader/libEGL.so
+	opt/discord-canary/swiftshader/libGLESv2.so
+	opt/discord-canary/swiftshader/libvk_swiftshader.so
+"
+
+CONFIG_CHECK="~USER_NS"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:/usr/share/${MY_PN}/${MY_BIN}:/opt/${MY_PN}/${MY_BIN}:g" \
+		usr/share/${MY_PN}/${MY_PN}.desktop || die
+}
+
+src_install() {
+	newicon usr/share/${MY_PN}/${MY_PN//-canary}.png ${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 ../../opt/${MY_PN}/${MY_BIN} usr/bin/${MY_PN}
+
+	pax-mark -m "${ED}"/opt/${MY_PN}/${MY_PN}
+}

diff --git a/net-im/discord-canary-bin/discord-canary-bin-0.0.119.ebuild b/net-im/discord-canary-bin/discord-canary-bin-0.0.119.ebuild
deleted file mode 100644
index 618be3f52..000000000
--- a/net-im/discord-canary-bin/discord-canary-bin-0.0.119.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils xdg
-
-DESCRIPTION="All-in-one voice and text chat"
-HOMEPAGE="https://discordapp.com/"
-SRC_URI="https://dl-canary.discordapp.net/apps/linux/${PV}/discord-canary-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="all-rights-reserved"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror bindist"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-libs/atk
-	sys-libs/libcxx
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-gfx/graphite2
-	media-libs/alsa-lib
-	media-libs/fontconfig:1.0
-	media-libs/libpng
-	media-libs/freetype:2
-	net-print/cups
-	sys-apps/dbus
-	net-libs/gnutls
-	sys-libs/libcxx
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	sys-libs/zlib
-	x11-libs/gtk+:3
-	x11-libs/libnotify
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-
-	x11-libs/libXtst
-	media-libs/opus"
-
-S=${WORKDIR}/DiscordCanary
-
-QA_PREBUILT="
-	opt/discord-canary-bin/DiscordCanary
-	opt/discord-canary-bin/libEGL.so
-	opt/discord-canary-bin/libGLESv2.so
-	opt/discord-canary-bin/swiftshader/libEGL.so
-	opt/discord-canary-bin/swiftshader/libGLESv2.so
-	opt/discord-canary-bin/libVkICD_mock_icd.so
-	opt/discord-canary-bin/libffmpeg.so
-"
-
-src_install() {
-	local destdir="/opt/${PN}"
-
-	insinto $destdir
-	doins -r locales resources
-	doins \
-		*.pak \
-		*.png \
-		*.dat \
-		*.bin \
-		*.so
-
-	exeinto $destdir
-	doexe DiscordCanary
-
-	dosym $destdir/DiscordCanary /usr/bin/discord-canary
-	make_desktop_entry discord Discord \
-		"/opt/discord-canary/discord.png" \
-		Network
-}