public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/ghostty-terminfo/
@ 2025-02-16 14:46 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-02-16 14:46 UTC (permalink / raw
  To: gentoo-commits

commit:     9704315cea8e4f472b58396a5e57365ab44c8490
Author:     sin-ack <sin-ack <AT> protonmail <DOT> com>
AuthorDate: Tue Feb  4 20:55:26 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 14:46:23 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9704315c

x11-terms/ghostty-terminfo: add symlink IUSE for ncurses compat

We have to be compatible with both USE=minimal and USE=-minimal and
still provide both the "ghostty" and "xterm-ghostty" terminfo entries.
When USE=symlink is unset, we require that the "ghostty" entry be
provided by ncurses instead.

Closes: https://bugs.gentoo.org/949209
Signed-off-by: sin-ack <sin-ack <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...1.0.ebuild => ghostty-terminfo-1.1.0-r1.ebuild} | 24 +++++++++++++++++++---
 x11-terms/ghostty-terminfo/metadata.xml            |  3 +++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.0.ebuild b/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.0-r1.ebuild
similarity index 93%
rename from x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.0.ebuild
rename to x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.0-r1.ebuild
index 2ca2c1e2d931..82112a4f0d8e 100644
--- a/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.0.ebuild
+++ b/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.0-r1.ebuild
@@ -59,16 +59,27 @@ S="${WORKDIR}/${P/-terminfo/}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
+# Tests are run on the main Ghostty package.
+RESTRICT="test"
 
-RDEPEND="!>=sys-libs/ncurses-6.5_p20250118[-minimal]"
+IUSE="symlink"
+RDEPEND="
+	symlink? (
+		|| (
+			<sys-libs/ncurses-6.5_p20250118
+			>=sys-libs/ncurses-6.5_p20250118[minimal]
+		)
+	)
+	!symlink? (
+		>=sys-libs/ncurses-6.5_p20250118[-minimal]
+	)
+"
 BDEPEND="sys-libs/ncurses"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.0-build-add-a-step-for-only-building-terminfo.patch
 )
 
