gentoo auto-resync : 16:03:2024 - 12:48:37

3 files changed, 51 insertions, 2 deletions

diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index 46b8603dca52..44cba91079ae 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -1,4 +1,5 @@
 AUX kpathsea-6.3.3_p20210325-Fix-Wimplicit-function-declaration.patch 1340 BLAKE2B 51267e47bf043ab2b63b886d7659b4af672ae7d6f22795073bc14a3e11a3f808373d3e798d970585d1f0ba89ccda008ed8233dab8d1d36e81afe9f9dda7df8ff SHA512 49e2b1790fa1837477a3f9a6ddaa2ffc842bd3180769b058e683b1d387dc8755bc74be923414204e5b0c3feb350b0aafeaf29129fed2d212f239c57861b5db07
+AUX kpathsea-6.3.3_p20210325-Fix-slibtool-test.patch 1632 BLAKE2B 35b10624e0951e4740a72fd0abb82877e7005fef7a182ded6bf0f8fd1d9a0dc6de293b66d6a2441264b9e8576a9c3edc5b41af8b2b0bb145d688be0fb117794a SHA512 21bd701c808b0e47699cf7ca2939d4791c8b58b5c7f7dc43deb196743a16f9e898fbb1509a0bc8707263bc4443b09808d543dc19198d09d0411674132fcbf06f
 AUX kpathsea.conf 36 BLAKE2B 5f3ea92946c78a2a4aa336aa38783cf894859e368ec2437facdb9a814ba258097831166df15afc412d6df3fd6639fbca8f2c2f33efa5d69fde75090a9fc7dd3b SHA512 4221eda451499869a3b9b6b5c07e6866df963368481c7169645e0923f674ce6aa7bd9411303bb087fe55d99eea8b187b2a978c9f9ba0e40802f1863268566e28
 AUX texmf-update-r2 6017 BLAKE2B b9ded4693768342c6fe9a0d99b6836e74b3d8b9a5bb3d335d8ecbbe5c2a45967ac880ebfc2476c04e461ca2dac3eb02ee6c41ee34a050ba94b54d9d731853ee0 SHA512 924c6a53d778b1a05252830d914c92f8d1a8d1c479cd8a065b861bf1f263d6bb529c42c365134fea19ea1d9bedf68a943d609cd89abf73912f90bbc3397fb14f
 DIST kpathsea-texmf.d-11.tar.xz 12616 BLAKE2B f64dcaae859d6c95d534907f69519428973fad5b7a734eec269b3cc89fc2ae527a459b4ae4d966a3394d6a95f40fac16841f59f9f6cabf2a07dcdcb98a14cba9 SHA512 eec72ecc35edd47bd9a5762f0d06212e4625eea1ee2ffc36f93885b548ca6c4e0eb65345a1ec050f3f838aed5128bb32eda509b5aadbad6643469b4955441f22
@@ -8,6 +9,6 @@ DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90
 DIST texlive-20230311-source.tar.xz 68359984 BLAKE2B 6263e8d3e066db96f071138f2442b1ed7e1f3db7e6d261cdeb9a7e6e636c6e6ed45305c6bda3ab6f9a439c92eabf32a79bf6e371d16b747eebbc05ee47b85035 SHA512 93ac43f3055fee0103a6cfceea18d39ece63984914f3af9ad76da218f2d568852d9b987d1c9647c1497b985e4ffa297ef97dc2d50d3e90f62b03ad685af31d96
 DIST tl-kpathsea-2021.tar.xz 32308 BLAKE2B 83052cefc5699d46ce104e4379d39eee8e86b514d25245a6104fc9940accf131790ae144ca11dbd3b99a31a06017495bb5a53afb1e49da71a2c9eec008200653 SHA512 398358b84ecb81fece969fbd3521b093f7e791feec828c218e6371c26d57956491328999517a65711d45dfb04c83fd643ef0fad6a0153590866eddf485d5c575
 DIST tl-kpathsea.doc-2021.tar.xz 1066608 BLAKE2B 798ccf9953e4fa2037f81b56dfa30cf99c56c17e2942d5a0f2041b871958284f05150e5d7631b542896190f178327f009130e6bb07f60e8173ec1e9f12c4cda9 SHA512 8ecccee7ad99220f91139dcd9c2ce0bd19eb0e2fe74f0a965f68e59a28bd3de454624d6e014ef2a5c481a537acb95b08a9546a79abd8df429300043ecf973545
