12 files changed, 489 insertions, 8 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index e521284a694f..de022612b764 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest
index 71fdba207615..19c1ab0966a3 100644
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@@ -3,6 +3,9 @@ AUX percona-toolkit-3.0.7-no-versioncheck.patch 5566 BLAKE2B 4def58c91dcdc35481c
 DIST percona-toolkit-3.5.5.tar.gz 14847253 BLAKE2B f26b88581b84a12fd2b353984b2dbfbf43056388a48821739e70f43a28f448fc7caea99bdb0f5284b91ce04436e0969da1eec85e66054bfc1e8ff2771dede6d2 SHA512 0fb367e2a967c1a459e2d8a70f3db6c75043caf4127c14472b2bdfdb89415286c9f52929e326fa4f402d73a4c3e95b4cf8b0ee0f0624e54e382e44eb653bfaf9
 DIST percona-toolkit-3.5.7-deps.tar.xz 108954608 BLAKE2B 788246531bdf3e1faa7d310fdd920b2fa42d9d82a75d730bb143047d0ce0c22d23ee86cf58bd646aae3dac503d88793040168be15fc74a7686979233a8d65dc1 SHA512 54a0698c5e3ae0fe30b6e253a31829db4c4656cccd48107126a5b99c148fe1ed9515d91e79784e1970569bfe8853d1b5cb74cf968dbc2d08e95aec6ef209659d
 DIST percona-toolkit-3.5.7.tar.gz 138784243 BLAKE2B a589c884348ad820ccadbb871ad85bf89a21ae49e8cea34fa019c61ab53302a5b7db03f01ae191138e15f61c77068388cb5d3863f360a7207d9f9075e9100385 SHA512 cfe232aa5b59d262242348ec18b676d0d8c7752dddadd1f027772346e02d329f5bc53b96dfdb82fbdb18524095f88ad0721e4b4c6ed611c727c0a5cde85998bd
+DIST percona-toolkit-3.6.0-deps.tar.xz 109295060 BLAKE2B eee69710b54b43cc95f456bccec7b5483d626561dc02e1398a57437bb9be91ef9c280d424821a216f688385e65a16f238faecb9ced6fc4ed9088d39ca01d275a SHA512 caf1884ee69acbec21df734420c99e633470b3e76b169a56e89abdbe66d9f15f8bf182a6256c162539b2c95ce6d9cc4178327fa4d2a745b790c5a1357d5d5a1f
+DIST percona-toolkit-3.6.0.tar.gz 136136447 BLAKE2B 9434760f5ca3fbaa91b1995af06d187bef2b7f982ffc24b2179773aed3b9aee06f33d9d5f548909e352cc2488ccd7c2db692f1ddb7be63fbc05e8ba3f4c8f325 SHA512 f7d99e5f0874c95b6820097a07e9ac144b08e1044dc07a82816e0d7377574e83d89265a49ab999c071affbd995af09eb2a0fd04c8b002a35c294230e75e61763
 EBUILD percona-toolkit-3.5.5.ebuild 1205 BLAKE2B db6a44d0959530b831cd10a8cfba0027edd156ebf85cd542f94fbc2c7c8395ee911906be689cee3f433e85b3d2ae3dd92b812c66d80180e55a5498ce77bf90be SHA512 845e6b2cd64b12e7e7a95a1fce9face54d02eb1f05387e446b11b5e4f237dd06cc31951af8a5dfee1fa90d93b8eb115b0c6b6488ee770861887371dbc6575085
 EBUILD percona-toolkit-3.5.7.ebuild 1315 BLAKE2B c560894a7dae83b7ca3c45585858ce0040023cd8c4fc07f134f05c0912d834838b5be882ab7f2edbea9b2663e72342bd99241c40ebe8a7d1c69f410b76df8f56 SHA512 85fe8f09d29f7846d6afdf3464928be572f2c04128e79ee0c771c0cc397c6a1379cd6786e7e9df58b9d8e66401ab0d38bffe8ff6a5b6154fc09f0d92fa0d25dc