-RESTRICT="test"
-
 src_configure() {
 	local my_zbs_args=(
 		-Demit-terminfo=false
@@ -85,4 +96,11 @@ src_compile() {
 src_install() {
 	DESTDIR="${D}" nonfatal ezig build terminfo "${ZBS_ARGS[@]}" \
 		|| die "Failed to compile terminfo database"
+
+	# Newer ncurses versions have a "ghostty" terminfo entry which
+	# collides with the "ghostty" symlink that is installed by default,
+	# but only when USE=-minimal. Remove the symlink in that case.
+	if ! use symlink; then
+		rm -rf "${ED}/usr/share/terminfo/g" || die
+	fi
 }

diff --git a/x11-terms/ghostty-terminfo/metadata.xml b/x11-terms/ghostty-terminfo/metadata.xml
index 5f5c91c8c89f..7106d0be75ad 100644
--- a/x11-terms/ghostty-terminfo/metadata.xml
+++ b/x11-terms/ghostty-terminfo/metadata.xml
@@ -12,4 +12,7 @@
 	<upstream>
 		<remote-id type="github">ghostty-org/ghostty</remote-id>
 	</upstream>
+	<use>
+		<flag name="symlink">Install symlink for a "ghostty" terminfo entry</flag>
+	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-terms/ghostty-terminfo/
@ 2025-02-16 14:46 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-02-16 14:46 UTC (permalink / raw
  To: gentoo-commits

commit:     4bf5209e51dae587d9dbee30dde5dbe0874c2524
Author:     sin-ack <sin-ack <AT> protonmail <DOT> com>
AuthorDate: Sun Feb 16 14:21:34 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 14:46:24 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bf5209e

x11-terms/ghostty-terminfo: add incompatible ghostty/ncurses blockers

This makes sure that Portage correctly handles the file collisions
during the upgrade.

Signed-off-by: sin-ack <sin-ack <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40419
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.0-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.0-r1.ebuild b/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.0-r1.ebuild
index 82112a4f0d8e..4262b26e68ed 100644
--- a/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.0-r1.ebuild
+++ b/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.0-r1.ebuild
@@ -64,7 +64,9 @@ RESTRICT="test"
 
 IUSE="symlink"
 RDEPEND="
+	!<x11-terms/ghostty-1.1.0-r1
 	symlink? (
+		!>=sys-libs/ncurses-6.5_p20250118[-minimal]
 		|| (
 			<sys-libs/ncurses-6.5_p20250118
 			>=sys-libs/ncurses-6.5_p20250118[minimal]


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-terms/ghostty-terminfo/
@ 2025-02-16 15:26 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-02-16 15:26 UTC (permalink / raw
  To: gentoo-commits

commit:     6ebdbf1a2244e5829a77b0dcdb272a9eccc26f93
Author:     sin-ack <sin-ack <AT> protonmail <DOT> com>
AuthorDate: Sun Feb 16 15:12:19 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 15:26:11 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ebdbf1a

x11-terms/ghostty-terminfo: add 1.1.2

Signed-off-by: sin-ack <sin-ack <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-terms/ghostty-terminfo/Manifest                |   3 +
 .../ghostty-terminfo/ghostty-terminfo-1.1.2.ebuild | 109 +++++++++++++++++++++
 2 files changed, 112 insertions(+)

diff --git a/x11-terms/ghostty-terminfo/Manifest b/x11-terms/ghostty-terminfo/Manifest
index c68dee1167a7..bf3702eeb62e 100644
--- a/x11-terms/ghostty-terminfo/Manifest
+++ b/x11-terms/ghostty-terminfo/Manifest
@@ -2,11 +2,14 @@ DIST breakpad-12207fd37bb8251919c112dcdd8f616a491857b34a451f7e4486490077206dc2a1
 DIST fontconfig-12201149afb3326c56c05bb0a577f54f76ac20deece63aa2f5cd6ff31a4fa4fcb3b7.tar.gz 2122247 BLAKE2B c8f6a33b62141eb732e74194076627072fc7dca19eea797ae256e169f07e4722f47e20e65ffd3152bfb7c98eb5e8a5bc1b5d90b22640c911889c4f29fb2f7e34 SHA512 73287cc3f8f8261a27c2920b0f9430dd6e3ac8733fb2ba55e1b5934cee211023b6415e1d14ddad04ef3c7819727ed34d80aa503d2734bdfc2f1c733c4096463f
 DIST freetype-1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d.tar.gz 2480637 BLAKE2B 9538fe61d9255b272fb34d08adf18876f421b378a89ce13349d50a761c17b70a982588f6d94799b4229dcf850c0948e651a7acb515f61b2dccf2abdecb5f6128 SHA512 9d7600af7e981227e37585dca71fbd7bc78b367a54d7705fe03e0f5549ce49e420548fa09b21c6bb137830f779a0a0b965611f50b163297b79fdc5903b4dc11d
 DIST ghostty-1.1.0.tar.gz 24307038 BLAKE2B 2a56e6ce6c25159948933d893c6a5437df78da8c443cfe9bd75abfa99d39a1fe0ed13198040cf7b4a409e5a02f88440db148ee42a185640aed3791d1f5788208 SHA512 661fb0dd7bce89e8889323bd96499c6007711a6363e8a67474a4f041229bb525ec43d5f4a7a093bc538d862b101478cf583867476e4a69a2b84d606d451b0f70
+DIST ghostty-1.1.2.tar.gz 28981358 BLAKE2B 101eefc8de1543a4b8266d888dfefacc7ed4e61b2c433a1168969e9830af603012ab41cf857e59c3e4bf2d3e5d8507987ba1652bcf177e6dbbf1d131573bb6e0 SHA512 fef82ad2ad36d15390556445330d4b3488da7fd454ca5b07cf13f06b856f61d3491401c6763fbf10f3acc75a4849d8f1a46d64779b8659bc77f1b7fa75800c77
 DIST glfw-1220736fa4ba211162c7a0e46cc8fe04d95921927688bff64ab5da7420d098a7272d.tar.gz 286801 BLAKE2B 04572843acee681ea9e83e6227602a02dee53c72ea55311c484312476511058de4341ea1f55e0204aea07930c951fd6f53ca7f4e85c5a4c5340f0bedd82cdce1 SHA512 958352bd2148fc4e349b5b4b8d7f6aae51566c1f28b56c498c9daad263806aea168b71f535ef38652e0933a102571c7a95b3bcb582ba5555d90a716042fc4495
 DIST glslang-12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1.tar.gz 3842427 BLAKE2B e8eae5a6380332d437edc78447ff1c53185616adacea77d057b69488dd50caa251357cb5950349eb8355a9357b681367aa948dd178b33dd48b6d5be92451a897 SHA512 570d2ff15116f48e195c73d9be1517b05e7c37541af10f6c05779a001e2d0295725349c1f4dd0bcca6f0c7e7e48c5162a60726c3e76cf04619c8e14bd0636ab6
+DIST gobject-12208d70ee791d7ef7e16e1c3c9c1127b57f1ed066a24f87d57fc9f730c5dc394b9d.tar.zst 3990050 BLAKE2B abacba114e9d70a0270f8133db734367ce9cbf628541603d114de8fb118b7177047944555d8bcd00c18c43a530ef4756e5bec1fe66c8dd35737cd2bf54c74ca9 SHA512 0015a3bb72d160cdce157221edc7e67e1fe41d97d79fd7907434d2670a7afa14c9306ebaee39bb83a65a3b8ec5aab312f72b3af15d4e927c9b120330946e0364
 DIST harfbuzz-1220b8588f106c996af10249bfa092c6fb2f35fbacb1505ef477a0b04a7dd1063122.tar.gz 36549985 BLAKE2B 541c17afc32bed24a628bb64fc8f25999c58c0877af8ee2e010b3e2d983fe8160873451d43f3eaa5b8aff3bb6514ea262effcf488a35f1da7c4356f8ccea1f26 SHA512 c90fc8f67ed6d75536a6a0d83434c51756863e51631f00fa390d124d721b003cba4739777b51ac2e9f107914eb5e2ab3daa00dab257435800bb60ff6d5dd45f6
 DIST highway-12205c83b8311a24b1d5ae6d21640df04f4b0726e314337c043cde1432758cbe165b.tar.gz 2162124 BLAKE2B e5514d9bd3187ea24bc3e612039e68014d2b16e90226e977365c72eab301174725e4a16f14ff68e2ea01da9132440884a67cbbbe9788ff2c601af1b5360efc86 SHA512 513718873ca5d1be5c781f92ef943432da4677582e15d25a247c1d3def087fdbd3fe787608d76f32a9b4f9253df88b40bd8ea570159f8106c338ba37e8a50a8d
 DIST imgui-1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402.tar.gz 1833808 BLAKE2B 1cde8c084b7b1ab40af78339f5af4f84895c723eb6f16bfb1657a2cccf1aff7833a15d93a7b8a3708c9cd34d39b84411573093b1d9fbaa08dbfca83414bac6c6 SHA512 d3b88faa8d0fbfbbf8f14ba06a615289b5271a5b8a191373a21c1c9f5ef87830ad2f71905e0c0083ef4709a5d599f43898e9c3d7f9558f8a15e8d25305e61819
+DIST iterm2_themes-12203d2647e5daf36a9c85b969e03f422540786ce9ea624eb4c26d204fe1f46218f3.tar.gz 55812365 BLAKE2B da6215a0169b2d0eb88993ff2dd931c4ff8b1abbf43bc0894010b2c06d53647a78081f557f8571e8f42a1f17ed3c953caa37e6ea812d4ba9b642f379d5f8b641 SHA512 4c0268d3d223df9da99f227299638b32b5277b5e154b4b83475c55c562f38783bcaf72b6ffe5f75777c0147a507cc414fe725e3e1eb1b0ad9af02bdd4efb80f5
 DIST iterm2_themes-12204fc99743d8232e691ac22e058519bfc6ea92de4a11c6dba59b117531c847cd6a.tar.gz 55346837 BLAKE2B 2e9973d9ae662c1ede6742c97a0c20c53c414d87bdaa80c50757a797ecddbbca6a8ea77a3a3bedc1e3d22107363e34f1c3985cdeae0f186b21307230c454f8a2 SHA512 69222065160ecb343e477376938e46584585401fa6a9779456c8713fe5699e7a292406acf7216ba585e41c8da7e9e65223e9617c8c4db3638ea41e9091eb6d1c
 DIST libpng-1220aa013f0c83da3fb64ea6d327f9173fa008d10e28bc9349eac3463457723b1c66.tar.gz 1554715 BLAKE2B 5bce9b666030b696f6ad63885fac48a058b11a39c95fed48b582c54a28ddeeb8af553f24b857440f1bb65d318f23bcaafa40869c352c4b3f995fcb190c311cf1 SHA512 3bb2a7b73113be42b09c2116e6c6f5a7ddb4e2ab06e0b13e10b7314acdccc4bb624ff602e16140c0484f6cde80efa190296226be3da195c6926819f07c723c12
 DIST libxev-1220ebf88622c4d502dc59e71347e4d28c47e033f11b59aff774ae5787565c40999c.tar.gz 265511 BLAKE2B 8329b8fcc76a9ae88dca9e2438559cc0bca06b92b46949d30ba6bcc4cadb22d21e7664891f59e1fb759ed11cccb7731fac1bf9d9fc879952534edcc3646e1e0f SHA512 573660b5a7d060b2bf2390295c8f4abd992a739e721fb13ffaaf5c3af30f3efe9760268bda05d990f1319fdaea4155972aeb41c78e980574958da21203110f56

diff --git a/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.2.ebuild b/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.2.ebuild
new file mode 100644
index 000000000000..58ae1bd1f4ca
--- /dev/null
+++ b/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Terminfo for ghostty, a fast, feature-rich, and cross-platform terminal emulator"
+HOMEPAGE="https://ghostty.org/ https://github.com/ghostty-org/ghostty"
+
+# NOTE: Keep in sync with x11-terms/ghostty ebuilds.
+declare -g -r -A ZBS_DEPENDENCIES=(
+	[breakpad-12207fd37bb8251919c112dcdd8f616a491857b34a451f7e4486490077206dc2a1ea.tar.gz]='https://github.com/getsentry/breakpad/archive/b99f444ba5f6b98cac261cbb391d8766b34a5918.tar.gz'
+	[fontconfig-12201149afb3326c56c05bb0a577f54f76ac20deece63aa2f5cd6ff31a4fa4fcb3b7.tar.gz]='https://deps.files.ghostty.org/fontconfig-2.14.2.tar.gz'
+	[freetype-1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d.tar.gz]='https://github.com/freetype/freetype/archive/refs/tags/VER-2-13-2.tar.gz'
+	[glfw-1220736fa4ba211162c7a0e46cc8fe04d95921927688bff64ab5da7420d098a7272d.tar.gz]='https://github.com/mitchellh/glfw/archive/b552c6ec47326b94015feddb36058ea567b87159.tar.gz'
+	[glslang-12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1.tar.gz]='https://github.com/KhronosGroup/glslang/archive/refs/tags/14.2.0.tar.gz'
+	[gobject-12208d70ee791d7ef7e16e1c3c9c1127b57f1ed066a24f87d57fc9f730c5dc394b9d.tar.zst]='https://github.com/ianprime0509/zig-gobject/releases/download/v0.2.2/bindings-gnome47.tar.zst'
+	[harfbuzz-1220b8588f106c996af10249bfa092c6fb2f35fbacb1505ef477a0b04a7dd1063122.tar.gz]='https://github.com/harfbuzz/harfbuzz/archive/refs/tags/8.4.0.tar.gz'
+	[highway-12205c83b8311a24b1d5ae6d21640df04f4b0726e314337c043cde1432758cbe165b.tar.gz]='https://github.com/google/highway/archive/refs/tags/1.1.0.tar.gz'
+	[imgui-1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402.tar.gz]='https://github.com/ocornut/imgui/archive/e391fe2e66eb1c96b1624ae8444dc64c23146ef4.tar.gz'
+	[iterm2_themes-12203d2647e5daf36a9c85b969e03f422540786ce9ea624eb4c26d204fe1f46218f3.tar.gz]='https://github.com/mbadolato/iTerm2-Color-Schemes/archive/db227d159adc265818f2e898da0f70ef8d7b580e.tar.gz'
+	[libpng-1220aa013f0c83da3fb64ea6d327f9173fa008d10e28bc9349eac3463457723b1c66.tar.gz]='https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.43.tar.gz'
+	[libxev-1220ebf88622c4d502dc59e71347e4d28c47e033f11b59aff774ae5787565c40999c.tar.gz]='https://github.com/mitchellh/libxev/archive/31eed4e337fed7b0149319e5cdbb62b848c24fbd.tar.gz'
+	[libxml2-122032442d95c3b428ae8e526017fad881e7dc78eab4d558e9a58a80bfbd65a64f7d.tar.gz]='https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.5.tar.gz'
+	[mach-glfw-12206ed982e709e565d536ce930701a8c07edfd2cfdce428683f3f2a601d37696a62.tar.gz]='https://github.com/mitchellh/mach-glfw/archive/37c2995f31abcf7e8378fba68ddcf4a3faa02de0.tar.gz'
+	[oniguruma-1220c15e72eadd0d9085a8af134904d9a0f5dfcbed5f606ad60edc60ebeccd9706bb.tar.gz]='https://github.com/kkos/oniguruma/archive/refs/tags/v6.9.9.tar.gz'
+	[pixels-12207ff340169c7d40c570b4b6a97db614fe47e0d83b5801a932dcd44917424c8806.tar.gz]='https://github.com/make-github-pseudonymous-again/pixels/archive/d843c2714d32e15b48b8d7eeb480295af537f877.tar.gz'
+	[plasma_wayland_protocols-12207e0851c12acdeee0991e893e0132fc87bb763969a585dc16ecca33e88334c566.tar.gz]='https://github.com/KDE/plasma-wayland-protocols/archive/db525e8f9da548cffa2ac77618dd0fbe7f511b86.tar.gz'
+	[sentry-1220446be831adcca918167647c06c7b825849fa3fba5f22da394667974537a9c77e.tar.gz]='https://github.com/getsentry/sentry-native/archive/refs/tags/0.7.8.tar.gz'
+	[spirv_cross-1220fb3b5586e8be67bc3feb34cbe749cf42a60d628d2953632c2f8141302748c8da.tar.gz]='https://github.com/KhronosGroup/SPIRV-Cross/archive/476f384eb7d9e48613c45179e502a15ab95b6b49.tar.gz'
+	[utfcpp-1220d4d18426ca72fc2b7e56ce47273149815501d0d2395c2a98c726b31ba931e641.tar.gz]='https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.5.tar.gz'
+	[vaxis-12200df4ebeaed45de26cb2c9f3b6f3746d8013b604e035dae658f86f586c8c91d2f.tar.gz]='https://github.com/rockorager/libvaxis/archive/6d729a2dc3b934818dffe06d2ba3ce02841ed74b.tar.gz'
+	[vaxis-1220c72c1697dd9008461ead702997a15d8a1c5810247f02e7983b9f74c6c6e4c087.tar.gz]='https://github.com/rockorager/libvaxis/archive/dc0a228a5544988d4a920cfb40be9cd28db41423.tar.gz'
+	[vulkan_headers-122004bfd4c519dadfb8e6281a42fc34fd1aa15aea654ea8a492839046f9894fa2cf.tar.gz]='https://github.com/mitchellh/vulkan-headers/archive/04c8a0389d5a0236a96312988017cd4ce27d8041.tar.gz'
+	[wayland-12202cdac858abc52413a6c6711d5026d2d3c8e13f95ca2c327eade0736298bb021f.tar.gz]='https://deps.files.ghostty.org/wayland-9cb3d7aa9dc995ffafdbdef7ab86a949d0fb0e7d.tar.gz'
+	[wayland_headers-1220b3164434d2ec9db146a40bf3a30f490590d68fa8529776a3138074f0da2c11ca.tar.gz]='https://github.com/mitchellh/wayland-headers/archive/5f991515a29f994d87b908115a2ab0b899474bd1.tar.gz'
+	[wayland_protocols-12201a57c6ce0001aa034fa80fba3e1cd2253c560a45748f4f4dd21ff23b491cddef.tar.gz]='https://deps.files.ghostty.org/wayland-protocols-258d8f88f2c8c25a830c6316f87d23ce1a0f12d9.tar.gz'
+	[wuffs-122037b39d577ec2db3fd7b2130e7b69ef6cc1807d68607a7c232c958315d381b5cd.tar.gz]='https://github.com/google/wuffs/archive/refs/tags/v0.4.0-alpha.9.tar.gz'
+	[x11_headers-122089c326186c84aa2fd034b16abc38f3ebf4862d9ae106dc1847ac44f557b36465.tar.gz]='https://github.com/mitchellh/x11-headers/archive/2ffbd62d82ff73ec929dd8de802bc95effa0ef88.tar.gz'
+	[xcode_frameworks-12202adbfecdad671d585c9a5bfcbd5cdf821726779430047742ce1bf94ad67d19cb.tar.gz]='https://github.com/mitchellh/xcode-frameworks/archive/69801c154c39d7ae6129ea1ba8fe1afe00585fc8.tar.gz'
+	[z2d-12201f0d542e7541cf492a001d4d0d0155c92f58212fbcb0d224e95edeba06b5416a.tar.gz]='https://github.com/vancluever/z2d/archive/4638bb02a9dc41cc2fb811f092811f6a951c752a.tar.gz'
+	[zf-1220edc3b8d8bedbb50555947987e5e8e2f93871ca3c8e8d4cc8f1377c15b5dd35e8.tar.gz]='https://github.com/natecraddock/zf/archive/ed99ca18b02dda052e20ba467e90b623c04690dd.tar.gz'
+	[zg-122055beff332830a391e9895c044d33b15ea21063779557024b46169fb1984c6e40.tar.gz]='https://codeberg.org/atman/zg/archive/v0.13.2.tar.gz'
+	[zig-objc-1220e17e64ef0ef561b3e4b9f3a96a2494285f2ec31c097721bf8c8677ec4415c634.tar.gz]='https://github.com/mitchellh/zig-objc/archive/9b8ba849b0f58fe207ecd6ab7c147af55b17556e.tar.gz'
+	[zig-wayland-12209ca054cb1919fa276e328967f10b253f7537c4136eb48f3332b0f7cf661cad38.tar.gz]='https://deps.files.ghostty.org/zig-wayland-fbfe3b4ac0b472a27b1f1a67405436c58cbee12d.tar.gz'
+	[zig_js-12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc.tar.gz]='https://github.com/mitchellh/zig-js/archive/d0b8b0a57c52fbc89f9d9fecba75ca29da7dd7d1.tar.gz'
+	[zigimg-1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5.tar.gz]='https://github.com/zigimg/zigimg/archive/3a667bdb3d7f0955a5a51c8468eac83210c1439e.tar.gz'
+	[ziglyph-12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25.tar.gz]='https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz'
+	[zlib-1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb.tar.gz]='https://github.com/madler/zlib/archive/refs/tags/v1.3.1.tar.gz'
+)
+
+ZIG_SLOT="0.13"
+inherit zig
+
+SRC_URI="
+	https://release.files.ghostty.org/${PV}/ghostty-${PV}.tar.gz
+	${ZBS_DEPENDENCIES_SRC_URI}
+"
+S="${WORKDIR}/${P/-terminfo/}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="symlink"
+# Tests are run on the main Ghostty package.
+RESTRICT="test"
+
+RDEPEND="
+	!<x11-terms/ghostty-1.1.0-r1
+	symlink? (
+		!>=sys-libs/ncurses-6.5_p20250118[-minimal]
+		|| (
+			<sys-libs/ncurses-6.5_p20250118
+			>=sys-libs/ncurses-6.5_p20250118[minimal]
+		)
+	)
+	!symlink? (
+		>=sys-libs/ncurses-6.5_p20250118[-minimal]
+	)
+"
+BDEPEND="sys-libs/ncurses"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-build-add-a-step-for-only-building-terminfo.patch
+)
+
+src_configure() {
+	local my_zbs_args=(
+		-Demit-terminfo=false
+		-Demit-termcap=false
+	)
+
+	zig_src_configure
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	DESTDIR="${D}" nonfatal ezig build terminfo "${ZBS_ARGS[@]}" \
+		|| die "Failed to compile terminfo database"
+
+	# Newer ncurses versions have a "ghostty" terminfo entry which
+	# collides with the "ghostty" symlink that is installed by default,
+	# but only when USE=-minimal. Remove the symlink in that case.
+	if ! use symlink; then
+		rm -rf "${ED}/usr/share/terminfo/g" || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-terms/ghostty-terminfo/
@ 2025-02-16 15:26 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-02-16 15:26 UTC (permalink / raw
  To: gentoo-commits

commit:     8204763b3d8006986c70bf4693bdf9858b41522b
Author:     sin-ack <sin-ack <AT> protonmail <DOT> com>
AuthorDate: Sun Feb 16 15:16:10 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 15:26:12 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8204763b

x11-terms/ghostty-terminfo: drop 1.1.0-r1

Signed-off-by: sin-ack <sin-ack <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40596
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-terms/ghostty-terminfo/Manifest                |   2 -
 .../ghostty-terminfo-1.1.0-r1.ebuild               | 108 ---------------------
 2 files changed, 110 deletions(-)

diff --git a/x11-terms/ghostty-terminfo/Manifest b/x11-terms/ghostty-terminfo/Manifest
index bf3702eeb62e..c0379416895b 100644
--- a/x11-terms/ghostty-terminfo/Manifest
+++ b/x11-terms/ghostty-terminfo/Manifest
@@ -1,7 +1,6 @@
 DIST breakpad-12207fd37bb8251919c112dcdd8f616a491857b34a451f7e4486490077206dc2a1ea.tar.gz 5475126 BLAKE2B 67af8bc3227723e9056eb5d7e6f85809037d1b6f62c57bf447b04648c43c299a3840ac7a9ced2431343beb47332079c1827fd4d0a301fe0c6b24992f9b1b6fd9 SHA512 740b70daaf150a7619839f467eea6dc6d5dcd599861a977b1638c308b7902cb2de5d3927081143c2314e9b0c46c07d646ecec0e9e8d5097ddaa958766c07074d
 DIST fontconfig-12201149afb3326c56c05bb0a577f54f76ac20deece63aa2f5cd6ff31a4fa4fcb3b7.tar.gz 2122247 BLAKE2B c8f6a33b62141eb732e74194076627072fc7dca19eea797ae256e169f07e4722f47e20e65ffd3152bfb7c98eb5e8a5bc1b5d90b22640c911889c4f29fb2f7e34 SHA512 73287cc3f8f8261a27c2920b0f9430dd6e3ac8733fb2ba55e1b5934cee211023b6415e1d14ddad04ef3c7819727ed34d80aa503d2734bdfc2f1c733c4096463f
 DIST freetype-1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d.tar.gz 2480637 BLAKE2B 9538fe61d9255b272fb34d08adf18876f421b378a89ce13349d50a761c17b70a982588f6d94799b4229dcf850c0948e651a7acb515f61b2dccf2abdecb5f6128 SHA512 9d7600af7e981227e37585dca71fbd7bc78b367a54d7705fe03e0f5549ce49e420548fa09b21c6bb137830f779a0a0b965611f50b163297b79fdc5903b4dc11d
-DIST ghostty-1.1.0.tar.gz 24307038 BLAKE2B 2a56e6ce6c25159948933d893c6a5437df78da8c443cfe9bd75abfa99d39a1fe0ed13198040cf7b4a409e5a02f88440db148ee42a185640aed3791d1f5788208 SHA512 661fb0dd7bce89e8889323bd96499c6007711a6363e8a67474a4f041229bb525ec43d5f4a7a093bc538d862b101478cf583867476e4a69a2b84d606d451b0f70
 DIST ghostty-1.1.2.tar.gz 28981358 BLAKE2B 101eefc8de1543a4b8266d888dfefacc7ed4e61b2c433a1168969e9830af603012ab41cf857e59c3e4bf2d3e5d8507987ba1652bcf177e6dbbf1d131573bb6e0 SHA512 fef82ad2ad36d15390556445330d4b3488da7fd454ca5b07cf13f06b856f61d3491401c6763fbf10f3acc75a4849d8f1a46d64779b8659bc77f1b7fa75800c77
 DIST glfw-1220736fa4ba211162c7a0e46cc8fe04d95921927688bff64ab5da7420d098a7272d.tar.gz 286801 BLAKE2B 04572843acee681ea9e83e6227602a02dee53c72ea55311c484312476511058de4341ea1f55e0204aea07930c951fd6f53ca7f4e85c5a4c5340f0bedd82cdce1 SHA512 958352bd2148fc4e349b5b4b8d7f6aae51566c1f28b56c498c9daad263806aea168b71f535ef38652e0933a102571c7a95b3bcb582ba5555d90a716042fc4495
 DIST glslang-12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1.tar.gz 3842427 BLAKE2B e8eae5a6380332d437edc78447ff1c53185616adacea77d057b69488dd50caa251357cb5950349eb8355a9357b681367aa948dd178b33dd48b6d5be92451a897 SHA512 570d2ff15116f48e195c73d9be1517b05e7c37541af10f6c05779a001e2d0295725349c1f4dd0bcca6f0c7e7e48c5162a60726c3e76cf04619c8e14bd0636ab6
@@ -10,7 +9,6 @@ DIST harfbuzz-1220b8588f106c996af10249bfa092c6fb2f35fbacb1505ef477a0b04a7dd10631
 DIST highway-12205c83b8311a24b1d5ae6d21640df04f4b0726e314337c043cde1432758cbe165b.tar.gz 2162124 BLAKE2B e5514d9bd3187ea24bc3e612039e68014d2b16e90226e977365c72eab301174725e4a16f14ff68e2ea01da9132440884a67cbbbe9788ff2c601af1b5360efc86 SHA512 513718873ca5d1be5c781f92ef943432da4677582e15d25a247c1d3def087fdbd3fe787608d76f32a9b4f9253df88b40bd8ea570159f8106c338ba37e8a50a8d
 DIST imgui-1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402.tar.gz 1833808 BLAKE2B 1cde8c084b7b1ab40af78339f5af4f84895c723eb6f16bfb1657a2cccf1aff7833a15d93a7b8a3708c9cd34d39b84411573093b1d9fbaa08dbfca83414bac6c6 SHA512 d3b88faa8d0fbfbbf8f14ba06a615289b5271a5b8a191373a21c1c9f5ef87830ad2f71905e0c0083ef4709a5d599f43898e9c3d7f9558f8a15e8d25305e61819
 DIST iterm2_themes-12203d2647e5daf36a9c85b969e03f422540786ce9ea624eb4c26d204fe1f46218f3.tar.gz 55812365 BLAKE2B da6215a0169b2d0eb88993ff2dd931c4ff8b1abbf43bc0894010b2c06d53647a78081f557f8571e8f42a1f17ed3c953caa37e6ea812d4ba9b642f379d5f8b641 SHA512 4c0268d3d223df9da99f227299638b32b5277b5e154b4b83475c55c562f38783bcaf72b6ffe5f75777c0147a507cc414fe725e3e1eb1b0ad9af02bdd4efb80f5
-DIST iterm2_themes-12204fc99743d8232e691ac22e058519bfc6ea92de4a11c6dba59b117531c847cd6a.tar.gz 55346837 BLAKE2B 2e9973d9ae662c1ede6742c97a0c20c53c414d87bdaa80c50757a797ecddbbca6a8ea77a3a3bedc1e3d22107363e34f1c3985cdeae0f186b21307230c454f8a2 SHA512 69222065160ecb343e477376938e46584585401fa6a9779456c8713fe5699e7a292406acf7216ba585e41c8da7e9e65223e9617c8c4db3638ea41e9091eb6d1c
 DIST libpng-1220aa013f0c83da3fb64ea6d327f9173fa008d10e28bc9349eac3463457723b1c66.tar.gz 1554715 BLAKE2B 5bce9b666030b696f6ad63885fac48a058b11a39c95fed48b582c54a28ddeeb8af553f24b857440f1bb65d318f23bcaafa40869c352c4b3f995fcb190c311cf1 SHA512 3bb2a7b73113be42b09c2116e6c6f5a7ddb4e2ab06e0b13e10b7314acdccc4bb624ff602e16140c0484f6cde80efa190296226be3da195c6926819f07c723c12
 DIST libxev-1220ebf88622c4d502dc59e71347e4d28c47e033f11b59aff774ae5787565c40999c.tar.gz 265511 BLAKE2B 8329b8fcc76a9ae88dca9e2438559cc0bca06b92b46949d30ba6bcc4cadb22d21e7664891f59e1fb759ed11cccb7731fac1bf9d9fc879952534edcc3646e1e0f SHA512 573660b5a7d060b2bf2390295c8f4abd992a739e721fb13ffaaf5c3af30f3efe9760268bda05d990f1319fdaea4155972aeb41c78e980574958da21203110f56
 DIST libxml2-122032442d95c3b428ae8e526017fad881e7dc78eab4d558e9a58a80bfbd65a64f7d.tar.gz 3780877 BLAKE2B bf6c3732b1c7d5e7216a97662a78914bb481cb3ab0ae9999de583c8f72ce815d0e39d1176d4277a2f335d73b39bf0b5ca0f0453b394c2074798935eb974eb258 SHA512 303528ead0f020c8e172beca54d00bb1281f4080885c9f44b979158516b585d71bbcb024999a5712a850e48647b19b1f634a1428ea29f39a48e8e6cbf7c71936

diff --git a/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.0-r1.ebuild b/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.0-r1.ebuild
deleted file mode 100644
index 4262b26e68ed..000000000000
--- a/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Terminfo for ghostty, a fast, feature-rich, and cross-platform terminal emulator"
-HOMEPAGE="https://ghostty.org/ https://github.com/ghostty-org/ghostty"
-
-# NOTE: Keep in sync with x11-terms/ghostty ebuilds.
-declare -g -r -A ZBS_DEPENDENCIES=(
-	[breakpad-12207fd37bb8251919c112dcdd8f616a491857b34a451f7e4486490077206dc2a1ea.tar.gz]='https://github.com/getsentry/breakpad/archive/b99f444ba5f6b98cac261cbb391d8766b34a5918.tar.gz'
-	[fontconfig-12201149afb3326c56c05bb0a577f54f76ac20deece63aa2f5cd6ff31a4fa4fcb3b7.tar.gz]='https://deps.files.ghostty.org/fontconfig-2.14.2.tar.gz'
-	[freetype-1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d.tar.gz]='https://github.com/freetype/freetype/archive/refs/tags/VER-2-13-2.tar.gz'
-	[glfw-1220736fa4ba211162c7a0e46cc8fe04d95921927688bff64ab5da7420d098a7272d.tar.gz]='https://github.com/mitchellh/glfw/archive/b552c6ec47326b94015feddb36058ea567b87159.tar.gz'
-	[glslang-12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1.tar.gz]='https://github.com/KhronosGroup/glslang/archive/refs/tags/14.2.0.tar.gz'
-	[harfbuzz-1220b8588f106c996af10249bfa092c6fb2f35fbacb1505ef477a0b04a7dd1063122.tar.gz]='https://github.com/harfbuzz/harfbuzz/archive/refs/tags/8.4.0.tar.gz'
-	[highway-12205c83b8311a24b1d5ae6d21640df04f4b0726e314337c043cde1432758cbe165b.tar.gz]='https://github.com/google/highway/archive/refs/tags/1.1.0.tar.gz'
-	[imgui-1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402.tar.gz]='https://github.com/ocornut/imgui/archive/e391fe2e66eb1c96b1624ae8444dc64c23146ef4.tar.gz'
-	[iterm2_themes-12204fc99743d8232e691ac22e058519bfc6ea92de4a11c6dba59b117531c847cd6a.tar.gz]='https://github.com/mbadolato/iTerm2-Color-Schemes/archive/0e23daf59234fc892cba949562d7bf69204594bb.tar.gz'
-	[libpng-1220aa013f0c83da3fb64ea6d327f9173fa008d10e28bc9349eac3463457723b1c66.tar.gz]='https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.43.tar.gz'
-	[libxev-1220ebf88622c4d502dc59e71347e4d28c47e033f11b59aff774ae5787565c40999c.tar.gz]='https://github.com/mitchellh/libxev/archive/31eed4e337fed7b0149319e5cdbb62b848c24fbd.tar.gz'
-	[libxml2-122032442d95c3b428ae8e526017fad881e7dc78eab4d558e9a58a80bfbd65a64f7d.tar.gz]='https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.5.tar.gz'
-	[mach-glfw-12206ed982e709e565d536ce930701a8c07edfd2cfdce428683f3f2a601d37696a62.tar.gz]='https://github.com/mitchellh/mach-glfw/archive/37c2995f31abcf7e8378fba68ddcf4a3faa02de0.tar.gz'
-	[oniguruma-1220c15e72eadd0d9085a8af134904d9a0f5dfcbed5f606ad60edc60ebeccd9706bb.tar.gz]='https://github.com/kkos/oniguruma/archive/refs/tags/v6.9.9.tar.gz'
-	[pixels-12207ff340169c7d40c570b4b6a97db614fe47e0d83b5801a932dcd44917424c8806.tar.gz]='https://github.com/make-github-pseudonymous-again/pixels/archive/d843c2714d32e15b48b8d7eeb480295af537f877.tar.gz'
-	[plasma_wayland_protocols-12207e0851c12acdeee0991e893e0132fc87bb763969a585dc16ecca33e88334c566.tar.gz]='https://github.com/KDE/plasma-wayland-protocols/archive/db525e8f9da548cffa2ac77618dd0fbe7f511b86.tar.gz'
-	[sentry-1220446be831adcca918167647c06c7b825849fa3fba5f22da394667974537a9c77e.tar.gz]='https://github.com/getsentry/sentry-native/archive/refs/tags/0.7.8.tar.gz'
-	[spirv_cross-1220fb3b5586e8be67bc3feb34cbe749cf42a60d628d2953632c2f8141302748c8da.tar.gz]='https://github.com/KhronosGroup/SPIRV-Cross/archive/476f384eb7d9e48613c45179e502a15ab95b6b49.tar.gz'
-	[utfcpp-1220d4d18426ca72fc2b7e56ce47273149815501d0d2395c2a98c726b31ba931e641.tar.gz]='https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.5.tar.gz'
-	[vaxis-12200df4ebeaed45de26cb2c9f3b6f3746d8013b604e035dae658f86f586c8c91d2f.tar.gz]='https://github.com/rockorager/libvaxis/archive/6d729a2dc3b934818dffe06d2ba3ce02841ed74b.tar.gz'
-	[vaxis-1220c72c1697dd9008461ead702997a15d8a1c5810247f02e7983b9f74c6c6e4c087.tar.gz]='https://github.com/rockorager/libvaxis/archive/dc0a228a5544988d4a920cfb40be9cd28db41423.tar.gz'
-	[vulkan_headers-122004bfd4c519dadfb8e6281a42fc34fd1aa15aea654ea8a492839046f9894fa2cf.tar.gz]='https://github.com/mitchellh/vulkan-headers/archive/04c8a0389d5a0236a96312988017cd4ce27d8041.tar.gz'
-	[wayland-12202cdac858abc52413a6c6711d5026d2d3c8e13f95ca2c327eade0736298bb021f.tar.gz]='https://deps.files.ghostty.org/wayland-9cb3d7aa9dc995ffafdbdef7ab86a949d0fb0e7d.tar.gz'
-	[wayland_headers-1220b3164434d2ec9db146a40bf3a30f490590d68fa8529776a3138074f0da2c11ca.tar.gz]='https://github.com/mitchellh/wayland-headers/archive/5f991515a29f994d87b908115a2ab0b899474bd1.tar.gz'
-	[wayland_protocols-12201a57c6ce0001aa034fa80fba3e1cd2253c560a45748f4f4dd21ff23b491cddef.tar.gz]='https://deps.files.ghostty.org/wayland-protocols-258d8f88f2c8c25a830c6316f87d23ce1a0f12d9.tar.gz'
-	[wuffs-122037b39d577ec2db3fd7b2130e7b69ef6cc1807d68607a7c232c958315d381b5cd.tar.gz]='https://github.com/google/wuffs/archive/refs/tags/v0.4.0-alpha.9.tar.gz'
-	[x11_headers-122089c326186c84aa2fd034b16abc38f3ebf4862d9ae106dc1847ac44f557b36465.tar.gz]='https://github.com/mitchellh/x11-headers/archive/2ffbd62d82ff73ec929dd8de802bc95effa0ef88.tar.gz'
-	[xcode_frameworks-12202adbfecdad671d585c9a5bfcbd5cdf821726779430047742ce1bf94ad67d19cb.tar.gz]='https://github.com/mitchellh/xcode-frameworks/archive/69801c154c39d7ae6129ea1ba8fe1afe00585fc8.tar.gz'
-	[z2d-12201f0d542e7541cf492a001d4d0d0155c92f58212fbcb0d224e95edeba06b5416a.tar.gz]='https://github.com/vancluever/z2d/archive/4638bb02a9dc41cc2fb811f092811f6a951c752a.tar.gz'
-	[zf-1220edc3b8d8bedbb50555947987e5e8e2f93871ca3c8e8d4cc8f1377c15b5dd35e8.tar.gz]='https://github.com/natecraddock/zf/archive/ed99ca18b02dda052e20ba467e90b623c04690dd.tar.gz'
-	[zg-122055beff332830a391e9895c044d33b15ea21063779557024b46169fb1984c6e40.tar.gz]='https://codeberg.org/atman/zg/archive/v0.13.2.tar.gz'
-	[zig-objc-1220e17e64ef0ef561b3e4b9f3a96a2494285f2ec31c097721bf8c8677ec4415c634.tar.gz]='https://github.com/mitchellh/zig-objc/archive/9b8ba849b0f58fe207ecd6ab7c147af55b17556e.tar.gz'
-	[zig-wayland-12209ca054cb1919fa276e328967f10b253f7537c4136eb48f3332b0f7cf661cad38.tar.gz]='https://codeberg.org/ifreund/zig-wayland/archive/fbfe3b4ac0b472a27b1f1a67405436c58cbee12d.tar.gz'
-	[zig_js-12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc.tar.gz]='https://github.com/mitchellh/zig-js/archive/d0b8b0a57c52fbc89f9d9fecba75ca29da7dd7d1.tar.gz'
-	[zigimg-1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5.tar.gz]='https://github.com/zigimg/zigimg/archive/3a667bdb3d7f0955a5a51c8468eac83210c1439e.tar.gz'
-	[ziglyph-12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25.tar.gz]='https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz'
-	[zlib-1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb.tar.gz]='https://github.com/madler/zlib/archive/refs/tags/v1.3.1.tar.gz'
-)
-
-ZIG_SLOT="0.13"
-inherit zig
-
-SRC_URI="
-	https://release.files.ghostty.org/${PV}/ghostty-${PV}.tar.gz
-	${ZBS_DEPENDENCIES_SRC_URI}
-"
-S="${WORKDIR}/${P/-terminfo/}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-# Tests are run on the main Ghostty package.
-RESTRICT="test"
-
-IUSE="symlink"
-RDEPEND="
-	!<x11-terms/ghostty-1.1.0-r1
-	symlink? (
-		!>=sys-libs/ncurses-6.5_p20250118[-minimal]
-		|| (
-			<sys-libs/ncurses-6.5_p20250118
-			>=sys-libs/ncurses-6.5_p20250118[minimal]
-		)
-	)
-	!symlink? (
-		>=sys-libs/ncurses-6.5_p20250118[-minimal]
-	)
-"
-BDEPEND="sys-libs/ncurses"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0-build-add-a-step-for-only-building-terminfo.patch
-)
-
-src_configure() {
-	local my_zbs_args=(
-		-Demit-terminfo=false
-		-Demit-termcap=false
-	)
-
-	zig_src_configure
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	DESTDIR="${D}" nonfatal ezig build terminfo "${ZBS_ARGS[@]}" \
-		|| die "Failed to compile terminfo database"
-
-	# Newer ncurses versions have a "ghostty" terminfo entry which
-	# collides with the "ghostty" symlink that is installed by default,
-	# but only when USE=-minimal. Remove the symlink in that case.
-	if ! use symlink; then
-		rm -rf "${ED}/usr/share/terminfo/g" || die
-	fi
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-terms/ghostty-terminfo/
@ 2025-03-25  6:23 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-03-25  6:23 UTC (permalink / raw
  To: gentoo-commits

commit:     70c9c2fe50ffbf81840f66c2ab154b75e6fce6a1
Author:     sin-ack <sin-ack <AT> protonmail <DOT> com>
AuthorDate: Mon Mar 24 20:12:06 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 25 06:22:39 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70c9c2fe

x11-terms/ghostty-terminfo: add 1.1.3

Signed-off-by: sin-ack <sin-ack <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-terms/ghostty-terminfo/Manifest                |   1 +
 .../ghostty-terminfo/ghostty-terminfo-1.1.3.ebuild | 108 +++++++++++++++++++++
 2 files changed, 109 insertions(+)

diff --git a/x11-terms/ghostty-terminfo/Manifest b/x11-terms/ghostty-terminfo/Manifest
index 491c74a17dbf..a819bdebc5b7 100644
--- a/x11-terms/ghostty-terminfo/Manifest
+++ b/x11-terms/ghostty-terminfo/Manifest
@@ -2,6 +2,7 @@ DIST breakpad-12207fd37bb8251919c112dcdd8f616a491857b34a451f7e4486490077206dc2a1
 DIST fontconfig-12201149afb3326c56c05bb0a577f54f76ac20deece63aa2f5cd6ff31a4fa4fcb3b7.tar.gz 2122247 BLAKE2B c8f6a33b62141eb732e74194076627072fc7dca19eea797ae256e169f07e4722f47e20e65ffd3152bfb7c98eb5e8a5bc1b5d90b22640c911889c4f29fb2f7e34 SHA512 73287cc3f8f8261a27c2920b0f9430dd6e3ac8733fb2ba55e1b5934cee211023b6415e1d14ddad04ef3c7819727ed34d80aa503d2734bdfc2f1c733c4096463f
 DIST freetype-1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d.tar.gz 2480637 BLAKE2B 9538fe61d9255b272fb34d08adf18876f421b378a89ce13349d50a761c17b70a982588f6d94799b4229dcf850c0948e651a7acb515f61b2dccf2abdecb5f6128 SHA512 9d7600af7e981227e37585dca71fbd7bc78b367a54d7705fe03e0f5549ce49e420548fa09b21c6bb137830f779a0a0b965611f50b163297b79fdc5903b4dc11d
 DIST ghostty-1.1.2.tar.gz 28981358 BLAKE2B 101eefc8de1543a4b8266d888dfefacc7ed4e61b2c433a1168969e9830af603012ab41cf857e59c3e4bf2d3e5d8507987ba1652bcf177e6dbbf1d131573bb6e0 SHA512 fef82ad2ad36d15390556445330d4b3488da7fd454ca5b07cf13f06b856f61d3491401c6763fbf10f3acc75a4849d8f1a46d64779b8659bc77f1b7fa75800c77
+DIST ghostty-1.1.3.tar.gz 28983069 BLAKE2B 7ed7c2a59c4f4f714f7977cefac07d292600543d65b2537b0afdf8e37fb66d1c19d11618578da3192d24c4737b7729666f14d416b416d0fe40f0ecf8513f2258 SHA512 fef62c4b1e5a35eee6eeea79e6d6d613b09d3946a3c42bb2b9224970030d5b0eaabeffe2f59d51880125b9124ac183809c05a13bc92d310a519823365c3d61aa
 DIST glfw-1220736fa4ba211162c7a0e46cc8fe04d95921927688bff64ab5da7420d098a7272d.tar.gz 286801 BLAKE2B 04572843acee681ea9e83e6227602a02dee53c72ea55311c484312476511058de4341ea1f55e0204aea07930c951fd6f53ca7f4e85c5a4c5340f0bedd82cdce1 SHA512 958352bd2148fc4e349b5b4b8d7f6aae51566c1f28b56c498c9daad263806aea168b71f535ef38652e0933a102571c7a95b3bcb582ba5555d90a716042fc4495
 DIST glslang-12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1.tar.gz 3842427 BLAKE2B e8eae5a6380332d437edc78447ff1c53185616adacea77d057b69488dd50caa251357cb5950349eb8355a9357b681367aa948dd178b33dd48b6d5be92451a897 SHA512 570d2ff15116f48e195c73d9be1517b05e7c37541af10f6c05779a001e2d0295725349c1f4dd0bcca6f0c7e7e48c5162a60726c3e76cf04619c8e14bd0636ab6
 DIST gobject-12208d70ee791d7ef7e16e1c3c9c1127b57f1ed066a24f87d57fc9f730c5dc394b9d.tar.zst 3990050 BLAKE2B abacba114e9d70a0270f8133db734367ce9cbf628541603d114de8fb118b7177047944555d8bcd00c18c43a530ef4756e5bec1fe66c8dd35737cd2bf54c74ca9 SHA512 0015a3bb72d160cdce157221edc7e67e1fe41d97d79fd7907434d2670a7afa14c9306ebaee39bb83a65a3b8ec5aab312f72b3af15d4e927c9b120330946e0364

diff --git a/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.3.ebuild b/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.3.ebuild
new file mode 100644
index 000000000000..efab150e6397
--- /dev/null
+++ b/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Terminfo for ghostty, a fast, feature-rich, and cross-platform terminal emulator"
+HOMEPAGE="https://ghostty.org/ https://github.com/ghostty-org/ghostty"
+
+# NOTE: Keep in sync with x11-terms/ghostty ebuilds.
+declare -g -r -A ZBS_DEPENDENCIES=(
+	[breakpad-12207fd37bb8251919c112dcdd8f616a491857b34a451f7e4486490077206dc2a1ea.tar.gz]='https://github.com/getsentry/breakpad/archive/b99f444ba5f6b98cac261cbb391d8766b34a5918.tar.gz'
+	[fontconfig-12201149afb3326c56c05bb0a577f54f76ac20deece63aa2f5cd6ff31a4fa4fcb3b7.tar.gz]='https://deps.files.ghostty.org/fontconfig-2.14.2.tar.gz'
+	[freetype-1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d.tar.gz]='https://github.com/freetype/freetype/archive/refs/tags/VER-2-13-2.tar.gz'
+	[glfw-1220736fa4ba211162c7a0e46cc8fe04d95921927688bff64ab5da7420d098a7272d.tar.gz]='https://github.com/mitchellh/glfw/archive/b552c6ec47326b94015feddb36058ea567b87159.tar.gz'
+	[glslang-12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1.tar.gz]='https://github.com/KhronosGroup/glslang/archive/refs/tags/14.2.0.tar.gz'
+	[gobject-12208d70ee791d7ef7e16e1c3c9c1127b57f1ed066a24f87d57fc9f730c5dc394b9d.tar.zst]='https://github.com/ianprime0509/zig-gobject/releases/download/v0.2.2/bindings-gnome47.tar.zst'
+	[harfbuzz-1220b8588f106c996af10249bfa092c6fb2f35fbacb1505ef477a0b04a7dd1063122.tar.gz]='https://github.com/harfbuzz/harfbuzz/archive/refs/tags/8.4.0.tar.gz'
+	[highway-12205c83b8311a24b1d5ae6d21640df04f4b0726e314337c043cde1432758cbe165b.tar.gz]='https://github.com/google/highway/archive/refs/tags/1.1.0.tar.gz'
+	[imgui-1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402.tar.gz]='https://github.com/ocornut/imgui/archive/e391fe2e66eb1c96b1624ae8444dc64c23146ef4.tar.gz'
+	[iterm2_themes-12203d2647e5daf36a9c85b969e03f422540786ce9ea624eb4c26d204fe1f46218f3.tar.gz]='https://github.com/mbadolato/iTerm2-Color-Schemes/archive/db227d159adc265818f2e898da0f70ef8d7b580e.tar.gz'
+	[libpng-1220aa013f0c83da3fb64ea6d327f9173fa008d10e28bc9349eac3463457723b1c66.tar.gz]='https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.43.tar.gz'
+	[libxev-1220ebf88622c4d502dc59e71347e4d28c47e033f11b59aff774ae5787565c40999c.tar.gz]='https://github.com/mitchellh/libxev/archive/31eed4e337fed7b0149319e5cdbb62b848c24fbd.tar.gz'
+	[libxml2-122032442d95c3b428ae8e526017fad881e7dc78eab4d558e9a58a80bfbd65a64f7d.tar.gz]='https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.5.tar.gz'
+	[mach-glfw-12206ed982e709e565d536ce930701a8c07edfd2cfdce428683f3f2a601d37696a62.tar.gz]='https://github.com/mitchellh/mach-glfw/archive/37c2995f31abcf7e8378fba68ddcf4a3faa02de0.tar.gz'
+	[oniguruma-1220c15e72eadd0d9085a8af134904d9a0f5dfcbed5f606ad60edc60ebeccd9706bb.tar.gz]='https://github.com/kkos/oniguruma/archive/refs/tags/v6.9.9.tar.gz'
+	[pixels-12207ff340169c7d40c570b4b6a97db614fe47e0d83b5801a932dcd44917424c8806.tar.gz]='https://github.com/make-github-pseudonymous-again/pixels/archive/d843c2714d32e15b48b8d7eeb480295af537f877.tar.gz'
+	[plasma_wayland_protocols-12207e0851c12acdeee0991e893e0132fc87bb763969a585dc16ecca33e88334c566.tar.gz]='https://github.com/KDE/plasma-wayland-protocols/archive/db525e8f9da548cffa2ac77618dd0fbe7f511b86.tar.gz'
+	[sentry-1220446be831adcca918167647c06c7b825849fa3fba5f22da394667974537a9c77e.tar.gz]='https://github.com/getsentry/sentry-native/archive/refs/tags/0.7.8.tar.gz'
+	[spirv_cross-1220fb3b5586e8be67bc3feb34cbe749cf42a60d628d2953632c2f8141302748c8da.tar.gz]='https://github.com/KhronosGroup/SPIRV-Cross/archive/476f384eb7d9e48613c45179e502a15ab95b6b49.tar.gz'
+	[utfcpp-1220d4d18426ca72fc2b7e56ce47273149815501d0d2395c2a98c726b31ba931e641.tar.gz]='https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.5.tar.gz'
+	[vaxis-12200df4ebeaed45de26cb2c9f3b6f3746d8013b604e035dae658f86f586c8c91d2f.tar.gz]='https://github.com/rockorager/libvaxis/archive/6d729a2dc3b934818dffe06d2ba3ce02841ed74b.tar.gz'
+	[vaxis-1220c72c1697dd9008461ead702997a15d8a1c5810247f02e7983b9f74c6c6e4c087.tar.gz]='https://github.com/rockorager/libvaxis/archive/dc0a228a5544988d4a920cfb40be9cd28db41423.tar.gz'
+	[vulkan_headers-122004bfd4c519dadfb8e6281a42fc34fd1aa15aea654ea8a492839046f9894fa2cf.tar.gz]='https://github.com/mitchellh/vulkan-headers/archive/04c8a0389d5a0236a96312988017cd4ce27d8041.tar.gz'
+	[wayland-12202cdac858abc52413a6c6711d5026d2d3c8e13f95ca2c327eade0736298bb021f_20250228.tar.gz]='https://deps.files.ghostty.org/wayland-9cb3d7aa9dc995ffafdbdef7ab86a949d0fb0e7d.tar.gz'
+	[wayland_headers-1220b3164434d2ec9db146a40bf3a30f490590d68fa8529776a3138074f0da2c11ca.tar.gz]='https://github.com/mitchellh/wayland-headers/archive/5f991515a29f994d87b908115a2ab0b899474bd1.tar.gz'
+	[wayland_protocols-12201a57c6ce0001aa034fa80fba3e1cd2253c560a45748f4f4dd21ff23b491cddef.tar.gz]='https://deps.files.ghostty.org/wayland-protocols-258d8f88f2c8c25a830c6316f87d23ce1a0f12d9.tar.gz'
+	[wuffs-122037b39d577ec2db3fd7b2130e7b69ef6cc1807d68607a7c232c958315d381b5cd.tar.gz]='https://github.com/google/wuffs/archive/refs/tags/v0.4.0-alpha.9.tar.gz'
+	[x11_headers-122089c326186c84aa2fd034b16abc38f3ebf4862d9ae106dc1847ac44f557b36465.tar.gz]='https://github.com/mitchellh/x11-headers/archive/2ffbd62d82ff73ec929dd8de802bc95effa0ef88.tar.gz'
+	[xcode_frameworks-12202adbfecdad671d585c9a5bfcbd5cdf821726779430047742ce1bf94ad67d19cb.tar.gz]='https://github.com/mitchellh/xcode-frameworks/archive/69801c154c39d7ae6129ea1ba8fe1afe00585fc8.tar.gz'
+	[z2d-12201f0d542e7541cf492a001d4d0d0155c92f58212fbcb0d224e95edeba06b5416a.tar.gz]='https://github.com/vancluever/z2d/archive/4638bb02a9dc41cc2fb811f092811f6a951c752a.tar.gz'
+	[zf-1220edc3b8d8bedbb50555947987e5e8e2f93871ca3c8e8d4cc8f1377c15b5dd35e8.tar.gz]='https://github.com/natecraddock/zf/archive/ed99ca18b02dda052e20ba467e90b623c04690dd.tar.gz'
+	[zg-122055beff332830a391e9895c044d33b15ea21063779557024b46169fb1984c6e40.tar.gz]='https://codeberg.org/atman/zg/archive/v0.13.2.tar.gz'
+	[zig-objc-1220e17e64ef0ef561b3e4b9f3a96a2494285f2ec31c097721bf8c8677ec4415c634.tar.gz]='https://github.com/mitchellh/zig-objc/archive/9b8ba849b0f58fe207ecd6ab7c147af55b17556e.tar.gz'
+	[zig-wayland-12209ca054cb1919fa276e328967f10b253f7537c4136eb48f3332b0f7cf661cad38.tar.gz]='https://deps.files.ghostty.org/zig-wayland-fbfe3b4ac0b472a27b1f1a67405436c58cbee12d.tar.gz'
+	[zig_js-12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc.tar.gz]='https://github.com/mitchellh/zig-js/archive/d0b8b0a57c52fbc89f9d9fecba75ca29da7dd7d1.tar.gz'
+	[zigimg-1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5.tar.gz]='https://github.com/zigimg/zigimg/archive/3a667bdb3d7f0955a5a51c8468eac83210c1439e.tar.gz'
+	[ziglyph-12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25.tar.gz]='https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz'
+	[zlib-1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb.tar.gz]='https://github.com/madler/zlib/archive/refs/tags/v1.3.1.tar.gz'
+)
+
+ZIG_SLOT="0.13"
+inherit zig
+
+SRC_URI="
+	https://release.files.ghostty.org/${PV}/ghostty-${PV}.tar.gz
+	${ZBS_DEPENDENCIES_SRC_URI}
+"
+S="${WORKDIR}/${P/-terminfo/}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="symlink"
+# Tests are run on the main Ghostty package.
+RESTRICT="test"
+
+RDEPEND="
+	symlink? (
+		!>=sys-libs/ncurses-6.5_p20250118[-minimal]
+		|| (
+			<sys-libs/ncurses-6.5_p20250118
+			>=sys-libs/ncurses-6.5_p20250118[minimal]
+		)
+	)
+	!symlink? (
+		>=sys-libs/ncurses-6.5_p20250118[-minimal]
+	)
+"
+BDEPEND="sys-libs/ncurses"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-build-add-a-step-for-only-building-terminfo.patch
+)
+
+src_configure() {
+	local my_zbs_args=(
+		-Demit-terminfo=false
+		-Demit-termcap=false
+	)
+
+	zig_src_configure
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	DESTDIR="${D}" nonfatal ezig build terminfo "${ZBS_ARGS[@]}" \
+		|| die "Failed to compile terminfo database"
+
+	# Newer ncurses versions have a "ghostty" terminfo entry which
+	# collides with the "ghostty" symlink that is installed by default,
+	# but only when USE=-minimal. Remove the symlink in that case.
+	if ! use symlink; then
+		rm -rf "${ED}/usr/share/terminfo/g" || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-terms/ghostty-terminfo/
@ 2025-05-10 20:04 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-05-10 20:04 UTC (permalink / raw
  To: gentoo-commits

commit:     1dcb2a08ddd42d2fbce806566eb21d13f84097a2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 10 20:03:46 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 10 20:03:46 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dcb2a08

x11-terms/ghostty-terminfo: Stabilize 1.1.3 amd64, #951635

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.3.ebuild b/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.3.ebuild
index efab150e6397..270ec752a1ed 100644
--- a/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.3.ebuild
+++ b/x11-terms/ghostty-terminfo/ghostty-terminfo-1.1.3.ebuild
@@ -59,7 +59,7 @@ S="${WORKDIR}/${P/-terminfo/}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="symlink"
 # Tests are run on the main Ghostty package.
 RESTRICT="test"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2025-05-10 20:04 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-10 20:04 [gentoo-commits] repo/gentoo:master commit in: x11-terms/ghostty-terminfo/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2025-03-25  6:23 Sam James
2025-02-16 15:26 Sam James
2025-02-16 15:26 Sam James
2025-02-16 14:46 Sam James
2025-02-16 14:46 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox