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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 25467159C96 for ; Tue, 23 Jul 2024 05:27:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9934EE29C4; Tue, 23 Jul 2024 05:27:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7B6C9E29C4 for ; Tue, 23 Jul 2024 05:27:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76326341C25 for ; Tue, 23 Jul 2024 05:27:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D87491E5D for ; Tue, 23 Jul 2024 05:27:04 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1721712410.1d6918c36aec2f50fe71ccceffa68879b821325c.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/helix/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/helix/helix-23.10-r3.ebuild app-editors/helix/helix-24.03-r1.ebuild app-editors/helix/helix-24.07.ebuild X-VCS-Directories: app-editors/helix/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 1d6918c36aec2f50fe71ccceffa68879b821325c X-VCS-Branch: master Date: Tue, 23 Jul 2024 05:27:04 +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: 1f16a10e-fc36-454a-a790-b5f8798f3a2d X-Archives-Hash: 2e91d9590d2d29eef88d85c5405f31d5 commit: 1d6918c36aec2f50fe71ccceffa68879b821325c Author: Jonas Frei pm me> AuthorDate: Wed Jul 17 19:27:16 2024 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue Jul 23 05:26:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d6918c3 app-editors/helix: Install grammars into libdir Signed-off-by: Jonas Frei pm.me> Signed-off-by: Steffen Winter proton.me> Closes: https://github.com/gentoo/gentoo/pull/37569 Signed-off-by: Joonas Niilola gentoo.org> app-editors/helix/helix-23.10-r3.ebuild | 7 ++++--- app-editors/helix/helix-24.03-r1.ebuild | 7 ++++--- app-editors/helix/helix-24.07.ebuild | 29 ++++++++++++++++------------- 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() {