From 1d907d86dc2d853f100fd3766adcd7b2ca13ff60 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Fri, 12 Dec 2025 16:22:02 +0100
Subject: [PATCH] app-text/typst: add 0.14.2, drop 0.14.1

Signed-off-by: odrling <florianbadie@odrling.xyz>
---
 app-text/typst/Manifest                       |  4 +-
 ...ypst-0.14.1.ebuild => typst-0.14.2.ebuild} | 51 +++++++++++++------
 2 files changed, 37 insertions(+), 18 deletions(-)
 rename app-text/typst/{typst-0.14.1.ebuild => typst-0.14.2.ebuild} (52%)

diff --git a/app-text/typst/Manifest b/app-text/typst/Manifest
index 7bdb4ddb8a..5d999544e7 100644
--- a/app-text/typst/Manifest
+++ b/app-text/typst/Manifest
@@ -1,2 +1,2 @@
-DIST typst-0.14.1-vendor.tar.xz 65119692 BLAKE2B 162b0880889d78709252042638c1544aab29f8a1f389cbdcf037344e02929aaa1b17e6ff6b528940587701e73a27dd5d81f16ce1bc9e23e6a626be1be94a7df3 SHA512 7885282f6f6572b9984eb016f79ead378f019ff1f9605be93ea140a917255ac8e2a685848f1872599fe55f5a56f2321ddfec52027aeaac37c8efea698cd597ed
-DIST typst-0.14.1.tar.gz 4122919 BLAKE2B a19a0df2416ff839199374f994fe9a7640fecc9a37d17c9824de106005a7eb199249dbf12eaa0037a87c602759bacffe06d5019423bfffc54474fd0b39afbd7a SHA512 d02dda0e65070dd63a5f3d11c3c61384d551c66a4e74631e6b0214a225fb11c3ad423071d26e9f76d5aede23500ca01a12b89bbf905fde5ebfcd19d433d977c8
+DIST typst-0.14.2-vendor.tar.xz 65124992 BLAKE2B ec2a14a735cc25b669c4553d9a64b02e0329c9f1365a4b0d79334d2b7de89b4f283c8b4833415cbb2475cca7936fe6d3de6c4b2b9d0fa232d12d61079e6e40c3 SHA512 e9e390ee4a8c72164f77046c0588623f8c35912d7d0d9d2e6f6fcd0cf6e885263eebcdfae1102d9825d46d876f5daf42b57c9b33d342c30233a8772fb12492c6
+DIST typst-0.14.2.tar.gz 4124613 BLAKE2B 676de25da5e9cc397358b552883abd2b522bf17052fc27e5da34244483cf64869ac9ce2ece4fc8110a816104c9ffb4b41223eff7a0e99e45d9065a07f04f55bf SHA512 008d02323c4dc5164f60543d2631d377c66cf55bf699497c82552b511edecd2060b741f328cb4ede4861e23dab4756e94f94a685354e1d1c77a3a0cd0bd20bd7
diff --git a/app-text/typst/typst-0.14.1.ebuild b/app-text/typst/typst-0.14.2.ebuild
similarity index 52%
rename from app-text/typst/typst-0.14.1.ebuild
rename to app-text/typst/typst-0.14.2.ebuild
index 9fddd35fbe..7f3bd38735 100644
--- a/app-text/typst/typst-0.14.1.ebuild
+++ b/app-text/typst/typst-0.14.2.ebuild
@@ -1,23 +1,25 @@
 # Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Autogenerated by pycargoebuild 0.13.2
-
 EAPI=8
 
-RUST_MIN_VER="1.88"
-
-CRATES="
-"
+RUST_MIN_VER="1.89"
 
 inherit cargo shell-completion
 
 DESCRIPTION="A markup-based typesetting system for the sciences"
 HOMEPAGE="https://typst.app"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}/${P}.tar.gz
-	https://github.com/odrling/typst/releases/download/v${PV}/typst-vendor.tar.xz -> ${P}-vendor.tar.xz
-"
+
+if [ ${PV} == 9999 ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/typst/typst.git"
+else
+	SRC_URI="
+		https://github.com/${PN}/${PN}/archive/v${PV}/${P}.tar.gz
+		https://github.com/odrling/typst/releases/download/v${PV}/typst-vendor.tar.xz -> ${P}-vendor.tar.xz
+	"
+	KEYWORDS="~amd64 ~arm64"
+fi
 
 LICENSE="Apache-2.0"
 # Dependent crate licenses
@@ -26,29 +28,46 @@ LICENSE+="
 	Unicode-3.0 ZLIB
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2o-r6:0=
 "
 DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-vcs/git
+"
 
 QA_FLAGS_IGNORED="usr/bin/typst"
 
 DOCS=( README.md )
 
-ECARGO_VENDOR="${WORKDIR}/vendor"
+if [ ${PV} != 9999 ]; then
+	ECARGO_VENDOR="${WORKDIR}/vendor"
+fi
+
+src_unpack() {
+	if [ ${PV} == 9999 ]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
 
 src_prepare() {
-	# to ignore git repo for typst-dev-assets
-	sed -i 's/^typst-dev-assets.*$/typst-dev-assets = "*"/' Cargo.toml || die
+	if [ ${PV} != 9999 ]; then
+		# ignore git repo for typst-dev-assets when using a vendor tarball
+		sed -i 's/^typst-dev-assets.*$/typst-dev-assets = "*"/' Cargo.toml || die
+	fi
 
 	default
 }
 
 src_compile() {
-	local GIT_HASH=$(gunzip < "${DISTDIR}/${P}.tar.gz" | git get-tar-commit-id)
-	export TYPST_VERSION="${PV} (${GIT_HASH::8})"
+	if [ ${PV} != 9999 ]; then
+		local GIT_HASH=$(gunzip < "${DISTDIR}/${P}.tar.gz" | git get-tar-commit-id)
+		export TYPST_VERSION="${PV} (${GIT_HASH::8})"
+	fi
 	export GEN_ARTIFACTS="artifacts/"
 
 	cargo_src_compile