From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4C358158090 for ; Fri, 20 May 2022 01:19:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E039E08CD; Fri, 20 May 2022 01:19:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6B2E2E08CD for ; Fri, 20 May 2022 01:19:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 17DEA3414F0 for ; Fri, 20 May 2022 01:19:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BF3783B5 for ; Fri, 20 May 2022 01:18:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1653009521.d83c48e3e6bde9fda19bd17bbaa171f3b7dc7490.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/discord-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/discord-bin/discord-bin-0.0.17-r1.ebuild net-im/discord-bin/discord-bin-0.0.17-r2.ebuild net-im/discord-bin/metadata.xml X-VCS-Directories: net-im/discord-bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d83c48e3e6bde9fda19bd17bbaa171f3b7dc7490 X-VCS-Branch: master Date: Fri, 20 May 2022 01:18:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fb00fc3c-6cf8-4c96-830f-f660677a5f1b X-Archives-Hash: 7d2ad6a333f35f9c4154db022f5666d8 commit: d83c48e3e6bde9fda19bd17bbaa171f3b7dc7490 Author: Randall T. Vasquez icloud com> AuthorDate: Thu May 19 17:29:11 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 20 01:18:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83c48e3 net-im/discord-bin: add maintainer; tidy ebuild This commit also adds additional trivial comments and fixes. (and flip install location back to /opt/discord) Signed-off-by: Randall T. Vasquez icloud.com> Closes: https://github.com/gentoo/gentoo/pull/25559 Signed-off-by: Sam James gentoo.org> ...0.17-r1.ebuild => discord-bin-0.0.17-r2.ebuild} | 39 ++++++++++------------ net-im/discord-bin/metadata.xml | 9 ++++- 2 files changed, 26 insertions(+), 22 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-r2.ebuild similarity index 71% rename from net-im/discord-bin/discord-bin-0.0.17-r1.ebuild rename to net-im/discord-bin/discord-bin-0.0.17-r2.ebuild index c79e83117a24..081e2e769962 100644 --- a/net-im/discord-bin/discord-bin-0.0.17-r1.ebuild +++ b/net-im/discord-bin/discord-bin-0.0.17-r2.ebuild @@ -5,7 +5,6 @@ EAPI=8 MY_PN="${PN/-bin}" MY_PV="${PV/-r*}" -MY_BIN="${MY_PN^}" 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 @@ -13,7 +12,7 @@ CHROMIUM_LANGS=" sw ta te th tr uk vi zh-CN zh-TW " -inherit chromium-2 desktop linux-info optfeature pax-utils unpacker xdg +inherit chromium-2 desktop linux-info optfeature unpacker xdg DESCRIPTION="All-in-one voice and text chat for gamers" HOMEPAGE="https://discordapp.com" @@ -56,10 +55,10 @@ RDEPEND=" RESTRICT="bindist mirror strip test" -DESTDIR="/opt/${MY_BIN}" +DESTDIR="/opt/${MY_PN}" QA_PREBUILT=" - ${DESTDIR#/}/${MY_BIN} + ${DESTDIR#/}/${MY_PN} ${DESTDIR#/}/chrome-sandbox ${DESTDIR#/}/libffmpeg.so ${DESTDIR#/}/libvk_swiftshader.so @@ -74,14 +73,14 @@ QA_PREBUILT=" CONFIG_CHECK="~USER_NS" -S="${WORKDIR}/${MY_BIN}" +S="${WORKDIR}/${MY_PN}" pkg_pretend() { chromium_suid_sandbox_check_kernel_config } src_unpack() { - unpack ${MY_PN}-${MY_PV}.tar.gz || die + unpack ${MY_PN}-${MY_PV}.tar.gz } src_configure() { @@ -92,37 +91,35 @@ src_configure() { src_prepare() { default - - rm postinst.sh - - pushd "locales/" || die + # 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 - - sed -i -e "s:/usr/share/discord/Discord:${DESTDIR}/${MY_BIN}:" ${MY_PN}.desktop || die + 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 + # install .desktop file domenu ${MY_PN}.desktop exeinto "${DESTDIR}" - doexe ${MY_BIN} chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so + 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 || die - - pax-mark m "${DESTDIR}"/${MY_BIN} || die "could not set proper PAX permissions" + # 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_BIN} /usr/bin/${MY_PN} || die + dosym "${DESTDIR}"/${MY_PN} /usr/bin/${MY_PN} } pkg_postinst() { 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 @@ - + + ran.dall@icloud.com + Randall T. Vasquez + + + proxy-maint@gentoo.org + Proxy Maintainers +