gentoo resync : 12.05.2022

38 files changed, 2058 insertions, 679 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 1bd416d652c3..78ed7489b531 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/citus/Manifest b/dev-db/citus/Manifest
index 149322aa841c..f15e10d19bfc 100644
--- a/dev-db/citus/Manifest
+++ b/dev-db/citus/Manifest
@@ -3,13 +3,13 @@ DIST citus-10.1.3.tar.gz 5281581 BLAKE2B cf119c550174a8b64bfee6497288a10030db7ff
 DIST citus-10.1.4.tar.gz 5283715 BLAKE2B e19b35734b32541678538b963f1c03a259fa404f373b759a4c08e867325e106689ff711a5db9ba9231e1f9b42e303a49e6d58c8fb18b5ab7d75e19aea4741a0e SHA512 36a19b30d63ea53a8be6a77946d54558f7fd92f2e91b356395f9273e907f24444500c31d77e9693186fc2bd8df7c7e5f62a11ddfbc8795fbde8d700ebe7a9e76
 DIST citus-10.2.4.tar.gz 5535944 BLAKE2B 3820622ec7f60aad5989536fe6dd53b8db75c51dc31ae3a0d023058afaa369f2de29fe49369d7846ad3bd17242fb6ce7784f2832263ba79ca045c75e558e14d7 SHA512 f9d6853333984c23b3f6aaeec156719c8564958e4d446781506f95fd56e48b8df27f1ddfa1cddb085791dccd6a17c07f3df87d84a89e137ba5a6972a656222f2
 DIST citus-10.2.5.tar.gz 5538309 BLAKE2B c8e06b356728a68a948ffd3dd6d3c56c2972ad094922ce03e049999c450cac0c62ebe45f4ecc489d2cb521530b9f1bf566ac9732227646247a7eebd03f3f88cb SHA512 95ee1225c850bc986025f6960cb5784b02f2ac5af8f312f5dd4a270c4ebf46dd60388ba604a9cd4cf2e22f8b7a855bd18654cbe9f701ba7cd35c1576414d185f
-DIST citus-11.0.0_beta0.tar.gz 5785689 BLAKE2B 249a396ec8171d12ae33234e5044d2ee75a2f3bf41bddfc528609fadc23b8d7da20049a8a2aaf3841db08f5343ccdf6f4206377bcfa4c1f2466c1b6677e398c0 SHA512 7dc15db0126b809c6dfb80e62a16b9009a248e4fefb0bd8a55b9b3d860426644238970cc2bdf4b27c0a09c30acb2ecf19d07b5ffcafb65d6da1215482876a2ba
+DIST citus-11.0.1_beta0.tar.gz 5805252 BLAKE2B 857a68481a3b91a3cfade75632acb308ac85ffcde95f7828e0997536e116810d8f2017e52c37f237ae6ca3afd8e0b2789ddc9f8974e028c95c45864fc732c1f1 SHA512 b7c9fcaf3c2da94e0e7d8f15f43ebe7b3636036fa74639c6870d7f4172d527a8f0f56170c68ab7b7802e811f72c3982308f5aa49c085c3c6ac9fc10f4157812d
 DIST citus-9.5.10.tar.gz 4744848 BLAKE2B e6d9595fe30cb93508007cb4f39933ae57b6f0f1c5ee084ac83b0f5edea0d32dc0e8fd71737e396eb9b77fd5601ae647e29dea5b13e2e7a53a59f96365773466 SHA512 24683c7607de115d1d7fc355b56ff732e5e5f2adcdbebac7ee0d71b8878de3f335f3824be9e02ae9554850c68d7e21bc6d95d581e02ba4fef9da27b2f67f2987
 EBUILD citus-10.0.6.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
 EBUILD citus-10.1.3.ebuild 573 BLAKE2B a5572761f51a81157e42dc6d860cd0a8b91857102aa027b0e23d9aaff092798ebc3efa4fa560b5e52b3e7ddb37be79c7bb26c181e6f87c544862e47583bca25e SHA512 dede570d1b403a461bd9ded53857dcec565c52d11b1475074e40e0ad2ab74fe34bad726857025087152aaf7be7e53f00f89b068a51ca1f9dd58e6447a5d809fd
 EBUILD citus-10.1.4.ebuild 573 BLAKE2B b64e0f2c3946099fac52b87264e0b441d88784c311ddc4cc6e0d298cc7ce2c3502b330639b1c33f767798cad2545705dccd74646edd21fdddd915cd139a546e2 SHA512 71d83fb2933c2068aa1e8ff3e57f5334ae3dce066e1d85a3a2da8a6dfa8e1cb63e269e2d6024befe8eac44405aed34d8bf48b833431935e063d8888f82856ef4
 EBUILD citus-10.2.4.ebuild 576 BLAKE2B 2139c10495f8b7c23e0fbc6be85012c24ffce7481f614e2f6134efeab79780b6b8bb7d5f8e7ed1866021fd577dbd8cd8400aa250c37bf568829b55879ef85ddc SHA512 25e3cb723a51b31bf85722098a40e31ecb3f4852dd2806fb91f73d52b2cfeb20159722c3a01d3d17238fb9d9e3ac754def12782c9bd64fe1d0f36f5e94a6ec05
 EBUILD citus-10.2.5.ebuild 576 BLAKE2B 2139c10495f8b7c23e0fbc6be85012c24ffce7481f614e2f6134efeab79780b6b8bb7d5f8e7ed1866021fd577dbd8cd8400aa250c37bf568829b55879ef85ddc SHA512 25e3cb723a51b31bf85722098a40e31ecb3f4852dd2806fb91f73d52b2cfeb20159722c3a01d3d17238fb9d9e3ac754def12782c9bd64fe1d0f36f5e94a6ec05
-EBUILD citus-11.0.0_beta0.ebuild 637 BLAKE2B d0f6aeef1ecd63da22ade5ae652a08563bf25f5c7a9e8d9b039d819187cbe84640691ac3c8d41b23c4aa92eb3a94757ef73ef9455f6df30b42a21510aac19fc9 SHA512 3b7479bc670ca340ea3e0c6d1d47f96ee5b9f159b4a8a5136bbcfc8a170f6387429a0bbbb5f8d183ebd9648ec35b69480fcfffdbc5b694ee46e0ad27bff72c8f
+EBUILD citus-11.0.1_beta0.ebuild 637 BLAKE2B d0f6aeef1ecd63da22ade5ae652a08563bf25f5c7a9e8d9b039d819187cbe84640691ac3c8d41b23c4aa92eb3a94757ef73ef9455f6df30b42a21510aac19fc9 SHA512 3b7479bc670ca340ea3e0c6d1d47f96ee5b9f159b4a8a5136bbcfc8a170f6387429a0bbbb5f8d183ebd9648ec35b69480fcfffdbc5b694ee46e0ad27bff72c8f
 EBUILD citus-9.5.10.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
 MISC metadata.xml 281 BLAKE2B 85a0d31b886497ac44662bb58420de2f6af5444882f008f902287c6a8265f6e76afa7513b0edeca5b34a26d69d9aa61832c5fb3287c577a7f047180aa3fb242e SHA512 9e9007a37a7acc9948a6eb15bd1bdfea46c95eacc88e96a878237baaf01298b1f849d6e170f04638bbfb68f2c8b8a3bf227e563b5309f859cfcd23d43bc5dd85
diff --git a/dev-db/citus/citus-11.0.0_beta0.ebuild b/dev-db/citus/citus-11.0.1_beta0.ebuild
index 08b2b75966ee..08b2b75966ee 100644
--- a/dev-db/citus/citus-11.0.0_beta0.ebuild
+++ b/dev-db/citus/citus-11.0.1_beta0.ebuild
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index c4f78d4ff540..997f9cdb989f 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -14,6 +14,7 @@ AUX mongodb.confd-r3 473 BLAKE2B b9d812cfb424309e117cf5c43ba8ee7bd4dadac78d6ebd1
 AUX mongodb.initd-r3 438 BLAKE2B 9d846579cc11145ff2fc8de47d32f8f1971a44633bd197cd46d622e084d9a6eed4b277105430f126af90dd55224b5c3ee8c0a286a42922fe68cdb0b6758b9338 SHA512 480514b3285c0239421cc7b6a485cb2b7d650e507befe5281ac7aaf2094dd0afbba457df8a8bc2af3f1815b2e268ed85f1634a07e00a9b2024f79ab5e60ad040
 AUX mongodb.logrotate 205 BLAKE2B d47c211207e599d9b7f56dd9579d3a9eec577ad0efc07dd6980747b6aa59eec930b760f956dd6e180681c684e4507eb12cc88a985e506f77e0c3162ef7df4675 SHA512 8c089b1a11f494e4148fb4646265964c925bf937633a65e395ee1361d42facf837871dd493a9a2e0f480ae0e0829dbd3ed60794c5334e2716332e131fc5c2c51
 AUX mongodb.service 220 BLAKE2B ea55bb2f08066d7399e9e66f981f86395f6a177faa198c66f93ea2965ea80d61c170336a4f49fc7f1f855d3abd5e7cf3862d58a2be4a7708c0582fb4ff80b255 SHA512 177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9
+AUX mongodb.service-r1 239 BLAKE2B 4e2da934120da54034e2dd030cdd349e7fa9a22293f3d06ced3c0fa7e6b158303fa753b0bda8ff896139172f988224c6cdab98542445eff79fef122bdabd0db5 SHA512 3e268dddcdd4d78f6bb64167fb84ab3eb60b019058ecce44063d616ce6451fbf317316bb7630a5440792e9cd071674edad8e8093e07f9d07e823aca114cb1b81
 AUX mongos.conf-r2 648 BLAKE2B 420bebfafc1ef4af4b90580077a803fe30f37d63eca6509e7381ca5fcf4e5bc31e136dfc72b653b4d942fdeda058f9fcecc3dcbec9c61e2c82ac3324b9fc0f44 SHA512 5aa8ced8d83572358e008c0df45dbe72a2e9c0003c9f49514d6b91bf9b75d4fb48b189ffe00d14e5675679943a05215a9873c5c9bde9ab1be4ed4813e75714e3
 AUX mongos.confd-r3 470 BLAKE2B 9cf6f201d337430901d957a5a0811ff11ac2e81814aac2120c5018e6ec4c38b5ca22d19caea593834416c63609c69a8294227fb6b30200b41dfb29799cc5c1b4 SHA512 952fb9cf5d3eeea2006b101e23142e408c98d66d1f4f868f6ea5a4df6a6331ddcbcbdfb24f4b031c1a8c42652141a3684073b96dfc0b3fbd21dc6b5bcf0e36cb
 AUX mongos.initd-r3 422 BLAKE2B 90872d0d8cdc5e33e3eebee848f58a2db0511d48b496ba9318117b74ad9265ead53a21b7d1790729a62d61839099bee315ace8ff3646c01e096a943c2251bf88 SHA512 bf5897614d59c6b4e72529b126408a62ea37d9e9368e5ff69c8fcf2bad3ec09065cff09467f82117a892c51090018706d2f38c03cb9a974a61a49bd9efa0f144
@@ -24,9 +25,15 @@ DIST mongodb-src-r4.4.8.tar.gz 50492854 BLAKE2B 4776b17e88104879ea69468ff277b07d
 DIST mongodb-src-r5.0.2.tar.gz 54527477 BLAKE2B f71102f4c2711074498c288817ee06156cb030ee647541f6604582b918fb75239cc5a551c08b745b6296a2693d2a1ac28d94c1365b86bc508257b9d42142612a SHA512 179d57a0a12c5c23e54208c262edff6976f509324be8ad68d6761997dc702534f618dea1a24568fdb2d716359762e64da54e2d152a685447b4e0450996bf2154
 DIST mongodb-src-r5.0.5.tar.gz 54862473 BLAKE2B aafa693da904177a11067603f3835e2ee69abcdb206c2d36983633baa6008b861efeb590880098557e224cd7d6ac8fb23e4e9c63724d76bf90422862c99cdfe9 SHA512 318e58285c8a88fc3a4467ba8c1e6487a2aec403db02c50dbdb53df9a6671b9ea2417c8ee8212b205d642327d0d4bdd76f4bc9543c47e53115dfb981ef73f63e
 EBUILD mongodb-4.2.15-r1.ebuild 4815 BLAKE2B 06b240707fe453731b56711ee3959d76b528b5599edd537ac650bb71c1da360ad689fb2a7f5592ad5f6f30b5af5b3d4329e47d7f727206d57142294ab29aaf8b SHA512 463600e4cb4c84eedff6e6383d21faaadada38da2a022a96bf779bcecba8c4437992408908506df8652aab8bcc998bec0f31d9fe6573c036671cfefa6a219ffc
+EBUILD mongodb-4.2.15-r2.ebuild 4836 BLAKE2B 9dffca5172f407ffe3aaeaee5ad7978e67c40442319a88af05f12060d00d20ded121bc23d09a61e8b11c60954cee5aaca2f54c959af34a890bdeb90830d7f965 SHA512 1775dad9da751927f771602f822ef4e4a567751c36a8953b5907e0b6004d62aa96b47be62158a62db1d52c9f2f94efc1a40d8eabe01cab6c8f4c778892355392
+EBUILD mongodb-4.2.17-r1.ebuild 4856 BLAKE2B 56c64ee54d73015e192a1ece7ddba430cb3df561ee0d6c37b44fd1eea1a10a3f054a1290cf83db72ddbf72ae0e7c6d6f0874024009b7541ac83348de84b3fbc6 SHA512 4dc30db66f09c491f3eb0d264100b650479c197aa570f203be5839add856a29090c68ed1450698d8ab45b2ee82a6320e65e3de8e3ec182f9959295e58a2b9e7a
 EBUILD mongodb-4.2.17.ebuild 4836 BLAKE2B 71bcfb8ac78f1365c9244a71ef98727f14db7bee16a0970b84258a9e377e4b07201cf9b08b5453a7425a5d33a370e2a78008e97ced1e4b8eba0b99be21f93a21 SHA512 b01cd77321dc8d463e2caebde228226ce56fc308dec12f60bc9f1573e1629742eb51443625b5208897e33350167c8e3cac7ac1c50d6dc1b5de582848b7c85254