-EBUILD kpathsea-6.3.3_p20210325-r1.ebuild 3341 BLAKE2B 4cf711dadfb282f471461a12175050c68c43d16f8d83326bcbbbdb56c0533de0bf52f09f743fdbaaabcb7b3390e0a98d46741d092c3ea73793c5ba4b0ee2769e SHA512 405819c64b3eeb97a70d849856b915c272fcf71f0da9bdb703c73ce96ffeb44921ea1301bd878a6ecf1f9bdf8e9314e722a72111aa22f0848e42dd1e96b067ce
+EBUILD kpathsea-6.3.3_p20210325-r1.ebuild 3410 BLAKE2B 3f1a4f7a693f4c6267a8c0a44f85fbd1ec7d22a9f323392df71b1ef5c3b37a3811b7e7a8c5e868b5f94a59de2c14d6ecd6b29e35121ef2526104fbd4f77266bd SHA512 4f7fe45a15dcfe197d73cb8ee69b2c57e357f51d4aed475a7db0db445799933109bf5201180879e3daacc5b557f1a73afc33c29523d546bacab140e43dd87d21
 EBUILD kpathsea-6.3.5_p20230311.ebuild 3231 BLAKE2B 4cb9a3c1c0462fe513144ef32ca07f7778a96d8cf267133096298c4d9aab65db4a67c11ada6ac87ca73c999be470cb1e87ffbb109d24f5c1ab364d849195da69 SHA512 5f452a4d6bc5d3d8ab364125450bb50ad6e60a3891b92866c9a83301637642b4f640155f70f78ea13a84f0153061de9e9a9c0fda09915d0eb0081dbee51567b7
 MISC metadata.xml 448 BLAKE2B b21dc893e893d1436adc5c3b486139cbf75bd1dd49318b2d552692705a1398d5bcb5e9d7c8a7757abee8b995a127d56702d497d263cc8d0dd2bb2a1c7b8443c5 SHA512 de08adc50b3edccebe1b625acedca999aa7c9aa4b117aacb7d40e4e7e8d7952b4e1d684f0124127a19cb008022c9effce1cd5f38f0bd216258fac8c32c220dd5
diff --git a/dev-libs/kpathsea/files/kpathsea-6.3.3_p20210325-Fix-slibtool-test.patch b/dev-libs/kpathsea/files/kpathsea-6.3.3_p20210325-Fix-slibtool-test.patch
new file mode 100644
index 000000000000..39a7fafb6fda
--- /dev/null
+++ b/dev-libs/kpathsea/files/kpathsea-6.3.3_p20210325-Fix-slibtool-test.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/924405
+https://github.com/TeX-Live/texlive-source/pull/65
+https://github.com/TeX-Live/texlive-source/commit/9c4aec9b1b85f3f0e336914d65d55ca6263c5526
+
+From 9c4aec9b1b85f3f0e336914d65d55ca6263c5526 Mon Sep 17 00:00:00 2001
+From: Karl Berry <karl@freefriends.org>
+Date: Thu, 22 Feb 2024 23:41:54 +0000
+Subject: [PATCH] make kpsereadlink.test generic, instead of depending on
+ libtool
+
+git-svn-id: svn://tug.org/texlive/trunk/Build/source@70081 c570f23f-e606-0410-a88d-b1316a301751
+---
+ texk/kpathsea/tests/kpsereadlink.test | 17 +++++++++++++----
+ 1 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/tests/kpsereadlink.test b/tests/kpsereadlink.test
+index 3b3570aa8d..2e1a852494 100755
+--- a/tests/kpsereadlink.test
++++ b/tests/kpsereadlink.test
+@@ -1,14 +1,23 @@
+ #! /bin/sh -vx
+ # $Id$
+-# Copyright 2017 Karl Berry <tex-live@tug.org>
++# Copyright 2017-2024 Karl Berry <tex-live@tug.org>
+ # Copyright 2010 Peter Breitenlohner <tex-live@tug.org>
+ # You may freely use, modify and/or distribute this file.
+ 
++test -n "$LN_S" || LN_S="ln -s" # standalone testing
++
+ test "x$LN_S" = 'xln -s' || exit 77
+ 
+-./kpsereadlink $LT_OBJDIR/libkpathsea.lai && exit 1
++rm -f readlink_test_file readlink_test_symlink
++
++touch readlink_test_file
++
++$LN_S readlink_test_file readlink_test_symlink || exit 1
++
++./kpsereadlink readlink_test_file && exit 1
+ 
+-link=`./kpsereadlink $LT_OBJDIR/libkpathsea.la` || exit 1
++link=`./kpsereadlink readlink_test_symlink` || exit 1
+ 
+-test "x$link" = x../libkpathsea.la || exit 1
++test "x$link" = xreadlink_test_file || exit 1
+ 
++rm -f readlink_test_file readlink_test_symlink
diff --git a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325-r1.ebuild b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325-r1.ebuild
index e848216c3fca..5109ca86e025 100644
--- a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325-r1.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325-r1.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=7
@@ -37,6 +37,7 @@ TEXMF_PATH=/usr/share/texmf-dist
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.3.3_p20210325-Fix-Wimplicit-function-declaration.patch
+	"${FILESDIR}"/${PN}-6.3.3_p20210325-Fix-slibtool-test.patch #924405
 )
 
 src_prepare() {