gentoo auto-resync : 09:01:2025 - 06:41:15

3 files changed, 16 insertions, 30 deletions

diff --git a/x11-terms/ghostty/Manifest b/x11-terms/ghostty/Manifest
index 9b4d360b105c..dde9f92e7ebc 100644
--- a/x11-terms/ghostty/Manifest
+++ b/x11-terms/ghostty/Manifest
@@ -33,5 +33,5 @@ DIST zig_js-12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc
 DIST zigimg-1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5.tar.gz 132016 BLAKE2B ef50ad59811637d16b8eabfa4c16243fe48ff0de032f3de405af8cfea841d6320e34b9fb6e3c5bbdd8cb90681a69c7f82e6a8d2bce264de7e931b69998180560 SHA512 188173710eeeca319338c6d35fbfb6948f6ac5f8a354492db5d32d654e684c2f441676ea0160985969128aa0489a6ce841e700c721bd7d22c45d13b48f977c33
 DIST ziglyph-12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25.tar.gz 562290 BLAKE2B bc5efc55442634c17357182d71881b3ae8d92b338abaaeb25d0ec548fa4d940d0c0efd5b281167a6d02d20213261799ba3008f4513a5014cf7d9f92c7b6f0322 SHA512 b7d5502bc03a0396a064080ddaebf503ab35e13384fe3e332832f64696c241d5f978997816c09d8e855173ccc7d312244397f5f8076a4d207b065bd6f304ff0e
 DIST zlib-1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb.tar.gz 1572744 BLAKE2B 6d15d8f3c8feaf602043bb6e72316ee721c33ef24e110e3bf03fb12eac9703fd29e352268d202ecd2f18b526b4f1dbd90c8046e01ad8e64ddce3e55ad5db513e SHA512 8c9642495bafd6fad4ab9fb67f09b268c69ff9af0f4f20cf15dfc18852ff1f312bd8ca41de761b3f8d8e90e77d79f2ccacd3d4c5b19e475ecf09d021fdfe9088
-EBUILD ghostty-1.0.1.ebuild 8749 BLAKE2B b5ad3452db2f4a7c09a96c542e3baa9f275cbc78730fde3b455ce5b2db4e44f34aac7c5b635b64eace2ed57c579e427dae5c5d841f60528ea450b20d3e70cc2f SHA512 e39114c78b1638ff08280fe63a5a82d6de014372486bb4dee7b1fe96a176015f2a3785cb757b9f3bed73552cdc65bd3212ba39a8714eed7d2e79f9e9420852d4
-MISC metadata.xml 1380 BLAKE2B b5a10f779b1460cc0670f9520c7656ab1b969078051afc2c70f522513a7da3907f0ff53989ebce40de41da7a3ffa03e04feb143673efc374bbca1655fea50639 SHA512 82fee914c23451d002093d33e442fedcd99eb1aa9e6ced4b25bed07026791d1aaa988d6b38a6c73232f63d4e109c624f8aad0dce3bea70c1c79e12565ef0f388
+EBUILD ghostty-1.0.1-r1.ebuild 8650 BLAKE2B 1e1c0bd08216f848b2b2520b36b91a3fbb5c898436c961705a13432126f824ff4cf62de0715cf545fd79b30e2dc3396dcba19f8c3a974b17445529d38d8f23d4 SHA512 5e46d161ef9e65bc45524c7136ded0867b98b5cd536148264943166f39b6aadcae5bbb6e44721b721ec24df9c23b459f0313e19303eb08c30370ad5627e10749
+MISC metadata.xml 1256 BLAKE2B d39c386cd087e0503b8f4387199e18e17fe3889f8195c8cfa6f91bb8549f2674767bad65aa47a0abb3f266c665658a7944b25d8ea4f9feb9f4c15f5d1f71d795 SHA512 494ddcb89c8ae6cc0a1ca46b24ccedf29f25d117cfeb7c53f3e36c1b260d7c548571de96e0bf218f20be9a3dc6c1b60d546f6e92ad279e4157abb8e800b782e5
diff --git a/x11-terms/ghostty/ghostty-1.0.1.ebuild b/x11-terms/ghostty/ghostty-1.0.1-r1.ebuild
index e00e89040d49..95117192ae04 100644
--- a/x11-terms/ghostty/ghostty-1.0.1.ebuild
+++ b/x11-terms/ghostty/ghostty-1.0.1-r1.ebuild
@@ -42,6 +42,7 @@ declare -g -r -A ZBS_DEPENDENCIES=(
 )
 
 ZIG_SLOT="0.13"
