6 files changed, 50 insertions, 527 deletions
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 86462529d3f6..b87233f0c4b1 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,20 +1,16 @@
 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
-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
+AUX sqlite-3.49.1-jimsh.patch 1596 BLAKE2B 3ffa24a9b2a03c8716a1b3d04172d086beb501b156188ae2b9d7afb191027df9f741d2f80249e5905d60a16f9159cc68ee7c0b3d94e75f69121e9bdab3035dbf SHA512 193e122ff6ba00749248a3846355191d2d3c92a83b6acae1aa5ddcacef1ad499d72001a5c6de715fd50c956e94e00648da39e1681575100d3bf7cc8aac51bc71
 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
 DIST sqlite-doc-3490100.zip 11333315 BLAKE2B 28fe302820898861e404f5c6dd1c05c3ff3ff10a8b713604f0ccec6b21ca7b82d61ba720903d7e9d8e9ec5de701900c5972037c23627ddd1a2734e95a92c5d6a SHA512 0eb6af0483bca7f6efd6baf00210adcca1d23ea5b474728aa96614a93a868ec6f9257d9b5f29c452fed5323c64fc180ee3845695ddbbcd7836dac69aecdfc833
 DIST sqlite-src-3460100.zip 14276926 BLAKE2B df16ea944e317df8ed64fdfab289e3699ec71725ce55e2b30450adaeb41c061b4fba1eb8c41ba638b0edcd12b23264a1f9e413b69fd593c2b65fb1037d3fc8b2 SHA512 6d32a0db9f95d3cec34f02f3fd45b453bf7c422d4d4d9570790f641e7d190b8b31be8e8715afacc1b6e4417f15a4d15a0b28e608ae0b4b5f3054b075783b916e
 DIST sqlite-src-3470200.zip 14421983 BLAKE2B dcaea5be0099b2dad1b53403933f0037ace48b1f248040c1b5cc116ac2ad6c9b44c71b8efe3afd16bef01119b440d1a2ec9d553a22f855e0ba55793684f53d8d SHA512 a6280a02304bfae173d9e9ebf376b2d3624658f04af4d8e95d5a042e24cf0405a47c0a4023f4dbc2790716cd85e16b97fcc0a83c1534e6d554f4eb0bfb0a3ed3
-DIST sqlite-src-3490000.zip 14371111 BLAKE2B 895d8869b3bc0abeb5faf8cdd0de29e0d86f44fa6eafb154e0df4373161fe79c5e35d360100064778f0a3f57a232e15dc8ec73ef5e75d23a4c8ffc880d2c571d SHA512 a414c544ca4288ab475c449327b3e2136e9d01145fc8b9c723ccfd30e356cc90411ca74ae969f3fe4c8212cad4d0969b2f3a72922ee073049c25e4984336eb7c
 DIST sqlite-src-3490100.zip 14372402 BLAKE2B c7f6a574698512e2fde44e54ed2a101e7307821b0015287bbf5ab151f5f59432fe051fda1d1caec865928717f51c42f1161187fb768180088574ca225cd29250 SHA512 24c81cee52e5655f4e9d6496a366e4787352b5108ea27eb5ce3dc07ef3e1975205bb250584b0758fb2832add84ca922b09a4d925e0dc2f55dd3613a58b414ec3
 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 13332 BLAKE2B 3947566589afa6f4904f382cadf2d9e97e6e4c7e364e08a67dea1a841a9cb01afa1412bfd2f72b919bec9456624ef0df6c0cffb5cca55b6da34511143d733b48 SHA512 9224248ceedff4b49349068b930aacaf1b1bb4a8830c0c8b45d8282cff70ae28ac6f79d6c1fe8caf9d47b1e3e11821f3b6eac03213c6cd5f8b424220cff7844d
