gentoo auto-resync : 26:01:2025 - 06:49:21

6 files changed, 47 insertions, 4 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 0f6aa68d3bed..15420a386842 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 39315602a7f6..b4519c214915 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,5 +1,6 @@
 AUX sqlite-3.45.1-ppc64-ptr.patch 986 BLAKE2B 8c97514a67601c1f51459c1d4ea683e023730b3fa66be7a238807f172ce19ebceeed8f81c9f6e4f3621c96eecd8f6ea3bd5669a8a5ee5b14cf2bebdb7338e0db SHA512 12c6384682a36cddfdde7d2cfdba8aad54441b816816abf139bb05c46f65e78548c5a9e4f7f8b8836bd95702455b93ed7e0afb868ab15fead20a84404f075615
 AUX sqlite-3.47.1-buildtclext.patch 986 BLAKE2B ba43fd663a77a2a161a26f31ca3db0f4b08fae940a08b4bdfa7882a7945eef1b041f11d70cbe6754fe1bc58c533f2b5864e25a90c6d38e8f1c4f27f8cfc3bd91 SHA512 20ff9155832fc23984f91c3c7fc6ab775ab026fb4a3b7d97f00b67583702c81d714db1345a28050c1be39376d411b2faa137b25719d4d312ac42cf00c73ade47
+AUX sqlite-3.47.2-hwtime.h-Don-t-use-rdtsc-on-i486.patch 1114 BLAKE2B 00b386967c4b7051b762041f98555f078e7fe7427adc57efa7b1bd3c6cdee20e379b2d086535358014dd1bafbb97d552980620c29c4ea63047f2d3c68efa2907 SHA512 f3787a9628d73ccd8f4bad99e8d2f3c0153078c06b2864d9110b77e1aea6a22ee2db485d71aec9b94039bc5e2e4517eb194faac862b95775d70440e1857f7d4c
 DIST sqlite-doc-3460100.zip 10851427 BLAKE2B 7462e83ca84e3e9aac7236f575fd2bdddac7744ae700a63fe8fdc9d2df3157c59fd374d99a0526bd4d9f742005ee7a90f3d78057861d3c3fcba9f897630e48db SHA512 1ad7dfc938d182f69ea9367b4f5ead1d48b991626521249e8b58c9fb4c2553e348ce402de9cc81b0ad699d4c45c467de56a98ee39f9c3555c6fafff15fba41ce
 DIST sqlite-doc-3470200.zip 10957830 BLAKE2B cbc40dd440d1c5af4ad4333090a7306bd54ec43250a478b6900b8f74bd721035018ea7647f3a208d42cc0639827325be26a9412d17af7d390f4e584d4c6acf44 SHA512 48349d512b7cd9bc6f6a5da3a2b2285de159d4653667311adb0f5e6a970060db940a590c2d01b529afc1614065b22434d5b3ac4d8d0122d003d74926745ba56e
 DIST sqlite-doc-3480000.zip 11391112 BLAKE2B d28531e5d3ac7802700636a669f165cb9fa2a6077422b1ba956b6b9e29db48941489b5a3bc1c4936723e59343e00c3edc9310db9724d914a30ac9aca775dc70d SHA512 d7cad0da8598a3abcacf0e05ba4e285ad1d790691e571e431f920abf1bf27c5a416408ff60ff051b01a65662c0e60bb63b9ba73872851fe63f379e834c5a0f04