+ZIG_NEEDS_LLVM=1
 inherit zig xdg
 
 SRC_URI="
@@ -61,14 +62,16 @@ KEYWORDS="~amd64"
 
 # TODO: simdutf integration (missing Gentoo version)
 # TODO: spirv-cross integration (missing Gentoo package)
-# TODO: glfw integration (no option from upstream)
-# NOTE: gtk backend requires X right now since ghostty unconditionally
-#       includes gdk/x11/gdkx.h.
-#       https://github.com/ghostty-org/ghostty/issues/3477
 RDEPEND="
-	adwaita? ( gui-libs/libadwaita:1= )
-	gtk? ( gui-libs/gtk:4=[X] )
+	gui-libs/gtk:4=[X?]
 
+	adwaita? ( gui-libs/libadwaita:1= )
+	X? ( x11-libs/libX11 )
+	system-fontconfig? ( >=media-libs/fontconfig-2.14.2:= )
+	system-freetype? (
+		system-harfbuzz? ( >=media-libs/freetype-2.13.2:=[bzip2,harfbuzz] )
+		!system-harfbuzz? ( >=media-libs/freetype-2.13.2:=[bzip2] )
+	)
 	system-fontconfig? ( >=media-libs/fontconfig-2.14.2:= )
 	system-freetype? ( >=media-libs/freetype-2.13.2:=[bzip2] )
 	system-glslang? ( >=dev-util/glslang-1.3.296.0:= )
@@ -83,17 +86,10 @@ BDEPEND="
 	man? ( virtual/pandoc )
 "
 
-IUSE="+adwaita man +gtk glfw"
+IUSE="+X +adwaita man"
 # System integrations
-IUSE+="
-	+system-fontconfig +system-freetype +system-glslang +system-harfbuzz +system-libpng +system-libxml2
-	+system-oniguruma +system-zlib
-"
-
-REQUIRED_USE="
-	adwaita? ( gtk )
-	^^ ( gtk glfw )
-"
+IUSE+=" +system-fontconfig +system-freetype +system-glslang +system-harfbuzz +system-libpng +system-libxml2"
+IUSE+=" +system-oniguruma +system-zlib"
 
 # XXX: Because we set --release=fast below, Zig will automatically strip
 #      the binary. Until Ghostty provides a way to disable the banner while
@@ -110,9 +106,11 @@ src_configure() {
 		# XXX: Ghostty displays a banner saying it is a debug build unless ReleaseFast is used.
 		--release=fast
 
+		-Dapp-runtime=gtk
 		-Dfont-backend=fontconfig_freetype
 		-Drenderer=opengl
 		-Dgtk-adwaita=$(usex adwaita true false)
+		-Dgtk-x11=$(usex X true false)
 		-Demit-docs=$(usex man true false)
 		-Dversion-string="${PV}"
 
@@ -126,16 +124,6 @@ src_configure() {
 		-f$(usex system-zlib sys no-sys)=zlib
 	)
 
-	if use gtk; then
-		my_zbs_args+=(
-			-Dapp-runtime=gtk
-		)
-	elif use glfw; then
-		my_zbs_args+=(
-			-Dapp-runtime=glfw
-		)
-	fi
-
 	zig_src_configure
 }
 
diff --git a/x11-terms/ghostty/metadata.xml b/x11-terms/ghostty/metadata.xml
index 264c58bdd6c6..2e369c002096 100644
--- a/x11-terms/ghostty/metadata.xml
+++ b/x11-terms/ghostty/metadata.xml
@@ -14,8 +14,6 @@
 	</upstream>
 	<use>
 		<flag name="adwaita">Use <pkg>gui-libs/libadwaita</pkg> for better GNOME integration</flag>
-		<flag name="gtk">Use the GTK 4 backend for windowing</flag>
-		<flag name="glfw">Use the GLFW backend for windowing</flag>
 		<flag name="system-fontconfig">Use system fontconfig instead of the bundled one</flag>
 		<flag name="system-freetype">Use system freetype instead of the bundled one</flag>
 		<flag name="system-glslang">Use system glslang instead of the bundled one</flag>