+EBUILD mongodb-4.4.10-r1.ebuild 4908 BLAKE2B 1aed44d5508a6e97055fa521d49df042719f3386de4c3d470f868e84943624e7151a4c5bec4e70a3994fb9d0ec8072a9d448f999f838fb16360acee8e9a60570 SHA512 9e5a096ba176de62c2b95657b9f604ca78fc7e2199d9d54f023ca7ccb1ef682e02814f8de283cb7fb2a25e99cdcfc79032d638f761fc7a4e5c0352364febfe64
 EBUILD mongodb-4.4.10.ebuild 4888 BLAKE2B 58287ee25140d53887ebd2f3574539ce2aad05d30758355da32c8dab3e187ebc5b47ccb87c112b0220eeb602ec23da5d9199441d88fe97f5217d0912d70e21bd SHA512 633272c0a5a0e38f59622b1074577b3d86284da9e1259c7855b0dfa7c901ad54563416636af2e86b8a0ec20c09961a757131819864c578335da9e364410ecdf4
 EBUILD mongodb-4.4.8-r1.ebuild 4867 BLAKE2B 935521811a6017674225c22ac41e97f09aaa4c379540be612b1345b3694407c2a762cbfe13c9fd25fbd53e759087180eef8c9610823624e28718dc74b3cac0f7 SHA512 52b9de7f98d1ab7c8d5f2421f05091e8ae1cfd79e70366b0c6e67725d042abbad1a4bb2024401a1d7e00005cf2d1d68c700b456f0c641f6d02311268eafb402e
+EBUILD mongodb-4.4.8-r2.ebuild 4888 BLAKE2B be48e9580680452abe6f06385f888bdd703affde4b06ed5bf0fb3548b4ff7b4e4d49edff5845581565a155e8a32f43d2d0044f6b5224ffabb8e82c05eda0d290 SHA512 8f257ab184ebee0aeb0bdf2e73beb9dfaeae5b06c33fc534a8239391357a65b1e9e8233b2e1784b05d76d1776c52fc9e25d869d2b202a289bc0a7ca0e95f9866
 EBUILD mongodb-5.0.2-r1.ebuild 4927 BLAKE2B cda52819b2615305ed018da514474ba39ebc222f1bff893f3139f7d018b87713d35e3d7c0b52f9a098e5eb02566d8da5bbd53e8b2292694844d8c3b352f316ec SHA512 d348c96ebe7e26ee6da5fd63e534b7c340eb31372d462138ee2137185473174bc1d1b65b1e502de7bf9386d49b08d9f9133c0545f9b916c17fccdee4e9b53ada
+EBUILD mongodb-5.0.2-r2.ebuild 4947 BLAKE2B 5d8eb8be56ff013b6d01a972832bb20c2825deeaa5b8f936cfdea428c04f580e45b16ce03bef47cb0c31cc9cf5cb854630d7752af0fc1c6fbd98256fe902e49c SHA512 793b82b03dba4927f300be7e6a1ac155a53f34a4edc5f876ac784e7705ff7fb12a26b3cc8a5a1d48cae5f0de5943d662f485f5ed02122c947da6c2924dbf9b03
+EBUILD mongodb-5.0.5-r1.ebuild 4923 BLAKE2B ac8a210477a4c629512cebfc1f54dbcca75b814ec5c9fc8af413d1532309fb09a94527291d06bc15b834764d2d2f57d6a29937f29d9db2608a0c8b59b8a0065c SHA512 c1d0787d5f3929356f536a99544726b0cb21ba31f8337ae3be69fda36741c110815720ea783ca020832c9ef92356149b50c5b1f4f65ea901ae94dfdc2789822b
 EBUILD mongodb-5.0.5.ebuild 4903 BLAKE2B 5ecf62cf6ec42d5f373d678de9036511b32e1faefb068a3b02e9ee2f8bc10f8e5df856e485768ec308f6c2a00eb93bfc3c37e6e0f8319d327a626fdc7ec0aa42 SHA512 03a9c2c8985b51a9849fa4cc18d5d72928c9d81c0fe8f1de407eed4df987d12c5ebd777a883c7caf216f89a48e9011cbf551fd4627173d9be30a01d9a545dad0
 MISC metadata.xml 919 BLAKE2B 59d8c500d1b14701caa3feef86c2377c3a2cb870bc218f8aaf993ddcf22f0b75e3b34715446900b6aaf03404387b67c5a23df3d47a64cc7b280a6bfc93f6de45 SHA512 af222eae62fc327ac2ff9f8bf2727ab8f1199a0aabb7fa9a1bd229bd817b9260fe6357ae0ca9d7184bcbc865e2a91195c84efecb430436a0bdb207910850cdda
