gentoo auto-resync : 24:05:2024 - 00:07:11

5 files changed, 26 insertions, 33 deletions

diff --git a/app-editors/helix/Manifest b/app-editors/helix/Manifest
index a9d3de898c59..e74b319c8f59 100644
--- a/app-editors/helix/Manifest
+++ b/app-editors/helix/Manifest
@@ -493,7 +493,7 @@ DIST zerocopy-0.7.11.crate 91526 BLAKE2B ace55fa19ffe035ab9afdd47627284bc1fdcf09
 DIST zerocopy-0.7.31.crate 151100 BLAKE2B 0363306c4b0f024bf87d8d689bfa63b7a12fcbf670cfb07a27a69d5b8269c38eadb73319b8788842d292bc73eb41a2a16820cb265cdf40f6a1f9dade3aa44d5c SHA512 672c71003c26a6cae1fc0704e13210b20055e66ccb1682e590effda094ab6c0409d56060c7dc8e94e4a0295b55e476f50bd2145096cbdad7b14c4abf613a251e
 DIST zerocopy-derive-0.7.11.crate 523743 BLAKE2B c112d9078d0cb8c69e4d8f287cd3bc362f673f4e615d7810211d344e41f022fd90c975b112661981a3bcbb4be234c56328648c7902650a1b399be2c586b74bf1 SHA512 245ce3fc87886440d9c6b68f1e4553ac6c8ce076186546b83990f1591cf2614779fcc53035e62d5eb594493b2c565f4df071876335ed4c87d93437fb91755071
 DIST zerocopy-derive-0.7.31.crate 533507 BLAKE2B e0872636d43956d1405e296f51f313989b1cddd9911adc5f1c2a59274f9668003356bbc942cbe7f339d7173f8caca8378e7ba11461c181fa1b51e582bf833a5f SHA512 33a0e2b1045c6f584fd67c34a64d4262c848090acbeafbc75e4c553ec2e2d14dcb70285a1a2d840257757b1836fdb44778737aa06199cd4e831ac74623932827
