gentoo auto-resync : 17:11:2024 - 03:03:09

4 files changed, 125 insertions, 1 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 00df49ec3fec..17435de383ee 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index a9dbf5eaba81..392b7665b1d3 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,6 +1,7 @@
 AUX sqlite-3.45.1-ppc64-ptr.patch 986 BLAKE2B 8c97514a67601c1f51459c1d4ea683e023730b3fa66be7a238807f172ce19ebceeed8f81c9f6e4f3621c96eecd8f6ea3bd5669a8a5ee5b14cf2bebdb7338e0db SHA512 12c6384682a36cddfdde7d2cfdba8aad54441b816816abf139bb05c46f65e78548c5a9e4f7f8b8836bd95702455b93ed7e0afb868ab15fead20a84404f075615
 AUX sqlite-3.45.2-tests-x86.patch 3704 BLAKE2B 107828e5cda62c2fc9f6c23efa5a5c1e3993d57fc0a129bc3ec8e24ad8c00770a72768d76b0843b2ed493f738d4fdded31a0efb46dd48bc0e9f78988e42492a8 SHA512 5a867ca23262c7144865fed8e8a088d0494d2e4716990b6ded8c26dab588163d367226f8858cfbdda87bf897bafacf1299d5828ef50c9ca6e02b026b18970965
 AUX sqlite-3.47.0-allocator-mismatch.patch 1574 BLAKE2B c9e2a590b418ad009b6434b17e9e67a8ca63e8eb785c93753786bb581d0d0e584a6d73fe35850bb9bd6ed390e5d29e1568ecbe294db99b69978f0b5d38d72878 SHA512 99313357c2f003f15e68332e81e9a78428591255e25e57bf6b597135fd0c532e58dd7d1f0d92e9b3fc51c03a8cde18557e18fcacba1df7fffcd0beeb28cb0150
+AUX sqlite-3.47.0-buildtclext.patch 4177 BLAKE2B 653cdd04aa78ce0d66e0fd30e5c0e811617875439804b7967ca550232ce80165f148c289899164600e6b02781e403bf4b29525f2f763ffa241ef13d43a48fd3f SHA512 80f01db442578d301a50f9ae989e3bbb02bcf1b2d8bd9c99a537a90871f06612f135ebee2e44df320fd7c08ab714335a291667a9c566e46e47de88718b8c45af
 AUX sqlite-3.47.0-nonbash.patch 2086 BLAKE2B d791fe6bcfb115f814608f40500a3a321b7dd519aa5396a5e55fa96bde492356174c4c440e7cde28a477057d5f56453b246a991fd7818de908ed7c671573eec0 SHA512 c5c530cd936b5656d69d87a10704465cfb0b4029850780b613fd2e34b2c046476503e8ca7aef841f9757887757498f8544e3bf1005f3c7a1b9a8056c98ab79e8
 DIST sqlite-doc-3450300.zip 10759906 BLAKE2B 3ad2307d4c5de10f20d0cb58bb673b291a63bf0328c3f1e40e37a4823fadda82e0f1fbfe7c9c76925ab1d1448e76cc4cbce4d4ad15c732f134f1b4b4caee9543 SHA512 8f865302137684c31c4f54d6cbe4ee82126394887930ec50501fb811023bc612878d2dc1c2317e960fe818a277b008a9835475e7a47822fc5ece5fe37aa61e31
 DIST sqlite-doc-3460000.zip 10842823 BLAKE2B 4b4b36d78ba540abaa39bb510465e23e39cabcce97d19e4cb1374d941183ea05e1150356d15c99dbdf5513adebe2e9b06cbc59bd268fe6ce17905523488ec682 SHA512 22748bf113ff96320c90227ba104ff081bf1761550944afbc78b6768d6677b13982d7e759c5f67eb7ba7ed0dcbffee500bc39fc9929d28f86b2a269145fefebd
@@ -13,7 +14,7 @@ DIST sqlite-src-3470000.zip 14408459 BLAKE2B c8e883410fdf9f020bc55ef01d7c2c5b7f1
 EBUILD sqlite-3.45.3.ebuild 12836 BLAKE2B 52d49dc6d44a902c3ac4ec0158c1a528889b0a76b3a2e2a72a7cc12295312e358e14b43aa4923ed72776b85a86e5bada1db2fcd6315e44d57f788202ce76c226 SHA512 e8904b4b1fd810a9823bacd431638e1ea6445aedbc1bc01e40eb8c0f6d0827ef852425d6cb2127b3e3714637451bedb87ce05c69005ac4f98e45480fa2b31b3f
 EBUILD sqlite-3.46.0.ebuild 12793 BLAKE2B 1b74ae60666a7fc1587db1e4e365d6a650b96caa9bb4f5351c6723aced9137d221f616296f672c1e7f56c0c3c0d0be49b8df2591d6c762d5344b8a29e913887f SHA512 ec4af38fdd7ed5be53d7a413c1744580fa1b990ca151e649214ed0096ba8545a9ebd14c29f9fa30e578fa4a95c299060e2b336db149d85a9fc2ac370403708d8
 EBUILD sqlite-3.46.1.ebuild 12794 BLAKE2B 51b2d071bc95c524e860bacc3341beb6a6e502368d961960c00ef21bd70b7cd214347da3565cdfdd2f23af80ffb1c62f1d27cdbc7917d6d9f230c542be122919 SHA512 30ebbaaf2531c28e3b604e29e352cadc100f23665dc7f62e4c4fba7a1a0812b216b70ca23fbe0e28a898045ed939ee0f3551a8bfa694bc3ee5b2e79106ee2956
