[gentoo-commits] proj/tex-overlay:main commit in: app-text/texlive-core/

["Florian Schmaus" <flow@gentoo.org>]

commit:     30ada4d41a2a485c3c86b01644a13f0e9b6fcaad
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 21:14:45 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 21:14:45 2024 +0000
URL:        https://gitweb.gentoo.org/proj/tex-overlay.git/commit/?id=30ada4d4

app-text/texlive-core: apply gentoo patches

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-text/texlive-core/Manifest                 |  2 +-
 app-text/texlive-core/texlive-core-2023.ebuild | 28 ++++++++++++++++----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index a0508fb..211d640 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -67,6 +67,7 @@ DIST findhyph.doc.r47444.tar.xz 35040 BLAKE2B c8c7bd2eec414c4289b441c047c3687072
 DIST findhyph.r47444.tar.xz 3904 BLAKE2B ed688ba5b589ecfda3c1de90f7977fb76952576534b4614ba01643335d25a7a7b2593d954515f96e65e6fffb5544aae6237b5ad1dd7b011691a0666cf516ba86 SHA512 aea6305dc0d9b31367638078a7958933468e761ef4cf47a1c44d9fd5ab2e25f7af22273c4631946a90edc9b51947c2e56b3d4b74c8c59f0a79250c2edf5bc137
 DIST fragmaster.doc.r26313.tar.xz 80316 BLAKE2B 5fe2d1f1b5b38dbf579e0ab8819103a04e885c9b43ed7e76afc4836da78f230a0a56840a0c188a6f40e06d17084108f0f7cccb8e45f5a9c32c2856d8c681a55e SHA512 61f0bd7dab46bfb91b634006217f01648007cbce3c9187b0811a5cc1755ec19654da94b47866ad9873fd57629f1561d1cc46bf3a4d62db618502aa0e67500637
 DIST fragmaster.r26313.tar.xz 6872 BLAKE2B 85cb9e3b240f22274f25bf1ff002b86ad20389d20840c197653242e8983795e4f61358b9546b302be786eeebe7359f51ae60a7b82fc06d2a5aec561d50fc7cfc SHA512 dc5d80aa4bab7a0a66258face6cf8222d03b12ea492f7cf568ef815a6d5950a8a2b36c7403ab466141f49cb8faedfbb33146820b88da17d8b8fa18a2b16235e4
+DIST gentoo-tex-patches-2.tar.bz2 16843 BLAKE2B 57f26c2c8179f4b97b87395af8a768dbf8ae38510a73fa649f09ac731343bd21261e8b1489c674e8ba1fa0384351b288382adb0fefa6dd58e39f5419460fc0c3 SHA512 d5a2e7eea4d94473f7adb599ae3e5ed87aacde8430c3f50a3a837746103658ccf50b32ebb2849ad4c80fcb1e9756823b45cd267732564ee44ac5e6f7a16d2acf
 DIST git-latexdiff.doc.r54732.tar.xz 18012 BLAKE2B f92e9a6aa1f258e89166b3b980af777fae808a4181fbfaa6258040ae2b732cc0cca054fae359d4b297964df50932e1880de285ec55f01be4321a82730128869e SHA512 bfda354f808c1f94dfac207d1526409a160b89292e44541930dac34383e3ffec9ce63d04db041ea5ac529e1e01fdc80c4c64cd43e8cdc14aac974094732d6fe8
 DIST git-latexdiff.r54732.tar.xz 8100 BLAKE2B d1acd7e6d100f59084868d2178c25bf75689646130edf87c1626c3b542d56001865c359df4d2d210a07649ea5293f05d7785e9e4ddfd81a7bc570969268ccf4d SHA512 74077b3dd1a91a734af6d668b309f804dc58a282393d88d8d5d74a5e6fc73c197e49b462369f829cc7151e20aaf8085c0587428ed61ce7957a1ef173d92c5481
 DIST gsftopk.doc.r52851.tar.xz 27540 BLAKE2B c6f3e6f01bf63616a66318fc652ae0e7cf08ac0e94eb9d31ec98058da77215fc8c84be7e885960eea70ff82d72533c5011a96136758f0159b7c17430aa835fc6 SHA512 0a597e2908438fc00fc2bafa7ec635a82b70aad9d7f7e86851a654c0b72b719b8c550be0c20ecf6c8d96627863a48e6a387156ad2c7e71d1e296dd4937d60805
@@ -176,7 +177,6 @@ DIST texdoctk.doc.r62186.tar.xz 30728 BLAKE2B 4878654c60e2fb3a1415f492894a3d956d
 DIST texdoctk.r62186.tar.xz 26712 BLAKE2B 4076b8b227dc08762cd7880165fd4b1780f3ed34e0ba68b1b04ce542efd47aefc3f893d71da7dbc8122ebb45107480974da0631f16f849d2990a14cd2db74ce6 SHA512 f3300a088f5ecedfe66ca277f793d3565b5b0f111721a0d73a788d65b72f09d0103a11edda13679fb9e919f11ce9ed3662717c18e46be99a83b744a1f7ec88fe
 DIST texfot.doc.r68110.tar.xz 35164 BLAKE2B 47f10b3bb639330c3517392ed19469fb36280bffd786792cc6c4b608c92c61a091b1c6143f707d4be09d46aa4dda48f928cc4cf1811ebbc487ca7e5eb677b58a SHA512 d652523552ad401598c68227b3e0e11c84261a3a243afc731f54892fc971c8f22e74bb58b6eb45ac15f70c8789e5a4a9c4dfca81a3dc304762ab97c8bc74e3c4
 DIST texfot.r68110.tar.xz 6936 BLAKE2B 1104fc5319d2dd5b71eee5f8e6e0a79edc4ad40215253591828b3fcc36cda0c7e538eb1751bc790994332b882af8e5618b0d908a6bb079e04370a3be2a296156 SHA512 0886ab706ce0f18b0eab304afa1d570fd55b57bc02c8b3b1aacde77c73ee260f688bd395b2e362cb998cc1aa9a2d1e228b118f5234eb9c40ce867a97d86f4ac9