-EBUILD helix-23.05.ebuild 6019 BLAKE2B 6c41d1cf20e79dba1d66dfd3525f834e1780afc34d8898e9b8dd06177717d77e62229ee662a8d147a939c3547bda53d1000802b9d07d999258638045850c8265 SHA512 9fcb1927b1f819b3976415730265c8e0878b1002b882432ab5aaee313ee90648d527f3619f6de6cd0259c011d0d330b8946afe2a24fec5997c7480cf51078bbd
-EBUILD helix-23.10-r2.ebuild 6890 BLAKE2B 405be2dc2ff7a970ae2a1378687920d1f5a23e93faac9e5f1a296da4db895b6f72749b218c0e71a9d1c4aa502b9b62498f6b258ecc003c08e0711da333a80350 SHA512 d03de36f986565250cca8616ac6574299c11eb3caca44ee992958319c0228665300d86ebaef88a2c16e0e2c7fbd4e8051b1b4e6bfb83c107fbe12c41aadd320e
-EBUILD helix-24.03.ebuild 7164 BLAKE2B c2c19cf10cf2b7a3950d3685f81051ff0089e7dde53b14012c65825b1a2cc419191e4b8d0610794095e613ede4115683ee7fb32d39e222f78aa335646d1e1e9d SHA512 e56c7b53bc9bab1707b555e6b8952ee1036e5a6e1b28178bf6a9689e8460ed3db1e591cbb7754dfaf1ea7567db4c2a464384923438a8de05f5f0562da8ec64fc
-MISC metadata.xml 810 BLAKE2B c9d3cf2b22533ee86d3d2750380c9e03ea3cd79a9c699c0d9df93d6ec7d0f1a4051004f91c59b78e6b915faea3f8f00ab3e10fcd892d3d50a1ea05c9b48b991e SHA512 0466db4f8af1ad67b70417fcf6a9970ceeb31fa81cd2691ee97527bdf593f55a863e3a0dc200301165d7794649a57486eb2fb92bb92d76fd450f080c58c96905
+EBUILD helix-23.05.ebuild 5924 BLAKE2B e72eb75bb1db0a3d84b37cd37dcb5dd33c38f987926900a4b7b9fd4fb8ae84989b0dfe350ae0048dec271b6ab2f023e2e9581c4819acdcbd936fdeae822c2eef SHA512 5f6c96c7730340e173c1da63b75bb6bc2dcd53ae7d2d337a91f7c44f7b24d72972f676e3b20fa06164b7ec60194235ffab43532a77bac4de49f03b507a75c67c
+EBUILD helix-23.10-r2.ebuild 6903 BLAKE2B 1abab242fc6f969de80688c3607eff0a9a977fd7469b9e7578db4f443cabcc9adfafa6e97dbc4266b836793892ae94aa41dd4a5a3454d0127a22d3171939befe SHA512 de6c7f8855d9a426082e0c14c512bfd969b689a60df063c39bde1fa8963c0a7e8b2406f3e249129fd0410b3d31e2173ddb9530b46631eeb12ed36be1e79a50c2
+EBUILD helix-24.03.ebuild 7177 BLAKE2B feac382db0e9adbe35856eecf848919feb7fe476d6454a530924e6d7cb6863b3d5c0e0d3d21145b157bddc5d94e62695ff3b48d2328bb014425fada34cbc0f63 SHA512 82f64521111bc85666474fd7a1d073173d98a31a04c05bb60d873efd14e381035d7dc1a1c87b6193133ee00e781c1b336d84dced7fabdf8e9e13bb2aad72d75b
+MISC metadata.xml 724 BLAKE2B ec174ca88f622d48176df4e7906cfa2651ab7f3cc1f7c4968b76d224b2403d8e593cc92adf74191e3686d919534a981baa633344a5726b9e0ada0ae2ddbd0e4b SHA512 adbe5478926b349b0bf492519a373fc1f082b73bdc2067a04bfb7e550d8b6c00c1962577b4a457f8449cc7234ba3af70e5eac004f241b4a627f8e921415ef19c
diff --git a/app-editors/helix/helix-23.05.ebuild b/app-editors/helix/helix-23.05.ebuild
index 74e224996d9b..8f47c3f4d3ff 100644
--- a/app-editors/helix/helix-23.05.ebuild
+++ b/app-editors/helix/helix-23.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -263,11 +263,9 @@ S="${WORKDIR}"
 LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+grammar"
 
 QA_FLAGS_IGNORED="
 	usr/bin/hx