-EBUILD sqlite-9999.ebuild 12793 BLAKE2B 175e773274cf05c37153cf3df24b1b82b2938eafd44e98c85937c496b2ede540def1a8470a47b17a28435e9a706ac9a1029f50b509b6f414fdbcd977b8176093 SHA512 2b179360b72271f610a450b689e60aa1b2a5fd0b692e13371c36edcce0f4770098ef863b811edaaf258f4b6ba6ab951cdfe4ffab46649944124c50aca896f163
+EBUILD sqlite-3.49.1.ebuild 13392 BLAKE2B 63918d3002e2b7f0164d4b5b4fd00dc494e6a7223db10e4a3988d84d078ef30a7fdeb9853279ba966b6ffc1186162583bc562c76f0ee65c36c13fb548647fda1 SHA512 486fb8db9c2819f5397c1af87d7effce3e971090696c40cfe5bafe2f5d2ae91c0039a5aa23762b768774302349a5c6844e6bf9803b9804ab819d88e4af65d407
+EBUILD sqlite-9999.ebuild 13174 BLAKE2B cf92b79267ae4c47bbd304ff79504e67fa0d491501ff08c190f04f82468d5c603ff5deda62bc7aecfab4bbfd5d53a97708ff26795afec1d4d396aacdf46f46c3 SHA512 137e54dce69f73260b1ad63c18715dc63c427641027be00dc34962602f8c992360de9adc5b170e7cd754ec0a6278afba0ec15ab706c2a1914fdcc4756ed161ae
 MISC metadata.xml 824 BLAKE2B 8ab2e8f230bf3a2b26077d90944bca7bf35ae905310205b90bf243365148488303256606c0ee7c3fb736300686466a1c2583bf103693c20063ca668fe9e52647 SHA512 ed4a89e3c2d633cb6ebf8bcbf3ca055d0d1b2ffd801ba559395f812faeaafdfedd97dae11a5a53a4c068e43026fbd4eed4cb12c8b89a7fda6dabe6f78a2e0b38
