gentoo auto-resync : 23:02:2025 - 19:24:09

4 files changed, 70 insertions, 16 deletions

diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 94ba05904fbb..86462529d3f6 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -3,6 +3,7 @@ AUX sqlite-3.47.1-buildtclext.patch 986 BLAKE2B ba43fd663a77a2a161a26f31ca3db0f4
 AUX sqlite-3.47.2-hwtime.h-Don-t-use-rdtsc-on-i486.patch 1114 BLAKE2B 00b386967c4b7051b762041f98555f078e7fe7427adc57efa7b1bd3c6cdee20e379b2d086535358014dd1bafbb97d552980620c29c4ea63047f2d3c68efa2907 SHA512 f3787a9628d73ccd8f4bad99e8d2f3c0153078c06b2864d9110b77e1aea6a22ee2db485d71aec9b94039bc5e2e4517eb194faac862b95775d70440e1857f7d4c
 AUX sqlite-3.49.0-cppflags.patch 2884 BLAKE2B 2d1cfae6c0f7654ed1acae75fe6b00eb309506e899316abe36e2a9263f01cdf09bf13870d61a61f94a30000fb35dc527cd43ad9b79f0eda08034438eb7f3c903 SHA512 14045ad50d5708e2f4c82d7ccf01e7ff5bdbae88d60e08bc2ba3f30cada317798a2eb5379bba32331a002c5365faacd6709103e9772524cacd90f89b86b77ac0
 AUX sqlite-3.49.0-icu-tests.patch 726 BLAKE2B e2b3d0ed8be80ba441e86a59372658d8da3849563dc8ae9ec2a3393450f8beed845d7fcd8b163b09b00ae75fde2252128132036fb0a1a266f752348a5363ee24 SHA512 e1deff11b81d8064f8187f7eadcf7859720789961f2c04f5aa99b1ce69aa703f6b7e030abf76276e77aafd37ac2664b42ca534d604b69ab1c62637924e9d53bd
+AUX sqlite-3.49.1-jimsh.patch 778 BLAKE2B 3042cfbb37ee54251078e9ae40fe1ebbcb63b73002a77f23934f5607b50054f14bda60dae1bac1c5e79c344e66e4a82cdee8bb032fa3cb8146a04d9079ea0dd9 SHA512 383bcc224effaa98ba25cc68d2f4dfb819fcbdc961e9f607cf7c0c4aae7c1a6f789280b5ec006c2a7000e6a7aefdb21d97ed12296f2fd0d230d40029982932d4
 DIST sqlite-doc-3460100.zip 10851427 BLAKE2B 7462e83ca84e3e9aac7236f575fd2bdddac7744ae700a63fe8fdc9d2df3157c59fd374d99a0526bd4d9f742005ee7a90f3d78057861d3c3fcba9f897630e48db SHA512 1ad7dfc938d182f69ea9367b4f5ead1d48b991626521249e8b58c9fb4c2553e348ce402de9cc81b0ad699d4c45c467de56a98ee39f9c3555c6fafff15fba41ce
 DIST sqlite-doc-3470200.zip 10957830 BLAKE2B cbc40dd440d1c5af4ad4333090a7306bd54ec43250a478b6900b8f74bd721035018ea7647f3a208d42cc0639827325be26a9412d17af7d390f4e584d4c6acf44 SHA512 48349d512b7cd9bc6f6a5da3a2b2285de159d4653667311adb0f5e6a970060db940a590c2d01b529afc1614065b22434d5b3ac4d8d0122d003d74926745ba56e
 DIST sqlite-doc-3490000.zip 11327988 BLAKE2B ecabc9b9217953874cc575ef06d93f3ef5da25d82c0837b827daca3ca1da54968d7f3f2498ec7fee22d43fb2a2bcc2077be396dfc5f6e4ee62e1493d7be20e9e SHA512 89823a426aba9db78597f99df6fe2162601d0133d7490c83c939414372c293e9f313bd2e46c5e5d4b19dd3846337f53eb788208c91a1fa7ffc768a0a5966da03