-DIST texlive-2023-drop-luazlib-version-check.patch 1622 BLAKE2B 657d2cf7a8082bf295a4f0b8f7d1f6db9284b2b937527b4550dbe440a5d7c53524cd0c81d16d0939c832e5f49f3ec2fdeb10b90333787b8c0b65c5a5846adcb7 SHA512 a81aea3127881f8b57dcbaece0f1b8a5afc2d20781d1e28f44695348ae4444bfa6cd8963f26d929bfdd77833f3732ca3785348cd42d8ea20d37458b3ddb1273b
 DIST texlive-20230311-source.tar.xz 68359984 BLAKE2B 6263e8d3e066db96f071138f2442b1ed7e1f3db7e6d261cdeb9a7e6e636c6e6ed45305c6bda3ab6f9a439c92eabf32a79bf6e371d16b747eebbc05ee47b85035 SHA512 93ac43f3055fee0103a6cfceea18d39ece63984914f3af9ad76da218f2d568852d9b987d1c9647c1497b985e4ffa297ef97dc2d50d3e90f62b03ad685af31d96
 DIST texlive-scripts-extra.doc.r62517.tar.xz 197196 BLAKE2B 80d2fd7b53ffbe21f975156cf0d5f52826faebc422d3e66c342c8237d7da27ba58b1ffc56f83a040ae4b4e870c8063c0d53392f9cc7e3bb3da30ebe5a258a40a SHA512 22cf59bf4dafc7ad9425086bc0aaedb2bf5f7d8aa6ea9c65abde2d523be37665b9c9bee4acb399857eae03613e7241ca1d6099f43cab77a95c10eced8813ad80
 DIST texlive-scripts-extra.r62517.tar.xz 23540 BLAKE2B 85762b7a74f5132ec550033e08caef5f6fd145ef367475a1b3ebaccfefdcfb426f2e12e647e45a35daa2a44cf0c2fba8d6ed8afec88ed6fccee0cf7eb52c2c50 SHA512 46ac37826d3c60de6c9260bf83d6275d49a35cbde88fb03481a050f92e87b698e9a94b2e520a74edc0417419f5a2dee53000a529b9c81ea6f6244a83480e56e7

diff --git a/app-text/texlive-core/texlive-core-2023.ebuild b/app-text/texlive-core/texlive-core-2023.ebuild
index 7147ea9..f272a7e 100644
--- a/app-text/texlive-core/texlive-core-2023.ebuild
+++ b/app-text/texlive-core/texlive-core-2023.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,10 +15,12 @@ SLOT="0"
 LICENSE="Apache-2.0 Artistic BSD BSD-2 FDL-1.3 GPL-1 GPL-2 GPL-3 GPL-3+ LGPL-3 LPPL-1.0 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT TeX TeX-other-free public-domain"
 RESTRICT="mirror"
 
+GENTOO_TEX_PATCHES_NUM=2
+
 SRC_URI="
 	mirror://ctan/systems/texlive/Source/${MY_P}.tar.xz
-	https://github.com/Flowdalic/texlive-source/commit/8be4094fa5dfcfbeace5d16a481ae97fdf816727.patch
-		-> texlive-2023-drop-luazlib-version-check.patch
+	https://gitweb.gentoo.org/proj/tex-patches.git/snapshot/tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2
+		-> gentoo-tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2
 "
 
 # We ship binextra collection alongside
@@ -411,14 +413,18 @@ src_prepare() {
 		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,$(pkg-config kpathsea --variable=includedir)\"," \
 		texk/web2c/configure || die
 
-	# eapply "${WORKDIR}"/patches
-	# eapply "${FILESDIR}"/${P}-cairo-strings.patch
-	# eapply "${FILESDIR}"/${P}-slibtool.patch
-	# eapply "${FILESDIR}"/${P}-clang-16.patch
-	# eapply "${WORKDIR}"/${P}-CVE-2023-32700.patch
-
-	# https://github.com/TeX-Live/texlive-source/pull/62
-	eapply "${DISTDIR}/texlive-2023-drop-luazlib-version-check.patch"
+	local patch_dir="${WORKDIR}/tex-patches-${GENTOO_TEX_PATCHES_NUM}"
+	local drop_patches=(
+		texlive-2021-unbundle-linked_scripts.patch
+		texlive-core-2021-CVE-2023-32700.patch
+		texlive-core-2021-clang-16.patch
+		texlive-core-2021-slibtool.patch
+	)
+	local patch
+	for patch in ${drop_patches[@]}; do
+		rm "${patch_dir}/${patch}" || die "Could not remove ${patch}"
+	done
+	eapply "${patch_dir}"
 
 	default