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 1B286158090 for ; Fri, 20 May 2022 02:40:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 525D9E08EC; Fri, 20 May 2022 02:40:39 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 080D4E08EC for ; Fri, 20 May 2022 02:40:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C42D2341A3A for ; Fri, 20 May 2022 02:40:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7ECE43B5 for ; Fri, 20 May 2022 02:40:34 +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: <1653014428.6a2b2e7256f76bd39a5adf27429f7fb5976dfb88.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: 6a2b2e7256f76bd39a5adf27429f7fb5976dfb88 X-VCS-Branch: master Date: Fri, 20 May 2022 02:40:34 +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: e703ca51-05b6-4837-86b1-203937a7b42c X-Archives-Hash: 603ab8a6193117218e2f29eb33e5969c commit: 6a2b2e7256f76bd39a5adf27429f7fb5976dfb88 Author: Sam James gentoo org> AuthorDate: Fri May 20 02:40:01 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 20 02:40:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a2b2e72 Revert "net-im/discord-bin: add maintainer; tidy ebuild" This reverts commit d83c48e3e6bde9fda19bd17bbaa171f3b7dc7490. (Didn't mean to push this with the lot earlier -- pushed with a bunch of stablereqs and forgot I'd started doing PRs.) Signed-off-by: Sam James gentoo.org> ...0.17-r2.ebuild => discord-bin-0.0.17-r1.ebuild} | 39 ++++++++++++---------- net-im/discord-bin/metadata.xml | 9 +---- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/net-im/discord-bin/discord-bin-0.0.17-r2.ebuild b/net-im/discord-bin/discord-bin-0.0.17-r1.ebuild similarity index 71% rename from net-im/discord-bin/discord-bin-0.0.17-r2.ebuild rename to net-im/discord-bin/discord-bin-0.0.17-r1.ebuild index 081e2e769962..c79e83117a24 100644 --- a/net-im/discord-bin/discord-bin-0.0.17-r2.ebuild +++ b/net-im/discord-bin/discord-bin-0.0.17-r1.ebuild @@ -5,6 +5,7 @@ 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 @@ -12,7 +13,7 @@ CHROMIUM_LANGS=" sw ta te th tr uk vi zh-CN zh-TW " -inherit chromium-2 desktop linux-info optfeature unpacker xdg +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" @@ -55,10 +56,10 @@ RDEPEND=" RESTRICT="bindist mirror strip test" -DESTDIR="/opt/${MY_PN}" +DESTDIR="/opt/${MY_BIN}" QA_PREBUILT=" - ${DESTDIR#/}/${MY_PN} + ${DESTDIR#/}/${MY_BIN} ${DESTDIR#/}/chrome-sandbox ${DESTDIR#/}/libffmpeg.so ${DESTDIR#/}/libvk_swiftshader.so @@ -73,14 +74,14 @@ QA_PREBUILT=" CONFIG_CHECK="~USER_NS" -S="${WORKDIR}/${MY_PN}" +S="${WORKDIR}/${MY_BIN}" pkg_pretend() { chromium_suid_sandbox_check_kernel_config } src_unpack() { - unpack ${MY_PN}-${MY_PV}.tar.gz + unpack ${MY_PN}-${MY_PV}.tar.gz || die } src_configure() { @@ -91,35 +92,37 @@ src_configure() { 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" + + rm postinst.sh + + pushd "locales/" || die 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" + popd || die + + sed -i -e "s:/usr/share/discord/Discord:${DESTDIR}/${MY_BIN}:" ${MY_PN}.desktop || die } src_install() { doicon -s 256 ${MY_PN}.png - # install .desktop file + # Install desktop file domenu ${MY_PN}.desktop exeinto "${DESTDIR}" - doexe ${MY_PN} chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so + doexe ${MY_BIN} 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 + # 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" - dosym "${DESTDIR}"/${MY_PN} /usr/bin/${MY_PN} + dosym "${DESTDIR}"/${MY_BIN} /usr/bin/${MY_PN} || die } pkg_postinst() { diff --git a/net-im/discord-bin/metadata.xml b/net-im/discord-bin/metadata.xml index f485c452f77f..115e9d64a669 100644 --- a/net-im/discord-bin/metadata.xml +++ b/net-im/discord-bin/metadata.xml @@ -1,12 +1,5 @@ - - ran.dall@icloud.com - Randall T. Vasquez - - - proxy-maint@gentoo.org - Proxy Maintainers - +