@@ -7,7 +8,7 @@ DIST sqlite-src-3460100.zip 14276926 BLAKE2B df16ea944e317df8ed64fdfab289e3699ec
 DIST sqlite-src-3470200.zip 14421983 BLAKE2B dcaea5be0099b2dad1b53403933f0037ace48b1f248040c1b5cc116ac2ad6c9b44c71b8efe3afd16bef01119b440d1a2ec9d553a22f855e0ba55793684f53d8d SHA512 a6280a02304bfae173d9e9ebf376b2d3624658f04af4d8e95d5a042e24cf0405a47c0a4023f4dbc2790716cd85e16b97fcc0a83c1534e6d554f4eb0bfb0a3ed3
 DIST sqlite-src-3480000.zip 14350897 BLAKE2B 1dafce5575cbf8eb4e7efb5c033322b887bcce38129756994da45b1d8e0cf136f337e6cb9fa3c4b5abcf1f68bff6763247bec1ad04975fc9de308e3b75fb4e54 SHA512 854832e9a5dc486a81934e36c1f1678ce50db55b8bd3c48ed2d569fb0bb7ce23d4b490c0a0f699274ff11ddf2000db4a620e064557084c54b217e7fdd836f4e1
 EBUILD sqlite-3.46.1.ebuild 12792 BLAKE2B ca98f4e22e0ba7abdf3c1c8a785e82a6f64d19f186a68d9733fbe31db879c2d3d0b1b517b3ea3f0af5c678cd9c036a8702c4f3e87f3a20c5b4342e391fd720d9 SHA512 6633db1ba661ed8948e21ffb245f59f7507669224d3b827c16d4fc5332d9b2bd62f176066afc7f59ed5104b0a5d15dc4eb8ed91ba4ab55b2afb773d6026708a0
-EBUILD sqlite-3.47.2.ebuild 12813 BLAKE2B 5a292369ad42e33ba09cc14abe677e9dbbb3be51dfe2683ed702fe87ed051080998db2d467d4e786bb0e64db37ea19bfd3fc52d29324d17870b8070a0ab715c5 SHA512 10fb5442b44a2ed0706f0dc1de11179642b467368e61de03c6d585a7e44cad323830b8281c3367b1ba2b5444fe2ba87e4674bb12145b9f025e69a3fad43619aa
-EBUILD sqlite-3.48.0.ebuild 12914 BLAKE2B e806deb5b16bb92ae678917d0c27a22ad6e74fb44899861dc72d73c997ca700e97aa6825a07179c9dd0006946f5c73aac7dcc6e0a118253e44346ab9bbf0aae2 SHA512 5f9d78a11993b20c9ae1817f8f3d49b7b7c8e897e7e0befa4b0c8dc6ecb6367d1fb9ace3f3b028b62d136fb2cf09aba826e00efd4d73b083fe5d686993d8b554
-EBUILD sqlite-9999.ebuild 12715 BLAKE2B d79519648d078c7c19312f1df796e2e681c40f2992649fa21b146a5fd16d469656fe02c2a52292a1dff66b38d9ac8061cbc468b162a4051cef56b4d4f1a462cd SHA512 fc50a53d730f618f33c600bf7886e94176404908975da1e5f893916f36c86bf0c4135ee1469026d703483339994638076f0fdc884aa7bad802be2cfaf713dc92
+EBUILD sqlite-3.47.2-r1.ebuild 12880 BLAKE2B 6686cb865c8f3b68ea03077ef146753a3ae03bbc5dbce1e2224ca514c6b55b8bca6ec1702bd42984cbb96e4f6169e726e4748a931ddcc33e4af065e89d7f4b3e SHA512 c321faed21950909eb0abc4d32f22ab74e79f90577a25a6fad3f9f9c51f47b5337056a9a209f2781d0a45119a17c802165fbf0569748334011b43597c51aca47
+EBUILD sqlite-3.48.0-r1.ebuild 12994 BLAKE2B aa78b006e7d4a5f775c7e3394d25be7c76d21d4c612f0f85dd72e7c75ff6faa57444ae86241e2ac3194ffd2649758edb9e1fe8d26fa222b6ce41d66b491498e2 SHA512 e273c85edd56ca79c2771f847978083956a9bba6bb777218de92085d3e50de7f30e2fd121e86c1d2ddc3d6402ca1838ccecce463763ed633107960179faa04ab
+EBUILD sqlite-9999.ebuild 12795 BLAKE2B 6f9a80eb912680ef1d0f3fb183d0bd5327c9d312c11ca392312568861b104556ba54e8350611c7acc758360c42e33e2a0cbe3bc44d57c4be225e2d84a7cb69c6 SHA512 375ce352d2ddd96bfde025a82e9abff16c1713d5d6a8fc0d5ef15534d281f60a586e8d963d8a57c98ee2c7369e6fd3fc5eef9513cb5fea7a038dc8aa04876105
 MISC metadata.xml 824 BLAKE2B 8ab2e8f230bf3a2b26077d90944bca7bf35ae905310205b90bf243365148488303256606c0ee7c3fb736300686466a1c2583bf103693c20063ca668fe9e52647 SHA512 ed4a89e3c2d633cb6ebf8bcbf3ca055d0d1b2ffd801ba559395f812faeaafdfedd97dae11a5a53a4c068e43026fbd4eed4cb12c8b89a7fda6dabe6f78a2e0b38
