1 |
commit: 90da631df86b6b0036090b942a687d67d008c5a6 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 19 02:03:25 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 19 02:03:41 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90da631d |
7 |
|
8 |
net-im/discord-bin: add missing inherit; tidy |
9 |
|
10 |
Bug: https://github.com/gentoo/gentoo/pull/25542 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
net-im/discord-bin/discord-bin-0.0.17-r1.ebuild | 61 ++++++++++--------------- |
14 |
1 file changed, 25 insertions(+), 36 deletions(-) |
15 |
|
16 |
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 |
17 |
index a818701fa4ed..c79e83117a24 100644 |
18 |
--- a/net-im/discord-bin/discord-bin-0.0.17-r1.ebuild |
19 |
+++ b/net-im/discord-bin/discord-bin-0.0.17-r1.ebuild |
20 |
@@ -13,7 +13,7 @@ CHROMIUM_LANGS=" |
21 |
sw ta te th tr uk vi zh-CN zh-TW |
22 |
" |
23 |
|
24 |
-inherit chromium-2 desktop linux-info optfeature pax-utils unpacker |
25 |
+inherit chromium-2 desktop linux-info optfeature pax-utils unpacker xdg |
26 |
|
27 |
DESCRIPTION="All-in-one voice and text chat for gamers" |
28 |
HOMEPAGE="https://discordapp.com" |
29 |
@@ -56,26 +56,26 @@ RDEPEND=" |
30 |
|
31 |
RESTRICT="bindist mirror strip test" |
32 |
|
33 |
+DESTDIR="/opt/${MY_BIN}" |
34 |
+ |
35 |
QA_PREBUILT=" |
36 |
- ${DESTDIR}/${MY_BIN} |
37 |
- ${DESTDIR}/chrome-sandbox |
38 |
- ${DESTDIR}/libffmpeg.so |
39 |
- ${DESTDIR}/libvk_swiftshader.so |
40 |
- ${DESTDIR}/libvulkan.so |
41 |
- ${DESTDIR}/libEGL.so |
42 |
- ${DESTDIR}/libGLESv2.so |
43 |
- ${DESTDIR}/libVkICD_mock_icd.so |
44 |
- ${DESTDIR}/swiftshader/libEGL.so |
45 |
- ${DESTDIR}/swiftshader/libGLESv2.so |
46 |
- ${DESTDIR}/swiftshader/libvk_swiftshader.so |
47 |
+ ${DESTDIR#/}/${MY_BIN} |
48 |
+ ${DESTDIR#/}/chrome-sandbox |
49 |
+ ${DESTDIR#/}/libffmpeg.so |
50 |
+ ${DESTDIR#/}/libvk_swiftshader.so |
51 |
+ ${DESTDIR#/}/libvulkan.so |
52 |
+ ${DESTDIR#/}/libEGL.so |
53 |
+ ${DESTDIR#/}/libGLESv2.so |
54 |
+ ${DESTDIR#/}/libVkICD_mock_icd.so |
55 |
+ ${DESTDIR#/}/swiftshader/libEGL.so |
56 |
+ ${DESTDIR#/}/swiftshader/libGLESv2.so |
57 |
+ ${DESTDIR#/}/swiftshader/libvk_swiftshader.so |
58 |
" |
59 |
|
60 |
CONFIG_CHECK="~USER_NS" |
61 |
|
62 |
S="${WORKDIR}/${MY_BIN}" |
63 |
|
64 |
-DESTDIR="/opt/${MY_BIN}" |
65 |
- |
66 |
pkg_pretend() { |
67 |
chromium_suid_sandbox_check_kernel_config |
68 |
} |
69 |
@@ -86,6 +86,7 @@ src_unpack() { |
70 |
|
71 |
src_configure() { |
72 |
chromium_suid_sandbox_check_kernel_config |
73 |
+ |
74 |
default |
75 |
} |
76 |
|
77 |
@@ -96,11 +97,9 @@ src_prepare() { |
78 |
|
79 |
pushd "locales/" || die |
80 |
chromium_remove_language_paks |
81 |
- popd |
82 |
- |
83 |
- sed -i \ |
84 |
- -e "s:/usr/share/discord/Discord:${DESTDIR}/${MY_BIN}:" \ |
85 |
- ${MY_PN}.desktop || die |
86 |
+ popd || die |
87 |
+ |
88 |
+ sed -i -e "s:/usr/share/discord/Discord:${DESTDIR}/${MY_BIN}:" ${MY_PN}.desktop || die |
89 |
} |
90 |
|
91 |
src_install() { |
92 |
@@ -109,37 +108,27 @@ src_install() { |
93 |
# Install desktop file |
94 |
domenu ${MY_PN}.desktop |
95 |
|
96 |
- exeinto ${DESTDIR} |
97 |
+ exeinto "${DESTDIR}" |
98 |
doexe ${MY_BIN} chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so |
99 |
|
100 |
- insinto ${DESTDIR} |
101 |
+ insinto "${DESTDIR}" |
102 |
doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin v8_context_snapshot.bin |
103 |
insopts -m0755 |
104 |
doins -r locales resources swiftshader |
105 |
|
106 |
# chrome-sandbox requires the setuid bit to be specifically set. |
107 |
# See https://github.com/electron/electron/issues/17972 |
108 |
- fperms 4755 ${DESTDIR}/chrome-sandbox || die |
109 |
- |
110 |
- pax-mark m ${DESTDIR}/${MY_BIN} || die "could not set proper PAX permissions" |
111 |
+ fperms 4755 "${DESTDIR}"/chrome-sandbox || die |
112 |
|
113 |
- dosym ${DESTDIR}/${MY_BIN} /usr/bin/${MY_PN} || die |
114 |
+ pax-mark m "${DESTDIR}"/${MY_BIN} || die "could not set proper PAX permissions" |
115 |
|
116 |
- dodir ${DESTDIR} |
117 |
+ dosym "${DESTDIR}"/${MY_BIN} /usr/bin/${MY_PN} || die |
118 |
} |
119 |
|
120 |
pkg_postinst() { |
121 |
- xdg_desktop_database_update |
122 |
- xdg_icon_cache_update |
123 |
- xdg_mimeinfo_database_update |
124 |
- |
125 |
+ xdg_pkg_postinst |
126 |
+ |
127 |
optfeature "sound support" \ |
128 |
media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire |
129 |
optfeature "system tray support" dev-libs/libappindicator |
130 |
} |
131 |
- |
132 |
-pkg_postrm() { |
133 |
- xdg_desktop_database_update |
134 |
- xdg_icon_cache_update |
135 |
- xdg_mimeinfo_database_update |
136 |
-} |