diff --git a/dev-db/sqlite/files/sqlite-3.49.0-cppflags.patch b/dev-db/sqlite/files/sqlite-3.49.0-cppflags.patch
deleted file mode 100644
index 13c6eafc390f..000000000000
--- a/dev-db/sqlite/files/sqlite-3.49.0-cppflags.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 3e06f2d79b15754999892a4ded6a7585520294a6 Mon Sep 17 00:00:00 2001
-From: stephan <stephan@noemail.net>
-Date: Sun, 9 Feb 2025 01:25:00 +0000
-Subject: [PATCH] configure: when transfering ENABLE/OMIT flags from CFLAGS to
- OPT_FEATURE_FLAGS, also do the same for CPPFLAGS and remove those ENABLE/OMIT
- flags from CFLAGS/CPPFLAGS to mimic legacy build behavior. Strip ENABLE/OMIT
- flags from BUILD_CFLAGS but do not transfer those to OPT_FEATURE_FLAGS, also
- to mimic legacy behavior. This is the second part of a fix discussed at
- [forum:9801e54665afd728|forum post 9801e54665afd728].
-
-FossilOrigin-Name: 16d307cc6c1e203900e7a2dc0730fc0e453946622a2114a07d64ebb99045cfbf
----
- autosetup/sqlite-config.tcl | 36 ++++++++++++++++++++++++++++++------
- manifest                    | 14 +++++++-------
- manifest.uuid               |  2 +-
- 3 files changed, 38 insertions(+), 14 deletions(-)
-
-diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
-index cabb32aac0..2a73548662 100644
---- a/autosetup/sqlite-config.tcl
-+++ b/autosetup/sqlite-config.tcl
-@@ -230,23 +230,47 @@ proc sqlite-setup-default-cflags {} {
-   # BUILD_CFLAGS is the CFLAGS for CC_FOR_BUILD.
-   define BUILD_CFLAGS [proj-get-env BUILD_CFLAGS {-g}]
- 
--  # Copy all CFLAGS entries matching -DSQLITE_OMIT* and
-+  # Copy all CFLAGS and CPPFLAGS entries matching -DSQLITE_OMIT* and
-   # -DSQLITE_ENABLE* to OPT_FEATURE_FLAGS. This behavior is derived
-   # from the legacy build and was missing the 3.48.0 release (the
-   # initial Autosetup port).
-   # https://sqlite.org/forum/forumpost/9801e54665afd728
-   #
-+  # Handling of CPPFLAGS, as well as removing ENABLE/OMIT from
-+  # CFLAGS/CPPFLAGS, was missing in the 3.49.0 release as well.
-+  #
-   # If any configure flags for features are in conflict with
--  # CFLAGS-specified feature flags, all bets are off.  There are no
--  # guarantees about which one will take precedence.
--  foreach cf [get-define CFLAGS ""] {
-+  # CFLAGS/CPPFLAGS-specified feature flags, all bets are off.  There
-+  # are no guarantees about which one will take precedence.
-+  foreach flagDef {CFLAGS CPPFLAGS} {
-+    set tmp ""
-+    foreach cf [get-define $flagDef ""] {
-+      switch -glob -- $cf {
-+        -DSQLITE_OMIT* -
-+        -DSQLITE_ENABLE* {
-+          sqlite-add-feature-flag $cf
-+        }
-+        default {
-+          lappend tmp $cf
-+        }
-+      }
-+    }
-+    define $flagDef $tmp
-+  }
-+
-+  # Strip all SQLITE_ENABLE/OMIT flags from BUILD_CFLAGS,
-+  # for compatibility with the legacy build.
-+  set tmp ""
-+  foreach cf [get-define BUILD_CFLAGS ""] {
-     switch -glob -- $cf {
-       -DSQLITE_OMIT* -
--      -DSQLITE_ENABLE* {
--        sqlite-add-feature-flag $cf
-+      -DSQLITE_ENABLE* {}
-+      default {
-+        lappend tmp $cf
-       }
-     }
-   }
-+  define BUILD_CFLAGS $tmp
- }
- 
- ########################################################################
diff --git a/dev-db/sqlite/files/sqlite-3.49.1-jimsh.patch b/dev-db/sqlite/files/sqlite-3.49.1-jimsh.patch
index 68203390c793..8f7f082a6d88 100644
--- a/dev-db/sqlite/files/sqlite-3.49.1-jimsh.patch
+++ b/dev-db/sqlite/files/sqlite-3.49.1-jimsh.patch
@@ -1,14 +1,27 @@
 # https://bugs.gentoo.org/949981
-# https://github.com/msteveb/jimtcl/commit/9b754b8033b9f2a1dc8ba1227df2e5d75185dda7
+# https://www2.sqlite.org/src/info/ffd05de8a3b7cab1
+From 09591b78ae28c6bb385ae96fef44edfb52454830 Mon Sep 17 00:00:00 2001
+From: stephan <stephan@noemail.net>
+Date: Mon, 24 Feb 2025 04:47:34 +0000
+Subject: [PATCH] Update jimsh0.c from upstream autosetup to address
+ [https://github.com/msteveb/autosetup/issues/75|autosetup ticket #75],
+ triggered by this build in the Gentoo project.
+
+FossilOrigin-Name: ffd05de8a3b7cab1b8e91b99da74b43ec5a7b91c78dcfd7cf338b66126e30a56
+---
+ autosetup/jimsh0.c | 20 ++++++++------------
+ manifest           | 12 ++++++------
+ manifest.uuid      |  2 +-
+ 3 files changed, 15 insertions(+), 19 deletions(-)
+
+diff --git a/autosetup/jimsh0.c b/autosetup/jimsh0.c
+index 0526b9a446..1a6453d0c8 100644
 --- a/autosetup/jimsh0.c
 +++ b/autosetup/jimsh0.c
-@@ -2088,9 +2088,13 @@ enum wbuftype {
- #define UNIX_SOCKETS 0
+@@ -1252,6 +1252,14 @@ int Jim_OpenForRead(const char *filename);
+ 
  #endif
  
--#ifndef MAXPATHLEN
--#define MAXPATHLEN JIM_PATH_LEN
--#endif
 +# ifndef MAXPATHLEN
 +# ifdef PATH_MAX
 +# define MAXPATHLEN PATH_MAX
@@ -16,6 +29,18 @@
 +# define MAXPATHLEN JIM_PATH_LEN
 +# endif
 +# endif
++
+ 
+ int Jim_FileStoreStatData(Jim_Interp *interp, Jim_Obj *varName, const jim_stat_t *sb);
+ 
+@@ -2088,10 +2096,6 @@ enum wbuftype {
+ #define UNIX_SOCKETS 0
+ #endif
+ 
+-#ifndef MAXPATHLEN
+-#define MAXPATHLEN JIM_PATH_LEN
+-#endif
+-
  
  
  
diff --git a/dev-db/sqlite/sqlite-3.49.0.ebuild b/dev-db/sqlite/sqlite-3.49.0.ebuild
deleted file mode 100644
index 12a1086d079a..000000000000
--- a/dev-db/sqlite/sqlite-3.49.0.ebuild
+++ /dev/null
@@ -1,434 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="SQL database engine"
-HOMEPAGE="https://sqlite.org/"
-
-# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
-# for hints regarding test failures, backports, etc.
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}"/${PN}
-	PROPERTIES="live"
-else
-	printf -v SRC_PV "%u%02u%02u%02u" $(ver_rs 1- " ")
-	DOC_PV="${SRC_PV}"
-	#printf -v DOC_PV "%u%02u%02u00" $(ver_rs 1-3 " ")
-
-	SRC_URI="
-		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}"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="public-domain"
-SLOT="3"
-IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] )
-	tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
-	tools? ( dev-lang/tcl:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )
-"
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" dev-vcs/fossil"
-else
-	BDEPEND+=" app-arch/unzip"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.47.2-hwtime.h-Don-t-use-rdtsc-on-i486.patch
-	# https://sqlite.org/forum/forumpost/3c2014fea4
-	"${FILESDIR}"/${PN}-3.49.0-cppflags.patch
-	# https://sqlite.org/forum/forumpost/f93323a743
-	"${FILESDIR}"/${PN}-3.49.0-icu-tests.patch
-)
-
-_fossil_fetch() {
-	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
-	local repo_id="${1}"
-	local repo_uri="${2}"
-
-	local -x FOSSIL_HOME="${HOME}"
-
-	mkdir -p "${T}/fossil/${repo_id}" || die
-	pushd "${T}/fossil/${repo_id}" > /dev/null || die
-
-	if [[ -n "${EVCS_OFFLINE}" ]]; then
-		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-			die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
-		fi
-	else
-		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-			einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
-			fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
-			echo
-		else
-			cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
-			einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
-			fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
-			echo
-		fi
-
-		(
-			addwrite "${distdir}"
-			mkdir -p "${distdir}/fossil-src/${repo_id}" || die
-			cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
-		)
-	fi
-
-	popd > /dev/null || die
-}
-
-_fossil_checkout() {
-	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
-	local repo_id="${1}"
-	local branch_or_commit="${2}"
-	local target_directory="${3}"
-
-	local -x FOSSIL_HOME="${HOME}"
-
-	if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-		die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
-	fi
-
-	if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
-		mkdir -p "${T}/fossil/${repo_id}" || die
-		cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
-	fi
-
-	mkdir "${target_directory}" || die
-	pushd "${target_directory}" > /dev/null || die
-
-	einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
-	fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
-	echo
-
-	popd > /dev/null || die
-}
-
-fossil_fetch() {
-	local repo_id="${1}"
-	local repo_uri="${2}"
-	local target_directory="${3}"
-
-	local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
-
-	_fossil_fetch "${repo_id}" "${repo_uri}"
-	_fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
-		if use doc; then
-			fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
-		fi
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
-	local options=()
-
-	options+=(
-		--enable-load-extension
-		--enable-threadsafe
-	)
-
-	# Support detection of misuse of SQLite API.
-	# https://sqlite.org/compile.html#enable_api_armor
-	append-cppflags -DSQLITE_ENABLE_API_ARMOR
-
-	# Support bytecode and tables_used virtual tables.
-	# https://sqlite.org/compile.html#enable_bytecode_vtab
-	# https://sqlite.org/bytecodevtab.html
-	append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
-
-	# Support column metadata functions.
-	# https://sqlite.org/compile.html#enable_column_metadata
-	# https://sqlite.org/c3ref/column_database_name.html
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# Support sqlite_dbpage virtual table.
-	# https://sqlite.org/compile.html#enable_dbpage_vtab
-	# https://sqlite.org/dbpage.html
-	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
-
-	# Support dbstat virtual table.
-	# https://sqlite.org/compile.html#enable_dbstat_vtab
-	# https://sqlite.org/dbstat.html
-	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
-
-	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
-	# https://sqlite.org/compile.html#enable_deserialize
-	# https://sqlite.org/c3ref/serialize.html
-	# https://sqlite.org/c3ref/deserialize.html
-	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
-
-	# Support comments in output of EXPLAIN.
-	# https://sqlite.org/compile.html#enable_explain_comments
-	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-
-	# Support Full-Text Search versions 3, 4 and 5.
-	# https://sqlite.org/compile.html#enable_fts3
-	# https://sqlite.org/compile.html#enable_fts3_parenthesis
-	# https://sqlite.org/compile.html#enable_fts4
-	# 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
-	options+=( --enable-fts4 )
-	options+=( --enable-fts5 )
-
-	# Support hidden columns.
-	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
-
-	# Support memsys5 memory allocator.
-	# https://sqlite.org/compile.html#enable_memsys5
-	# https://sqlite.org/malloc.html#memsys5
-	options+=( --enable-memsys5 )
-
-	# Support sqlite3_normalized_sql() function.
-	# https://sqlite.org/c3ref/expanded_sql.html
-	append-cppflags -DSQLITE_ENABLE_NORMALIZE
-
-	# Support sqlite_offset() function.
-	# https://sqlite.org/compile.html#enable_offset_sql_func
-	# https://sqlite.org/lang_corefunc.html#sqlite_offset
-	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
-
-	# Support pre-update hook functions.
-	# https://sqlite.org/compile.html#enable_preupdate_hook
-	# https://sqlite.org/c3ref/preupdate_count.html
-	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
-
-	# Support Resumable Bulk Update extension.
-	# https://sqlite.org/compile.html#enable_rbu
-	# https://sqlite.org/rbu.html
-	append-cppflags -DSQLITE_ENABLE_RBU
-
-	# Support R*Trees.
-	# https://sqlite.org/compile.html#enable_rtree
-	# https://sqlite.org/compile.html#enable_geopoly
-	# https://sqlite.org/rtree.html
-	# https://sqlite.org/geopoly.html
-	options+=( --enable-rtree --enable-geopoly )
-
-	# Support Session extension.
-	# https://sqlite.org/compile.html#enable_session
-	# https://sqlite.org/sessionintro.html
-	options+=( --enable-session )
-
-	# Support scan status functions.
-	# https://sqlite.org/compile.html#enable_stmt_scanstatus
-	# https://sqlite.org/c3ref/stmt_scanstatus.html
-	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
-	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
-
-	# Support sqlite_stmt virtual table.
-	# https://sqlite.org/compile.html#enable_stmtvtab
-	# https://sqlite.org/stmt.html
-	append-cppflags -DSQLITE_ENABLE_STMTVTAB
-
-	# Support unknown() function.
-	# https://sqlite.org/compile.html#enable_unknown_sql_function
-	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
-
-	# Support unlock notification.
-	# https://sqlite.org/compile.html#enable_unlock_notify
-	# https://sqlite.org/c3ref/unlock_notify.html
-	# https://sqlite.org/unlock_notify.html
-	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-
-	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
-	# https://sqlite.org/compile.html#enable_update_delete_limit
-	# https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
-	# https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
-	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
-
-	# Support soundex() function.
-	# https://sqlite.org/compile.html#soundex
-	# https://sqlite.org/lang_corefunc.html#soundex
-	append-cppflags -DSQLITE_SOUNDEX
-
-	# Support URI filenames.
-	# https://sqlite.org/compile.html#use_uri
-	# https://sqlite.org/uri.html
-	append-cppflags -DSQLITE_USE_URI
-
-	options+=( $(use_enable debug) )
-
-	if use icu; then
-		# Support ICU extension.
-		# https://sqlite.org/compile.html#enable_icu
-		options+=( --with-icu-config )
-	fi
-
-	options+=(
-		--disable-editline
-		$(use_enable readline)
-	)
-
-	if use readline; then
-		options+=( --with-readline-inc="-I${ESYSROOT}/usr/include/readline" )
-	fi
-
-	if use secure-delete; then
-		# Enable secure_delete pragma by default.
-		# https://sqlite.org/compile.html#secure_delete
-		# https://sqlite.org/pragma.html#pragma_secure_delete
-		append-cppflags -DSQLITE_SECURE_DELETE
-	fi
-
-	options+=( $(use_enable static-libs static) )
-
-	# tcl, test, tools USE flags.
-	if use tcl || use test || { use tools && multilib_is_native_abi; }; then
-		options+=(
-			--enable-tcl
-			--with-tcl="${ESYSROOT}/usr/$(get_libdir)"
-		)
-	else
-		options+=( --disable-tcl )
-	fi
-
-	if [[ "${ABI}" == "x86" ]]; then
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
-			append-cflags -mfpmath=sse
-		else
-			append-cflags -ffloat-store
-		fi
-	fi
-
-	# 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() {
-	emake HAVE_TCL="$(usev tcl 1)" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
-
-	if use tools && multilib_is_native_abi; then
-		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
-	fi
-
-	if [[ ${PV} == 9999 ]] && use doc && multilib_is_native_abi; then
-		emake tclsqlite3.c
-
-		local build_directory="$(pwd)"
-		build_directory="${build_directory##*/}"
-
-		mkdir "${WORKDIR}/${PN}-doc-build" || die
-		pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
-
-		emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
-		rmdir doc/matrix{/*,} || die
-
-		popd > /dev/null || die
-	fi
-}
-
-multilib_src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions"
-		return
-	fi
-
-	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
-
-	# e_uri.test tries to open files in /.
-	# bug #839798
-	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict "/test.db"
-	addpredict "/ÿ.db"
-
-	emake -Onone $(usex debug 'fulltest' 'test')
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
-
-	if use tools && multilib_is_native_abi; then
-		install_tool() {
-			if [[ -f ".libs/${1}" ]]; then
-				newbin ".libs/${1}" "${2}"
-			else
-				newbin "${1}" "${2}"
-			fi
-		}
-
-		install_tool changeset sqlite3-changeset
-		install_tool dbdump sqlite3-db-dump
-		install_tool dbhash sqlite3-db-hash
-		install_tool dbtotxt sqlite3-db-to-txt
-		install_tool index_usage sqlite3-index-usage
-		install_tool rbu sqlite3-rbu
-		install_tool scrub sqlite3-scrub
-		install_tool showdb sqlite3-show-db
-		install_tool showjournal sqlite3-show-journal
-		install_tool showshm sqlite3-show-shm
-		install_tool showstat4 sqlite3-show-stat4
-		install_tool showwal sqlite3-show-wal
-		install_tool sqldiff sqlite3-diff
-		install_tool sqlite3_analyzer sqlite3-analyzer
-		install_tool sqlite3_checker sqlite3-checker
-		install_tool sqlite3_expert sqlite3-expert
-		install_tool sqltclsh sqlite3-tclsh
-
-		unset -f install_tool
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	doman sqlite3.1
-
-	if use doc; then
-		if [[ ${PV} == 9999 ]]; then
-			pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
-		else
-			pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
-		fi
-
-		find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
-		if [[ ${PV} != 9999 ]]; then
-			rm search search.d/admin || die
-			rmdir search.d || die
-			find -name "*~" -delete || die
-		fi
-
-		(
-			docinto html
-			dodoc -r *
-		)
-
-		popd > /dev/null || die
-	fi
-}
diff --git a/dev-db/sqlite/sqlite-3.49.1.ebuild b/dev-db/sqlite/sqlite-3.49.1.ebuild
index ce81dc0b2788..25ab0c8a1da6 100644
--- a/dev-db/sqlite/sqlite-3.49.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.49.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic multilib-minimal toolchain-funcs
+inherit flag-o-matic multilib multilib-minimal toolchain-funcs
 
 DESCRIPTION="SQL database engine"
 HOMEPAGE="https://sqlite.org/"
@@ -53,7 +53,7 @@ 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
+	# https://bugs.gentoo.org/949981, https://www2.sqlite.org/src/info/ffd05de8a3b7cab1
 	"${FILESDIR}"/${PN}-3.49.1-jimsh.patch
 )
 
diff --git a/dev-db/sqlite/sqlite-9999.ebuild b/dev-db/sqlite/sqlite-9999.ebuild
index 2b47259e17d4..2d4ae2f9926b 100644
--- a/dev-db/sqlite/sqlite-9999.ebuild
+++ b/dev-db/sqlite/sqlite-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic multilib-minimal toolchain-funcs
+inherit flag-o-matic multilib multilib-minimal toolchain-funcs
 
 DESCRIPTION="SQL database engine"
 HOMEPAGE="https://sqlite.org/"
@@ -318,8 +318,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
@@ -370,6 +372,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