@@ -14,6 +15,6 @@ DIST sqlite-src-3490100.zip 14372402 BLAKE2B c7f6a574698512e2fde44e54ed2a101e730
 EBUILD sqlite-3.46.1.ebuild 12792 BLAKE2B ca98f4e22e0ba7abdf3c1c8a785e82a6f64d19f186a68d9733fbe31db879c2d3d0b1b517b3ea3f0af5c678cd9c036a8702c4f3e87f3a20c5b4342e391fd720d9 SHA512 6633db1ba661ed8948e21ffb245f59f7507669224d3b827c16d4fc5332d9b2bd62f176066afc7f59ed5104b0a5d15dc4eb8ed91ba4ab55b2afb773d6026708a0
 EBUILD sqlite-3.47.2-r1.ebuild 12880 BLAKE2B 6686cb865c8f3b68ea03077ef146753a3ae03bbc5dbce1e2224ca514c6b55b8bca6ec1702bd42984cbb96e4f6169e726e4748a931ddcc33e4af065e89d7f4b3e SHA512 c321faed21950909eb0abc4d32f22ab74e79f90577a25a6fad3f9f9c51f47b5337056a9a209f2781d0a45119a17c802165fbf0569748334011b43597c51aca47
 EBUILD sqlite-3.49.0.ebuild 12978 BLAKE2B 3e90f580c22cd0a99a6c9e7f69e801fe60625e04fdc1a4afbc3332e054cb05bb477c636fe0de84095bf8c11324412e7fa678d49a9dad943579229b4083960bf1 SHA512 f7d2a28eee202c3dcaff7d233ef5632ea74232ccb94bf65463582f804b4c24f0743aea339ef5cdd1601e0c47dff8c97f4b21f4ff336bb463d7190fe9e57c7b97
-EBUILD sqlite-3.49.1.ebuild 12886 BLAKE2B 9ade68413d7290e22201df29e2fa39c164bdfaa04fae0bcbda9c7c9c248f3d3c7a64b186ab30e3e1ac4cc411488e5569f2a7ec9d7bfcffbcbf5b5f20818622c2 SHA512 2f33c688c8434e835338325ba82a3292ca2ede7e9704bdd4f646ca2433dc9ae4f25fad2ff36870ac94e59b4a5fbb54af9037626a19f8a5428e790c5cd0a436a9
-EBUILD sqlite-9999.ebuild 12795 BLAKE2B 6f9a80eb912680ef1d0f3fb183d0bd5327c9d312c11ca392312568861b104556ba54e8350611c7acc758360c42e33e2a0cbe3bc44d57c4be225e2d84a7cb69c6 SHA512 375ce352d2ddd96bfde025a82e9abff16c1713d5d6a8fc0d5ef15534d281f60a586e8d963d8a57c98ee2c7369e6fd3fc5eef9513cb5fea7a038dc8aa04876105
+EBUILD sqlite-3.49.1.ebuild 13332 BLAKE2B 3947566589afa6f4904f382cadf2d9e97e6e4c7e364e08a67dea1a841a9cb01afa1412bfd2f72b919bec9456624ef0df6c0cffb5cca55b6da34511143d733b48 SHA512 9224248ceedff4b49349068b930aacaf1b1bb4a8830c0c8b45d8282cff70ae28ac6f79d6c1fe8caf9d47b1e3e11821f3b6eac03213c6cd5f8b424220cff7844d
+EBUILD sqlite-9999.ebuild 12793 BLAKE2B 175e773274cf05c37153cf3df24b1b82b2938eafd44e98c85937c496b2ede540def1a8470a47b17a28435e9a706ac9a1029f50b509b6f414fdbcd977b8176093 SHA512 2b179360b72271f610a450b689e60aa1b2a5fd0b692e13371c36edcce0f4770098ef863b811edaaf258f4b6ba6ab951cdfe4ffab46649944124c50aca896f163
 MISC metadata.xml 824 BLAKE2B 8ab2e8f230bf3a2b26077d90944bca7bf35ae905310205b90bf243365148488303256606c0ee7c3fb736300686466a1c2583bf103693c20063ca668fe9e52647 SHA512 ed4a89e3c2d633cb6ebf8bcbf3ca055d0d1b2ffd801ba559395f812faeaafdfedd97dae11a5a53a4c068e43026fbd4eed4cb12c8b89a7fda6dabe6f78a2e0b38
