[gentoo-commits] repo/gentoo:master commit in: net-im/discord-bin/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/discord-bin/
Date: Thu, 19 May 2022 02:03:55 +0000 (UTC)	[thread overview]
Message-ID: <1652925821.90da631df86b6b0036090b942a687d67d008c5a6.sam@gentoo> (raw)

commit:     90da631df86b6b0036090b942a687d67d008c5a6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 02:03:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 19 02:03:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90da631d

net-im/discord-bin: add missing inherit; tidy

Bug: https://github.com/gentoo/gentoo/pull/25542
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-im/discord-bin/discord-bin-0.0.17-r1.ebuild | 61 ++++++++++---------------
 1 file changed, 25 insertions(+), 36 deletions(-)

diff --git a/net-im/discord-bin/discord-bin-0.0.17-r1.ebuild b/net-im/discord-bin/discord-bin-0.0.17-r1.ebuild
index a818701fa4ed..c79e83117a24 100644
--- a/net-im/discord-bin/discord-bin-0.0.17-r1.ebuild
+++ b/net-im/discord-bin/discord-bin-0.0.17-r1.ebuild
@@ -13,7 +13,7 @@ CHROMIUM_LANGS="
 	sw ta te th tr uk vi zh-CN zh-TW
 "
 
-inherit chromium-2 desktop linux-info optfeature pax-utils unpacker
+inherit chromium-2 desktop linux-info optfeature pax-utils unpacker xdg
 
 DESCRIPTION="All-in-one voice and text chat for gamers"
 HOMEPAGE="https://discordapp.com"
@@ -56,26 +56,26 @@ RDEPEND="
 
 RESTRICT="bindist mirror strip test"
 
+DESTDIR="/opt/${MY_BIN}"
+
 QA_PREBUILT="
-	${DESTDIR}/${MY_BIN}
-	${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
+	${DESTDIR#/}/${MY_BIN}
+	${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_BIN}"
 
-DESTDIR="/opt/${MY_BIN}"
-
 pkg_pretend() {
 	chromium_suid_sandbox_check_kernel_config
 }
@@ -86,6 +86,7 @@ src_unpack() {
 
 src_configure() {
 	chromium_suid_sandbox_check_kernel_config
+
 	default
 }
 
@@ -96,11 +97,9 @@ src_prepare() {
 
 	pushd "locales/" || die
 	chromium_remove_language_paks
-	popd
-	
-	sed -i \
-	-e "s:/usr/share/discord/Discord:${DESTDIR}/${MY_BIN}:" \
-	${MY_PN}.desktop || die
+	popd || die
+
+	sed -i -e "s:/usr/share/discord/Discord:${DESTDIR}/${MY_BIN}:" ${MY_PN}.desktop || die
 }
 
 src_install() {
@@ -109,37 +108,27 @@ src_install() {
 	# Install desktop file
 	domenu ${MY_PN}.desktop
 
-	exeinto ${DESTDIR}
+	exeinto "${DESTDIR}"
 	doexe ${MY_BIN} chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so  libvk_swiftshader.so
 
-	insinto ${DESTDIR}
+	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 || die
-
-	pax-mark m ${DESTDIR}/${MY_BIN} || die "could not set proper PAX permissions"
+	fperms 4755 "${DESTDIR}"/chrome-sandbox || die
 
-	dosym ${DESTDIR}/${MY_BIN} /usr/bin/${MY_PN} || die
+	pax-mark m "${DESTDIR}"/${MY_BIN} || die "could not set proper PAX permissions"
 
-	dodir ${DESTDIR}
+	dosym "${DESTDIR}"/${MY_BIN} /usr/bin/${MY_PN} || die
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	
+	xdg_pkg_postinst
+
 	optfeature "sound support" \
 		media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire
 	optfeature "system tray support" dev-libs/libappindicator
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}

next             reply	other threads:[~2022-05-19  2:04 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-19  2:03 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-01-14  5:31 [gentoo-commits] repo/gentoo:master commit in: net-im/discord-bin/ Nick Sarnie
2023-01-14  5:29 Nick Sarnie
2023-01-14  1:20 Nick Sarnie
2023-01-13 18:49 Nick Sarnie
2023-01-13 18:30 Nick Sarnie
2023-01-13  0:40 Nick Sarnie
2023-01-13  0:16 Nick Sarnie
2023-01-13  0:12 Nick Sarnie
2022-12-10  3:29 Nick Sarnie
2022-11-07  8:49 Joonas Niilola
2022-11-07  8:49 Joonas Niilola
2022-10-21 23:55 Stefan Strogin
2022-09-15 18:39 Sam James
2022-08-10 20:36 Sam James
2022-07-24  6:08 Joonas Niilola
2022-06-08 18:16 Stefan Strogin
2022-06-08 18:14 Stefan Strogin
2022-05-26 12:58 Joonas Niilola
2022-05-26 12:58 Joonas Niilola
2022-05-20  2:40 Sam James
2022-05-20  1:18 Sam James
2022-05-19  2:03 Sam James
2022-02-17 20:25 Ionen Wolkens
2022-02-17 20:25 Ionen Wolkens
2022-02-17 20:25 Ionen Wolkens
2021-12-21  2:19 Sam James
2021-12-01 18:34 Sam James
2021-12-01 14:43 Sam James
2021-12-01 14:42 Sam James
2021-11-20 23:05 Ionen Wolkens
2021-10-19  0:55 Ionen Wolkens
2021-10-19  0:55 Ionen Wolkens
2021-10-19  0:55 Ionen Wolkens
2021-09-22 20:22 Stefan Strogin
2021-05-25 14:13 Stefan Strogin
2021-03-24 16:28 Stefan Strogin
2020-12-05 21:10 Stefan Strogin
2020-09-12  3:01 Sam James
2020-09-12  1:05 Sam James
2020-09-12  1:05 Sam James
2020-09-12  1:05 Sam James
2020-08-06 20:55 Sam James
2020-08-06 20:55 Sam James
2020-08-06 20:55 Sam James
2020-02-29  9:18 Johannes Huber
2020-02-29  9:18 Johannes Huber
2020-01-12 20:46 Johannes Huber
2020-01-12 13:20 Johannes Huber
2020-01-12 13:20 Johannes Huber
2020-01-12 13:20 Johannes Huber
2020-01-12 13:20 Johannes Huber
2019-12-04 16:06 Aaron Bauman
2019-03-15 22:22 Thomas Deutschmann
2019-03-12 21:32 Thomas Deutschmann
2019-03-12 21:32 Thomas Deutschmann
2019-01-19  5:43 Thomas Deutschmann
2019-01-19  5:43 Thomas Deutschmann
2018-05-01 20:37 Johannes Huber
2018-05-01 20:37 Johannes Huber
2018-01-09 17:36 Johannes Huber
2018-01-09 17:34 Johannes Huber
2017-12-22  8:59 Johannes Huber
2017-12-12  6:15 Johannes Huber
2017-09-13 17:52 Johannes Huber
2017-09-13 17:52 Johannes Huber
2017-09-09  8:00 Johannes Huber
2017-09-09  8:00 Johannes Huber
2017-04-14 12:03 Johannes Huber
2017-01-29 20:21 Johannes Huber

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:a818701fa4e dfblob:c79e83117a2 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: net-im/discord-bin/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1652925821.90da631df86b6b0036090b942a687d67d008c5a6.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox