Created attachment 539084 [details] discord-bin-0.0.5.ebuild rewrite Hello, the way net-im/discord-bin ebuild installs files is weird and different from every other electron packages in the tree, here is a rewrite of your ebuild to bring it in line and cleanup the /opt/discord directory structure also fixed /usr/share/lintian for those who care about that.. see below for other apps that use the same electron base net-im/signal-desktop-bin net-im/slack-bin ================================================================ --- /usr/portage/net-im/discord-bin/discord-bin-0.0.5.ebuild 2018-05-03 15:47:52.992011193 -0700 +++ /usr/local/portage/net-im/discord-bin/discord-bin-0.0.5.ebuild 2018-07-06 17:50:10.580865051 -0700 @@ -4,6 +4,7 @@ EAPI=6 MY_PN=${PN/-bin/} +MY_BIN="D${MY_PN/d/}" inherit eutils gnome2-utils unpacker DESCRIPTION="All-in-one voice and text chat for gamers" @@ -50,9 +51,9 @@ 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,20 +64,20 @@ 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/. - - 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 + insinto /usr/share + dodoc -r usr/share/doc/${MY_PN}/. + doins -r usr/share/lintian + 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} + dosym /opt/${MY_PN}/${MY_PN}.desktop /usr/share/applications/${MY_PN}.desktop + dosym /opt/${MY_PN}/${MY_PN}.png /usr/share/pixmaps/${MY_PN}.png } pkg_preinst() { =========================================================================
Could you please create a pull request for this? (0.0.5-r1)
Here is the PR https://github.com/gentoo/gentoo/pull/9815
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fd290cc81eab1146dfd80f9798a576674d54c2d commit 0fd290cc81eab1146dfd80f9798a576674d54c2d Author: Gino <onigino@protonmail.com> AuthorDate: 2018-09-09 21:54:17 +0000 Commit: Thomas Deutschmann <whissi@gentoo.org> CommitDate: 2019-01-19 05:08:30 +0000 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 <whissi@gentoo.org> ...in-0.0.5.ebuild => discord-bin-0.0.5-r1.ebuild} | 35 +++++++++++----------- 1 file changed, 17 insertions(+), 18 deletions(-)