diff --git a/dev-db/sqlite/files/sqlite-3.49.1-jimsh.patch b/dev-db/sqlite/files/sqlite-3.49.1-jimsh.patch
new file mode 100644
index 000000000000..68203390c793
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.49.1-jimsh.patch
@@ -0,0 +1,36 @@
+# https://bugs.gentoo.org/949981
+# https://github.com/msteveb/jimtcl/commit/9b754b8033b9f2a1dc8ba1227df2e5d75185dda7
+--- a/autosetup/jimsh0.c
++++ b/autosetup/jimsh0.c
+@@ -2088,9 +2088,13 @@ enum wbuftype {
+ #define UNIX_SOCKETS 0
+ #endif
+ 
+-#ifndef MAXPATHLEN
+-#define MAXPATHLEN JIM_PATH_LEN
+-#endif
++# ifndef MAXPATHLEN
++# ifdef PATH_MAX
++# define MAXPATHLEN PATH_MAX
++# else
++# define MAXPATHLEN JIM_PATH_LEN
++# endif
++# endif
+ 
+ 
+ 
+@@ -4173,14 +4177,6 @@ int Jim_regexpInit(Jim_Interp *interp)
+ #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+ #endif
+ 
+-# ifndef MAXPATHLEN
+-# ifdef PATH_MAX
+-# define MAXPATHLEN PATH_MAX
+-# else
+-# define MAXPATHLEN JIM_PATH_LEN
+-# endif
+-# endif
+-
+ #if defined(__MINGW32__) || defined(__MSYS__) || defined(_MSC_VER)
+ #define ISWINDOWS 1
+ 
diff --git a/dev-db/sqlite/sqlite-3.49.1.ebuild b/dev-db/sqlite/sqlite-3.49.1.ebuild
index a0c2249a6802..ce81dc0b2788 100644
--- a/dev-db/sqlite/sqlite-3.49.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.49.1.ebuild
@@ -53,6 +53,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.47.2-hwtime.h-Don-t-use-rdtsc-on-i486.patch
 	# https://sqlite.org/forum/forumpost/f93323a743
 	"${FILESDIR}"/${PN}-3.49.0-icu-tests.patch
+	# https://bugs.gentoo.org/949981
+	"${FILESDIR}"/${PN}-3.49.1-jimsh.patch
 )
 
 _fossil_fetch() {
@@ -320,8 +322,10 @@ multilib_src_configure() {
 		fi
 	fi
 
-	# set SONAME for the library
-	options+=( --soname=legacy )
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		# set SONAME for the library
+		options+=( --soname=legacy )
+	fi
 
 	# https://sqlite.org/forum/forumpost/4f4d06a9f6683bb9
 	tc-export_build_env BUILD_CC
@@ -372,6 +376,15 @@ multilib_src_test() {
 multilib_src_install() {
 	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
 
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name, soname=legacy doesn't work for this (but
+		# breaks the build instead)
+		install_name_tool \
+			-id "${EPREFIX}/usr/$(get_libdir)/libsqlite3$(get_libname 0)" \
+			"${ED}/usr/$(get_libdir)/libsqlite3$(get_libname ${PV})" \
+			|| die "failed to fix install_name"
+	fi
+
 	if use tools && multilib_is_native_abi; then
 		install_tool() {
 			if [[ -f ".libs/${1}" ]]; then
diff --git a/dev-db/sqlite/sqlite-9999.ebuild b/dev-db/sqlite/sqlite-9999.ebuild
index e0fe683ea625..2b47259e17d4 100644
--- a/dev-db/sqlite/sqlite-9999.ebuild
+++ b/dev-db/sqlite/sqlite-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+inherit flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="SQL database engine"
 HOMEPAGE="https://sqlite.org/"
@@ -19,8 +19,8 @@ else
 	#printf -v DOC_PV "%u%02u%02u00" $(ver_rs 1-3 " ")
 
 	SRC_URI="
-		https://sqlite.org/2024/${PN}-src-${SRC_PV}.zip
-		doc? ( https://sqlite.org/2024/${PN}-doc-${DOC_PV}.zip )
+		https://sqlite.org/2025/${PN}-src-${SRC_PV}.zip
+		doc? ( https://sqlite.org/2025/${PN}-doc-${DOC_PV}.zip )
 	"
 	S="${WORKDIR}/${PN}-src-${SRC_PV}"
 
@@ -43,7 +43,6 @@ DEPEND="
 	${RDEPEND}
 	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )
 "
-BDEPEND=">=dev-lang/tcl-8.6:0"
 if [[ ${PV} == 9999 ]]; then
 	BDEPEND+=" dev-vcs/fossil"
 else
@@ -142,7 +141,6 @@ src_unpack() {
 src_prepare() {
 	default
 
-	eautoreconf
 	multilib_copy_sources
 }
 
@@ -196,7 +194,8 @@ multilib_src_configure() {
 	# https://sqlite.org/compile.html#enable_fts5
 	# https://sqlite.org/fts3.html
 	# https://sqlite.org/fts5.html
-	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
+	options+=( --enable-fts4 )
 	options+=( --enable-fts5 )
 
 	# Support hidden columns.
@@ -205,7 +204,7 @@ multilib_src_configure() {
 	# Support memsys5 memory allocator.
 	# https://sqlite.org/compile.html#enable_memsys5
 	# https://sqlite.org/malloc.html#memsys5
-	append-cppflags -DSQLITE_ENABLE_MEMSYS5
+	options+=( --enable-memsys5 )
 
 	# Support sqlite3_normalized_sql() function.
 	# https://sqlite.org/c3ref/expanded_sql.html
@@ -231,12 +230,12 @@ multilib_src_configure() {
 	# https://sqlite.org/compile.html#enable_geopoly
 	# https://sqlite.org/rtree.html
 	# https://sqlite.org/geopoly.html
-	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
+	options+=( --enable-rtree --enable-geopoly )
 
 	# Support Session extension.
 	# https://sqlite.org/compile.html#enable_session
 	# https://sqlite.org/sessionintro.html
-	append-cppflags -DSQLITE_ENABLE_SESSION
+	options+=( --enable-session )
 
 	# Support scan status functions.
 	# https://sqlite.org/compile.html#enable_stmt_scanstatus
@@ -280,8 +279,7 @@ multilib_src_configure() {
 	if use icu; then
 		# Support ICU extension.
 		# https://sqlite.org/compile.html#enable_icu
-		append-cppflags -DSQLITE_ENABLE_ICU
-		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		options+=( --with-icu-config )
 	fi
 
 	options+=(
@@ -320,7 +318,13 @@ multilib_src_configure() {
 		fi
 	fi
 
-	econf "${options[@]}"
+	# set SONAME for the library
+	options+=( --soname=legacy )
+
+	# https://sqlite.org/forum/forumpost/4f4d06a9f6683bb9
+	tc-export_build_env BUILD_CC
+
+	CC_FOR_BUILD=${BUILD_CC} econf "${options[@]}"
 }
 
 multilib_src_compile() {