1 |
commit: 6a2b2e7256f76bd39a5adf27429f7fb5976dfb88 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 20 02:40:01 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 20 02:40:28 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a2b2e72 |
7 |
|
8 |
Revert "net-im/discord-bin: add maintainer; tidy ebuild" |
9 |
|
10 |
This reverts commit d83c48e3e6bde9fda19bd17bbaa171f3b7dc7490. |
11 |
|
12 |
(Didn't mean to push this with the lot earlier -- pushed with |
13 |
a bunch of stablereqs and forgot I'd started doing PRs.) |
14 |
|
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
|
17 |
...0.17-r2.ebuild => discord-bin-0.0.17-r1.ebuild} | 39 ++++++++++++---------- |
18 |
net-im/discord-bin/metadata.xml | 9 +---- |
19 |
2 files changed, 22 insertions(+), 26 deletions(-) |
20 |
|
21 |
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 |
22 |
similarity index 71% |
23 |
rename from net-im/discord-bin/discord-bin-0.0.17-r2.ebuild |
24 |
rename to net-im/discord-bin/discord-bin-0.0.17-r1.ebuild |
25 |
index 081e2e769962..c79e83117a24 100644 |
26 |
--- a/net-im/discord-bin/discord-bin-0.0.17-r2.ebuild |
27 |
+++ b/net-im/discord-bin/discord-bin-0.0.17-r1.ebuild |
28 |
@@ -5,6 +5,7 @@ EAPI=8 |
29 |
|
30 |
MY_PN="${PN/-bin}" |
31 |
MY_PV="${PV/-r*}" |
32 |
+MY_BIN="${MY_PN^}" |
33 |
|
34 |
CHROMIUM_LANGS=" |
35 |
am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi |
36 |
@@ -12,7 +13,7 @@ CHROMIUM_LANGS=" |
37 |
sw ta te th tr uk vi zh-CN zh-TW |
38 |
" |
39 |
|
40 |
-inherit chromium-2 desktop linux-info optfeature unpacker xdg |
41 |
+inherit chromium-2 desktop linux-info optfeature pax-utils unpacker xdg |
42 |
|
43 |
DESCRIPTION="All-in-one voice and text chat for gamers" |
44 |
HOMEPAGE="https://discordapp.com" |
45 |
@@ -55,10 +56,10 @@ RDEPEND=" |
46 |
|
47 |
RESTRICT="bindist mirror strip test" |
48 |
|
49 |
-DESTDIR="/opt/${MY_PN}" |
50 |
+DESTDIR="/opt/${MY_BIN}" |
51 |
|
52 |
QA_PREBUILT=" |
53 |
- ${DESTDIR#/}/${MY_PN} |
54 |
+ ${DESTDIR#/}/${MY_BIN} |
55 |
${DESTDIR#/}/chrome-sandbox |
56 |
${DESTDIR#/}/libffmpeg.so |
57 |
${DESTDIR#/}/libvk_swiftshader.so |
58 |
@@ -73,14 +74,14 @@ QA_PREBUILT=" |
59 |
|
60 |
CONFIG_CHECK="~USER_NS" |
61 |
|
62 |
-S="${WORKDIR}/${MY_PN}" |
63 |
+S="${WORKDIR}/${MY_BIN}" |
64 |
|
65 |
pkg_pretend() { |
66 |
chromium_suid_sandbox_check_kernel_config |
67 |
} |
68 |
|
69 |
src_unpack() { |
70 |
- unpack ${MY_PN}-${MY_PV}.tar.gz |
71 |
+ unpack ${MY_PN}-${MY_PV}.tar.gz || die |
72 |
} |
73 |
|
74 |
src_configure() { |
75 |
@@ -91,35 +92,37 @@ src_configure() { |
76 |
|
77 |
src_prepare() { |
78 |
default |
79 |
- # remove post-install script |
80 |
- rm postinst.sh || die "the removal of the unneeded post-install script failed" |
81 |
- # cleanup languages |
82 |
- pushd "locales/" || die "location change for language cleanup failed" |
83 |
+ |
84 |
+ rm postinst.sh |
85 |
+ |
86 |
+ pushd "locales/" || die |
87 |
chromium_remove_language_paks |
88 |
- popd || die "location reset for language cleanup failed" |
89 |
- # fix .desktop exec location |
90 |
- sed -i -e "s:/usr/share/discord/Discord:${DESTDIR}/${MY_PN}:" ${MY_PN}.desktop || die "fixing of exec location on .desktop failed" |
91 |
+ popd || die |
92 |
+ |
93 |
+ sed -i -e "s:/usr/share/discord/Discord:${DESTDIR}/${MY_BIN}:" ${MY_PN}.desktop || die |
94 |
} |
95 |
|
96 |
src_install() { |
97 |
doicon -s 256 ${MY_PN}.png |
98 |
|
99 |
- # install .desktop file |
100 |
+ # Install desktop file |
101 |
domenu ${MY_PN}.desktop |
102 |
|
103 |
exeinto "${DESTDIR}" |
104 |
- doexe ${MY_PN} chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so |
105 |
+ doexe ${MY_BIN} chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so |
106 |
|
107 |
insinto "${DESTDIR}" |
108 |
doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin v8_context_snapshot.bin |
109 |
insopts -m0755 |
110 |
doins -r locales resources swiftshader |
111 |
|
112 |
- # Chrome-sandbox requires the setuid bit to be specifically set. |
113 |
- # see https://github.com/electron/electron/issues/17972 |
114 |
- fperms 4755 "${DESTDIR}"/chrome-sandbox |
115 |
+ # chrome-sandbox requires the setuid bit to be specifically set. |
116 |
+ # See https://github.com/electron/electron/issues/17972 |
117 |
+ fperms 4755 "${DESTDIR}"/chrome-sandbox || die |
118 |
+ |
119 |
+ pax-mark m "${DESTDIR}"/${MY_BIN} || die "could not set proper PAX permissions" |
120 |
|
121 |
- dosym "${DESTDIR}"/${MY_PN} /usr/bin/${MY_PN} |
122 |
+ dosym "${DESTDIR}"/${MY_BIN} /usr/bin/${MY_PN} || die |
123 |
} |
124 |
|
125 |
pkg_postinst() { |
126 |
|
127 |
diff --git a/net-im/discord-bin/metadata.xml b/net-im/discord-bin/metadata.xml |
128 |
index f485c452f77f..115e9d64a669 100644 |
129 |
--- a/net-im/discord-bin/metadata.xml |
130 |
+++ b/net-im/discord-bin/metadata.xml |
131 |
@@ -1,12 +1,5 @@ |
132 |
<?xml version="1.0" encoding="UTF-8"?> |
133 |
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
134 |
<pkgmetadata> |
135 |
- <maintainer type="person" proxied="yes"> |
136 |
- <email>ran.dall@××××××.com</email> |
137 |
- <name>Randall T. Vasquez</name> |
138 |
- </maintainer> |
139 |
- <maintainer type="project" proxied="proxy"> |
140 |
- <email>proxy-maint@g.o</email> |
141 |
- <name>Proxy Maintainers</name> |
142 |
- </maintainer> |
143 |
+ <!-- maintainer-needed --> |
144 |
</pkgmetadata> |