-EBUILD sqlite-3.47.0-r1.ebuild 12867 BLAKE2B f8fd4d09264f6fead6eec1b2c12a636e6c1dbde75d8910b4002010b7d42f55a4369723206d4f9628da6e471b5b3ecf73e191230a1f6f73558398be1881e24a56 SHA512 9aec42f84876c9ab6acfbad0a6f070f5369999c10fb0e446e804f9fd921ffbf969ad2d08a9f986cfc6e1795bf5b5a22558c08a5bdb6320a7f954e55f7a5de992
+EBUILD sqlite-3.47.0-r1.ebuild 12913 BLAKE2B efef3474627c29bbafa616f192569e6091bac26d2abd4a29beaf6749c6ee4e2b6646567c465c800e08de37ba815ae5a8b096fa4bf25b159e77b6869528224070 SHA512 c6ffa3c6de1aad5592a2442908d7632fe8c53f759de539cd393eb5116bf029b170339fa0d464fa549e94f16ff9a08bdbcc3c24d2737fd32da9cc6cc1f709d0b0
 EBUILD sqlite-3.47.0.ebuild 12814 BLAKE2B 564ce70728bcec6bb601a33910f4b29feaa4404c4088bfa5022c39b8d418bb0edf0a7f6924df4c1f54af8885080a246758fb68ce5c8087e806f8e1758756f9c6 SHA512 9940914a1a3a13febae6bd698005e9fa458bb6cbdc56154c2f4593a53f8aba93d28651ad5121eb67aaf9829c58ec591adc2f6b8c1e67d44eecb3770b89431be3
 EBUILD sqlite-9999.ebuild 12715 BLAKE2B d79519648d078c7c19312f1df796e2e681c40f2992649fa21b146a5fd16d469656fe02c2a52292a1dff66b38d9ac8061cbc468b162a4051cef56b4d4f1a462cd SHA512 fc50a53d730f618f33c600bf7886e94176404908975da1e5f893916f36c86bf0c4135ee1469026d703483339994638076f0fdc884aa7bad802be2cfaf713dc92
 MISC metadata.xml 824 BLAKE2B 8ab2e8f230bf3a2b26077d90944bca7bf35ae905310205b90bf243365148488303256606c0ee7c3fb736300686466a1c2583bf103693c20063ca668fe9e52647 SHA512 ed4a89e3c2d633cb6ebf8bcbf3ca055d0d1b2ffd801ba559395f812faeaafdfedd97dae11a5a53a4c068e43026fbd4eed4cb12c8b89a7fda6dabe6f78a2e0b38
