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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 895F4138334 for ; Sat, 19 Jan 2019 05:43:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68F39E03EC; Sat, 19 Jan 2019 05:43:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2CAE1E03EC for ; Sat, 19 Jan 2019 05:43:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04172335CEC for ; Sat, 19 Jan 2019 05:43:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 439AF4FC for ; Sat, 19 Jan 2019 05:43:12 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1547874510.0fd290cc81eab1146dfd80f9798a576674d54c2d.whissi@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.5-r1.ebuild net-im/discord-bin/discord-bin-0.0.5.ebuild X-VCS-Directories: net-im/discord-bin/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 0fd290cc81eab1146dfd80f9798a576674d54c2d X-VCS-Branch: master Date: Sat, 19 Jan 2019 05:43:12 +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: 9c38ce1e-3592-47e7-807f-60a780dcdae5 X-Archives-Hash: 9a563b8462d2b306ce8bb28b405e2856 commit: 0fd290cc81eab1146dfd80f9798a576674d54c2d Author: Gino protonmail com> AuthorDate: Sun Sep 9 21:54:17 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Jan 19 05:08:30 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fd290cc net-im/discord-bin: rewrite ebuild This rewrite offers better handling of electron files installed into /opt Closes: https://bugs.gentoo.org/660870 Closes: https://github.com/gentoo/gentoo/pull/9815 Signed-off-by: Thomas Deutschmann gentoo.org> ...in-0.0.5.ebuild => discord-bin-0.0.5-r1.ebuild} | 35 +++++++++++----------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/net-im/discord-bin/discord-bin-0.0.5.ebuild b/net-im/discord-bin/discord-bin-0.0.5-r1.ebuild similarity index 64% rename from net-im/discord-bin/discord-bin-0.0.5.ebuild rename to net-im/discord-bin/discord-bin-0.0.5-r1.ebuild index aebe7f5fee1..4f5af1205dc 100644 --- a/net-im/discord-bin/discord-bin-0.0.5.ebuild +++ b/net-im/discord-bin/discord-bin-0.0.5-r1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 MY_PN=${PN/-bin/} -inherit eutils gnome2-utils unpacker +MY_BIN="D${MY_PN/d/}" +inherit eutils gnome2-utils unpacker desktop xdg-utils DESCRIPTION="All-in-one voice and text chat for gamers" HOMEPAGE="https://discordapp.com" @@ -50,9 +51,9 @@ S=${WORKDIR} RESTRICT="mirror bindist" QA_PREBUILT=" - opt/discord/share/discord/Discord - opt/discord/share/discord/libnode.so - opt/discord/share/discord/libffmpeg.so + opt/discord/${MY_BIN} + opt/discord/libnode.so + opt/discord/libffmpeg.so " src_unpack() { @@ -63,30 +64,28 @@ src_prepare() { default sed -i \ - -e "s:/usr/share/discord/Discord:discord:g" \ + -e "s:/usr/share/discord/Discord:/opt/${MY_PN}/${MY_BIN}:g" \ usr/share/${MY_PN}/${MY_PN}.desktop || die } src_install() { - insinto /opt/${MY_PN} - doins -r usr/. + domenu opt/${MY_PN}/${MY_PN}.desktop + doicon opt/${MY_PN}/${MY_PN}.png - fperms +x /opt/${MY_PN}/bin/${MY_PN} - dosym ../../opt/${MY_PN}/bin/${MY_PN} /usr/bin/${MY_PN} - dosym ../../../opt/${MY_PN}/share/applications/${MY_PN}.desktop \ - /usr/share/applications/${MY_PN}.desktop - dosym ../../../opt/${MY_PN}/share/pixmaps/${MY_PN}.png \ - /usr/share/pixmaps/${MY_PN}.png -} - -pkg_preinst() { - gnome2_icon_savelist + insinto /opt + doins -r usr/share/${MY_PN} + fperms +x /opt/${MY_PN}/${MY_BIN} + dosym ../../opt/${MY_PN}/${MY_BIN} usr/bin/${MY_PN} } pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update gnome2_icon_cache_update } pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update gnome2_icon_cache_update }