diff --git a/dev-db/mongodb/files/mongodb.service-r1 b/dev-db/mongodb/files/mongodb.service-r1
new file mode 100644
index 000000000000..a9adb390bd19
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.service-r1
@@ -0,0 +1,12 @@
+[Unit]
+Description=High-performance, schema-free document-oriented database
+After=network.target
+
+[Service]
+User=mongodb
+ExecStart=/usr/bin/mongod --quiet --config /etc/mongodb.conf
+LimitNOFILE=65536
+
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-db/mongodb/mongodb-4.2.15-r2.ebuild b/dev-db/mongodb/mongodb-4.2.15-r2.ebuild
new file mode 100644
index 000000000000..3edd0a731a40
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.2.15-r2.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="debug kerberos lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3:=
+	>=dev-cpp/yaml-cpp-0.6.2:=
+	>=dev-libs/boost-1.70:=[threads(+)]
+	>=dev-libs/libpcre-8.42[cxx]
+	app-arch/zstd:=
+	dev-libs/snowball-stemmer:=
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	ssl? (
+		>=dev-libs/openssl-1.0.1g:0=
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
+		>=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+	"${FILESDIR}/${PN}-4.2.15-no-compass.patch"
+	"${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
+		has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
+	fi
+
+	has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
+			ewarn "To upgrade from a version earlier than the 4.0-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 4.0-series. Then upgrade to 4.2 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+		--use-system-zstd
+	)
+
+	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	ewarn "Tests may hang with FEATURES=usersandbox"
+	"${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.2.17-r1.ebuild b/dev-db/mongodb/mongodb-4.2.17-r1.ebuild
new file mode 100644
index 000000000000..874b0f131583
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.2.17-r1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="debug kerberos lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3:=
+	>=dev-cpp/yaml-cpp-0.6.2:=
+	>=dev-libs/boost-1.70:=[threads(+)]
+	>=dev-libs/libpcre-8.42[cxx]
+	app-arch/zstd:=
+	dev-libs/snowball-stemmer:=
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	ssl? (
+		>=dev-libs/openssl-1.0.1g:0=
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
+		>=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+	"${FILESDIR}/${PN}-4.2.15-no-compass.patch"
+	"${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
+		has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
+	fi
+
+	has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
+			ewarn "To upgrade from a version earlier than the 4.0-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 4.0-series. Then upgrade to 4.2 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+		--use-system-zstd
+	)
+
+	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	ewarn "Tests may hang with FEATURES=usersandbox"
+	"${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.4.10-r1.ebuild b/dev-db/mongodb/mongodb-4.4.10-r1.ebuild
new file mode 100644
index 000000000000..a110d8e1be17
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.4.10-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+SCONS_MIN_VERSION="3.3.1"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 -riscv"
+IUSE="debug kerberos lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3:=
+	>=dev-cpp/yaml-cpp-0.6.2:=
+	>=dev-libs/boost-1.70:=[threads(+),nls]
+	>=dev-libs/libpcre-8.42[cxx]
+	app-arch/zstd:=
+	dev-libs/snowball-stemmer:=
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	ssl? (
+		>=dev-libs/openssl-1.0.1g:0=
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
+		>=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-100 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.4.8-no-compass.patch"
+	"${FILESDIR}/${PN}-4.4.1-boost.patch"
+	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+	"${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
+		has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
+	fi
+
+	has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 4.2; then
+			ewarn "To upgrade from a version earlier than the 4.2-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 4.2-series. Then upgrade to 4.4 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 4.2 before upgrading."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+		--use-system-zstd
+	)
+
+	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	ewarn "Tests may hang with FEATURES=usersandbox"
+	"${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+	dobin build/install/bin/{mongo,mongod,mongos}
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.4.8-r2.ebuild b/dev-db/mongodb/mongodb-4.4.8-r2.ebuild
new file mode 100644
index 000000000000..1e73ef98da40
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.4.8-r2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+SCONS_MIN_VERSION="3.3.1"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 -riscv"
+IUSE="debug kerberos lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3:=
+	>=dev-cpp/yaml-cpp-0.6.2:=
+	>=dev-libs/boost-1.70:=[threads(+),nls]
+	>=dev-libs/libpcre-8.42[cxx]
+	app-arch/zstd:=
+	dev-libs/snowball-stemmer:=
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	ssl? (
+		>=dev-libs/openssl-1.0.1g:0=
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
+		>=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-100 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.4.8-no-compass.patch"
+	"${FILESDIR}/${PN}-4.4.1-boost.patch"
+	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+	"${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
+		has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
+	fi
+
+	has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 4.2; then
+			ewarn "To upgrade from a version earlier than the 4.2-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 4.2-series. Then upgrade to 4.4 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 4.2 before upgrading."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+		--use-system-zstd
+	)
+
+	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	ewarn "Tests may hang with FEATURES=usersandbox"
+	"${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+	dobin build/install/bin/{mongo,mongod,mongos}
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-5.0.2-r2.ebuild b/dev-db/mongodb/mongodb-5.0.2-r2.ebuild
new file mode 100644
index 000000000000..f80a7d9aa426
--- /dev/null
+++ b/dev-db/mongodb/mongodb-5.0.2-r2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+SCONS_MIN_VERSION="3.3.1"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 -riscv"
+CPU_FLAGS="cpu_flags_x86_avx"
+IUSE="debug kerberos lto mongosh ssl +tools ${CPU_FLAGS}"
+
+# https://github.com/mongodb/mongo/wiki/Test-The-Mongodb-Server
+# resmoke needs python packages not yet present in Gentoo
+RESTRICT="test"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3:=
+	>=dev-cpp/yaml-cpp-0.6.2:=
+	>=dev-libs/boost-1.70:=[threads(+),nls]
+	>=dev-libs/libpcre-8.42[cxx]
+	app-arch/zstd:=
+	dev-libs/snowball-stemmer:=
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	ssl? (
+		>=dev-libs/openssl-1.0.1g:0=
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		>=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )"
+PDEPEND="
+	mongosh? ( app-admin/mongosh-bin )
+	tools? ( >=app-admin/mongo-tools-100 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.1-boost.patch"
+	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+	"${FILESDIR}/${PN}-5.0.2-fix-scons.patch"
+	"${FILESDIR}/${PN}-5.0.2-no-compass.patch"
+	"${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch"
+	"${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
+	"${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	# Bug 809692
+	if use amd64 && ! use cpu_flags_x86_avx; then
+		eerror "MongoDB 5.0 requires use of the AVX instruction set"
+		eerror "https://docs.mongodb.com/v5.0/administration/production-notes/"
+		die "MongoDB requires AVX"
+	fi
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 4.4; then
+			ewarn "To upgrade from a version earlier than the 4.4-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 4.4-series. Then upgrade to 5.0 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 4.4 before upgrading."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost,pcre-*,snappy-*,yaml-cpp,zlib-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--jobs="$(makeopts_jobs)"
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+		--use-system-zstd
+	)
+
+	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	PREFIX="${EPREFIX}/usr" ./buildscripts/scons.py "${scons_opts[@]}" install-core || die
+}
+
+src_install() {
+	dobin build/install/bin/{mongo,mongod,mongos}
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-5.0.5-r1.ebuild b/dev-db/mongodb/mongodb-5.0.5-r1.ebuild
new file mode 100644
index 000000000000..7cdc397e6121
--- /dev/null
+++ b/dev-db/mongodb/mongodb-5.0.5-r1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+SCONS_MIN_VERSION="3.3.1"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 -riscv"
+CPU_FLAGS="cpu_flags_x86_avx"
+IUSE="debug kerberos lto mongosh ssl +tools ${CPU_FLAGS}"
+
+# https://github.com/mongodb/mongo/wiki/Test-The-Mongodb-Server
+# resmoke needs python packages not yet present in Gentoo
+RESTRICT="test"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3:=
+	>=dev-cpp/yaml-cpp-0.6.2:=
+	>=dev-libs/boost-1.70:=[threads(+),nls]
+	>=dev-libs/libpcre-8.42[cxx]
+	app-arch/zstd:=
+	dev-libs/snowball-stemmer:=
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	ssl? (
+		>=dev-libs/openssl-1.0.1g:0=
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		>=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )"
+PDEPEND="
+	mongosh? ( app-admin/mongosh-bin )
+	tools? ( >=app-admin/mongo-tools-100 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.1-boost.patch"
+	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+	"${FILESDIR}/${PN}-5.0.2-fix-scons.patch"
+	"${FILESDIR}/${PN}-5.0.2-no-compass.patch"
+	"${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch"
+	"${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	# Bug 809692
+	if use amd64 && ! use cpu_flags_x86_avx; then
+		eerror "MongoDB 5.0 requires use of the AVX instruction set"
+		eerror "https://docs.mongodb.com/v5.0/administration/production-notes/"
+		die "MongoDB requires AVX"
+	fi
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 4.4; then
+			ewarn "To upgrade from a version earlier than the 4.4-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 4.4-series. Then upgrade to 5.0 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 4.4 before upgrading."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost,pcre-*,snappy-*,yaml-cpp,zlib-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--jobs="$(makeopts_jobs)"
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+		--use-system-zstd
+	)
+
+	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	PREFIX="${EPREFIX}/usr" ./buildscripts/scons.py "${scons_opts[@]}" install-core || die
+}
+
+src_install() {
+	dobin build/install/bin/{mongo,mongod,mongos}
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 4c51e9284159..16ec5c8e7ab7 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,8 +1,7 @@
 AUX mycli-1.21.1-fix-test-install.patch 456 BLAKE2B 3f4eafe405a2151b1b2897ac60347a5fdce45747f927a40367943ad78ef96753ad106bdefe516b76946fa509b17a31d9423cf0b5cf311e79174ce5e4f6320428 SHA512 90c53b12baee1339cdc629615a021ff0290e6350f3358491cd163c4405d49be02340a56a73475623a6b49877cef53e3c5bd9aa93897aa91769a402e8f4c0b88a
-AUX mycli-1.22.2_p20201026.patch 17058 BLAKE2B b9e436fab98be62fae2b4ff549914d9431520a179af946db8a48255d1f7c2e36f90b91d4adc698c7b84095d00483f14a22f5e0c99ab022a1ad6364601482db63 SHA512 0e7b5cd9e687056514447e50df1310090d04f50666455c87ae32cf2ffb2935e923d93a8343d44adb2393d696238cdda5f215535267dca45e9861a8d86a0a21c3
-DIST mycli-1.22.2_p20201026.tar.gz 269338 BLAKE2B 42f4349e65a43829691fd7fa0fa1a57968cf34ffba04156ae221d7a2713179826fc09903e45b6f05fbf05688f956a9cd95e87393179992378766b3a3a6ef9c6e SHA512 70d68d7517322b28783c324d463664c2794ba26cc78e0eee056891ce43dbce57c4dd9c13982ac2976af07ff1fa3d4552cb22bf42b9c7885c93483ba86b873636
 DIST mycli-1.24.1.tar.gz 275983 BLAKE2B cc03ebd0f4de1fabbd1c186139aac04a50d01529190972cac63765a4d3e688e994c112d001489bf1dfb17541370e0c348a368d85a86b7eed335b775b96897765 SHA512 5f8ffb98fd285d2e556bef7cefdc77588983c0028c7c24084710633fb469ae3c5ab2232ca23e87406d44d87e503c113039e6884ec9efd603f45b3ab7ed7c0925
-EBUILD mycli-1.22.2_p20201026.ebuild 1573 BLAKE2B abd09587e3cd1fb9012972a2483f619a28b107fbba19eb3497cebedbc4979d23c79df2bd64e7a012a6d2f9ca7f2083661ac967df88a2e205e6c949761e77bc4e SHA512 eb434c741d4c8a39e69215698bf8f58578bf57675eb42d8bf1351fc9c2b95520a6809200733a0b28ad03eb3708fe34b85909f28de569842627143a5fdada4d72
+DIST mycli-1.25.0.tar.gz 277022 BLAKE2B eabb07003741bc041fcfc7be92beade5bdf0c19d0be00b1a98037d38b164043e5280254b9c8446254928253f6059c33ae9395df780a2f30c5d9cbebffe020895 SHA512 e20b1466f0f2bf81f0d65bd23f97eae6b0943029c89d9d45f84368abc5f12c3054c09a45c4daea47831a192417e2e5be7bcd6622ea518e57b68f975a028d3f79
 EBUILD mycli-1.24.1.ebuild 1618 BLAKE2B 6abc3adf00e104ab39c2a48bf3b8ddf4c20f0239ef11344c3fe60aeceff00c618131fc51dfcf9168cfc223ece23d3fef41815f3581fe0de7f0a6ce22df8bdf8b SHA512 53c5e01e9094ef99f32a1e7cde1656cc39899396b65cb9587df14febfcc1dbfae60c8898a7e0a6ed8ab5fdf2773445eb6cb3fabfc824093db4e837b2b4843246
+EBUILD mycli-1.25.0.ebuild 1618 BLAKE2B e5c4dfeac65e02d4e03d67f9057883c63b754f0c047587e0abe270a7039908a7a756db5596a823b5f3b86dcac68a9c7a958b4aeaec65e0296447d45dc858fe5f SHA512 1de29dc9f6d3145fb1da2214e88d723829e9243561951a4ab5eed539df84ba727a48054bc14b50508961a7f772497b84b5007fe73f592eaba6100ed71acfff49
 EBUILD mycli-9999.ebuild 1521 BLAKE2B 45f5354d25dc81e6ebe2fdbc9ffa82ab742db3e3df0d66f5a06756d92443314f4f86e2a7f656503d0f1ee33c72056d8c86744ca1adc6abfd19716ef6d109e70c SHA512 0129118820272ddbbd4f0be542992da4ae8e255c1047a07215f2ef92e91b02376d78893384e04b2bf9d2d4d7d996c552c83ebd6fb174312d5262714c97440fcf
 MISC metadata.xml 407 BLAKE2B dfa0f0bca1f39157b698c2109ed478e36ad966b7af46494cfba11481f9430c4ecd0738b231f66620618fe1ce7debf3e02108af4938aeb587c599493bc8faef60 SHA512 8ff03bb08d6a3d08216ba13e0b8c3d5aaba4ebc71eb6e77a66c154b68426f766124c8f4b5008a21a1a7a4c23587bc07ea91aec3edf98226dc9c8c3303ada0e54
diff --git a/dev-db/mycli/files/mycli-1.22.2_p20201026.patch b/dev-db/mycli/files/mycli-1.22.2_p20201026.patch
deleted file mode 100644
index 3e7c719bf396..000000000000
--- a/dev-db/mycli/files/mycli-1.22.2_p20201026.patch
+++ /dev/null
@@ -1,470 +0,0 @@
-diff --git a/.travis.yml b/.travis.yml
-index 0afb5cc..182dea7 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -12,7 +12,7 @@ matrix:
- 
- install:
-   - pip install -r requirements-dev.txt
--  - pip install -e .
-+  - pip install --no-cache-dir -e .
-   - sudo rm -f /etc/mysql/conf.d/performance-schema.cnf
-   - sudo service mysql restart
- 
-diff --git a/README.md b/README.md
-index efe804d..d5a0687 100644
---- a/README.md
-+++ b/README.md
-@@ -96,6 +96,7 @@ $ sudo apt-get install mycli # Only on debian or ubuntu
-       --local-infile BOOLEAN        Enable/disable LOAD DATA LOCAL INFILE.
-       --login-path TEXT             Read this path from the login file.
-       -e, --execute TEXT            Execute command and quit.
-+      --init-command TEXT           SQL statement to execute after connecting.
-       --help                        Show this message and exit.
- 
- Features
-diff --git a/changelog.md b/changelog.md
-index a4fea35..508c801 100644
---- a/changelog.md
-+++ b/changelog.md
-@@ -1,9 +1,22 @@
-+TBD
-+===
-+
-+Features:
-+---------
-+
-+* Add an option `--init-command` to execute SQL after connecting (Thanks: [KITAGAWA Yasutaka]).
-+
-+Bug Fixes:
-+----------
-+* Fixed compatibility with sqlparse 0.4 (Thanks: [mtorromeo]).
-+
- 1.22.2
- ======
- 
- Bug Fixes:
- ----------
--*  Make the `pwd` module optional. 
-+
-+*  Make the `pwd` module optional.
- 
- 1.22.1
- ======
-@@ -18,6 +31,11 @@ Features:
- * Add an option `--list-ssh-config` to list ssh configurations.
- * Add an option `--ssh-config-path` to choose ssh configuration path.
- 
-+Bug Fixes:
-+----------
-+
-+* Fix specifying empty password with `--password=''` when config file has a password set (Thanks: [Zach DeCook]).
-+
- 
- 1.21.1
- ======
-@@ -28,6 +46,7 @@ Bug Fixes:
- 
- * Fix broken auto-completion for favorite queries (Thanks: [Amjith]).
- * Fix undefined variable exception when running with --no-warn (Thanks: [Georgy Frolov])
-+* Support setting color for null value (Thanks: [laixintao])
- 
- 1.21.0
- ======
-@@ -768,3 +787,6 @@ Bug Fixes:
- [François Pietka]: https://github.com/fpietka
- [Frederic Aoustin]: https://github.com/fraoustin
- [Georgy Frolov]: https://github.com/pasenor
-+[Zach DeCook]: https://zachdecook.com
-+[laixintao]: https://github.com/laixintao
-+[mtorromeo]: https://github.com/mtorromeo
-diff --git a/mycli/AUTHORS b/mycli/AUTHORS
-index b3636d9..a1204b0 100644
---- a/mycli/AUTHORS
-+++ b/mycli/AUTHORS
-@@ -72,6 +72,10 @@ Contributors:
-   * Jakub Boukal
-   * Takeshi D. Itoh
-   * laixintao
-+  * Zach DeCook
-+  * kevinhwang91
-+  * KITAGAWA Yasutaka
-+  * Massimiliano Torromeo
- 
- Creator:
- --------
-diff --git a/mycli/clistyle.py b/mycli/clistyle.py
-index c94f793..293f0f4 100644
---- a/mycli/clistyle.py
-+++ b/mycli/clistyle.py
-@@ -34,6 +34,7 @@ TOKEN_TO_PROMPT_STYLE = {
-     Token.Output.Header: 'output.header',
-     Token.Output.OddRow: 'output.odd-row',
-     Token.Output.EvenRow: 'output.even-row',
-+    Token.Output.Null: 'output.null',
-     Token.Prompt: 'prompt',
-     Token.Continuation: 'continuation',
- }
-diff --git a/mycli/main.py b/mycli/main.py
-index 03797a0..dffd724 100755
---- a/mycli/main.py
-+++ b/mycli/main.py
-@@ -98,7 +98,7 @@ class MyCli(object):
-         xdg_config_home = "~/.config"
-     system_config_files = [
-         '/etc/myclirc',
--        os.path.join(xdg_config_home, "mycli", "myclirc")
-+        os.path.join(os.path.expanduser(xdg_config_home), "mycli", "myclirc")
-     ]
- 
-     default_config_file = os.path.join(PACKAGE_ROOT, 'myclirc')
-@@ -152,7 +152,7 @@ class MyCli(object):
-                                 c['main'].as_bool('auto_vertical_output')
- 
-         # Write user config if system config wasn't the last config loaded.
--        if c.filename not in self.system_config_files:
-+        if c.filename not in self.system_config_files and not os.path.exists(myclirc):
-             write_default_config(self.default_config_file, myclirc)
- 
-         # audit log
-@@ -363,7 +363,7 @@ class MyCli(object):
-     def connect(self, database='', user='', passwd='', host='', port='',
-                 socket='', charset='', local_infile='', ssl='',
-                 ssh_user='', ssh_host='', ssh_port='',
--                ssh_password='', ssh_key_filename=''):
-+                ssh_password='', ssh_key_filename='', init_command=''):
- 
-         cnf = {'database': None,
-                'user': None,
-@@ -396,7 +396,7 @@ class MyCli(object):
-         port = port or cnf['port']
-         ssl = ssl or {}
- 
--        passwd = passwd or cnf['password']
-+        passwd = passwd if isinstance(passwd, str) else cnf['password']
-         charset = charset or cnf['default-character-set'] or 'utf8'
- 
-         # Favor whichever local_infile option is set.
-@@ -420,7 +420,7 @@ class MyCli(object):
-                 self.sqlexecute = SQLExecute(
-                     database, user, passwd, host, port, socket, charset,
-                     local_infile, ssl, ssh_user, ssh_host, ssh_port,
--                    ssh_password, ssh_key_filename
-+                    ssh_password, ssh_key_filename, init_command
-                 )
-             except OperationalError as e:
-                 if ('Access denied for user' in e.args[1]):
-@@ -429,7 +429,7 @@ class MyCli(object):
-                     self.sqlexecute = SQLExecute(
-                         database, user, new_passwd, host, port, socket,
-                         charset, local_infile, ssl, ssh_user, ssh_host,
--                        ssh_port, ssh_password, ssh_key_filename
-+                        ssh_port, ssh_password, ssh_key_filename, init_command
-                     )
-                 else:
-                     raise e
-@@ -1051,6 +1051,8 @@ class MyCli(object):
-               help='Read this path from the login file.')
- @click.option('-e', '--execute',  type=str,
-               help='Execute command and quit.')
-+@click.option('--init-command', type=str,
-+              help='SQL statement to execute after connecting.')
- @click.argument('database', default='', nargs=1)
- def cli(database, user, host, port, socket, password, dbname,
-         version, verbose, prompt, logfile, defaults_group_suffix,
-@@ -1058,7 +1060,8 @@ def cli(database, user, host, port, socket, password, dbname,
-         ssl_ca, ssl_capath, ssl_cert, ssl_key, ssl_cipher,
-         ssl_verify_server_cert, table, csv, warn, execute, myclirc, dsn,
-         list_dsn, ssh_user, ssh_host, ssh_port, ssh_password,
--        ssh_key_filename, list_ssh_config, ssh_config_path, ssh_config_host):
-+        ssh_key_filename, list_ssh_config, ssh_config_path, ssh_config_host,
-+        init_command):
-     """A MySQL terminal client with auto-completion and syntax highlighting.
- 
-     \b
-@@ -1182,7 +1185,8 @@ def cli(database, user, host, port, socket, password, dbname,
-         ssh_host=ssh_host,
-         ssh_port=ssh_port,
-         ssh_password=ssh_password,
--        ssh_key_filename=ssh_key_filename
-+        ssh_key_filename=ssh_key_filename,
-+        init_command=init_command
-     )
- 
-     mycli.logger.debug('Launch Params: \n'
-diff --git a/mycli/myclirc b/mycli/myclirc
-index 534b201..ba3ea1e 100644
---- a/mycli/myclirc
-+++ b/mycli/myclirc
-@@ -111,6 +111,7 @@ bottom-toolbar.transaction.failed = 'bg:#222222 #ff005f bold'
- output.header = "#00ff5f bold"
- output.odd-row = ""
- output.even-row = ""
-+output.null = "#808080"
- 
- # Favorite queries.
- [favorite_queries]
-diff --git a/mycli/packages/completion_engine.py b/mycli/packages/completion_engine.py
-index 2b19c32..3cff2cc 100644
---- a/mycli/packages/completion_engine.py
-+++ b/mycli/packages/completion_engine.py
-@@ -2,7 +2,6 @@ import os
- import sys
- import sqlparse
- from sqlparse.sql import Comparison, Identifier, Where
--from sqlparse.compat import text_type
- from .parseutils import last_word, extract_tables, find_prev_keyword
- from .special import parse_special_command
- 
-@@ -55,7 +54,7 @@ def suggest_type(full_text, text_before_cursor):
-         stmt_start, stmt_end = 0, 0
- 
-         for statement in parsed:
--            stmt_len = len(text_type(statement))
-+            stmt_len = len(str(statement))
-             stmt_start, stmt_end = stmt_end, stmt_end + stmt_len
- 
-             if stmt_end >= current_pos:
-diff --git a/mycli/sqlexecute.py b/mycli/sqlexecute.py
-index c68af0f..7534982 100644
---- a/mycli/sqlexecute.py
-+++ b/mycli/sqlexecute.py
-@@ -42,7 +42,7 @@ class SQLExecute(object):
- 
-     def __init__(self, database, user, password, host, port, socket, charset,
-                  local_infile, ssl, ssh_user, ssh_host, ssh_port, ssh_password,
--                 ssh_key_filename):
-+                 ssh_key_filename, init_command=None):
-         self.dbname = database
-         self.user = user
-         self.password = password
-@@ -59,12 +59,13 @@ class SQLExecute(object):
-         self.ssh_port = ssh_port
-         self.ssh_password = ssh_password
-         self.ssh_key_filename = ssh_key_filename
-+        self.init_command = init_command
-         self.connect()
- 
-     def connect(self, database=None, user=None, password=None, host=None,
-                 port=None, socket=None, charset=None, local_infile=None,
-                 ssl=None, ssh_host=None, ssh_port=None, ssh_user=None,
--                ssh_password=None, ssh_key_filename=None):
-+                ssh_password=None, ssh_key_filename=None, init_command=None):
-         db = (database or self.dbname)
-         user = (user or self.user)
-         password = (password or self.password)
-@@ -79,6 +80,7 @@ class SQLExecute(object):
-         ssh_port = (ssh_port or self.ssh_port)
-         ssh_password = (ssh_password or self.ssh_password)
-         ssh_key_filename = (ssh_key_filename or self.ssh_key_filename)
-+        init_command = (init_command or self.init_command)
-         _logger.debug(
-             'Connection DB Params: \n'
-             '\tdatabase: %r'
-@@ -93,9 +95,11 @@ class SQLExecute(object):
-             '\tssh_host: %r'
-             '\tssh_port: %r'
-             '\tssh_password: %r'
--            '\tssh_key_filename: %r',
-+            '\tssh_key_filename: %r'
-+            '\tinit_command: %r',
-             db, user, host, port, socket, charset, local_infile, ssl,
--            ssh_user, ssh_host, ssh_port, ssh_password, ssh_key_filename
-+            ssh_user, ssh_host, ssh_port, ssh_password, ssh_key_filename,
-+            init_command
-         )
-         conv = conversions.copy()
-         conv.update({
-@@ -110,12 +114,16 @@ class SQLExecute(object):
-         if ssh_host:
-             defer_connect = True
- 
-+        client_flag = pymysql.constants.CLIENT.INTERACTIVE
-+        if init_command and len(list(special.split_queries(init_command))) > 1:
-+            client_flag |= pymysql.constants.CLIENT.MULTI_STATEMENTS
-+
-         conn = pymysql.connect(
-             database=db, user=user, password=password, host=host, port=port,
-             unix_socket=socket, use_unicode=True, charset=charset,
--            autocommit=True, client_flag=pymysql.constants.CLIENT.INTERACTIVE,
-+            autocommit=True, client_flag=client_flag,
-             local_infile=local_infile, conv=conv, ssl=ssl, program_name="mycli",
--            defer_connect=defer_connect
-+            defer_connect=defer_connect, init_command=init_command
-         )
- 
-         if ssh_host:
-@@ -146,6 +154,7 @@ class SQLExecute(object):
-         self.socket = socket
-         self.charset = charset
-         self.ssl = ssl
-+        self.init_command = init_command
-         # retrieve connection id
-         self.reset_connection_id()
- 
-diff --git a/requirements-dev.txt b/requirements-dev.txt
-index 8e206a5..7a38ed5 100644
---- a/requirements-dev.txt
-+++ b/requirements-dev.txt
-@@ -3,8 +3,8 @@ pytest!=3.3.0
- pytest-cov==2.4.0
- tox
- twine==1.12.1
--behave
--pexpect
-+behave>=1.2.4
-+pexpect==3.3
- coverage==5.0.4
- codecov==2.0.9
- autopep8==1.3.3
-diff --git a/setup.py b/setup.py
-index 156cd1a..fbab22e 100755
---- a/setup.py
-+++ b/setup.py
-@@ -24,7 +24,7 @@ install_requirements = [
-     'sqlparse>=0.3.0,<0.4.0',
-     'configobj >= 5.0.5',
-     'cryptography >= 1.0.0',
--    'cli_helpers[styles] > 1.1.0',
-+    'cli_helpers[styles] >= 2.0.1',
- ]
- 
- 
-@@ -65,7 +65,7 @@ class test(TestCommand):
-     def initialize_options(self):
-         TestCommand.initialize_options(self)
-         self.pytest_args = ''
--        self.behave_args = ''
-+        self.behave_args = '--no-capture'
- 
-     def run_tests(self):
-         unit_test_errno = subprocess.call(
-diff --git a/test/features/environment.py b/test/features/environment.py
-index 1a49dbe..cb35140 100644
---- a/test/features/environment.py
-+++ b/test/features/environment.py
-@@ -16,7 +16,7 @@ def before_all(context):
-     os.environ['LINES'] = "100"
-     os.environ['COLUMNS'] = "100"
-     os.environ['EDITOR'] = 'ex'
--    os.environ['LC_ALL'] = 'en_US.utf8'
-+    os.environ['LC_ALL'] = 'en_US.UTF-8'
-     os.environ['PROMPT_TOOLKIT_NO_CPR'] = '1'
- 
-     test_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-@@ -118,11 +118,12 @@ def after_scenario(context, _):
-             host = context.conf['host']
-             dbname = context.currentdb
-             context.cli.expect_exact(
--                '{0}@{1}:{2}> '.format(
-+                '{0}@{1}:{2}>'.format(
-                     user, host, dbname
-                 ),
-                 timeout=5
-             )
-+        context.cli.sendcontrol('c')
-         context.cli.sendcontrol('d')
-         context.cli.expect_exact(pexpect.EOF, timeout=5)
- 
-diff --git a/test/features/steps/crud_database.py b/test/features/steps/crud_database.py
-index a0bfa53..be6dec0 100644
---- a/test/features/steps/crud_database.py
-+++ b/test/features/steps/crud_database.py
-@@ -64,15 +64,13 @@ def step_see_prompt(context):
-     user = context.conf['user']
-     host = context.conf['host']
-     dbname = context.currentdb
--    wrappers.expect_exact(context, '{0}@{1}:{2}> '.format(
--        user, host, dbname), timeout=5)
--    context.atprompt = True
-+    wrappers.wait_prompt(context, '{0}@{1}:{2}> '.format(user, host, dbname))
- 
- 
- @then('we see help output')
- def step_see_help(context):
-     for expected_line in context.fixture_data['help_commands.txt']:
--        wrappers.expect_exact(context, expected_line + '\r\n', timeout=1)
-+        wrappers.expect_exact(context, expected_line, timeout=1)
- 
- 
- @then('we see database created')
-@@ -96,10 +94,7 @@ def step_see_db_dropped_no_default(context):
-     context.currentdb = None
- 
-     wrappers.expect_exact(context, 'Query OK, 0 rows affected', timeout=2)
--    wrappers.expect_exact(context, '{0}@{1}:{2}> '.format(
--        user, host, database), timeout=5)
--
--    context.atprompt = True
-+    wrappers.wait_prompt(context, '{0}@{1}:{2}>'.format(user, host, database))
- 
- 
- @then('we see database connected')
-diff --git a/test/features/steps/wrappers.py b/test/features/steps/wrappers.py
-index 565ca59..de833dd 100644
---- a/test/features/steps/wrappers.py
-+++ b/test/features/steps/wrappers.py
-@@ -88,7 +88,7 @@ def wait_prompt(context, prompt=None):
-         user = context.conf['user']
-         host = context.conf['host']
-         dbname = context.currentdb
--        prompt = '{0}@{1}:{2}> '.format(
-+        prompt = '{0}@{1}:{2}>'.format(
-             user, host, dbname),
-     expect_exact(context, prompt, timeout=5)
-     context.atprompt = True
-diff --git a/test/test_main.py b/test/test_main.py
-index 3f92bd1..707c359 100644
---- a/test/test_main.py
-+++ b/test/test_main.py
-@@ -492,3 +492,37 @@ def test_ssh_config(monkeypatch):
-             MockMyCli.connect_args["ssh_host"] == "arg_host" and \
-             MockMyCli.connect_args["ssh_port"] == 3 and \
-             MockMyCli.connect_args["ssh_key_filename"] == "/path/to/key"
-+
-+
-+@dbtest
-+def test_init_command_arg(executor):
-+    init_command = "set sql_select_limit=1000"
-+    sql = 'show variables like "sql_select_limit";'
-+    runner = CliRunner()
-+    result = runner.invoke(
-+        cli, args=CLI_ARGS + ["--init-command", init_command], input=sql
-+    )
-+
-+    expected = "sql_select_limit\t1000\n"
-+    assert result.exit_code == 0
-+    assert expected in result.output
-+
-+
-+@dbtest
-+def test_init_command_multiple_arg(executor):
-+    init_command = 'set sql_select_limit=2000; set max_join_size=20000'
-+    sql = (
-+        'show variables like "sql_select_limit";\n'
-+        'show variables like "max_join_size"'
-+    )
-+    runner = CliRunner()
-+    result = runner.invoke(
-+        cli, args=CLI_ARGS + ['--init-command', init_command], input=sql
-+    )
-+
-+    expected_sql_select_limit = 'sql_select_limit\t2000\n'
-+    expected_max_join_size = 'max_join_size\t20000\n'
-+
-+    assert result.exit_code == 0
-+    assert expected_sql_select_limit in result.output
-+    assert expected_max_join_size in result.output
-diff --git a/test/test_tabular_output.py b/test/test_tabular_output.py
-index 7d7d000..c20c7de 100644
---- a/test/test_tabular_output.py
-+++ b/test/test_tabular_output.py
-@@ -16,7 +16,7 @@ from pymysql.constants import FIELD_TYPE
- @pytest.fixture
- def mycli():
-     cli = MyCli()
--    cli.connect(None, USER, PASSWORD, HOST, PORT, None)
-+    cli.connect(None, USER, PASSWORD, HOST, PORT, None, init_command=None)
-     return cli
- 
- 
diff --git a/dev-db/mycli/mycli-1.22.2_p20201026.ebuild b/dev-db/mycli/mycli-1.25.0.ebuild
index f660a9ed97dc..8880c86f5a31 100644
--- a/dev-db/mycli/mycli-1.22.2_p20201026.ebuild
+++ b/dev-db/mycli/mycli-1.25.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_SINGLE_IMPL=yes
 inherit distutils-r1
 
@@ -21,32 +21,37 @@ IUSE="ssh"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
+		>=dev-python/cli_helpers-2.2.1[${PYTHON_USEDEP}]
 		>=dev-python/click-7.0[${PYTHON_USEDEP}]
 		>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
 		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
 		<dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pyaes[${PYTHON_USEDEP}]
 		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
 		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+		dev-python/pyperclip[${PYTHON_USEDEP}]
 		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
 		<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
 		ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
 "
 BDEPEND="
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )"
-
+	test? ( $(python_gen_cond_dep '
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/paramiko[${PYTHON_USEDEP}]
+	') )
+"
 distutils_enable_tests pytest
 
-PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" "${FILESDIR}/mycli-1.22.2_p20201026.patch" )
+PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
 
 python_test() {
-	epytest --capture=sys \
-		--doctest-modules \
-		--doctest-ignore-import-errors \
-		--ignore=setup.py \
-		--ignore=mycli/magic.py \
-		--ignore=mycli/packages/parseutils.py \
-		--ignore=test/features \
-		--ignore=mycli/packages/paramiko_stub/__init__.py
+	local EPYTEST_IGNORE=(
+		setup.py
+		mycli/magic.py
+		mycli/packages/parseutils.py
+		test/features
+		mycli/packages/paramiko_stub/__init__.py
+	)
+	epytest --capture=sys --doctest-modules --doctest-ignore-import-errors
 }
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index ecf36ecd1cfc..71a8ae021eee 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -4,5 +4,5 @@ DIST mydumper-0.11.3-5.tar.gz 105032 BLAKE2B 722938bf88fdea17804542c28f0613f4e79
 DIST mydumper-0.11.5-2.tar.gz 110088 BLAKE2B c9e2f56ce7cc206f311ba00fd82e96479cd0313d99260ae27130489b5aa02e0b465c96900e41e9eb017d68022501bf327495ae39c8a64b330dc1072b3fb5ca9b SHA512 f600c086c7e3402c3d35070709c5968e30046be5fc351e67dca05d2d7c48565e68ccbba08cf01195aa4d2ae3f2bdf8df84338d4f44a40504b583959fb67e72d8
 EBUILD mydumper-0.11.1.3.ebuild 1102 BLAKE2B e91d45b8773d91af63c6688b12b87f39c4538d48216b6583f44b6b9c58366971392e37cfdfb15a4e595b70639ab33f9dcecf6c1ff134bca9179c0f454ee3d139 SHA512 6be8ff2856833ce2a3a8252abdc09b030e421cbadf0eb6631964a9495ff750ac56811c4294b9196180def85abad0ddebeb627ebe7b77f37a849aae942ce71218
 EBUILD mydumper-0.11.3.5.ebuild 1103 BLAKE2B 8d0b27e49c8334030907ce1b96d49c1bbd1a37a82840a2619064201ff636d8d7a2b2e48832ff4a18bce5333455c948cbb9bfb97ab499e0416b88339f3b0e25ac SHA512 db64fc1e96b46cece40e14642d95f2c33b16e410c65458a9f0f807218c38b238aa823dcf87a32680b048605c9d7d78479f9f7fc97dac622e86a71df4fd83bac3
-EBUILD mydumper-0.11.5.2.ebuild 1105 BLAKE2B d1978ef0acaa9bcae511713c85815ed326ad1ab64adb8dd5c2b06093b66f560a5d195aa4ee4bd2afb723e447aceb7b73c93ec2094eba67add8ee15cc664e7745 SHA512 14a228e46f49d0816f456ea9ce157fe4e88209e59f7be65fc7397c493822ca1c23f958aea4a7dad629fdcd79f93a5efa1a1da5b690d84ef136111b94658d2b13
+EBUILD mydumper-0.11.5.2.ebuild 1104 BLAKE2B c9fa788e14d3d615da06cf9981442b0d1519ce116258462b73a77ce0d28dad1577e0da5ee0e9eb5a960b59a952a375633888f655716c78cdb76b4a16a9bcd728 SHA512 ff607256bd05bf3f3995963d6be4a9b850085a635752fd4e3fb9c6216136d0ab3a685eb17cc15cce901b1ac451b09f53a193c276d653130cce12be55789702c7
 MISC metadata.xml 479 BLAKE2B a45a9746e2f5be11c4cd992e81135c8b39fa494c105f1f3c01586482b635596f1384690d0d1bfa3f08b8e33d1bd64b625fba07f410b8a8220a9a19f7f048f2dd SHA512 b0f20f8fb1b5eb3771d9a59869a3a28b0011642721dd12b5545b4f80456556f2f7a9da3b4b69c85cfae666534bad6143ae437b43b45179544626455a03b9218a
diff --git a/dev-db/mydumper/mydumper-0.11.5.2.ebuild b/dev-db/mydumper/mydumper-0.11.5.2.ebuild
index 72f86aa467fe..ae2803f27c16 100644
--- a/dev-db/mydumper/mydumper-0.11.5.2.ebuild
+++ b/dev-db/mydumper/mydumper-0.11.5.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="app-arch/zstd
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index ffb8e1aa332b..cb1834033874 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -3,5 +3,5 @@ AUX myodbc-8.0.19-cxxlinkage.patch 812 BLAKE2B 18e0f62ceb6bb33ad282972a8aae2f755
 AUX odbc.ini.m4 406 BLAKE2B 3a20c28b1971753a14a4aa4d30efcc7de833488501a41d9404987567623d48250ce1daea1d3138adaef36741c4f2e0eafc60eba554e5262b45084f93f5205160 SHA512 84ab2a3aab594123d42b65205a7faf8e91fe9416a9e3c4c4c354533b9a298395f59172649c91dc0b671392bfbe5baeaddb6aa47119ce4c825917f3977d9dd521
 AUX odbcinst.ini.m4 118 BLAKE2B 6da835746e063f415ad7d640233cfd96e744cd56e12aaab4a21a2bf0bd5f1bd1e5c3d1c9a28522e3aa07c1261abac92301819d4112ac6a000a729aca9f7f7ad6 SHA512 6d929bbffd602a9f060a05998149a6b16334f8a5e3db30d02ff5d38c0065085d085042521e700b87a63766e32aa27ae92be72cef33c2a7aa8f6767b6b71c82c8
 DIST mysql-connector-odbc-8.0.27-src.tar.gz 3849283 BLAKE2B 6a2500cdd706c0f8cda83dd04d3e573baa0bfbad59c931e20bb25a3f09dd78d2380079d0a20e075c3f44482d58acb6e727f4cbcf490e9d4d7817dd26f98061ee SHA512 4f907b7647425c274d3bd1c3b3ebbb83ac2360f2ee56733dabb501c17b800a26ef1117e16e5b05180ff904bfc642d25393baa861b96a79edf9d35f186a8689b2
-EBUILD myodbc-8.0.27.ebuild 3413 BLAKE2B ef42bcc9585b1a251e4b1d2fabcdebcf473a37b0631e411727862ec5919e5e17d5a69e1ec90342bab5e74c0f16720e7fd715ffae15523dd0dea7620ea963175d SHA512 e1bba6958e7f0a6b353f12a5a3fcb905ce1d40648b3cf5763919ec01952793d219a41098bac06e44efc8e5ee831ecb7e9fc035c538a2db78d86cf8bdc5d3cccd
+EBUILD myodbc-8.0.27-r1.ebuild 3408 BLAKE2B a0aa95db130a8137214e88c9e5922a025e60fc0466d68cc71b26a441fc3b87c80794379584b3e47fdfb81a1ef03187f936a9281895084e74e46498b20ea35791 SHA512 2e12db4abb07d5c7cf1952230b4bcd40ab3e8ff0b7a630a28c81a37c092e89e4ad350cd1565a68fe86a5c182bf409fa1a257f1220c3ba58f57a95ce1f0997a89
 MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27
diff --git a/dev-db/myodbc/myodbc-8.0.27.ebuild b/dev-db/myodbc/myodbc-8.0.27-r1.ebuild
index 21745e0ba5ee..7689549feac7 100644
--- a/dev-db/myodbc/myodbc-8.0.27.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.27-r1.ebuild
@@ -92,8 +92,7 @@ multilib_src_install_all() {
 }
 
 pkg_config() {
-
-	[ "${ROOT}" != "/" ] && \
+	[ -n "${ROOT}" ] && \
 		die 'Sorry, non-standard ROOT setting is not supported :-('
 
 	local msg='MySQL ODBC driver'
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 5ae0822d58c8..32d6b9cc7e5e 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -32,7 +32,7 @@ EBUILD postgresql-12.9-r1.ebuild 13477 BLAKE2B 73da16f9f304441f554a0aff0b16fbcb0
 EBUILD postgresql-13.5-r1.ebuild 13915 BLAKE2B 4e26527c9f181560e26c12dbad6c4ec4efa1541ef3e4c95aadecc634daac60aec4407ab050b4c1d8f2626d5ecf32f466f6e2c361a9502c21933d5a063b42c51d SHA512 c404c73cb8b61074329c6185e2a760b77b782f042e81a9b4e839f2554a3ee1b23f5a87519996777e8506cc461803f81ac585919eb0e5de8b6ab576f5c0f02a05
 EBUILD postgresql-13.6-r2.ebuild 13923 BLAKE2B 4affe91b5f0d9a50c5c4151614da2aa51f53c1c1a009e3bee1cdc9bf948ef1f393943192a7d7bc697b2e76ec7a34ff5cf3862f2d1f12a8a85a6e87ae9d01d6a3 SHA512 3b564b616a8a33a8f16c35d2d9360b35b6682169875de9cc79f00e44aea6d29a7324ea641c1df9613226db3f83e0bf860c131fae18b609ad3e817e21df97de19
 EBUILD postgresql-14.1-r1.ebuild 13911 BLAKE2B 579d9eb3d1b3ecbbaabfe44c2fefc590ebc7cc3a638e7affc9e4c5235c0da9cfccbd5b21b91cca5455924adbb5cca033b7d0fbfcc444119dce2ce570741f580c SHA512 4a9839e479f1c851f28b9d8738b65ec973346a650190c94b3968bbfa2dd45807a24efeba806a973dff83a7dc90f685616d659735528eff4113b9fbf658c64642
-EBUILD postgresql-14.2-r1.ebuild 13852 BLAKE2B d206b46531785c62f6e7912ec421b2873fb1bdea767f69304f2fed2ea0e3b3b2ea9796f87202b9bf24e4a668c6e6c4f7ef585bd9ef75398cb7d294531146fd8d SHA512 0f899a410b452683412e15588a887c424590a923d9d5cb0ee2e79ae6c03e59260347d340e9f06ecb06b37b7dae30bb1e38b655bcbf6d0520b5ac3581e2688f5a
+EBUILD postgresql-14.2-r1.ebuild 13844 BLAKE2B 96791ac26849a47c86282170d2bec9c1b0c2c794664f2429154d1f34ceb3f12c59fbf6ac54e12ecf3dc025f884520260dec8e317f8a28df83878c366e1d9d0f9 SHA512 717076f2136ee41a43825b30733801edc2717222b0dc103ccba74f2b600a3b36d51a9b669cd91adff7c2a2954138bc544738b30936906dda2340671299635108
 EBUILD postgresql-9.6.24-r1.ebuild 14328 BLAKE2B 9e2d97a2caee5f87d4fafebbc6903d6e48195e7a06f7e6ecbef7612e7113a29b431d04d087bf3543af7a468255926fd1d3f10df08bf8789cff07f9931185189e SHA512 9d361a663d1905314eaac7321b91dbb89b47c02610795ffeaea2ab056063d660e30531f90d14714357487e1561c9aced8d71082325e2398e7c87fd6e7c683d31
 EBUILD postgresql-9999.ebuild 14102 BLAKE2B 821a52a05174b6b4d9c539d01563a45a0edded846b1533b5cc87ccfd45fcfd56bf2e77c49ec8ee1f5cf79d7174f0aaade405591e70aa5d7d81c068fc33fee923 SHA512 e1d8c3ce0347b9db2ba4aeec48cf08d99e522eb5663ae0b84b510baf07be4a06c83a9b6c951952a949a7c3984e373048db0f518ce234117d54ce773fc735ccb2
 MISC metadata.xml 716 BLAKE2B c881b294d82137c80ddfde58ef50074a2e2b92e6883e6ebc5d8c71a366e8cbb0568756b2044fc411dd18e89da0e5625df80b876820e0abeaccc24d26880d5145 SHA512 dd045716ced95dbac8763aea347125d27bdb230eeb64bfc932f94110eda2ad42aa892e9cb19595c0d2f4a593d2629d9709a7aea792ac16661a2c210158368ba3
diff --git a/dev-db/postgresql/postgresql-14.2-r1.ebuild b/dev-db/postgresql/postgresql-14.2-r1.ebuild
index 669ad0e26b8a..20bb400d6937 100644
--- a/dev-db/postgresql/postgresql-14.2-r1.ebuild
+++ b/dev-db/postgresql/postgresql-14.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 SLOT=$(ver_cut 1)
 
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 82301d12ecb7..04b6e0140afa 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -24,7 +24,11 @@ AUX redis.tmpfiles-2 57 BLAKE2B 1e0577c1828bb693cf820f3ba5e77d7d748adf4df2d1910d
 DIST redis-5.0.14.tar.gz 2000179 BLAKE2B 77d3ed09a81450dbf806edd017785b82c50bb059aab44c82bc4ab784b7f03d5c58f9372b96c857831f84d278771dcf223f42ca05af790f0dc10ecdde211fd149 SHA512 513299ae8b967a659d54812fab4dfdfaf0081b20136a3d89b6a761e93548583c96436fedb84baa4d23385b42110ef615527efc3690b873f5bec7793403fe7eaf
 DIST redis-6.0.16.tar.gz 2288647 BLAKE2B f3552cc0d27cbc5cf6556792da9a75d01ff70d372484c95d2af8b24ec902a8086b9c3f4e53513df982fe135963432bfb527334926dd494e50d2cc618ab813f39 SHA512 83bb72448f9943e3d015cb4d961eb2eae21602ef1f90ca52ca8ab7c6918b0ab979db9f61f3981df27b2286894f4864f4588c3a52fa988e30e9419b0967998845
 DIST redis-6.2.6.tar.gz 2476542 BLAKE2B d139479432171294911d99e7e8c2327dbbc6682ea49de761c4bb4089a2efd814926f2f8823dca1826b4a61dd9ccf79abb22878c9463ac92870481b43d8a7fff7 SHA512 9b947d26fd9e208627ed22d318ab3d0775ab0be46d98db1c1d158feac671b984e75ce33e647d196face9643f80768af47e678be1b4e1ddd3eb56dff467c46022
+DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953
+DIST redis-7.0.0.tar.gz 2943054 BLAKE2B 561cf591bacac51fddc375a1c725c385f9b0b4b4bb7fca7d889ee1b7760cf5ea986e26613a0f69fda9b6f8a02d02e055514d374be7913e26724e3857967fea22 SHA512 12ac925708c54b00b34c365dee39cb207fbe3cb3c99e8daad965e122b6e3a6543e3ca80e23e6a56f5dff6371d4f2b9c149ee51800ed540e1f1b9154a118ea07b
 EBUILD redis-5.0.14.ebuild 4665 BLAKE2B cf9e076f373a99384e49a4f411aa7e34a692b94dbbb4b58e2465735efe55fbd05ea10152373a14ac115f4f08b41b5eff580d3b457bff596ff29af9981433ffda SHA512 6fc35519713d68a57fd18dd3a6b36f1ed109481be47c988c5335469fe760a63f8f976c9834df0f25d9fb35d1c9b634c60316d64e0fd3ae32460d819ecbed2216
 EBUILD redis-6.0.16.ebuild 5122 BLAKE2B b6a0e8a15dba59fb7614ab9f0747f26165ce1ec96e735e783450c2a1eed9fa767a35d5ad172483b620da1dc0bb8b368643f692bb57c72c31deb4245774f60dfc SHA512 831b3fa61caad327c61e1132f53a35ae47efb1b5986142cdaf348aad0c6e885b9e36e1c4be2bfe99777270ef4f4074b2350913a435156b657dc01c71eaa31be1
-EBUILD redis-6.2.6.ebuild 5128 BLAKE2B 5c13e1c15456d1038ba306e6a59c26fc56dc9558aa15e846becc56a950864203d85ef03f8c2e3d41fa24cb62fca0963bcb253c0badf49052e3b0f6f25cd297f9 SHA512 c89904640ef675c807f673a4100058bb7443895272fd73a9bd9b6d749275be3124d25203603b9459178df9c58c25a9ffcb13c330b5daaa50a4cd53d1702e12d9
+EBUILD redis-6.2.6.ebuild 5134 BLAKE2B 0a53df5479f14bf66bc15b2b72404cb9ed222c9f657166a5da9962fc0c727ae85076fa0a8f6b4b81f231df293c1907d84e2e344f0f39138f116184825aaae6ce SHA512 71add2d4e17c2f15405263b00244f84e8a4b2d744e3d0d143ef871a3e136c28fd8b183f9446f819c02fda52d134d652c993ef57706fa63fe95c9c0a38c8671c0
+EBUILD redis-6.2.7-r1.ebuild 5264 BLAKE2B 7d70836158962a02084a8a4c52091d9a7ef786a1ed12d2a185c7b5636bf8861a5f4c6dbd98cc4545bab81b08c9ad70e936c33538ff5c0f739739dd45d66a6af0 SHA512 244e125a12b1463f5a912b8eda9c564c9b0aab901157df22a5e4065df09679991158ebd5d620826b7a7cadd7f25921a24a5914f3cad46aaa5543bae9f45799e3
+EBUILD redis-7.0.0.ebuild 5264 BLAKE2B 7d70836158962a02084a8a4c52091d9a7ef786a1ed12d2a185c7b5636bf8861a5f4c6dbd98cc4545bab81b08c9ad70e936c33538ff5c0f739739dd45d66a6af0 SHA512 244e125a12b1463f5a912b8eda9c564c9b0aab901157df22a5e4065df09679991158ebd5d620826b7a7cadd7f25921a24a5914f3cad46aaa5543bae9f45799e3
 MISC metadata.xml 365 BLAKE2B a2a33da17b877c0e66732b18af4c41e78ad7f60403f7d63b43d16797228c2fe0b3e2af2d0ff56af23baa944ae489163732d84e0921335919f5cea26c589e12ea SHA512 54a8b9cb42305881b12ef37c4da78ba3760ab2de4b8f2663b099eba7188deaeae08f5649a0c101d6acae63cf20c20d4c5d33274dc3ec6ced80bed68114f32db2
diff --git a/dev-db/redis/redis-6.2.6.ebuild b/dev-db/redis/redis-6.2.6.ebuild
index ebe779b0841d..023aba8e9614 100644
--- a/dev-db/redis/redis-6.2.6.ebuild
+++ b/dev-db/redis/redis-6.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+jemalloc ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/redis/redis-6.2.7-r1.ebuild b/dev-db/redis/redis-6.2.7-r1.ebuild
new file mode 100644
index 000000000000..daabb56d3c64
--- /dev/null
+++ b/dev-db/redis/redis-6.2.7-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Redis does NOT build with Lua 5.2 or newer at this time:
+#  - 5.3 and 5.4 give:
+# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
+#  - 5.2 fails with:
+# scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
+#    because lua_open became lua_newstate in 5.2
+LUA_COMPAT=( lua5-1 luajit )
+
+# Upstream have deviated too far from vanilla Lua, adding their own APIs
+# like lua_enablereadonlytable, but we still need the eclass and such
+# for bug #841422.
+inherit autotools flag-o-matic systemd toolchain-funcs lua-single tmpfiles
+
+DESCRIPTION="A persistent caching system, key-value, and data structures database"
+HOMEPAGE="https://redis.io"
+SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+jemalloc ssl systemd tcmalloc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	${LUA_DEPS}
+	jemalloc? ( >=dev-libs/jemalloc-5.1:= )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/redis
+	acct-user/redis
+"
+
+BDEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+# Tcl is only needed in the CHOST test env
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-lang/tcl:0=
+		ssl? ( dev-tcltk/tls )
+	)"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )
+	${LUA_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.1-config.patch
+	"${FILESDIR}"/${PN}-5.0-shared.patch
+	"${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
+	"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
+)
+
+src_prepare() {
+	default
+
+	# unstable on jemalloc
+	> tests/unit/memefficiency.tcl || die
+
+	# Copy lua modules into build dir
+	#cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
+	#cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
+	# Append cflag for lua_cjson
+	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+	append-cflags "-DENABLE_CJSON_GLOBAL"
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
+
+	# Use the correct pkgconfig name for Lua.
+	# The upstream configure script handles luajit specially, and is not
+	# affected by these changes.
+	sed -i	\
+		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
+		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoreconf
+}
+
+src_configure() {
+	econf #$(use_with lua_single_target_luajit luajit)
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	local myconf=""
+
+	if use jemalloc; then
+		myconf+="MALLOC=jemalloc"
+	elif use tcmalloc; then
+		myconf+="MALLOC=tcmalloc"
+	else
+		myconf+="MALLOC=libc"
+	fi
+
+	if use ssl; then
+		myconf+=" BUILD_TLS=yes"
+	fi
+
+	export USE_SYSTEMD=$(usex systemd)
+
+	tc-export AR CC RANLIB
+	emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox
+	if has usersandbox ${FEATURES}; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	if use ssl; then
+		./utils/gen-test-certs.sh
+		./runtest --tls
+	else
+		./runtest
+	fi
+}
+
+src_install() {
+	insinto /etc/redis
+	doins redis.conf sentinel.conf
+	use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
+	fperms 0750 /etc/redis
+	fperms 0644 /etc/redis/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd-r2" redis
+	newinitd "${FILESDIR}/redis.initd-6" redis
+
+	systemd_newunit "${FILESDIR}/redis.service-4" redis.service
+	newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+	newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
+
+pkg_postinst() {
+	tmpfiles_process redis.conf
+
+	ewarn "The default redis configuration file location changed to:"
+	ewarn "  /etc/redis/{redis,sentinel}.conf"
+	ewarn "Please apply your changes to the new configuration files."
+}
diff --git a/dev-db/redis/redis-7.0.0.ebuild b/dev-db/redis/redis-7.0.0.ebuild
new file mode 100644
index 000000000000..daabb56d3c64
--- /dev/null
+++ b/dev-db/redis/redis-7.0.0.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Redis does NOT build with Lua 5.2 or newer at this time:
+#  - 5.3 and 5.4 give:
+# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
+#  - 5.2 fails with:
+# scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
+#    because lua_open became lua_newstate in 5.2
+LUA_COMPAT=( lua5-1 luajit )
+
+# Upstream have deviated too far from vanilla Lua, adding their own APIs
+# like lua_enablereadonlytable, but we still need the eclass and such
+# for bug #841422.
+inherit autotools flag-o-matic systemd toolchain-funcs lua-single tmpfiles
+
+DESCRIPTION="A persistent caching system, key-value, and data structures database"
+HOMEPAGE="https://redis.io"
+SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+jemalloc ssl systemd tcmalloc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	${LUA_DEPS}
+	jemalloc? ( >=dev-libs/jemalloc-5.1:= )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/redis
+	acct-user/redis
+"
+
+BDEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+# Tcl is only needed in the CHOST test env
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-lang/tcl:0=
+		ssl? ( dev-tcltk/tls )
+	)"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )
+	${LUA_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.1-config.patch
+	"${FILESDIR}"/${PN}-5.0-shared.patch
+	"${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
+	"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
+)
+
+src_prepare() {
+	default
+
+	# unstable on jemalloc
+	> tests/unit/memefficiency.tcl || die
+
+	# Copy lua modules into build dir
+	#cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
+	#cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
+	# Append cflag for lua_cjson
+	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+	append-cflags "-DENABLE_CJSON_GLOBAL"
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
+
+	# Use the correct pkgconfig name for Lua.
+	# The upstream configure script handles luajit specially, and is not
+	# affected by these changes.
+	sed -i	\
+		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
+		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoreconf
+}
+
+src_configure() {
+	econf #$(use_with lua_single_target_luajit luajit)
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	local myconf=""
+
+	if use jemalloc; then
+		myconf+="MALLOC=jemalloc"
+	elif use tcmalloc; then
+		myconf+="MALLOC=tcmalloc"
+	else
+		myconf+="MALLOC=libc"
+	fi
+
+	if use ssl; then
+		myconf+=" BUILD_TLS=yes"
+	fi
+
+	export USE_SYSTEMD=$(usex systemd)
+
+	tc-export AR CC RANLIB
+	emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox
+	if has usersandbox ${FEATURES}; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	if use ssl; then
+		./utils/gen-test-certs.sh
+		./runtest --tls
+	else
+		./runtest
+	fi
+}
+
+src_install() {
+	insinto /etc/redis
+	doins redis.conf sentinel.conf
+	use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
+	fperms 0750 /etc/redis
+	fperms 0644 /etc/redis/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd-r2" redis
+	newinitd "${FILESDIR}/redis.initd-6" redis
+
+	systemd_newunit "${FILESDIR}/redis.service-4" redis.service
+	newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+	newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
+
+pkg_postinst() {
+	tmpfiles_process redis.conf
+
+	ewarn "The default redis configuration file location changed to:"
+	ewarn "  /etc/redis/{redis,sentinel}.conf"
+	ewarn "Please apply your changes to the new configuration files."
+}
diff --git a/dev-db/spatialite-tools/Manifest b/dev-db/spatialite-tools/Manifest
index 9945e050aa99..af4cf7752629 100644
--- a/dev-db/spatialite-tools/Manifest
+++ b/dev-db/spatialite-tools/Manifest
@@ -1,5 +1,3 @@
-DIST spatialite-tools-4.3.0.tar.gz 540811 BLAKE2B 3de4301380a0b64cdd388cb0dc1917b90a02a721b1e34d3781b5b4e14a810809c922a3760a269c3980790801b66a100f9bacf1249f2874374295b5bb9431b133 SHA512 e1de27c1c65ff2ff0b08583113517bea74edf33fff59ad6e9c77492ea3ae87d9c0f17d7670ee6602b32eea73ad3678bb5410ef2c6fac6e213bf2e341a907db88
 DIST spatialite-tools-5.0.1.tar.gz 578520 BLAKE2B ec01bc73bb9001b439e52794b172aba4197d6a55297abbdf8397f3d984c2463df19da5a1cbcc5baba5c23e47990287d750f30f0731144d69876a0df82a4727d5 SHA512 dad52f6ed3c66ffd95f3a5c21225cd1b20641523af616f7e8defba8e4e46921da169e5f7bf9c53a355e132b6e74750d6db3fe02c870a3386f850df49c83bb8cd
-EBUILD spatialite-tools-4.3.0-r1.ebuild 666 BLAKE2B 2c650ad394cf4a945713a89c4cdb80e41e55279e98003cb31054cb2c55d16671322d04538b7018c10ae3bb764e9c735adf1e900a4bf570fb5b41646a98fa6d85 SHA512 20ceb663ce052d6955229d7667e23d0674f5edffa62b73bdba8b24b051f97f0e989826d9d0c9320f7f7edd564b5c6c416e5cb5beb3cdbc58ca71561ba90c131c
 EBUILD spatialite-tools-5.0.1-r1.ebuild 676 BLAKE2B fc28a838450c763a759d2331228d26c1b52dcb61bb76ff8ec8c2842d797e846007d0dd94e88feaa5fe697a65f6da03d7f06e358e3e20d71bf2efea2fc5068bd0 SHA512 dc004107166f0b941382f7c6440ba1b2b6f0217085e76de5aa5b51941c2bb941f2cadae805e7372575615879f5f81316c127d3d5a3abe9886e45ec2da1c31070
 MISC metadata.xml 270 BLAKE2B d671fe6a94e536276e72466a25e98a1e0bc835584f788b10653270c10b976da801bdb6bad177fc69d359c1e588d08101dc4f01792f14f04432ba7b6e234787a7 SHA512 e54914ee9c11010802a2bb5b4c998c82c53e93085d12dd59c6c5ec570de962ec8938e1e1a5ad6640fe8047c3d3eedea8c367881dd07a5648e95863af32e888f9
diff --git a/dev-db/spatialite-tools/spatialite-tools-4.3.0-r1.ebuild b/dev-db/spatialite-tools/spatialite-tools-4.3.0-r1.ebuild
deleted file mode 100644
index a4a242e63a90..000000000000
--- a/dev-db/spatialite-tools/spatialite-tools-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A collection of CLI tools supporting SpatiaLite"
-HOMEPAGE="https://www.gaia-gis.it/spatialite"
-SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="readline"
-
-RDEPEND="
-	dev-db/sqlite:3[extensions(+)]
-	>=dev-db/spatialite-3.0.1[geos,xls]
-	dev-libs/expat
-	dev-libs/libxml2
-	sci-geosciences/readosm
-	sci-libs/geos
-	sci-libs/proj
-	readline? (
-		sys-libs/ncurses:=
-		sys-libs/readline:=
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable readline)
-}
diff --git a/dev-db/spatialite/Manifest b/dev-db/spatialite/Manifest
index fac013b194bb..d5374e104a66 100644
--- a/dev-db/spatialite/Manifest
+++ b/dev-db/spatialite/Manifest
@@ -1,5 +1,3 @@
-DIST libspatialite-4.3.0a.tar.gz 4440660 BLAKE2B 2eb2afb96b096b86be9c30cf71663b7b2839d345b6c418fc8511653ed59d0aeff1756b6b19807140c67128c938e39be66d13088640658d14883c92c438c97251 SHA512 adfd63e8dde0f370b07e4e7bb557647d2bfb5549205b60bdcaaca69ff81298a3d885e7c1ca515ef56dd0aca152ae940df8b5dbcb65bb61ae0a9337499895c3c0
 DIST libspatialite-5.0.1.tar.gz 6372753 BLAKE2B 0fe5b37efac134e3796c96ed012b434ce99547037a44df69d3e98c7ac586c1173faa1fe93c4578e7cc0f47a9f1c539710661bad57f8012c3bdabde427221a842 SHA512 c2552994bc30d69d1e80aa274760f048cd384f71e8350a1e48a47cb8222ba71a1554a69c6534eedde9a09dc582c39c089967bcc1c57bf158cc91a3e7b1840ddf
-EBUILD spatialite-4.3.0a.ebuild 1234 BLAKE2B 13526ec828adbe85fb5e53e0b9e48142c8d26d48ef78b6d070e149da0ee86cc3d4b5cd6b8338377f1ea207d609e33f860b3550650957f22f6bcc2e12fd0f24f2 SHA512 4ed7d7af559d2a779aae76f7bf5a3f91717376ff694eb6b3de6bdeaf7d5414fca5129cec39bd5fdef3673e26129c19ef40db413eb8ee1862618ab3e4e8888de8
 EBUILD spatialite-5.0.1-r1.ebuild 1267 BLAKE2B 028fa2b89a63b96f5f059741d5bb6564ce25be3d0eb6dc9d4d68449fbdadd8975fb44f2a9233a20c70f6fb75850d075fe25fe9557fe0058e7d9777051fd995cb SHA512 345151d357fb5ed604553b896bc1c94935d401282c50cf6789574991eb72d0648fc5bcd20e1d46e9f56da6c7cf94edbeea8b9c0f5ffcc19935e0fc2fa0d4cbe6
 MISC metadata.xml 560 BLAKE2B ed60171b5e1d210cd68c23146dd5a520b6546dd06029c76b4b76fd2c96259eccaf04848f8b23d804851d97f7d5779753d6136c9fb47a44c61d8f324040504d6a SHA512 943e7e90d4a9f799af5bf054a29d4569df4e70cd29834a6d17e69458b2fdf5052c8b3ba09a49fce32bb1ac036af9c35d33bc23caf3b50811de6ae874186bddd1
diff --git a/dev-db/spatialite/spatialite-4.3.0a.ebuild b/dev-db/spatialite/spatialite-4.3.0a.ebuild
deleted file mode 100644
index e745b55a7969..000000000000
--- a/dev-db/spatialite/spatialite-4.3.0a.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-MY_PN="lib${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A complete Spatial DBMS in a nutshell built upon sqlite"
-HOMEPAGE="https://www.gaia-gis.it/gaia-sins/"
-SRC_URI="https://www.gaia-gis.it/gaia-sins/${MY_PN}-sources/${MY_P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
-IUSE="+geos iconv +proj test +xls +xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-db/sqlite-3.7.5:3[extensions(+)]
-	sys-libs/zlib
-	geos? ( >=sci-libs/geos-3.4 )
-	proj? ( sci-libs/proj:= )
-	xls? ( dev-libs/freexl )
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="test? ( iconv )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	if use proj && has_version ">=sci-libs/proj-6.0.0"; then
-		append-flags "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
-	fi
-	econf \
-		--disable-examples \
-		--disable-static \
-		--enable-epsg \
-		--enable-geocallbacks \
-		$(use_enable geos) \
-		$(use_enable geos geosadvanced) \
-		$(use_enable iconv) \
-		$(use_enable proj) \
-		$(use_enable xls freexl) \
-		$(use_enable xml libxml2)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 266011c035b0..336a9d46daec 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,13 +1,16 @@
-DIST sqlite-doc-3370200.zip 10542395 BLAKE2B 129ae0bac8099eb2571cc31ded186ed6c166c1b31af493047608ffb63ac7a90ccbaa5df733661c92660d2436bab6e3796f92e42ac8bb4154ff15212afc74b9b0 SHA512 02c68a3906aee3fd05a4340549144032a239e5ab885d9b3b09236ed2b74a90c770de373e4ca9f99e72f92df090d0fb6789213fb361e954d9dd6709af20336857
 DIST sqlite-doc-3380000.zip 10603776 BLAKE2B f196b00cce01672dc1a27a64d70669ff87c26eacbdb97c76c3c45702cc2c9509507ddcc50180b3a4479afe2991a94dc3a8def59a984d917ad09fba5cbb63da94 SHA512 8e1f77504a1057cd23a8a6c2a285d63c5df50ceaf6ab84054a6f5422286dd868bdb3d5bd9be180b7834caba2b65ca185ffff60455bb504df30801157b62a62ef
 DIST sqlite-doc-3380100.zip 10615296 BLAKE2B fa3df2458b9c15d5f7ce8abb02eb050dddb618c6e87cd79e1979612649be53de4ed26d2bb3e1230e43d7fb1293e1d5bfa870d211195a9b7c2a11a97d417d1ab6 SHA512 ccdfee3d07f2c43b6dda52a2240fd3e72ada38be5a644d097b23116e1b0c2e21f539bf56afbae30fc4275b9b4a954393f95b0a5272bcf18c98e1538d190ff6bc
 DIST sqlite-doc-3380200.zip 10620764 BLAKE2B 81f7e7b9aef37bdae133c4d7dc517d2040d8202a7e0cdf00180d3abe3fb677c80dbc1987e437f0d0f34f47c61f09a7c9d664ba42af976ecfb24555590bb22087 SHA512 b54372ff788aa42b2138c6de91c42c4f6a6440623de3679f08b0519c5c20d9d865c60fa63223c60f4374ff5badb800d6f209e75abb280b9815902757424faf0b
-DIST sqlite-src-3370200.zip 13145234 BLAKE2B 296eb8ac0e83552c348847ea1d0b06ce1b610ca1f53d8b56fa872196ccdc29c343a3b5cc671716854950c97425f8a5b78968e1b22c137ea1ff3bf386e94d8acc SHA512 2db103965934bb34c8336cf82ff7d77e75dc1ca00fa6324ac5697f3bf4b41bffff355dec7593515a68816449e5c9827a9503f6d7841c4c13981c231d3414ff76
+DIST sqlite-doc-3380300.zip 10626490 BLAKE2B 7f1c2ff11ed4ba4748c35fcd72bedec5ce1ca68d87d00839f0a5f512c7309cf1c60678c0a0d8aecf07dc521c2240acdf1262f47ff3000b95e4953e095f2ec8f2 SHA512 4c30860b6ff0ba8c9455ea037cdda642bab2c1070e8726411ee51046b442f333623ce9c810d1d028a49ce571e6cc4afe363c643e90ba59463e84bb39298c4ad3
+DIST sqlite-doc-3380500.zip 10640188 BLAKE2B d831b672879a07e700c4d19bb97435cfc3aabc2371fd1b7f9e2257d1d53edaba72d974816d509fa60dbc7feaddf4b4f64c6bc061da4945aecab7be463951cb0c SHA512 1f8520e8b06cac97a3cd532d105be847b864d4d51ff2d8ab92c62b369e2e662aa477808e566e334a9103e31b84c119050b92ab6f0ef6d5d68db4d49bf2dd8182
 DIST sqlite-src-3380000.zip 13236840 BLAKE2B f303e39a9d913994f0756f986de9d316322b2278b8d2aeb505eb37d1c370c2edbb91f6f56e95b73938137a72b0c22a82fc8a2ceb19ab03271c38f653b66f66ea SHA512 9f4d3c406df5e6290f3f0b5e24b568723ab54bb085cb8cd7621ab42b0b8cd4f76e9784a4a29b42ea8cb0d1b7d759267c3cd980913d490d08e7172df05949131d
 DIST sqlite-src-3380100.zip 13241298 BLAKE2B 9dbccd5942f146da4c40d6208c491473c191752a74ee18ce131f3dea533976732440974e97906aead460daee39c7d6085ffa0f093d8f17e8f64c813bbb2409ad SHA512 df200916789c15e010a8e62dd8257833f34d4cf3496080a72fdc2330a530c193cda055e3c9ed39a404b87c8001c83a4b187491525ca95b5c5a1dbdd2f41cc222
 DIST sqlite-src-3380200.zip 13242285 BLAKE2B a07f895f57c355e2ec1c96fc857b63d774ff52f7e49c22b1c936b260e6e7787ec656059c02cc6d38845c4368507067d86dac493559541fbb914a3da9cbc67cce SHA512 fd457602db4577b31bc6053fd3cceb220337275e3fd26976f4270fb8a7da4fa047ca23dd18e2795cdfd894d05bad4c53954a81391d71507d359fb224995e420a
-EBUILD sqlite-3.37.2.ebuild 12919 BLAKE2B 69decab1fb8d5b9815597b35ac4442d16afa82583431dcba1daa054f7264ed19f4517be3f2c408055ca472d1bb28ed58ea96718bae0ae6888be8158ef892521d SHA512 b06119380784525486934d74c0e9cb0df74197d03959f60ff2d2cbd87d5a30e9fa9e5f08adfed0ae8e3002a3309bcbe9a727f95d71f7e4c19eda6db79f366df8
-EBUILD sqlite-3.38.0.ebuild 12909 BLAKE2B a0fe292b29b82068f67be79cff09f810cc54023f318f41ba7a566abc66296a862959998b5eebba64e31246a0f7d74d4a8e496b1103039af337f55e86bbb76769 SHA512 42c431a5db67754d82c7be5c43ec9abcc91eaf02f74f24e2650831293379afa8d7da7ac2bbd011208666e355a0c5eda3dcf42cfafc2228d443a7948cde132897
-EBUILD sqlite-3.38.1.ebuild 12915 BLAKE2B 7449d9ff7c77b6b11d66d1586b13fd69933d8545b397b882ee183104dabb89c0e72f815b1f7cd99aaac672294b9e7676e6dbee7c1879614aff98bcb39564140f SHA512 4cc7eb9d9e15c76c56c43e05718cda66a0ef6ecfee3ce74fe14643891e853f45c8e7ec8608b1cc1b19a46569e6842714bb2eccc490e4a4f8a63dc58a7371f789
-EBUILD sqlite-3.38.2.ebuild 13106 BLAKE2B 4d3ed7bd5f18f77afd03108e52d3691072f02b0c81e63e22305580eabb460449dfdd77ac5ccfd5ff3242cffe4afa367a442b4bfae5e221c7c2c58ec9711ff7b1 SHA512 c2958c3e075fd2fb569fd12489d20193b34475cb65828da1037eaeceb9d665e65a11213e4c630eb96fdc9cf5a318d172c3b883989281976c73bbb261cb4d5215
+DIST sqlite-src-3380300.zip 13244116 BLAKE2B d28c26a72729b49fac009e835068a15cb14b13bcef5e2d45a94929f22329002cbbf09ff9926a7cb041d1bcbd6fb9ebac784cce06196d29a9b9bf56f97645553e SHA512 d0605148931db62d167080e384d058e87452409fcb3ce366603e6eec8e2f68754259ce217c26e641401d5b0ae7714efd45fc4a881671db37597f2f027cd7da51
+DIST sqlite-src-3380500.zip 13245057 BLAKE2B d2deefbc918ab593146950c21047dbd94168d09150ffe00da20e4ee6b02f69516b496b14e1925b00ace8a4148b87bfb263a97d75ab48990e29e12796387fee5f SHA512 d91f060165354ff4b32a72627c16b6d2310d478768794a49eef57229d7199d83f951444fdc0725acf8d2565ef61a9c7921e9c965f429b018b6fd23d129b6e630
+EBUILD sqlite-3.38.0.ebuild 13054 BLAKE2B d9725fecd7429de654cf025ff7680b6d2763eff611bc5e89c004ad74d312fb00b5f6af1d8603f5d9d2610d5886856c5d1d42773f30f29f59531358569a5f2854 SHA512 f03e809d1899ff7a0ee74c226ebbdab9c074a232203cf965c726da5f832f59aa56c828cd3c7943b9c6fc11b28285a618b8c0555009bc7185433558c9f4a1d1ab
+EBUILD sqlite-3.38.1.ebuild 13056 BLAKE2B 9b19abc1a94304c6c45cac08507abc3aa91818db7e1ca369f32871bc8bb5eaceec114e19e85eb40825bee50932f3b35f26d986372f0b14f59f0fb5a87690419c SHA512 d78040c2ba1dea67907c44768e5109b0f141f50a43b6cc88421512bc175b307c6d3a360a84bdd4514645bbfeaef5707ae6fe94c9f40d9b910c6122720ad5b97a
+EBUILD sqlite-3.38.2.ebuild 13260 BLAKE2B 92c5bc279bd338b62cb19a9e1dacfe483c81a48c104e50f5fc1d8c413136031c9f20794f4eb5fcfecc2c3b1b926596788806934ab9eb57b03f635bdd3d81f835 SHA512 95af9af81ff7063c1d1b3497fb02525b36ff8495c08f933f5e226185d040efb3a6c87ba129fb3989ae96640bffc726fd40e8416379c8af3d8883ddfb3ea4005f
+EBUILD sqlite-3.38.3.ebuild 13260 BLAKE2B 92c5bc279bd338b62cb19a9e1dacfe483c81a48c104e50f5fc1d8c413136031c9f20794f4eb5fcfecc2c3b1b926596788806934ab9eb57b03f635bdd3d81f835 SHA512 95af9af81ff7063c1d1b3497fb02525b36ff8495c08f933f5e226185d040efb3a6c87ba129fb3989ae96640bffc726fd40e8416379c8af3d8883ddfb3ea4005f
+EBUILD sqlite-3.38.5.ebuild 13260 BLAKE2B 92c5bc279bd338b62cb19a9e1dacfe483c81a48c104e50f5fc1d8c413136031c9f20794f4eb5fcfecc2c3b1b926596788806934ab9eb57b03f635bdd3d81f835 SHA512 95af9af81ff7063c1d1b3497fb02525b36ff8495c08f933f5e226185d040efb3a6c87ba129fb3989ae96640bffc726fd40e8416379c8af3d8883ddfb3ea4005f
 MISC metadata.xml 771 BLAKE2B 34887e6d8a43fde66998787bfb3ca4bda644918a3a80afc650546547f132a9ff482a955ea5df8dded47a971a317be099bf5d9708a00ab25f00f78b714c3ed521 SHA512 e5955f59348abdee15c7fcaff38c220ab0ad84a717600525686e33a1fb7d29498c5b510d81c87ca49d48d7d11da782cf3840f38f1d4bd0e696fd7166aedeb597
diff --git a/dev-db/sqlite/sqlite-3.38.0.ebuild b/dev-db/sqlite/sqlite-3.38.0.ebuild
index c4d76620eda4..e0cb3893bffc 100644
--- a/dev-db/sqlite/sqlite-3.38.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.38.0.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 if [[ "${PV}" == "9999" ]]; then
 	PROPERTIES="live"
@@ -358,6 +358,11 @@ multilib_src_test() {
 
 	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
 
+	# e_uri.test tries to open files in /.
+	# https://bugs.gentoo.org/839798
+	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict "/test.db:/ÿ.db"
+
 	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
 }
 
diff --git a/dev-db/sqlite/sqlite-3.38.1.ebuild b/dev-db/sqlite/sqlite-3.38.1.ebuild
index 04d9b6b87116..9477c9a3adc1 100644
--- a/dev-db/sqlite/sqlite-3.38.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.38.1.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 if [[ "${PV}" == "9999" ]]; then
 	PROPERTIES="live"
@@ -358,6 +358,11 @@ multilib_src_test() {
 
 	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
 
+	# e_uri.test tries to open files in /.
+	# https://bugs.gentoo.org/839798
+	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict "/test.db:/ÿ.db"
+
 	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
 }
 
diff --git a/dev-db/sqlite/sqlite-3.38.2.ebuild b/dev-db/sqlite/sqlite-3.38.2.ebuild
index c3c343219986..c69a893b551d 100644
--- a/dev-db/sqlite/sqlite-3.38.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.38.2.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 if [[ "${PV}" == "9999" ]]; then
 	PROPERTIES="live"
@@ -365,6 +365,11 @@ multilib_src_test() {
 
 	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
 
+	# e_uri.test tries to open files in /.
+	# https://bugs.gentoo.org/839798
+	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict "/test.db:/ÿ.db"
+
 	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
 }
 
diff --git a/dev-db/sqlite/sqlite-3.37.2.ebuild b/dev-db/sqlite/sqlite-3.38.3.ebuild
index 909019a749b5..c69a893b551d 100644
--- a/dev-db/sqlite/sqlite-3.37.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.38.3.ebuild
@@ -13,6 +13,9 @@ fi
 
 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
 	SRC_URI=""
 else
@@ -22,7 +25,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 if [[ "${PV}" == "9999" ]]; then
 	PROPERTIES="live"
@@ -199,11 +202,6 @@ multilib_src_configure() {
 	# Support hidden columns.
 	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
 
-	# Support JSON1 extension.
-	# https://sqlite.org/compile.html#enable_json1
-	# https://sqlite.org/json1.html
-	append-cppflags -DSQLITE_ENABLE_JSON1
-
 	# Support memsys5 memory allocator.
 	# https://sqlite.org/compile.html#enable_memsys5
 	# https://sqlite.org/malloc.html#memsys5
@@ -324,6 +322,13 @@ multilib_src_configure() {
 		else
 			append-cflags -ffloat-store
 		fi
+
+		# Skip known-broken test for now
+		# https://sqlite.org/forum/forumpost/d97caf168f
+		# https://sqlite.org/forum/forumpost/50f136d91d
+		if use test ; then
+			rm test/atof1.test || die
+		fi
 	fi
 
 	econf "${options[@]}"
@@ -360,6 +365,11 @@ multilib_src_test() {
 
 	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
 
+	# e_uri.test tries to open files in /.
+	# https://bugs.gentoo.org/839798
+	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict "/test.db:/ÿ.db"
+
 	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
 }
 
diff --git a/dev-db/sqlite/sqlite-3.38.5.ebuild b/dev-db/sqlite/sqlite-3.38.5.ebuild
new file mode 100644
index 000000000000..c69a893b551d
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.38.5.ebuild
@@ -0,0 +1,436 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
+	DOC_PV="${SRC_PV}"
+	# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+fi
+
+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
+	SRC_URI=""
+else
+	SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
+		doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
+fi
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+if [[ "${PV}" == "9999" ]]; then
+	PROPERTIES="live"
+fi
+RESTRICT="!test? ( test )"
+
+if [[ "${PV}" == "9999" ]]; then
+	BDEPEND=">=dev-lang/tcl-8.6:0
+		dev-vcs/fossil"
+else
+	BDEPEND="app-arch/unzip
+		>=dev-lang/tcl-8.6:0"
+fi
+RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0= )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
+
+if [[ "${PV}" == "9999" ]]; then
+	S="${WORKDIR}/${PN}"
+else
+	S="${WORKDIR}/${PN}-src-${SRC_PV}"
+fi
+
+_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() {
+	eapply_user
+
+	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
+
+	# debug USE flag.
+	options+=($(use_enable debug))
+
+	# icu USE flag.
+	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
+
+	# readline USE flag.
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+	if use readline; then
+		options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	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
+
+	# static-libs USE flag.
+	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
+
+		# Skip known-broken test for now
+		# https://sqlite.org/forum/forumpost/d97caf168f
+		# https://sqlite.org/forum/forumpost/50f136d91d
+		if use test ; then
+			rm test/atof1.test || die
+		fi
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex 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 /.
+	# https://bugs.gentoo.org/839798
+	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict "/test.db:/ÿ.db"
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo 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/timescaledb/Manifest b/dev-db/timescaledb/Manifest
index 820d3121a361..b0ea598d626a 100644
--- a/dev-db/timescaledb/Manifest
+++ b/dev-db/timescaledb/Manifest
@@ -1,5 +1,7 @@
 DIST timescaledb-2.5.2.tar.gz 2773859 BLAKE2B 918768e21ea43de2678c2ce12c5ea9faa9794eb48d4f1003c898d5510330d25c319b30323692facff78f95ee417a4cd4ec0e78363de17c4746aeb3f42c0b5bba SHA512 28cc4b4a786c62651aa9e499bb82bbc079307ed237a8c2478d5fbd4d6aaa9bb43bf3c1df971f76921d25112761a79dc9dec31d663fa31caca38b0c822f2026b0
 DIST timescaledb-2.6.0.tar.gz 2863860 BLAKE2B 14b7bbfcfe1ca874ef24a7d31f3855f78cde0be57022251e1b1eb141819e19af45a2269123583a2d97c08c778aed38d9662cd4a6ff9c44281a605b8c0faed1ec SHA512 b076a44e3b30e99986dba710079cdc1a38b59a9d65ecd9f78fa16f3b762f253d7a9236a34a4d7e7beb29c1051113ea8877973e07ed3116012c9d2175a77e2edc
+DIST timescaledb-2.6.1.tar.gz 2876847 BLAKE2B 6053e69fd6f7b86287c0ae54966a9e7528cf371d2952b6edfe80c0c616c4fcaccf04fa1f3af5f7ed787e85b7b12ac00e709664552c79561f7b4e503891cb5dd4 SHA512 edcc84c37af9670c1a7bf527f5c430405e9b04e9a35e676d04e7ac70b20184032f992d05545a180b50ac2346b076aac4fc98348c355006345394910978864a8f
 EBUILD timescaledb-2.5.2-r1.ebuild 1434 BLAKE2B d1c472204d3055d48060bd78c12aea4a98ea23b3b242d41d2fefa85fe0c9d5035ed4277d6ee42d1ec12540475e4eb586e08e87e88c871fa4d1fabd064e45a234 SHA512 cf76e892e19dd4d1f2ccdb9f2bbf73cfd52fbb4ab4ee8ba1e9dec7a35beb15196e7e5b3d783662e1669920ea0e77c5f00a1edf2d418de697d72dbb8b5c7065dd
 EBUILD timescaledb-2.6.0.ebuild 1434 BLAKE2B d1c472204d3055d48060bd78c12aea4a98ea23b3b242d41d2fefa85fe0c9d5035ed4277d6ee42d1ec12540475e4eb586e08e87e88c871fa4d1fabd064e45a234 SHA512 cf76e892e19dd4d1f2ccdb9f2bbf73cfd52fbb4ab4ee8ba1e9dec7a35beb15196e7e5b3d783662e1669920ea0e77c5f00a1edf2d418de697d72dbb8b5c7065dd
+EBUILD timescaledb-2.6.1.ebuild 1434 BLAKE2B d1c472204d3055d48060bd78c12aea4a98ea23b3b242d41d2fefa85fe0c9d5035ed4277d6ee42d1ec12540475e4eb586e08e87e88c871fa4d1fabd064e45a234 SHA512 cf76e892e19dd4d1f2ccdb9f2bbf73cfd52fbb4ab4ee8ba1e9dec7a35beb15196e7e5b3d783662e1669920ea0e77c5f00a1edf2d418de697d72dbb8b5c7065dd
 MISC metadata.xml 424 BLAKE2B 8cbf1315da7aa52b81fb2b141d7d34100cd838667ec366ba000fb914251cddd35632d9f9b8f6200bf4b679683db9c487522d18bedb4b371f92651c26a3e6121b SHA512 8e8b90dec46092f8d7dd36e67fa000e3f4c108f80903ebd3dad4965bbb4797bf952208afa7e90646946207382547fdd59d4d282379a898a3121b91f86e090c20
diff --git a/dev-db/timescaledb/timescaledb-2.6.1.ebuild b/dev-db/timescaledb/timescaledb-2.6.1.ebuild
new file mode 100644
index 000000000000..b6b5d265256d
--- /dev/null
+++ b/dev-db/timescaledb/timescaledb-2.6.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 12 13 14 )
+POSTGRES_USEDEP="ssl"
+
+inherit postgres-multi cmake
+
+DESCRIPTION="Open-source time-series SQL database"
+HOMEPAGE="https://www.timescale.com/"
+SRC_URI="https://github.com/timescale/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="proprietary-extensions"
+LICENSE="POSTGRESQL Apache-2.0 proprietary-extensions? ( timescale )"
+
+KEYWORDS="~amd64"
+
+SLOT=0
+
+RESTRICT="test"
+
+DEPEND="${POSTGRES_DEP}"
+RDEPEND="${DEPEND}"
+
+CMAKE_IN_SOURCE_BUILD=yes
+CMAKE_BUILD_TYPE="RelWithDebInfo"
+BUILD_DIR=${WORKDIR}/${P}
+
+src_prepare() {
+	postgres-multi_src_prepare
+	postgres-multi_foreach cmake_src_prepare
+}
+
+timescale_configure() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	local mycmakeargs=( "-DPG_CONFIG=/usr/bin/pg_config${MULTIBUILD_VARIANT}" "-DREGRESS_CHECKS=OFF" )
+
+	# licensing is tied to features, this useflag disables the non-apache2 licensed bits
+	if ! use proprietary-extensions ; then
+		mycmakeargs+=("-DAPACHE_ONLY=ON")
+	fi
+	cmake_src_configure
+}
+
+src_configure() {
+	postgres-multi_foreach timescale_configure
+}
+
+timescale_src_compile() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	cmake_src_compile
+}
+
+src_compile() {
+	postgres-multi_foreach timescale_src_compile
+}
+
+timescale_src_install() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	cmake_src_install
+}
+
+src_install() {
+	postgres-multi_foreach timescale_src_install
+}
diff --git a/dev-db/tokyocabinet/Manifest b/dev-db/tokyocabinet/Manifest
index 1f06c66cb8d0..d804a4b49903 100644
--- a/dev-db/tokyocabinet/Manifest
+++ b/dev-db/tokyocabinet/Manifest
@@ -1,5 +1,4 @@
 AUX fix_rpath.patch 1792 BLAKE2B 38d89cc47984b4d83e2df79b444cba657b814a0d9f80d0c3172c49984a7c22eac40d7c880872be632244fcc2efbf24c52b5613ecbdef624db47df97d6c27c1c1 SHA512 aca59f03c289ed2ffc1df1a387d7f141df56968866187324d14239258c6b270a8a56739bfea7c8398af90f52c5ec7a87eedba4194eb3b097cd0df05cc8553964
 DIST tokyocabinet-1.4.48.tar.gz 1000485 BLAKE2B 4da2659a90dcee1cc99be286fe0e286ee75bd8179b75a944f229a3cc04169b8007220e36400d4934a7b5fde554bbc1783c4813fdf44b4a3530882ea0a8ef258e SHA512 b9995c838e713c13f781ab41062caefeb5c613f696dab08039f992f6860413d60a513114b83468cafdf7fc5b5e51ab880226972465d532f873f2a55f615e1440
-EBUILD tokyocabinet-1.4.48-r1.ebuild 1481 BLAKE2B 78a11e0c030b9531600729d0ba39ca016c83212add6a89f8c154f51f6c0cad873cab4dff2335973ade7477d4cae029e9c931293a3f866ba44919a0a0fbe69c0a SHA512 c51718107640160e03905c3cc650562b0116894315c44a7dd64df38deea2662b8899f862675065cde55504348e34ca26be293912abe311d9e81f2cd805bec700
 EBUILD tokyocabinet-1.4.48-r2.ebuild 1644 BLAKE2B cfdd94279cab7ca98eacf91a8532873891c252319731f73e522e29fcb45e1c0fbe54b827d91bdb3b8126c1b81f90d87ea36abc6d49252624cb92ecdc6f340a72 SHA512 c7b96024d7b2370e02a485dcb972a9c0ecf2d60ef11ea7cafef630e44630ec73d589ddb8746aae890e94c487d11ebafdef2518f24dde51e52324941a00c889e8
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
deleted file mode 100644
index df6c7e422489..000000000000
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A library of routines for managing a database"
-HOMEPAGE="https://fallabs.com/tokyocabinet/"
-SRC_URI="https://fallabs.com/tokyocabinet/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="bzip2 doc examples threads zlib"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/fix_rpath.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/ldconfig/d" \
-		-e "/DATADIR/d" Makefile.in || die
-
-	# cflags fix - remove -O2 at end of line and -fomit-frame-pointer
-	sed -i -e 's/-O3"$/"/' configure.in || die
-	sed -i -e 's/-fomit-frame-pointer//' configure.in || die
-
-	# flag only works on x86 derivatives, remove everywhere else
-	if ! use x86 && ! use amd64; then
-		sed -i -e 's/ -minline-all-stringops//' configure.in || die
-	fi
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# we use the "fastest" target without the -O3
-	econf \
-		$(use_enable bzip2 bzip) \
-		$(use_enable zlib) \
-		$(use_enable threads pthread) \
-		--enable-off64 \
-		--enable-fastest
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use doc; then
-		dodoc -r doc/*
-	fi
-
-	if use examples; then
-		docinto example
-		dodoc example/*
-	fi
-}