diff --git a/dev-db/sqlite/files/sqlite-3.47.0-buildtclext.patch b/dev-db/sqlite/files/sqlite-3.47.0-buildtclext.patch
new file mode 100644
index 000000000000..491674f5e993
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.47.0-buildtclext.patch
@@ -0,0 +1,122 @@
+# https://sqlite.org/forum/forumpost/0683a49cb02f31a1
+# https://bugs.gentoo.org/942918
+# Compiled from https://sqlite.org/forum/forumpost/6fd4ca69e86eafc6, https://www.sqlite.org/src/info/38136b33f9536b63 and https://www.sqlite.org/src/info/2f6e5946cf34e094
+
+--- a/tool/buildtclext.tcl
++++ b/tool/buildtclext.tcl
+@@ -140,12 +140,13 @@
+   if {[string length $OPTS]>1} {
+     append LDFLAGS $OPTS
+   }
+-  set CMD [subst $cmd]
+   if {$TCLMAJOR>8} {
+     set OUT libtcl9sqlite$VERSION.$SUFFIX
+   } else {
+     set OUT libsqlite$VERSION.$SUFFIX
+   }
++  set @ $OUT; # workaround for https://sqlite.org/forum/forumpost/6b1af7eb10884373
++  set CMD [subst $cmd]
+ }
+   
+ # Show information about prior installs
+
+From b03592c324a4d066e12c3af945dd510dc28b6d65 Mon Sep 17 00:00:00 2001
+From: stephan <stephan@noemail.net>
+Date: Sat, 16 Nov 2024 14:33:01 +0000
+Subject: [PATCH] Add DESTDIR support to the tclextension-install target, via
+ [67a3ca0c013b] and [d1663cf05f7d].
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1600,7 +1600,7 @@ tclextension:	tclsqlite3.c
+ # to find it.
+ #
+ tclextension-install:	tclsqlite3.c
+-	$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --cc "$(CC)" $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS)
++	$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --destdir "$(DESTDIR)" --cc "$(CC)" $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS)
+ 
+ # Install the SQLite TCL extension that is used by $TCLSH_CMD
+ #
++38136b33f9536b63520d3810f397a3b4b5372028b31108806f84fe44bf338425
+--- a/tool/buildtclext.tcl
++++ b/tool/buildtclext.tcl
+@@ -15,6 +15,7 @@ Options:
+    --info               Show info on existing SQLite TCL extension installs
+    --install-only       Install an extension previously build
+    --uninstall          Uninstall the extension
++   --destdir DIR        Installation root (used by "make install DESTDIR=...")
+ 
+ Other options are retained and passed through into the compiler.}
+ 
+@@ -25,6 +26,7 @@ set uninstall 0
+ set infoonly 0
+ set CC {}
+ set OPTS {}
++set DESTDIR ""; # --destdir "$(DESTDIR)"
+ for {set ii 0} {$ii<[llength $argv]} {incr ii} {
+   set a0 [lindex $argv $ii]
+   if {$a0=="--install-only"} {
+@@ -42,6 +44,9 @@ for {set ii 0} {$ii<[llength $argv]} {incr ii} {
+   } elseif {$a0=="--cc" && $ii+1<[llength $argv]} {
+     incr ii
+     set CC [lindex $argv $ii]
++  } elseif {$a0=="--destdir" && $ii+1<[llength $argv]} {
++    incr ii
++    set DESTDIR [lindex $argv $ii]
+   } elseif {[string match -* $a0]} {
+     append OPTS " $a0"
+   } else {
+@@ -245,7 +250,7 @@ package ifneeded sqlite3 $VERSION \\
+ 
+ if {$install} {
+   # Install the extension
+-  set DEST2 $DEST/sqlite$VERSION
++  set DEST2 ${DESTDIR}$DEST/sqlite$VERSION
+   file mkdir $DEST2
+   puts "installing $DEST2/pkgIndex.tcl"
+   file copy -force pkgIndex.tcl $DEST2
+
+From 375552f224813c7e2fac0e67dd13ecd6ba3a3571 Mon Sep 17 00:00:00 2001
+From: stephan <stephan@noemail.net>
+Date: Sat, 16 Nov 2024 17:12:17 +0000
+Subject: [PATCH] Handle DESTDIR at an earlier phase in buildtclext.tcl to
+ account for the is-writable-dir check and to filter out //zipfs: dirs as
+ (im)possible installation targets.
+--- a/tool/buildtclext.tcl
++++ b/tool/buildtclext.tcl
+@@ -198,7 +198,15 @@ if {$install} {
+   #
+   set DEST {}
+   foreach dir $auto_path {
+-    if {[file writable $dir]} {
++    if {[string match //*:* $dir]} {
++      # We can't install to //zipfs: paths
++      continue
++    } elseif {"" ne $DESTDIR && ![file writable $DESTDIR]} {
++      continue
++    }
++    set dir ${DESTDIR}$dir
++    if {[file writable $dir] || "" ne $DESTDIR} {
++      # the dir will be created later ^^^^^^^^
+       set DEST $dir
+       break
+     } elseif {[glob -nocomplain $dir/sqlite3*/pkgIndex.tcl]!=""} {
+@@ -216,7 +224,7 @@ if {$install} {
+     puts "to work around this problem.\n"
+     puts "These are the (unwritable) \$auto_path directories:\n"
+     foreach dir $auto_path {
+-      puts "  *  $dir"
++      puts "  *  ${DESTDIR}$dir"
+     }
+     exit 1
+   }
+@@ -250,7 +258,7 @@ package ifneeded sqlite3 $VERSION \\
+
+ if {$install} {
+   # Install the extension
+-  set DEST2 ${DESTDIR}$DEST/sqlite$VERSION
++  set DEST2 $DEST/sqlite$VERSION
+   file mkdir $DEST2
+   puts "installing $DEST2/pkgIndex.tcl"
+   file copy -force pkgIndex.tcl $DEST2
+
diff --git a/dev-db/sqlite/sqlite-3.47.0-r1.ebuild b/dev-db/sqlite/sqlite-3.47.0-r1.ebuild
index c7033bdf2661..b3dd1b416b61 100644
--- a/dev-db/sqlite/sqlite-3.47.0-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.47.0-r1.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.45.1-ppc64-ptr.patch
 	"${FILESDIR}"/${PN}-3.47.0-nonbash.patch
 	"${FILESDIR}"/${PN}-3.47.0-allocator-mismatch.patch
+	"${FILESDIR}"/${PN}-3.47.0-buildtclext.patch
 )
 
 _fossil_fetch() {