summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Frei <freijon@pm.me>2024-07-17 21:27:16 +0200
committerJoonas Niilola <juippis@gentoo.org>2024-07-23 08:26:50 +0300
commit1d6918c36aec2f50fe71ccceffa68879b821325c (patch)
treeb3831997c3791c95ae6406d1e7ab2d4fd305c340 /app-editors
parentapp-editors/helix: add 24.07 (diff)
downloadgentoo-1d6918c36aec2f50fe71ccceffa68879b821325c.tar.gz
gentoo-1d6918c36aec2f50fe71ccceffa68879b821325c.tar.bz2
gentoo-1d6918c36aec2f50fe71ccceffa68879b821325c.zip
app-editors/helix: Install grammars into libdir
Signed-off-by: Jonas Frei <freijon@pm.me> Signed-off-by: Steffen Winter <steffen.winter@proton.me> Closes: https://github.com/gentoo/gentoo/pull/37569 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/helix/helix-23.10-r3.ebuild7
-rw-r--r--app-editors/helix/helix-24.03-r1.ebuild7
-rw-r--r--app-editors/helix/helix-24.07.ebuild29
3 files changed, 24 insertions, 19 deletions
diff --git a/app-editors/helix/helix-23.10-r3.ebuild b/app-editors/helix/helix-23.10-r3.ebuild
index cce301b3bf47..820bf1627758 100644
--- a/app-editors/helix/helix-23.10-r3.ebuild
+++ b/app-editors/helix/helix-23.10-r3.ebuild
@@ -308,9 +308,10 @@ src_compile() {
src_install() {
cargo_src_install --path helix-term
- rm runtime/grammars/.gitkeep || die
- rm -r runtime/grammars/sources || die
- use grammar || rm -r runtime/grammars || die
+ insinto "/usr/$(get_libdir)/${PN}"
+ use grammar && doins runtime/grammars/*.so
+ rm -r runtime/grammars || die
+ use grammar && dosym "../../../$(get_libdir)/${PN}" "${EPREFIX}/usr/share/${PN}/runtime/grammars"
insinto /usr/share/helix
doins -r runtime
diff --git a/app-editors/helix/helix-24.03-r1.ebuild b/app-editors/helix/helix-24.03-r1.ebuild
index 7ac23280faec..46ee3c25397e 100644
--- a/app-editors/helix/helix-24.03-r1.ebuild
+++ b/app-editors/helix/helix-24.03-r1.ebuild
@@ -315,9 +315,10 @@ src_compile() {
src_install() {
cargo_src_install --path helix-term
- rm runtime/grammars/.gitkeep || die
- rm -r runtime/grammars/sources || die
- use grammar || rm -r runtime/grammars || die
+ insinto "/usr/$(get_libdir)/${PN}"
+ use grammar && doins runtime/grammars/*.so
+ rm -r runtime/grammars || die
+ use grammar && dosym "../../../$(get_libdir)/${PN}" "${EPREFIX}/usr/share/${PN}/runtime/grammars"
insinto /usr/share/helix
doins -r runtime
diff --git a/app-editors/helix/helix-24.07.ebuild b/app-editors/helix/helix-24.07.ebuild
index d73fe8256bfa..1e4539721df4 100644
--- a/app-editors/helix/helix-24.07.ebuild
+++ b/app-editors/helix/helix-24.07.ebuild
@@ -306,31 +306,24 @@ RDEPEND="dev-vcs/git"
QA_FLAGS_IGNORED="
usr/bin/hx
- usr/share/helix/runtime/grammars/.*\.so
+ usr/share/${PN}/runtime/grammars/.*\.so
"
-DOCS=(
- README.md
- CHANGELOG.md
- book/
- docs/
-)
-
pkg_setup() {
- export HELIX_DEFAULT_RUNTIME="${EPREFIX}/usr/share/helix/runtime"
+ export HELIX_DEFAULT_RUNTIME="${EPREFIX}/usr/share/${PN}/runtime"
use grammar || export HELIX_DISABLE_AUTO_GRAMMAR_BUILD=1
}
src_install() {
cargo_src_install --path helix-term
- rm runtime/grammars/.gitkeep || die
- rm -r runtime/grammars/sources || die
- use grammar || rm -r runtime/grammars || die
+ insinto "/usr/$(get_libdir)/${PN}"
+ use grammar && doins runtime/grammars/*.so
+ rm -r runtime/grammars || die
+ use grammar && dosym "../../../$(get_libdir)/${PN}" "${EPREFIX}/usr/share/${PN}/runtime/grammars"
insinto /usr/share/helix
doins -r runtime
- dodoc -r "${DOCS[@]}"
doicon -s 256x256 contrib/${PN}.png
domenu contrib/Helix.desktop
@@ -341,6 +334,16 @@ src_install() {
newbashcomp contrib/completion/hx.bash hx
newzshcomp contrib/completion/hx.zsh _hx
dofishcomp contrib/completion/hx.fish
+
+ DOCS=(
+ README.md
+ CHANGELOG.md
+ docs/
+ )
+ HTML_DOCS=(
+ book/
+ )
+ einstalldocs
}
pkg_postinst() {