-	usr/share/helix/runtime/grammars/.*\.so
 "
 
 DOCS=(
@@ -278,7 +276,7 @@ DOCS=(
 )
 
 src_compile() {
-	use grammar || local -x HELIX_DISABLE_AUTO_GRAMMAR_BUILD=1
+	local -x HELIX_DISABLE_AUTO_GRAMMAR_BUILD=1
 
 	cargo_src_compile
 }
@@ -286,12 +284,10 @@ src_compile() {
 src_install() {
 	cargo_src_install --path helix-term
 
-	rm -r runtime/grammars/.gitkeep || die
-	rm -r runtime/grammars/sources || die
+	insinto /usr/share/helix/runtime
+	doins -r runtime/{queries,themes,tutor}
 
 	insinto /usr/share/helix
-	doins -r runtime
-
 	dodoc -r "${DOCS[@]}"
 
 	doicon -s 256x256 contrib/${PN}.png
diff --git a/app-editors/helix/helix-23.10-r2.ebuild b/app-editors/helix/helix-23.10-r2.ebuild
index e28a697c495b..2ee1d5fb78d8 100644
--- a/app-editors/helix/helix-23.10-r2.ebuild
+++ b/app-editors/helix/helix-23.10-r2.ebuild
@@ -277,14 +277,11 @@ S="${WORKDIR}"
 LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE="+grammar"
 
-BDEPEND="grammar? ( dev-vcs/git )"
 RDEPEND="dev-vcs/git"
 
 QA_FLAGS_IGNORED="
 	usr/bin/hx
-	usr/share/helix/runtime/grammars/.*\.so
 "
 
 DOCS=(
@@ -299,7 +296,7 @@ PATCHES=(
 )
 
 src_compile() {
-	use grammar || local -x HELIX_DISABLE_AUTO_GRAMMAR_BUILD=1
+	local -x HELIX_DISABLE_AUTO_GRAMMAR_BUILD=1
 
 	cargo_src_compile
 }
@@ -307,12 +304,10 @@ src_compile() {
 src_install() {
 	cargo_src_install --path helix-term
 
-	rm -r runtime/grammars/.gitkeep || die
-	rm -r runtime/grammars/sources || die
+	insinto /usr/share/helix/runtime
+	doins -r runtime/{queries,themes,tutor}
 
 	insinto /usr/share/helix
-	doins -r runtime
-
 	dodoc -r "${DOCS[@]}"
 
 	doicon -s 256x256 contrib/${PN}.png
@@ -329,11 +324,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "The runtime files (grammars, queries, themes) have been"
+	einfo "The runtime files (queries, themes) have been"
 	einfo "installed in '/usr/share/helix/runtime'. The environment variable"
 	einfo "HELIX_RUNTIME was also installed on your system. In running shell instances"
 	einfo "you need to run 'source /etc/profile' to pick up the new variable"
 	einfo "or manually set the environment variable HELIX_RUNTIME=/usr/share/helix/runtime."
+	einfo ""
+	einfo "Grammars are not installed yet. To fetch and install them, run:"
+	einfo ""
+	einfo "  hx --grammar fetch"
+	einfo "  hx --grammar build"
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 }
diff --git a/app-editors/helix/helix-24.03.ebuild b/app-editors/helix/helix-24.03.ebuild
index b989a0d04ed8..ae80d6841b50 100644
--- a/app-editors/helix/helix-24.03.ebuild
+++ b/app-editors/helix/helix-24.03.ebuild
@@ -290,14 +290,11 @@ S="${WORKDIR}"
 LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+grammar"
 
-BDEPEND="grammar? ( dev-vcs/git )"
 RDEPEND="dev-vcs/git"
 
 QA_FLAGS_IGNORED="
 	usr/bin/hx
-	usr/share/helix/runtime/grammars/.*\.so
 "
 
 DOCS=(
@@ -308,7 +305,7 @@ DOCS=(
 )
 
 src_compile() {
-	use grammar || local -x HELIX_DISABLE_AUTO_GRAMMAR_BUILD=1
+	local -x HELIX_DISABLE_AUTO_GRAMMAR_BUILD=1
 
 	cargo_src_compile
 }
@@ -316,12 +313,10 @@ src_compile() {
 src_install() {
 	cargo_src_install --path helix-term
 
-	rm -r runtime/grammars/.gitkeep || die
-	rm -r runtime/grammars/sources || die
+	insinto /usr/share/helix/runtime
+	doins -r runtime/{queries,themes,tutor}
 
 	insinto /usr/share/helix
-	doins -r runtime
-
 	dodoc -r "${DOCS[@]}"
 
 	doicon -s 256x256 contrib/${PN}.png
@@ -338,11 +333,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "The runtime files (grammars, queries, themes) have been"
+	einfo "The runtime files (queries, themes) have been"
 	einfo "installed in '/usr/share/helix/runtime'. The environment variable"
 	einfo "HELIX_RUNTIME was also installed on your system. In running shell instances"
 	einfo "you need to run 'source /etc/profile' to pick up the new variable"
 	einfo "or manually set the environment variable HELIX_RUNTIME=/usr/share/helix/runtime."
+	einfo ""
+	einfo "Grammars are not installed yet. To fetch and install them, run:"
+	einfo ""
+	einfo "  hx --grammar fetch"
+	einfo "  hx --grammar build"
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 }
diff --git a/app-editors/helix/metadata.xml b/app-editors/helix/metadata.xml
index 07edb24ed94b..f699ef0c9568 100644
--- a/app-editors/helix/metadata.xml
+++ b/app-editors/helix/metadata.xml
@@ -13,9 +13,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="grammar">Build and install grammar language files</flag>
-	</use>
 	<upstream>
 		<bugs-to>https://github.com/helix-editor/helix/issues</bugs-to>
 		<changelog>https://github.com/helix-editor/helix/commits/master</changelog>