+EBUILD percona-toolkit-3.6.0.ebuild 1317 BLAKE2B 970e4085a6e0adc34cfcf68b16d8595ee4aeedb8f07b916b8613757a03ce4f1017d9554ed8e2c351f6db220a95a83d1848f03489d9b11b6776d9188c24d5f2fd SHA512 4f4ca8b992d2f48734882806b798f67b2db18b1cf42ec30f0df443a9aeac5e192b2234f8fadafc3d974778d6ca0e1769ab52fefc3c531575fb2d9428406a529b
 MISC metadata.xml 648 BLAKE2B a1d5ee4c53fe96e65ebfc310e5e9e58c8e9d30dd5c160cc5e212f735a9f0d1e87dfd6c2020d785051c9349d9a8c2ea00ffce8d6bc95dfb279268aa9ab154ff64 SHA512 cd0d16d6d9a7e8585a1e11f9717b4b98bec459e72b127bd379d56cf0ef4b8347eb385d762ff4ebf36bebea27b9fc13195ecaab53b5453bfb02b01aa6d14111ec
diff --git a/dev-db/percona-toolkit/percona-toolkit-3.6.0.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.6.0.ebuild
new file mode 100644
index 000000000000..f30c867e29cd
--- /dev/null
+++ b/dev-db/percona-toolkit/percona-toolkit-3.6.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module perl-module
+
+DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks"
+HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit"
+SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz
+	https://github.com/hydrapolic/gentoo-dist/releases/download/${P}/${P}-deps.tar.xz"
+
+LICENSE="|| ( GPL-2 Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Package warrants IUSE doc
+IUSE=""
+
+COMMON_DEPEND="dev-perl/DBI
+	dev-perl/DBD-mysql
+	virtual/perl-Time-HiRes"
+RDEPEND="${COMMON_DEPEND}
+	dev-perl/JSON
+	dev-perl/Role-Tiny
+	dev-perl/TermReadKey"
+	dev-perl/libwww-perl
+	virtual/perl-Digest-MD5
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long
+	virtual/perl-IO-Compress
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Time-Local
+DEPEND="${COMMON_DEPEND}
+	virtual/perl-ExtUtils-MakeMaker"
+
+# Bug #501904 - CVE-2014-2029
+# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/*
+# ^ is *-no-versioncheck.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch
+	"${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch
+)
+
+src_install() {
+	default
+	dobin bin/*
+}
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 02e59d697050..af5c621ffcfd 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -14,7 +14,7 @@ DIST pgpool-II-4.4.7.tar.gz 5024007 BLAKE2B 701d6b266156c565e562b926aa8c20ebfdc3
 EBUILD pgpool2-4.3.10.ebuild 2458 BLAKE2B 22f65c3a22c9b79dba97d5eb6ba24ef010a3e99db42e3f43f61e99b5ac2b1568ec1b207534b757f3300ca318ffddbcffe0f7c134d69383829771f635c53fc99d SHA512 1a7c3c4d8a53819c1ec00fd606b8d475a1e83a4f5aa60dcbef68f8ecbb53e7099d6093a2167d871aab1c591fc7923b447310a29024ff67fb653059477056653e
 EBUILD pgpool2-4.3.8.ebuild 2456 BLAKE2B 7ac3722e1336c3b8447732fa2495b919fc91f56012aafc96bd19ca2ab2beea30b942f03341df33831c68c02b97673b0fa974a2930fca5bc8b787224ca7534d0a SHA512 6edb966973bc72d7284b6f15474758b16755da8b65befa094f79b51150d8be1dcf22d9e951abc1efdb1bd0cc9b58f9d11d751485479defe719deca463704e1fc
 EBUILD pgpool2-4.4.4.ebuild 2454 BLAKE2B a59c283e26abaaf4444c57cc9055465ecc5c4233dbabf8a072f47432e5d14f2d21f17068c09968584f01f70d29bfe95d490bd04dab487778c04cb473230b25da SHA512 4355cb8dde83e810a46cbb8859bfbb841bea03382e14cf7760eda76ec969d24ccedd35db6cea0d90107997369ca3f58cbdef78e66d12eda79beaef65685331a4
-EBUILD pgpool2-4.4.5.ebuild 2453 BLAKE2B 03108c5efa21fe38230d793f4188eb178a85c21f46aebfe3cd2a2ef1c9f48dd3d73904987669ea0c87f50e07a48ca28d64092794f446c62eac3a7381d8b2983a SHA512 36e69ccad76e5549a999d2648d48ca0f78b126c07da3c76b52b26cd6a9666f49cbc8c82a2121c07d830100f5d7494db0a44900209e078d1c09bdaae661edea88
+EBUILD pgpool2-4.4.5.ebuild 2452 BLAKE2B b95d99df5991a36c809e7f07145b0dc5872e92b897be9797c448268c99fed3c1ffcfda69c594ef64104f310e05df01b795c10a193fb6fdaa571d82ac5aecb2a3 SHA512 1cfdbf1ce126dd07a30f4907cbe6bec1751e93c4a2480ea1bd86f542633c13a411bc63576a3dfdbc09fe5d838590972432a1e458dca58972618eb8203f4276aa
 EBUILD pgpool2-4.4.7.ebuild 2454 BLAKE2B 72c3f7bf2142e85be2d0c4d58f1e23537bcac20079436d95ab3da45f9150150e2a83a21d98b42999d1593dde041a6eb5d618203e293e7ac4c09446f7c1e87c82 SHA512 d2f5256914cc5aefdae9958a019b8e353ed1d603f3a0103c22c5c0834a00b01f75daa51c87255175675687a8f31e7ac4c62963b983aadcad167beb7d281abec5
 EBUILD pgpool2-9999.ebuild 2552 BLAKE2B 01e1997a789efb97126111830ab8022a25d47d6eb45a25545fe5a218644de73e7a8a54aca7f18881bfc25e60a0b2361dd0ced1a8682b065bf1619b3d5df14542 SHA512 b989b9385dcff0bf1fcdb876d6eac368a3e57ef6d2e6d376c4e4001c04373ab6e2464ff912d325eb5a8ef512655245cfcf5c1ec2c1f6b3e1016459c5c0982a80
 MISC metadata.xml 391 BLAKE2B c5855fde95e138709d778b50b897ea0dd75267547e89faf60988d1dfe78740c313291a226c30fdd618ef2893ad3dc11000b33026e04369fe294ca9ed1e18efb1 SHA512 374bd70841f1f13e2f8265f972e2debc7fb79a3f463efb897a75fd8ddc3163edf82c888d3d8d5bfede6c509fc27f67e74592599b8da8640035a5d4241cad98c1
diff --git a/dev-db/pgpool2/pgpool2-4.4.5.ebuild b/dev-db/pgpool2/pgpool2-4.4.5.ebuild
index 4885aa0ffece..9966584469a6 100644
--- a/dev-db/pgpool2/pgpool2-4.4.5.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.4.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 IUSE="doc memcached pam ssl static-libs"
 
diff --git a/dev-db/phppgadmin/Manifest b/dev-db/phppgadmin/Manifest
index 11f1ca3dbdec..3a20ab1e149e 100644
--- a/dev-db/phppgadmin/Manifest
+++ b/dev-db/phppgadmin/Manifest
@@ -1,6 +1,6 @@
 AUX postinstall-en.txt 162 BLAKE2B d08f1f1064e8f268fe92ee622d0b5a756e20d80a6376abf1bfc7e8bb88c90d7b3c1b7c3c3291d3189791cca9766feb05b9831ddcba2e84f69e295f7048d440e7 SHA512 3aa9e4b58ffd97cc9bc990e0ca8444e8be012fb56859b28705e7ed3d5ffae74bcfab19c55e415785c9f09fabcc20ea5a493ee2f03fb380a351c02fe958231bd8
 DIST phppgadmin-7.14.5.tar.gz 1153991 BLAKE2B 52f52e02305814a149cdde7498bdffe281c78198241c436182bdebce7e2597aea8ac1e0ae04900073355dbe4da7f41f0f0b83c5ec28a5b476ce6f3249dfff6b7 SHA512 1983b7d98623def3aa0d83f7ea507026abe1699dba3104fddf743fb581a4f1226be8d784990984ebcc22e92c2bed3cacfbec13ed7387d7b87b2662fc66fe0ac6
 DIST phppgadmin-7.14.7.tar.gz 1154132 BLAKE2B 96321c9f2c67f8a740425b8a049a8b31320d43eedaaa2f8ceaf135d0b5b725ea168aa14715fc2df19fe9eb75d551bdb76c3821d1dbde6550dc865595ecc0ca99 SHA512 b5c6dd52e1458184a0bdb693650157c69f36d72a43df0645fde87ec7e0b3b75216dd4e1dcb3f34f95e8a0acb4bf3ec6bd9a9086a72a3ad526b80431acb476054
-EBUILD phppgadmin-7.14.5.ebuild 939 BLAKE2B 0db9e7b4d2951381ffb6b8984ab64abf66a96da7da322d2809a93fdac963bba8560ddb6f6d90fee5a13455c8e308bf9ece02b0ae79cc5d6fa375441fe936c4c2 SHA512 d1b5a315b39c1043e1c5882146828567bbb6d1c1039d27a14d1f8b4bcfb2555ff490f4e7e83624b87b61edad15bee394c6eecfadae8b8fe423eebfa1ce0c69b5
+EBUILD phppgadmin-7.14.5.ebuild 938 BLAKE2B 00f865b317ac251a98785b0a5742f8a6f5295e2d890b16b0a2b0739f79bc8cb98230d17efa92a381ae82c52f941eb03eaaf862f41d40d119c41189dcfab722cb SHA512 52eaef9f8a2dc32f6532f018d2e8e84c9b5a5eeba3f6acb7f0977d869b2338b29ed71372414f14c5e3e457b96ccf3a19bb427a1df6d7ad6ef742def0971bf639
 EBUILD phppgadmin-7.14.7.ebuild 938 BLAKE2B 00f865b317ac251a98785b0a5742f8a6f5295e2d890b16b0a2b0739f79bc8cb98230d17efa92a381ae82c52f941eb03eaaf862f41d40d119c41189dcfab722cb SHA512 52eaef9f8a2dc32f6532f018d2e8e84c9b5a5eeba3f6acb7f0977d869b2338b29ed71372414f14c5e3e457b96ccf3a19bb427a1df6d7ad6ef742def0971bf639
 MISC metadata.xml 336 BLAKE2B 77497569d487b6229d058b35c2c5f78ea1e5749e68f37515ffc4b4704c754b3ba10ad4be6044f49937bd46361ba3788aab22ac8e93690aecef3aa37b4c16968a SHA512 d96603ccdd1a6e66adc36bb3cbef1f46895c45b3e7e147fa1b2ccedd2f648b676f255cb1696ec1555c1455850de8e819580fe3eb41e9849165602ab49d51307e
diff --git a/dev-db/phppgadmin/phppgadmin-7.14.5.ebuild b/dev-db/phppgadmin/phppgadmin-7.14.5.ebuild
index a514ae5be2de..e1741b8a26fc 100644
--- a/dev-db/phppgadmin/phppgadmin-7.14.5.ebuild
+++ b/dev-db/phppgadmin/phppgadmin-7.14.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ReimuHakurei/phpPgAdmin/archive/refs/tags/v${PV}-mod
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-lang/php[postgres,session,unicode]"
 
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index a65ceeb163b9..7d3e0478721f 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -4,10 +4,10 @@ AUX postgis-3.4.0-without-gui.patch 491 BLAKE2B 6c2ff929b453986045e6ecddc3034592
 DIST postgis-3.3.7.tar.gz 17782849 BLAKE2B 8f9b1f27c33727a9a24a53972dee67057c4230d0f1f01af352ff6b740d880b9acb7fccbacb5c2cc614c58adadace2cd6be9a1f52a7ce12cc20dbc2a99aa808d7 SHA512 007f0f6fc9b1256f3e7c4536d5d37c0b715fe285613804805567a4000d1ec9a132650b44f585ed184f5ad5209459e11a9464c5caf3ca285b2b230cf89ccf7709
 DIST postgis-3.4.3.tar.gz 14957514 BLAKE2B 2c472a66d6063c70a2a5b7d42953233c9d24ee4f283e5837f74b231e0c034ba395e6f84dda9b14a46766ef6f1196c39aa7795d99b50ada106a66b2569ffdd6b4 SHA512 92da910fa87a618e49ab16bcb3d9b4403dc4e08bdfd599631f5b7c7a4955258a1a9e4efb1d982c30ef3a395631f52d055f321a1c17b1b7fe22403580671a2dab
 DIST postgis-3.5.0.tar.gz 15031829 BLAKE2B a641eaa7b0407108e332bf6f244fef0d22d21ed34c16c2f3cb718f49acf9a0bb3b1bf8b1ec3d7eb4f731beeb652f37f666ff4b8d44c5a66db7da4a9a555caa38 SHA512 baf81b9133db34c87ecb5e019497df89fba9faf293ae2f2e4fa5578dbe608ff5310b5ca718a7bf94e76af51bf7b8ec4b1f69fad91412017d70cdcd70492ae9e5
-EBUILD postgis-3.3.7-r1.ebuild 3361 BLAKE2B 0d4834acb8c9d7a7193f8ae520543c240e1a135aaee704f45ab8e589aeae980fbc17fa114c4d0972a9df907bb2ddabf01b18dede0165ea3aedb4f44e1d97b576 SHA512 3d1cba1fcfe8c25c10d9cb85f62241ec6831bc219239063a841576519a79ddbfa53006645ad281a447903b26e01435bf21fb0b0a6b1c2eeff6298da633117c68
+EBUILD postgis-3.3.7-r1.ebuild 3360 BLAKE2B 598d86f0b97a3494c48c3f7a8e7f72af1a5f0ca640d026ad689db37e953a28e60a40c7b2d248b354cbdcf8e8fb7616ae602d724fe5c0ff2ac0757b98fbb5c4a7 SHA512 1dea13a95b39667e7ccd5a7b2a08ac7cc9534b6605cedcd3032d1bef5cc67b9bcc6176d91100681f9f3a58fa85dd37781cbcfb7d49837413f501019d644e0d3a
 EBUILD postgis-3.3.7.ebuild 3165 BLAKE2B 88491d911e35a591db9f8129b35363d4304648a4e0d913927c8654ca58fd23e96e9cd325c1f07c4ea0d3be6b38ec5c77f2eec59890f64070a2100d712250e80a SHA512 8df61dfa0539fc0e61777ea49653c54426d87bb9da485cc92d5a25f38c2ccfe8659ec0d0b5ef0574cd8e05966128343e9126fb2801d5d02392304e957039acd2
 EBUILD postgis-3.4.3-r1.ebuild 3488 BLAKE2B 310e350b28326a97de239e67f27e74f671976b589793186891e588f582eb8c14c0cd81ca5ca0cec44f3910327e994e17c772787a34c20e6cdce430099ac3c2f6 SHA512 6dbfd7ca11f73a27971ca90997ada88ece7ebe8c86cb477337a4b786724537a995da6503b5ce93911ad5669e4c7be7d5fe2704a37ce3b07cfed7a88238feb768
 EBUILD postgis-3.4.3.ebuild 3294 BLAKE2B da49f7d3046cbf5180e0ac35dea6b241bf55d12e732f55149f07d1274da4811d453c8d303d91ad17e2e9c9c24327a899266eeda66e4602df58cfbaf0b8880daf SHA512 68c42f60c5f338799ff79b9abf1b750210f9fce512a207d07b317a5bf4a66e78f897078c7fa628ae1e04e3bd46f415a70b22095d67f21ddefdb743e1ea802f12
-EBUILD postgis-3.5.0-r1.ebuild 3313 BLAKE2B 4febe29a6c803ca272fd64a937ecbd1419d14d92be64cf39a369407dcf897c12a4faa736e58256093a92e1b79db498967d80b8f988f4782148e7cc7232bdd2bc SHA512 ae94efb65c5d23c8afb4372630106321a614cc940e7a96699dafe81efaf60bbae4fa8c1d70f13732d1654cfbffc16f502c49af59e52134f3d925c56781c2921a
+EBUILD postgis-3.5.0-r1.ebuild 3312 BLAKE2B 803a046a5c31b751ae47b9ddd1cec665df56204c8cb95047310b320f7fad21fab1217220743b17c00920a7a1b2cfd0c9ca0d36625caa7c0f31d5816c5e9bf27f SHA512 a4be5d26c7e955e681e9c1d73cf242944620eb3ff669be9784e66001c09aae4a025a6582585ebfab822fad16db4fc74e000f1ec74e69e8774e0489adf1ca2592
 EBUILD postgis-3.5.0.ebuild 3117 BLAKE2B 666977b91b0a8cf5626bf2cf7da330088661c337cbe3b0f8c3e93429ac954c24c1d7a28c6fcb91a193c4a24dd7eb1aa27ed4a4383e959e3e68ecfa6ba2ace67b SHA512 a7c36569c5c1d2f06a12e422dcd2c1a5afc2fdcb22783cd7c100a1bd6746990f39e4492b33a0646843256c075f7b4be04ee385820375ec7a3185966b6885ccad
 MISC metadata.xml 818 BLAKE2B 1f49aad6ae27cc838c1eb0908eaec3eda84400174b0ef20a7afd828a3212b0215761e3c6d8dcdb2b62cbb8c7bda7266854d93b02f121c253ae8618cb917e39ce SHA512 c344b128ea11c07a098bb5cf6f6cdf67677a43a6d40222e74258b26951774cf59ec9ad61b515cc6f5abaf5eb99593b38c66fbeabe3f7fafa52e16e055cb7f119
diff --git a/dev-db/postgis/postgis-3.3.7-r1.ebuild b/dev-db/postgis/postgis-3.3.7-r1.ebuild
index c5a84dafd7f1..d67784ea6c55 100644
--- a/dev-db/postgis/postgis-3.3.7-r1.ebuild
+++ b/dev-db/postgis/postgis-3.3.7-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]] ; then
 else
 	PGIS="$(ver_cut 1-2)"
 	SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Geographic Objects for PostgreSQL"
diff --git a/dev-db/postgis/postgis-3.5.0-r1.ebuild b/dev-db/postgis/postgis-3.5.0-r1.ebuild
index 384e437c41b1..a24e493e0e07 100644
--- a/dev-db/postgis/postgis-3.5.0-r1.ebuild
+++ b/dev-db/postgis/postgis-3.5.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]] ; then
 else
 	PGIS="$(ver_cut 1-2)"
 	SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Geographic Objects for PostgreSQL"
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 171b2a562575..50a0ca5ffdc7 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -4,9 +4,12 @@ AUX sqlite-3.47.0-buildtclext.patch 4177 BLAKE2B 653cdd04aa78ce0d66e0fd30e5c0e81
 AUX sqlite-3.47.0-nonbash.patch 2086 BLAKE2B d791fe6bcfb115f814608f40500a3a321b7dd519aa5396a5e55fa96bde492356174c4c440e7cde28a477057d5f56453b246a991fd7818de908ed7c671573eec0 SHA512 c5c530cd936b5656d69d87a10704465cfb0b4029850780b613fd2e34b2c046476503e8ca7aef841f9757887757498f8544e3bf1005f3c7a1b9a8056c98ab79e8
 DIST sqlite-doc-3460100.zip 10851427 BLAKE2B 7462e83ca84e3e9aac7236f575fd2bdddac7744ae700a63fe8fdc9d2df3157c59fd374d99a0526bd4d9f742005ee7a90f3d78057861d3c3fcba9f897630e48db SHA512 1ad7dfc938d182f69ea9367b4f5ead1d48b991626521249e8b58c9fb4c2553e348ce402de9cc81b0ad699d4c45c467de56a98ee39f9c3555c6fafff15fba41ce
 DIST sqlite-doc-3470000.zip 10937359 BLAKE2B 3fc349e4b2b0cd3fc59147519062133261463e09933419f330cd18e6b120d3498c10a1864c85c2de144430f1dbf7f9a867aba47ab77dbe2aa0b5128e0742dddf SHA512 20c126551a95905e63e99930e3f7964b6e3fc8b72fbbedf5484f669817af2a8384f05fce89d6117a5e232ba71f5469894d4bb22ba7abd796b24fd624372c7c17
+DIST sqlite-doc-3470100.zip 10945765 BLAKE2B 10181e3c5d35f76edf40b6fbda1d5505eb0a6996ff7ca2eebb39140c7e167493377ff66e746b42d543d8040d6f87b4a7960711ad8e12ff419b1a36cb2d15542d SHA512 7d02f4aa5e1c49670b15cdbc013bbdd713b3dac574f2d8a71d0eed2ecf5785c7dc64039079bcff6f872d3a9cf798977468b4147e5a166c9fa49b9d5c6ef2e9d8
 DIST sqlite-src-3460100.zip 14276926 BLAKE2B df16ea944e317df8ed64fdfab289e3699ec71725ce55e2b30450adaeb41c061b4fba1eb8c41ba638b0edcd12b23264a1f9e413b69fd593c2b65fb1037d3fc8b2 SHA512 6d32a0db9f95d3cec34f02f3fd45b453bf7c422d4d4d9570790f641e7d190b8b31be8e8715afacc1b6e4417f15a4d15a0b28e608ae0b4b5f3054b075783b916e
 DIST sqlite-src-3470000.zip 14408459 BLAKE2B c8e883410fdf9f020bc55ef01d7c2c5b7f1744d3475e7755f2395b24b2d5397302aac2eb7912161cbc2a705a1d7a94b1fa5e8f4e5dbf374c31de56228cbc9e5d SHA512 294d718fb1ebb23e2a4d6e8b7f498d7a7d922e6af5e36452fae075c0d48f4d4f64b5f235ab561b1e47fb7722efc647dfe541164cc385ddc0e2ec0dbce1f40b01
+DIST sqlite-src-3470100.zip 14415832 BLAKE2B 0f238a263c00da5e388fd56080a2a9e7fd64177f0bc59868b52dac96ab4615841500f6dc0b294ae54dd7415217b3a8720db28a354be622a7dcc0c162dbe1c161 SHA512 a7f82a91e1f694d446c9c12398e082074c2c5374a00f1b7e382f077a956bc1e0171abfdb84172605b31e4e61cf1b7ed22adbf7196d41637916c508d12aa1196a
 EBUILD sqlite-3.46.1.ebuild 12792 BLAKE2B ca98f4e22e0ba7abdf3c1c8a785e82a6f64d19f186a68d9733fbe31db879c2d3d0b1b517b3ea3f0af5c678cd9c036a8702c4f3e87f3a20c5b4342e391fd720d9 SHA512 6633db1ba661ed8948e21ffb245f59f7507669224d3b827c16d4fc5332d9b2bd62f176066afc7f59ed5104b0a5d15dc4eb8ed91ba4ab55b2afb773d6026708a0
 EBUILD sqlite-3.47.0-r1.ebuild 12913 BLAKE2B efef3474627c29bbafa616f192569e6091bac26d2abd4a29beaf6749c6ee4e2b6646567c465c800e08de37ba815ae5a8b096fa4bf25b159e77b6869528224070 SHA512 c6ffa3c6de1aad5592a2442908d7632fe8c53f759de539cd393eb5116bf029b170339fa0d464fa549e94f16ff9a08bdbcc3c24d2737fd32da9cc6cc1f709d0b0
+EBUILD sqlite-3.47.1.ebuild 12772 BLAKE2B 1b0a7471646ae88394f5cfe2f6649df8d7586ac05cb987ca984eadf82d8eaa3a54d1000bc6137939638824e96a6f46371e622dfa83b4bf6a45a1c8182f226e4c SHA512 07122867c7bcbabdf9ef8b1b0d8b098140b06779f603beb97654b9277414035b235c9714725dd0c4d3ef182b10e892ddc785d630d5a57101361fee11653ccbfe
 EBUILD sqlite-9999.ebuild 12715 BLAKE2B d79519648d078c7c19312f1df796e2e681c40f2992649fa21b146a5fd16d469656fe02c2a52292a1dff66b38d9ac8061cbc468b162a4051cef56b4d4f1a462cd SHA512 fc50a53d730f618f33c600bf7886e94176404908975da1e5f893916f36c86bf0c4135ee1469026d703483339994638076f0fdc884aa7bad802be2cfaf713dc92
 MISC metadata.xml 824 BLAKE2B 8ab2e8f230bf3a2b26077d90944bca7bf35ae905310205b90bf243365148488303256606c0ee7c3fb736300686466a1c2583bf103693c20063ca668fe9e52647 SHA512 ed4a89e3c2d633cb6ebf8bcbf3ca055d0d1b2ffd801ba559395f812faeaafdfedd97dae11a5a53a4c068e43026fbd4eed4cb12c8b89a7fda6dabe6f78a2e0b38
diff --git a/dev-db/sqlite/sqlite-3.47.1.ebuild b/dev-db/sqlite/sqlite-3.47.1.ebuild
new file mode 100644
index 000000000000..6f71237f381c
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.47.1.ebuild
@@ -0,0 +1,426 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools 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/2024/${PN}-src-${SRC_PV}.zip
+		doc? ( https://sqlite.org/2024/${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}] )
+"
+BDEPEND=">=dev-lang/tcl-8.6:0"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" dev-vcs/fossil"
+else
+	BDEPEND+=" app-arch/unzip"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.45.1-ppc64-ptr.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
+
+	eautoreconf
+	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 -DSQLITE_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
+	append-cppflags -DSQLITE_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
+	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
+
+	# Support Session extension.
+	# https://sqlite.org/compile.html#enable_session
+	# https://sqlite.org/sessionintro.html
+	append-cppflags -DSQLITE_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
+		append-cppflags -DSQLITE_ENABLE_ICU
+		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+	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
+
+	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
+}