diff --git a/dev-db/sqlite/files/sqlite-3.47.2-hwtime.h-Don-t-use-rdtsc-on-i486.patch b/dev-db/sqlite/files/sqlite-3.47.2-hwtime.h-Don-t-use-rdtsc-on-i486.patch
new file mode 100644
index 000000000000..499fe2d21bd9
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.47.2-hwtime.h-Don-t-use-rdtsc-on-i486.patch
@@ -0,0 +1,33 @@
+https://sqlite.org/forum/forumpost/45f76411c1
+
+From 0f2389e42ec65fd925e1bce608f382f3b35ee0f6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 25 Jan 2025 12:10:24 +0000
+Subject: [PATCH] hwtime.h: Don't use rdtsc on i486
+
+If -DSQLITE_ENABLE_STMT_SCANSTATUS is passed, rdtsc is used for profiling
+purposes, but that's not available on i486 CPUs (e.g. Soekris 4501 / AMD Elan
+in the linked bug).
+
+Just look for i586 instead of i386. For the i386/i486 case, it's fine if we
+use the stub implementation. This feels cleaner than toggling functionality
+in the ebuild, even if it's unlikely anyone on i486 is going to use that.
+
+Thanks to amonakov who found the problem quickly and the relevant part of SQLite.
+
+Bug: https://bugs.gentoo.org/948671
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/hwtime.h
++++ b/src/hwtime.h
+@@ -24,7 +24,7 @@
+ */
+ #if !defined(__STRICT_ANSI__) && \
+     (defined(__GNUC__) || defined(_MSC_VER)) && \
+-    (defined(i386) || defined(__i386__) || defined(_M_IX86))
++    (defined(i586) || defined(__i586__) || defined(_M_IX86))
+ 
+   #if defined(__GNUC__)
+ 
+-- 
+2.48.1
+
diff --git a/dev-db/sqlite/sqlite-3.47.2.ebuild b/dev-db/sqlite/sqlite-3.47.2-r1.ebuild
index ca490c5917e3..044a48ee68f5 100644
--- a/dev-db/sqlite/sqlite-3.47.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.47.2-r1.ebuild
@@ -53,6 +53,7 @@ fi
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.45.1-ppc64-ptr.patch
 	"${FILESDIR}"/${PN}-3.47.1-buildtclext.patch
+	"${FILESDIR}"/${PN}-3.47.2-hwtime.h-Don-t-use-rdtsc-on-i486.patch
 )
 
 _fossil_fetch() {
diff --git a/dev-db/sqlite/sqlite-3.48.0.ebuild b/dev-db/sqlite/sqlite-3.48.0-r1.ebuild
index d5b15dc53f6c..ffb79ecc5f1d 100644
--- a/dev-db/sqlite/sqlite-3.48.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.48.0-r1.ebuild
@@ -49,6 +49,10 @@ else
 	BDEPEND+=" app-arch/unzip"
 fi
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.47.2-hwtime.h-Don-t-use-rdtsc-on-i486.patch
+)
+
 _fossil_fetch() {
 	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
 	local repo_id="${1}"
diff --git a/dev-db/sqlite/sqlite-9999.ebuild b/dev-db/sqlite/sqlite-9999.ebuild
index 53686a767f9b..e0fe683ea625 100644
--- a/dev-db/sqlite/sqlite-9999.ebuild
+++ b/dev-db/sqlite/sqlite-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -50,6 +50,10 @@ else
 	BDEPEND+=" app-arch/unzip"
 fi
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.47.2-hwtime.h-Don-t-use-rdtsc-on-i486.patch
+)
+
 _fossil_fetch() {
 	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
 	local repo_id="${1}"