gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-db
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
127 files changed, 609 insertions, 2772 deletions
diff --git a/dev-db/4store/4store-1.1.5-r1.ebuild b/dev-db/4store/4store-1.1.5-r1.ebuild
index cbbefd39efa2..bc3835b91931 100644
--- a/dev-db/4store/4store-1.1.5-r1.ebuild
+++ b/dev-db/4store/4store-1.1.5-r1.ebuild
@@ -39,7 +39,7 @@ src_install() {
 	# patch the Makefiles to use /usr/ instead of /usr/local/
 	find . -name "Makefile" -execdir sed -e "s#/usr/local/#/usr/#" -i {} \;
 
-	MAKEOPTS="-j1" emake DESTDIR="${D}" install || die "emake install failed"
+	MAKEOPTS="-j1" emake DESTDIR="${D}" install
 
 	dodir /var/log/4store
 	fowners fourstore:fourstore \
diff --git a/dev-db/4store/Manifest b/dev-db/4store/Manifest
index e95df85d4283..34a4b2aa6924 100644
--- a/dev-db/4store/Manifest
+++ b/dev-db/4store/Manifest
@@ -1,3 +1,3 @@
 DIST 4store-v1.1.5.tar.gz 5610204 BLAKE2B fefcad237a587e83bc58b8f89e9c40cbc19ba9e2b784ca2d96b7a502c79068bf60fa78d7f273589df4e110b3f14a77f9d901479902b640454ac1f0dfe6e028e7 SHA512 42a7431c7853e1b06a76ed15c205eebd7b334516c14e7dcfeddb2f9249f30f879f8256a1b454be71f79e71205b3efa95efab726fd88b4d455bb0fc4a8092bcf4
-EBUILD 4store-1.1.5-r1.ebuild 1472 BLAKE2B 8bae6d001048418fd72f0b73ebbea47db93f57b03d8a2f0603d1547a4333a04c7f9c22119158c175f88fabba5a9a5796cedf7b4efb40971533e38cb5d0f71d80 SHA512 5f61f30d75ad171078909e3a5ffb4bee4c001a546f49556b6b78a50287b5bdf9fc8f1fcec9ed86c43ab28e24d8ff66e35b6d863aad611ec57cad63379b97d2ad
+EBUILD 4store-1.1.5-r1.ebuild 1442 BLAKE2B e1e1ece74d5eed879b4eaee82197ca02f05970f753a3c2ac26f74493910e7b9f7e1427352537848bd602f6c203abc143bb368220d9191e9eed50acaf7ee4ff30 SHA512 57a351dfca0ec636034bb9d7c9959da149c6093a4275b54bdd13e1eaf933d242088b281def4922c66e2c0afc96313cf95fd62c44a6de85c3a1bd84c460dfcc09
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index b8212e57105d..9f9a3184a8f5 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/apgdiff/Manifest b/dev-db/apgdiff/Manifest
index 9647390e319e..36b3aea77628 100644
--- a/dev-db/apgdiff/Manifest
+++ b/dev-db/apgdiff/Manifest
@@ -3,9 +3,9 @@ DIST apgdiff-2.2.1-src.zip 194305 BLAKE2B 9c4d5eb7639038b591d31a6059efa0c78cdd1e
 DIST apgdiff-2.2.2-src.zip 198814 BLAKE2B b044f16475576fd714b6196da55ec1b744255aeb3cdccc2fd654500235cd0b500b8188e7d06962bb8fd28dc1a77e3526cf39550eb89da101d6255b1b6b9fe59d SHA512 273ba473b5b4ccfe2ae1b3f34ce2c2b825e446fad166f28a4575528190c20922e6794563ae3e5b2918ade5a3292a792ea363e9e5ec0900e924332d8771548c0b
 DIST apgdiff-2.3-src.zip 215881 BLAKE2B 05482ec11e278f5408305e16ee57bef99eb3e362ebdc5055781017ff40890a56936b515dd9973b557ad64d4a7e934b1bb5886207a9d9a9e0365d0e41f3fe008c SHA512 e716143ff4378fc27c4781076c51826583c2ad9dab17f4364acbfed0f9a0958dca0de9a72171816bbce41653ad33834158cb9277dd8790649da4bd24e013bbb5
 DIST apgdiff-2.4-src.zip 227714 BLAKE2B 1c62c94592b28a7caf5a56f4ef4206cc2655f2da278d5a71e165f409587d1573dd44b62261817f0b994ed95a398555190dee6a2873fe493f695e91c6cf9dd22c SHA512 f37e0f86ff8a8bc53a43cac1748ab3a2c96ab6c972b37ee63f281ee397b31a7b48986cbc963d89ea773f1bb7b10b798de74a4c88a03f2db7672501b93355261b
-EBUILD apgdiff-1.4.ebuild 1077 BLAKE2B 7937af4e236eb070ddf078245d5eb160df71ec732041f6de22c0c013b50ebb86f5a88151fbede492e0fd9a8f0202396a8d35664b57d52eb79235c17dc8d83beb SHA512 1600b4fe5690a827b7b8d8ece56ab8b925887458435907a8df957f1112282a5e5a9981b1adccbd11b4bff67a7c8ed9d3de63d1cb05862ea392fe8cb67ba657a8
-EBUILD apgdiff-2.2.1.ebuild 1080 BLAKE2B 81e47a54877baa6b0088a798e521bf66e3db0168801afe0af095c6124188ffd2d006d2bc01e9e2a2ebadcda1a5c0fdf1fee5eddc217d9e1d2528c40e6b43b22a SHA512 438d60ab64e85540b8840417c2e820a91108678f28042e13293ff2d6d6505141da0cd925fa875e7a81f986ec156fcaa11d8935ae409b67370ee8a4721afc4b7a
-EBUILD apgdiff-2.2.2.ebuild 1074 BLAKE2B b4ead10a2ebc772d822dd99c3a47edfae86fb5f41e0f5ac65107c9bc2fe0d6fbdb3e711c858ac6c71c6d2ed613e54f92e57ee85de6a2cfe0805a87dd262e9bb3 SHA512 954aa73ef60cbbf982ac6bdd22a0f8194c39070557264c7572ea508c79a7b8eb30badf7ae021c00b958a94a1dcac240b04d0b38600e645fcd4e97ff4c6fe010f
-EBUILD apgdiff-2.3.ebuild 1074 BLAKE2B b4ead10a2ebc772d822dd99c3a47edfae86fb5f41e0f5ac65107c9bc2fe0d6fbdb3e711c858ac6c71c6d2ed613e54f92e57ee85de6a2cfe0805a87dd262e9bb3 SHA512 954aa73ef60cbbf982ac6bdd22a0f8194c39070557264c7572ea508c79a7b8eb30badf7ae021c00b958a94a1dcac240b04d0b38600e645fcd4e97ff4c6fe010f
-EBUILD apgdiff-2.4.ebuild 1074 BLAKE2B b4ead10a2ebc772d822dd99c3a47edfae86fb5f41e0f5ac65107c9bc2fe0d6fbdb3e711c858ac6c71c6d2ed613e54f92e57ee85de6a2cfe0805a87dd262e9bb3 SHA512 954aa73ef60cbbf982ac6bdd22a0f8194c39070557264c7572ea508c79a7b8eb30badf7ae021c00b958a94a1dcac240b04d0b38600e645fcd4e97ff4c6fe010f
+EBUILD apgdiff-1.4.ebuild 1101 BLAKE2B 068494e8686934f6e7a7857f1cd8a12dfe034bff11d59ae7d20128c79881b977ab5779617f82c381b64d04ad5cad3741ea871575e5952661ca4ed9271cdf4db5 SHA512 3ade424c6cbc9fc15ef70fc857b16519116d3d7b5e11d5dbdfa3a647c7e11af26c2068e956b6472e34befe7dda67684672fbaaae13c1586b382eb86eb0811437
+EBUILD apgdiff-2.2.1.ebuild 1104 BLAKE2B 8c8205a063b3679349eb369f04bd75bad8f1a9c90aa9caba37d8bda85116210269ebe2797ef146f41e71a2f34d706e2ddc7cb49fcf94ad8e98e8a5eb0e65402f SHA512 7f47a043a0d5b1fbeb98a0eed7cdeef5a4408d88ee469f3a281fc1e99f24a14222a7d1a8b64e9b0e2a80dc2aaf8d56d49d9ee731ab0d4440de35a5d58032780c
+EBUILD apgdiff-2.2.2.ebuild 1098 BLAKE2B b0ef57ba86411a0fc2d864654d650fa3164133c54cb9ec8b0781a697bfafc97d4e6beba47bba730c72a8d406875254ec7a2a295975671389f5940804e5c721e8 SHA512 f9284908521f49d42cc1312a8db98ad08c6c076f2786c7c2aeb6fd40d6fa1f80c88d007977a60cf2e3a241a4342b85a4d4f6e9326f2135e0e7438e5e11aacd51
+EBUILD apgdiff-2.3.ebuild 1098 BLAKE2B b0ef57ba86411a0fc2d864654d650fa3164133c54cb9ec8b0781a697bfafc97d4e6beba47bba730c72a8d406875254ec7a2a295975671389f5940804e5c721e8 SHA512 f9284908521f49d42cc1312a8db98ad08c6c076f2786c7c2aeb6fd40d6fa1f80c88d007977a60cf2e3a241a4342b85a4d4f6e9326f2135e0e7438e5e11aacd51
+EBUILD apgdiff-2.4.ebuild 1098 BLAKE2B b0ef57ba86411a0fc2d864654d650fa3164133c54cb9ec8b0781a697bfafc97d4e6beba47bba730c72a8d406875254ec7a2a295975671389f5940804e5c721e8 SHA512 f9284908521f49d42cc1312a8db98ad08c6c076f2786c7c2aeb6fd40d6fa1f80c88d007977a60cf2e3a241a4342b85a4d4f6e9326f2135e0e7438e5e11aacd51
 MISC metadata.xml 301 BLAKE2B f760bd727a4a0cc9572e5ff436dd66ef64d8f734e8605ce15599645a6ccfaef3b0d17348d916894171e99e6920ba60b0e4a13917f9445562473dbd5949ce6f55 SHA512 c38dc6bf13779d6e575526c42fc108080b160b9a7127aaea7f93b8a7ca46dbee5d349e95bfbc8a598c745ba0d2c8ce8ce6ea65a475854ad4d5a85e3620166552
diff --git a/dev-db/apgdiff/apgdiff-1.4.ebuild b/dev-db/apgdiff/apgdiff-1.4.ebuild
index 1899250f7990..b23143f348bd 100644
--- a/dev-db/apgdiff/apgdiff-1.4.ebuild
+++ b/dev-db/apgdiff/apgdiff-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,6 +12,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.7.0:0
diff --git a/dev-db/apgdiff/apgdiff-2.2.1.ebuild b/dev-db/apgdiff/apgdiff-2.2.1.ebuild
index b52222f6cf74..82e2382f3931 100644
--- a/dev-db/apgdiff/apgdiff-2.2.1.ebuild
+++ b/dev-db/apgdiff/apgdiff-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,6 +12,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=">=virtual/jdk-1.6
 	>=dev-java/ant-core-1.7.0:0
diff --git a/dev-db/apgdiff/apgdiff-2.2.2.ebuild b/dev-db/apgdiff/apgdiff-2.2.2.ebuild
index fd930739b116..8066c91411e7 100644
--- a/dev-db/apgdiff/apgdiff-2.2.2.ebuild
+++ b/dev-db/apgdiff/apgdiff-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,6 +12,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=">=virtual/jdk-1.6
 	>=dev-java/ant-core-1.7.0:0
diff --git a/dev-db/apgdiff/apgdiff-2.3.ebuild b/dev-db/apgdiff/apgdiff-2.3.ebuild
index fd930739b116..8066c91411e7 100644
--- a/dev-db/apgdiff/apgdiff-2.3.ebuild
+++ b/dev-db/apgdiff/apgdiff-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,6 +12,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=">=virtual/jdk-1.6
 	>=dev-java/ant-core-1.7.0:0
diff --git a/dev-db/apgdiff/apgdiff-2.4.ebuild b/dev-db/apgdiff/apgdiff-2.4.ebuild
index fd930739b116..8066c91411e7 100644
--- a/dev-db/apgdiff/apgdiff-2.4.ebuild
+++ b/dev-db/apgdiff/apgdiff-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,6 +12,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=">=virtual/jdk-1.6
 	>=dev-java/ant-core-1.7.0:0
diff --git a/dev-db/cdb/Manifest b/dev-db/cdb/Manifest
index f87e39cc3e88..fa047a8df8c3 100644
--- a/dev-db/cdb/Manifest
+++ b/dev-db/cdb/Manifest
@@ -1,5 +1,5 @@
 AUX cdb-0.75-errno.diff 243 BLAKE2B e0b2433529e8ade1c4802353017948fd709f47843f339d8e1f77f9c665ece80721613d2dce8c9e67b595ee03f9b7298b04f927a26ad0bf8b5e38a10836799c81 SHA512 03c64d2ab185c16d88f51aaa12d1ca06102444c3eed9d712fcd53e6b8eaeeeacbdf525d91c7fc3eb28bf88be776de4748157d596103b9fc7776a5bde05eef4c4
 AUX cdb-0.75-stdint.diff 11423 BLAKE2B 85f0c3d1b2908c001ebdb055ebe4d7a79bf16a61d1d3ce8295e17cc9c0d5f1d7859465e3dba377a2857741ef082efb621c0cb77179bc6208b35120d390b71f53 SHA512 0308d25c6f9ee3b8fc49e75a2e69c7cdbf8cca7dbf165b3a107d5e2717051f6c68df04a962456295c56e6dde97ee0777944cf406c3eb48f4b7f39ecfaf56f877
 DIST cdb-0.75.tar.gz 54162 BLAKE2B 7b488bf330b2aac88a1cca82a6a49e24d0fd953c77935231a31bd72cc0936a37628736b5b22ea0d58aaa77cd118976ab8aa82ccc080f99e190e3f1db5d51b622 SHA512 6faeab91a77457348b58f685e81000b83fb609691317198a06284c5c62dee1e4d6138f90be1e727021f279d740169c175a21b23c96adb39a654e3f7fafdf36c0
-EBUILD cdb-0.75-r4.ebuild 1478 BLAKE2B 96a61dad10e9866a5b886d21a85da2b893695f4889803cb022199807dd63774621c16abe93c0cd4d5f288d8d3a57813bcf9f7996c874f1dcd7f11e2f03c59bb1 SHA512 101ded179661ff83cb11c7cac5f015fcb655522f2c2dbb01b1081ec617b823980e24f6dc47bc0bc88039bf6b782aabfa2b6daec4fd02bf1f73888d9cf84870d0
+EBUILD cdb-0.75-r4.ebuild 1386 BLAKE2B 6a54d0922fa13cbd734c56cf072863b0953cb6c6808a9ab55c21bbf061aee7808579bdc5fa3764cdcfbc19c3b5b6c36938e715b22f0c6f525efada08310b84a4 SHA512 7bd1208a961f7a9d6abb77e9abc3c01a3e4fdad95aa4fdc0d6dcb619eea8c6e8340ef593c109532406bdc815db0ac90a5a5fb694e341144c9cf7b2dd6ed906fb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index 89db70153cf3..4ba24d9d243a 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -32,21 +32,20 @@ src_configure() {
 }
 
 src_install() {
-	dobin cdbdump cdbget cdbmake cdbmake-12 cdbmake-sv cdbstats cdbtest \
-		|| die "dobin failed"
+	dobin cdbdump cdbget cdbmake cdbmake-12 cdbmake-sv cdbstats cdbtest
 
 	# ok so ... first off, some automakes fail at finding
 	# cdb.a, so install that now
-	dolib *.a || die "dolib failed"
+	dolib *.a
 
 	# then do this pretty little symlinking to solve the somewhat
 	# cosmetic library issue at hand
-	dosym cdb.a /usr/$(get_libdir)/libcdb.a || die "dosym failed"
+	dosym cdb.a /usr/$(get_libdir)/libcdb.a
 
 	# uint32.h needs installation too, otherwise compiles depending
 	# on it will fail
 	insinto /usr/include/cdb
-	doins cdb*.h buffer.h alloc.h uint32.h || die "doins failed"
+	doins cdb*.h buffer.h alloc.h uint32.h
 
 	dodoc CHANGES FILES README SYSDEPS TODO VERSION
 }
diff --git a/dev-db/clickhouse/Manifest b/dev-db/clickhouse/Manifest
index 5df90942c534..00beeba0fa8f 100644
--- a/dev-db/clickhouse/Manifest
+++ b/dev-db/clickhouse/Manifest
@@ -10,12 +10,12 @@ DIST clickhouse-19.13.1.11.zip 11502726 BLAKE2B c2788702a2c27c995abc072a94f3945e
 DIST clickhouse-19.15.2.2.zip 11425217 BLAKE2B 3a2288d771cd92dc283713a44df84df8c3c946ef92efd781d7619c8ffc0d7a3884f1a988c81f1703a7d373e78e413bdaea0fd100cebf7090be9bba16779209ff SHA512 029376b9d540c592d30a32457deb9e605d512fc448eb3dc6896b0ca48a5e92f390ef2dc3a4ea63ce19c264a8b2810ff952e95a6c7a8d4506f733ac6253c079d3
 DIST clickhouse-19.5.3.8.zip 11247905 BLAKE2B f72289f55bddf9b3ad2e16a4d1fc6e4f7681477e742eda3694c3c16975820c93affc01c70b194c5992226d79bee714f706c04402c62bd0ed3d1701a16fb22192 SHA512 f578abbd43c3ccf721e079ce2bafac22be0c5d619388be192c59a2053ae1cf1e7f0a025e0323f0f8f004f879990a88c0ca0cd4d135606de51c576619fe0172b8
 DIST clickhouse-19.9.5.36.zip 11708002 BLAKE2B 075f9b1556c5ee207a608047fa559cec7a0b1f044236e412189ae6dabe25aa04abf881726e4ffa17d4aad6937250c704f050935e61470994b57eaa1ac9ea07e4 SHA512 b0aa04a1c0f7c15316c83a2711f9b64f8235e664956f933530a9f2dc26fcb8b817adb8ca43c96db1cad498e06f4291ce13c0bb259726039c5caa52ae523fa4ab
-EBUILD clickhouse-18.10.3-r1.ebuild 4918 BLAKE2B 2b7db7cd6213ec5965692c231d567f29345515edd639e054ad2f4dd9ca5ccc11560126c9361fb93412395810947c1b6b19859c0b5274a90eda502851a45c44f0 SHA512 97f4328dc9b0ad5cb50c223b00d127aee0da3f3349067674cd124b6a4842547376b674d031d72274313bc1df22099570cdac6211f294be97b5b08ed91155cedc
-EBUILD clickhouse-18.12.17-r1.ebuild 4915 BLAKE2B 6912e12f85c382c0a2822c924055583d1152311f1a7480900573f7dba1002821821912c75420551aebf32ee7dea70f54f8d8c00512f155fa66f3926146e21721 SHA512 af177e7339dcc6b0a8a8d3527b2c15a663f8bab2cdf2879d1ba7ff217697bd7db369f1a3f54630ebf00bc36e455b6f9b4390752cd910d3e434d42aab962ed0e8
-EBUILD clickhouse-18.6.0-r1.ebuild 4906 BLAKE2B ab34699e3a363109e51559ed941bc47ee422335ec0a198191f8aee9673cabb2d14156210855bb46bcf0ac1cbd7b744541641b3e0e796085a0c2cd9d2e3a59435 SHA512 3671f1837b50806528893c8f1291ec60f2ef42230ae8f5b7c07ee9da34706a0ba489e90950a03fa0f3c8b9bc3b144a06e7f3f0bc35b30fbb179da7715ebefc14
-EBUILD clickhouse-19.13.1.11-r2.ebuild 5060 BLAKE2B 9dd106fcbf56f676668613defe986cc39b8b489e67a15f96bc89101e7490bccebfffdbd85dbe5ea890e635f7f87dd7f06555caaaafdd76f06ee0ae5ea7cd1db6 SHA512 8e0eb0472dbe9bca99181b644489b331a292f41ede0d6ef35c6c8862f427f883255d890f0fd973728a9c6538d679c7aa6916e481bb55f3ac1b662c402215efa1
-EBUILD clickhouse-19.13.1.11-r3.ebuild 5150 BLAKE2B 3224340a5229b176f033481560373c62ba3493e4f75d2d946379db1c1da8ff17180c382478572803d638e67614a4c4385a8bf1e13fb46293f0ea4a07fb9ae812 SHA512 ce24527a8c9c5802d6fb1cdc9a6c6fafa49a71d20199ae77e45da1190cd720719591009a0f2ecaad867f4f9952432d3af7ad5a39a9618f2467b2aee817d31f3b
-EBUILD clickhouse-19.15.2.2.ebuild 5280 BLAKE2B 2ebd85d2ba0e26bcd0f55237c26e4280578caba6be08414b90613e727e21af371716fabf7109a6bcae4f2ee2ebe0aecf958b796f2c7e121fb1d37e6e1a1c690d SHA512 0dc7930bce6a5f34317ef2694b60b6b55f1caa9eff1dcd0d2f2f728a9bf0f713634da8c6d8fb5954ef9527aeb699ccc85548315d4cd777f94b01fd301b497ff0
-EBUILD clickhouse-19.5.3.8-r1.ebuild 5041 BLAKE2B aad165d484fd9a978057e57f57a12146ae97f82455ff47909a9476f04c28c95e719a7867cb2b2fe6acde25fa2e43c12de4c7c19c2c8e6f0810f4ddcf08b311ad SHA512 253de2e46d5eaba79d5d79a149e0fcc582dd08dd30a0b04fe39e2900ebf5ca68cfd7619f4c9af5d662d7baa795649a37a4db48efc6067c92fb79956a2ca9e847
-EBUILD clickhouse-19.9.5.36-r1.ebuild 5041 BLAKE2B aad165d484fd9a978057e57f57a12146ae97f82455ff47909a9476f04c28c95e719a7867cb2b2fe6acde25fa2e43c12de4c7c19c2c8e6f0810f4ddcf08b311ad SHA512 253de2e46d5eaba79d5d79a149e0fcc582dd08dd30a0b04fe39e2900ebf5ca68cfd7619f4c9af5d662d7baa795649a37a4db48efc6067c92fb79956a2ca9e847
+EBUILD clickhouse-18.10.3-r1.ebuild 4945 BLAKE2B 92ce84a4ad45c297c6343e1d754ca49bb316c5561f9d3fbf9585f58b65c7905ceedaa98900c1d2247324c9fafc87f3a10dec3a0f98627bfe212e0b2a0cc9b0e6 SHA512 15f1d42ae6cfe8f80d37e61b745d329490be7d9515b37fe5e8e0b57f282611d787d3772ec1d2edcba0659471284688d5d3cea382c2603820c75203b980bd98a3
+EBUILD clickhouse-18.12.17-r1.ebuild 4942 BLAKE2B 9435bf169fb3d7726eae5c7d050965441516e824ed310a27e20835f3c9362512e1afe231c06165a958f65185ed3a0b81fcd85f6b20102f5064af45116190c8f0 SHA512 240d4096fcb8112a73a12d357706ccd41fefb5985ecd185f2a398ccf9ab8f672f173534e5723674ff28657721f08a7f8191093289bad6b99bf9fee4ef9d36525
+EBUILD clickhouse-18.6.0-r1.ebuild 4933 BLAKE2B 8e8365e1410d2686411dbbdb353908fdc623f42ea4cfa83427c93e4e43707a8a6bf1d4a2d2b1df701198e862adea162a339ddc4a6909fe9b64093c368a00a527 SHA512 b1c573214a740511a476ba7bac8111268901ba2f323cbf74652ed47bc8aa30ecf1c7271da64c5ec981e873954780e22f972994c36ce4b760a6e26ce98f088a3f
+EBUILD clickhouse-19.13.1.11-r2.ebuild 5087 BLAKE2B 51f28b64c9edbd332970f6a62d7382bd1223b05cfdc821de179ab4554f4eb4cbf4e6223cb3d44a2a54652ea4d45deff98652e0b430f639673593f5583f2cfe5c SHA512 c5ddb931bec986cdb649b407cb3f8474f98bad2057dd7f036a23e3bd8ecedcc42022e87714033f16dbdfaab6b19eb89391a13fb77022ad815fc21abcdf3af6a8
+EBUILD clickhouse-19.13.1.11-r3.ebuild 5177 BLAKE2B 7ea02b1ca78b64fdad01765970b808112122b3b6e26f3c2ef0cd4c4957732f1f1d86b587c07dc17174d88705370a542a92ef1599784c34c329871ceaafd2490f SHA512 e6a2e7c8d0bc4c6e5f9ea29bcc5ca28d270afd97a43886a187a86a65cded378805c091b41bf46be107e7710632f8ead746f6299981c6cf3bd1e3332332c8e96a
+EBUILD clickhouse-19.15.2.2.ebuild 5307 BLAKE2B b386d6f4996c02e26730440bd8a30df5c33caa889f6d634b5248acee29a9fa6a7e327cca2dbc5dc2a38e99e4db991b4c8713b70496a47d55697166560000a383 SHA512 fa6b613fb1c4e3641eda633da238251e3bdd3a7d716d28ce09ba532c604e6d5ef1a04bee5320955b5fb5001e1f81d093c28dcf8135756d2d0eb590848b1947bb
+EBUILD clickhouse-19.5.3.8-r1.ebuild 5068 BLAKE2B 3015be0524ed170060410ee0b5c15780b7d21da61001bbb96f571ee0214bdd3a673e861a5613481b09da46b017b6f9cf95c480f09d6abdab38375f612a56693c SHA512 f7e2bc913d97a905f1042d28b3645adcbe3da1f24510d129d710cbbd95943a444fe484e56ae310f3d4fde70b29b36364f7462c8ac1a2bf004644c1c68e63a273
+EBUILD clickhouse-19.9.5.36-r1.ebuild 5068 BLAKE2B 3015be0524ed170060410ee0b5c15780b7d21da61001bbb96f571ee0214bdd3a673e861a5613481b09da46b017b6f9cf95c480f09d6abdab38375f612a56693c SHA512 f7e2bc913d97a905f1042d28b3645adcbe3da1f24510d129d710cbbd95943a444fe484e56ae310f3d4fde70b29b36364f7462c8ac1a2bf004644c1c68e63a273
 MISC metadata.xml 657 BLAKE2B ea02627178df53a81cf2cb46f47e51ebf0437d5e70ec745a7d5d92d430e2055f3112280d3cbed5d7d7eccd1ce892ff1b184f042b850de1f9071716bda5176e82 SHA512 1a3810659c43b9191a8a37aac652c070fb05e663090575c4908e5dc248dfb1e20d9dd3d832a71b95c36b17a6f3a802dacbea2866f33c530c3d5d6c93f8a58690
diff --git a/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild b/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
index ff3db2a3a66b..051b8e2ae359 100644
--- a/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
+++ b/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
@@ -21,6 +21,7 @@ SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P
 
 SLOT="0/${TYPE}"
 IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper"
+RESTRICT="!test? ( test )"
 KEYWORDS="~amd64"
 
 REQUIRED_USE="
diff --git a/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild b/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
index b8a7337618a9..a2fa38544292 100644
--- a/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
+++ b/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
@@ -21,6 +21,7 @@ SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P
 
 SLOT="0/${TYPE}"
 IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
+RESTRICT="!test? ( test )"
 KEYWORDS="~amd64"
 
 REQUIRED_USE="
diff --git a/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild b/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
index e419edfa1571..d92170ac9fe5 100644
--- a/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
+++ b/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
@@ -22,6 +22,7 @@ SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P
 
 SLOT="0/${TYPE}"
 IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper"
+RESTRICT="!test? ( test )"
 KEYWORDS="~amd64"
 
 REQUIRED_USE="
diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
index 799746e089be..4e0ea139c71b 100644
--- a/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
+++ b/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
@@ -21,6 +21,7 @@ SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.z
 
 SLOT="0/${TYPE}"
 IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
+RESTRICT="!test? ( test )"
 KEYWORDS="~amd64"
 
 REQUIRED_USE="
diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
index 6525cf8d8cf5..dd1a6eead246 100644
--- a/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
+++ b/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
@@ -21,6 +21,7 @@ SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.z
 
 SLOT="0/${TYPE}"
 IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
+RESTRICT="!test? ( test )"
 KEYWORDS="~amd64"
 
 REQUIRED_USE="
diff --git a/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild b/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild
index 47fed41d0c75..c93c02640661 100644
--- a/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild
+++ b/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild
@@ -21,6 +21,7 @@ SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.z
 
 SLOT="0/${TYPE}"
 IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
+RESTRICT="!test? ( test )"
 KEYWORDS="~amd64"
 
 REQUIRED_USE="
diff --git a/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild b/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
index 7892e4667f5d..3e511dc357c8 100644
--- a/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
+++ b/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
@@ -21,6 +21,7 @@ SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.z
 
 SLOT="0/${TYPE}"
 IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
+RESTRICT="!test? ( test )"
 KEYWORDS="~amd64"
 
 REQUIRED_USE="
diff --git a/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild b/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
index 7892e4667f5d..3e511dc357c8 100644
--- a/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
+++ b/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
@@ -21,6 +21,7 @@ SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.z
 
 SLOT="0/${TYPE}"
 IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
+RESTRICT="!test? ( test )"
 KEYWORDS="~amd64"
 
 REQUIRED_USE="
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 5ffd4ee81aa6..4ccda1e2f18f 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -5,7 +5,9 @@ AUX etcd.logrotated 104 BLAKE2B 3126c99db171af177d6d6368e7e53f3e5e07b9ae2926ff12
 AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452d26fbaec17ab9c138db86b543c3c88fd3d16ce79487eb2c31ad7bbfb0c5b9cd11eede9b99bd2d SHA512 0074f77a17afe2bb4145f12a6eb312caa3e08cfe8bf35856b79d091ad8786c4223bd91c0a865e789ee9ba180f2672b31721742bb32efd0cd383bc747eb926961
 AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10e20b61ab3df45918747f588b9246085fec925bb39b772e061628aadd030a23a59b65a2fc2243eca1a7f9 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce
 DIST etcd-3.3.17.tar.gz 6507229 BLAKE2B e49b66a3a2bb5be254cb3400341d4f1454608a9923295826ce780fb5750b6182ec7ec35996ef538aa38863cacd0c0e3efd072ce5c3dae1e65509ce962964994d SHA512 73f8ddab1c27c77cedeb602201d01b433363c9550ec26b4729f2c5c114aefa4b90d444fd5a7696272c2cccdc8329e641f073ef9f39c7ea4e62837341dfc28641
+DIST etcd-3.3.18.tar.gz 6508732 BLAKE2B cce52ac9fa005388bafacf3d0bf049f3930de12d0cb50cc863655fdbc35cae2d647f64eddb699cb1ef7b3736687a9978cd120d181b274b663a1ac2b7eb549729 SHA512 1146baa8c424a6ddb4a2a10494e2f82ba0c22def1fcd3e041b871c060ca915267f1a2e1c455b017eded1908300ddbd8a3849ee3c5dda93489d9eeaaa90baf254
 DIST etcd-3.4.3.tar.gz 8941589 BLAKE2B 127e4a8dd9495686ffc43099c3002e0e3c00ab661bce917ac298f69351e1226dff0efcaf9277c1e46449abafef965af8f612a127e1e30c381545073232a2ff50 SHA512 0bc1e857b707be1d348f5ab58a330d259dd30338c28580751142f643b2a081d1fe42a8859fa9463a734ff27f51929dc89f933f044b89d6e549a348add034d752
 EBUILD etcd-3.3.17.ebuild 2003 BLAKE2B b17a2eb321060ae13b0fcd6ccc347b9449a3e113489431e95a96e3cec570c3f65adac65b446357eac95f0faaae0a2f33548fc51cd4bb05a37725a2529f076338 SHA512 41bdae1f83128670a89ab695a03a550d6ad29b29b977cf0e992c9c2a04d4110be651e7a15b615d34e83d1646a3573c8521b09a168d65069fb682846febb1f826
+EBUILD etcd-3.3.18.ebuild 2004 BLAKE2B ebbf4469e049005dae059bd5207a834b99ae01aef51a395df2e39f2b6e56018072e4c5eecb52f8ffe9199d95e0c82ba629b17e10f490215711a6700ed4d839c5 SHA512 cffde362cc2300daf694d5b32c4b83ab4c6f57d47199b9a2ce62719606e1a384e6df977ac27863ffe9b271064be6e1aad67b7b62f4284dd2f73c92a7756a1e67
 EBUILD etcd-3.4.3.ebuild 2273 BLAKE2B 4fc16f6847b2843bd8e2fe4d419f8efb09ea0bb99d754bad831eec4c44af3678e141b90242bc3582eba374220a8a6a7758065bf968ea989ab7e7b0d67b0fb6b2 SHA512 3631168ebfd7275c949d7e7a31caeba76ba95bb5bb97bc2726c0ad971600c71d0243334fa8ebf2014a51fb8aa6f6549b746b59da28b653c400d14b98155b0bda
 MISC metadata.xml 679 BLAKE2B 7374379a18107011df792be631428834334ad8e6da5cfe404f18555e8c168d3fc716a1c8d6cb5cf1d9ccd173737aecf93a165f846865dbb6ba4a76bd4669b446 SHA512 8070d8b51dd3319e8b159072db237dcc5299361c2f74fa086fc4cbc174cc6a5c8f7659310332b54b2275e2bc3d028323c4dfa5775e21693a339f54312582d2f0
diff --git a/dev-db/etcd/etcd-3.3.18.ebuild b/dev-db/etcd/etcd-3.3.18.ebuild
new file mode 100644
index 000000000000..76b45d139626
--- /dev/null
+++ b/dev-db/etcd/etcd-3.3.18.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/coreos/etcd"
+GIT_COMMIT="3c8740a"
+MY_PV="${PV/_rc/-rc.}"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/etcd-io/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+IUSE="doc +server"
+DEPEND=">=dev-lang/go-1.12:="
+RDEPEND="!dev-db/etcdctl"
+
+src_prepare() {
+	default
+	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
+		-i "${S}"/src/${EGO_PN}/build || die
+	sed -e 's:\(for p in \)shellcheck :\1 :' \
+		-e 's:^			gofmt \\$:\\:' \
+		-e 's:^			govet \\$:\\:' \
+		-i "${S}"/src/${EGO_PN}/test || die
+	# missing ... in args forwarded to print-like function
+	sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
+		-i "${S}"/src/${EGO_PN}/raft/logger.go || die
+}
+
+pkg_setup() {
+	if use server; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	fi
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #651934
+	export GOPATH=${S}
+	pushd src/${EGO_PN} || die
+	GO_BUILD_FLAGS=-v ./build || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/etcdctl
+	use doc && dodoc -r Documentation
+	if use server; then
+		insinto /etc/${PN}
+		doins "${FILESDIR}/${PN}.conf"
+		dobin bin/etcd
+		dodoc README.md
+		systemd_dounit "${FILESDIR}/${PN}.service"
+		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+		keepdir /var/lib/${PN}
+		fowners ${PN}:${PN} /var/lib/${PN}
+		fperms 0700 /var/lib/${PN}
+		keepdir /var/log/${PN}
+		fowners ${PN}:${PN} /var/log/${PN}
+		fperms 755 /var/log/${PN}
+	fi
+	popd || die
+}
+
+src_test() {
+	pushd src/${EGO_PN} || die
+	./test || die
+	popd || die
+}
diff --git a/dev-db/henplus/Manifest b/dev-db/henplus/Manifest
index 77bb6c0461aa..9eb5f0f6784a 100644
--- a/dev-db/henplus/Manifest
+++ b/dev-db/henplus/Manifest
@@ -1,5 +1,5 @@
 AUX 0.9.8-build.xml.patch 771 BLAKE2B b0fc8433a08fe2321656c8a34190dc19efbc6ed52022824ef74cf55e990c43a5cd48147550c40230843239bddf15fc77d4f0ed1beea872af2df5d1ebfe7f6258 SHA512 b886c7f53bbbb10221b99c3d2ff32513c5388769310714e1c74c69aa662618bc719aa7338ccde92ca2119f9e6fa9591ae260dfe5055fa760f90b5f26ad740190
 AUX henplus.pre 1418 BLAKE2B bedb6cbef3fc1713895716c8af2cc3a70d77a42c7a940e86c57157064177afd59d52369f1aee72ac4e2c7501f219b8da1fe8482424fae62e1ef875fc255cf333 SHA512 331138630336c9f7a2f7cbf343b6ea77277d4ad77d706497545a6ff33cf44572cbe126acb4f0d212a40f652a24190b629f7776dbca08630de66d6f8ac3fae26a
 DIST henplus-0.9.8.tar.gz 233035 BLAKE2B 0cfba9cde654103f539ce28508d77169ce3a34ccc9a8805253e9bcd3a731118408c8a241f82eb6da8be2b96d1a4932c95024a158eae48396b045d5b94b0acaa9 SHA512 a22fc847f4441f627c1fa12f4f365c38d0c8ddfc205758d044e797e83f8d37032995666c2ee3dbb68d0a5f563fa5d574886e85757b1faa0acfc055e92b2fad0b
-EBUILD henplus-0.9.8-r1.ebuild 1025 BLAKE2B 6ab6fecb647dbbaadff21db0f705559f87e1e96a9c06ecd5f18eee8ce7298fb46253b24d858b3a503b7ddb2f17a43523cb5b17581270aadeb9b4580ea60f730c SHA512 0d55002c3686531f7485ea47ac91bddd73ff0beaf02f52b161c8cbb091e4aa38d230166e43fd724171f6f20a0bf75da588baf70fce4f17c364dd1c73cab282b5
+EBUILD henplus-0.9.8-r1.ebuild 1011 BLAKE2B 077b5c07ece62daade1fec608b7a852e37fb6dce984677803bdfd8ea8f1e78a74a2caabf01c47007256deebd5832cce1b6a875220fe155ec3d86997ce7d8ab14 SHA512 ef67bd74690353af4ce11ac00b98d2b7bbcbb2d2c284fd7ff2532bbc9876da0986736d8aaf1fa6e09bffdf34a7169cbdaf1defee21fe5e355179cc05540987ed
 MISC metadata.xml 313 BLAKE2B 494eb57813ba2f3f9c9ba73b23547819ae369df2ea1973710bbd5d240163902d67a854abaaf401e2ce598fa2ad9b559d48ea51e5db2dde55b1639de7b612e481 SHA512 22c759bfaa403d45fd081972c2009675d69156ff6f2caff621d9330b5c4a6c56030e70fd9a0639ff6a8684c1ff0e213ce9b8d6890607b12522eb2c768361d762
diff --git a/dev-db/henplus/henplus-0.9.8-r1.ebuild b/dev-db/henplus/henplus-0.9.8-r1.ebuild
index a1d41261fac3..c42f56c5c950 100644
--- a/dev-db/henplus/henplus-0.9.8-r1.ebuild
+++ b/dev-db/henplus/henplus-0.9.8-r1.ebuild
@@ -35,8 +35,8 @@ src_install () {
 	java-pkg_dolauncher ${PN} -pre "${FILESDIR}/${PN}.pre" \
 		--main henplus.HenPlus
 
-	dodoc README || die
-	dohtml doc/HenPlus.html || die
+	dodoc README
+	dohtml doc/HenPlus.html
 
 	use doc && java-pkg_dojavadoc javadoc/api
 	use source && java-pkg_dosrc "src/${PN}"
diff --git a/dev-db/hyperdex/Manifest b/dev-db/hyperdex/Manifest
index 280f0ccfa771..0ddc71deedf6 100644
--- a/dev-db/hyperdex/Manifest
+++ b/dev-db/hyperdex/Manifest
@@ -5,9 +5,9 @@ DIST hyperdex-1.6.0.tar.gz 1490273 BLAKE2B bc8e83fa73f44695d82c2e7fb936b3cf34749
 DIST hyperdex-1.7.1.tar.gz 1517677 BLAKE2B 45c2789736a6f609f2c327f31f1e248b05abb46d766b565f35609be1ca78f680e2cedd017336fc82c844d17034197c14230bbf07d30228001c6cd45bcd509e15 SHA512 41bf8cc49081ba41917c737facfa7b5e29bcf73f510ae5743356828643bd7292ac8c610915985e52f6609c4a80cf70e7d515504bbe0a85383c74d7e288f2dc5b
 DIST hyperdex-1.8.0.tar.gz 1516389 BLAKE2B 7636349a3d81cc2592fed5d6db7c7bbaacdc0d1f6e4cb4965f111fe04ef8232337d6f1f4ce5a4d335daaab58e4171073fff079afd1822d8d57aadd6927c7da58 SHA512 e667552f16899edf57a08f3704e762e33b33aa9508ee486187b5c6fd6f01ab9cb61cd65444a676386554cebb2e4d191b4181df4c9b399821e5d244791bf3cb12
 DIST hyperdex-1.8.1.tar.gz 1516446 BLAKE2B aa2e011b8fdda57d73662164dac30984b3b633dc27bdbd70e415859386559cc41874ff6da0faabac4c28518455464fb960f285f50fd8e76cb9f40e938c9e328c SHA512 28a9b1a1f99d4159fb2d453fb7f740d4926ac2275488c8676a70d45879be5b1ef9b1e84720f86ef4f058706558899f2e3229fc7140349dadc3974754a03ac13e
-EBUILD hyperdex-1.6.0-r1.ebuild 1497 BLAKE2B e9a1e01ea9d604d6255c515ff4ad26f010be49537fe6b341f95fc313c53093976b45a828d6343cc7272ed9782e1529b8797c4b0753b8518527d4897ca34f5b0b SHA512 08966755f65cc5307d0caaf4543056b111ca1927642c5b9d3273d236802b5c154ece90951519ba129495d80d95d0d9b7719863980b1a4e8cfc03a54cd6ac0418
-EBUILD hyperdex-1.7.1.ebuild 1497 BLAKE2B e9a1e01ea9d604d6255c515ff4ad26f010be49537fe6b341f95fc313c53093976b45a828d6343cc7272ed9782e1529b8797c4b0753b8518527d4897ca34f5b0b SHA512 08966755f65cc5307d0caaf4543056b111ca1927642c5b9d3273d236802b5c154ece90951519ba129495d80d95d0d9b7719863980b1a4e8cfc03a54cd6ac0418
-EBUILD hyperdex-1.8.0.ebuild 1596 BLAKE2B 8b302e59a9555aa19ac9c8bade8bdeb16141449a24204ba891f64dbd55d502cf25be329faeddb0e404f86251cf917f142ddab28243581c288c07f5ed297b8989 SHA512 1f66116c040ff29dc248c65d53ab33d5e92726c1ecc4bd3dc51307fad594e64fa3eccdee6821f458f081bb7c33a19ba28d9498b4bebf149dae842f5ade31e330
-EBUILD hyperdex-1.8.1.ebuild 1596 BLAKE2B 8b302e59a9555aa19ac9c8bade8bdeb16141449a24204ba891f64dbd55d502cf25be329faeddb0e404f86251cf917f142ddab28243581c288c07f5ed297b8989 SHA512 1f66116c040ff29dc248c65d53ab33d5e92726c1ecc4bd3dc51307fad594e64fa3eccdee6821f458f081bb7c33a19ba28d9498b4bebf149dae842f5ade31e330
-EBUILD hyperdex-9999.ebuild 1433 BLAKE2B 40a874a8b4d9fe5d727091f6f3775d13d7d92abae383f6352fb0e29783e5e081c63415dfd839a59eff26dc8a8d88dc8efeaea432855ca3301dd87d4015b74c79 SHA512 41f608776b4ee8068beea39066a4f7bd45c54583b11e483113c78f2b84c4ba49b064d1c717dae40721325e0856fabfd43d91a3a369035454a6d8d00fab05ad16
+EBUILD hyperdex-1.6.0-r1.ebuild 1392 BLAKE2B bf86b3d8439217138e1dc4e46d328da122c7640a74228f3d03a9a99f1fc6890f1fd4784792405bc35435323d22cae1e68b03f377777e22e487ead92215f8a1d8 SHA512 46f3a608f219950d6c8e74b33aa3147b415e27f38c3e6a914a1294e8795db39da155ce350cf2f913ce4dc783c8bbf0ac64efbbc03351433d2962b57245536728
+EBUILD hyperdex-1.7.1.ebuild 1392 BLAKE2B bf86b3d8439217138e1dc4e46d328da122c7640a74228f3d03a9a99f1fc6890f1fd4784792405bc35435323d22cae1e68b03f377777e22e487ead92215f8a1d8 SHA512 46f3a608f219950d6c8e74b33aa3147b415e27f38c3e6a914a1294e8795db39da155ce350cf2f913ce4dc783c8bbf0ac64efbbc03351433d2962b57245536728
+EBUILD hyperdex-1.8.0.ebuild 1491 BLAKE2B 101b067a734b223b91e66843feab16c72b3bde465805bf58fc091d4c4ef094e79d3b1536a0ecc7c275b4ee4b58c36484e313cbb086eb28068127a8eed9d5fa6e SHA512 cc36edaea0d156135ff32f6068fe76a9822fe217edfbf8e674519061566286257aea21cb102cd38ed1612db1e1e0c0a52cce24a59d76b5864ec2b55d6e23d173
+EBUILD hyperdex-1.8.1.ebuild 1491 BLAKE2B 101b067a734b223b91e66843feab16c72b3bde465805bf58fc091d4c4ef094e79d3b1536a0ecc7c275b4ee4b58c36484e313cbb086eb28068127a8eed9d5fa6e SHA512 cc36edaea0d156135ff32f6068fe76a9822fe217edfbf8e674519061566286257aea21cb102cd38ed1612db1e1e0c0a52cce24a59d76b5864ec2b55d6e23d173
+EBUILD hyperdex-9999.ebuild 1328 BLAKE2B c49ecf1efdb6b9c91f726330b9b1d8a855a34ae86a3719d2df465b0dd34c5a9adaf1812b20ed592201018a6ec234359eb034ad0e21c38486ac1ea805ac166720 SHA512 d6afa2cb6b4e702f8abb8a030f705cd008791978af5144c6664f6dca2c307548d561006893caf38c875c84f7f62b7b958a9f1a9b94699b3b8e55d2f28d957013
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild b/dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild
index ba8e0bd4d3de..0a3b4c5bc249 100644
--- a/dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild
+++ b/dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild
@@ -54,8 +54,8 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Failed to install"
-	newinitd "${FILESDIR}/hyperdex.initd" hyperdex || die "Failed to install init script"
-	newconfd "${FILESDIR}/hyperdex.confd" hyperdex || die "Failed to install config file"
+	emake DESTDIR="${D}" install
+	newinitd "${FILESDIR}/hyperdex.initd" hyperdex
+	newconfd "${FILESDIR}/hyperdex.confd" hyperdex
 	find "${D}" -name '*.la' -exec rm {} \; # bad buildsystem! bad!
 }
diff --git a/dev-db/hyperdex/hyperdex-1.7.1.ebuild b/dev-db/hyperdex/hyperdex-1.7.1.ebuild
index ba8e0bd4d3de..0a3b4c5bc249 100644
--- a/dev-db/hyperdex/hyperdex-1.7.1.ebuild
+++ b/dev-db/hyperdex/hyperdex-1.7.1.ebuild
@@ -54,8 +54,8 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Failed to install"
-	newinitd "${FILESDIR}/hyperdex.initd" hyperdex || die "Failed to install init script"
-	newconfd "${FILESDIR}/hyperdex.confd" hyperdex || die "Failed to install config file"
+	emake DESTDIR="${D}" install
+	newinitd "${FILESDIR}/hyperdex.initd" hyperdex
+	newconfd "${FILESDIR}/hyperdex.confd" hyperdex
 	find "${D}" -name '*.la' -exec rm {} \; # bad buildsystem! bad!
 }
diff --git a/dev-db/hyperdex/hyperdex-1.8.0.ebuild b/dev-db/hyperdex/hyperdex-1.8.0.ebuild
index 107843edc025..de31c1703020 100644
--- a/dev-db/hyperdex/hyperdex-1.8.0.ebuild
+++ b/dev-db/hyperdex/hyperdex-1.8.0.ebuild
@@ -55,9 +55,9 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Failed to install"
-	newinitd "${FILESDIR}/hyperdex.initd" hyperdex || die "Failed to install init script"
-	newconfd "${FILESDIR}/hyperdex.confd" hyperdex || die "Failed to install config file"
+	emake DESTDIR="${D}" install
+	newinitd "${FILESDIR}/hyperdex.initd" hyperdex
+	newconfd "${FILESDIR}/hyperdex.confd" hyperdex
 	find "${D}" -name '*.la' -exec rm {} \; # bad buildsystem! bad!
 }
 
diff --git a/dev-db/hyperdex/hyperdex-1.8.1.ebuild b/dev-db/hyperdex/hyperdex-1.8.1.ebuild
index 107843edc025..de31c1703020 100644
--- a/dev-db/hyperdex/hyperdex-1.8.1.ebuild
+++ b/dev-db/hyperdex/hyperdex-1.8.1.ebuild
@@ -55,9 +55,9 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Failed to install"
-	newinitd "${FILESDIR}/hyperdex.initd" hyperdex || die "Failed to install init script"
-	newconfd "${FILESDIR}/hyperdex.confd" hyperdex || die "Failed to install config file"
+	emake DESTDIR="${D}" install
+	newinitd "${FILESDIR}/hyperdex.initd" hyperdex
+	newconfd "${FILESDIR}/hyperdex.confd" hyperdex
 	find "${D}" -name '*.la' -exec rm {} \; # bad buildsystem! bad!
 }
 
diff --git a/dev-db/hyperdex/hyperdex-9999.ebuild b/dev-db/hyperdex/hyperdex-9999.ebuild
index d1d8b48d8504..24f6526f77b6 100644
--- a/dev-db/hyperdex/hyperdex-9999.ebuild
+++ b/dev-db/hyperdex/hyperdex-9999.ebuild
@@ -52,8 +52,8 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Failed to install"
-	newinitd "${FILESDIR}/hyperdex.initd" hyperdex || die "Failed to install init script"
-	newconfd "${FILESDIR}/hyperdex.confd" hyperdex || die "Failed to install config file"
+	emake DESTDIR="${D}" install
+	newinitd "${FILESDIR}/hyperdex.initd" hyperdex
+	newconfd "${FILESDIR}/hyperdex.confd" hyperdex
 	find "${D}" -name '*.la' -exec rm {} \; # bad buildsystem! bad!
 }
diff --git a/dev-db/libodbc++/Manifest b/dev-db/libodbc++/Manifest
index c905aa190017..166a2e0dbb5d 100644
--- a/dev-db/libodbc++/Manifest
+++ b/dev-db/libodbc++/Manifest
@@ -2,5 +2,5 @@ AUX libodbc++-0.2.3-doxygen.patch 561 BLAKE2B 4b1813dc89760c0e70d36f853c21e5a830
 AUX libodbc++-0.2.3-gcc41.patch 456 BLAKE2B ad9de19388669c345cd619ab95518e0a8c3ca4dc5b246bedc386c76ae45a1d89e5fe1a9c15e88e298e1f228fcf066a4e2c3237e60f75bc893c695aa3a518526a SHA512 9b758fab94141338f42d9ce4291620bb839f7d044a9020de90258b70ef0554bb128879a3008bbafae9e5fab2082170d1a2b9e631d5ea7ef5c23eaf03f14d7615
 AUX libodbc++-0.2.3-gcc44.patch 316 BLAKE2B a7c4e6466b9c3b0b4aca8ea4288df30a86e462835fba4b63cb1c7c1925732bcb75f5652d154bb7223fe135dccfc0308167e0f521e958b2ef3262a24d17820353 SHA512 6b8b6f57523e9128927530d95477c3c55a27c47836e7231e8017958bd20407e637fd4896015a2a3fbf2e47e3e44f7f3e933a28c4ac84fc600366b899462aebb1
 DIST libodbc++-0.2.5.tar.bz2 362310 BLAKE2B c0266eef510f8bee3c430b6998f68859955968ee26b1ce8b456a497f84ad5f67ef96b474de0966aa07ff4ef308737103887c949704635696b095fef0bbfe59f7 SHA512 cc2485a0dae8a3f548a26a759f1421133a0a23715296f632067f5967b61778ca64e1339e19a4de15d06fb80b4e43ec8ddb13ba170b70dd7202c4d07b5669c2c7
-EBUILD libodbc++-0.2.5-r2.ebuild 3266 BLAKE2B f9ade3122983dfc191874ded2a02d73d0adbd7c9549a7066fbd3ff319202f26022c7f5dc62c385c557e2acd1f32e7e91473817b159d0d05662ed5070a06aba14 SHA512 2a76bbc2584fda03c1547b2d8e9153d1e21366e62d1ff08120085a8bc66855258b13a58903c481d614cff27740a6fd9e4c4bd4744709f09c64db556fbd4b2352
+EBUILD libodbc++-0.2.5-r2.ebuild 3239 BLAKE2B 2d6d4f9410810d3bc90605914a136b4491aa9425d8d4f13bca4bb73729aa48a21f37094cdcf0fef9bed1379514404405fe342c6546f7699a2e25fdff9342adb0 SHA512 670ef73d6286f82faa32e015af1f7fc1e350061482836fa2c811adb51955a766126b7246fc35b4a1fa56ad29e3ca093083dd44ecd472141ad2c3540f901c286f
 MISC metadata.xml 297 BLAKE2B 756bd221053dc911884d21bcc63739f5dfa8ea02020ff9c1ef124ce6b8f88b680d38bc43d9ad22d7ee3ca9dbcdce902cc21c221216e85d2b8e6d6bed859e687f SHA512 8633931faf6811746726153defe0825b1df645c938c98c4e02dac7e829f69596f8483a58096e51366f7849cd4e02ab2b2ec2cf00d8bb76c44c98f686c6560914
diff --git a/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild b/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild
index 2ff9b64fa4bf..ca2d04023a40 100644
--- a/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild
+++ b/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild
@@ -74,8 +74,7 @@ src_configure() {
 		#--without-qt \
 		econf \
 			${commonconf} \
-			${commonconf2} \
-			|| die "econf failed"
+			${commonconf2}
 	done
 }
 
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index a52b4569b7d4..ce87d3ecb52f 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -1,6 +1,6 @@
 AUX lmdb.pc 295 BLAKE2B 29c1cc5a70eb3d7f5c9dc4b1646644045514929428f164894ece93a4fabf33ca464e1f116c8a803b499aabf28b6dec372b50c46a2fa4fc1eb65105208759f4ba SHA512 d0749849a0ca0593fbff0b4f8db7143177c588e342978bdb8331238761379f5d5bf686190e39506ff6b0abf6f9d668c96480da685c56d7ed44e7756f92f4e057
 DIST LMDB_0.9.23.tar.gz 143813 BLAKE2B 252acad974a7ed528fe0e52b8332845bc0b6076599bbc79ef2c3f41459acb6ccbe5f6030c6a258fe30633c4c0568fa05fa6d46dc05bab3f93ee3aab16e6faa89 SHA512 47466a96ce288d18d489acf1abf811aa973649848a4cac31f71e1f25ea781a055ebd6616d2d630214b2df2f146f12609c82d65be0196f49d6b46a6c96464e120
 DIST LMDB_0.9.24.tar.gz 143916 BLAKE2B f075ec5f4dfb77685188229e20f12c4febe8295c7d35ed15c3db492b68af68cc7f76741078e9bb524d2c38587839f542e964af1e5d6d984bb28bd602caabbb8d SHA512 c3a96c27f13c072ef5861bcea045d82f0a220dbd938579411ea6c38ac0696b3620c71f1e2cc56d31db5105f3533da95aba1ac34653d8bdcfa4f2f1fb831cccb1
-EBUILD lmdb-0.9.23.ebuild 2264 BLAKE2B 2dfc5a9c856877c9c7fb21f1b2b9d5f2379b11cbda798d092aa42328472e3a9cd1e25fc2669da1e979c537b2fd020bb52f89df096cb6a0ee9b9fab5e35962d2d SHA512 922fecf16887e1ab9830daf11545ad372bf915416cbb14bd53097eb2ff1f97ba98f44721164fb1b5b583f1a23f0adaa1baf521753661a2abc1cdd4e274555281
+EBUILD lmdb-0.9.23.ebuild 2265 BLAKE2B 5bace75616cfb54910c2650a5ede02f5528fefde864ca50a1af1768166aff8b8963eec83e7bdf5b047c1140c9a9c81b80f2188454972bc7dba792b39c8a6e820 SHA512 e37446ec6499417508fa35c4b2ab17c21f561ce6e4132b705698f77f767f8665be19d63cbd7683f2a057af9f7e5269b7345829db184105b57fa78420803227bb
 EBUILD lmdb-0.9.24.ebuild 2287 BLAKE2B 72934fcabbe1802d6ac95efcef46857a7fd6bb24c2817d4d8d94187c6731685047538e510f65d073f1981944b46bdb2a67db0cec6d467bf4df6c1e759a38f967 SHA512 91c57ddefb164689905df0864274057098925a89291895526a060aba96eb6f4686f2a592ab2ae298e7a8349bdce439f87555a981993cd1e3feb2909fe5f75825
 MISC metadata.xml 540 BLAKE2B b064697aa562165a627cb1be8cce847c8046d10cf184a4563a632c43ebd1916ad866e843efd49ae5659e379f3695514005b9d601117719c9f48652dab48dcea8 SHA512 7ff1fddaca73c5d7b4a6a9ada9a7aad60e16c8c7063ad5cd9cf57301f504f6e0fe53bf568dec83abf522c2c099d2b3b2463619df17077ebaa3b39bd67bd738c4
diff --git a/dev-db/lmdb/lmdb-0.9.23.ebuild b/dev-db/lmdb/lmdb-0.9.23.ebuild
index 9c45a7a75f29..0365448cdf10 100644
--- a/dev-db/lmdb/lmdb-0.9.23.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
 
 LICENSE="OPENLDAP"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 9e96842fca44..697ed8dd08a9 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -5,7 +5,7 @@ AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3
 DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
 DIST mariadb-connector-c-3.1.4-src.tar.gz 738308 BLAKE2B ba0242ba951ba53aec899517cb25877cefebb757eb1d90adcf88021d669213790c32654d1078943f1c37f0494de780e03d93b3f2c2d8a584ddffc08d9802c392 SHA512 9528760df2aa4921d6a06dfd977977060b58fe7d57c7cb1e323021245533de3da97e45f44818fe9bfdfbe60606aff69f8216e23a0b53620aa21dcdee241c30ea
 DIST mariadb-connector-c-3.1.5-src.tar.gz 739192 BLAKE2B 4430231489bcd173ce6f0dc1502a4bc376545e598336a239d81e9a19ef73b7788316cdfc2660ab7681c3201afa42ed2527b37944097e6e525e6896e4f74766e0 SHA512 06da9d400bdaf1db640cd20ef0e028986e7dbe1108c24b73c67d6df40eecc36bcfa35fc0697567a95f5016242da5829a48b47a07c08faf8eadd4ba44b50acc1d
-EBUILD mariadb-connector-c-3.0.6-r1.ebuild 2815 BLAKE2B 807069ea31a7c42ae6eba3d8c3d3ccb76f23741d7a4fae97655f76df674cda564487796971d36d12e909243492531f9cacbdff312e61e1bb1522e2221f3f5287 SHA512 40395fbe2f70b2e7e77c339129be309d343368e5b006f4b0fc86c5134e7993c309ef715ef4b7f2e3feae178111954d407e13f6db4070ae0530ec1e6b54e03215
+EBUILD mariadb-connector-c-3.0.6-r1.ebuild 2842 BLAKE2B 207d08aff8494af4fd67c5fc9b8292348bc3c198655e3ae66c8e2f3fa7d27af3d177e177279ceb333d800fb9a8c5b8343edb9722282e892be42b73d79660e80a SHA512 83bcb560d6f10ecc2b24004b7dd71c6a5b5c9385b3787b44362d7cf0c3194bb4bcb0c25eacce5f400aa22091a3fd31acf7695d663c0446ed07e16f9e0f7480a2
 EBUILD mariadb-connector-c-3.1.4.ebuild 2344 BLAKE2B da4880e8fee8dede76cce177181f1290874f3a72078b9d7a3cd9ce3ad6d3abf7d72b418e81f57bdeb321e0e39d5a052b0195be70c92d066a53d8c4f0768842d0 SHA512 0b747b13ba14a5b1943ada402afbed3b19c490fb1b07fcd2a9c1791b1c97566186d9a46c9ac35113685b1a32b287e9373339f932c0e794ad86a19aa497de879a
 EBUILD mariadb-connector-c-3.1.5.ebuild 2344 BLAKE2B da4880e8fee8dede76cce177181f1290874f3a72078b9d7a3cd9ce3ad6d3abf7d72b418e81f57bdeb321e0e39d5a052b0195be70c92d066a53d8c4f0768842d0 SHA512 0b747b13ba14a5b1943ada402afbed3b19c490fb1b07fcd2a9c1791b1c97566186d9a46c9ac35113685b1a32b287e9373339f932c0e794ad86a19aa497de879a
 EBUILD mariadb-connector-c-9999.ebuild 2344 BLAKE2B 503e29dbd45777f693139c7febc843733c68b1c3c6151e7f69afd5b09fbe1767be464f912c2d7a8a082320a951952dca213ec1241b9fb7b2a2a3b2818bffbed9 SHA512 47a5d77dfb14bf5ffdad3bf849a3bb0df995a4c7db5b94704231ad70ff6e7529c5713e830e8c11c76d1cec0303496815d449390b84d91ca9687e312939883166
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
index f2f106102fe0..c4997d7b9543 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
@@ -29,6 +29,7 @@ LICENSE="LGPL-2.1"
 
 SLOT="0/3"
 IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	virtual/libiconv:=[${MULTILIB_USEDEP}]
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index d01177dd359b..586561ce5b06 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -13,10 +13,10 @@ DIST mariadb-5.5.66.tar.gz 45962591 BLAKE2B 41befba24abec2af876168a11fc205d328c1
 DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 8b5feb32085dc35b2f68dae985b2d266c4eaa0e956b490050a2df04bbff99bf8623b67e75af9326d84e3ad625c4d86b0d21d23c9a96df5a0c9cd5ed730958970 SHA512 fbd7af9284bbf09d55f128361e7cc52d94f24ac491aac800cd6d61f2e444aeca66a4d5e6ae94c2fb4044e00cec9b232bae9a76a229f87f19d90b7aecf70792ec
 DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43 SHA512 ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c
 DIST mysql-extras-20190731-2258Z.tar.bz2 332111 BLAKE2B cc144c9af852bfdd4149b96bdc22f8afb2d0aa92f95ebd272a244f0fb7743dc03f9244871d5c195260bac5d9ed20583093257ee2c95a5a4d0a4dae488d781adf SHA512 d4428a1128cd5aef62c463b659992b110090b1602cdcb6b8d922d570c6b946fde325bfcf5a9a955a8dcc61f3ccd3d612d8517ebf63e316f98ca9ff2cd8a807aa
-EBUILD mariadb-10.1.38-r1.ebuild 29462 BLAKE2B 79d7e5c952ca405a882558c933a988c933435339afc8075baaed9867e38ba587ee9c32a7b49c45cea2f7dedbcba9f6c20de868b5ddad9ea7c1ab7e0e092497e6 SHA512 4b0cbbebca30134500487db3046a68e16a63d61ab81a5f5b34522390a39da429bfd39491f16326e038d7cb72df2782ed152935378efa5ebe43eaa70fe9a12167
-EBUILD mariadb-10.1.43.ebuild 29886 BLAKE2B e4dfd11443d0aa9d522696779dbb4c35131643a6dd38cd2598ded4e682f76809fbe6006610d0dbff9b914dd33e3dd9f3dc8fe298ece58737b83a3c4a3144b6c3 SHA512 e4b11d0bdbac8498f5c1d5b9e6e1ccba724b1d94d8f7fb5da9b4cf17bccc9a4962a917522bbbebeea7ff6acb61fc3b09f55aea7bbc5434f3ea796808b6525fcb
-EBUILD mariadb-10.2.22-r1.ebuild 32513 BLAKE2B 4ad7714945e8fa176bfb1634c088b67700277c6421ff831fae5b2a9b2100d4403f77007e4e2f621852341414b7fde78cc11aa39a768bdafc5e011f6ffccea8d1 SHA512 5056956f48909865cb06d7e5c6a874748087d63f0a4bd509e08706607c37a2fd45aa7ffb1c88666bb9f7cd30be888da128b011fd61f633a29ba10a4a7b7510c9
-EBUILD mariadb-10.2.29.ebuild 33107 BLAKE2B 1551c19ed2fb6ec140e661f22c8ee6b833ee4e919424102cb66906daf39a9cc79fe250febe622a74ce6ad9dcf4fc7d7a0794461c80d88298f614a8a1eca6581b SHA512 203baf92f5c63243e1f541caf88f09f3a418f34d327c521b85804bd3666c792aaca0a8382788a565256b7ab9a7bdb7eaf222ade3707159021bb3c59fb3c08e27
+EBUILD mariadb-10.1.38-r1.ebuild 29478 BLAKE2B 933479e0acb409d33480b85280df5b58d773731b74bebb4d469c2c848d36e6e2dc41a4299142a06cf0a2e25d9d8aef461df91968ab56f5a2f7d35f3d526d9224 SHA512 ef1d5b460bd4f2f692c0e6dfd59bf0d752b2589141df3db5ac5489195cdb0642ed90518295c8dd3c1272a1e76e5a4ae78d7828aecef2aff8107972859049a3c0
+EBUILD mariadb-10.1.43.ebuild 29882 BLAKE2B e67075c31a1585036ff4d82ddc7ce00119ee9a46170144acd59e1106c0c1cd05cb1e38b9e7eee77dcfaf320ccf3615845e1751cca242d7376d1c535a587d7c72 SHA512 8072069e496ea9300352264d71c998bcd926bfabca50607afd1b3bc47be265e31fd137737b6e85b7d2d4c2dc8d41d1f054ca846d94fe548eb1dda5a06f3b5b82
+EBUILD mariadb-10.2.22-r1.ebuild 32529 BLAKE2B b27b46733a239cf2ea88f8166428a521517baeaee738f4adcce2a91cc1acfce79654d253cd7646371c0b5d7e307eae238ca2d8b50edac11faee26240d5301819 SHA512 f29d53677e9409bb423bee2427a7cf0408e07f11f463e66c2df89e237d3e89f35eea67a580b7181d202a67976b368f5a6e85fef5770e8d4b3d9b2f247319b4d1
+EBUILD mariadb-10.2.29.ebuild 33103 BLAKE2B fdf29163bd6297d9627a3d767e33ab8c43e9df5a88a3bc6d9ecf1e45523ed55014f6febb304cee3dfb17d0ed195f6f9f457dc1eaf5da91779220569c6a95b246 SHA512 ab764d0c158718ceb3081b8c21bc9b370171bf6382fae8f5286ee9ed1df738163a96f8ae746a3eeab52ab52bf6e3e4477f27ae3c9f32b5c618377292dc9ac913
 EBUILD mariadb-10.3.20.ebuild 32731 BLAKE2B 2e8437c3af728e5a3dc02a825f025231bc4a6f3ae5b72066afdcf033fdaa807847b86167ecdf9719213061e2937c97300f72989e45f9adbcb74ef597939c25c0 SHA512 0e84837c35c84eaef8d0afb6630c8caff7d036671ab9871ccc2b30aa3ffe2a24f8a363f5f9364755bb69c1290f2995366164a249fb4c61f902d2e41aa2571612
 EBUILD mariadb-10.4.10.ebuild 33383 BLAKE2B 43b890bcb0b23b7d40faecd424a968248524453ccc486dcba474a1b5959503a51252ff3dab70c5dfb6238f20b9cdcb281dbea9d728d1cd31d7a3cb3c5c419ea3 SHA512 acfdec61923f7cd5e837e52c6854ee7104278ea2157df5993de38811dda81f3db0644dd7002995367981ca4142e35fe9fed0e58d83ffb71f4528477976d93a63
 EBUILD mariadb-5.5.66.ebuild 27262 BLAKE2B 323891d4180b27a079bf96952c36880d8531eb273ce4a8ba2d16d2b3f85a85514a29381d849b89dfe97a534b3eb600ec5a85e006dfaccb3cd76a51c9a35c2f92 SHA512 e52d96c624a69a98b362f9c5d498eb62cd6b635660871deb62b2426638513319714a2e7992f60b3535872cc342f7307b053d79901df16e5573d33786100e9d3d
diff --git a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
index 7c7ab5234d7d..781cda89b82f 100644
--- a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
@@ -33,7 +33,7 @@ IUSE="+backup bindist client-libs cracklib debug extraengine galera jdbc jemallo
 	systemd systemtap static static-libs tcmalloc test tokudb xml yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
diff --git a/dev-db/mariadb/mariadb-10.1.43.ebuild b/dev-db/mariadb/mariadb-10.1.43.ebuild
index e900614ec03f..efd07a576537 100644
--- a/dev-db/mariadb/mariadb-10.1.43.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.43.ebuild
@@ -40,7 +40,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
index 9364e5734a39..6fcf7489030e 100644
--- a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
@@ -35,7 +35,7 @@ IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
 	test tokudb xml yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
diff --git a/dev-db/mariadb/mariadb-10.2.29.ebuild b/dev-db/mariadb/mariadb-10.2.29.ebuild
index df420dcf7436..7b99a2969bbd 100644
--- a/dev-db/mariadb/mariadb-10.2.29.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.29.ebuild
@@ -42,7 +42,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 4c4b263bb81e..a930a57c1ccb 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -20,12 +20,12 @@ DIST mongodb-src-r4.0.12.tar.gz 49937644 BLAKE2B 81044a6d68be6420d30fb2d7386ff29
 DIST mongodb-src-r4.0.13.tar.gz 50006727 BLAKE2B bf47bd32cf50c24084091a1baa811690c50586352307deb80876bb1bad539e90de77f85fc591960d6ae871e0a6f22d5d2f05bb340218784b642e3529d0c64bb6 SHA512 2a74ac8648cde6d9b5aa33da195b22eca926ef5ff85d4140e0a1ba978e3d13d410f4d7d7e102e35f994ef3b848333a4ef4bacfec9e2ac1b1288cbee885875ef7
 DIST mongodb-src-r4.2.0.tar.gz 60781115 BLAKE2B 75531f69647c84f71127d4cdccf13bc21e50586240c767b4c1aa1efbf56cf008bf4f32b3a2011120ad9099da0f97be934375b8dd3d012670034327175c454f0e SHA512 be2f4e00364ac49b1a0490fa859640680a4d10d861252d200bd3db535c770a3b97cee9de6d2b0b6b3622502d055ba92b6c1d88cb1134d251aa2cf50a8951b64c
 DIST mongodb-src-r4.2.1.tar.gz 60922510 BLAKE2B b06141cf0a8d256fc24e64c7115093009f42a97c74d270997ad4a70fb040199db05c5083cf1639283cc253264fbeb975d7efe3a41227d75146d7aa2e2fb9fa12 SHA512 6057f68ebeb2d5f74e70639fcc08aecfb112d386e3d016e18dfb2413319abf46249a0f5ffcfb74be9264a2ef34f45dd96f9774d86b1ec7e7213276f1c84f3106
-EBUILD mongodb-3.6.13.ebuild 4230 BLAKE2B b2d7e960c5d6a4dc9e4f882d999446eb9ab4e8a1128a513e87e1d119ade30197aa1941e75632d32f1adee32e9a6d0b659f32ad64adc1f0472982885ef303479c SHA512 70e382660c6ceca1bcd53beb41656add3d16c3fec27108864423e7eeeadef90cb4fe7d9b992af6d24b362a2a614b95171a22585eb9addf2f22c177dd65e4a635
-EBUILD mongodb-3.6.14.ebuild 4216 BLAKE2B f61802d40a82cefcd1006c2f3c069690eb6bf6cb42129d02f164df5066573a82d7f87146eca68ae16738b4f22f9b51b65088188088d594abe2b7b343ac3b9c2c SHA512 ef381b59444c55e147c2af37dde25ce145e4a385153c364ef65d0895b08988e3f2e80b3db24acb6187103875a82c31fa5318a4dc89cac83d7d037248945e361b
-EBUILD mongodb-3.6.8.ebuild 4197 BLAKE2B d28a62156019eaeab2d0fa8b4de5c5589e96c955145f283d810ba58c906d01e6447d74b08fc8037e2ebfff9b43dea38c3f6d5b28615e322ebee892bbe9c97d3a SHA512 90c2f9937355bed8d110044a89a7a5a3980c236b0e33b67457c3bc3ffce2ba3dc730dd55b977667cdd43ff07ecec4489183cee50e8e0e2a618ee2ec3e4fe82ef
-EBUILD mongodb-4.0.10.ebuild 4231 BLAKE2B 981c770cdbde22763fa8f4c7be235de7e8d312b1a1b1b6e688de557201cd0c265405b4bd8e5415d9e845618abdd0156bb594036376185ec57caa02cbe7b7ef56 SHA512 9e8153cd872408325dd0941f7e2fdffef09e6b1bd24dd8cf297821fdeb94098c1096df1a722db8e282db18a3bff0f95ce672cc3a3243801cbe3408135094c91a
-EBUILD mongodb-4.0.12.ebuild 4291 BLAKE2B dedfea39b0454fd1d4c13fe96c032845d8c951f75bcb6bc85bac84fbd1d6577e415cf817fddf5a6fab50e958b01dbdb467bcb1d33f4a3f1652efee2eacf745c3 SHA512 d0ec6aa07bb7a46b54ce43e4dccb599149e6e67dea4ecd7a85ff7332d515b802e7cf14f5dfc384e1c37820d9503913082bb0699bee37f6ab5308b12c8c26c5af
-EBUILD mongodb-4.0.13.ebuild 4217 BLAKE2B 8de92d34b4d0b1b0b750d7d65bf89140e84e56af16b81dfe81648a1036cd82eb8be9023aa90893ad9e8ca6185630393d11f726ed1efb405819859c355e9e88fe SHA512 73855a9a943d3938a67c5ca28900582246ac430e4e097ca61418a38b00b1874082b6fe2fb94e3805227fe06e58c9ced2dc94702bbb59cd80990f4f87fffd8aca
-EBUILD mongodb-4.2.0-r2.ebuild 4333 BLAKE2B 0ec1ff9596f0840de62c4ef6844aa0f38fd01a4f0de1c9a9545bb9de991482fae3ee398f3cec39367457c92758f442414986914354dbe8cd8d5bf3b34b37ccbd SHA512 01f7426d86a90f3e52b0310c260ce738b77c31baf01f3634734e41c978fa0123946c269834e12af93f4fe748d3019782d234a30c7a327a3814c3f7ef63d42a5d
-EBUILD mongodb-4.2.1.ebuild 4203 BLAKE2B 16394f58bbe5fb5b8ce63b8b7e5c8d4c8fdceab48aaf9fa8b982cb2a117de077f791db6249937f3ae15db477fcf90410b444676b86ba59f0bb79cba429d54262 SHA512 1be7c415208cedb6ed60294da3f034e02a94e4085421e328d745781ad3a9b3e8672fa1489af240e1d66ee7c1943c56df9dcfb60d1782bb6205d8d01a8da9ac87
+EBUILD mongodb-3.6.13.ebuild 4257 BLAKE2B 0643b2cca9c231b3b8093e1cc4d0e4b7ff2bd6504251f8c7dd706bd15f59548bb4f8462e5547b3e97da5aed385f0179807cef36060211bcf069feec4b251425e SHA512 edbc5d01e606bd324ea505e02d8216b68250bab78dc26b932203df625621d9f27847b8fefc5e0bf7256be67ccde8fe0a56d28ed59b5e0d79e3b68d454b454cf4
+EBUILD mongodb-3.6.14.ebuild 4243 BLAKE2B 8cb508eb72021f1c96104f55df266505b9b77087ca130645c991e1594427f41d2b20b9843fe8c8de7f9469b5d31a46556b546723bc6d653ed897b43255543fb8 SHA512 72997ea27f0cfae8761150a6416465868b27544bd341e01adf76f53f1d3f79139196581c0034740aef49aa9172bcb582f4b390fb1413e2f5a42b9c91aea07f2d
+EBUILD mongodb-3.6.8.ebuild 4224 BLAKE2B abccde393e61abb1596f7895f4d9f067f3664a0ac4165c403c5cf23b5774b2eb3b3ad1e41c6a91bf7c2f9fa82726b6867b58f0b1ce0b845c1b8e70697d12e131 SHA512 0a2b9c7a39d90d314adf33b10127af1a265768e9c8c5d22d286e6e2d64b6d05c20b41de364b6f1305b3fba32bec581c2a8c8b54e352186981b23fe7676917634
+EBUILD mongodb-4.0.10.ebuild 4258 BLAKE2B b7b8453cd23ed9932f98124b337c269285d9d8f2623cab5bf02ceb85d27c253841d1868bdef693809fe8fb6b206fb37bf60349bad0cd5fa5bfbcb101b825ba01 SHA512 1dc1ef0c3869f50fe329705ad42403a0fad9805a7bdf28556ad878614be7214b2f6ffe6a18edbbb6b52a7934990d41a0a43c729355a867953e5cc36030289645
+EBUILD mongodb-4.0.12.ebuild 4318 BLAKE2B be6dcb75ecb3654b980db1b893746ab6a33e537a9dac06b42e8f2defbd75aaab3b7d32b63f67cb97b886f79c74363199651377580c7b76160e2ecba993ab78fa SHA512 bf45a240826725c47dbd8475c01d24da966c44027cadb73b28b2fa536f45d9dfb714a50393b09040dc928f0c676b42a89d3ebace2d63e0a78443d434eb43b235
+EBUILD mongodb-4.0.13.ebuild 4244 BLAKE2B e045a5c70486076096254161c8633d9a144bee7088991b85d3b26d5264fd553f70b0b14df841b618159ec3074a845866756de4a9bd69acbe829e8889b83d5d36 SHA512 820958bad65597051874f2519b52a15f4fe52f3921074137d1642cc9f310e6508588c7b6c2e34eb1e56cf463a93fd4c36d2c3bf9dbdf68dddb7399029a8db1ca
+EBUILD mongodb-4.2.0-r2.ebuild 4360 BLAKE2B 31aa4b65fb52517aa001068ed6c6d2977c84d25e6bc800009a358b587e2ae7bcafb08f609123f658116a870b9903235e3d6b415715d7517a60296ef5e337aff5 SHA512 c2c9edb996a032ea306dbd1579fd0f2e66e404f9c10a394157c80e88a51c0ccb89f319fe1eb558ac42b35416a8e91da13b0763f39441d4668cc5f57ea8a23107
+EBUILD mongodb-4.2.1.ebuild 4298 BLAKE2B 45ff322e5a054613fcf98a7e2409bf4732e10677efd108b0d794f2e3e525f96a16b2214899bece93ea4f61f0d97ccd235130641028b9f8c3ee0110e92b8fec66 SHA512 83bc5133429edde8f132be09b240a01728c7f29ce9f30e1b26bc64f2da9703ad8bc42a082e9eafb1b5ba0fb2c1dbab3e4322a9fb4a0a5ab1c5518a0c9cc58594
 MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36
diff --git a/dev-db/mongodb/mongodb-3.6.13.ebuild b/dev-db/mongodb/mongodb-3.6.13.ebuild
index 4fb9536e58f4..88e6596fe833 100644
--- a/dev-db/mongodb/mongodb-3.6.13.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.13.ebuild
@@ -22,6 +22,7 @@ LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-arch/snappy-1.1.3
 	>=dev-cpp/yaml-cpp-0.5.3:=
diff --git a/dev-db/mongodb/mongodb-3.6.14.ebuild b/dev-db/mongodb/mongodb-3.6.14.ebuild
index b63d5ceeb560..346c4039a335 100644
--- a/dev-db/mongodb/mongodb-3.6.14.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.14.ebuild
@@ -22,6 +22,7 @@ LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="acct-group/mongodb
 	acct-user/mongodb
diff --git a/dev-db/mongodb/mongodb-3.6.8.ebuild b/dev-db/mongodb/mongodb-3.6.8.ebuild
index 3f1b10dc84fd..e2c2033998d7 100644
--- a/dev-db/mongodb/mongodb-3.6.8.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.8.ebuild
@@ -22,6 +22,7 @@ LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="debug kerberos libressl mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-arch/snappy-1.1.3
 	>=dev-cpp/yaml-cpp-0.5.3:=
diff --git a/dev-db/mongodb/mongodb-4.0.10.ebuild b/dev-db/mongodb/mongodb-4.0.10.ebuild
index ad10fd71e28a..5a035ec23440 100644
--- a/dev-db/mongodb/mongodb-4.0.10.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.10.ebuild
@@ -22,6 +22,7 @@ LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-arch/snappy-1.1.3
 	>=dev-cpp/yaml-cpp-0.5.3:=
diff --git a/dev-db/mongodb/mongodb-4.0.12.ebuild b/dev-db/mongodb/mongodb-4.0.12.ebuild
index 2792ff470fe4..1aac4e77094e 100644
--- a/dev-db/mongodb/mongodb-4.0.12.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.12.ebuild
@@ -22,6 +22,7 @@ LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-arch/snappy-1.1.3
 	>=dev-cpp/yaml-cpp-0.5.3:=
diff --git a/dev-db/mongodb/mongodb-4.0.13.ebuild b/dev-db/mongodb/mongodb-4.0.13.ebuild
index 74236bf4fa1e..ef4bca699aab 100644
--- a/dev-db/mongodb/mongodb-4.0.13.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.13.ebuild
@@ -22,6 +22,7 @@ LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="acct-group/mongodb
 	acct-user/mongodb
diff --git a/dev-db/mongodb/mongodb-4.2.0-r2.ebuild b/dev-db/mongodb/mongodb-4.2.0-r2.ebuild
index 23f844c5069c..bbb765a7566c 100644
--- a/dev-db/mongodb/mongodb-4.2.0-r2.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.0-r2.ebuild
@@ -22,6 +22,7 @@ LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug kerberos libressl lto ssl test +tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-arch/snappy-1.1.3
 	>=dev-cpp/yaml-cpp-0.6.2:=
diff --git a/dev-db/mongodb/mongodb-4.2.1.ebuild b/dev-db/mongodb/mongodb-4.2.1.ebuild
index cdd1a9ed1be5..42fec3063700 100644
--- a/dev-db/mongodb/mongodb-4.2.1.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.1.ebuild
@@ -22,6 +22,7 @@ LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug kerberos libressl lto ssl test +tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="acct-group/mongodb
 	acct-user/mongodb
@@ -101,6 +102,7 @@ src_configure() {
 		--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 )
diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index a2e623f12358..30adf4eef5f5 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,6 +1,6 @@
 DIST mycli-1.19.0.tar.gz 263255 BLAKE2B 524190429476793af038c8302f43389884a6ee24a05b0b8c739f290dbfdebec3336bd14567eafff2ea3351430791e4844e16dfc5affb1b28bb57d3759b496350 SHA512 8c6003a09a888c2ac6f35a881ca072ba8972f66b13319cbff73f7a525d1f808b767dcef0121b6272a1b82eed1a02c8c417d5805e5a8ce0c141545f28ff3c3a33
 DIST mycli-1.20.1.tar.gz 265264 BLAKE2B d00b1713132609b0a5ec6e8b78785fdab5c6b4db5937bc0b9bc69ddde90ad3dc75aeb99ccf6b5e7fe5e78e9bf4819f03fb454825e5182bc5d2c44356032343d1 SHA512 82ee642b2a4c158b0e2ea275941650125e15004ec1c70b2ab90ae0825090efccb4910a14fd46bcdf795a74adba5689b46de5668447308de63d1cbbbe2e6b0e9d
-EBUILD mycli-1.19.0.ebuild 1276 BLAKE2B b4ef901db33ef7cd55a3ad0e267c78be9c85ded80fb403efb2c108a72781157f1087a4b0734a707d2f3b03af879c1051db9207a11114d2209de696fe4dcffc4e SHA512 a2c60914458d0ff14fdc29734d67a37dd408f55d5a9492247e26d499894108c72a2bba7b0229fd0372c67526c56eff5e2e82be346c3bfed7481e4ed6ecf6f49a
-EBUILD mycli-1.20.1.ebuild 1280 BLAKE2B 1f34ae0a9e226b852e03d86083b0ebeeeda16a178dcd198e2b6096604881e63f9d7db79b967b09c95397c79fb34714fd7102fa6e40e8e2dbc29eedb82f39232c SHA512 b0e8db1e8cc453277d103aaf5bd438c87934cf05b312b91afec31b99d2e8ecba3db7b3706acc8c81c5084d59a5fe003f4953c22b52b2d086b45671b3b918d0e8
-EBUILD mycli-9999.ebuild 1260 BLAKE2B f422998c353983378e777c5a80bbaebe8d360a646bac89c846024ef1978bc10462b6517c6f339fdd2b33335863813142c4ce2f857152dce2d3d8467b88f4f2b4 SHA512 118bc9163ded7b3be0629bdc4112a4d0924cde388ef2f07838f019656a526843f6f997bf6c6cb537f292574bec8a45345e10ccb9745885af741d45adb77f6e95
+EBUILD mycli-1.19.0.ebuild 1303 BLAKE2B 1b22aca2b9c9b4dd6e1df7ec13f259b82562159a59da9896cfbe0c4b015b41304cae610f63d52808d654c7ba24f95ecbf6a4037e865b5f2161f01313bd33f0d0 SHA512 dda31c6f17225df56b49e9d117e7a8e3fb391b6d59c7a60ac8a1481a99714e906bf00debbed75b63626c818eff63e184bea10a9e55a4f3d82c8b4e29de8e7321
+EBUILD mycli-1.20.1.ebuild 1307 BLAKE2B c2bab5f80d09ef818459a9f64b7029e5dc8dcc75d732ea317de657e2a8c55db1043d7af76431f55573b72401d81f5d20b7f05487364b161df97ff666ff0bc460 SHA512 09691e0fd405c454000ac26b8e0e8d1b914584125becaa7f28d44bab63f186e2eb82379a3f30b49b47e14018bc905fafb91debf36bca8a98437699b2035fa838
+EBUILD mycli-9999.ebuild 1287 BLAKE2B b6d3e199773efda2680594818eab9a10981de03c5e6bd7ef863473e0b6dde1ce620bac5eb8dc962cc673230ee224599bfe3d8b6ef2c659a68069e908c8f6014a SHA512 104d5797e65ffaa3dd4a7816068d7d909f2273eb283a082e1360ed05733173ede2ea4bb4ce6c6f5f5ece4d725e1631dbb271c3c1039fb2a594b1422dcbd8bea1
 MISC metadata.xml 406 BLAKE2B d46b17f9f36fc9851f36d4deadf52ca52d6df621245e521f66386ff3deed3b863188875dd2207c3cf78474cd8a04aebf03dad6564251581b8f9d09fb7bdf5ba8 SHA512 b88e9469cfd9287df46b84c62b27fd60f3cf84abfe93aba4ca7b46d668b0ed855c17ccccd95a49bc102bc2d9c054846ff33e094fe0351c598a9b55f494618e57
diff --git a/dev-db/mycli/mycli-1.19.0.ebuild b/dev-db/mycli/mycli-1.19.0.ebuild
index d69737494d35..98875cc61725 100644
--- a/dev-db/mycli/mycli-1.19.0.ebuild
+++ b/dev-db/mycli/mycli-1.19.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ssh test"
+RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-python/cli_helpers-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/click-4.1[${PYTHON_USEDEP}]
diff --git a/dev-db/mycli/mycli-1.20.1.ebuild b/dev-db/mycli/mycli-1.20.1.ebuild
index 8416d80d3592..5d9f47d07783 100644
--- a/dev-db/mycli/mycli-1.20.1.ebuild
+++ b/dev-db/mycli/mycli-1.20.1.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ssh test"
+RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-python/cli_helpers-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/click-7.0[${PYTHON_USEDEP}]
diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild
index e159c1e0e5bb..70af20e6a863 100644
--- a/dev-db/mycli/mycli-9999.ebuild
+++ b/dev-db/mycli/mycli-9999.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="ssh test"
+RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-python/cli_helpers-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/click-7.0[${PYTHON_USEDEP}]
diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 3ada9d070fda..92b607f16c9a 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -5,7 +5,7 @@ DIST mysql-cluster-gpl-7.2.34.tar.gz 25114728 BLAKE2B b9337cf8ae6742c58f92ae64b8
 DIST mysql-cluster-gpl-7.3.22.tar.gz 41356026 BLAKE2B 055a3f8590f0e2e53f8620244bd2ca7d619ab5549de7b33c4d41d2fabd260d98eaabdc0169488a6d018bcafc4458433e21b65025827998a31e9abc1deb5101ae SHA512 ccb9f3429e6ccb2dbb53d98f54abeae3c3128e65dc69c41918324630fef665f48d3c3af2d60bf1cce4e28c492e525c6bbc32cc8a39a9ea47988184adeafd5bd3
 DIST mysql-cluster-gpl-7.4.21.tar.gz 41718490 BLAKE2B 4578e477b345c85ccf12e4ea79893dda9b33bf35722ff8c6d706f150d8506d07b5e49a8e69e37cb3c8ff449832c80f72430924559b4a6d209d11d31cc2a67ca4 SHA512 48f475806608c0f6e0c45cc9c3b3851678153e17cf5c74114b2ca7a75eee455798c8decb857738eecb3fe664930e378e1d399509a954a7073802285eb87801b5
 DIST mysql-extras-20190121-0015Z.tar.bz2 330807 BLAKE2B d5beae3d5a493e01d57130f835cd0d7dcbf53af389f9b933446ab43b86f96c85b5858a7a56ffe882ee63371ab96f0226e04f710dfb119ddd91b5c5685d0999bc SHA512 2f092b8e1e2f836d19e4663d383be876d498bca0ee005a690f48ba1797e9e5b648c4a15c36885faa286ce12a49386bf2898940e19eb1d288e7ee084968821a05
-EBUILD mysql-cluster-7.2.34.ebuild 25600 BLAKE2B 3f82f2f2ca47223eb33450325b1fd5473bf9f9df986edcfb68070d0c640092fe1146547713dd068a5950529b2e9340b91a8dbec7b42c0adf16168a9a85ab5932 SHA512 504e87616dfa471e657c90ed6d724f00f04413f0764eb5cace83836afa89d2f70a64c6ee5a0831aa98e74fb06246703e676e2de23fde210f5185b389f6d2ea25
-EBUILD mysql-cluster-7.3.22.ebuild 26056 BLAKE2B 53ffe5a77a8c6d3b0684b3ddc52f27bc43d0b57ebc4ca3c4ae2a4655099cf7dc9a835936a994d1606c01f97d56fbed85303b388d843f6c8ef8faff59b7277995 SHA512 fb69f17c8d18f23855c2adda0cf27836f8521b5ef41a6df449d5b070e90a430e93ddfb177417076afeca1dc1d6d4ee090d9593f636d39e3d6bb82bb0bed59e02
-EBUILD mysql-cluster-7.4.21.ebuild 26056 BLAKE2B 7e7d4fd1088b8c8189e1e73730f7efc440970e1a908c82d273e497271c44c63e58b088b957b6bdccab15ad52b45f3db304fbad98925879be2e0b49f87ffb0973 SHA512 ea7cd316ddd78c6decb336ecdac06674e3e8ec5aa996e474335d29ba2b630634f04a4feb9fabc783715ac5f3d8148197d46a6260ca0ed0a306a1edf35886e7b9
+EBUILD mysql-cluster-7.2.34.ebuild 25616 BLAKE2B 732a89a04e9593931a5fd06afcb7ebea0df0e12f141a6d362ef8fb80e4f3b48e97ee9ed78cf016641a6f157e19cafd38e06df8d743f03a7135156dc46e612ddb SHA512 4a4361affe734122a4fcd03d6da77b522d35b86e8e13d089d9da8b45afbd68e6bdcd059d635ab9faa8294373e50d3f6a83324604824cd1474735fbd627ec9e7f
+EBUILD mysql-cluster-7.3.22.ebuild 26072 BLAKE2B 0f0c2fa6f640ec7ca2a634995c9bb3caab7dd3e7407f92fbb6b5b7bb6e772dc7c898a514c76674341d5d8a3d3c6e26e5f324438c4088973e01b742d65f1bb05c SHA512 3f5ade7b0ac957e8757326048c3bf037214cc761820a541a522a01ad3221c4b9b7cd13ae1457d7f8b75a20a7a1a3a018856bce1c773d7a5dbf0841573cdcad64
+EBUILD mysql-cluster-7.4.21.ebuild 26072 BLAKE2B 8b336a01500b5d6351824501581a25f69e6804938d3c4579b10801020ffe08f5253abdb57c27dc44fd983cb694516aa84876c88e9a639e04657efdb7b3f529a3 SHA512 49fb7e1e1f6eed702a17a02291ec5ff145a77ff569f2d39e0cc2bc2487d2910f1bc011488bf95cf28c5083937751d785a9c28da0ec7fd80167a6549f2424da3a
 MISC metadata.xml 1248 BLAKE2B 02eec2cf13c1d1ec71d92a3a6e15a65966e3a6de1595f5027159e8eb6c6c67a38994fe7c051746ff9f820138c51f21afd46214c0a686e9e107668b3eaba9950d SHA512 ce4c1b021cf1d5381c4523b9c047ce3a580ea807cfa81557d398ef5bf92bb0d30d1145d0fde299f1dbab8837b09731eea1767a864964ec9d66393096e61661f5
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
index ee858318fdf3..8ecb148dc58a 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
@@ -29,7 +29,7 @@ IUSE="bindist client-libs debug extraengine java jemalloc latin1 libressl
 	test yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
 	static? ( yassl )"
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
index 16b657b80515..8a33824b92a4 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
@@ -29,7 +29,7 @@ IUSE="client-libs debug extraengine jemalloc latin1 libressl numa
 	test yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
+RESTRICT="!test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
 	static? ( yassl )"
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
index 9e8f595ee075..8d0360acf3a8 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
@@ -29,7 +29,7 @@ IUSE="client-libs debug extraengine jemalloc latin1 libressl numa
 	test yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
+RESTRICT="!test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
 	static? ( yassl )"
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 0a24ae1b2d59..d9d3bb62f097 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,4 +1,3 @@
-AUX 8.0.11-fix-build.patch 9453 BLAKE2B 72c42d2f0aac7de63151b4b12a5de6f1597f70be3a8a42d1a137c1a57329acf1adf196377e90c838e1d4995223fb58615814d8c14d3c8d86472ad795e1b456e7 SHA512 321444184d459f7e650b3f72589db4b2537f67c2d413f9d3d5a995c937497b6310bc2b58200fc61b5c0d8e8fe2030d65035ddbab672338d9df1b6cf3ce605ea9
 AUX mysql-connector-c++-1.1.11-fix-cpp-linking.patch 440 BLAKE2B 2b78f683c8e4645df7a306783ec3e61263682688b0069fff61cb3a85575d41aa33de481314bc1d18f8a5181c5e2dbb29cfb8c89d6a36b44c11f27340b4f7921c SHA512 f941e32d4f1e52d603958bb01d17e75c8fb89738d20f5af29d4c30bbe77ba82af4b25cc27f1e2df934d1b309f6c75faf2fb0fc88fb250770a0669f867cc16e1c
 AUX mysql-connector-c++-1.1.11-fix-mariadb.patch 1939 BLAKE2B 4ca552777bfcb8671e5dc0213c411f9e1e8fbcbeb0f9f3369572c82ba03304a9df2ab98725b1fb3a365a63e4c8ed9d3d86332c54ffcb14210469b3d6078d89da SHA512 3d02972b57a0c2a544edef9ec5050c82f9214a7013e941cdc13a8f0742b7608812f33bc0c84367e70ea556562efb653297730ce5fc8d928458c5af1d71f3f60a
 AUX mysql-connector-c++-1.1.6-fix-cmake.patch 762 BLAKE2B 4cecebd2cb075c6e1af7ab74a84132f41beeeb202d4d286038b05cbbb202cef709e7114563bdbee12aab4e6a738a9e23bbb9455fc1ce0f906d952af4e0042f05 SHA512 c4c89b398aa88a9e7b4ed4cf42b055b79670dc70685775afd1ef2d683e5b3754575c831a6083ef0d097431e796513597e1daf7737e3ade710abad917f63ed32f
@@ -11,7 +10,7 @@ DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B e2cd300946a873a94beab13d9d1
 DIST mysql-connector-c++-8.0.15-src.tar.gz 2210243 BLAKE2B 45e0ffa2134c9df5a7e311963c7f2c58b5d7cfc0eefd80a5dc323bbe34ba60d40c79154f932e19c5f8e18ae45d0b61d304b7b7daba4955f92f830cf20c718931 SHA512 9a217b8f61babe5dac405be19b12d34b22673e779433d880a3aa31ea2e128f93434599a3fe0c1150b3f7b8c4d03f595d545d8cc33342a60561a2f60bff71ef14
 DIST mysql-connector-c++-8.0.18-src.tar.gz 3115736 BLAKE2B f28229593d20f4a401a3e9d0e636ee896a90fb7573f06d9b60340540d6c4d577b4f44daa287c7896a03a60d75dec343413cba981e63a22607ce60eb20f4de122 SHA512 f5b202677392bcf5c5bdd4c3433332e57aa20c1a140de81b57ce3ce69709661d572e2466ae022926fc220b20159c90f09f15b5e44f384529103a24fd592de60d
 EBUILD mysql-connector-c++-1.1.11-r1.ebuild 1621 BLAKE2B fdf824ec8993976294bbc03467c63da10206bd04ed066ec33a2d7ce9310e654a0cdd1440e57517bcb22c37851310da0fb2e8e8c48696a99800da3e45cdc0c47a SHA512 7c05b18bac4af342c9feab9622e63afc916bd408a8f2b88dcf59c6192b5a62fba481b3e3f5cbca6826f61d092e7c91e9ef8f20f29b7272c11454c28a836fb15c
-EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1643 BLAKE2B b7d17b47134e45350f956c8594144404e5de6abd6413daa87591072ddb90a598a51c6413fe32178153b9ec07d88d55143e504c23c6c20f58c1b003a872478fc7 SHA512 5165dfe0f68af0a360401e594cbf0f0c0df5cb9a00be0e049543e978e3378a2d84e57b7a5a6b2810ad73c93e3eb2cf2b243ce2b741c1fafc6295deb8e789ae89
+EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1642 BLAKE2B 6e6fa755a9c7f51fc9ddd4310664b7f1a9dfa1e348ea033006195ae9ef7d1f6cbbfa82c13394ea3355fb15bca3d05baa5bee43a287b7c63d9fcbe5240d0a59ab SHA512 0a0d2ec5bd5231f708baa1d605c8d24118d2bf3ca8583d5f22e3b9cbdcbd55c6a2fc3f5aa53bc3e4858884d5f7ad4d70221dbe57d2dc60df68cc3c27fceb16d4
 EBUILD mysql-connector-c++-1.1.9-r1.ebuild 1570 BLAKE2B 2f5d17177fe53a0ab0a70efe13d225a6982746819191719d1378b072881037ce81b0d63beb1e0e3dd9106dc04d17ef29b6ac010831734fca2f184901568ba2b2 SHA512 ce9598a2a5f8924cb24822dec8b5349f1655148ba7aba234e324912999d7a5df054a3b3d78c7e9c33c909d046d28bceb9322dc1848370fbed00b27941d49d387
 EBUILD mysql-connector-c++-8.0.15.ebuild 909 BLAKE2B 3a0fa261424e3ce299cf1d10ff5ace8e8bedc4e91fd0eb098916ca1b2d2353562a21d4aaf3fb73c119a665ad64da113036fba6ad9a02a6199306cece67b1f835 SHA512 32c8692e66ed3805c3e01ad5b4e66b04bc0a750e1fd270fc52f70777242abd21d5f11acdff27210b9194190e2ea1bfb3d203e264986c985f0d13210618e51047
 EBUILD mysql-connector-c++-8.0.18.ebuild 1015 BLAKE2B e14bf0abe5da065ff96a350c16ce5e90bd8f2190665d0fc45d29a3c6cfe447987733a9b10bb42671cc6c9ccdef485070a3ab265880b256739958cd46a4f7b186 SHA512 3b53b586627adeb2567d275a1a7f8f1787dc9d01d996015bf273e2fed9b387666793eba0add85961fc1eae2c011d8ce11b359f400217154a2029ea67c2783de1
diff --git a/dev-db/mysql-connector-c++/files/8.0.11-fix-build.patch b/dev-db/mysql-connector-c++/files/8.0.11-fix-build.patch
deleted file mode 100644
index 7449b910a9b0..000000000000
--- a/dev-db/mysql-connector-c++/files/8.0.11-fix-build.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-diff -aurN a/buildinfo.cmake b/buildinfo.cmake
---- a/buildinfo.cmake	2018-04-08 15:10:57.000000000 -0400
-+++ b/buildinfo.cmake	2018-04-20 13:37:20.993266176 -0400
-@@ -112,4 +112,4 @@
- endif()
- 
- 
--install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION .)
-+#install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION .)
-diff -aurN a/cdk/cmake/install_macros.cmake b/cdk/cmake/install_macros.cmake
---- a/cdk/cmake/install_macros.cmake	2018-04-08 15:10:57.000000000 -0400
-+++ b/cdk/cmake/install_macros.cmake	2018-04-20 14:12:17.255877167 -0400
-@@ -327,7 +327,7 @@
-     DESTINATION ${ARG_DESTINATION}
-     ${RENAME_PARAM}
-     ${PERMISSIONS_${target_type}}
--    CONFIGURATIONS Release RelWithDebInfo
-+    CONFIGURATIONS Release RelWithDebInfo Gentoo
-     COMPONENT ${ARG_COMPONENT}
-     OPTIONAL)
- 
-@@ -346,7 +346,7 @@
-     INSTALL(FILES ${debug_pdb_target_location}
-       DESTINATION ${ARG_PDB_DESTINATION}
-       ${PDB_RENAME_PARAM}
--      CONFIGURATIONS Release RelWithDebInfo
-+      CONFIGURATIONS Release RelWithDebInfo Gentoo
-       COMPONENT ${ARG_COMPONENT}
-       OPTIONAL)
-   ENDIF()
-diff -aurN a/cdk/cmake/libutils.cmake b/cdk/cmake/libutils.cmake
---- a/cdk/cmake/libutils.cmake     2018-04-08 15:10:57.000000000 -0400
-+++ b/cdk/cmake/libutils.cmake     2018-04-20 14:27:49.021432318 -0400
-@@ -275,14 +275,7 @@
-   endforeach()
-
-   if(libs)
--
--    if(${type} STREQUAL "STATIC")
--        merge_static_libraries(${TARGET} ${libs})
--        add_dependencies(${TARGET} ${libs})
--    else()
-       target_link_libraries(${TARGET} PRIVATE ${libs})
--    endif()
--
-   endif()
-
-   #
-diff -aurN a/cdk/cmake/protobuf.cmake b/cdk/cmake/protobuf.cmake
---- a/cdk/cmake/protobuf.cmake	2018-04-08 15:10:57.000000000 -0400
-+++ b/cdk/cmake/protobuf.cmake	2018-04-20 13:43:04.950466261 -0400
-@@ -36,142 +36,8 @@
- #  ADD_LIBRARY(target ... ${SRCS})
- #
- 
--#
--# Configure Protobuf project in protobuf subfolder of build location.
--#
--
--message("Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR}")
--file(REMOVE ${PROJECT_BINARY_DIR}/protobuf/CMakeCache.txt)
--file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf)
--
--# If specified, use the same build type for Protobuf
--
--if(CMAKE_BUILD_TYPE)
--  set(set_build_type -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
--endif()
--
--execute_process(
--  COMMAND ${CMAKE_COMMAND}
--          -G "${CMAKE_GENERATOR}"
--          ${set_build_type}
--          -DSTATIC_MSVCRT=${STATIC_MSVCRT}
--          -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
--          -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
--          -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
--          ${PROJECT_SOURCE_DIR}/protobuf
--  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf
--  RESULT_VARIABLE protobuf_config
--)
--
--if(protobuf_config)
--  message(FATAL_ERROR "Could not configure Protobuf build: ${protobuf_config}")
--endif()
--
--include(${PROJECT_BINARY_DIR}/protobuf/exports.cmake)
--
--#
--# Protobuf library targets imported above (pb_protobuf
--# and pb_protobuf-lite) are local to the directory from which
--# they were imported. This is not good if cdk is used as
--# a sub-project of a parent project, because the parent project
--# must have access to these targets.
--#
--# For that reason blow we create global protobuf/protobuf-lite targets
--# and copy their loactions from the imported targets.
--#
--
--add_library(protobuf STATIC IMPORTED GLOBAL)
--add_library(protobuf-lite STATIC IMPORTED GLOBAL)
--
--foreach(lib protobuf protobuf-lite)
--  #message("processing: ${lib}")
--
--   foreach(CONF NOCONFIG DEBUG RELEASE MINSIZEREL RELWITHDEBINFO)
--    #message("- CONF: ${CONF}")
--
--    get_target_property(LOC pb_${lib} IMPORTED_LOCATION_${CONF})
--    if(LOC)
--      #message("- settig imported location to: ${LOC}")
--      set(location "${LOC}")
--      set_target_properties(${lib} PROPERTIES
--        IMPORTED_LOCATION_${CONF} "${LOC}"
--      )
--      set_property(TARGET ${lib} APPEND PROPERTY
--        IMPORTED_CONFIGURATIONS ${CONF})
--    endif()
--
--  endforeach(CONF)
--
--  # For multi-configuration builders like MSVC, set a generic
--  # location of the form <prefix>/$(Configuration)/<name> which will
--  # work with any configuration choosen at build time.
--  # It is constructed from one of per-configurartion locations
--  # determined above and saved in ${location}. The logic assumes
--  # that the per-configration location is of the form
--  # <prefix>/<config>/<name>
--
--  if(CMAKE_CONFIGURATION_TYPES)
--
--    get_filename_component(name "${location}" NAME)
--    get_filename_component(LOC "${location}" PATH)
--    get_filename_component(LOC "${LOC}" PATH)
--    set(LOC "${LOC}/$(Configuration)/${name}")
--
--    message("- setting generic location to: ${LOC}")
--    set_target_properties(${lib} PROPERTIES
--      IMPORTED_LOCATION "${LOC}"
--    )
--
--  endif()
--
--endforeach(lib)
--
--
--# protobuf depends on protobuf-lite
--
--set_target_properties(protobuf PROPERTIES
--  INTERFACE_LINK_LIBRARIES "protobuf-lite"
--)
--
--
--message("Protobuf include path: ${PROTOBUF_INCLUDE_DIR}")
--
--set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIR}
--    CACHE INTERNAL "Protobuf include path" FORCE)
--set(PROTOBUF_PROTOC_EXECUTABLE pb_protoc
--    CACHE INTERNAL "Protobuf compiler" FORCE)
--
--#
--# Custom target build_protobuf ensures that Protobuf project is built.
--#
--# Note: this depends on Protobuf project generating the stamp file
--#
--
--if(NOT DEFINED PROTOBUF_BUILD_STAMP)
--  message(FATAL_ERROR "Protobuf build stamp file not defined")
--endif()
--
--if(CMAKE_VERSION VERSION_LESS 3.0)
--  add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP}
--    COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIGURATION>
--    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf
--    COMMENT "Building protobuf using configuration: $<CONFIGURATION>"
--  )
--else()
--  add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP}
--    COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
--    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf
--    COMMENT "Building protobuf using configuration: $<CONFIG>"
--  )
--endif()
--
--add_custom_target(build_protobuf
--  DEPENDS ${PROTOBUF_BUILD_STAMP}
--)
--
--add_dependencies(protobuf build_protobuf)
--add_dependencies(protobuf-lite build_protobuf)
--add_dependencies(pb_protoc build_protobuf)
-+#SET(Protobuf_USE_STATIC_LIBS ON)
-+find_package(Protobuf REQUIRED)
- 
- #
- #  Choice between full and lite version of the library.
-diff -aurN a/cdk/protocol/mysqlx/crud.cc b/cdk/protocol/mysqlx/crud.cc
---- a/cdk/protocol/mysqlx/crud.cc	2018-04-08 15:10:57.000000000 -0400
-+++ b/cdk/protocol/mysqlx/crud.cc	2018-04-20 11:22:22.398040489 -0400
-@@ -295,7 +295,7 @@
- class Placeholder_conv_imp
-     : public Args_conv
- {
--  map<string, unsigned> m_map;
-+  std::map<string, unsigned> m_map;
- 
- public:
- 
-@@ -303,7 +303,7 @@
- 
-   unsigned conv_placeholder(const string &name)
-   {
--    map<string, unsigned>::const_iterator it = m_map.find(name);
-+    std::map<string, unsigned>::const_iterator it = m_map.find(name);
-     if (it == m_map.end())
-       throw_error("Placeholder converter: Placeholder was not defined on args");
-       //throw Generic_error((boost::format("Placeholder %s was not defined on args.")
-@@ -314,7 +314,7 @@
- 
-   void add_placeholder(const string &name)
-   {
--    map<string, unsigned>::const_iterator it = m_map.find(name);
-+    std::map<string, unsigned>::const_iterator it = m_map.find(name);
-     if (it != m_map.end())
-       throw_error("Placeholder converter: Redefined placeholder");
-       //throw Generic_error((boost::format("Redifined placeholder %s.")
-diff -aurN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2018-04-20 14:15:00.546645410 -0400
-+++ b/CMakeLists.txt	2018-04-20 13:26:16.888470928 -0400
-@@ -529,7 +529,7 @@
- 
- 
- install(TARGETS connector
--  CONFIGURATIONS Release RelWithDebInfo
-+  CONFIGURATIONS Release RelWithDebInfo Gentoo
-   ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}"
-   RUNTIME DESTINATION "${INSTALL_LIB_DIR}"
-   LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
-@@ -576,6 +576,12 @@
- SET_INTERFACE_OPTIONS(try devapi)
- #  ADD_GCOV(try)
- 
-+IF(WITH_SSL STREQUAL "system")
-+  find_package(OpenSSL REQUIRED)
-+  TARGET_LINK_LIBRARIES(try ${OPENSSL_LIBRARIES})
-+ENDIF()
-+
-+
- if(WITH_JDBC)
- 
-   add_executable(try_jdbc try_jdbc.cc)
---- a/jdbc.cmake	2018-04-08 15:10:57.000000000 -0400
-+++ b/jdbc.cmake	2018-04-20 15:03:38.683674143 -0400
-@@ -20,7 +20,7 @@
- # Configure legacy connector build environment in ${JDBC_DIR}
- #
- 
--list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON)
-+list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=OFF)
- 
- if(CMAKE_BUILD_TYPE)
-   list(APPEND jdbc_cmake_opts -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
---- /var/tmp/portage/dev-db/mysql-connector-c++-8.0.11/work/mysql-connector-c++-8.0.11-src/jdbc/FindMySQL.cmake	2018-02-23 05:47:56.000000000 -0500
-+++ mysql-connector-c++-8.0.11-src/jdbc/FindMySQL.cmake	2018-04-20 15:13:42.204665429 -0400
-@@ -832,9 +832,11 @@
- IF(NOT WIN32)
- _mysql_conf(MYSQL_COMPILER_VERSION "")
- STRING(REGEX MATCH "Compiler:[a-zA-Z0-9\\. ]+" MYSQL_COMPILER_VERSION ${MYSQL_COMPILER_VERSION})
-+IF(MYSQL_COMPILER_VERSION)
- STRING(REGEX REPLACE "Compiler: " "" MYSQL_COMPILER_VERSION ${MYSQL_COMPILER_VERSION})
- STRING(REGEX MATCH "[a-zA-Z0-9]+" MYSQL_COMPILER_ID ${MYSQL_COMPILER_VERSION})
- STRING(REGEX REPLACE "[a-zA-Z0-9]+ " "" MYSQL_COMPILER_VERSION ${MYSQL_COMPILER_VERSION})
-+ENDIF(MYSQL_COMPILER_VERSION)
- ENDIF(NOT WIN32)
- 
- ##########################################################################
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
index 5ca30d754e7c..6a139eae88f6 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0/7"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
 IUSE="debug examples gcov libressl static-libs"
 
 DEPEND="dev-db/mysql-connector-c:=
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index b6835584d118..047c69e54ad9 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,6 +1,5 @@
 AUX 20028_all_mysql-5.6-gcc7.patch 603 BLAKE2B f03dc2e39dca4496cc084b427daa60014464876df456bf290a5de3431b481691a35ac9ac00d71cc86931efe3bca70dae012bedefc6d29ad7fec2feeb07cce014 SHA512 f9dab813418f38f3a877b8672cdec153d6f0f289144c35277e8275cc7a58195f974b7bf76b74f8dd2403643b1199f5e6d6bcde661ce5f79f614ff10347b52278
 AUX 6.1.11-openssl-1.1.patch 8987 BLAKE2B 8bd00bb778e086cbdcd04b6ac904f36bd64bbbb332f913129eb3acbaf6da4d044fdc65523626a9fed47d6bf5859826af489bd9ae7ae51664c613c966a88708ba SHA512 46af56504ed2a69ce74a5e2040ee8b3355f5ac48fb80e4668b635f01a2650d07f50dd098ad43239e8b35a80e975a5a9549bd1b1a9c1a0612ed9e4750b537bb76
-AUX 8.0.16-libressl.patch 12591 BLAKE2B add6c31d6ea29af0b97e4f4558a006de899bf33a75ac37b20c4feb539a568a9bdec20db6bf6f3e5a64488af8740fba566d3166ea7f339f98f7c9df738bb63c71 SHA512 49ac3e698be404eb13771e3850a6b37c1f839fda1d710be7f53369d457236e14423e6d8877dfa0a580c0e700cc4c33f3fa2b5e87c9ad14e8f88899451a51a91e
 AUX mysql-connector-c-8.0.17-always-build-decompress-utilities.patch 819 BLAKE2B 424a30a5217aa4b1005d1991e90e75f033092c87cfadf0d2298d8f2a6819bafa24f5f1149d00ea252afb71f004069e9b4b406e801438d0f15a8077d5bcbc1561 SHA512 bf839e2a126066b78a64a7876b319507fd049cdc3a8b2855d8df27ae0c74a93f4b66d7d1db534552107cbe293a1913d51bd25ce945a6bdc47e785b3a6c3608df
 AUX mysql-connector-c-8.0.17-libressl.patch 10106 BLAKE2B 5ed9b5f77f35c5079ac13d855ec9de0f67769d9de20029876026064986a7c79671b607a19c6afe3cbcdc9ab14527e5618a213b4aa8953f10349e80b0ef7c21ea SHA512 7e692de4260f2a846008eca3bf8f4f59b61d2780743ded9a08d2245baf73ece360cb8b25ab4a3518b706b7dcc2915f3628122930b973ab27ec3e7bfbf120c3ed
 AUX mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch 684 BLAKE2B 10007011b38462ffa8b539f9ac531c715fcead4e6bb1d1c04ea8055decc0aa6eda8b22e3967d91773316d04062ca231cf8561ce72ab2b5aaeaf37a0bb425c7f5 SHA512 d0e60dff5faa7b6c71878803d598b46266021029c874c8f6834d496de10ddf42d3b806fae3c6d532c1890cb5f491bbd69235bd1ac919848011a9ca57c465ce1c
diff --git a/dev-db/mysql-connector-c/files/8.0.16-libressl.patch b/dev-db/mysql-connector-c/files/8.0.16-libressl.patch
deleted file mode 100644
index 079211dd86f7..000000000000
--- a/dev-db/mysql-connector-c/files/8.0.16-libressl.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From 521750b438d96bef234b338901ff74f239b68061 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Sat, 8 Jun 2019 15:52:26 +0300
-Subject: [PATCH] Fix build with LibreSSL
-
-- Fix version checks as OPENSSL_VERSION_NUMBER in OpenSSL is always
-  0x20000000L.
-- FIPS support is removed from LibreSSL, do not use it.
-- Check for TLS1_3_VERSION define, not OpenSSL/LibreSSL version.
-  Theoretically even OpenSSL >=1.1.1 can be built with TLS 1.3 disabled.
----
- cmake/ssl.cmake                                           | 5 +++--
- extra/libevent/openssl-compat.h                           | 5 ++++-
- mysys_ssl/my_md5.cc                                       | 2 +-
- .../src/bindings/xcom/xcom/xcom_ssl_transport.c           | 4 ++--
- plugin/x/client/xconnection_impl.cc                       | 4 ++--
- router/src/http/src/tls_client_context.cc                 | 2 +-
- router/src/http/src/tls_context.cc                        | 6 +++++-
- router/src/http/src/tls_server_context.cc                 | 3 ++-
- sql-common/client.cc                                      | 3 ++-
- sql/mysqld.cc                                             | 4 ++--
- sql/sys_vars.cc                                           | 8 ++++----
- vio/viossl.cc                                             | 4 ++--
- vio/viosslfactories.cc                                    | 2 +-
- 13 files changed, 31 insertions(+), 21 deletions(-)
-
-diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
-index be3411a8916..95ed535f08a 100644
---- a/cmake/ssl.cmake
-+++ b/cmake/ssl.cmake
-@@ -313,13 +313,14 @@ MACRO (MYSQL_CHECK_SSL)
-         OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
-         )
-     ENDIF()
--    IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
-+    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
-+    IF(HAVE_TLS1_3_VERSION)
-        ADD_DEFINITIONS(-DHAVE_TLSv13)
-     ENDIF()
-     IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARY   AND
-        CRYPTO_LIBRARY      AND
--       OPENSSL_MAJOR_VERSION STREQUAL "1"
-+       OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
-       )
-       SET(OPENSSL_FOUND TRUE)
-       FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
-diff --git a/extra/libevent/openssl-compat.h b/extra/libevent/openssl-compat.h
-index 69afc716e25..deb21d6ad77 100644
---- a/extra/libevent/openssl-compat.h
-+++ b/extra/libevent/openssl-compat.h
-@@ -24,7 +24,6 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name)
- #define BIO_set_init(b, val) (b)->init = (val)
- #define BIO_set_data(b, val) (b)->ptr = (val)
- #define BIO_set_shutdown(b, val) (b)->shutdown = (val)
--#define BIO_get_init(b) (b)->init
- #define BIO_get_data(b) (b)->ptr
- #define BIO_get_shutdown(b) (b)->shutdown
- 
-@@ -32,4 +31,8 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name)
- 
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#define BIO_get_init(b) (b)->init
-+#endif
-+
- #endif /* OPENSSL_COMPAT_H */
-diff --git a/mysys_ssl/my_md5.cc b/mysys_ssl/my_md5.cc
-index 095fcb4eafb..0bdc885a96d 100644
---- a/mysys_ssl/my_md5.cc
-+++ b/mysys_ssl/my_md5.cc
-@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf,
- int compute_md5_hash(char *digest, const char *buf, int len) {
-   int retval = 0;
-   int fips_mode = 0;
--#if !defined(HAVE_WOLFSSL)
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   fips_mode = FIPS_mode();
- #endif /* HAVE_WOLFSSL */
-   /* If fips mode is ON/STRICT restricted method calls will result into abort,
-diff --git a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
-index 67c151b207b..6a18a717b23 100644
---- a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
-+++ b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
-@@ -297,7 +297,7 @@ error:
-   return 1;
- }
- 
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- #define OPENSSL_ERROR_LENGTH 512
- static int configure_ssl_fips_mode(const uint fips_mode) {
-   int rc = -1;
-@@ -521,7 +521,7 @@ int xcom_init_ssl(const char *server_key_file, const char *server_cert_file,
-   int verify_server = SSL_VERIFY_NONE;
-   int verify_client = SSL_VERIFY_NONE;
- 
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   if (configure_ssl_fips_mode(ssl_fips_mode) != 1) {
-     G_ERROR("Error setting the ssl fips mode");
-     goto error;
-diff --git a/plugin/x/client/xconnection_impl.cc b/plugin/x/client/xconnection_impl.cc
-index cab1836c34f..4ba28d8fb5f 100644
---- a/plugin/x/client/xconnection_impl.cc
-+++ b/plugin/x/client/xconnection_impl.cc
-@@ -489,7 +489,7 @@ XError Connection_impl::get_ssl_error(const int error_id) {
-   return XError(CR_SSL_CONNECTION_ERROR, buffer);
- }
- 
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- /**
-   Set fips mode in openssl library,
-   When we set fips mode ON/STRICT, it will perform following operations:
-@@ -539,7 +539,7 @@ XError Connection_impl::activate_tls() {
-   if (!m_context->m_ssl_config.is_configured())
-     return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED};
- 
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   if (set_fips_mode((int)m_context->m_ssl_config.m_ssl_fips_mode, err_string) !=
-       1) {
-diff --git a/router/src/http/src/tls_client_context.cc b/router/src/http/src/tls_client_context.cc
-index f9dff94d837..ae7413b43e9 100644
---- a/router/src/http/src/tls_client_context.cc
-+++ b/router/src/http/src/tls_client_context.cc
-@@ -54,7 +54,7 @@ void TlsClientContext::verify(TlsVerify verify) {
- 
- void TlsClientContext::cipher_suites(const std::string &ciphers) {
- // TLSv1.3 ciphers are controlled via SSL_CTX_set_ciphersuites()
--#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1)
-+#ifdef TLS1_3_VERSION
-   if (1 != SSL_CTX_set_ciphersuites(ssl_ctx_.get(), ciphers.c_str())) {
-     throw TlsError("set-cipher-suites");
-   }
-diff --git a/router/src/http/src/tls_context.cc b/router/src/http/src/tls_context.cc
-index bae36860fea..2cdc31274b6 100644
---- a/router/src/http/src/tls_context.cc
-+++ b/router/src/http/src/tls_context.cc
-@@ -92,7 +92,7 @@ static constexpr int o11x_version(TlsVersion version) {
-       return TLS1_1_VERSION;
-     case TlsVersion::TLS_1_2:
-       return TLS1_2_VERSION;
--#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1)
-+#ifdef TLS1_3_VERSION
-     case TlsVersion::TLS_1_3:
-       return TLS1_3_VERSION;
- #endif
-@@ -122,9 +122,11 @@ void TlsContext::version_range(TlsVersion min_version, TlsVersion max_version) {
-     default:
-       // unknown, leave all disabled
-       // fallthrough
-+#ifdef TLS1_3_VERSION
-     case TlsVersion::TLS_1_3:
-       opts |= SSL_OP_NO_TLSv1_2;
-       // fallthrough
-+#endif
-     case TlsVersion::TLS_1_2:
-       opts |= SSL_OP_NO_TLSv1_1;
-       // fallthrough
-@@ -171,8 +173,10 @@ TlsVersion TlsContext::min_version() const {
-       return TlsVersion::TLS_1_1;
-     case TLS1_2_VERSION:
-       return TlsVersion::TLS_1_2;
-+#ifdef TLS1_3_VERSION
-     case TLS1_3_VERSION:
-       return TlsVersion::TLS_1_3;
-+#endif
-     case 0:
-       return TlsVersion::AUTO;
-     default:
-diff --git a/router/src/http/src/tls_server_context.cc b/router/src/http/src/tls_server_context.cc
-index 4f3fa39cd28..ecc9755979b 100644
---- a/router/src/http/src/tls_server_context.cc
-+++ b/router/src/http/src/tls_server_context.cc
-@@ -162,7 +162,8 @@ void TlsServerContext::init_tmp_dh(const std::string &dh_params) {
-     }
- 
-   } else {
--#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
-+#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \
-+    !defined(LIBRESSL_VERSION_NUMBER)
-     dh2048.reset(DH_get_2048_256());
- #else
-     /*
-diff --git a/sql-common/client.cc b/sql-common/client.cc
-index d6d977970b7..af68f04104d 100644
---- a/sql-common/client.cc
-+++ b/sql-common/client.cc
-@@ -7515,7 +7515,8 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option,
- #endif
-       break;
-     case MYSQL_OPT_SSL_FIPS_MODE: {
--#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL)
-+#if defined(HAVE_OPENSSL) && \
-+    !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-       char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-       ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-       mysql->options.extension->ssl_fips_mode = *(uint *)arg;
-diff --git a/sql/mysqld.cc b/sql/mysqld.cc
-index 13479e3c474..904bae80f8f 100644
---- a/sql/mysqld.cc
-+++ b/sql/mysqld.cc
-@@ -4640,7 +4640,7 @@ static int init_thread_environment() {
- 
- static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define FILE_LINE_ARGS
- #else
- #define FILE_LINE_ARGS , const char *, int
-@@ -4676,7 +4676,7 @@ static void init_ssl() {
- }
- 
- static int init_ssl_communication() {
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string);
-   if (ret_fips_mode != 1) {
-diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
-index b511c453f1e..8952922c1ff 100644
---- a/sql/sys_vars.cc
-+++ b/sql/sys_vars.cc
-@@ -4282,7 +4282,7 @@ static Sys_var_ulong Sys_max_execution_time(
-     HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG),
-     VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
- 
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
-   char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {
-@@ -4295,7 +4295,7 @@ static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
- }
- #endif
- 
--#ifdef HAVE_WOLFSSL
-+#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER)
- static const char *ssl_fips_mode_names[] = {"OFF", 0};
- #else
- static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0};
-@@ -4303,7 +4303,7 @@ static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0};
- static Sys_var_enum Sys_ssl_fips_mode(
-     "ssl_fips_mode",
-     "SSL FIPS mode (applies only for OpenSSL); "
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-     "permitted values are: OFF, ON, STRICT",
- #else
-     "permitted values are: OFF",
-@@ -4311,7 +4311,7 @@ static Sys_var_enum Sys_ssl_fips_mode(
-     GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE),
-     ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
-     ON_CHECK(NULL),
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-     ON_UPDATE(update_fips_mode),
- #else
-     ON_UPDATE(NULL),
-diff --git a/vio/viossl.cc b/vio/viossl.cc
-index 97335eef321..e34b973f59e 100644
---- a/vio/viossl.cc
-+++ b/vio/viossl.cc
-@@ -507,7 +507,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
- #if !defined(HAVE_WOLFSSL) && !defined(DBUG_OFF)
-     {
-       STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
--      ssl_comp_methods = SSL_COMP_get_compression_methods();
-+      ssl_comp_methods = (STACK_OF(SSL_COMP) *)SSL_COMP_get_compression_methods();
-       n = sk_SSL_COMP_num(ssl_comp_methods);
-       DBUG_PRINT("info", ("Available compression methods:\n"));
-       if (n == 0)
-@@ -515,7 +515,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
-       else
-         for (j = 0; j < n; j++) {
-           SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-           DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
- #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-           DBUG_PRINT("info",
-diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc
-index 1a88dc3ed1d..a273c9991e7 100644
---- a/vio/viosslfactories.cc
-+++ b/vio/viosslfactories.cc
-@@ -429,7 +429,7 @@ void ssl_start() {
-   }
- }
- 
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- /**
-   Set fips mode in openssl library,
-   When we set fips mode ON/STRICT, it will perform following operations:
--- 
-2.22.0
-
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index cfaa91985dd5..3d4ae0299c3e 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,6 +1,5 @@
 AUX mysql-workbench-6.2.5-wbcopytables.patch 496 BLAKE2B 4666f32098ec43ad36f1c726903472e829873002521262d6781a2febfc1394dac6f9708fbb99a3fa52a032a5b8f695c9b98579b28a63e74727eac21a8ef3fbe6 SHA512 c0766315cd345893af57880eccdc2c1dd9ffa456a27d0c736af1382ca24c507de865188588753f212f35d8781305dcbd8d555f128edd6454dc2299bd0357fd5b
 AUX mysql-workbench-6.3.10-i386-json.patch 7167 BLAKE2B 44a6e2446b24cd2f7f096d51b6cfdacfb485634a94733c4ef67a128ec903fec3736cb62ed45d6abbe7c7793b7d3ab668198f663a44b1bcc313f4d02ced4cd578 SHA512 992595df7719c4c958c98b5561f3fea04607213287c72daea6bb331392c417123d6fe5d1126c6dec128a857aa299908221f3a2c0ac08744241bf395e80a9574d
-AUX mysql-workbench-6.3.9-mariadb-json.patch 2320 BLAKE2B 9dcf7ca5091109ab71a201a68aa16259402dae85d4ea1135fbce476dbc0d4f49ad154005a6fe6195ce86ffba49ebf3d03de8ac94b6adcda2a297600b1ac6d0d3 SHA512 23e4135ee5c8b7cc7b70cc6b5170209c9a6350cfc7e8450d29a1098c31472b68494147ec4f1286365f7802af72570f4822b0078ae269affbbaf98e3ad9e99eb4
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed SHA512 de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST mysql-workbench-community-8.0.16-src.tar.gz 15653536 BLAKE2B c76cd35e88167641037a779b85245c620b31e2a2943260309d8ba461391892d9ec5856023c8eb25e1ea40c12ece796a1d2e36f1638187db4bd2739eb273232c9 SHA512 e9495e78aec58f70cc586ad73908408d3b8d5071c815279c1019d5268c97f53f10f4e59a47fe0ffea03b795de8e283c1175e03e2585a81fc58b62461d665cfe9
 DIST mysql-workbench-community-8.0.17-src.tar.gz 15777302 BLAKE2B ba1aebfc5f9b55e88529bdbc5ebe42da594fce1da0ea64bd0153294293fe4c2533bbc00aac9c1ba0942577eff90c1b522ef1af803e56edf0c361876ac5dea764 SHA512 c7b5f68e4a2fe30d33fde5f18a03342e034a8c10edc2506278dc09751f264884f1dba3d68c430594ac09d26b692465409d2189c2b2a440d80aca7ad00188a39f
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
deleted file mode 100644
index e785d6fb0976..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/plugins/migration/copytable/copytable.cpp
-+++ b/plugins/migration/copytable/copytable.cpp
-@@ -109,8 +109,10 @@
-       return "MYSQL_TYPE_STRING";
-     case MYSQL_TYPE_GEOMETRY:
-       return "MYSQL_TYPE_GEOMETRY";
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
-     case MYSQL_TYPE_JSON:
-       return "MYSQL_TYPE_JSON";
-+#endif
-     default:
-       return "UNKNOWN";
-   }
-@@ -295,7 +297,9 @@
-       case MYSQL_TYPE_STRING:
-       case MYSQL_TYPE_VAR_STRING:
-       case MYSQL_TYPE_BIT:
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
-       case MYSQL_TYPE_JSON:
-+#endif
-         if (!col->is_long_data)
-           bind.buffer_length = (unsigned)col->source_length + 1;
- 
-@@ -1392,7 +1396,11 @@
-               rowbuffer[index].buffer_type == MYSQL_TYPE_MEDIUM_BLOB ||
-               rowbuffer[index].buffer_type == MYSQL_TYPE_LONG_BLOB || rowbuffer[index].buffer_type == MYSQL_TYPE_BLOB ||
-               rowbuffer[index].buffer_type == MYSQL_TYPE_STRING ||
--              rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON) {
-+              rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
-+              || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON
-+#endif
-+              ) {
-             if (rowbuffer[index].buffer_length)
-               free(rowbuffer[index].buffer);
- 
-@@ -2162,7 +2170,9 @@
-       case MYSQL_TYPE_STRING:
-       case MYSQL_TYPE_ENUM:
-       case MYSQL_TYPE_SET:
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
-       case MYSQL_TYPE_JSON:
-+#endif
-         _bulk_insert_record.append("'", 1);
-         ret_val = _bulk_insert_record.append_escaped((char *)(*_row_buffer)[col_index].buffer,
-                                                      *(*_row_buffer)[col_index].length);
-@@ -2621,7 +2621,7 @@
-   // This is needed because the escaping depends on the character set in use by the server
-   unsigned long ret_length = 0;
- 
--#if MYSQL_CHECK_VERSION(5, 7, 6)
-+#if MYSQL_CHECK_VERSION(5, 7, 6) && ! defined MARIADB_BASE_VERSION
-   if (_target->is_mysql_version_at_least(5, 7, 6))
-     ret_length += mysql_real_escape_string_quote(_mysql, buffer + length, data, (unsigned long)dlength, '"');
-   else
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index f5097754a938..f419e384d812 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -13,10 +13,10 @@ DIST mysql-boost-8.0.18.tar.gz 194953221 BLAKE2B e3622cccd8f60487a5e643e522e9cdc
 DIST mysql-extras-20190817-0024Z.tar.bz2 337793 BLAKE2B dfd51a708654aff5bdbbaf2acad7ef966869a8e3adcba544ee15f217d2ba942827445841e73981bccc6c1f145b6225bfa7245114219f0cf52f0dfb85494a6830 SHA512 c2ff81be1c55636f0a2700033af030149f312f0383217054a4b8c65aef174626299fcb4539eaae967ea7d096a5bb09f5b5122dce344b44b0a135d886ba0fdf28
 DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
 DIST mysql-extras-20191016-1722Z.tar.bz2 340442 BLAKE2B fa38fc455693b940cfb96f69a35c190f7edb3fdfa7bf0e3f4e444032843ca1ad1d4767fecaf3b080f7f8885335ffe81f2355e9fe0fdebe77ac90d7fb1a0d2121 SHA512 1b4d3fb1cda63471807e37ecdd6a663672149a9eac9497d6b864a9ecdd57d179950176da2db0668892567994bd2fc1e98ea499f16dc689738331a1e319c9131c
-EBUILD mysql-5.6.44-r1.ebuild 27130 BLAKE2B d42d26aa3282093b81c795f1ef909487831cede065a996d814850fb4c638c848d278ba0ef0d8275a2ef1c91c5832977d7c2aa3085f324ddb03a2ac25b1607916 SHA512 16e437ee7e8497b84dabf1698f701ff46c096530acfa5d211c9ca96fa538b0014f8571e2fce64182c2d497155383353bdc38a69a68dd7d333c96e9175cea804a
-EBUILD mysql-5.6.45-r2.ebuild 27081 BLAKE2B eda4a8ff2d1145cd35e886442a09dbf9432ebcd498d2ebe8008d4acdd591ab4865b33ba4c8de663af47388f2e5934164cef72fd6593154721d9b0be4e0793f9c SHA512 65036a9f986aa579b831a0c1f595eae15752f0905c3d91eaa446d771af42417057a31a63cdecbdeabd33e2bc45a4cda1e5974e588a875d6df777104cf51bfe3b
-EBUILD mysql-5.7.26-r1.ebuild 31717 BLAKE2B 3085f70b4a76baaf7f94ac8fe5e37b9c3470b6537a88a626236232dec1c2cf234f4d25f83ab7bfd92fba1881b4080039c0259c4485259be472c8833cfcb71b6d SHA512 6663432102f90d9d2cbda3937c1a5e1dc9a01e4d6599bc517e0303e73beda60766be930cd9695fb4d0a65ea6e746c27f5449eda2e64e0268e670d0f5660040fb
-EBUILD mysql-5.7.27-r1.ebuild 31744 BLAKE2B d845c5dc775b1f25d8b63b66aaeca0620dab0709a49e47943e73a182eef8c96a79125454bcfd830ae6f8ec1659b48262837121c6670e227f2745a9ae7ed5584b SHA512 41dfcdde2790359007f84905900931a96259cf150e690213a7c2a3714d2c6e7d26c3b8a1a0cada5f7b3ee8067bff2c190b1a57945617b31d204e3fe53b9ea022
-EBUILD mysql-8.0.17.ebuild 36451 BLAKE2B 9e81d30e5f0569790047ba7484ebe47cd70bc709ef4eca59caa5fdd2aeed4c4fddada4cfa1bbe5f298d759fc30e496d9fbe5ece7925d08eb8153cb507ada30d6 SHA512 ceeefc52d0a62cba8af57fed0a137e0317c4db39f237d31a9991611ef84ddade142287194d84e3f1dcba4ebd5c1a63c85821a2bfc2642adc0f0ebd45ed6270d2
-EBUILD mysql-8.0.18.ebuild 36472 BLAKE2B 7ac22811242bd58740930388149e8091f4b7b7a76574320d42e447d1524c046245acd8b07fea875208b676c11bdf47294f4b72bc443e9ab53f04165a15a8c0a1 SHA512 be5750b6518dd8f43e729231b53e365af3087bd41570f7eff5a2cf3b9cf9225e4e8501e57fd8f2ff69e752d2bfa2628388701ec7e25fce2c9b76a4a8bd5089c7
+EBUILD mysql-5.6.44-r1.ebuild 27146 BLAKE2B f8afe1efcdaf08bf6529f931486e1ad97aef88169a9ae301ebb25888c173f799cfced4c70569ff9aa565a71c15bf26e5129de8b2e4226e2b1fe6abfe7e010ba5 SHA512 dc5d3e62fe4f47126228594a0b1b79bf191f70c6158a33890e49d0826dadf890512a604968a57cdb4ee9ead4fd9c9c3c10eebea8603f3323bf01aa1b9a1d4608
+EBUILD mysql-5.6.45-r2.ebuild 27096 BLAKE2B 4185eba92b1d3455b2c9d718249a55e0a95b45f02f25ae5d65a9c3e01ad5de9bfe66793e63a2f577e3e7a9e295f40d7576070b356f6e2efcf493599f8569817e SHA512 faed98d09a85757cf2cede77fc21d83e059fcee33cfffd739f2dabe34ec905101840244f45c4bdf97f945abd79202c78b40f3b1dcc2f9edf10173741a3ea5b13
+EBUILD mysql-5.7.26-r1.ebuild 31733 BLAKE2B d6e6f240727daae94a5d08773f1ec5046831c9b7faa605bcf685aac69c1a23b046a0bfba942e36779d9cbdfb616c9b847a2547b25673af7dcefc8839c6752710 SHA512 6dfe6baf03cf35e006677b7879d4c60705d57dc759608f17ac34eb0c747aa99844f7efe69c8d660dfb9863353d0ef390230972153e5901e7b527b8e59d9b4084
+EBUILD mysql-5.7.27-r1.ebuild 31759 BLAKE2B 865bf492634cb00a3a373497501beeda472b477219960f012dcd74d5951e218904390039c17e5ff999a562cc12cb6bd58f0e2b0aa6efdb2e29f203171f04cecc SHA512 c0c7393a70d3be0129cba16694437f3017e97aa5f6cf8db63eb460d62ba06f5d3af8edbcb472d009f560e29ab837038dce4306bf2c2eb94f9ce026cae2204678
+EBUILD mysql-8.0.17.ebuild 36467 BLAKE2B 1cbcfb611410b32433ee0bfd3789c6c9fd40e226266e6ca5ce7aa471b70bb0cdbebd9ba8ddcb122735654e8f5e2a244592733bf35406502a034e2e5c4138dd27 SHA512 6faeb17c577db5d48c158c5c8973b47e7e2fc25cd1d6bd8e37bcfa175c497548f6ae31378cda60c4fd934c1a96c8b938d662bcb3e7c4e8c621e349a218d2fcdd
+EBUILD mysql-8.0.18.ebuild 36488 BLAKE2B 703c284c471911e9a7a44397dc7998a24fb8e4473bb0997d14cd0717cb10cf3692d40ecbfdaef56277d020ea1bc32815f5a58a6d95139cfa7a667085c8b9b8ff SHA512 adb4f60a7a572a65d6651f584e25b373d9c990b2840341109786a64b934ed1c289103b6f84e4e3511152385f4c9d99a276c1e6b8864214203892680895c36387
 MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7
diff --git a/dev-db/mysql/mysql-5.6.44-r1.ebuild b/dev-db/mysql/mysql-5.6.44-r1.ebuild
index 642f7932867e..1e3ee4b5f576 100644
--- a/dev-db/mysql/mysql-5.6.44-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.44-r1.ebuild
@@ -33,7 +33,7 @@ IUSE="client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling s
 	+server static static-libs systemtap tcmalloc test yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
+RESTRICT="!test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
 
diff --git a/dev-db/mysql/mysql-5.6.45-r2.ebuild b/dev-db/mysql/mysql-5.6.45-r2.ebuild
index 174b9eac6e41..1ea042478213 100644
--- a/dev-db/mysql/mysql-5.6.45-r2.ebuild
+++ b/dev-db/mysql/mysql-5.6.45-r2.ebuild
@@ -33,11 +33,11 @@ IUSE="client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling s
 	+server static static-libs systemtap tcmalloc test yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
+RESTRICT="!test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-5.7.26-r1.ebuild b/dev-db/mysql/mysql-5.7.26-r1.ebuild
index ea0df7b4e112..6a478c8f6819 100644
--- a/dev-db/mysql/mysql-5.7.26-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.26-r1.ebuild
@@ -30,7 +30,7 @@ IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa
 	selinux +server static static-libs systemtap tcmalloc test yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
+RESTRICT="!test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
 
diff --git a/dev-db/mysql/mysql-5.7.27-r1.ebuild b/dev-db/mysql/mysql-5.7.27-r1.ebuild
index d1584c591b8e..5a103007c82a 100644
--- a/dev-db/mysql/mysql-5.7.27-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.27-r1.ebuild
@@ -30,11 +30,11 @@ IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa
 	selinux +server static static-libs systemtap tcmalloc test yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
+RESTRICT="!test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-8.0.17.ebuild b/dev-db/mysql/mysql-8.0.17.ebuild
index 2697f6786560..349e399bee8e 100644
--- a/dev-db/mysql/mysql-8.0.17.ebuild
+++ b/dev-db/mysql/mysql-8.0.17.ebuild
@@ -33,7 +33,7 @@ IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
 	router selinux tcmalloc test"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
+RESTRICT="!test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
diff --git a/dev-db/mysql/mysql-8.0.18.ebuild b/dev-db/mysql/mysql-8.0.18.ebuild
index 95f1b274f5cc..90bf594c427a 100644
--- a/dev-db/mysql/mysql-8.0.18.ebuild
+++ b/dev-db/mysql/mysql-8.0.18.ebuild
@@ -33,7 +33,7 @@ IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
 	router selinux +server tcmalloc test"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
+RESTRICT="!test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
diff --git a/dev-db/oracle-instantclient/Manifest b/dev-db/oracle-instantclient/Manifest
index 56122b928d14..1da084ef1a12 100644
--- a/dev-db/oracle-instantclient/Manifest
+++ b/dev-db/oracle-instantclient/Manifest
@@ -6,38 +6,45 @@ DIST instantclient-basic-linux-19.3.0.0.0dbru.zip 69597591 BLAKE2B 4ac954c027a83
 DIST instantclient-basic-linux.x64-18.3.0.0.0dbru.zip 72794506 BLAKE2B 22db5d69d48c33061db72bdc050e081ec24152c5e4655505c7f75407646f5ffa140aa51f4638ad8e7c5628476bb44358cb061b2d228ab1e36cd9464e49fcf1f6 SHA512 92e607e1711b24ddf10f11ecd3b389795acc544a567a95cb62b624e5913ad11a1707699b5df659f5fb33dae5cd56700036644e643c7edbe51e7a67e57a152ecc
 DIST instantclient-basic-linux.x64-18.5.0.0.0dbru.zip 72902980 BLAKE2B 23fd9885309507183758cf817b0d68342633ad08eb627f4136b967cf38e1910cefa905f17ffea7c929fafe2232eca71ee66a15153f202eb0d03236a1b21cdc30 SHA512 10e6f91dfe07ee4788a5f70ce65affe141061e7b1d6ea0eab6583bd2aed47d7281824e91da2103c53f15e49f02b94add8c3d524494cd4eacded90b2d1cc8743b
 DIST instantclient-basic-linux.x64-19.3.0.0.0dbru.zip 75106438 BLAKE2B d3738c6a92251c75bf39afa996eecfeb9052c6cb6a8cd2080755c8108559257c4aaf660b6a12a1127228122836c85d15d84bb322d49921184ec67ee32ffbfddc SHA512 13ddda55c88fe72e761d9b9ce5bc5ccda4df0bd5ca6237efed34e6dfebf10866b116f3aa7eaf023a73458406584a4e57ecde825bf996fc0e844c030e4d8a3bba
+DIST instantclient-basic-linux.x64-19.5.0.0.0dbru.zip 75169949 BLAKE2B a2f63542408a26b52389734282268cc471b4e995242ce53a52bcbfdb7eb7174bca06f26c1d2291dfd797dab860c18c56f38e4a930486436de36f171ab30093a3 SHA512 7860d27392c4601969a480199f263fbda0f0952a2dcab36efcbdf501568b624c6219d4966a8ff4936b6657b865fd9130f5fdab6bdceec2a45f54fe448f94db4e
 DIST instantclient-jdbc-linux-18.3.0.0.0dbru.zip 1574763 BLAKE2B 2ddbb6a6d61c3b6bc3e37b40f786dd86f5efadcf8cbe5b58dec2631b92ebae25065cb29f87ceed9a1f426ada094a9c0ef1887f8ea7b70e66527e9b75e11f213e SHA512 96298e579b6b5a81ae2ef679d6bf9a18f8bd08c33981d0a5b836c20710dc07d15d7964895a3d66c01075a20720d333f766ac439dc4f3867edac473e020eaf065
 DIST instantclient-jdbc-linux-19.3.0.0.0dbru.zip 1577507 BLAKE2B 2347eb36b1dbe7552753be35b2656edbb43140768379abb8e5c94be7fb3f66fa139becb332d328d8e7f0b7f0b4e32d86703d1760dba36f53471a5b6b3c9b2341 SHA512 66c60f97994a1f45b0ef9e1600da6de319476a6ec4f6a0c9a04516d86e9d89fde1cdfd3bbd8279df125f96326f52875a1daef2ecbb6525fa26482eb637133205
 DIST instantclient-jdbc-linux.x64-18.3.0.0.0dbru.zip 1575572 BLAKE2B bb9d5ad0064b547a7152d4f9b170c646105b4a0731596fe381f7a2c63b720e36cc5a93eea59ea71aa3405999d972cf962a74063350c468a8d114ad28f5a0be0c SHA512 70ebece929cb11f34fdcb6aea75af3679f22d0b838c3d256d4c7c0249977423625b1244a54ca504b51d24e2f178b1784571e185574cd3db34c2cda8128298b60
 DIST instantclient-jdbc-linux.x64-18.5.0.0.0dbru.zip 1578269 BLAKE2B 88047325934da02e81e907c9c4caee540cb06da7d7c08562e90781c2f6004940ba20131d971018fe237cc09cfef010fdf6f912b2309006396315ad67c17b10b6 SHA512 e46a4326f61863a63be333bd588571bc037edd2de1f2462b799e17c65ca8556aeaf42e2eed3a7226bf8c89479b4a723fc6cf6582a65b5ee8a827ffdad1c06bc8
 DIST instantclient-jdbc-linux.x64-19.3.0.0.0dbru.zip 1578033 BLAKE2B 18c9fcca1282c316c67bf86258154d94a26d81779c1d36e782dd55d91fbaf40f03f1e403db9beefe114a27f09fd3d2bcfc643cf3e9a02ae68a5bc3d2eee51c16 SHA512 58813681a74286a7f080f729e3a237584a091487401af08619e2b4349323bf3def8cce22eb550d8ee5675e9a4c7ddddab8fa493bdd8c89981aff3ef0f65d1eb3
+DIST instantclient-jdbc-linux.x64-19.5.0.0.0dbru.zip 1578023 BLAKE2B 2919f4d5a304d16b284151c620134dfcb934251a35837aba2286bb9e1b1e79179642c4331a19994d0fde55ec2859dfd5a7a56167f2b07cd0939f5c85e9448721 SHA512 c62793038b154a10dbff738e31d9e0af4e7dd0435aa51b1839e49be528d8a7b567447b735d400c3327a28cace5b9e22b92d4d9eec0eec0ce77e9f6d7831007d0
 DIST instantclient-odbc-linux-18.3.0.0.0dbru.zip 605026 BLAKE2B 2f7808ef2706c65d1c876e44e7b831ea0629a218347f34dd4b81cce192b45b78b26c9e164b179232b1fceeeeb5f84d807ac6bef1f36fd7d077e620bbb6c093eb SHA512 370d3f34c57e33909642f18104de8b48c2ab0fd1cf679087f8601720ebc1097f64caceb118010b9e8d2f7207cef04210b22a36824de747683c3a1162ccb4f09e
 DIST instantclient-odbc-linux-19.3.0.0.0dbru.zip 600586 BLAKE2B ec76518290f306f41305b12da317ad6de8a73f5049ca6e06fb0e4197ecc9dc8f9855c469fa36e309615a749150580d3ff89a35bfe5878c6441fe4f6218ce3410 SHA512 77aa6c1c5f5a93b86e4e529656ab1b2eaa1e008e343d17193a074e758fc270a5b12d641a959c51b00d5cbc7a2b562c590e662701e66e295d218995ff266f005b
 DIST instantclient-odbc-linux.x64-18.3.0.0.0dbru.zip 648825 BLAKE2B 1e96b87802c9ccc7d5f6ae2fdab501004e6fe8d4e155503bb983c82cdbfff729263e541689f4c2dbeeabfdd1037f0a97191e3a50842a8488a3267f24fec6b43d SHA512 23ad10a834fd92007147f8a7ad95dd9df4fbd5b786f7e2bb9afd6a12101fb934a40daa81ade914d8d0f59872591a1ae29438f23229b3767ed4ea3ff7cc730f66
 DIST instantclient-odbc-linux.x64-18.5.0.0.0dbru.zip 651470 BLAKE2B c5e7d794137fafb97ecb5fb647a640e59490270787c16f972882c03b34c4f404717f6f87e8501252f415a85b8d92031bba9910eb034c92c4f7fac37f66a3fe43 SHA512 b9e066af00b263b348f1e7a26dbf5672f01be79115bd75a47e2cff95f32fb412a8d03736e1c5ac663847a2d75ea5606cdb1fc27434f7690120c462f8eb15a6cf
 DIST instantclient-odbc-linux.x64-19.3.0.0.0dbru.zip 638697 BLAKE2B 2a9077243a4718c7af4abc2c36b7ca3e2993acb904dd9873c91bf8c0010ebaf18d6864a6b488eaa3a66d6fa42f83d099367533dad65d228db6e21e2b4e23a6df SHA512 dc148301d7e0ce7d74d90619f4f6aa03a26d61033d36803de7623ad64ddd5da1b34e24704ec1cf948ec341ba91e96c1bc08a5b62da79555d248f245ae75e776d
+DIST instantclient-odbc-linux.x64-19.5.0.0.0dbru.zip 638692 BLAKE2B 6ab7357ee95d806ab60de2da2a82414aa2f5f0e7527cc4f44a4028a52a01abb334ac8c4076e5f26a6d0444943e46f6c1da7843d31ff7b1c1a9d31cf13a017c9b SHA512 ac145a24ed2a2287d28c45e16f87509786f044588443b470e4155351576bc5a7d94c845f6af38a58f1a5bd82a57a4b69a8719f46cc85b1f0c4173ab3ee927fbb
 DIST instantclient-precomp-linux-18.3.0.0.0dbru.zip 5200252 BLAKE2B 1d3613de34ccd61fd7c3795170d6d012491bc2c045c39f39db716ac7ce2e68e7e8da84c5b95afa8e50afb97d2fcad8e469f25627b9ec570f58f0b167a2f2348e SHA512 f783b6f346cc4848567a1b7284a93d1bf20a9555fa9cbfd57597b3856444969653cc6d6c3c3e710da6775d39d2efa6399b9e91f4f7458de43b0a404f4f693dd0
 DIST instantclient-precomp-linux-19.3.0.0.0dbru.zip 5183647 BLAKE2B 79a37d25e5731978911d643bdd19c0b0f1f66b153ed7164358fe2038a987594a73a8aacbc2fd8c542557a099e52931666cc9df5d5fb1af30e3fd365378fd505b SHA512 a6f7d7f82d657bb32431aa81c4dfa1fb3ea31aaa6df9781e19fc78c2ef25bf168420c95e3d9fa8f4aa3912afd3fc98eaa45f63a28ddaa091c4e50360802735b3
 DIST instantclient-precomp-linux.x64-18.3.0.0.0dbru.zip 6403554 BLAKE2B bd8e1b3de4b8c12214ea066be22f7ca18133e62e1d9a70b2710578e967204561cdcc9f719f8c1310e19e94baca367e0aa8c482e637b2f13a51781328b229be92 SHA512 292322eb07e3707cf469cea8390636fb2fae99a50b3b900a9c43b5808ce741cb708541820de5e9aa9c341290ad5015be32d968c43e1a14aebf97dd5fd04fc925
 DIST instantclient-precomp-linux.x64-18.5.0.0.0dbru.zip 6401804 BLAKE2B 9098fa6966023e4cc48e9c4fe60aef5e7c4d15a5200fcf92716fc224fa741cb6bd41bbe58a1820ab4c4c95b5be2faee8f0d85dcf6d5c0f14c51943fd67b32856 SHA512 e44ddacecbcc7311f59490116fe44f0d9b303c0a669d9ecf43926bb5627b0a767400bd51e8ec1162d088ff52022d2fa0d2f4e9d83e7efc0e40b0c02679c1b109
 DIST instantclient-precomp-linux.x64-19.3.0.0.0dbru.zip 6225945 BLAKE2B 1a17f20b7147496047f31cfeee56efb74c7daface1c7e6bab2a67258d410723b9e70b771fa9df9e16c2c27c831e97d538a69854e565ebd313f528a7f57a2f358 SHA512 6db99e0df10d439e93813ecdb27e5961232ab64a480b6aa0ee5e00a43e08bae2ade64b2abb60cad58e3139609f81835bde53d91ab35dedf427d3122d65c184b6
+DIST instantclient-precomp-linux.x64-19.5.0.0.0dbru.zip 6226878 BLAKE2B 5f1606d5e9bb8900b4181e781b270d6dc28b72def6f77edfb8ba241ca4b955c9f9fd2b61b8f4c97eb20845ae3397af7be8a574f175095b68478f299220f2332e SHA512 a4b200444efa597ee66b858f3eefd135fc36f038502301f9a1636ffdb6955c1bfca1fad278b57a0dad2fc90979eed4750d9ef631b64ed65495d5c600ea36cbb6
 DIST instantclient-sdk-linux-18.3.0.0.0dbru.zip 927121 BLAKE2B 5b53d759cb82c854d67b9bebaffb07e442b62d13367e5acf19af2dec4dbca2ba3ee50c83f89cf6e865121ad039227d898e74fecf43439610254eb43a429422a0 SHA512 6e4ccafb69d047b96dbda2f493c175f005b593472ea3c9a75fed758d2f12d970509d58b32d94f7a59b3d0402a87efaa754e6487af9cde01f7211f0145434c6c9
 DIST instantclient-sdk-linux-19.3.0.0.0dbru.zip 932301 BLAKE2B 6c5cfe55a651b9364da3f24d5739813e1b8165fad6434b7a09da2acdeddda408ab4fb37aa34851a537a000a4a7718fbe41ccf8b5fd51aa1bb4fd2e8ec0db33f9 SHA512 8dda8500ffa9eac966f54818d1c19b7d8b878f09c0664e03cfcc8ee8e5b061de566e6b411d15c5db58ef0e97374c2311d16fffd6b4c124dc06bdfd8fa8916b7b
 DIST instantclient-sdk-linux.x64-18.3.0.0.0dbru.zip 927118 BLAKE2B 9c6cd889843552cee3e84566d9c1b29369b1e7b20a01fac65676a33d6196b042a4c34cd2df8cf1ec5c8664a403e44e6a283f42912b7e056e093c744bd24ec24f SHA512 c9e1493601ec70541e437ded748f3be24deaa3f1037884fd003907bbab38b3099aef12dda1b9845c3eb3ce3827f743696f5ebe6d8dffe7974088c1329528b729
 DIST instantclient-sdk-linux.x64-18.5.0.0.0dbru.zip 929988 BLAKE2B 942f99fbea74e253a0be1677cfe40d79a26cb7a6442631d626648a65aa4f20b730e4f1ff13effcce5c4befd2ce50ab038f88b61c6f05ccad262568b209b3048f SHA512 7adc9e315c7c8784e4648a97fa54e03eb26a05b7b35a1f5cf1105898701b31fdc22f0011b1ae192752adcf3ec9798ba635bb9a9a5d4bc768a9a519c3564a9375
 DIST instantclient-sdk-linux.x64-19.3.0.0.0dbru.zip 932294 BLAKE2B 26ea1ce34209c1dc92101e211f009ecd20cfdad4d88e946844cbd1f2b1f4365c7dd273e7079be1dc807c38393035847e47800d65b0ecebb3a705cc6cac092a0d SHA512 ec3527a8371bb9644f4912b8190cfde53bf2afd8bf2ec7376bad97dc4d4b37f010a5e0d30567e2398f51c07affeeb15515347df095587a9cff84ef657b7e8c6e
+DIST instantclient-sdk-linux.x64-19.5.0.0.0dbru.zip 932481 BLAKE2B 6a62e3c2a2889b5534133882c47aefc957c3e261c0ba7c161baed32657de0d15317356719ed9b354919fec8936dfb99044b707e83ae5ecd9d3359955e6de0005 SHA512 0f6521cc2c0430d15efe80fcece7b802146418591ae52b062f3571a85a60a8d8912b8d484e36360bc7428c0fe1e18043fac5bc7b3d484cdca9737931c1e72ffc
 DIST instantclient-sqlplus-linux-18.3.0.0.0dbru.zip 881315 BLAKE2B 787dd43ffaadd493d8cb3a9a8bbd160f75c51ad07e16d8eb7631e8368b4a8bfe9e574326837724b3573705e1c309cbe0bf364c1b98660534b05f5d72d28b1b11 SHA512 9087e5654143c9da3499fb7f1b8a15b04433cacc0d96257519788b3cd12a0aa480b37fa37fbe55a2f40940ea8da1eeae9881712a87d5942e142c0f29b580e54d
 DIST instantclient-sqlplus-linux-19.3.0.0.0dbru.zip 883462 BLAKE2B c3891a6ea525add3030372bb96b57e31b3a2743dd5bddbf12d4e2d43b7732b244c265a15423ae48d93db609f37a449233c8c16f5fd7c1d345b6ef42c217bb8d2 SHA512 521b80d47320b4ea51a68bee8f05fa51fa5e74690e62817d1fdb5471eaed577cad6bd5364e18fa5c18dc0cf56b99e33b62488a93c176d860e471ce2a7e9facca
 DIST instantclient-sqlplus-linux.x64-18.3.0.0.0dbru.zip 915778 BLAKE2B 8d93e462568a5bf5a294a5abcf0a0e30c08e9eef18c01a79b8f716261efbeb14a286d1058ddfa278108daeb49b74a3e296efa83291d7bc03f4ad35428c946701 SHA512 878ac2cf58aaa8cb237779fcd04378c95d738fd444eddd5745838fa86e8cd60f1c2be49f0f4fc3d4b16dca652fe66681ac0907a4aeddec1d9433e63d2f4e5db6
 DIST instantclient-sqlplus-linux.x64-18.5.0.0.0dbru.zip 918469 BLAKE2B 14efa748e7a892334610fa7a615c56b07e25873d5761408b9cac642af11ae2d97062b8014e4c7dee06dc37676d7c9d1a409d80f50b9d162210e073c1c4ef67d5 SHA512 8c2866ad092893647086adc554c7fab3c9bdc5429c9e0715d68717065fe12f106d228a2f241fe76bdc677a4adfa6eb01b0d866fab2bebbb1491a087a4b9d4a50
 DIST instantclient-sqlplus-linux.x64-19.3.0.0.0dbru.zip 910409 BLAKE2B e05c8dd3c545842989a2650013ff7ac8b06b41bef07efcd312ff66c51929942e3336bc9bd9a53a197088433b2cdbcb5bfbf4b2f4e1a40d68cfe559207737446e SHA512 34320712009ea724edd71f04bb72dd58fb99d34b1a357e238c04c9a55c7120eafc8c675558755a85587c7e75801dde2a7f8fc54795dd7e3e61568f8cf27d791d
+DIST instantclient-sqlplus-linux.x64-19.5.0.0.0dbru.zip 910437 BLAKE2B dc204e6dfc4ab8d22720067b6238ffff773a5db6522b2066306bbbfa8645cc62f952126b2f4bc548dc0096695914d7ca44c7b299f59a609c363739fca1be76e6 SHA512 83a8b7004585ea3a31f7abd55615c983963b3df2ed030e54057ab897442b38ce41fe66c2754ad034b37c588090fe478549db371b809e457846ca537b25b2fdb8
 DIST instantclient-tools-linux-18.3.0.0.0dbru.zip 1042756 BLAKE2B 1b1af7abb50b6977e0dd4bc0f2b5e89534cf5bffe216dbe553063761470c45f330f4a72ece428a3e0dc8162cebad3cf0ffa628f4b3879bc434ecda7b7b07570f SHA512 b809b83e2e7dbe19c13611c1eb819fa4648a127ddc8a97abaa794213c7f4b6d28b70956aac4f331389d088c6fccc998d0eda8dc39f2dedc338f3baf03bc3ceac
 DIST instantclient-tools-linux-19.3.0.0.0dbru.zip 1018792 BLAKE2B e24a264d59a4e29b8dcf56dfd09c80571612f465c8e2e91514c076553f27a0b07e66bb2ac0f3fcd6150c8a04ba861de04576e45ca1c03d173149296c029b8fcb SHA512 33103d934dec1bb6e34fb3f15cbbfba2ceec724334ca89bc55df3953779b3f4d45d70e7c9d1734481f366bb2e7e8ab58bef063415571acdf07022f193558ed54
 DIST instantclient-tools-linux.x64-18.3.0.0.0dbru.zip 1142609 BLAKE2B 5c915bd940b7bfaa42429710685cfafc5f0189607da2d789f4aaada2bc9d3365ad8e9ee31cc209830fa54b406ffe4b9b2fc2b5e0b6819ff176f7dbb566117a79 SHA512 2c198d9e723b39f7b512217eb08557dfa3c9ae32858acd882df8b9b24beecffe6b44eb089b50341edf01d7e4c0514d4b3de4aa06fa9185aa0538855963c174a4
 DIST instantclient-tools-linux.x64-18.5.0.0.0dbru.zip 1143747 BLAKE2B af5e70e1add6ca2042a213b5038a805ea3d6074703d5a677798684f60f681d6f7b642154d87a02fe973b5b12295ea9ef6f64c45836ceee66ce67d4e4498417b6 SHA512 7bbacdb1fa062c40b2389599ab522b02d63e68731d461fe45446685642b932ee741b8c9e0fde189d8f741db4131f6ac72c8124612e8668a00f90ed7c594fff50
 DIST instantclient-tools-linux.x64-19.3.0.0.0dbru.zip 1085243 BLAKE2B abcdf61f01e2bc67610043f1a66015050908f2c09f6aa8b615fd9e8b19a94a161d20b372119bc1bfc1a8ca8511a3859f67c48a39a3c2509fa326a350d7614721 SHA512 33df3a1c19d55ba94e0851bb4eaa83e0bfa72a132de2f5b98bb2a1b0528abee319b20211c7f08719c58250579506cda5c1f4de726f7b1e7c1c484dcb3986e43b
+DIST instantclient-tools-linux.x64-19.5.0.0.0dbru.zip 1085242 BLAKE2B 8d540be2f491d5c5a5e36808332e2a0d28092cb450dff6293851644ea11b8de0f376c87d2cfeea383d0f636e33ed196a89740e3d1ec060b75dc96bd291e18319 SHA512 fde38a0c935be334c96de339f84bbdc15ec956c753395a7a29c2b0d16c301e1fd0accb3d5fdc44082adf36934a7f6a1a2bae7a035d47c949337339bdec615d76
 EBUILD oracle-instantclient-18.3.0.0-r2.ebuild 12167 BLAKE2B 40c852da52c88e48aad4b36a10bd391b92295fd7ed45a6bb054c6e2766e70e1ca9c2aeb78768c724f4a191130aa32421ab1d946c2a9b0d700f46afb9ae9877d9 SHA512 fedd20c039cd8d8dfc0b0b10ddfa0939177fa5e393cced2b713642a1b74710e265221b7eb4b0c1436407bc4ba84362f766aca54c7b5bda0d6445c8e7426a5a6b
 EBUILD oracle-instantclient-18.5.0.0.ebuild 11891 BLAKE2B fd3cef07338af39b511497540c8527fceb0e7f5c47366413f6245cf0c36dbe560bbe49a5b748c003eff61f3e5758227ff7b2cd2975a3f5fbc2a8260fbfc7fae6 SHA512 02a4b7dca6942aa10d920419e06c31493e4256fd47dd72f88d94c650ff6baae2216ecf63c73b463019d7aa5268f462277b0cdf559461d074dcb7179a8a14b8f7
 EBUILD oracle-instantclient-19.3.0.0-r1.ebuild 12164 BLAKE2B ecec46f9af808ab224ab1ea2af4139ff3fd7bf61d1c9ecc85cf56f07c2f8cf527fcf2721ed1f7e43dd69ee66c2e5888cbac8e3f263268cf57205d60eaa7faa67 SHA512 6f9a018423d8887a9e7da46e1ad9706928b9173a96b6cb23a9621cd5986a9b689c0f7c12d1bead88f39ee54114207aec8f37afd013c9d236933c4a66582aa7be
-EBUILD oracle-instantclient-19.3.0.0.ebuild 12160 BLAKE2B ea7c78ea1443b4a606b1721646f73fd5f221d7cb53426d1c2a9873988537b1063b91a44fed8b5b8c700cf1c268d78b1e0476a562df0644d0b8af08f868f82ecc SHA512 84592ce3a943e79c91f4d845229149d917a786e5f9ba133f47a5801b28fb338d6c77fb16e93b9e23104a429a2d2d22bddced643a0e0838e59e65c57de2246e95
+EBUILD oracle-instantclient-19.5.0.0.ebuild 11895 BLAKE2B 16955a9be0c015f64e2336e0949046f29d9fe8a3f6c0b08d851f408181b23c984dd07c86f47fb28b314b6d043b9985c8a5fe2d8119386adfe516be88a438217e SHA512 0dae716c8a9d346382e10fd48d4b5aaccb20718efb0a249af7fa0695847842942869f04087885fd8578680c86877af90d8eabfe4290de9035a7285f03551af0c
 MISC metadata.xml 957 BLAKE2B dfe01a80765d0ec1afac4a5045e2081e39ee9060a17f278b6eb7cfae7670ec102a504397d037b2b8d8ad82d242a9fa3ed1d4309b25158b934f8674a062dec53e SHA512 dd8c982f1ce276e7701e6b82b71e2464eaa21e413115c2a4d3bbd49053539ff3a9bcfc84252ef7aa9c39d36054fee119002716de5d525a20bb1f2da0d44b3c89
diff --git a/dev-db/oracle-instantclient/oracle-instantclient-19.3.0.0.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-19.5.0.0.ebuild
index 4f43015be89d..cff6ed819326 100644
--- a/dev-db/oracle-instantclient/oracle-instantclient-19.3.0.0.ebuild
+++ b/dev-db/oracle-instantclient/oracle-instantclient-19.5.0.0.ebuild
@@ -8,7 +8,7 @@ inherit eutils pax-utils multilib-minimal
 DESCRIPTION="Oracle 18c Instant Client with SDK"
 HOMEPAGE="https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html"
 
-MY_SOVER=18.1 # the library soname found in the zip files
+MY_SOVER=19.1 # the library soname found in the zip files
 
 IUSE="jdbc odbc precomp +sdk +sqlplus tools"
 REQUIRED_USE="precomp? ( sdk )"
@@ -48,16 +48,6 @@ then
 fi
 
 SRC_URI="
-	abi_x86_32? (
-		${MY_A_x86}
-		jdbc?    ( ${MY_A_x86_jdbc}    )
-		odbc?    ( ${MY_A_x86_odbc}    )
-		precomp? ( ${MY_A_x86_precomp} )
-		!abi_x86_64? (
-			sdk?     ( ${MY_A_x86_sdk}     )
-			sqlplus? ( ${MY_A_x86_sqlplus} )
-			tools?   ( ${MY_A_x86_tools}   )
-	) )
 	abi_x86_64? (
 		${MY_A_amd64}
 		jdbc?    ( ${MY_A_amd64_jdbc}    )
@@ -71,7 +61,7 @@ SRC_URI="
 
 LICENSE="OTN"
 SLOT="0/${MY_SOVER}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 RESTRICT="fetch splitdebug"
 
 DEPEND="app-arch/unzip"
@@ -254,7 +244,7 @@ src_install() {
 		# here and we do not want this to be overwritten.
 		insinto /etc/oracle
 		doins precomp/admin/pcscfg.cfg
-		sed -i -e "s%^sys_include=.*%sys_include=(${oracle_home}/include,${EPREFIX}/usr/include)%" \
+		sed -i -e "s%^sys_include=.*%sys_include=(${oracle_home}/sdk/include,${EPREFIX}/usr/include)%" \
 			"${ED}"/etc/oracle/pcscfg.cfg || die
 		dosym ../../${oracle_home_to_root}/etc/oracle/pcscfg.cfg "${oracle_home}/precomp/admin/pcscfg.cfg"
 		dosym ../.."${oracle_home}"/bin/proc /usr/bin/proc
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index f2bbdb44d5c8..b0e307aa7b8c 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -10,7 +10,7 @@ DIST mysql-extras-20191031-0134Z.tar.bz2 340718 BLAKE2B 8c228d6953aa888449a006ab
 DIST percona-server-5.7.26-29.tar.gz 84327421 BLAKE2B beedb4b5025c337a63ae56644e47991e90c2c0e57c6d03f1562095f9470cef4b67c8df6c3774d88dfc6ed6dfb81f9dd4b62325db30bc26802651279921bd3a2d SHA512 c8100e69f7e29a5aa2de9dddbc1a3cba9836fe485b7f829a8db0a7e5ac1d1bdabfb1360dacad90665f4c9c78ac91226209c6c15158ef449e84519e36bb06f0a1
 DIST percona-server-5.7.27-30.tar.gz 84672298 BLAKE2B 8431d231f602b704195868110e8eb73adb3db7c761906c15eff182e54634ef091a3ffa0d4f3498a93dbfbf65cd5cdd12102871abaaaa0f32378ba3068d083b2b SHA512 d62c66de3128df87dce52292ad1671e01fe2c923e668ef0faf9cb663c11c9cd0b976345aea1de6ea2bc458d0e1066b42c022849e422121d96cea082ed12c8f4b
 DIST percona-server-8.0.17-8.tar.gz 249562136 BLAKE2B d3bf20d9fee43f17b8aef3e403e74d9c5924a5a012d0c4208b22ffffce37f48867a2a1fb7992d7837f35492d5c5871901f3e0f68cde54793090bb2c089cee310 SHA512 c875492e8b67307aef439ae54b8ff6320464ac495a2d06029f1b33b2117e56bd1c2b3ce4ba7b406c1bd6604d0016d04a5c3f36643097cbf36425d60a44b6adc3
-EBUILD percona-server-5.7.26.29-r1.ebuild 36357 BLAKE2B fb2c8d7df5f60be02196d94512a129574584181dfc7d3403a15624f034fa40d742d2cdd3334a61c58a0fa28cc93e315d8698042e8624c89b146abf80e8ce38b5 SHA512 4f66e8fea2ead405db593a251940768e33866fdaada65260e32ead75681a24efc082062dfe25045c1180966bd3945b8523aaef8e0ae48844da566bf3fe0560e0
-EBUILD percona-server-5.7.27.30.ebuild 37274 BLAKE2B 61f000a8f022f4c2a2837454d97587f0ef4becef2d0d25ab4f8d4ee43ce668be1b1ea5ab177502ca48cfcdc479b73acc2113f78450becfc2aa7562ac90a58bf4 SHA512 593bbbf57c95abaec5b67bb37819af7e537969edecfa8544e284f9e7c96c9dc64c71fdc1d10c6f414f2a6b609d04c7dc124963647ece495e0ca8f0d6e04a9414
-EBUILD percona-server-8.0.17.8.ebuild 37069 BLAKE2B c92cf25eef3a38740816ed1d80dd920a4931987fb43142cdd7f5515343561a4f5ca96d55d5a70272b3529e5e81ed0b0f7ab0b32d136a8ea6585f26fcc99583f2 SHA512 109c01a542c0ebbea3d623260d85cfe0ef85719f239822c09e9e8eb2d328b85e0955fe35e7c4763b9662973375458f90b2fa6827c9478868c5c26088a0a181c1
+EBUILD percona-server-5.7.26.29-r1.ebuild 36373 BLAKE2B 8d1213a84a7b9dc3738db959b73d9e0129ff9128ad40133a007e7777d5cf5616a8e2943a83d812193370e1ea126ac283db9d2fa88d856c2f92189c9daea4b329 SHA512 464ac08ab42c3b088d616cbb69f962423bb9b0a72cf97ed15ddcb38bcc23ed4af07caf7121def6a5a981d68843526878ca68604a91691a12598544cee8764f30
+EBUILD percona-server-5.7.27.30.ebuild 37290 BLAKE2B 539507ea5fbdd1e1f3a43128bce1c4a565344ba238de6e68e89cce2750c159eb65e9d1d82f6198ebe891a685fa4345ff03be38647a54d3582ae6ff95d6ad65ff SHA512 340ec101d272cfe788c2fa19579f889923c2ab34997e4482b5ba827ebe7ab824655c3c14ce90ebe40385a55f74cba46414a76eeda09a9aac53759ebe8a48c820
+EBUILD percona-server-8.0.17.8.ebuild 37156 BLAKE2B 9080a3141936f3f0e937647c4d48b028307bf11464b447867f87e16f977a32bf33d0f1849a293e946a08c54c1df3e7cb667bff1fc2515c75cf8887844e7bc2aa SHA512 4ff19ccc5581e8f386ba476112a648b63504f40b2add568455ea9342ec100265ad04a881d3aab824d22e67fddf9b2c9d75837a563385549cbe31e6633dc9ab4f
 MISC metadata.xml 1476 BLAKE2B 45302733bbb03e6e999d60db72bed7382f664d9b46772904a35a1a8bfceccc89008e739fcead55bfb6a056523f0ff84fd22c638de859236f47a01eb8ac6c45eb SHA512 e53b29f9d78e895a26f228b7719a023dbd5957d1e10f384376b75b539a211425be143c229378af2ade5314f6b414d891bafc7e1fffde9bb88b59ff24de31a2c2
diff --git a/dev-db/percona-server/percona-server-5.7.26.29-r1.ebuild b/dev-db/percona-server/percona-server-5.7.26.29-r1.ebuild
index 5c07b92757dc..6f2590a7c1aa 100644
--- a/dev-db/percona-server/percona-server-5.7.26.29-r1.ebuild
+++ b/dev-db/percona-server/percona-server-5.7.26.29-r1.ebuild
@@ -39,7 +39,7 @@ IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa
 	selinux +server static static-libs systemtap tcmalloc test tokudb tokudb-backup-plugin yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
+RESTRICT="!test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
 
diff --git a/dev-db/percona-server/percona-server-5.7.27.30.ebuild b/dev-db/percona-server/percona-server-5.7.27.30.ebuild
index 54ce90a8b648..5c4af55fc2eb 100644
--- a/dev-db/percona-server/percona-server-5.7.27.30.ebuild
+++ b/dev-db/percona-server/percona-server-5.7.27.30.ebuild
@@ -39,7 +39,7 @@ IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa
 	selinux +server static static-libs systemtap tcmalloc test tokudb tokudb-backup-plugin yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
+RESTRICT="!test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
 
diff --git a/dev-db/percona-server/percona-server-8.0.17.8.ebuild b/dev-db/percona-server/percona-server-8.0.17.8.ebuild
index e2666362cd2b..0fbc6f60a16a 100644
--- a/dev-db/percona-server/percona-server-8.0.17.8.ebuild
+++ b/dev-db/percona-server/percona-server-8.0.17.8.ebuild
@@ -34,11 +34,11 @@ HOMEPAGE="https://www.percona.com/software/mysql-database/percona-server"
 DESCRIPTION="Fully compatible, enhanced and open source drop-in replacement for MySQL"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk cracklib debug jemalloc latin1 libressl numa pam +perl profiling
 	rocksdb router selinux +server tcmalloc test tokudb tokudb-backup-plugin"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
+RESTRICT="!test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
@@ -87,6 +87,9 @@ COMMON_DEPEND="
 	libressl? ( dev-libs/libressl:0= )
 	!libressl? ( >=dev-libs/openssl-1.0.0:0= )
 	numa? ( sys-process/numactl )
+	server? (
+		pam? ( sys-libs/pam:0= )
+	)
 	tcmalloc? ( dev-util/google-perftools:0= )
 "
 DEPEND="${COMMON_DEPEND}
@@ -308,6 +311,7 @@ src_configure(){
 		mycmakeargs+=(
 			-DWITH_EXTRA_CHARSETS=all
 			-DWITH_DEBUG=$(usex debug)
+			-DWITH_PAM=$(usex pam)
 		)
 
 		if use profiling ; then
diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest
index 61daabc44ce2..daae9e477d6b 100644
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@@ -1,7 +1,6 @@
 AUX percona-toolkit-2.2.20-fix-package-name.patch 334 BLAKE2B 3a36f40823194db89de326453d3a2b069edcd67fb50f1a65c27550002b0bf5f5c8631bf65fde8a4f83b7b90db434670c582a1a752b57ddb6c2acaecfc0ba8698 SHA512 eb87fa7d333160d0620ff56fb7e413024f573d05583b68a06aa0156f9a0332ce104ea38e9394d7a842bb5ab05349d77ec4ca3a5fdf28abd582241604f2337e09
 AUX percona-toolkit-2.2.7-no-versioncheck.patch 9310 BLAKE2B 8d102dcab97bc87ad1a98ffd7b600d7453eb449ba919908b5a5063b53a127562bbd419d19dd716a9b6c199a1a38055fd5593817ddfe5200892c4529146c6435b SHA512 6d571c017254e8ea37d128f1623cc4e813ebbfc611cbb84403540c786abc62ee9ba625ec914b101953e5d1d09431f9caa91e270684e00ec6e002b2777b105df9
 AUX percona-toolkit-3.0.10-slave-delay-fix.patch 1593 BLAKE2B 94bc49d581fbd453f650fe81b704ae042f3219495373c09bd750241cbdb3a1917e582927d3682072a1ac6369e2a564ee41bb16c25f662cab16748af1772c11b2 SHA512 40268aa6241416b80e6c076083a0ba2f75fb330529dc5de01438536cd6ce352b4dbee642cad1e1219441ababb054243731afdba0e4f8642dea20c0f1dada5646
-AUX percona-toolkit-3.0.7-fix-package-name.patch 320 BLAKE2B 174f7d5870ec75eb7b8b1282eac9bf4ad4f9834480c5ae5645c436ce8df1dfcb353aaab59eb98cbad9b44aff20f4b1aa09ea2de9fc5e25cf8c7fd1a728bdc72e SHA512 32a3de3fc1e845a26d7d1cad2071030d4376bd408b6b8dead781866bfb29abea754c353f30f3b52c72d2fdefc2ef8727f21c7ff891c1c33c766862c5e7865497
 AUX percona-toolkit-3.0.7-no-versioncheck.patch 5566 BLAKE2B 4def58c91dcdc35481c2ba89c78cb35db2a9121b86ba3a66896d0ef0175c9d6f47cf6eff0908847564ecc810243a3fdc0b893fbc3b2bd2131ec932f93a8694ad SHA512 a681b7f32f1acb509f01fe6c8e99106708729b8f8f5fe5fba0f2131b4380cfd22462f37bf0fbb95213b89d17375f0252b961d0257fb310295fe0e6e002b66e28
 DIST percona-toolkit-2.2.20.tar.gz 1431840 BLAKE2B 76565662b4037010f7e8de98316f568c2994f55d042ae3a21b80dc3b839444a11014b61db675cc21c149f26c3b7df52013d7b06c9c1127ec325dae2942a4e4c0 SHA512 f7a5f47e9ca05c43dcb80866a1eacd13066e1f036f4f58d51145fc6354ddc86dd6515a9aa33c8f736029800bf4c80f7ba5fcb9f1e6ac41653b3351597885f679
 DIST percona-toolkit-3.0.13.tar.gz 10855538 BLAKE2B 30dfbd3c56da64de10ce5d960a9b35b5729c7ea07ec8a40b97f2707af935e57d2291201926dae8794e623a2f60095502a5b97709d3343bd95318ab832f3a5ca5 SHA512 4f8050f3f3a43363c9ee1b15c161d60deafd443a0e057b7960881870d10d1fe0214b885e77b404f03081eb27adfa337e3adea26ca238efac753fb949272f36d3
diff --git a/dev-db/percona-toolkit/files/percona-toolkit-3.0.7-fix-package-name.patch b/dev-db/percona-toolkit/files/percona-toolkit-3.0.7-fix-package-name.patch
deleted file mode 100644
index 4ca3ecf5fff0..000000000000
--- a/dev-db/percona-toolkit/files/percona-toolkit-3.0.7-fix-package-name.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.PL b/Makefile.PL
-index a2136634..2a0f587b 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -1,7 +1,7 @@
- use ExtUtils::MakeMaker;
- 
- WriteMakefile(
--    NAME      => 'percona-toolkit',
-+    NAME      => 'Percona::Toolkit',
-     VERSION   => '3.0.7',
-     EXE_FILES => [ <bin/*> ],
-     MAN1PODS  => {
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index d3609398655f..a1588bd21b01 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,9 +1,3 @@
-DIST pgadmin4-4.10.tar.gz 22809776 BLAKE2B 70a9857de31721b1cd5816b9e15abf325516f94ad5248f3ce5387cca5081ba96d7fca6c487265960ffac8d63c2fd09c3dea44d24a1cc9f8dbb170bd76d5de545 SHA512 b7f91d85fdc39766a294d9b66e8539f709b99f971726551d013345595161ff017e03505f05a41352575892be9d9622e86f4ccdbac76bcea435e2fb88a690b565
 DIST pgadmin4-4.13.tar.gz 25077107 BLAKE2B afbf0b6fba2f4cbbc1f47ac6c7867b7f131e5698de265a9dda53b79968f237ac591c5ff4da94dde0b74479cac1158ec825f42b14fc01aee13982043822c04443 SHA512 7eca41047e41f7bdce2dfe992260e8c2ab40f985dd232eb240ea9c0024f551f011653717aa0d5e4ccdccd4ef4936102cde1f97a32852d8382dcc222fadce7707
-DIST pgadmin4-4.5.tar.gz 22420769 BLAKE2B ae16e34c4cfce0ae78f06321ea1fc34aac0e081df4c0d5906fc4da0c82abb67e374477b8f9a9266d003579eb8887541e4224465ce6eccd86589129e1b3efff24 SHA512 835434612ac2a7ff89fab4c4bed89644e43506491ce12d2b74ffdbc25b33f2ac9ae566c95e886d4b4f8bca6499c40be5f0d776b18bfdcebd44d7ffe3b89deb5f
-DIST pgadmin4-4.8.tar.gz 22780924 BLAKE2B 7b64ef8ac3782e9c8207d5938f3638d67ddf5c86ca520afbfb296a824b39411362ca6e9d8b03920e35cca38d1303efe81750e5bfc849cfb363f370da3d25ac44 SHA512 68b35c1091435fbeb39e67c7f93038fcba95cd5ae7098434b5d3afee10595f875ef9fd997934f2bbd93c914bcd5c3c71bd43f032f788e55c5795f5ad63b57cd7
-EBUILD pgadmin4-4.10.ebuild 3559 BLAKE2B 4dadf2c0c44f091558cd0c510f4188842b7fa097ed91594c5ce3605d83f5a277a2f57a08bfe6165712520c2a2d2e4d6b1b9f141b86968cdc99326003e94aad9d SHA512 f6819b1183e57c6855d094bd4cc5bd9ba6073c55204f87f6a9542f117566550edabc6f76a506d26bfc142e5c1297dfc1dc298bb893f493d19738d0392c79bcc9
-EBUILD pgadmin4-4.13.ebuild 2822 BLAKE2B 6d36b16f3b9fdc5f8ee9d7e9479436184b8ecff6da1f92a9765246ff4841eeaadeaf849abcb8ae00022a93d5ff24669360dfb0a8dd017f34f678695b9e1aef35 SHA512 1547140af33afc93a29e9db4e3bb05d55c3510245057953adb68800b614243e125b6cab206ea18c6803e869dac55f92cae8280bc2914e6b9305f996b0bd2d0bb
-EBUILD pgadmin4-4.5.ebuild 3557 BLAKE2B d94690d8d884c26a070d5cd4a67c9aa79e308f5fa91f5f6d368193f9aeab733b5d176b8ae03c50251bbdb37cc0327504f2e78d06c125e90508f39e545cbb9739 SHA512 c9ed54b183053d0a93876fc8a7aa9565f36b6295fc437dfed965c76b2e9e3fc45b2b6739e841c340f44612bbdd8fe62b95ced938e7446559cf82e56a9bcd368e
-EBUILD pgadmin4-4.8.ebuild 3559 BLAKE2B 4dadf2c0c44f091558cd0c510f4188842b7fa097ed91594c5ce3605d83f5a277a2f57a08bfe6165712520c2a2d2e4d6b1b9f141b86968cdc99326003e94aad9d SHA512 f6819b1183e57c6855d094bd4cc5bd9ba6073c55204f87f6a9542f117566550edabc6f76a506d26bfc142e5c1297dfc1dc298bb893f493d19738d0392c79bcc9
+EBUILD pgadmin4-4.13.ebuild 2822 BLAKE2B 2d708614013f5b5dcd71241d07251290e6c9f56559c03cdb57b1783e1fd33b12f9a72d7a0d499fc3318e02c47b32afd92233ced2c934ad939551df4f7f3d9cdd SHA512 1b00e0a0cfa563839968991e9760c40144d8c49c5b875a4226eba7535f7ee4752b07d01bcccbdc7a6ffdded69b7acd87cf2704a0b08a754441d3fd2e8940a6b9
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-4.10.ebuild b/dev-db/pgadmin4/pgadmin4-4.10.ebuild
deleted file mode 100644
index 741c799eb200..000000000000
--- a/dev-db/pgadmin4/pgadmin4-4.10.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 qmake-utils
-
-DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="doc"
-
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/click-6.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.2.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.12.4[${PYTHON_USEDEP}]
-	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-htmlmin-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-migrate-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
-	>=dev-python/mimeparse-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.4.7[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2018.3[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.13.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.5[${PYTHON_USEDEP}]
-	>=dev-python/sshtunnel-0.1.3[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}"/${P}/runtime
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_compile() {
-	default
-	if use doc; then
-		cd "${WORKDIR}"/${P} || die
-		emake docs
-	fi
-}
-
-src_install() {
-	dobin pgAdmin4
-
-	cd "${WORKDIR}"/${P} || die
-
-	local APP_DIR=/usr/share/${PN}/web
-	insinto "${APP_DIR}"
-	doins -r web/*
-	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
-		SERVER_MODE = False
-		UPGRADE_CHECK_ENABLED = False
-	EOF
-	python_optimize "${D}${APP_DIR}"
-
-	local CONFIG_DIR="/etc/xdg/pgadmin"
-	dodir "${CONFIG_DIR}"
-	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
-		[General]
-		ApplicationPath=${APP_DIR}
-		PythonPath=$(python_get_sitedir)
-	EOF
-
-	if use doc; then
-		rm -r docs/en_US/_build/html/_sources || die
-		insinto /usr/share/${PN}/docs/en_US/_build
-		doins -r docs/en_US/_build/html
-	fi
-}
diff --git a/dev-db/pgadmin4/pgadmin4-4.13.ebuild b/dev-db/pgadmin4/pgadmin4-4.13.ebuild
index 52a65026ff9f..6672ccce0217 100644
--- a/dev-db/pgadmin4/pgadmin4-4.13.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="sqlite"
 
 inherit python-single-r1 qmake-utils
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.pgadmin.org/"
 SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
 
 LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-db/pgadmin4/pgadmin4-4.5.ebuild b/dev-db/pgadmin4/pgadmin4-4.5.ebuild
deleted file mode 100644
index 828b27ee6a0e..000000000000
--- a/dev-db/pgadmin4/pgadmin4-4.5.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 qmake-utils
-
-DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="doc"
-
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/click-6.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.2.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.12.4[${PYTHON_USEDEP}]
-	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-htmlmin-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-migrate-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
-	>=dev-python/mimeparse-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.4.7[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2018.3[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.13.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.5[${PYTHON_USEDEP}]
-	>=dev-python/sshtunnel-0.1.3[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}"/${P}/runtime
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_compile() {
-	default
-	if use doc; then
-		cd "${WORKDIR}"/${P} || die
-		emake docs
-	fi
-}
-
-src_install() {
-	dobin pgAdmin4
-
-	cd "${WORKDIR}"/${P} || die
-
-	local APP_DIR=/usr/share/${PN}/web
-	insinto "${APP_DIR}"
-	doins -r web/*
-	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
-		SERVER_MODE = False
-		UPGRADE_CHECK_ENABLED = False
-	EOF
-	python_optimize "${D}${APP_DIR}"
-
-	local CONFIG_DIR="/etc/xdg/pgadmin"
-	dodir "${CONFIG_DIR}"
-	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
-		[General]
-		ApplicationPath=${APP_DIR}
-		PythonPath=$(python_get_sitedir)
-	EOF
-
-	if use doc; then
-		rm -r docs/en_US/_build/html/_sources || die
-		insinto /usr/share/${PN}/docs/en_US/_build
-		doins -r docs/en_US/_build/html
-	fi
-}
diff --git a/dev-db/pgadmin4/pgadmin4-4.8.ebuild b/dev-db/pgadmin4/pgadmin4-4.8.ebuild
deleted file mode 100644
index 741c799eb200..000000000000
--- a/dev-db/pgadmin4/pgadmin4-4.8.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 qmake-utils
-
-DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="doc"
-
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/click-6.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.2.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.12.4[${PYTHON_USEDEP}]
-	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-htmlmin-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-migrate-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
-	>=dev-python/mimeparse-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.4.7[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2018.3[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.13.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.5[${PYTHON_USEDEP}]
-	>=dev-python/sshtunnel-0.1.3[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}"/${P}/runtime
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_compile() {
-	default
-	if use doc; then
-		cd "${WORKDIR}"/${P} || die
-		emake docs
-	fi
-}
-
-src_install() {
-	dobin pgAdmin4
-
-	cd "${WORKDIR}"/${P} || die
-
-	local APP_DIR=/usr/share/${PN}/web
-	insinto "${APP_DIR}"
-	doins -r web/*
-	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
-		SERVER_MODE = False
-		UPGRADE_CHECK_ENABLED = False
-	EOF
-	python_optimize "${D}${APP_DIR}"
-
-	local CONFIG_DIR="/etc/xdg/pgadmin"
-	dodir "${CONFIG_DIR}"
-	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
-		[General]
-		ApplicationPath=${APP_DIR}
-		PythonPath=$(python_get_sitedir)
-	EOF
-
-	if use doc; then
-		rm -r docs/en_US/_build/html/_sources || die
-		insinto /usr/share/${PN}/docs/en_US/_build
-		doins -r docs/en_US/_build/html
-	fi
-}
diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 0c8e7d167f8c..fbda2a1bf761 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -1,12 +1,15 @@
 AUX logrotate 119 BLAKE2B 7ed90c0272410e5a37411f78aaa446d1688ceb5a5a0cfa652f8ea3d043f693af2b963aaf18bb230ec4cd5ae34f09219f02b9ee0ca5b43fe61489f46aa7a8d505 SHA512 5aa4226ab2d168a88a3b64deb114d3901431d2afb2571cf8ae411c989549bc465ee05104a6863cc8fce6d769d809b4ab536973280f50cb4415c6698c34e1a5b8
 AUX pgbouncer-1.11-dirs.patch 461 BLAKE2B ed51cc404049c92f59f08b87a2a7402c7f70e5ee4a66bf6ce0c2ea02a29ebb07441833852d46b34f95461fe4fef6972945c8a7ed5c0f3c8e7024103645e84ae1 SHA512 b6c53cf6b4ec5fb4620dfd71033a96918d90440c964a745c7befb89cb797c6b5af1b5f2cfd3f454cf1479df48a9f459f8a50d60127eef404c38de2b2445555a3
+AUX pgbouncer-1.12-dirs.patch 804 BLAKE2B fba4fbc1a9c01b2d43f74719cbc4b285817c301ec7f0fbe1b59871d9121a507d35e8059f8d74f69645fd4dc25dac5c22bae2841cf8f3ad448ce3513b2e70d404 SHA512 5d3f9bae8789d9be376b897396ffabc94fd13fa50abad811abd9195f75cad46315465e90a843579552ba53bc17d2c53a52211c824de97b1905babd1e51cd35f7
 AUX pgbouncer-1.8-dirs.patch 984 BLAKE2B 0e9a3550efad0669e4598513197c50460326f701dae628ae8c9fb201e08ae3f0c5826515c6a884a00f2b0afd048490b16d87f9b3b9cf836ca4c77284cd705334 SHA512 2c9ddd2ae193b032435f97d41e789283ae69d99fefeb3829e80a90be296ccd2a754a9d00e6930985408758dfa3349d65f3c2ddf1f74053424bc8d8d09b2fa0e2
 AUX pgbouncer.confd-r1 457 BLAKE2B 0b2e33b57ee33eac42742a8f9fe7c0f090bad53c5d7c29d86fd3047307bd05d62f922fc66a0805ba3396934f6e2e7060f810f1c71c5b07d887edf2763cc0f40d SHA512 0642b12236e944b6b5086b593dfd4a5d7c04c8347fc286835381945a50a421e87805900d63d84d12dcb1fad667fc81f21c8644c63af33388a71048ec6e024ab5
 AUX pgbouncer.initd-r2 2204 BLAKE2B 9c417188d4a762906c7631f1ae8fc7c7b8f6c52805acf6bfc12d580c53b2faa4e36b7c0662852feaf78aebcc29498bb8ae441d749a710793508c6950a448862f SHA512 dd9e8f7487affcc46b359e6d07a4c2fd698626d7360d2b2929389bbd7a340059eb27f0e0e9a648b7005c446d65762edbb02b865fa68194ebb822c01fba19fd7e
 DIST pgbouncer-1.10.0.tar.gz 480571 BLAKE2B a0c1dadc48f38cfe0ba2641791b4734da84cfe6674198bb2a8014bc92543850e909d7b4649b99e78d58febaa0f89f62b6694f6333b1111cbd62ff2f22741984d SHA512 8ec9f102b57ca5f92fb689588ec090056ac29f21825400ec67bca413fe076ad50e0b491e65c4cfebc488cc245eb3c88c36db2ee0ba1cb737f35404be0983dd1d
 DIST pgbouncer-1.11.0.tar.gz 571414 BLAKE2B 044d7cdf57b352b5b87547a8b96af1eca87e46b1f761bbd31d28a0d5158b52e438325db051ab51849f4e683f6211d0156a5081cc99a1109846085c84be7f72a6 SHA512 2373157f952a39dbb5d9afad7db2eba7459c28bcc302487c3bf15b64dca98940f65c9f7a1d142237f7053b6d2b290eaec15f930a341025f1665b501a26919115
+DIST pgbouncer-1.12.0.tar.gz 567465 BLAKE2B 866a877478a417b3854e6e2a724fcd06c04bd94893e5d79f8bf250fa9391407c5b7cd00bf2771af18b162dfd2b7bdced00be15c44ba74cf842e3d98c561991e3 SHA512 017d150f865df231861cda4678963ad7e63a0cd238f5ece5679c920484e01c53ab27af63bf47e6227d66b7dc94b4d59ca41ac49c26f60aba74d40b43cad55664
 DIST pgbouncer-1.9.0.tar.gz 469300 BLAKE2B 466f171a49ec9ce9be9a9d3208780cfbff956da7c74ec4332c7104ea537cb47a5cfdc0d80bbd96d233769b6f430f1ad99b623caefa2dc93af7ba336dd0f49514 SHA512 b127f4cb60ca5cdf339da76727918f0a3797a3e0a89f8ed6fdcaa80f3391d2c5bb51e19731915775210c0e5070dd611ee2e410c9a947624e45b5cf11aecdacf9
 EBUILD pgbouncer-1.10.0.ebuild 1890 BLAKE2B 3040ae1502615e4b2dbc4a4e0baf503908eb97d53c94b98188edfe7916b3e9dfbac3d4ed74ad583cf36532260c0ebb12fbf0d5fee45c7efbb257720655ddb8de SHA512 4eb12a8791b02fa1ed0b0ab941194fb713a8b83a7d18e1d090a0603d29d2e37572725cc050764239749bc53b2b4a64bf044fa32ad08f9056fffc81144ca79d7b
 EBUILD pgbouncer-1.11.0.ebuild 1893 BLAKE2B 09413b8c746ab8833746f83a8208386af799b260fdb314952222bdd5d148d400071d52e767b0f15e24de5533012e736b5230c234a7793ec357ec1f1bb68ef860 SHA512 51770bcb96830e2a3e7c29dd97cfda8bdaaa3f18ef3b485ea225d5411e3cd505b6875855b85c17dc1065fff6a10a286ce35f3ba25be92983dbd9c050fa871e91
+EBUILD pgbouncer-1.12.0.ebuild 1991 BLAKE2B 1e33ac46c7956c9d3ba5a733de9f90bce9cf985e1a276f9db7fc4eee252388914f84f9742494967afb8b0c854280d23fe6c0e5a28f348ce8777899673f7421c9 SHA512 da63c5f25cfd248dd434cbcc0ebcda0629ceaf6eaa5a656f925e1980bb3cec80f3f84e0cee9185c3769f6d3746dd15fed40c04a2e943fb03b371f23e33b7bce4
 EBUILD pgbouncer-1.9.0.ebuild 1893 BLAKE2B be596d0ec72a92b9c4351de0e9ff04b5f5f12e4c53684c12aec583e577ff20729f015890394e7ebeabdbf97ef84bcf6e4bad114b84c59e2ab07bd4ecd73c1013 SHA512 b65617a84baa28abb9c207f1a0567d9267cb936823539d908dcde9735fbb66d3b2619386e74fa8f4222cbba7b09227b03f3d9c2ec2abdfe21316110941a7c56e
 MISC metadata.xml 472 BLAKE2B b06a5dca1ee52c85fa1f948c4c8cf6e83c0aba3e0b0bd77672f1585c01d0a2f8ef4d7502e30e9cb658ec3dd3e53560671b69210166c36b4ce888e329f531585b SHA512 b098e87be6194706f462bb93c4bf5425023f7bd90a0ed421a51ea42db98c85ebd77f23eb413f4e271e126ad4404cd0bdf0694f675662c421f7afd8ec0f036b4d
diff --git a/dev-db/pgbouncer/files/pgbouncer-1.12-dirs.patch b/dev-db/pgbouncer/files/pgbouncer-1.12-dirs.patch
new file mode 100644
index 000000000000..29d63d875fbc
--- /dev/null
+++ b/dev-db/pgbouncer/files/pgbouncer-1.12-dirs.patch
@@ -0,0 +1,31 @@
+--- a/etc/pgbouncer.ini
++++ b/etc/pgbouncer.ini
+@@ -43,7 +43,9 @@
+ ;;;
+ 
+ logfile = /var/log/pgbouncer/pgbouncer.log
+-pidfile = /var/run/pgbouncer/pgbouncer.pid
++
++; Leave unset. This is handled in the initscript.
++;pidfile =
+ 
+ ;;;
+ ;;; Where to wait for clients
+@@ -53,11 +55,12 @@
+ listen_addr = 127.0.0.1
+ listen_port = 6432
+ 
+-;; Unix socket is also used for -R.
+-;; On Debian it should be /var/run/postgresql
+-;unix_socket_dir = /tmp
+-;unix_socket_mode = 0777
+-;unix_socket_group =
++; Unix socket is also used for -R (online restart), but the
++; initscripts can't do that. Generally, you'll want to leave these
++; alone. System-wide default is: /run/postgresql
++unix_socket_dir = /run/postgresql
++unix_socket_mode = 0777
++unix_socket_group = postgres
+ 
+ ;;;
+ ;;; TLS settings for accepting clients
diff --git a/dev-db/pgbouncer/files/pgbouncer.initd-r2 b/dev-db/pgbouncer/files/pgbouncer.initd-r2
index 72e0103e0b5d..72e0103e0b5d 100755..100644
--- a/dev-db/pgbouncer/files/pgbouncer.initd-r2
+++ b/dev-db/pgbouncer/files/pgbouncer.initd-r2
diff --git a/dev-db/pgbouncer/pgbouncer-1.12.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.12.0.ebuild
new file mode 100644
index 000000000000..5d41644f4c44
--- /dev/null
+++ b/dev-db/pgbouncer/pgbouncer-1.12.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user
+
+DESCRIPTION="Lightweight connection pooler for PostgreSQL"
+HOMEPAGE="https://www.pgbouncer.org/"
+SRC_URI="https://www.pgbouncer.org/downloads/files/${PV}/pgbouncer-${PV}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+c-ares debug doc pam ssl -udns"
+
+# At-most-one-of, one can be enabled but not both
+REQUIRED_USE="?? ( c-ares udns )"
+
+RDEPEND="
+	>=dev-libs/libevent-2.0
+	>=sys-libs/glibc-2.10
+	c-ares? ( >=net-dns/c-ares-1.10 )
+	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] )
+	udns? ( >=net-libs/udns-0.1 )
+"
+
+DEPEND="${RDEPEND}"
+
+# Tests require a local database server, wants to fiddle with iptables,
+# and doesn't support override. things.
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	enewuser pgbouncer -1 -1 -1 postgres
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/pgbouncer-1.12-dirs.patch
+
+	default
+}
+
+src_configure() {
+	# --enable-debug is only used to disable stripping
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--enable-debug \
+		$(use_with c-ares cares) \
+		$(use_enable debug cassert) \
+		$(use_with pam) \
+		$(use_with ssl openssl) \
+		$(use_with udns)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS
+	use doc && dodoc doc/*.rst
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
+
+	insinto /etc
+	doins etc/pgbouncer.ini
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" pgbouncer
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		einfo "Please read the config.txt for Configuration Directives"
+		einfo
+		einfo "For Administration Commands, see:"
+		einfo "    man pgbouncer"
+		einfo
+		einfo "By default, PgBouncer does not have access to any database."
+		einfo "GRANT the permissions needed for your application and make sure that it"
+		einfo "exists in PgBouncer's auth_file."
+	fi
+}
diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest
index 760110bd214c..dd4befcb067a 100644
--- a/dev-db/pgcli/Manifest
+++ b/dev-db/pgcli/Manifest
@@ -1,3 +1,5 @@
 DIST pgcli-2.0.2.tar.gz 432325 BLAKE2B 5cbe2be05910d9bfa64e7ac908d636a39ed11f994e0e81cd06afce97510e02be335837b2587653df716beee0d30076f07489ac8e4fb05fbc579bceee8636a470 SHA512 5681effcb36101ce408f7c4dcc881984686d63a6e593bd4f5c2bb3b2d870362c787094895ece027a3ba27d3a4524498b27082da0f25b1b77f23e54b2df6c0501
+DIST pgcli-2.2.0.tar.gz 436991 BLAKE2B 9041240952a8ba9a770705850bf4281eaa89ac5b970366c7ec27e705bec65d9c3c455fb2c9d2220d53f4a9ff31142501437faa6974839f6fe59e6fc1618d8a6d SHA512 239a3278b604248b7bd5cdaf4d0b0f3e62188617b04c358d123e2fa2ad1449c3854ef84995b89239fcf559ce010ee0dd80e12ddd72b27dcb89f92ac08d34c49b
 EBUILD pgcli-2.0.2.ebuild 1176 BLAKE2B 8c11a8118c535c0d578a781863f63b4235d08f39009aa1d0d99bf3991d829e9af31e112cefc6fe4104cdfa3c00c6b951bac945f3d7817f57a4a4f5a70cb1084e SHA512 37d8ad2eb1ab7ab509b20726e2534856def0474c730f4a7ee2c694c7854c1941519f1314b294685e3bd24ab2687931ab555a77190e756ce2be629bd4b5d5d662
+EBUILD pgcli-2.2.0.ebuild 1243 BLAKE2B 8767b42b667b700e4413ff264115d6d961c542d666a8813b61bda432e363b0ecea84d6c0d28ea1cf9cf3bab7de524898f0657de417429ba3284f6703c9145adf SHA512 95fda971e09f9a98ac2eea284b69693f8f233762b94414226fe379be5d2a3f0dbeef0eef9c242c55f296827c2850e91d6d1b789b2b0ca07470b20df2e9bcee95
 MISC metadata.xml 463 BLAKE2B 10d06fec98bb18e1a546d7d87eba57353797600a2d11ad02980a4b8cff329821bedc3da990d5f9e0d5fa453ae3876de314c8c74cc09c97d567fcd8e4bbac1195 SHA512 44fc53f5a20d0c64bdbd8605feb964c1d345e471f589d8eed347b2ca632fb2a61ea511eff4e03c4fce3790721b47ef1b701a37e964941651ff1d7b77e587eed5
diff --git a/dev-db/pgcli/pgcli-2.2.0.ebuild b/dev-db/pgcli/pgcli-2.2.0.ebuild
new file mode 100644
index 000000000000..d651e872230d
--- /dev/null
+++ b/dev-db/pgcli/pgcli-2.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="CLI for Postgres with auto-completion and syntax highlighting"
+HOMEPAGE="https://www.pgcli.com https://github.com/dbcli/pgcli"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/prompt_toolkit-2.0.6[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/python-sqlparse-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cli_helpers-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/humanize-0.5.1[${PYTHON_USEDEP}]
+	>=dev-python/pgspecial-1.11.8[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/setproctitle-1.1.9[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	test? (
+		dev-db/postgresql
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+# there is a flaky test, so no tests for now
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-db/pgxnclient/Manifest b/dev-db/pgxnclient/Manifest
index 036daca1b096..5cc6da6bd293 100644
--- a/dev-db/pgxnclient/Manifest
+++ b/dev-db/pgxnclient/Manifest
@@ -1,5 +1,5 @@
 DIST pgxnclient-1.2.1.tar.gz 87275 BLAKE2B 794ee6201988ba523cdcb4ee5a6287625cb3dd8a30ad750266d7adb739792b7f8e852d5d01f746fb6b05b54c98d677854dceacc57e41b05efba094efabc6a129 SHA512 3fa864b1ebb5dedaf75515b5efe4c453f02acff558f7b82d2648da62e58c93e050049a7688171a69593784d9963bb62f4ad3674d526284554dbeb4f4a4ea1dbf
 DIST pgxnclient-1.2.tar.gz 86436 BLAKE2B 796191d31000ff75360e0990bb20ca88af0fb1b908aac9ca7a6b7309b5420c56d045a67c775e8d5dda166f37ad956314f65bd2032c114cac7414bef9ad1a0d8e SHA512 d677f8d5346caf4de5d7e0d4e4031b8bdd932e343af7fc33e8895ebe51b1e9e6a11d7300d9e98ddc10242854f7d39c0a4196f41938e42f0b0e5158454e386deb
-EBUILD pgxnclient-1.2-r1.ebuild 760 BLAKE2B 59dfce779f0bf10bb332c22ad9b0aaff281579816d2dcfa8816ce7ba7228ab430aa93be676ebf1cde926cc167adada1e3fd8d11abc5bb4fe425162e04c06b260 SHA512 58a18bad140cebd74ddb00b93c4727153433fbd42fe9eac4c50ff0b5e844e07a22001fc05808c94130a370892d9b5e8139cfc546531aa5284d485ea65d5bd9cf
-EBUILD pgxnclient-1.2.1.ebuild 770 BLAKE2B 5c87340f680ecefd01dfbe7fd384134dd9b2e273f76033319f044359a36ce824e40cfc961eb0349b7d5401872dc0bfc72bd1d9ed9d9e0ff5399213e10e3bd614 SHA512 474a22ed60fd336b865ba59cc6039a500c7f96a88e5a0a180fbd052101f9f6a863106c05c484f2dcdeabbac7648baabff08c715d61a845be92f25e3339d00191
+EBUILD pgxnclient-1.2-r1.ebuild 787 BLAKE2B 2eb540090cf46a1c14d41fb178b8da3bc58dec943521a90238d777db1bb3d1bf1a0c6a7031540c50f34e55571c82565c39b2161f55bdb4d2d1133b10c3582acd SHA512 203fb6df4c23c8e940118a1ac45a596b940a2f095dd396bd178ae0c9fde1d7d97e83194cb40cb92fddb971b118bb87981ebcb5074cfa3ef41652e61444857fc7
+EBUILD pgxnclient-1.2.1.ebuild 797 BLAKE2B 9500c08221100f9599d6f12bfd668788926a747bb71cde4edc2f96c0da02060e120ca4bc8ab54653137daf498570011819ebdb2d807b13e36ebf92b4c7ce5ba2 SHA512 9c2f28104d81830c3d1e6e683ce4fe56789124b49159a28e2f7493dea27b567d23712ad58d1fa0b1df267d6046bebc978d364fbb448be29b2513dedbda180507
 MISC metadata.xml 477 BLAKE2B 69bcece85da5b9490a5aec5f94264a420d5babb983d602188b4bcad58f35da663216bb52e694009562e518b716a12b05734a2ee81a1219d93641268630a68e3b SHA512 63a1019650d2bfec1f0dab904cabd0de847f5d7cb5ad62dd04ca93a6cf7c25ef2a727a8dc0700a00958b841f7ffaa2c99f608b4cb1872a31a1dc920d0834d22d
diff --git a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
index 77102652e494..679315dda916 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-db/postgresql-9.1[server]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
index b5aa655a650d..00235521e841 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-db/postgresql-9.1[server]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 0983b7e2b2e7..99b259759835 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en-3.1.txt 1160 BLAKE2B 0aa21601490830f93a784c1a3c09b90986d606d0086b128b37d6598c946e9ebe43f575f12ca5ee571db8520841a2c08624b567b721567d26ee02e1e3c4c9124e SHA512 7b50ab9f9e3a828bd9bff600550ea97712c28804467ab5900a52710d4adb0581fe33155a965dd3956fcd36cc153b1a18a1f001d88ac52d70c8288faf695f01ec
-DIST phpMyAdmin-4.9.1-all-languages.tar.xz 6146368 BLAKE2B d0a4fdb9bd995f807a0f88c3572f67ddd1df090817b4d32606025b6e7d08c6e05fbcbbc9b3b7edbe5492345c45c454797c9ba0f59498fe5e01d0979148c070ad SHA512 c2804bdb9d8501309e46d66fe4c27c3618de9cbd440928bf6335b3623a7e71608bb02fda17c5f1715b0cb32ecd68e2bbca86565f240b138c3630084225c56f83
-EBUILD phpmyadmin-4.9.1.ebuild 1549 BLAKE2B b96266f912847f284ee83fceb9efdba192c44e468b3ddd83f3a84b06eb8b65bdc98ed0b24031254687fd3c854c481d704a7cfad1f00c15ec5db1d4c2fd1a43ac SHA512 35bcc8a96bdbdc175e7023a6dc27738544bdac67b4c616697ba9264395ded71093b5fcdb1bf927974ebc94b28e144c5c15a2bd6960e9fdfe016c97a6a5ce88fe
+DIST phpMyAdmin-4.9.2-all-languages.tar.xz 6118472 BLAKE2B 07093982aebf83017a1773a1cd1acac8b7a4cc9bf666f7c62fdef4b3b46441f5ee1da37746610b0ed6b92a67296d908dbf24ba1ea546c1b573c3593a02b90088 SHA512 426689c31f963a9cbe34b2116888aa0264801aa5ef18fb0e4b89811b032d4018c770538e823bccb684fb066ed27fcf6dc6e0fb4198d1e082e7eea15595b67727
+EBUILD phpmyadmin-4.9.2.ebuild 1542 BLAKE2B d5a89c66b89c72c8989da4e7d1bf6f749c9f5d3dc763460c01dbbe84abade5422b50978f0d20064a92d2dea8cfeb7db5ef0b6532c19cac5f7fddd9fe72cfa55f SHA512 9994be872214e99297337c8b8dc3235806d2acf440e7c80cd11b95debfe6e1c9b23c8fbc224bc36083d575338361d6bd0f1919467a7e2e45be0ff880189bab4a
 MISC metadata.xml 701 BLAKE2B aef0a047bca31221714bf27203bd720863c5cef6b7b4dd72b441761a0638bca38c03610e65b3819ca0fba6577973908d7ca40ec8baa3aac1255d19b7cfa9f0a7 SHA512 6dcb099779cd0db4928ee812c81fee762612846044e6ee3df3b661a2dce6aed01420d0bc1301c8ff9d763fb8aeaeef3290a7889b32705fc48e8c392aa8b8ca82
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.9.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.9.2.ebuild
index fbece53dcc9b..1bf18d49625f 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.9.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.9.2.ebuild
@@ -37,7 +37,7 @@ pkg_setup() {
 src_install() {
 	webapp_src_preinst
 
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
+	dodoc README RELEASE-DATE-${MY_PV} ChangeLog
 	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
 
 	if ! use setup; then
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 3ccc3726dbe4..d02be8cad6b4 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -24,13 +24,13 @@ DIST redis-4.0.2.tar.gz 1713990 BLAKE2B 307ab76b336f7520e14a23a1577c46e1b63cc5a5
 DIST redis-5.0.3.tar.gz 1959445 BLAKE2B d1c3247d77aa3b1076d0e1a0dcce74dcfb14a0ad3776603ef8154d7868f9f3efcf2138cb08581eee1974e9d76658d07456d6e9795391321b1f1f8bca7f9d40f5 SHA512 5915b14502438bf7c3f56e38640dda54b095bd87501aefa6e386c9cef48e8d1e625e980643d128d91b8cab26dd51d5d99ca66fa638dc04e5ba315fe43f11f58b
 DIST redis-5.0.4.tar.gz 1966337 BLAKE2B 9195e970d7c987c2540da3a89f4fc33620f6a45ed243fa24715fe20f174d5e569e5ff940834176b3f26b13d9cca95f1d2914d65ad71f295787553c6bb8552089 SHA512 336929c81a476e2a23a64f867823d70c3aab66fb0098eef2e61630be6522ff2f6af680169ffcae35d559758b2c6b56f88c5a953a538291fea886449cba33b8ad
 DIST redis-5.0.5.tar.gz 1975750 BLAKE2B 3a0463685ae30f9d38e96d7324ae624474f02311e22e186460834920babc35ff343d84e8cb78a2cee0d45d9ba1c01944c783c88892b6580d83bc1cdec64a3e94 SHA512 78215ec02b7184e05788c7a368146ea53095a877a0e09174b4c9f175aeb9ba9174023c19e33bf62e4513b848e1841538d398e7c0a651c5c947255c1691cb4586
-EBUILD redis-4.0.10.ebuild 4069 BLAKE2B 33bf7fbd67db2035d3bdc92f01f1252c9a27a1a3c736f555d21c6670920e03057b30bc51594898414dc5a18312c1af5f74f01b86ede936025cb44d6f0e478855 SHA512 52c9a38d8823fa87ddb8aea6db611bf43b0e3543eddb275a991da075095e27758de2f5456685a01eb79e3166a642a38256cd95f75d5cf7b1a432dcb3af29f671
-EBUILD redis-4.0.11.ebuild 4074 BLAKE2B 609631167471b07d3caccad80d601e4d73a594a97979b25f828c171c341f2f8d24c12e2399ad81b8952e5f459f0a340726a4e8ee69a1f51b0626b52d18e7ce3c SHA512 86c003235c630c87a551b31f359a5fe824d7114016f22788cf8dc84dec56d5bea24c3fdbc86efd15734ccb636394bb6fc4f4d757566ac857605fa23c841db4d4
-EBUILD redis-4.0.12.ebuild 4071 BLAKE2B 712cefef53f55c9e60a1461a5bc843866fdf60815ecb42675b929b6b4fdd98dc270fa3544e6739ce22616f5f5a15efac7ecb4f78a910271bb15acaeacde07516 SHA512 2df15597298b24a7c2f317ce52d9efdb810a558da8f40902cda5865e43a8f59d699f0c92f025bfdfae183ac6b019eb0ad130a745ace48d8865a9642c0bacd7c1
-EBUILD redis-4.0.13.ebuild 4071 BLAKE2B ce447abe1db2a9bf75fb506cb910a0906447ddd64d251907a4a4fce753189c41c7b42938a97f716169eae19d1868440bdc4b993b937dc896124f025df0453a85 SHA512 40b346d0d67fdc1f8fa5d80b3c502230b78a59ec9a2242e87c0091bd18ae33a76904ab1ccff4a197b867a7a3bdfd6d7462db93b127f59f628aa01e1bce3b098e
-EBUILD redis-4.0.14.ebuild 4614 BLAKE2B b25502b39a4abb1276942381c28a3f374ef0de996f5f3ff9da1b7eb6ec21c57511dca22d335528a4a37f701fe59f76689a3148c326ae59a9f22c9bf8d9c1ca00 SHA512 2456153a26f727f7af0095e44e3e5295f51115a2cb2584eced4299938e072ec2f12a49f979916314609ffdd0850936c419fadc3587ac65782be34a2b8523243c
-EBUILD redis-4.0.2-r1.ebuild 3807 BLAKE2B 7dbd27ad7593b53f1f7184321ba33f140072ef946859b33cf8dacf7eb98c9d7398c512ce403132bf3b9fece12e73cc0e4dd5cca1dbc220d50dea105ea87ef774 SHA512 d7744c01cbf4b6f1fec17ce7733a31f4deb3e925afbafb3a9aaa360d9598aff78b44c3bcadc54e82c809ff6ba0211e475d32f96ec4244f6081e3f5cfde1b1daa
-EBUILD redis-5.0.3.ebuild 4559 BLAKE2B c7c725eb0117a509f8e56c8d57bbf64cc1970e6e90819f284cd3b5c982a3400d53be7dd3c3552001dffd6ef6440d8164ccb3b2a4e76613388a4b50e541e9eb2a SHA512 36ddfc7f091e48daee3b7c3ff7230a6b1137fd143a40c861597699071941262b1d7575c1141c1fa0783df0f09a42381112d77a88e6d16d10fb712b218a50ae6d
-EBUILD redis-5.0.4.ebuild 4616 BLAKE2B 92c18f4d7d8be03e6d238966d585e29c65643fdb4ba2067c80615105e688518e78ef6d8383be6c8c777b598317b7223a427859a0cbd63c9dfefcf8962503535b SHA512 e14d9c0c1195ad474fcdea771f2ebc6dc1e8bbac00888fe842800ee926e0a0c9056d98f31f5c44b41bc3215af5ac029ec0c3057f3ce68da2bc72877b15d5e969
-EBUILD redis-5.0.5.ebuild 4616 BLAKE2B 92c18f4d7d8be03e6d238966d585e29c65643fdb4ba2067c80615105e688518e78ef6d8383be6c8c777b598317b7223a427859a0cbd63c9dfefcf8962503535b SHA512 e14d9c0c1195ad474fcdea771f2ebc6dc1e8bbac00888fe842800ee926e0a0c9056d98f31f5c44b41bc3215af5ac029ec0c3057f3ce68da2bc72877b15d5e969
+EBUILD redis-4.0.10.ebuild 4093 BLAKE2B ec853cec4f47ca34b1690ce1e93eb6014db3d8e313ce4097f2c6d958ac46d36fe46d7e1090ab00f6e784feaea0b88dd015a7816f2b0ef26f3686c255bed18f02 SHA512 e0b4724ca37886afd6b7f237bc5ecf56ce8e26cf7410738534e79da8f5a555411ff8b25efa6c6666ab1fa021a4c411fca1d7a3253aaa87842f2808c1dcd29f3a
+EBUILD redis-4.0.11.ebuild 4098 BLAKE2B 3e4158443ae025ba8c24864ad13f37ec34449eabb9527a5d74d0c6e4e0b248dfd71391a89989724039b9593aa82632b157250a776a0beb7e5a01f2020dcb1506 SHA512 377f0562a8f64c5995bd1ab6b29822852e473daaa8006db724dcf0df48559e8e5eb8e4c75bebff6e7bc80d5ee987484375f03f39f23d3d8ade57deb906dfa882
+EBUILD redis-4.0.12.ebuild 4098 BLAKE2B 3e4158443ae025ba8c24864ad13f37ec34449eabb9527a5d74d0c6e4e0b248dfd71391a89989724039b9593aa82632b157250a776a0beb7e5a01f2020dcb1506 SHA512 377f0562a8f64c5995bd1ab6b29822852e473daaa8006db724dcf0df48559e8e5eb8e4c75bebff6e7bc80d5ee987484375f03f39f23d3d8ade57deb906dfa882
+EBUILD redis-4.0.13.ebuild 4098 BLAKE2B 3e4158443ae025ba8c24864ad13f37ec34449eabb9527a5d74d0c6e4e0b248dfd71391a89989724039b9593aa82632b157250a776a0beb7e5a01f2020dcb1506 SHA512 377f0562a8f64c5995bd1ab6b29822852e473daaa8006db724dcf0df48559e8e5eb8e4c75bebff6e7bc80d5ee987484375f03f39f23d3d8ade57deb906dfa882
+EBUILD redis-4.0.14.ebuild 4641 BLAKE2B 970a3440789c6bc964339b0de7df7c7882a492e259e503a65f0182aa77c7e54b2d477903f623dda0f1526de8e9985075a658a2050952484a3070a04ddfa49c60 SHA512 0ec94984ce74d537d13028d64d1a503f7de7cd5514f25a57d89872e6389a69d8cc747e1e9448f13e8395faed6e7d733c5183174029cb10af8d7b27320c659670
+EBUILD redis-4.0.2-r1.ebuild 3831 BLAKE2B aac2861849f335334acf0efec4277da58268ab76da7f1258c7a2da9c455411c07e0fed1c60873ce896ee95e6457f9f94ae0b7fa4035bc9bf7c3b5fa002671782 SHA512 e7728e0c6958d5ff2039513d919efea3d9edbf272f2e56aa5a6df9610079a5c70a3cefd1850894519042dec877c65775f7b04c02a8002aaf0d3dd5bed3e38c04
+EBUILD redis-5.0.3.ebuild 4586 BLAKE2B f1732190f4e7e235130eaf70ca15962e206ecc95d0404e409cfd9daf6e23918b2c0ada1064cce16b8520c43caf59a8b1b1162cbc8e529dd12c2421e63a776a88 SHA512 d54f410b4bd0c3f0a97e281dd9320c4ee2050ff988763782379291c7e3c85b25290376db45b87b294c0e16000d27378d8a6d850caed9fb2ef455b75107bb4c78
+EBUILD redis-5.0.4.ebuild 4643 BLAKE2B 97b14d1e266889a7cceef8ffc8e23ad64a45118a7845a404f13b0b40ce25bfe4298b3f9ade9679fb37958505a386ba4f60bfc28b4118fcb864148dc9e16206b5 SHA512 1371edf66967441555392448ccfe1671dad3535468160ec8797e480088c9b19b64ad0df9fd79fc5845ee180b2c58f8c7a0119f721c25e7c40424851ef31f49f1
+EBUILD redis-5.0.5.ebuild 4643 BLAKE2B 97b14d1e266889a7cceef8ffc8e23ad64a45118a7845a404f13b0b40ce25bfe4298b3f9ade9679fb37958505a386ba4f60bfc28b4118fcb864148dc9e16206b5 SHA512 1371edf66967441555392448ccfe1671dad3535468160ec8797e480088c9b19b64ad0df9fd79fc5845ee180b2c58f8c7a0119f721c25e7c40424851ef31f49f1
 MISC metadata.xml 356 BLAKE2B 19e27b12be84927b990fc2f481d8dd1f88f05b5e029fdd91c7ce9517e7fd378d6e1df1eb55052a04fefe781da09b371da1c28fd269c72f4222aa896897222bf7 SHA512 ab06f694c5b20072f40e85b3a8e05d2c333f3b29fc145733fde1e3f42ea78ac7c51550afc29e671ef9b4a163597ac9f44bc182344c18db52036595e5d65f7e22
diff --git a/dev-db/redis/redis-4.0.10.ebuild b/dev-db/redis/redis-4.0.10.ebuild
index 0062f6313ebb..be27d0c369e6 100644
--- a/dev-db/redis/redis-4.0.10.ebuild
+++ b/dev-db/redis/redis-4.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 # Redis does NOT build with Lua 5.2 or newer at this time.
diff --git a/dev-db/redis/redis-4.0.11.ebuild b/dev-db/redis/redis-4.0.11.ebuild
index a8d59c405e63..ee9220186854 100644
--- a/dev-db/redis/redis-4.0.11.ebuild
+++ b/dev-db/redis/redis-4.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 # Redis does NOT build with Lua 5.2 or newer at this time.
diff --git a/dev-db/redis/redis-4.0.12.ebuild b/dev-db/redis/redis-4.0.12.ebuild
index 596754bc3a07..ee9220186854 100644
--- a/dev-db/redis/redis-4.0.12.ebuild
+++ b/dev-db/redis/redis-4.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 # Redis does NOT build with Lua 5.2 or newer at this time.
diff --git a/dev-db/redis/redis-4.0.13.ebuild b/dev-db/redis/redis-4.0.13.ebuild
index a1d588da3ae0..ee9220186854 100644
--- a/dev-db/redis/redis-4.0.13.ebuild
+++ b/dev-db/redis/redis-4.0.13.ebuild
@@ -12,6 +12,7 @@ SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 # Redis does NOT build with Lua 5.2 or newer at this time.
diff --git a/dev-db/redis/redis-4.0.14.ebuild b/dev-db/redis/redis-4.0.14.ebuild
index cc327916f83f..5ca8d4bae3db 100644
--- a/dev-db/redis/redis-4.0.14.ebuild
+++ b/dev-db/redis/redis-4.0.14.ebuild
@@ -12,6 +12,7 @@ SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="amd64 arm arm64 hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 # Redis does NOT build with Lua 5.2 or newer at this time.
diff --git a/dev-db/redis/redis-4.0.2-r1.ebuild b/dev-db/redis/redis-4.0.2-r1.ebuild
index dd90a7deb368..510cd9b08c0d 100644
--- a/dev-db/redis/redis-4.0.2-r1.ebuild
+++ b/dev-db/redis/redis-4.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 # Redis does NOT build with Lua 5.2 or newer at this time.
diff --git a/dev-db/redis/redis-5.0.3.ebuild b/dev-db/redis/redis-5.0.3.ebuild
index c584f33c21fc..c40f7c3c47cd 100644
--- a/dev-db/redis/redis-5.0.3.ebuild
+++ b/dev-db/redis/redis-5.0.3.ebuild
@@ -12,6 +12,7 @@ SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 # Redis does NOT build with Lua 5.2 or newer at this time.
diff --git a/dev-db/redis/redis-5.0.4.ebuild b/dev-db/redis/redis-5.0.4.ebuild
index 07c6466e9a12..1b0f17be18b6 100644
--- a/dev-db/redis/redis-5.0.4.ebuild
+++ b/dev-db/redis/redis-5.0.4.ebuild
@@ -12,6 +12,7 @@ SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 # Redis does NOT build with Lua 5.2 or newer at this time.
diff --git a/dev-db/redis/redis-5.0.5.ebuild b/dev-db/redis/redis-5.0.5.ebuild
index 07c6466e9a12..1b0f17be18b6 100644
--- a/dev-db/redis/redis-5.0.5.ebuild
+++ b/dev-db/redis/redis-5.0.5.ebuild
@@ -12,6 +12,7 @@ SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 # Redis does NOT build with Lua 5.2 or newer at this time.
diff --git a/dev-db/rqlite/Manifest b/dev-db/rqlite/Manifest
index 1372154c493d..58f47deff036 100644
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@@ -1,17 +1,32 @@
 DIST github.com-Bowery-prompt-972d0ceb96f55132a1ba9714cb771ce19b3821ab.tar.gz 11492 BLAKE2B 849b1019fffb514230bd57ab18403894dd8d87528fe24ac0f5b2b1609af8ac35819c9f9f82d4109bd82e38a7674c07beed597d0f9607b0792bee1861bec030d8 SHA512 7c17b436eb8661669646a96d72ea9164949ad28843dbe56387b8960e63245ed353d03120066eb00ef9811501fa25bfddccb979ffceab099380ea71adc4369ade
+DIST github.com-Bowery-prompt-fa8279994f75f982bdae3c827a3afffd78a6fe0d.tar.gz 11507 BLAKE2B 65e575ca929f642dc583ef8b7857437ef35a1f4f8a00d978e62187d7c8e781ec50f102c35f8c62f8bbe41c9ce6bd0347aaf017a5fa727d37e9124fa691e04d9f SHA512 6096c29ecc0adf02bb563c5b92f79a7d57b0d028f332cf5cd214317918a19618b394be88a5acab86c561c13994f6bdda94c80cd67f28cb87ac371097664ff0f0
 DIST github.com-armon-go-metrics-2801d9688273d5b516966851b9a0863b9e6b0652.tar.gz 26971 BLAKE2B b20592f843325543028b509a55e0bc61612fd6584dd0fc43ce6621b5f73c3671688a67c997adddc83970c09a713d174da7e286b49b918f6a80d723fc76e006c7 SHA512 92847a7e149d2a21019822e291b735e328c7bba2f0cd74dc9a97e9668821bdc795aa71db9813b7e7c925c8c21d99ca49e84b52868f0e000ad7a1c46ca77fcfac
+DIST github.com-armon-go-metrics-v0.3.0.tar.gz 28377 BLAKE2B c2cc9e146b44098367dd7dee62dc57bd374c052c91317894f4ac0fc0338e77f4acb9d0a44de84c6b1fb8d1f4eae384b6b2db0db45bbeada856782946160643a6 SHA512 753d2e3eb41e93ed8f3b1b9b1f54ee05ad894e70bba431f84a69e939acd02fa5ae47811bb56a08b8769e05c0573de5db26df6235d6dc23958e82e98e22444d18
 DIST github.com-boltdb-bolt-fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5.tar.gz 83950 BLAKE2B 04b9aa5632ccf231f319e8d25309f024a2a60c84e8eafac8b4bc16152fb7581d1a563903034e47668d7e9c61fdd6828294342c5b84d843e70367e578864ba4dd SHA512 5effccc7dadb214ef5ce53092db48c04ae25a388962c58732190c34f4537b579ef645ae579df5d0de30645574ff753486a6f743bf4fd58ec1d2aff76ba537694
+DIST github.com-boltdb-bolt-v1.3.1.tar.gz 83437 BLAKE2B 460123b8a7a4edf489707bed8f4aab02b259fe472662770181df0bfde67d73014b8978ff2f0bcff74fc682b2c16f8841a683fbf8cd0234c112e7930375f89420 SHA512 35b57d4a0c1d8bf66ebb61635d99bc09cf446e41a3c513302b3b2f5e711d2b75f743db88fed26569407d21d9f3a7e0a4ba282ea32f94add9f21f8bc4fdfacaa8
+DIST github.com-golang-crypto-b544559bb6d1b5c62fba4af5e843ff542174f079.tar.gz 1712189 BLAKE2B c543b13f82ae1353f7efc053b27efdce4e5f817edac5ae8104652566dc3d9e3ffcdc6afbc9a403b2903e0e10f2a4f8f83c0f40eb29d1a619f78be775243fa5b7 SHA512 5521b2c37a70261de01e37e4a13c13a4c31cb1013ac42747e716086197cad92baecf6c2bd4850c307cd81fafb4e87d5839de6f4d427aa3b3ab12a65558b1b18c
 DIST github.com-golang-crypto-c05e17bb3b2dca130fc919668a96b4bec9eb9442.tar.gz 1679727 BLAKE2B e0ca48445610e31fa43b6b0a244fc0edf3941f49bbed17bbc48026a96ee150c36ffbc2e9c93796c72bf43dbea73e815721951947b7b379507eda2868df2eb44e SHA512 4977e15931867eeae008a845b6c93609fc5790ab3ffddfbc931abc7ba33d5f383e067be968bf33c8bcb595ff2c05022d95c935890a0fb2a3ab25d5d4e2c62c29
+DIST github.com-golang-sys-6d18c012aee9febd81bbf9806760c8c4480e870d.tar.gz 1532865 BLAKE2B 35294c250562b5338ab9367cdd1f1b536e83914b915981cf503997456be45efcc1567ac0309d4b41a5918f0fb3735e256a5496056db618b67745ffc8423383fe SHA512 18a6556545687f54b637c4631189419272c3664f48c283c8cb011aed36fad8ab297b5301b0ee268e5841781b0e6d01f2296e9746a7627196633a69b15f96b7ea
 DIST github.com-golang-sys-9f0b1ff7b46a4014ddb5d4bdb6602a43b882cb27.tar.gz 1385808 BLAKE2B 6aaec90675531d7855a3cfd13f68dd5f70b16321c68bf98a05cf49a1ed90d75cf670624e257e2e36fee8b254402f5f34d215b5f5c789934f5dfd5bacd3ef7433 SHA512 06dc3f6c8fea31b819094b96ca74afe2751abf0b61f890de2ae113974e7d21a5f5ae0db3c4830510b8ae0167cec2fd6de82fcfe292975c8f0ad971c97d75c2ae
 DIST github.com-hashicorp-go-immutable-radix-27df80928bb34bb1b0d6d0e01b9e679902e7a6b5.tar.gz 19298 BLAKE2B 3d5f810ab1be777994b1a43e3334509f8558390a68056d299942e6cb8fb8f5957d250567b52925f137c9a17730bff8a438219e4ae9e3ab4fd331fc9dea6a5f58 SHA512 481b97db22ec3196c9e3b115ae1891884ffa15e3f83282a5deb32f6ea74d73a02f8046417ac9fea1fc0e23540445a0db303dec247448ff2eef0defe3225e33e1
+DIST github.com-hashicorp-go-immutable-radix-v1.1.0.tar.gz 22073 BLAKE2B 13961a0b78b894d72d33575eb58e11e98394952504fd62a0ccab70bb3d86dc7d6faa1fe314b0fcd8c835c004c056a23c59d137494df423c2470b938204c5f7b3 SHA512 85e4754e7d4cb19c00717d4273b5d8f5c68aa3349a6f28dfbd2f879be26b7d3711a2b5d092512a720946d5209d47ccfeb76d0e007b22354b2b9733daf90aa45d
 DIST github.com-hashicorp-go-msgpack-c4a1f61d43c2788b8b6fd55304f01a96863eec94.tar.gz 49676 BLAKE2B 2208429031f890cce6345f603f46dc5bac3dc24646236fd639d20d5c466d4c4d57685463bae5d7c91e4a342e30c68534be814022390ea3461af9fb24cdd2dff0 SHA512 fdbd083afbe2c94d2df62c20c58555a74e1633720c4b72d587b9b07cff65b270b1d4ee67b06426de7bd198ec132dfc52c7dec4d37b023ebaeb735d290af56355
+DIST github.com-hashicorp-go-msgpack-v0.5.5.tar.gz 50069 BLAKE2B aae96b54b58b0eeab45956431cd3b5ce2115e5ff82a66e3b803bf2413aff2ebbaf9da9d6e9069639ee9828b0a9ba967888248d658c93c0085a920f8d9e408812 SHA512 956fb5839348587bc85385a2d822824001b5f08ab30c5e3fb5f82c1536021c8e2b429a736e04ffd6b338e7128caba63284cf9cae955451aa8444615937754cfc
 DIST github.com-hashicorp-golang-lru-7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz 12983 BLAKE2B c600a2ee072ae86dc080f10232d079f5d0179e4f3ebc4c7db4ac2ef05ed99998843ce0882c38236552ce36ba38898dea6a13956e2da9ed58af91a728a34a980a SHA512 1a87bbb71da395c99b947aa85ccc8e8f680af14d0be3fcaf353bb058ffbde80252ee5dc5186e5a0a325cec0cbb8fd45cf86f3e6d4f8056515af1af4072c49308
+DIST github.com-hashicorp-golang-lru-v0.5.3.tar.gz 13348 BLAKE2B 598db380ae34bfc568d5a048e991e9bdd6d486800caa4c7d27ea96877f47e5fa5448b3bc30aa9d800a41755f9a17189c36ec738b8e7c00a51f2a80db3c270a1e SHA512 8775349e1c9df60a57a425f506ff53a1849aa4877a878583b59bc53f3e746f5b6c482ded9bed9182c68e1d12c5acc4bacebe7a6d41440234d4b40361bddb805d
 DIST github.com-labstack-gommon-82ef680aef5189b68682876cf70d09daa4ac0f51.tar.gz 11022 BLAKE2B 8ee66d3fe33cdd302e30f7567296300f802a9aa1f2aac7d97940ed754de275ab0faba9ce7e383c34d7997bdc23f046131ec0382bb38e4a7c79647bbb00bae720 SHA512 efcfa1664a9af160efff340eba21104727c046b198cbec854c31ed8563bdb232e3d6d6a9dea99ee84e60c1b7d295a2787e0ae7a7ecb0db70cbc0a571738df66f
+DIST github.com-labstack-gommon-v0.3.0.tar.gz 11426 BLAKE2B eb3b985c0da3dfff30c77d831c8d105d50175915693f7798428645ef8b7484038ce87a07b1eda7b7a2e7f2d43e510ddca1c7fce77f79dcd1edb011194dd2f425 SHA512 e52a4d954db07658d28f36b85466d09bcd14842e88a4d8c3c19d4c20011c33f2de892a01dc58585ee032749e1e22dd603854ae89a2fe7abd09ebc060c50dcbc9
 DIST github.com-mattn-go-colorable-3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz 8518 BLAKE2B e0c475aa8ca1a8c3488fe676f547f40a4f2cf6e655262c0c5875074d907509ff45d56c969240b9b43b4aca1dc58340a5828c7b8bddcd26428663eae399ff1905 SHA512 ec88288aa9d0c3a6e1b38f74e0c44ab8e8a7dfab49bd1ed83d9cb3b4019a7651555e07003bc70eae5a18ee213870538015bdb81646f43bb09815585f3dd0d25d
+DIST github.com-mattn-go-colorable-v0.1.4.tar.gz 8981 BLAKE2B fc4f16bf9cc9f4e235b1313bb83c8e8df8509d200616c440b4edb8dd945e4c48cd97b0e999e6d181fa6e586f18a391e2e16c8a176ba1935372c6fb6e68205907 SHA512 a1050a0fc8cce89c874275a827e8643785ca9324dfc0b98230557134688c4a2ad0272d14b2a2d9c3afbde981ae0f4ea40b1527bab1762ea86a4b317d367ddac1
 DIST github.com-mattn-go-isatty-c1975dc15c1d481e8da23f6ed313bb071136b98f.tar.gz 3567 BLAKE2B 829ee5664916513e9f9cecd5f353613401a48acf2d7d621607e51ac5b52853c1a86a0e8155680768c310bde2b2a061b9fec56745b2ee237cbe27d23375c36cd4 SHA512 05e187ef24a7ce4b34b41ef82d2d2e3184a9926335ff1d54d0c8da3c0d078a42daebae281a9305ab4c1b703a817ee43779c91cb627f892c1bc87a6881e4a21bd
+DIST github.com-mattn-go-isatty-v0.0.10.tar.gz 4465 BLAKE2B 7da424fd365096386e752780fcda8403a93754bb030c564f5d6df705b931d8385b00d8226155370ed5ebff86c700e9aa2b2bab33fe72a1fd3f6a91c36124dc1a SHA512 76545b77aaa04effd15d2ffb450c19b9a4091f65833323fb7138d6a2dbcc37197a66a8782aeafdd54ed9171e07a0e5c0160d39cdeb2d067182fb4d7e339c8c95
 DIST github.com-mattn-go-sqlite3-5994cc52dfa89a4ee21ac891b06fbc1ea02c52d3.tar.gz 2268814 BLAKE2B 4bff96f33e646d2456b9c5ce2cc71ac3c175167de9584d5151c0a7b34384bfead51b37ed9196686dc3a13d225500020108707c635c7898e6d7d81ea7223afec2 SHA512 14ffa634405b206194977ecdca8d188a5bc8661d894ba88d7842a63b1502ce9e5f5abf42abff6d9363b5053935d8d4908d1b4f166bd99f8fc08d33ec3d6d9bcd
+DIST github.com-mattn-go-sqlite3-v1.13.0.tar.gz 2297510 BLAKE2B 04178518c27204cf7c549487c7dc08721532f5876c51acf6a8eabaf67bca943f1986dc8f7081c4f49362a0e54970c66056bb2d703c096f8220b7efbdb69e8ea4 SHA512 293dcd49724b06d51ffd3548df15573e07b155a62a910d90101c0515febb5bac7902afd8a68a002424bc77164f3ad5e00bc8f0c50361705674e88120be542338
 DIST github.com-mkideal-cli-41df2d00b0edfa4614da67cf68f41df9d4e55539.tar.gz 47510 BLAKE2B 42ba41832afb53e2405167101261cfc15234e263fd7731e527938da1b84cbd20c87e520984cc6cb86b0d4a4989a4ad04805e0b6db8a4f87b944b26c6cf42401e SHA512 18f9ea78b16f92800fbbbde24a6dc64261f9467a833a890ef16422f945fa074642d4f56e13674973ae7e1f1050829aac7eb3fb22ed3ba96a92b00459b7daf49a
+DIST github.com-mkideal-cli-v0.0.3.tar.gz 47485 BLAKE2B ee9f9847001bd0e792ee65cbfd57c7d4c61880b97110d40142ea75ebeb97ce690634801604f2952b02483e421617c51d0f83ff71651209a3bcae5635019b2f78 SHA512 aa86b0d59c61f58b7a64a7f58906be0adeeab6c6de55ca70574a862e07bde52871cc50f359c469b78154a2ab097555c02ea2796969f8a4d1bda96260b8b3cbf8
 DIST github.com-mkideal-pkg-3e188c9e7ecc83d0fe7040a9161ce3c67885470d.tar.gz 69219 BLAKE2B 6df0a553da3a225352c4e712c2fb7f12b73850e0e1c9d0aaf9eb0dc917c36a026a10db1b8b23d45070567d209a6298fef84e794347fdd1951d0ec421fa1c72d4 SHA512 1c6b5cd345da17f8c2691a4f132bcb8ce1e794db54ecdcf2bf20392bb2f3195db6c1579ffd220bb21f121ccbec0c8c9ea4160a4a6c38734c68d1e163622ec1cd
 DIST rqlite-4.5.0.tar.gz 363264 BLAKE2B 63c211406b8696f06dba8d22d4476c6523829e007647c339f0b4af6e4fb4b3329936acab8f654ecd2620b7596113748675512e204ac9da859be9c8ef4c3ec659 SHA512 ecf62e23c0103641993e2dec209b5030ec5dd1ed72ca8530ce9781c626479900cdeed9166d3f0cfc7b3c1fc5f12e703bc96fd3dbd4973d3126f82523f902f1d4
+DIST rqlite-4.6.0.tar.gz 371493 BLAKE2B ac4699cae56602c66222909ecad734ff6ad3059c6b4d19e869bcec05e54cc9ad8a6c0f1e310f0dcedda22a86e985b8267aeda61e9b037b1bed832668eb18c4a8 SHA512 791f20d1a148169cf4c25a5f491c89ddd95885892ac0ad61586d52dd6d288291992b144edb5167ecd9e238038efffb7c7adbc786ac1d13b525452517d7dd1c0e
 EBUILD rqlite-4.5.0.ebuild 2157 BLAKE2B 363fd6a29d112748faf5313b4688ddd440fd69bb59e00f6ba6b0864824706bb00cf2f9c558aa92d0d29b41c4a4aaf2dbb69d50c29db8d1aea652e87c653110a6 SHA512 3e3971811f129be22029d7b266dae2da12549ba6b88d08b8832e4c453de9df820c5847500d5bafbf365855ed5849600cdfb5f6d9ffca6f021e67108915166c88
+EBUILD rqlite-4.6.0.ebuild 1819 BLAKE2B ab536331490387d5230fb63fd2427cc12a694e52dd7b32a82ecea803c1678c4eea256e110f8b49b57e3c773eb9dd9fb5e4c248110d41fbec6aacdd874e6e2c0d SHA512 0886337d2932d9c1173679c631842c46163f8494a4bbace1fd059ec03b8bdfd44f11870bb09ac5b2cc28434d76398ff424e7ddb908b3c6d6f4ff68b9e06b4ea6
 MISC metadata.xml 304 BLAKE2B aa848abaaeaf54cb85ddb9600c6044a9ed2f3e446f3131f3725431b3a3eefa0058a8c962c708f1735dd97caee1c25a461da3f6fd622b521ad36234157580f6f4 SHA512 3e536da8ed6a50cbffad3574074029e67b25627d80050f388742e7b086ffa73e6fd93fa307cc267bc23b4eca080ddefa7845a3ac90ad3736862362f9c0e29c92
diff --git a/dev-db/rqlite/rqlite-4.6.0.ebuild b/dev-db/rqlite/rqlite-4.6.0.ebuild
new file mode 100644
index 000000000000..78e22f2cc221
--- /dev/null
+++ b/dev-db/rqlite/rqlite-4.6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/rqlite/rqlite"
+EGO_VENDOR=(
+	"github.com/Bowery/prompt fa8279994f75f982bdae3c827a3afffd78a6fe0d"
+	"github.com/armon/go-metrics v0.3.0"
+	"github.com/boltdb/bolt v1.3.1"
+	"github.com/hashicorp/go-immutable-radix v1.1.0"
+	"github.com/hashicorp/go-msgpack v0.5.5"
+	"github.com/hashicorp/golang-lru v0.5.3"
+	"github.com/labstack/gommon v0.3.0"
+	"github.com/mattn/go-colorable v0.1.4"
+	"github.com/mattn/go-isatty v0.0.10"
+	"github.com/mattn/go-sqlite3 v1.13.0"
+	"github.com/mkideal/cli v0.0.3"
+	"github.com/mkideal/pkg 3e188c9e7ecc83d0fe7040a9161ce3c67885470d"
+	"golang.org/x/crypto b544559bb6d1b5c62fba4af5e843ff542174f079 github.com/golang/crypto"
+	"golang.org/x/sys 6d18c012aee9febd81bbf9806760c8c4480e870d github.com/golang/sys"
+)
+
+inherit golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
+
+HOMEPAGE="https://github.com/rqlite/rqlite http://www.philipotoole.com/tag/rqlite/"
+LICENSE="MIT BSD MPL-2.0"
+SLOT="0"
+IUSE=""
+EGIT_REPO_URI="https://${EGO_PN}.git"
+EGIT_COMMIT="085d2d23d88728fbf03855f4fd213815397ed9f4"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #678966
+	GOPATH="${WORKDIR}/${P}" \
+	GOBIN="${WORKDIR}/${P}/bin" \
+		go install \
+			-ldflags="-X main.version=v${PV} -X main.branch=master -X main.commit=${EGIT_COMMIT} -X main.buildtime=$(date +%Y-%m-%dT%T%z)" \
+			-v -work -x ${EGO_BUILD_FLAGS} ${EGO_PN}/cmd/... || die
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}" \
+	GOBIN="${WORKDIR}/${P}/bin" \
+		go test -v ./... || die
+}
+
+src_install() {
+	dobin "${WORKDIR}/${P}/bin"/${PN}{,d}
+	dodoc -r *.md DOC
+}
diff --git a/dev-db/sadisplay/Manifest b/dev-db/sadisplay/Manifest
index 9942b30d9623..f862c677ec74 100644
--- a/dev-db/sadisplay/Manifest
+++ b/dev-db/sadisplay/Manifest
@@ -1,3 +1,3 @@
 DIST sadisplay-0.4.8.tar.gz 9063 BLAKE2B a6b965d6703102000510ae6100a6bb4d0ad5b42543408aea520476128897bf8f38fda276ea39ac066e9b6621ecf2634d20e82ca21543b8c0bb472ac5d804b2a1 SHA512 c3707f90a20028fdb164caa3037f4ffff3da3f4bc763c400f8204dae4d7d71862e65902892d8ad0fe3bbe636cf87e4f96a475e01e8ce0ac55bed4e17073e3308
-EBUILD sadisplay-0.4.8.ebuild 657 BLAKE2B 6b1c13053d8099820da90f096d694a947a89043266acfcb5147ac380122755bd9bef2a71f954065b965022f56cdbbf4a8f1552f7bf978b88779a73f3f2f1a81c SHA512 82de36b200e6f3f11154643e9436277d3fd22ba3f9b7c5157d84eb996a4a50642e7409602e8b672ae14ccf26e445cb5f83ab7880b64dc8074ba8e52410652786
+EBUILD sadisplay-0.4.8.ebuild 684 BLAKE2B e66e581f08968c197a8bc04883763bd61fe8f694daa146013c85b90a5d8e5190124c1b459bf2ca07e5602718cfad70cb08c995aed1e6b2ef72719264a9e3ba92 SHA512 d035ea9fa057f6f1c19f8cf9f48da1e7b03a1b86e83fafb6f2921958d6780067a88cad9069ccf83a0fcaed488ad8aabc64ca759ba6c22b4cd2ec9e293a7e4ad5
 MISC metadata.xml 731 BLAKE2B f661d037e9ab428af2c3033ccd1ea68578e66200ceb5cda2318b23c87b1a98fa36ccc4941c38ccfeaf4718395df81f1fc3dc6eb793068372f7ced968954b9b2b SHA512 c05e53460ae66a3c52b3a17ec0547962338bd7beb07b9d8f79d43184ff8fd433eb8eaf4bafbb288555016b33f6b296715fcaf2eb73f571dfffdc593773ffbf74
diff --git a/dev-db/sadisplay/sadisplay-0.4.8.ebuild b/dev-db/sadisplay/sadisplay-0.4.8.ebuild
index 01dee7c70cdf..3802c282403d 100644
--- a/dev-db/sadisplay/sadisplay-0.4.8.ebuild
+++ b/dev-db/sadisplay/sadisplay-0.4.8.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/dev-db/spatialite/Manifest b/dev-db/spatialite/Manifest
index e569b10ccfe3..81d4f46f521d 100644
--- a/dev-db/spatialite/Manifest
+++ b/dev-db/spatialite/Manifest
@@ -1,5 +1,5 @@
 DIST libspatialite-4.3.0.tar.gz 4439538 BLAKE2B f3bbda3b9d6099197691eb85e20c693d5cbc3a8958c8f23bd1ba57add9d8676895163d845a4aadd690650244ffa7ae2a02ce86e844e032b815fe4c94f30fb4b8 SHA512 b686766ed90711a41efbf219a8942ead8aefda8784a9cabc59233f107e0e10eda949d022152af1064a169975aa6a47515f6064589166418b853427dde5779ecc
 DIST libspatialite-4.3.0a.tar.gz 4440660 BLAKE2B 2eb2afb96b096b86be9c30cf71663b7b2839d345b6c418fc8511653ed59d0aeff1756b6b19807140c67128c938e39be66d13088640658d14883c92c438c97251 SHA512 adfd63e8dde0f370b07e4e7bb557647d2bfb5549205b60bdcaaca69ff81298a3d885e7c1ca515ef56dd0aca152ae940df8b5dbcb65bb61ae0a9337499895c3c0
-EBUILD spatialite-4.3.0-r1.ebuild 1060 BLAKE2B f01a8c5e0d60da79a3d3a524fdbd51b8afe63285746e1b5458d05742d0eb2b78bc02550dbb326f86691f0559a3d5c2f039007cba60fc3f07d9f49c1ad95b658b SHA512 1acdc18e95954a6bd6c510c80ea85b78f59435efa66f53d1f4029cc536f301243bb030161a2ad4eed596f15d2c4f1ce52b4fd673400decd171da9b11e356d582
-EBUILD spatialite-4.3.0a.ebuild 1208 BLAKE2B 93873ae74d1eb40012ef91063b873b2c336f17588ce738075cd7664d4570894b8974002015f7c9aa85e77ac71fd5a809c121f24efa9cbd4b527b9c3428cd842a SHA512 8c6f0c07490208f42a7658569d3d63889ec7937fb3e2286a305873919de47d6420f29b8d57a6536b4ebd71b7ee73bac1a36fe9803aa8d326e8b4a7bbd6e82781
+EBUILD spatialite-4.3.0-r1.ebuild 1087 BLAKE2B fa255b48b12ce9f52fee369e08ff14e5d178de0692506165128e357fe8544d5296dbb88e4288142bf755616a475ceb2bc6f3e040e916698ef1a031b0023ed38a SHA512 70cc5be58b571bfa42295b080ff789b0a223422ede1af0e5652d7c02e98c7f5d860b1e4f9a23f28ec01063952541143b42dbd5aa9ef4a7eeccb924ce9228e44e
+EBUILD spatialite-4.3.0a.ebuild 1235 BLAKE2B ac9586a36cf87717194c777373b988e534b41c6c0e1ec6dac4c83ab3388219495ed41381972ac2dc705cec7a5eb0d57a1dcca2089dafae91c0ee46588de5ebc4 SHA512 52780f2e597b73f3c2098b1476223699bcd81d292378df3c9ac2ea96902cec3603c8790db54eeb52842b0ceb4132a667d842b47d72e264d51de4560d3fa0a92b
 MISC metadata.xml 559 BLAKE2B b128c4425723bb652063fd3ebebcd83de75a44c7a01e5a8b6c6596cad0bcd1a5f86977f4e3b49d2f1945ea83f12f9761ba712d5f1d919338996c7ddf18bc4a66 SHA512 a21438d83d828b52e4fc16f91edd29e6ace87ada9b697cf233b847a6d3a9f5196135769993873f23409f98548bf852a4e89645c2b0eaf57bd8427ff6dcc36111
diff --git a/dev-db/spatialite/spatialite-4.3.0-r1.ebuild b/dev-db/spatialite/spatialite-4.3.0-r1.ebuild
index cc5f1d7760a0..fc885a9624fa 100644
--- a/dev-db/spatialite/spatialite-4.3.0-r1.ebuild
+++ b/dev-db/spatialite/spatialite-4.3.0-r1.ebuild
@@ -14,6 +14,7 @@ LICENSE="MPL-1.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="+geos iconv +proj test +xls +xml"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-db/sqlite-3.7.5:3[extensions(+)]
diff --git a/dev-db/spatialite/spatialite-4.3.0a.ebuild b/dev-db/spatialite/spatialite-4.3.0a.ebuild
index 3fb9d3d53dd8..ccd7a6e07707 100644
--- a/dev-db/spatialite/spatialite-4.3.0a.ebuild
+++ b/dev-db/spatialite/spatialite-4.3.0a.ebuild
@@ -16,6 +16,7 @@ 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(+)]
diff --git a/dev-db/sqlcipher/Manifest b/dev-db/sqlcipher/Manifest
index b5c29d5a987f..55c25592915e 100644
--- a/dev-db/sqlcipher/Manifest
+++ b/dev-db/sqlcipher/Manifest
@@ -1,6 +1,6 @@
 AUX sqlcipher-3.4.2-libressl-2.8.patch 490 BLAKE2B 5ac29fbf1370f1ed1a28335d68f86dada605d6362521fbe4eb4decbd215c5eda04d7c62017979de829f46ac37a9f0718d8c748069173f4d0ff591664f51d83da SHA512 bea99e890d78f1b1417f3a81d612388ad3305d30cc576ef5b29d0726459570a231786551fd8ba4cc03ef8fd257ee985ce5933b7f2bcfc15867f6afc2f662f229
 DIST sqlcipher-3.4.2.tar.gz 14743960 BLAKE2B 88ee265b02bb9a42734c2ef93070c8fd8e13d546d7cc85e7fbfd6e6046ccbf2626d75e14b19cbba379c99784c7311d0100de06235b99b4908c60c99890d8d7a2 SHA512 c620bf2b175e404afd60ebe76b5476f5a447ff5fcdfa31bebc3f4bd7f1ebfcd507ee423cd582c9b3d6431d8b57320171492da2586e1a739adb4f440e7443dc03
 DIST sqlcipher-4.0.1.tar.gz 17006324 BLAKE2B 44e8eb4e1230c3625b4fe1b4af608cd8edc25f3c6adf7e11450c8f9ddb7970fea92ff0823f3a1e631d1b0acfbab6cf078c80e4645c535d66de57f1d73b55ff47 SHA512 0fb48326860a10e9849b2f56fae0c310deae124c7203b54d51f92d346782be795d505c29eafbdfb7206f5e7be54c0f7228fe50c45bd9d2b23cca976b263264fc
-EBUILD sqlcipher-3.4.2.ebuild 1467 BLAKE2B 3a8aed24789d39ec99bce034aa456625488dbea9f240a2ff4ff9cc8e17099f842deaf64efbb9e05347d326249d395aa6cff97e7fb7d15321bd4e044c05c80166 SHA512 15846af5ee4c47a393028d6561ed3198da6b98d3a23e017575546d4c9e7f4aed791887b2168bf6222a997bfc4a6341b2a24fb5dabde7d22fd16b2b47f5ec47ef
+EBUILD sqlcipher-3.4.2.ebuild 1494 BLAKE2B a06b197dda7a13394aa90ff7c921238f0a6542862a9f474e223bd238a12a42171d0e3458a2ab5f1a66853df39082e587da56f8759b036d436066b8c7ca3449ea SHA512 f3e5326be97de199dfeb26fe27495697e403378673353166a9e83fbbe27f770baed9c72901734e2d48a02ddf19fd863981fdb6c704ad133422ac15902d23f9d5
 EBUILD sqlcipher-4.0.1.ebuild 1670 BLAKE2B 05bafb28456a408367973a8115b5ae9e273be86e3391225ff1170c34297c84d3ed012bbbbef5287091d329390fd6cc9e5d787051139ce6fdc6ccd6348f59c43f SHA512 b80daff29d79ed5d74cdecd1f7ba95f5050d42633d1f9058865f4cc046fb1b73979378b3122a45910666b4de28608e23cabc86c62bea6cfe68c5d212db40dcbf
 MISC metadata.xml 341 BLAKE2B f5035fe38770437027936a72b9b7d66854fd6a19cf19f7140e409e8004297ed3da11aab122ba81b2f2b5d82302e8252462a7f185de0a998f79d348dd45e16c7e SHA512 b387658993279fb3c74c7647b36035f5c0e0e3e81a3cf4eab28f3dac19319f0b6958cfa16fab30295e5508c0810d601b0e2899710f57e992886f35c781e37dfa
diff --git a/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild b/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
index 8591e1693bc0..490e59bef3ef 100644
--- a/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
+++ b/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 IUSE="libedit readline libressl static-libs tcl test"
+RESTRICT="!test? ( test )"
 
 # Tcl is always needed by buildsystem
 RDEPEND="
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index f4dfa4956b16..d1808bd5ce4a 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,16 +1,12 @@
 AUX sqlite-3.25.0-nonfull_archive-build.patch 416 BLAKE2B 37faa30235c1b668d3cf510c353730a932a807f650c638ac0d07d3a1c0534dedef233c06cef52b6569eb1d58b5bcd910dd59c8d2e792726945f49f882d4181be SHA512 44db89a32b51713cf59fb3f071cca08648deebf6e2830dd61b033a5160ce6ddcbf54a191be42b3b252ea4bc16614fbcfa569207f34f268f1da5acd5fadcda668
-AUX sqlite-3.28.0-full_archive-build.patch 15538 BLAKE2B 35b95c237a06c14cb315df044154a2533954b745e045d3038af48803853df46b5d3b075cd702ae5be72ccd291608f4382d254e1e792029f16aa47541009645fc SHA512 f8faa1d582391a6162fb032f2078adcd410736512991acd38ea5b1a735c825109d8608ce753cf2bd6a670871852cec92fc03147050265154c57b1d81bf9427a3
-AUX sqlite-3.28.0-full_archive-segmentation_fault_fixes.patch 56920 BLAKE2B f4edd8a213e6aaa2cb87500c1b16b082850f2ddcfd4ab08f559a8c1430f306f954ad1c6b8697fa9c4cdb8c0bbdb760564404816b8544bba16c65f5ae82c6d3c8 SHA512 6fefcf5a4e391db69a0eedbb50a9266d8224743f2fe1a9efa8c7c2e2d5fbe40fa406400b7e71907cc3c961ec58339382e61ec86587494339251727de2e33b3a8
-AUX sqlite-3.28.0-full_archive-tests.patch 493 BLAKE2B 53baa103b0abefe0d24431f4372d14bf58f0b69943b41b94c5b506577930deadcd9494c35e5aba1e9e7709d6dbbebad700041655bba2fb84b1208e320db2a5d6 SHA512 2b70fbfd448b287f88e5b2792df3ce9bf728eefd92e06f93f2d33f2392eca0f81bc689e27bead65653d732b025e583f7496044c39e155a8704eb09163253ec46
-AUX sqlite-3.28.0-nonfull_archive-segmentation_fault_fixes.patch 3975 BLAKE2B dbdcbec6584c64d662fe0a9a808695e62623844ff08da3e3d38d4027669f84ebb7b757b6e9772d90e12a474dd04b5bdc51efc5d0287a1551f7ba1c37ad7d728b SHA512 0a0c9f748f4bd0e07e743641b58d4068d8f88f9346edf9802cd79ddba47f9dcaf19843677321df78d2912c03e591ee5a72d87391b36f4006f93e00d433f04a78
 AUX sqlite-3.29.0-full_archive-build.patch 15915 BLAKE2B ccc439a441bede4d6b380cae77b97929d342a54f0fc3ee4ac000ca52b1d8d3d63a86e0d9c89dbf3f3a9235ed03ad51c29cbde27a6929e4fe25fb2304977affb9 SHA512 a551bd1c54a7fe7e1581c2682cc0a76f16a00d8513386d85d939ffd1494f29ee266fbe3bc97db74f72435616f30855d14b76dfd4e205c61c5c91c7af3eb97851
 AUX sqlite-3.29.0-full_archive-tests.patch 4122 BLAKE2B e41f62e1efa354c8b5dda6f79328384f0c19f40830e71268e2a3741961248db5c3ca6159deca9bd47983d8ca47ce0caf2fcc8b406cf2f1bc1ff21910fa51d9d6 SHA512 f8cf5f8fc6a53459187cec92823f0982d0d48d9f0b0ab75bcaf713f5486a40193578d187cbc7272371e868b95990a48c794efe300b18a63b9ae273cfcc2f8757
-DIST sqlite-autoconf-3280000.tar.gz 2810415 BLAKE2B e1af03476d97f96ef78d4e0a9df6ae69a06fb08e48046c843ed668b3f8c00c58263df07a4e8a22a1c7cfc920fd005fa6c2525dceeec4f724b43df7589ca3f777 SHA512 e800c0d9e6c8c01ccf1d714c6c4da4b98e9610c4c06557dda6393d0792a8ae09788703d4a74dcb21844c49b3629ff7ed95a4a86ff79872aafd2b49c672c7a570
 DIST sqlite-autoconf-3290000.tar.gz 2833613 BLAKE2B b68a4f9bfe90653f5ce9dbf94b44cecc843fbb639883a7be9dd40150749f8d2eca0c231b215137d2f8da78d33356d72640a943ba06516c6d7c10ebd04cae4766 SHA512 85dcaa72cc2476c628e801d4ce46cf10ed8997f56cb0334062df5553f18c29d607883a1049bf75258204f2f53a29a02a01f014dcca383b05dfac1e2123778024
-DIST sqlite-doc-3280000.zip 9421770 BLAKE2B 695eab96f718307a7aff8a171d9e416ddb4b17039ef7230a458dc7d256e2f07a5b41d3aa1a3f085e5e418c297b5dd1d2ba5e4827434329d1ed61d3dd1f618f3d SHA512 83e23dff00614d31d501c66c29d8d4aa780b38859242b58937243235d185fe3db2f9f3c1accf9bf2df0b457a6e32612a00e82f503a8665aad4f19602e2b36396
+DIST sqlite-autoconf-3300100.tar.gz 2848951 BLAKE2B 3a541a2b07ebbaf7ddca4693b71765e2ecd11974dd64b4a7a19eaee4eea8a17a6004c69f3b2163213fe7568480152709745e029107711813d4bdd41052763cd1 SHA512 9ec0283c417fb0323b0e43550af2a49e9a63988e4212c27ea62cc9da3534caa6faf5bdc7e051b6772c4ce61560a433b3d3288b68e05e9ba8495f61a3bcebda3e
 DIST sqlite-doc-3290000.zip 9415641 BLAKE2B 97fef1f01d3e7730e5220541ad9ccdf9f8538aa43939c0f513919c8505b3a4f4b4c89eb2e04fddae80b7eeed440eb0f06f7cfd93cd56f0539bd6fdd5f47e1ff7 SHA512 ca856cf250e395d9c7e9817337adb5a16b1d96a20548a4010f5137188d35bb9d49a4a6da47bf2a696deffa68d2976dbb35a036adce19b8320e0e286876ac094f
-DIST sqlite-src-3280000.zip 12477204 BLAKE2B e62e0f36f0bebf89990f8ec91cb1e508a5ebc92bb212eaf9c80eb0febecb5623f5938ecd31c210837314f1f9aab19a18189824f82a106799384d8184ca5f65ab SHA512 49c35c65fa686a2326e13218db583c54fa5fe8f48f0caddd11a942601803b3023f7d32ffbab16641e0d72dc9ed288ad26eaa7226c865ac54e1f181859125651f
+DIST sqlite-doc-3300100.zip 9485342 BLAKE2B bf5e3909a327c773106d4990b3e3be5dd63db2dbc1a7f8a7c1bd16f39bec83a6b2a98c4c56ded3b58f4087dcdcc934e542db36e142bf338a411ed7115d67d6b3 SHA512 373e843015307071443a0db5fb930f9120718f6118cc2e21b506fdc8535fbe6996e9889e8b5809ffb91257addfe778bdf3412a81e11f6bced2c5e0330337d00d
 DIST sqlite-src-3290000.zip 12557725 BLAKE2B b1aeb80734a2cb7d45c6f2e278bad2996b56ecaf792a8f26322bf50aeaa430eea267f23edb1721bb80ecb6e0c8e14c7a5d8f26178d056fd23efb52f496cc03e1 SHA512 575398fbe20c6471ee2abcbde170b8d48efbb3cb2716a65f42f05c52429a45d14e8046e50c59bbf75bfe2d8f151c34abd50b440c50af571f19e19f3290b230df
-EBUILD sqlite-3.28.0.ebuild 10067 BLAKE2B 1db1b8101b6db76d7146143bf9bbe2b27358d6d7233009fc7d1ac10b09589da34d3aa5c9a945f67a991c5123aa5e31562adee245a08d791eedc224521a367088 SHA512 d1fb4bbae6dd93a50f0242895bcab0508e0de42e7b0ec523fbeb4bae3b93eecc5ec0ad511a278748283124c38d60609dd251d8fb892f77dc43ddf2cc0a601a67
+DIST sqlite-src-3300100.zip 12648162 BLAKE2B bb239bac9115c74778de0347b4f4e24a82f149f55fe7dea8b89eb859bfe4cf6f6c2f065f5e1741c40624bb88ecd395140064a41d475a1c64a0188990fd6248e7 SHA512 f40236d0bb25f3ea01a1192dace3b6732fb671fbdabb7cfa8d0cc2b99d21aef00ae380999fdee904501cb03304644cddfb2506951f36a2f6a83693f311c3c11d
 EBUILD sqlite-3.29.0.ebuild 12010 BLAKE2B 4cc533b7b9e57e759c93bbf91adf5d1ae04b252ae9244beef08ee98ebbc4d52c724a441b207aef3fdbbb52658d685f6b21f196fff55df49a7640e24e732ad06e SHA512 d7e7bec9be46e9e29935bbf584efe6228b2d19e4c0ec54c22c73a545d6b3b88a324dc67a6a9057d6623ff170deae1bb15051ced2e6a42c510ce71ec4af05d084
+EBUILD sqlite-3.30.1.ebuild 11656 BLAKE2B d319e8ac1e50dc9ff050f44fd593ecf4ec076a74821d2c19abcbdf4f43da2d4e8c92c5f0444962fedb459a864d12692422630c0beee9a6c73cdab41afa56ca0e SHA512 f59464fb128deca4a89399d8dd218a7e63b385e281474ca5702df84267e00dcb9fa0efb0932a17e266e03fd387cbd0d8da6229f504b654c3f86f72c419bb64da
 MISC metadata.xml 748 BLAKE2B c58da3e33e12b7747bbadacfd1a6137cf847fd5bd0525fc02ef854eb5bcad7bad0b29739257b632e19190995659768fdea418ffa7e485e55ef15f40f58b8382c SHA512 66f3f134065f76229b74a7ab7b469066a93da737a9037435e6fe78e85f45c980ec561537f2bb9b95db9de026bad025d8b06682187c97dedd2741717e893d43da
diff --git a/dev-db/sqlite/files/sqlite-3.28.0-full_archive-build.patch b/dev-db/sqlite/files/sqlite-3.28.0-full_archive-build.patch
deleted file mode 100644
index 95b53328c43c..000000000000
--- a/dev-db/sqlite/files/sqlite-3.28.0-full_archive-build.patch
+++ /dev/null
@@ -1,461 +0,0 @@
-Move some code to libsqlite3.so to avoid duplication.
-Link executables against libsqlite3.so.
-Increase timeout for fuzzcheck.
-Fix building with dlopen() not available.
-
---- /Makefile.in
-+++ /Makefile.in
-@@ -311,6 +311,9 @@
- # Source code for extensions
- #
- SRC += \
-+  $(TOP)/ext/expert/sqlite3expert.c \
-+  $(TOP)/ext/expert/sqlite3expert.h
-+SRC += \
-   $(TOP)/ext/fts1/fts1.c \
-   $(TOP)/ext/fts1/fts1.h \
-   $(TOP)/ext/fts1/fts1_hash.c \
-@@ -363,8 +366,11 @@
-   $(TOP)/ext/rbu/sqlite3rbu.h \
-   $(TOP)/ext/rbu/sqlite3rbu.c
- SRC += \
-+  $(TOP)/ext/misc/appendvfs.c \
-   $(TOP)/ext/misc/json1.c \
--  $(TOP)/ext/misc/stmt.c
-+  $(TOP)/ext/misc/sqlar.c \
-+  $(TOP)/ext/misc/stmt.c \
-+  $(TOP)/ext/misc/zipfile.c
- 
- # Generated source code files
- #
-@@ -435,7 +441,6 @@
- # Statically linked extensions
- #
- TESTSRC += \
--  $(TOP)/ext/expert/sqlite3expert.c \
-   $(TOP)/ext/expert/test_expert.c \
-   $(TOP)/ext/misc/amatch.c \
-   $(TOP)/ext/misc/carray.c \
-@@ -461,7 +466,6 @@
-   $(TOP)/ext/misc/totype.c \
-   $(TOP)/ext/misc/unionvtab.c \
-   $(TOP)/ext/misc/wholenumber.c \
--  $(TOP)/ext/misc/zipfile.c \
-   $(TOP)/ext/userauth/userauth.c
- 
- # Source code to the library files needed by the test fixture
-@@ -640,25 +644,25 @@
- 
- libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
- 	$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
--		libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
-+		libsqlite3.la @TCL_STUB_LIB_SPEC@ \
- 		-rpath "$(TCLLIBDIR)" \
- 		-version-info "8:6:8" \
- 		-avoid-version
- 
--sqlite3$(TEXE):	shell.c sqlite3.c
--	$(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
--		shell.c sqlite3.c \
--		$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
-+sqlite3$(TEXE):	shell.c libsqlite3.la
-+	$(LTLINK) $(READLINE_FLAGS) -o $@ \
-+		shell.c libsqlite3.la \
-+		$(LIBREADLINE)
- 
--sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
--	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
-+sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c libsqlite3.la
-+	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
- 
--dbhash$(TEXE):	$(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
--	$(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
-+dbhash$(TEXE):	$(TOP)/tool/dbhash.c libsqlite3.la
-+	$(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
- 
--scrub$(TEXE):	$(TOP)/ext/misc/scrub.c sqlite3.lo
-+scrub$(TEXE):	$(TOP)/ext/misc/scrub.c libsqlite3.la
- 	$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
--		$(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
-+		$(TOP)/ext/misc/scrub.c libsqlite3.la
- 
- srcck1$(BEXE):	$(TOP)/tool/srcck1.c
- 	$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
-@@ -768,7 +772,7 @@
- # Rule to build the amalgamation
- #
- sqlite3.lo:	sqlite3.c
--	$(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
-+	$(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
- 
- # Rules to build the LEMON compiler generator
- #
-@@ -1065,14 +1069,9 @@
- # Source files that go into making shell.c
- SHELL_SRC = \
- 	$(TOP)/src/shell.c.in \
--        $(TOP)/ext/misc/appendvfs.c \
- 	$(TOP)/ext/misc/shathree.c \
- 	$(TOP)/ext/misc/fileio.c \
- 	$(TOP)/ext/misc/completion.c \
--	$(TOP)/ext/misc/sqlar.c \
--	$(TOP)/ext/expert/sqlite3expert.c \
--	$(TOP)/ext/expert/sqlite3expert.h \
--	$(TOP)/ext/misc/zipfile.c \
- 	$(TOP)/ext/misc/memtrace.c \
-         $(TOP)/src/test_windirent.c
- 
-@@ -1240,15 +1239,15 @@
- 
- # Fuzz testing
- fuzztest:	fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
--	./fuzzcheck$(TEXE) $(FUZZDATA)
-+	./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
- 	./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
- 
- fastfuzztest:	fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
--	./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
-+	./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
- 	./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
- 
- valgrindfuzz:	fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
--	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
-+	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
- 	valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
- 
- # The veryquick.test TCL tests.
-@@ -1279,24 +1278,23 @@
- smoketest:	$(TESTPROGS) fuzzcheck$(TEXE)
- 	./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
- 
--sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
-+sqlite3_analyzer.c:	$(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
- 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
- 
--sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
--	$(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
-+sqlite3_analyzer$(TEXE):	sqlite3_analyzer.c libsqlite3.la
-+	$(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
- 
--sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
-+sqltclsh.c:	$(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
- 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
- 
--sqltclsh$(TEXE): sqltclsh.c
--	$(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
-+sqltclsh$(TEXE):	sqltclsh.c libsqlite3.la
-+	$(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL)
- 
--sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
--	$(LTLINK)	$(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
-+sqlite3_expert$(TEXE):	$(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la
-+	$(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la
- 
- CHECKER_DEPS =\
-   $(TOP)/tool/mkccode.tcl \
--  sqlite3.c \
-   $(TOP)/src/tclsqlite.c \
-   $(TOP)/ext/repair/sqlite3_checker.tcl \
-   $(TOP)/ext/repair/checkindex.c \
-@@ -1307,36 +1305,36 @@
- sqlite3_checker.c:	$(CHECKER_DEPS)
- 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
- 
--sqlite3_checker$(TEXE):	sqlite3_checker.c
--	$(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
-+sqlite3_checker$(TEXE):	sqlite3_checker.c libsqlite3.la
-+	$(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL)
- 
--dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
-+dbdump$(TEXE):	$(TOP)/ext/misc/dbdump.c libsqlite3.la
- 	$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
--           $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
-+           $(TOP)/ext/misc/dbdump.c libsqlite3.la
- 
--dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c
--	$(LTLINK)-o $@ $(TOP)/tool/dbtotxt.c
-+dbtotxt$(TEXE):	$(TOP)/tool/dbtotxt.c
-+	$(LTLINK) -o $@ $(TOP)/tool/dbtotxt.c
- 
--showdb$(TEXE):	$(TOP)/tool/showdb.c sqlite3.lo
--	$(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
-+showdb$(TEXE):	$(TOP)/tool/showdb.c libsqlite3.la
-+	$(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
- 
--showstat4$(TEXE):	$(TOP)/tool/showstat4.c sqlite3.lo
--	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
-+showstat4$(TEXE):	$(TOP)/tool/showstat4.c libsqlite3.la
-+	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
- 
--showjournal$(TEXE):	$(TOP)/tool/showjournal.c sqlite3.lo
--	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
-+showjournal$(TEXE):	$(TOP)/tool/showjournal.c
-+	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c
- 
--showwal$(TEXE):	$(TOP)/tool/showwal.c sqlite3.lo
--	$(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
-+showwal$(TEXE):	$(TOP)/tool/showwal.c
-+	$(LTLINK) -o $@ $(TOP)/tool/showwal.c
- 
- showshm$(TEXE):	$(TOP)/tool/showshm.c
- 	$(LTLINK) -o $@ $(TOP)/tool/showshm.c
- 
--index_usage$(TEXE): $(TOP)/tool/index_usage.c sqlite3.lo
--	$(LTLINK) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.lo $(TLIBS)
-+index_usage$(TEXE):	$(TOP)/tool/index_usage.c libsqlite3.la
-+	$(LTLINK) -o $@ $(TOP)/tool/index_usage.c libsqlite3.la
- 
--changeset$(TEXE):	$(TOP)/ext/session/changeset.c sqlite3.lo
--	$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
-+changeset$(TEXE):	$(TOP)/ext/session/changeset.c libsqlite3.la
-+	$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
- 
- changesetfuzz$(TEXE):	$(TOP)/ext/session/changesetfuzz.c sqlite3.lo
- 	$(LTLINK) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.lo $(TLIBS)
-@@ -1361,11 +1359,11 @@
- kvtest$(TEXE):	$(TOP)/test/kvtest.c sqlite3.c
- 	$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
- 
--rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
--	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
-+rbu$(EXE):	$(TOP)/ext/rbu/rbu.c libsqlite3.la
-+	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
- 
--loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
--	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
-+loadfts$(EXE):	$(TOP)/tool/loadfts.c libsqlite3.la
-+	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
- 
- # This target will fail if the SQLite amalgamation contains any exported
- # symbols that do not begin with "sqlite3_". It is run as part of the
---- /configure.ac
-+++ /configure.ac
-@@ -587,6 +587,9 @@
- if test "${enable_load_extension}" = "yes" ; then
-   OPT_FEATURE_FLAGS=""
-   AC_SEARCH_LIBS(dlopen, dl)
-+  if test "${ac_cv_search_dlopen}" = "no" ; then
-+    OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
-+  fi
- else
-   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
- fi
---- /ext/misc/sqlar.c
-+++ /ext/misc/sqlar.c
-@@ -14,6 +14,8 @@
- ** for working with sqlar archives and used by the shell tool's built-in
- ** sqlar support.
- */
-+#ifdef SQLITE_HAVE_ZLIB
-+
- #include "sqlite3ext.h"
- SQLITE_EXTENSION_INIT1
- #include <zlib.h>
-@@ -119,3 +121,5 @@
-   }
-   return rc;
- }
-+
-+#endif /* SQLITE_HAVE_ZLIB */
---- /ext/misc/zipfile.c
-+++ /ext/misc/zipfile.c
-@@ -24,6 +24,8 @@
- **    *  No support for zip64 extensions
- **    *  Only the "inflate/deflate" (zlib) compression method is supported
- */
-+#ifdef SQLITE_HAVE_ZLIB
-+
- #include "sqlite3ext.h"
- SQLITE_EXTENSION_INIT1
- #include <stdio.h>
-@@ -2176,3 +2178,5 @@
-   (void)pzErrMsg;  /* Unused parameter */
-   return zipfileRegister(db);
- }
-+
-+#endif /* SQLITE_HAVE_ZLIB */
---- /ext/repair/sqlite3_checker.c.in
-+++ /ext/repair/sqlite3_checker.c.in
-@@ -2,6 +2,7 @@
- ** Read an SQLite database file and analyze its space utilization.  Generate
- ** text on standard output.
- */
-+#define SQLITE_CORE 1
- #define TCLSH_INIT_PROC sqlite3_checker_init_proc
- #define SQLITE_ENABLE_DBPAGE_VTAB 1
- #define SQLITE_ENABLE_JSON1 1
-@@ -14,7 +15,7 @@
- #define SQLITE_OMIT_SHARED_CACHE 1
- #define SQLITE_DEFAULT_MEMSTATUS 0
- #define SQLITE_MAX_EXPR_DEPTH 0
--INCLUDE sqlite3.c
-+#include "sqlite3.h"
- INCLUDE $ROOT/src/tclsqlite.c
- INCLUDE $ROOT/ext/misc/btreeinfo.c
- INCLUDE $ROOT/ext/repair/checkindex.c
---- /src/shell.c.in
-+++ /src/shell.c.in
-@@ -61,6 +61,7 @@
- #include <stdio.h>
- #include <assert.h>
- #include "sqlite3.h"
-+#include "ext/expert/sqlite3expert.h"
- typedef sqlite3_int64 i64;
- typedef sqlite3_uint64 u64;
- typedef unsigned char u8;
-@@ -127,6 +128,10 @@
- # define SHELL_USE_LOCAL_GETLINE 1
- #endif
- 
-+#ifdef SQLITE_HAVE_ZLIB
-+#include <zlib.h>
-+#endif
-+
- 
- #if defined(_WIN32) || defined(WIN32)
- # include <io.h>
-@@ -939,14 +944,7 @@
- INCLUDE ../ext/misc/shathree.c
- INCLUDE ../ext/misc/fileio.c
- INCLUDE ../ext/misc/completion.c
--INCLUDE ../ext/misc/appendvfs.c
- INCLUDE ../ext/misc/memtrace.c
--#ifdef SQLITE_HAVE_ZLIB
--INCLUDE ../ext/misc/zipfile.c
--INCLUDE ../ext/misc/sqlar.c
--#endif
--INCLUDE ../ext/expert/sqlite3expert.h
--INCLUDE ../ext/expert/sqlite3expert.c
- 
- #if defined(SQLITE_ENABLE_SESSION)
- /*
-@@ -4000,7 +3998,9 @@
-     sqlite3_shathree_init(p->db, 0, 0);
-     sqlite3_completion_init(p->db, 0, 0);
- #ifdef SQLITE_HAVE_ZLIB
-+    extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
-     sqlite3_zipfile_init(p->db, 0, 0);
-+    extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
-     sqlite3_sqlar_init(p->db, 0, 0);
- #endif
-     sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
-@@ -5971,6 +5971,7 @@
-         goto end_ar_command;
-       }
-       sqlite3_fileio_init(cmd.db, 0, 0);
-+      extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
-       sqlite3_sqlar_init(cmd.db, 0, 0);
-       sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
-                               shellPutsFunc, 0, 0);
-@@ -9260,6 +9261,7 @@
- #endif
-   }
-   data.out = stdout;
-+  extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *);
-   sqlite3_appendvfs_init(0,0,0);
- 
-   /* Go ahead and open the database file if it already exists.  If the
---- /test/sessionfuzz.c
-+++ /test/sessionfuzz.c
-@@ -700,42 +700,6 @@
- #include <assert.h>
- #include "zlib.h"
- 
--/*
--** Implementation of the "sqlar_uncompress(X,SZ)" SQL function
--**
--** Parameter SZ is interpreted as an integer. If it is less than or
--** equal to zero, then this function returns a copy of X. Or, if
--** SZ is equal to the size of X when interpreted as a blob, also
--** return a copy of X. Otherwise, decompress blob X using zlib
--** utility function uncompress() and return the results (another
--** blob).
--*/
--static void sqlarUncompressFunc(
--  sqlite3_context *context,
--  int argc,
--  sqlite3_value **argv
--){
--  uLong nData;
--  uLongf sz;
--
--  assert( argc==2 );
--  sz = sqlite3_value_int(argv[1]);
--
--  if( sz<=0 || sz==(nData = sqlite3_value_bytes(argv[0])) ){
--    sqlite3_result_value(context, argv[0]);
--  }else{
--    const Bytef *pData= sqlite3_value_blob(argv[0]);
--    Bytef *pOut = sqlite3_malloc(sz);
--    if( Z_OK!=uncompress(pOut, &sz, pData, nData) ){
--      sqlite3_result_error(context, "error in uncompress()", -1);
--    }else{
--      sqlite3_result_blob(context, pOut, sz, SQLITE_TRANSIENT);
--    }
--    sqlite3_free(pOut);
--  }
--}
--
--
- /* Run a chunk of SQL.  If any errors happen, print an error message
- ** and exit.
- */
---- /tool/mksqlite3c.tcl
-+++ /tool/mksqlite3c.tcl
-@@ -117,6 +117,7 @@
-    rtree.h
-    sqlite3session.h
-    sqlite3.h
-+   sqlite3expert.h
-    sqlite3ext.h
-    sqlite3rbu.h
-    sqliteicu.h
-@@ -403,6 +404,10 @@
-    sqlite3session.c
-    fts5.c
-    stmt.c
-+   appendvfs.c
-+   sqlar.c
-+   sqlite3expert.c
-+   zipfile.c
- } {
-   copy_file tsrc/$file
- }
---- /tool/sqlite3_analyzer.c.in
-+++ /tool/sqlite3_analyzer.c.in
-@@ -14,9 +14,6 @@
- #define SQLITE_DEFAULT_MEMSTATUS 0
- #define SQLITE_MAX_EXPR_DEPTH 0
- #define SQLITE_OMIT_LOAD_EXTENSION 1
--#ifndef USE_EXTERNAL_SQLITE
--INCLUDE sqlite3.c
--#endif
- INCLUDE $ROOT/src/tclsqlite.c
- 
- const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
---- /tool/sqltclsh.c.in
-+++ /tool/sqltclsh.c.in
-@@ -27,19 +27,17 @@
- #define SQLITE_OMIT_SHARED_CACHE 1
- #define SQLITE_DEFAULT_MEMSTATUS 0
- #define SQLITE_MAX_EXPR_DEPTH 0
--INCLUDE sqlite3.c
--INCLUDE $ROOT/ext/misc/appendvfs.c
--#ifdef SQLITE_HAVE_ZLIB
--INCLUDE $ROOT/ext/misc/zipfile.c
--INCLUDE $ROOT/ext/misc/sqlar.c
--#endif
-+#include "sqlite3.h"
- INCLUDE $ROOT/src/tclsqlite.c
- 
- const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
-   (void)interp;
-+  extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *);
-   sqlite3_appendvfs_init(0,0,0);
- #ifdef SQLITE_HAVE_ZLIB
-+  extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
-   sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
-+  extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
-   sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
- #endif
- 
diff --git a/dev-db/sqlite/files/sqlite-3.28.0-full_archive-segmentation_fault_fixes.patch b/dev-db/sqlite/files/sqlite-3.28.0-full_archive-segmentation_fault_fixes.patch
deleted file mode 100644
index cf430a9ddc5a..000000000000
--- a/dev-db/sqlite/files/sqlite-3.28.0-full_archive-segmentation_fault_fixes.patch
+++ /dev/null
@@ -1,954 +0,0 @@
-https://sqlite.org/src/info/b2ce5ed175cb5029
-https://sqlite.org/src/info/6e4a5f22811bcd14
-https://sqlite.org/src/info/516ca8945150bdc1
-https://sqlite.org/src/info/e1724f1d618cfbcf
-https://sqlite.org/src/info/c621fc668c6538f9
-https://sqlite.org/src/info/c509d8a8aebe0da4
-https://sqlite.org/src/info/a9b90aa12eecdd9f
-
---- /ext/fts3/fts3_write.c
-+++ /ext/fts3/fts3_write.c
-@@ -3754,7 +3754,7 @@
-     }
-     p->iOff += fts3GetVarint32(&p->aNode[p->iOff], &nSuffix);
- 
--    if( nPrefix>p->iOff || nSuffix>p->nNode-p->iOff ){
-+    if( nPrefix>p->term.n || nSuffix>p->nNode-p->iOff || nSuffix==0 ){
-       return FTS_CORRUPT_VTAB;
-     }
-     blobGrowBuffer(&p->term, nPrefix+nSuffix, &rc);
-@@ -3773,7 +3773,7 @@
-     }
-   }
- 
--  assert( p->iOff<=p->nNode );
-+  assert_fts3_nc( p->iOff<=p->nNode );
-   return rc;
- }
- 
---- /ext/fts5/fts5_buffer.c
-+++ /ext/fts5/fts5_buffer.c
-@@ -178,7 +178,11 @@
-     i64 iOff = *piOff;
-     int iVal;
-     fts5FastGetVarint32(a, i, iVal);
--    if( iVal==1 ){
-+    if( iVal<=1 ){
-+      if( iVal==0 ){
-+        *pi = i;
-+        return 0;
-+      }
-       fts5FastGetVarint32(a, i, iVal);
-       iOff = ((i64)iVal) << 32;
-       fts5FastGetVarint32(a, i, iVal);
---- /ext/fts5/test/fts5corrupt3.test
-+++ /ext/fts5/test/fts5corrupt3.test
-@@ -8128,6 +8128,215 @@
-   INSERT INTO t1(t1) VALUES('optimize')
- } {1 {database disk image is malformed}}
- 
-+#-------------------------------------------------------------------------
-+reset_db
-+do_test 58.0 {
-+  sqlite3 db {}
-+  db deserialize [decode_hexdb {
-+.open --hexdb
-+| size 24576 pagesize 4096 filename crash-5a5acd0ab42d31.db
-+| page 1 offset 0
-+|      0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00   SQLite format 3.
-+|     16: 10 00 01 01 00 40 20 20 00 00 00 00 00 00 00 00   .....@  ........
-+|     96: 00 00 00 00 0d 00 00 00 06 0e 0f 00 0f aa 0f 53   ...............S
-+|    112: 0e e8 0e 8b 0e 33 0e 0f 00 00 00 00 00 00 00 00   .....3..........
-+|   3584: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 22   ................
-+|   3600: 06 06 17 11 11 01 31 74 61 62 6c 65 62 62 62 62   ......1tablebbbb
-+|   3616: 06 43 52 45 41 54 45 20 54 41 42 4c 45 20 62 62   .CREATE TABLE bb
-+|   3632: 28 61 29 56 05 06 17 1f 1f 01 7d 74 61 62 6c 65   (a)V.......table
-+|   3648: 74 31 5f 63 2a 6e 66 69 68 74 31 5f 63 6f 6e 66   t1_c*nfiht1_conf
-+|   3664: 69 67 05 43 52 45 41 54 45 20 54 41 42 4c 45 20   ig.CREATE TABLE 
-+|   3680: 27 74 31 5f 63 6f 6e 66 69 67 27 28 6b 20 50 52   't1_config'(k PR
-+|   3696: 49 4d 41 52 59 20 4b 45 59 2c 20 76 29 20 57 49   IMARY KEY, v) WI
-+|   3712: 54 48 4f 55 54 20 52 4f 57 49 44 5b 04 07 17 21   THOUT ROWID[...!
-+|   3728: 21 01 81 01 74 61 62 6c 65 74 31 5f 64 6f 73 73   !...tablet1_doss
-+|   3744: 69 7a 65 74 31 5f 64 6f 63 73 69 7a 65 04 43 52   izet1_docsize.CR
-+|   3760: 45 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 64   EATE TABLE 't1_d
-+|   3776: 6f 63 73 69 7a 65 27 28 69 64 20 49 4e 54 45 47   ocsize'(id INTEG
-+|   3792: 45 52 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20   ER PRIMARY KEY, 
-+|   3808: 73 7a 20 42 4c 4f 42 29 69 03 07 17 19 19 01 81   sz BLOB)i.......
-+|   3824: 2d 74 61 62 6c 65 74 31 5f 69 64 78 74 31 5f 69   -tablet1_idxt1_i
-+|   3840: 64 78 03 43 52 45 41 54 45 20 54 41 42 4c 45 20   dx.CREATE TABLE 
-+|   3856: 27 74 31 5f 69 64 78 27 28 73 65 67 69 64 2c 20   't1_idx'(segid, 
-+|   3872: 74 65 72 6d 2c 20 70 67 6e 6f 2c 20 50 52 49 4d   term, pgno, PRIM
-+|   3888: 41 52 59 20 4b 45 59 28 73 65 67 69 64 2c 20 74   ARY KEY(segid, t
-+|   3904: 65 72 6d 29 29 20 57 49 54 48 4f 55 54 20 52 4f   erm)) WITHOUT RO
-+|   3920: 57 49 44 55 02 07 17 1b 1b 01 81 01 74 61 62 6c   WIDU........tabl
-+|   3936: 65 74 31 5f 64 61 74 61 74 31 5f 64 61 74 61 02   et1_datat1_data.
-+|   3952: 43 52 45 41 54 45 20 54 41 42 4c 45 20 27 74 31   CREATE TABLE 't1
-+|   3968: 5f 64 61 74 61 27 28 69 64 20 49 4e 54 45 47 45   _data'(id INTEGE
-+|   3984: 52 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20 62   R PRIMARY KEY, b
-+|   4000: 6c 6f 63 6b 20 42 4c 4f 42 29 54 01 07 17 11 11   lock BLOB)T.....
-+|   4016: 08 81 15 74 61 62 6c 65 74 31 74 31 43 52 45 41   ...tablet1t1CREA
-+|   4032: 54 45 20 56 49 52 54 55 41 4c 20 54 41 42 4c 45   TE VIRTUAL TABLE
-+|   4048: 20 74 31 20 55 53 49 4e 47 20 66 74 73 35 28 61    t1 USING fts5(a
-+|   4064: 2c 62 2c 70 72 65 66 69 78 3d 22 32 2c 32 2c 33   ,b,prefix=.2,2,3
-+|   4080: 2c 34 22 2c 20 63 6f 6e 74 65 6e 74 3d 22 22 29   ,4., content=..)
-+| page 2 offset 4096
-+|      0: 0d 0b 6a 00 37 09 4c 02 0f e7 09 4c 0f c6 0f a4   ..j.7.L....L....
-+|     16: 0f 88 0f 6d 0f 4b 0f 2c 0f 0e 0e ec 0e cd 0e ae   ...m.K.,........
-+|     32: 0e 8e 0e 6c 0e 4b 0e 29 0e 08 0d e6 0d c4 0d b5   ...l.K.)........
-+|     48: 0d 97 0d 76 0d 54 0d 30 fd 15 0c f3 0c d3 0c b5   ...v.T.0........
-+|     64: 0c 95 0c 73 0c 54 0c 32 0c 10 0b ee 0b cc 0b b0   ...s.T.2........
-+|     80: 0b 8d 0b 7e 0b 48 0b 2e 0b 0b 0a ef 0a cc 0a ad   ...~.H..........
-+|     96: 0a 8c 0a 6d 0a 4d 0a 2b 0a 0c 00 00 00 00 00 00   ...m.M.+........
-+|   2368: 00 00 00 00 00 00 00 00 00 00 00 00 15 0a 03 00   ................
-+|   2384: 30 00 00 00 9c 01 03 35 00 03 01 01 12 02 01 12   0......5........
-+|   2400: 03 01 11 1c 8c 80 80 80 80 10 03 00 3e 00 00 00   ............>...
-+|   2416: 17 01 05 05 34 74 61 62 6c 03 02 03 01 04 77 68   ....4tabl.....wh
-+|   2432: 65 72 03 02 06 09 1b 8c 80 80 80 80 0f 03 00 3c   er.............<
-+|   2448: 00 00 00 16 05 34 66 74 73 34 03 02 02 01 04 6e   .....4fts4.....n
-+|   2464: 75 6d 62 03 06 01 04 09 1b 8c 80 80 80 80 0e 03   umb.............
-+|   2480: 00 3c 00 00 00 16 04 33 74 68 65 03 06 01 01 04   .<.....3the.....
-+|   2496: 01 03 77 68 65 03 02 04 04 0a 1b 8c 80 80 80 80   ..whe...........
-+|   2512: 0d 03 00 3c 00 00 00 16 04 33 6e 75 6d 03 06 01   ...<.....3num...
-+|   2528: 01 05 01 03 74 61 62 05 62 03 04 0a 19 8c 80 80   ....tab.b.......
-+|   2544: 80 80 0c 03 00 38 00 00 00 14 03 39 a7 68 03 02   .....8.....9.h..
-+|   2560: 04 10 04 33 66 74 73 03 02 02 04 07 18 8c 80 80   ...3fts.........
-+|   2576: 80 80 0b 03 00 36 00 00 00 13 03 32 74 61 03 02   .....6.....2ta..
-+|   2592: 03 02 01 68 03 06 01 01 04 04 07 1b 8c 80 80 80   ...h............
-+|   2608: 80 0a 03 00 3c 00 00 00 16 03 32 6e 75 03 06 01   ....<.....2nu...
-+|   2624: 01 05 01 02 6f 66 03 06 01 01 06 04 09 19 8c 80   ....of..........
-+|   2640: 80 80 80 09 03 00 38 00 00 00 14 03 32 66 74 03   ......8.....2ft.
-+|   2656: 02 02 01 02 69 73 03 06 01 01 03 04 07 18 8c 80   ....is..........
-+|   2672: 80 80 80 08 03 00 36 00 00 00 13 02 31 74 03 08   ......6.....1t..
-+|   2688: 03 01 01 04 01 01 77 03 02 04 04 09 1a 8c 80 80   ......w.........
-+|   2704: 80 80 07 03 00 3a ff 00 00 15 02 31 6e 03 08 01   .....:.....1n...
-+|   2720: 01 02 05 01 01 6f 03 06 01 01 06 04 09 18 8c 80   .....o..........
-+|   2736: 80 80 80 06 03 00 36 00 00 00 13 04 02 31 66 03   ......6......1f.
-+|   2752: 02 01 f1 01 69 03 06 01 01 03 05 06 1c 8c 80 80   ....i...........
-+|   2768: 80 80 05 03 00 3e 00 00 00 17 04 30 74 68 65 03   .....>.....0the.
-+|   2784: 06 01 01 14 01 05 77 68 65 72 65 03 02 04 0a 15   ......where.....
-+|   2800: 8c 80 80 80 80 04 03 00 30 00 00 00 11 01 01 06   ........0.......
-+|   2816: 06 30 74 61 62 6c cc 03 02 03 07 1c 8c 80 80 80   .0tabl..........
-+|   2832: 80 03 03 00 3e 00 00 00 17 07 30 6e 75 6d 62 65   ....>.....0numbe
-+|   2848: 72 03 06 01 01 05 01 02 6f 66 02 06 04 0d 13 8c   r.......of......
-+|   2864: 80 80 80 80 02 03 00 2c 00 00 00 0f 01 01 03 02   .......,........
-+|   2880: 30 6e 03 06 01 01 02 07 1b 8c 80 80 80 80 01 03   0n..............
-+|   2896: 00 3c 00 00 00 16 08 30 66 74 73 34 61 75 78 03   .<.....0fts4aux.
-+|   2912: 02 02 01 02 69 73 03 06 04 0c 00 00 00 14 2a 00   ....is........*.
-+|   2928: 00 00 01 01 02 24 00 02 01 01 12 02 01 12 08 88   .....$..........
-+|   2944: 80 80 80 80 12 03 00 16 00 00 00 05 02 1c 88 80   ................
-+|   2960: 80 80 80 11 03 00 3e 00 00 00 17 05 34 72 6f 77   ......>.....4row
-+|   2976: 73 02 06 01 01 05 01 04 74 68 65 72 02 02 04 0b   s.......ther....
-+|   2992: 15 88 80 80 80 80 10 03 00 3e 10 00 00 11 02 01   .........>......
-+|   3008: 01 07 05 34 62 65 74 77 02 02 04 08 1b 88 80 80   ...4betw........
-+|   3024: 80 80 0f 03 00 3c 00 00 00 16 04 04 33 72 6f 77   .....<......3row
-+|   3040: 02 06 01 01 05 01 03 74 68 65 02 08 05 0a 1b 88   .......the......
-+|   3056: 80 80 80 80 0e 03 05 0c 00 00 00 16 01 01 02 04   ................
-+|   3072: 33 61 72 65 02 02 03 01 03 62 65 74 02 02 07 08   3are.....bet....
-+|   3088: 1b 88 80 80 80 80 0d 03 00 3c 00 00 00 16 03 32   .........<.....2
-+|   3104: 74 68 02 08 02 01 01 07 00 04 33 61 6e 64 02 06   th........3and..
-+|   3120: 04 01 1b 88 80 80 80 80 0c 03 00 3c 00 00 00 16   ...........<....
-+|   3136: 03 32 69 6e 02 06 01 01 06 01 02 72 6f 02 06 01   .2in.......ro...
-+|   3152: 01 05 04 09 18 88 80 80 80 80 0b 03 00 36 00 00   .............6..
-+|   3168: 00 13 02 03 32 61 72 02 02 03 01 02 62 65 02 02   ....2ar.....be..
-+|   3184: 04 05 07 1b 88 80 bf 80 80 0a 03 00 3c 00 00 00   ............<...
-+|   3200: 16 02 31 74 02 08 02 01 01 07 00 03 32 61 6e 02   ..1t........2an.
-+|   3216: 06 01 01 04 09 19 88 80 80 80 80 09 03 00 38 00   ..............8.
-+|   3232: 00 00 14 02 31 6e 02 06 01 01 03 01 01 72 02 06   ....1n.......r..
-+|   3248: 01 01 05 03 08 17 88 80 80 80 80 08 03 00 34 00   ..............4.
-+|   3264: 01 00 12 02 31 62 02 02 04 01 01 69 02 06 01 01   ....1b.....i....
-+|   3280: 06 04 06 19 88 80 80 80 80 07 03 00 38 00 00 00   ............8...
-+|   3296: 14 04 02 31 32 02 02 05 01 01 61 02 08 03 01 01   ...12.....a.....
-+|   3312: 02 05 06 1b 88 80 80 80 80 06 03 00 3c 00 00 00   ............<...
-+|   3328: 16 06 30 74 68 65 72 65 02 12 02 00 02 31 31 02   ..0there.....11.
-+|   3344: 06 01 01 04 0a 15 88 80 80 80 80 05 03 00 30 00   ..............0.
-+|   3360: 00 00 11 01 01 05 04 30 74 68 65 02 06 71 01 07   .......0the..q..
-+|   3376: 07 1c 88 80 80 80 80 04 03 00 3e 00 00 00 17 01   ..........>.....
-+|   3392: 01 06 02 30 6e 02 06 01 01 03 01 04 72 6f 77 73   ...0n.......rows
-+|   3408: 02 06 07 08 1b 88 80 80 80 80 03 03 00 3c 00 00   .............<..
-+|   3424: 00 16 08 30 62 65 74 77 65 65 6e 02 02 04 01 02   ...0between.....
-+|   3440: 69 6e 02 06 04 0c 1a 88 80 80 80 80 02 03 00 3a   in.............:
-+|   3456: 08 f0 00 15 04 30 61 6e 64 02 06 01 01 02 02 02   .....0and.......
-+|   3472: 72 65 02 02 03 04 0a 17 88 80 80 80 80 01 03 00   re..............
-+|   3488: 34 00 00 00 12 02 30 31 02 06 01 01 04 01 01 32   4.....01.......2
-+|   3504: 02 02 07 04 08 08 84 80 80 80 80 12 03 00 16 00   ................
-+|   3520: 00 00 05 04 1b 84 80 80 80 80 11 03 00 3c 00 00   .............<..
-+|   3536: 00 16 05 34 74 61 62 6c 01 06 01 01 05 02 03 65   ...4tabl.......e
-+|   3552: 72 6d 01 02 04 0b 1b 84 80 80 80 80 10 03 00 3c   rm.............<
-+|   3568: 00 00 00 16 05 34 65 61 63 68 01 02 03 01 04 70   .....4each.....p
-+|   3584: 72 65 73 01 02 05 04 09 1a 84 80 80 80 80 0f 03   res.............
-+|   3600: 00 3a 00 00 00 15 04 33 74 65 72 01 02 04 02 02   .:.....3ter.....
-+|   3616: 68 65 01 06 01 01 03 04 08 1b 84 80 80 80 80 0e   he..............
-+|   3632: 03 00 3c 00 00 00 16 04 33 70 72 65 01 02 05 01   ..<.....3pre....
-+|   3648: 03 74 61 62 01 06 01 01 05 04 08 1a 84 80 80 80   .tab............
-+|   3664: 80 0d 03 00 3a 00 00 00 15 04 33 66 6f 72 01 02   ....:.....3for..
-+|   3680: 02 02 02 74 73 01 06 01 01 04 03 f8 1b 84 80 80   ...ts...........
-+|   3696: 80 80 0c 03 00 3c 00 00 00 16 03 32 74 68 01 06   .....<.....2th..
-+|   3712: 01 01 03 00 04 33 65 61 63 01 02 03 04 09 18 84   .....3eac.......
-+|   3728: 80 80 80 80 0b 03 00 36 00 00 00 13 03 32 74 61   .......6.....2ta
-+|   3744: 01 06 01 01 05 02 01 65 00 02 04 04 09 19 84 80   .......e........
-+|   3760: 80 80 80 0a 03 10 38 00 00 00 14 03 32 69 6e 01   ......8.....2in.
-+|   3776: 06 01 01 02 01 02 70 72 01 02 05 04 09 18 84 80   ......pr........
-+|   3792: 80 80 80 09 03 00 36 00 00 00 13 03 32 66 6f 01   ......6.....2fo.
-+|   3808: 02 02 02 01 74 01 06 01 01 04 04 07 1b 84 80 80   ....t...........
-+|   3824: 80 80 08 03 00 3c 00 00 00 16 02 31 74 01 0a 04   .....<.....1t...
-+|   3840: 01 00 03 04 00 03 32 65 61 01 02 03 04 0a 17 84   ......2ea.......
-+|   3856: 80 80 80 80 07 03 00 34 00 00 00 12 02 31 69 01   .......4.....1i.
-+|   3872: 06 01 01 02 de 01 70 01 02 05 04 08 18 84 80 80   ......p.........
-+|   3888: 80 80 06 03 00 36 00 00 00 13 02 31 65 01 02 03   .....6.....1e...
-+|   3904: 01 01 66 01 08 02 01 01 04 04 06 1b 84 80 80 80   ..f.............
-+|   3920: 80 05 03 00 3c 00 00 00 16 05 30 74 65 72 6d 01   ....<.....0term.
-+|   3936: 02 04 02 02 68 65 01 06 01 01 03 04 09 14 84 80   ....he..........
-+|   3952: 80 80 80 04 03 00 2e 00 00 00 10 06 30 74 61 62   ............0tab
-+|   3968: 6c 65 01 06 01 01 05 04 15 84 80 80 80 80 03 03   le..............
-+|   3984: 00 30 00 00 00 11 02 08 30 70 72 65 73 65 6e 74   .0......0present
-+|   4000: 01 02 05 05 1b 84 80 80 80 80 02 03 00 3c 00 00   .............<..
-+|   4016: 00 16 04 30 66 74 73 01 06 01 01 04 01 02 69 6e   ...0fts.......in
-+|   4032: 01 06 01 01 04 0a 1a 84 80 80 80 80 01 03 00 3a   ...............:
-+|   4048: 00 00 00 15 05 30 65 61 63 68 00 f2 03 01 03 66   .....0each.....f
-+|   4064: 6f 72 01 02 02 04 09 06 01 03 00 12 03 0b 0f 00   or..............
-+|   4080: 00 08 8c 80 80 80 80 11 03 00 16 00 00 00 05 04   ................
-+| page 3 offset 8192
-+|      0: 0a 00 00 00 32 0e 4f 00 0f fa 0f f1 0f e9 0f e1   ....2.O.........
-+|     16: 0f d8 0f d1 0f c9 0f c1 0f b9 0f c1 0f a9 0f a0   ................
-+|     32: 0f 98 0f 90 0f 87 0f 80 0f 78 0f 71 0f 68 0f 5f   .........x.q.h._
-+|     48: 0f 56 0f 4d 0f 41 0f 38 0f 2f 0f 26 0f 1d 0f 13   .V.M.A.8./.&....
-+|     64: 0f 0a 0f 01 0e f7 0e ee 0e e6 0e dd 0e d7 0e cd   ................
-+|     80: 0e c3 0e ba 0e b0 0e a8 0e 9f 0e 96 0e 8e 0e 85   ................
-+|   3648: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 08   ................
-+|   3664: 04 01 10 01 03 34 74 20 07 04 01 0e 01 03 34 1e   .....4t ......4.
-+|   3680: 09 04 01 12 34 03 33 74 68 1c 08 04 01 10 01 03   ....4.3th.......
-+|   3696: 33 6e 1a 08 04 01 10 01 03 32 77 18 08 04 01 10   3n.......2w.....
-+|   3712: 01 03 32 74 16 08 04 01 10 01 03 32 6e 14 07 04   ..2t.......2n...
-+|   3728: 01 0e 01 03 32 12 08 04 01 0f f1 03 31 74 10 08   ....2.......1t..
-+|   3744: 04 01 10 01 03 31 6e 0e 07 04 01 0e 01 03 30 fc   .....1n.......0.
-+|   3760: 09 04 01 12 01 03 30 74 68 0a 08 04 01 10 01 03   ......0th.......
-+|   3776: 30 74 08 09 04 01 12 01 03 30 6e 75 06 08 04 01   0t.......0nu....
-+|   3792: 10 01 03 30 6e 04 06 04 01 0c 01 05 52 08 04 01   ...0n.......R...
-+|   3808: 10 01 02 34 72 22 07 04 01 0e 01 02 34 20 08 04   ...4r.......4 ..
-+|   3824: 01 10 01 02 33 72 1e 09 04 01 12 01 02 33 61 72   ....3r.......3ar
-+|   3840: 1c 08 04 01 10 01 02 32 74 1a 08 04 01 10 b3 02   .......2t.......
-+|   3856: 32 69 18 09 04 01 12 01 02 32 61 72 16 08 04 01   2i.......2ar....
-+|   3872: 10 01 02 31 74 14 08 04 01 10 01 02 31 6e 12 08   ...1t.......1n..
-+|   3888: 04 01 10 01 02 31 62 10 08 04 01 10 01 02 31 32   .....1b.......12
-+|   3904: 0e 0b 04 01 16 01 02 30 74 68 65 72 0c 08 04 01   .......0ther....
-+|   3920: 10 01 02 30 74 0a 08 04 01 10 01 02 30 6e 08 08   ...0t.......0n..
-+|   3936: 04 01 10 01 02 30 62 06 09 04 01 10 01 02 30 61   .....0b.......0a
-+|   3952: 04 06 04 01 0c 01 02 02 07 04 09 10 01 34 74 22   .............4t.
-+|   3968: 06 04 09 0e 01 34 20 08 04 09 12 01 33 74 65 1e   .....4 .....3te.
-+|   3984: 07 04 09 10 01 33 70 1c 07 f4 09 11 01 33 66 1a   .....3p......3f.
-+|   4000: 08 04 09 12 01 32 74 68 18 07 04 09 10 01 32 e4   .....2th......2.
-+|   4016: 16 07 04 09 10 01 32 69 14 07 04 09 10 01 32 66   ......2i......2f
-+|   4032: 12 07 04 09 10 01 31 74 10 07 04 09 10 01 31 69   ......1t......1i
-+|   4048: 0e 06 04 09 0e 01 31 0c 08 04 09 12 01 30 74 65   ......1......0te
-+|   4064: 0a 07 04 09 10 01 30 74 08 00 00 00 00 00 00 00   ......0t........
-+| page 4 offset 12288
-+|   4064: 00 00 00 00 00 00 00 00 00 00 00 05 03 03 00 10   ................
-+|   4080: 03 05 05 02 03 00 10 04 06 05 01 03 00 10 04 04   ................
-+| page 5 offset 16384
-+|      0: 0a 00 00 00 02 0f eb 00 0f eb 0f f4 00 00 00 00   ................
-+|   4064: 00 00 00 00 00 00 00 00 00 00 00 08 03 15 01 70   ...............p
-+|   4080: 67 73 7a 18 0b 03 1b 01 76 65 72 73 69 6f 6e 04   gsz.....version.
-+| page 6 offset 20480
-+|   4080: 00 00 23 03 02 01 03 03 02 00 00 00 00 00 00 00   ..#.............
-+| end crash-5a5acd0ab42d31.db
-+}]} {}
-+
-+do_execsql_test 58.1 {
-+  SELECT * FROM t1('t*');
-+} {{} {} {} {} {} {}}
- 
- sqlite3_fts5_may_be_corrupt 0
- finish_test
---- /src/btree.c
-+++ /src/btree.c
-@@ -4284,10 +4284,9 @@
-       rc = newDatabase(pBt);
-       pBt->nPage = get4byte(28 + pBt->pPage1->aData);
- 
--      /* The database size was written into the offset 28 of the header
--      ** when the transaction started, so we know that the value at offset
--      ** 28 is nonzero. */
--      assert( pBt->nPage>0 );
-+      /* pBt->nPage might be zero if the database was corrupt when 
-+      ** the transaction was started. Otherwise, it must be at least 1.  */
-+      assert( CORRUPT_DB || pBt->nPage>0 );
-     }
-     sqlite3BtreeLeave(p);
-   }
-@@ -7637,6 +7636,7 @@
-     u16 maskPage = pOld->maskPage;
-     u8 *piCell = aData + pOld->cellOffset;
-     u8 *piEnd;
-+    VVA_ONLY( int nCellAtStart = b.nCell; )
- 
-     /* Verify that all sibling pages are of the same "type" (table-leaf,
-     ** table-interior, index-leaf, or index-interior).
-@@ -7665,6 +7665,10 @@
-     */
-     memset(&b.szCell[b.nCell], 0, sizeof(b.szCell[0])*(limit+pOld->nOverflow));
-     if( pOld->nOverflow>0 ){
-+      if( limit<pOld->aiOvfl[0] ){
-+        rc = SQLITE_CORRUPT_BKPT;
-+        goto balance_cleanup;
-+      }
-       limit = pOld->aiOvfl[0];
-       for(j=0; j<limit; j++){
-         b.apCell[b.nCell] = aData + (maskPage & get2byteAligned(piCell));
-@@ -7684,6 +7688,7 @@
-       piCell += 2;
-       b.nCell++;
-     }
-+    assert( (b.nCell-nCellAtStart)==(pOld->nCell+pOld->nOverflow) );
- 
-     cntOld[i] = b.nCell;
-     if( i<nOld-1 && !leafData){
---- /src/resolve.c
-+++ /src/resolve.c
-@@ -866,7 +866,9 @@
- #ifndef SQLITE_OMIT_WINDOWFUNC
-         if( pExpr->y.pWin ){
-           Select *pSel = pNC->pWinSelect;
--          sqlite3WindowUpdate(pParse, pSel->pWinDefn, pExpr->y.pWin, pDef);
-+          if( IN_RENAME_OBJECT==0 ){
-+            sqlite3WindowUpdate(pParse, pSel->pWinDefn, pExpr->y.pWin, pDef);
-+          }
-           sqlite3WalkExprList(pWalker, pExpr->y.pWin->pPartition);
-           sqlite3WalkExprList(pWalker, pExpr->y.pWin->pOrderBy);
-           sqlite3WalkExpr(pWalker, pExpr->y.pWin->pFilter);
---- /src/vdbe.c
-+++ /src/vdbe.c
-@@ -264,7 +264,7 @@
-     ** is clear. Otherwise, if this is an ephemeral cursor created by 
-     ** OP_OpenDup, the cursor will not be closed and will still be part
-     ** of a BtShared.pCursor list.  */
--    p->apCsr[iCur]->isEphemeral = 0;
-+    if( p->apCsr[iCur]->pBtx==0 ) p->apCsr[iCur]->isEphemeral = 0;
-     sqlite3VdbeFreeCursor(p, p->apCsr[iCur]);
-     p->apCsr[iCur] = 0;
-   }
-@@ -3686,7 +3686,10 @@
-   if( pCx ){
-     /* If the ephermeral table is already open, erase all existing content
-     ** so that the table is empty again, rather than creating a new table. */
--    rc = sqlite3BtreeClearTable(pCx->pBtx, pCx->pgnoRoot, 0);
-+    assert( pCx->isEphemeral );
-+    if( pCx->pBtx ){
-+      rc = sqlite3BtreeClearTable(pCx->pBtx, pCx->pgnoRoot, 0);
-+    }
-   }else{
-     pCx = allocateCursor(p, pOp->p1, pOp->p2, -1, CURTYPE_BTREE);
-     if( pCx==0 ) goto no_mem;
---- /test/altertab3.test
-+++ /test/altertab3.test
-@@ -142,6 +142,39 @@
-   ALTER TABLE Table0 RENAME Col0 TO Col0;
- }
- 
-+#-------------------------------------------------------------------------
-+reset_db
-+do_execsql_test 7.1.0 {
-+  CREATE TABLE t1(a,b,c);
-+  CREATE TRIGGER AFTER INSERT ON t1 BEGIN
-+    SELECT a, rank() OVER w1 FROM t1
-+    WINDOW w1 AS (PARTITION BY b, percent_rank() OVER w1);
-+  END;
-+}
-+
-+do_execsql_test 7.1.2 {
-+  ALTER TABLE t1 RENAME TO t1x;
-+  SELECT sql FROM sqlite_master;
-+} {
-+  {CREATE TABLE "t1x"(a,b,c)}
-+  {CREATE TRIGGER AFTER INSERT ON "t1x" BEGIN
-+    SELECT a, rank() OVER w1 FROM "t1x"
-+    WINDOW w1 AS (PARTITION BY b, percent_rank() OVER w1);
-+  END}
-+}
-+
-+do_execsql_test 7.2.1 {
-+  DROP TRIGGER after;
-+  CREATE TRIGGER AFTER INSERT ON t1x BEGIN
-+    SELECT a, rank() OVER w1 FROM t1x
-+    WINDOW w1 AS (PARTITION BY b, percent_rank() OVER w1 ORDER BY d);
-+  END;
-+}
-+
-+do_catchsql_test 7.2.2 {
-+  ALTER TABLE t1x RENAME TO t1;
-+} {1 {error in trigger AFTER: no such column: d}}
-+
- finish_test
- 
- 
---- /test/corruptL.test
-+++ /test/corruptL.test
-@@ -838,4 +838,32 @@
-   INSERT INTO t3 SELECT * FROM t2;
- } {1 {database disk image is malformed}}
- 
-+#-------------------------------------------------------------------------
-+reset_db
-+do_test 9.0 {
-+  sqlite3 db {}
-+  db deserialize [decode_hexdb {
-+| size 8192 pagesize 4096 filename crash-ab10597e4e1c32.db
-+| page 1 offset 0
-+|      0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00   SQLite format 3.
-+|     16: 10 00 01 01 00 40 20 20 00 00 00 00 00 00 00 00   .....@  ........
-+|     96: 00 00 00 00 0d 00 00 00 01 0f d6 00 0f d6 00 00   ................
-+|   4048: 00 00 00 00 00 00 28 01 06 17 11 11 01 3d 74 61   ......(......=ta
-+|   4064: 62 6c 65 74 31 74 31 02 43 52 45 41 54 45 20 54   blet1t1.CREATE T
-+|   4080: 41 42 4c 45 20 74 31 28 61 2c 62 2c 63 2c 64 29   ABLE t1(a,b,c,d)
-+| page 2 offset 4096
-+|      0: 0d 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
-+| end crash-ab10597e4e1c32.db
-+}]} {}
-+
-+do_execsql_test 9.1 {
-+  SAVEPOINT one;
-+}
-+do_catchsql_test 9.3 {
-+  INSERT INTO t1(b,c) VALUES(5,6);
-+} {1 {database disk image is malformed}}
-+do_execsql_test 9.3 {
-+  ROLLBACK TO one;
-+}
-+
- finish_test
---- /test/fts3corrupt4.test
-+++ /test/fts3corrupt4.test
-@@ -3915,5 +3915,491 @@
-   SELECT 'FyzLy'FROM t1 WHERE t1 MATCH 'j';
- } {1 {database disk image is malformed}}
- 
-+#-------------------------------------------------------------------------
-+reset_db
-+do_test 24.0 {
-+  sqlite3 db {}
-+  db deserialize [decode_hexdb {
-+.open --hexdb
-+| size 28672 pagesize 4096 filename crash-369d042958c29b.db
-+| page 1 offset 0
-+|      0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00   SQLite format 3.
-+|     16: 10 00 01 01 00 40 20 20 00 00 03 10 00 00 00 00   .....@  ........
-+|     96: 00 00 00 00 0d 0e b1 00 06 0d a4 00 0f 8d 0f 21   ...............!
-+|    112: 0e b9 0d c8 0e 7e 0d a4 00 00 00 00 00 00 00 00   .....~..........
-+|   3488: 00 00 00 00 22 07 06 17 11 11 01 31 74 61 62 6c   ...........1tabl
-+|   3504: 65 74 32 74 32 07 43 52 45 41 54 45 20 54 41 42   et2t2.CREATE TAB
-+|   3520: 4c 45 20 74 32 28 78 29 81 33 05 07 17 1f 1f 01   LE t2(x).3......
-+|   3536: 82 35 74 61 62 6c 65 74 31 5f 73 65 67 64 69 72   .5tablet1_segdir
-+|   3552: 74 31 5f 73 65 67 64 69 72 05 43 52 45 41 54 45   t1_segdir.CREATE
-+|   3568: 20 54 41 42 4c 45 20 27 74 31 5f 73 65 67 64 69    TABLE 't1_segdi
-+|   3584: 72 27 28 6c 65 76 65 6c 20 49 4e 54 45 47 45 52   r'(level INTEGER
-+|   3600: 2c 69 64 78 20 49 4e 54 45 47 45 52 2c 73 74 61   ,idx INTEGER,sta
-+|   3616: 72 74 5f 62 6c 6f 63 6b 20 49 4e 54 45 47 45 52   rt_block INTEGER
-+|   3632: 2c 6c 65 61 76 65 73 5f 65 6e 64 5f 62 6c 6f 63   ,leaves_end_bloc
-+|   3648: 6b 20 49 4e 54 45 47 45 52 2c 65 6e 64 5f 62 6c   k INTEGER,end_bl
-+|   3664: 6f 63 6b 20 49 4e 54 45 47 45 52 2c 72 6f 6f 74   ock INTEGER,root
-+|   3680: 20 42 4c 4f 42 2c 50 52 49 4d 41 52 59 20 4b 45    BLOB,PRIMARY KE
-+|   3696: 59 28 6c 65 76 65 6c 2c 20 69 64 78 29 29 31 06   Y(level, idx))1.
-+|   3712: 06 17 45 1f 01 00 69 6e 64 65 78 73 71 6c 69 74   ..E...indexsqlit
-+|   3728: 65 5f 61 75 74 6f 69 6e 64 65 78 5f 74 31 5f 73   e_autoindex_t1_s
-+|   3744: 65 67 64 69 72 5f 31 74 31 5f 73 65 67 64 69 72   egdir_1t1_segdir
-+|   3760: 06 0f c7 00 08 00 10 00 00 66 04 07 17 23 23 01   .........f...##.
-+|   3776: 81 13 74 61 62 6c 65 74 31 5f 73 65 67 6d 65 6e   ..tablet1_segmen
-+|   3792: 64 73 74 31 5f 73 65 67 6d 65 6e 74 73 04 43 52   dst1_segments.CR
-+|   3808: 45 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 73   EATE TABLE 't1_s
-+|   3824: 65 67 6d 65 6e 74 73 27 28 62 6c 6f 63 6b 69 64   egments'(blockid
-+|   3840: 20 49 4e 54 45 47 45 52 20 50 52 49 4d 41 52 59    INTEGER PRIMARY
-+|   3856: 20 4b 45 59 2c 20 62 6c 6f 63 6b 20 42 4c 4f 42    KEY, block BLOB
-+|   3872: 29 6a 03 07 17 21 21 01 81 1f 74 61 62 6c 65 74   )j...!!...tablet
-+|   3888: 31 4f 63 6f 6e 74 65 6e 74 74 31 5f 63 6f 6e 74   1Ocontentt1_cont
-+|   3904: 65 6e 74 03 43 52 45 41 54 45 20 54 41 42 4c 45   ent.CREATE TABLE
-+|   3920: 20 27 74 31 5f 63 6f 6e 74 65 6e 74 27 28 64 6f    't1_content'(do
-+|   3936: 63 69 64 20 49 4e 54 45 47 45 52 20 50 52 39 4d   cid INTEGER PR9M
-+|   3952: 41 52 59 20 4b 45 59 2c 20 27 63 30 61 27 2c 20   ARY KEY, 'c0a', 
-+|   3968: 27 63 31 62 27 2c 20 27 63 32 63 27 29 38 02 06   'c1b', 'c2c')8..
-+|   3984: 17 11 11 08 5f 74 61 62 6c 65 74 31 74 31 43 52   ...._tablet1t1CR
-+|   4000: 45 41 54 45 20 56 49 52 54 55 41 4c 20 54 41 42   EATE VIRTUAL TAB
-+|   4016: 4c 45 20 74 31 20 55 53 49 4e 47 20 66 74 73 33   LE t1 USING fts3
-+|   4032: 28 61 2c 62 2c 63 29 00 00 00 00 00 00 00 00 00   (a,b,c).........
-+| page 3 offset 8192
-+|      0: 0d 00 00 00 26 0b 48 0e 0f d8 0f af 0f 86 0f 74   ....&.H........t
-+|     16: 0f 61 0f 4e 0f 2f 0f 0f 0e ef 0e d7 0e be 0e a5   .a.N./..........
-+|     32: 0e 8d 0e 74 0e 5b 0e 40 0e 24 0e 08 0d ef 0d d5   ...t.[.@.$......
-+|     48: 0d bb 0d a0 0e 94 03 28 0d 4f 0d 35 0d 1b 05 0b   .......(.O.5....
-+|     64: 0c da 0c b9 0c 99 0c 78 0c 57 0c 3e 0c 24 0c 0a   .......x.W.>.$..
-+|   2880: 00 00 00 00 00 00 00 00 81 3f 25 06 00 72 7f 00   .........?%..r..
-+|   2896: 00 43 4f 4d 50 49 4c 45 52 3d 67 63 63 2d 35 2e   .COMPILER=gcc-5.
-+|   2912: 34 2e 30 20 32 30 31 36 30 36 30 39 20 44 55 42   4.0 20160609 DUB
-+|   2928: 55 47 20 45 4e 41 e4 7c 45 20 44 42 53 54 41 54   UG ENA.|E DBSTAT
-+|   2944: e4 d1 54 41 42 20 45 4e 41 42 4c 45 20 46 54 53   ..TAB ENABLE FTS
-+|   2960: 34 20 45 4e 41 42 4c 45 20 46 54 53 35 20 45 4e   4 ENABLE FTS5 EN
-+|   2976: 41 42 4c 45 20 47 45 4f 50 4f 4c 59 20 45 4e 41   ABLE GEOPOLY ENA
-+|   2992: 42 4c 45 20 4a 53 4f 4e 31 20 45 4e 41 42 4c 45   BLE JSON1 ENABLE
-+|   3008: 20 4d 45 4d 53 59 53 35 20 45 4e 41 42 4c 45 20    MEMSYS5 ENABLE 
-+|   3024: 42 54 52 45 45 20 4d 41 58 20 4d 45 4d 4f 52 59   BTREE MAX MEMORY
-+|   3040: 3d 35 30 30 30 30 30 30 30 20 4f 4c 49 54 20 4c   =50000000 OLIT L
-+|   3056: 4f 41 43 20 45 58 54 45 4e 53 49 4f 4e 21 54 48   OAC EXTENSION!TH
-+|   3072: 52 45 41 44 53 41 46 45 3d 30 18 24 05 00 25 0f   READSAFE=0.$..%.
-+|   3088: 19 54 48 52 45 41 44 53 41 46 45 3d 30 58 42 49   .THREADSAFE=0XBI
-+|   3104: 4e 41 52 59 18 23 05 00 25 0f 19 54 48 52 45 41   NARY.#..%..THREA
-+|   3120: 44 53 41 4b 75 3d 30 58 4d 4f 43 41 53 45 17 22   DSAKu=0XMOCASE..
-+|   3136: 05 00 25 0f 17 54 48 52 45 41 44 53 41 46 46 3d   ..%..THREADSAFF=
-+|   3152: 30 58 52 54 52 49 4d 1f 21 05 00 33 0f 19 4f 4d   0XRTRIM.!..3..OM
-+|   3168: 49 54 20 4c 4f 41 44 20 45 58 54 45 4e 52 49 4f   IT LOAD EXTENRIO
-+|   3184: 4e 58 42 49 4e 41 52 59 1f 20 05 00 33 0f 19 4f   NXBINARY. ..3..O
-+|   3200: 4d 49 54 20 4c 4f 41 44 20 45 58 54 45 4e 53 49   MIT LOAD EXTENSI
-+|   3216: 4f 4e 58 4e 4f 43 41 53 45 1e 1f 05 00 33 0f 17   ONXNOCASE....3..
-+|   3232: 4f 4d 49 54 20 4c 4f 41 44 20 45 58 54 45 4e 53   OMIT LOAD EXTENS
-+|   3248: 49 4f 4e 58 52 54 52 49 4d 1f 1e 05 00 33 0f 19   IONXRTRIM....3..
-+|   3264: 4d 41 58 20 4d 45 4d 4f 52 59 3d 35 30 30 30 30   MAX MEMORY=50000
-+|   3280: 30 30 30 58 42 49 4e 41 52 59 1f 1d 05 00 33 0f   000XBINARY....3.
-+|   3296: 19 4d 41 58 20 4d 45 4d 4f 52 59 3d 35 30 30 30   .MAX MEMORY=5000
-+|   3312: 30 30 30 30 58 4e 4f 43 41 53 45 1e 1c 05 00 33   0000XNOCASE....3
-+|   3328: 0f 17 4d 42 b8 20 4d 45 4d 4f 52 59 3d 35 30 30   ..MB. MEMORY=500
-+|   3344: 30 30 30 30 30 58 52 54 52 49 4d 18 1b 05 00 25   00000XRTRIM....%
-+|   3360: 0f 19 45 4e 41 42 4c 45 20 52 54 52 45 45 58 42   ..ENABLE RTREEXB
-+|   3376: 49 4e 41 52 59 18 1a 05 0d a5 0f 19 45 4e 41 42   INARY.......ENAB
-+|   3392: 4c 45 20 52 54 52 45 45 58 4e 4f 43 41 53 45 17   LE RTREEXNOCASE.
-+|   3408: 19 1c 00 25 0f 17 45 4e 41 42 4c 45 20 52 54 52   ...%..ENABLE RTR
-+|   3424: 45 45 58 52 54 52 49 4d 1a 18 05 00 29 0f 19 45   EEXRTRIM....)..E
-+|   3440: 4e 41 42 4c 45 20 4d 45 4d 53 59 53 35 58 42 49   NABLE MEMSYS5XBI
-+|   3456: 4e 41 52 59 1a 17 05 00 29 0f 19 45 4e 41 42 4c   NARY....)..ENABL
-+|   3472: 45 20 4d 45 4d 53 59 53 35 58 4e 4f 43 41 53 45   E MEMSYS5XNOCASE
-+|   3488: 19 16 05 00 29 0f 17 45 4e 41 42 4c 45 20 4d 45   ....)..ENABLE ME
-+|   3504: 4d 53 59 53 35 58 52 54 52 49 4d 18 14 05 01 25   MSYS5XRTRIM....%
-+|   3520: 0f 19 45 4e 12 42 4c 45 20 4a 53 4f 4e 31 58 42   ..EN.BLE JSON1XB
-+|   3536: 49 4e 41 52 59 18 14 05 00 25 09 d9 45 4e 41 42   INARY....%..ENAB
-+|   3552: 4c 45 20 4a 53 4f 3e 31 58 4e 4f 43 41 53 45 17   LE JSO>1XNOCASE.
-+|   3568: 13 05 00 25 0f 17 45 4e 40 42 4c 45 20 4a 53 4f   ...%..EN@BLE JSO
-+|   3584: 4e 31 58 52 54 52 49 4d 1a 12 05 82 29 0f 19 45   N1XRTRIM....)..E
-+|   3600: 4e 41 42 4c 45 20 47 45 4f 50 4f 4c 59 58 42 49   NABLE GEOPOLYXBI
-+|   3616: 4e 41 52 59 1a 11 05 c9 29 e8 19 46 4e 41 42 4c   NARY....)..FNABL
-+|   3632: 48 c0 47 45 4f 50 4f 4c 59 58 4e 74 43 41 53 45   H.GEOPOLYXNtCASE
-+|   3648: 19 10 05 00 29 0f 17 45 4e 41 42 4c 45 20 47 45   ....)..ENABLE GE
-+|   3664: 4f 50 4f 4c 59 58 52 54 52 49 4d 17 0f 05 00 23   OPOLYXRTRIM....#
-+|   3680: 0f 19 45 4e 41 42 4c 45 30 46 54 53 35 58 42 49   ..ENABLE0FTS5XBI
-+|   3696: 4e 41 52 59 17 0e 05 00 23 0f 19 45 4e 41 42 4c   NARY....#..ENABL
-+|   3712: 45 20 46 54 53 35 58 4e 4f 43 41 53 45 16 0e 05   E FTS5XNOCASE...
-+|   3728: 00 23 0f 17 45 4e 41 42 4c 45 20 46 54 53 35 58   .#..ENABLE FTS5X
-+|   3744: 52 54 52 49 4d 17 0c 05 00 23 0f 19 45 4e 41 42   RTRIM....#..ENAB
-+|   3760: 4c 45 20 46 54 53 34 58 42 49 4e 41 52 59 17 0b   LE FTS4XBINARY..
-+|   3776: 05 00 23 0f 19 45 4e 41 42 4c 45 20 46 54 53 34   ..#..ENABLE FTS4
-+|   3792: 58 4e 4f 43 41 53 45 16 0a 05 00 23 0f 17 45 4e   XNOCASE....#..EN
-+|   3808: 41 42 4c 45 20 46 54 53 34 58 52 54 52 49 4d 1e   ABLE FTS4XRTRIM.
-+|   3824: 09 05 00 31 0f 19 45 4e 42 42 4c 45 20 44 42 53   ...1..ENBBLE DBS
-+|   3840: 54 41 54 20 56 54 41 42 58 42 49 4e 41 52 59 1e   TAT VTABXBINARY.
-+|   3856: 08 05 00 31 0f 19 45 4e 41 42 4c 45 20 44 42 53   ...1..ENABLE DBS
-+|   3872: 54 41 54 20 56 54 41 42 58 4e 4f 43 41 53 45 1d   TAT VTABXNOCASE.
-+|   3888: 07 05 00 31 0f 17 45 4e 41 42 4c 45 20 44 42 53   ...1..ENABLE DBS
-+|   3904: 54 41 54 20 56 54 41 42 58 52 54 52 4a 4d 11 06   TAT VTABXRTRJM..
-+|   3920: 05 f0 17 0f 19 44 45 42 55 47 58 42 49 4e 41 52   .....DEBUGXBINAR
-+|   3936: 59 11 05 05 00 17 0e 19 44 45 42 55 47 58 4e 4f   Y.......DEBUGXNO
-+|   3952: 43 41 53 45 10 04 05 00 17 0f 16 44 45 42 55 47   CASE.......DEBUG
-+|   3968: 58 52 54 52 49 4d 27 03 05 00 43 0f 19 43 4f 4d   XRTRIM'...C..COM
-+|   3984: 50 49 4c 45 52 3d 67 63 63 2d 35 2e 34 2e 30 20   PILER=gcc-5.4.0 
-+|   4000: 32 30 31 36 30 36 30 39 58 42 49 4e 41 52 59 27   20160609XBINARY'
-+|   4016: 02 05 00 43 0f 19 43 4f 4d 50 49 4c 45 52 3d 67   ...C..COMPILER=g
-+|   4032: 63 63 2d 35 2e 34 2e 30 20 32 30 31 36 30 36 30   cc-5.4.0 2016060
-+|   4048: 39 58 4e 4f 43 41 53 45 26 01 06 00 43 0f 17 43   9XNOCASE&...C..C
-+|   4064: 4f 4d 50 49 4b 45 52 3d 67 63 63 2d 35 2e 34 2e   OMPIKER=gcc-5.4.
-+|   4080: 30 20 32 30 31 36 30 36 40 39 58 29 54 52 49 4d   0 201606@9X)TRIM
-+| page 4 offset 12288
-+|      0: 0d 00 10 00 00 10 00 00 00 00 00 00 00 01 00 00   ................
-+| page 5 offset 16384
-+|      0: 0d 00 00 00 02 0b a0 00 0c ad 0b a0 00 00 00 00   ................
-+|   2976: 82 0a 02 08 08 09 08 08 17 84 06 30 20 32 35 33   ...........0 253
-+|   2992: 00 01 30 04 25 06 1b 00 00 08 32 30 31 36 30 36   ..0.%.....201606
-+|   3008: 30 39 03 25 07 00 00 01 34 03 25 05 00 00 01 35   09.%....4.%....5
-+|   3024: 03 25 04 00 01 07 30 30 30 30 30 30 30 03 25 1a   .%....0000000.%.
-+|   3040: 00 00 08 63 6f 6d 70 69 6c 65 72 03 25 02 00 00   ...compiler.%...
-+|   3056: 06 64 62 73 74 61 74 03 25 0a 00 01 04 65 62 75   .dbstat.%....ebu
-+|   3072: 67 03 25 08 00 00 06 65 6e 61 62 6c 65 09 25 09   g.%....enable.%.
-+|   3088: 05 04 04 04 04 04 00 01 08 78 74 65 6e 73 69 6f   .........xtensio
-+|   3104: 6e 03 25 1d 00 00 04 66 74 73 34 03 25 0d 00 03   n.%....fts4.%...
-+|   3120: 01 35 03 25 0f 00 00 03 67 63 63 03 25 03 00 01   .5.%....gcc.%...
-+|   3136: 06 65 6f 70 6f 6c 79 03 25 11 00 00 05 6a 73 6f   .eopoly.%....jso
-+|   3152: 6e 31 03 25 13 00 00 04 6c 6f 61 64 03 25 1c 00   n1.%....load.%..
-+|   3168: 00 03 6d 61 78 03 25 18 00 01 05 65 6e 6f 72 79   ..max.%....enory
-+|   3184: 03 25 19 00 03 04 ce 79 73 4d 03 25 15 00 00 04   .%.....ysM.%....
-+|   3200: 6f 6d 69 74 03 25 1b 00 00 05 72 74 72 65 65 03   omit.%....rtree.
-+|   3216: 25 17 00 00 0a 74 68 72 65 61 64 73 61 66 65 03   %....threadsafe.
-+|   3232: 25 0e 00 00 04 76 74 61 62 03 25 0b 00 86 50 01   %....vtab.%...P.
-+|   3248: 08 08 08 08 08 17 8d 12 30 20 38 33 35 00 01 30   ........0 835..0
-+|   3264: 12 01 06 00 01 06 00 01 06 00 1f 03 00 01 03 09   ................
-+|   3280: 51 03 00 00 08 32 30 31 36 30 36 30 39 09 01 07   Q....20160609...
-+|   3296: 00 01 07 00 01 07 00 00 01 34 09 01 05 00 01 05   .........4......
-+|   3312: 00 01 05 00 00 01 35 09 01 04 00 01 04 00 01 04   ......5.........
-+|   3328: 00 01 07 30 30 30 30 30 30 30 09 1c 04 00 01 04   ...0000000......
-+|   3344: 00 01 04 00 00 06 62 69 6e 61 72 79 3c 03 01 02   ......binary<...
-+|   3360: 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02   ................
-+|   3376: 00 03 01 02 02 00 02 f1 02 02 00 03 01 02 02 00   ................
-+|   3392: 03 01 02 02 00 03 01 02 02 00 03 01 02 02 00 03   ................
-+|   3408: 01 02 02 00 03 01 02 02 00 00 08 63 6f 6d 70 69   ...........compi
-+|   3424: 6c 65 72 09 01 02 00 01 02 00 01 02 00 00 06 67   ler............g
-+|   3440: d2 73 74 61 74 09 07 03 00 01 03 00 01 03 00 01   .stat...........
-+|   3456: 04 65 62 75 67 09 04 02 00 01 02 00 01 02 00 00   .ebug...........
-+|   3472: 06 65 6e 6f 82 6c 65 3f 07 02 00 01 02 00 01 02   .eno.le?........
-+|   3488: b0 01 02 00 01 02 00 11 02 00 01 02 00 01 02 00   ................
-+|   3504: 01 02 00 01 02 00 01 02 00 01 a6 00 01 02 00 01   ................
-+|   3520: 02 05 51 02 00 01 02 00 01 02 00 01 02 00 01 02   ..Q.............
-+|   3536: 00 01 02 00 01 02 00 01 08 78 74 65 6e 73 69 6f   .........xtensio
-+|   3552: 6e 09 1f 04 00 01 04 00 00 04 00 00 04 66 74 73   n............fts
-+|   3568: 34 09 0a 03 00 01 03 00 01 03 00 03 01 35 09 0d   4............5..
-+|   3584: 03 00 01 03 00 01 03 00 00 03 67 63 63 09 01 03   ..........gcc...
-+|   3600: 00 01 03 00 01 03 00 01 06 65 6f 70 73 6c 79 09   .........eopsly.
-+|   3616: 10 03 00 01 03 00 01 03 00 00 05 6a 73 6f 6e 31   ...........json1
-+|   3632: 09 13 03 00 01 03 00 01 03 00 00 04 6c 6f 61 64   ............load
-+|   3648: 09 1f 03 00 01 03 00 01 03 00 00 03 6d 61 78 09   ............max.
-+|   3664: 1c 02 00 01 02 00 01 02 00 01 05 65 6d 6f 72 79   ...........emory
-+|   3680: 09 1c 03 00 01 03 00 01 03 00 03 04 73 79 73 35   ............sys5
-+|   3696: 09 16 03 00 01 03 00 01 03 00 00 06 6e 6f 63 61   ............noca
-+|   3712: 73 65 3c 02 01 02 02 00 03 01 12 02 00 03 01 02   se<.............
-+|   3728: 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02   ................
-+|   3744: 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02 00   ................
-+|   3760: 03 01 02 02 00 03 01 02 02 00 03 01 02 02 00 00   ................
-+|   3776: 04 6f 6d 69 74 09 1f 02 00 01 02 00 01 02 00 00   .omit...........
-+|   3792: 05 72 74 72 65 65 09 19 03 00 01 03 00 01 03 00   .rtree..........
-+|   3808: 03 02 69 6d 3c 01 01 02 02 00 03 01 02 02 00 03   ..im<...........
-+|   3824: 01 02 02 00 03 01 02 02 00 03 01 02 02 00 03 01   ................
-+|   3840: 02 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02   ................
-+|   3856: 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02   ................
-+|   3872: 00 00 0a 74 68 72 65 61 64 73 61 66 65 09 22 02   ...threadsafe...
-+|   3888: 00 01 02 00 01 02 00 00 04 76 74 61 62 09 07 04   .........vtab...
-+|   3904: 00 01 04 00 01 03 ff ff 01 78 b4 01 01 01 01 02   .........x......
-+|   3920: 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00   ................
-+|   3936: 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00 01   ................
-+|   3952: 01 01 02 00 01 01 01 07 30 01 01 01 02 00 01 01   ........0.......
-+|   3968: 01 02 00 11 01 01 02 00 01 01 01 02 00 11 01 01   ................
-+|   3984: 02 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02   ................
-+|   4000: 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00   ................
-+|   4016: 01 01 01 01 ff 01 01 01 02 00 01 01 01 02 00 01   ................
-+|   4032: 01 01 02 00 01 01 01 02 00 01 01 01 02 00 01 01   ................
-+|   4048: 01 02 00 01 01 09 c2 00 01 01 01 02 00 01 01 01   ................
-+|   4064: 02 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02   ................
-+|   4080: 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00   ................
-+| page 6 offset 20480
-+|      0: 0a 00 00 00 02 0f f5 00 0f fb 0f f5 00 00 00 00   ................
-+|   4080: 00 00 00 00 00 05 04 08 09 01 02 04 04 08 08 09   ................
-+| page 7 offset 24576
-+|      0: 0d 00 00 00 05 0f b8 00 0e f4 0f e9 10 d6 0f c7   ................
-+|   4016: 00 00 00 00 00 00 00 00 0d 05 02 23 61 75 74 6f   ...........#auto
-+|   4032: 6d 65 72 67 65 3d 35 0d 04 02 23 6d 65 72 67 65   merge=5...#merge
-+|   4048: 3d 31 00 00 00 00 00 00 00 00 00 00 00 00 00 00   =1..............
-+| end crash-369d042958c29b.db
-+}]} {}
-+
-+do_catchsql_test 24.1 {
-+  WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT '4hE'+x FROM c WHERE x<72)
-+    INSERT INTO t1(a) SELECT randomblob(2829) FROM c;
-+} {0 {}}
-+
-+do_catchsql_test 24.2 {
-+  UPDATE t1 SET b=quote((true) ) WHERE t1 MATCH 'h';
-+} {0 {}}
-+
-+do_catchsql_test 24.3 {
-+  WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT 3+x FROM c WHERE x<72)
-+    INSERT INTO t1(a) SELECT randomblob(2829) FROM c;
-+} {0 {}}
-+
-+do_catchsql_test 24.4 {
-+  WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT null<<x FROM c WHERE x<72)
-+    INSERT INTO t1(a) SELECT randomblob(2829) FROM c;
-+} {0 {}}
-+
-+do_catchsql_test 24.5 {
-+  WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT 3+x FROM c WHERE x<72)
-+    INSERT INTO t1(a) SELECT randomblob(2829) FROM c;
-+} {0 {}}
-+
-+do_catchsql_test 24.7 {
-+  INSERT INTO t1(t1) SELECT x FROM t2;
-+} {1 {database disk image is malformed}}
-+
-+#-------------------------------------------------------------------------
-+#-------------------------------------------------------------------------
-+reset_db
-+do_test 25.0 {
-+  sqlite3 db {}
-+  db deserialize [decode_hexdb {
-+.open --hexdb
-+| size 28672 pagesize 4096 filename crash-dde9e76ed8ab2d.db
-+| page 1 offset 0
-+|      0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00   SQLite format 3.
-+|     16: 10 00 01 01 00 40 20 20 00 00 03 10 00 00 00 00   .....@  ........
-+|     96: 00 00 00 00 0d 0e b1 00 06 0d a4 00 0f 8d 0f 21   ...............!
-+|    112: 0e b9 0d c8 0e 7e 0d a4 00 00 00 00 00 00 00 00   .....~..........
-+|   3488: 00 00 00 00 22 07 06 17 11 11 01 31 74 61 62 6c   ...........1tabl
-+|   3504: 65 74 32 74 32 07 43 52 45 41 54 45 20 54 41 42   et2t2.CREATE TAB
-+|   3520: 4c 45 20 74 32 28 78 29 81 33 05 07 17 1f 1f 01   LE t2(x).3......
-+|   3536: 82 35 74 61 62 6c 65 74 31 5f 73 65 67 64 69 72   .5tablet1_segdir
-+|   3552: 74 31 5f 73 65 67 64 69 72 05 43 52 45 41 54 45   t1_segdir.CREATE
-+|   3568: 20 54 41 42 4c 45 20 27 74 31 5f 73 65 67 64 69    TABLE 't1_segdi
-+|   3584: 72 27 28 6c 65 76 65 6c 20 49 4e 54 45 47 45 52   r'(level INTEGER
-+|   3600: 2c 69 64 78 20 49 4e 54 45 47 45 52 2c 73 74 61   ,idx INTEGER,sta
-+|   3616: 72 74 5f 62 6c 6f 63 6b 20 49 4e 54 45 47 45 52   rt_block INTEGER
-+|   3632: 2c 6c 65 61 76 65 73 5f 65 6e 64 5f 62 6c 6f 63   ,leaves_end_bloc
-+|   3648: 6b 20 49 4e 54 45 47 45 52 2c 65 6e 64 5f 62 6c   k INTEGER,end_bl
-+|   3664: 6f 63 6b 20 49 4e 54 45 47 45 52 2c 72 6f 6f 74   ock INTEGER,root
-+|   3680: 20 42 4c 4f 42 2c 50 52 49 4d 41 52 59 20 4b 45    BLOB,PRIMARY KE
-+|   3696: 59 28 6c 65 76 65 6c 2c 20 69 64 78 29 29 31 06   Y(level, idx))1.
-+|   3712: 06 17 45 1f 01 00 69 6e 64 65 78 73 71 6c 69 74   ..E...indexsqlit
-+|   3728: 65 5f 61 75 74 6f 69 6e 64 65 78 5f 74 31 5f 73   e_autoindex_t1_s
-+|   3744: 65 67 64 69 72 5f 31 74 31 5f 73 65 67 64 69 72   egdir_1t1_segdir
-+|   3760: 06 0f c7 00 08 00 00 00 00 66 04 07 17 23 23 01   .........f...##.
-+|   3776: 81 13 74 61 62 6c 65 74 31 5f 73 65 67 6d 65 6e   ..tablet1_segmen
-+|   3792: 64 73 74 31 5f 73 65 67 6d 65 6e 74 73 04 43 52   dst1_segments.CR
-+|   3808: 45 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 73   EATE TABLE 't1_s
-+|   3824: 65 67 6d 65 6e 74 73 27 28 62 6c 6f 63 6b 69 64   egments'(blockid
-+|   3840: 20 49 4e 54 45 47 45 52 20 50 52 49 4d 41 52 59    INTEGER PRIMARY
-+|   3856: 20 4b 45 59 2c 20 62 6c 6f 63 6b 20 42 4c 4f 42    KEY, block BLOB
-+|   3872: 29 6a 03 07 17 21 21 01 81 1f 74 61 62 6c 65 74   )j...!!...tablet
-+|   3888: 31 5f 63 6f 6e 74 65 6e 74 74 31 5f 63 6f 6e 74   1_contentt1_cont
-+|   3904: 65 6e 74 03 43 52 45 41 54 45 20 54 41 42 4c 45   ent.CREATE TABLE
-+|   3920: 20 27 74 31 5f 63 6f 6e 74 65 6e 74 27 28 64 6f    't1_content'(do
-+|   3936: 63 69 64 20 49 4e 54 45 47 45 52 20 50 52 39 4d   cid INTEGER PR9M
-+|   3952: 41 52 59 20 4b 45 59 2c 20 27 63 30 61 27 2c 20   ARY KEY, 'c0a', 
-+|   3968: 27 63 31 62 27 2c 20 27 63 32 63 27 29 38 02 06   'c1b', 'c2c')8..
-+|   3984: 17 11 11 08 5f 74 61 62 6c 65 74 31 74 31 43 52   ...._tablet1t1CR
-+|   4000: 45 41 54 45 20 56 49 52 54 55 41 4c 20 54 41 42   EATE VIRTUAL TAB
-+|   4016: 4c 45 20 74 31 20 55 53 49 4e 47 20 66 74 73 33   LE t1 USING fts3
-+|   4032: 28 61 2c 62 2c 63 29 00 00 00 00 00 00 00 00 00   (a,b,c).........
-+| page 3 offset 8192
-+|      0: 0d 00 00 00 26 0b 48 0e 0f d8 0f af 0f 86 0f 74   ....&.H........t
-+|     16: 0f 61 0f 4e 0f 2f 0f 0f 0e ef 0e d7 0e be 0e a5   .a.N./..........
-+|     32: 0e 8d 0e 74 0e 5b 0e 40 0e 24 0e 08 0d ef 0d d5   ...t.[.@.$......
-+|     48: 0d bb 0d a0 0e 94 03 28 0d 4f 0d 35 0d 1b 05 0b   .......(.O.5....
-+|     64: 0c da 0c b9 0c 99 0c 78 0c 57 0c 3e 0c 24 0c 0a   .......x.W.>.$..
-+|   2880: 00 00 00 00 00 00 00 00 81 3f 25 06 00 72 7f 00   .........?%..r..
-+|   2896: 00 43 4f 4d 50 49 4c 45 52 3d 67 63 63 2d 35 2e   .COMPILER=gcc-5.
-+|   2912: 34 2e 30 20 32 30 31 36 30 36 30 39 20 44 55 42   4.0 20160609 DUB
-+|   2928: 55 47 20 45 4e 41 e4 7c 45 20 44 42 53 54 41 54   UG ENA.|E DBSTAT
-+|   2944: e4 46 54 41 42 20 45 4e 41 42 4c 45 20 46 54 53   .FTAB ENABLE FTS
-+|   2960: 34 20 45 4e 41 42 4c 45 20 46 54 53 35 20 45 4e   4 ENABLE FTS5 EN
-+|   2976: 41 42 4c 45 20 47 45 4f 50 4f 4c 59 20 45 4e 41   ABLE GEOPOLY ENA
-+|   2992: 42 4c 45 20 4a 53 4f 4e 31 20 45 4e 41 42 4c 45   BLE JSON1 ENABLE
-+|   3008: 20 4d 45 4d 53 59 53 35 20 45 4e 41 42 4c 45 20    MEMSYS5 ENABLE 
-+|   3024: 42 54 52 45 45 20 4d 41 58 20 4d 45 4d 4f 52 59   BTREE MAX MEMORY
-+|   3040: 3d 35 30 30 30 30 30 30 30 20 4f 4c 49 54 20 4c   =50000000 OLIT L
-+|   3056: 4f 41 43 20 45 58 54 45 4e 53 49 4f 4e 21 54 48   OAC EXTENSION!TH
-+|   3072: 52 45 41 44 53 41 46 45 3d 30 18 24 05 00 25 0f   READSAFE=0.$..%.
-+|   3088: 19 54 48 52 45 41 44 53 41 46 45 3d 30 58 42 49   .THREADSAFE=0XBI
-+|   3104: 4e 41 52 59 18 23 05 00 25 0f 19 54 48 52 45 41   NARY.#..%..THREA
-+|   3120: 44 53 41 4b 75 3d 30 58 4d 4f 43 41 53 45 17 22   DSAKu=0XMOCASE..
-+|   3136: 05 00 25 0f 17 54 48 52 45 41 44 53 41 46 46 3d   ..%..THREADSAFF=
-+|   3152: 30 58 52 54 52 49 4d 1f 21 05 00 33 0f 19 4f 4d   0XRTRIM.!..3..OM
-+|   3168: 49 54 20 4c 4f 41 44 20 45 58 54 45 4e 52 49 4f   IT LOAD EXTENRIO
-+|   3184: 4e 58 42 49 4e 41 52 59 1f 20 05 00 33 0f 19 4f   NXBINARY. ..3..O
-+|   3200: 4d 49 54 20 4c 4f 41 44 20 45 58 54 45 4e 53 49   MIT LOAD EXTENSI
-+|   3216: 4f 4e 58 4e 4f 43 41 53 45 1e 1f 05 00 33 0f 17   ONXNOCASE....3..
-+|   3232: 4f 4d 49 54 20 4c 4f 41 44 20 45 58 54 45 4e 53   OMIT LOAD EXTENS
-+|   3248: 49 4f 4e 58 52 54 52 49 4d 1f 1e 05 00 33 0f 19   IONXRTRIM....3..
-+|   3264: 4d 41 58 20 4d 45 4d 4f 52 59 3d 35 30 30 30 30   MAX MEMORY=50000
-+|   3280: 30 30 30 58 42 49 4e 41 52 59 1f 1d 05 00 33 0f   000XBINARY....3.
-+|   3296: 19 4d 41 58 20 4d 45 4d 4f 52 59 3d 35 30 30 30   .MAX MEMORY=5000
-+|   3312: 30 30 30 30 58 4e 4f 43 41 53 45 1e 1c 05 00 33   0000XNOCASE....3
-+|   3328: 0f 17 4d 42 b8 20 4d 45 4d 4f 52 59 3d 35 30 30   ..MB. MEMORY=500
-+|   3344: 30 30 30 30 30 58 52 54 52 49 4d 18 1b 05 00 25   00000XRTRIM....%
-+|   3360: 0f 19 45 4e 41 42 4c 45 20 52 54 52 45 45 58 42   ..ENABLE RTREEXB
-+|   3376: 49 4e 41 52 59 18 1a 05 0d a5 0f 19 45 4e 41 42   INARY.......ENAB
-+|   3392: 4c 45 20 52 54 52 45 45 58 4e 4f 43 41 53 45 17   LE RTREEXNOCASE.
-+|   3408: 19 1c 00 25 0f 17 45 4e 41 42 4c 45 20 52 54 52   ...%..ENABLE RTR
-+|   3424: 45 45 58 52 54 52 49 4d 1a 18 05 00 29 0f 19 45   EEXRTRIM....)..E
-+|   3440: 4e 41 42 4c 45 20 4d 45 4d 53 59 53 35 58 42 49   NABLE MEMSYS5XBI
-+|   3456: 4e 41 52 59 1a 17 05 00 29 0f 19 45 4e 41 42 4c   NARY....)..ENABL
-+|   3472: 45 20 4d 45 4d 53 59 53 35 58 4e 4f 43 41 53 45   E MEMSYS5XNOCASE
-+|   3488: 19 16 05 00 29 0f 17 45 4e 41 42 4c 45 20 4d 45   ....)..ENABLE ME
-+|   3504: 4d 53 59 53 35 58 52 54 52 49 4d 18 14 05 01 25   MSYS5XRTRIM....%
-+|   3520: 0f 19 45 4e 12 42 4c 45 20 4a 53 4f 4e 31 58 42   ..EN.BLE JSON1XB
-+|   3536: 49 4e 41 52 59 18 14 05 00 25 09 d9 45 4e 41 42   INARY....%..ENAB
-+|   3552: 4c 45 20 4a 53 4f 3e 31 58 4e 4f 43 41 53 45 17   LE JSO>1XNOCASE.
-+|   3568: 13 05 00 25 0f 17 45 4e 40 42 4c 45 20 4a 53 4f   ...%..EN@BLE JSO
-+|   3584: 4e 31 58 52 54 52 49 4d 1a 12 05 82 29 0f 19 45   N1XRTRIM....)..E
-+|   3600: 4e 41 42 4c 45 20 47 45 4f 50 4f 4c 59 58 42 49   NABLE GEOPOLYXBI
-+|   3616: 4e 41 52 59 1a 11 05 c9 29 e8 19 46 4e 41 42 4c   NARY....)..FNABL
-+|   3632: 48 c0 47 45 4f 50 4f 4c 59 58 4e 74 43 41 53 45   H.GEOPOLYXNtCASE
-+|   3648: 19 10 05 00 29 0f 17 45 4e 41 42 4c 45 20 47 45   ....)..ENABLE GE
-+|   3664: 4f 50 4f 4c 59 58 52 54 52 49 4d 17 0f 05 00 23   OPOLYXRTRIM....#
-+|   3680: 0f 19 45 4e 41 42 4c 45 30 46 54 53 35 58 42 49   ..ENABLE0FTS5XBI
-+|   3696: 4e 41 52 59 17 0e 05 00 23 0f 19 45 4e 41 42 4c   NARY....#..ENABL
-+|   3712: 45 20 46 54 53 35 58 4e 4f 43 41 53 45 16 0e 05   E FTS5XNOCASE...
-+|   3728: 00 23 0f 17 45 4e 41 42 4c 45 20 46 54 53 35 58   .#..ENABLE FTS5X
-+|   3744: 52 54 52 49 4d 17 0c 05 00 23 0f 19 45 4e 41 42   RTRIM....#..ENAB
-+|   3760: 4c 45 20 46 54 53 34 58 42 49 4e 41 52 59 17 0b   LE FTS4XBINARY..
-+|   3776: 05 00 23 0f 19 45 4e 41 42 4c 45 20 46 54 53 34   ..#..ENABLE FTS4
-+|   3792: 58 4e 4f 43 41 53 45 16 0a 05 00 23 0f 17 45 4e   XNOCASE....#..EN
-+|   3808: 41 42 4c 45 20 46 54 53 34 58 52 54 52 49 4d 1e   ABLE FTS4XRTRIM.
-+|   3824: 09 05 00 31 0f 19 45 4e 42 42 4c 45 20 44 42 53   ...1..ENBBLE DBS
-+|   3840: 54 41 54 20 56 54 41 42 58 42 49 4e 41 52 59 1e   TAT VTABXBINARY.
-+|   3856: 08 05 00 31 0f 19 45 4e 41 42 4c 45 20 44 42 53   ...1..ENABLE DBS
-+|   3872: 54 41 54 20 56 54 41 42 58 4e 4f 43 41 53 45 1d   TAT VTABXNOCASE.
-+|   3888: 07 05 00 31 0f 17 45 4e 41 42 4c 45 20 44 42 53   ...1..ENABLE DBS
-+|   3904: 54 41 54 20 56 54 41 42 58 52 54 52 4a 4d 11 06   TAT VTABXRTRJM..
-+|   3920: 05 f0 17 0f 19 44 45 42 55 47 58 42 49 4e 41 52   .....DEBUGXBINAR
-+|   3936: 59 11 05 05 00 17 0e 19 44 45 42 55 47 58 4e 4f   Y.......DEBUGXNO
-+|   3952: 43 41 53 45 10 04 05 00 17 0f 16 44 45 42 55 47   CASE.......DEBUG
-+|   3968: 58 52 54 52 49 4d 27 03 05 00 43 0f 19 43 4f 4d   XRTRIM'...C..COM
-+|   3984: 50 49 4c 45 52 3d 67 63 63 2d 35 2e 34 2e 30 20   PILER=gcc-5.4.0 
-+|   4000: 32 30 31 36 30 36 30 39 58 42 49 4e 41 52 59 27   20160609XBINARY'
-+|   4016: 02 05 00 43 0f 19 43 4f 4d 50 49 4c 45 52 3d 67   ...C..COMPILER=g
-+|   4032: 63 63 2d 35 2e 34 2e 30 20 32 30 31 36 30 36 30   cc-5.4.0 2016060
-+|   4048: 39 58 4e 4f 43 41 53 45 26 01 06 00 43 0f 17 43   9XNOCASE&...C..C
-+|   4064: 4f 4d 50 49 4b 45 52 3d 67 63 63 2d 35 2e 34 2e   OMPIKER=gcc-5.4.
-+|   4080: 30 20 32 30 31 36 30 36 40 39 58 29 54 52 49 4d   0 201606@9X)TRIM
-+| page 4 offset 12288
-+|      0: 0d 00 10 00 00 10 00 00 00 00 00 00 00 01 00 00   ................
-+| page 5 offset 16384
-+|      0: 0d 00 00 00 02 0b a0 00 0c ad 0b a0 00 00 00 00   ................
-+|   2976: 82 0a 02 08 08 09 08 08 17 84 06 30 20 32 35 33   ...........0 253
-+|   2992: 00 01 30 04 25 06 1b 00 00 08 32 30 31 36 30 36   ..0.%.....201606
-+|   3008: 30 39 03 25 07 00 00 01 34 03 25 05 00 00 01 35   09.%....4.%....5
-+|   3024: 03 25 04 00 01 07 30 30 30 30 30 30 30 03 25 1a   .%....0000000.%.
-+|   3040: 00 00 08 63 6f 6d 70 69 6c 65 72 03 25 02 00 00   ...compiler.%...
-+|   3056: 06 64 62 73 74 61 74 03 25 0a 00 01 04 65 62 75   .dbstat.%....ebu
-+|   3072: 67 03 25 08 00 00 06 65 6e 61 62 6c 65 09 25 09   g.%....enable.%.
-+|   3088: 05 04 04 04 04 04 00 01 08 78 74 65 6e 73 69 6f   .........xtensio
-+|   3104: 6e 03 25 1d 00 00 04 66 74 73 34 03 25 0d 00 03   n.%....fts4.%...
-+|   3120: 01 35 03 25 0f 00 00 03 67 63 63 03 25 03 00 01   .5.%....gcc.%...
-+|   3136: 06 65 6f 70 6f 6c 79 03 25 11 00 00 05 6a 73 6f   .eopoly.%....jso
-+|   3152: 6e 31 03 25 13 00 00 04 6c 6f 61 64 03 25 1c 00   n1.%....load.%..
-+|   3168: 00 03 6d 61 78 03 25 18 00 01 05 65 6e 6f 72 79   ..max.%....enory
-+|   3184: 03 25 19 00 03 04 ce 79 73 4d 03 25 15 00 00 04   .%.....ysM.%....
-+|   3200: 6f 6d 69 74 03 25 1b 00 00 05 72 74 72 65 65 03   omit.%....rtree.
-+|   3216: 25 17 00 00 0a 74 68 72 65 61 64 73 61 66 65 03   %....threadsafe.
-+|   3232: 25 0e 00 00 04 76 74 61 62 03 25 0b 00 86 50 01   %....vtab.%...P.
-+|   3248: 08 08 08 08 08 17 8d 12 30 20 38 33 35 00 01 30   ........0 835..0
-+|   3264: 12 01 06 00 01 06 00 01 06 00 1f 03 00 01 03 09   ................
-+|   3280: 51 03 00 00 08 32 30 31 36 30 36 30 39 09 01 07   Q....20160609...
-+|   3296: 00 01 07 00 01 07 00 00 01 34 09 01 05 00 01 05   .........4......
-+|   3312: 00 01 05 00 00 01 35 09 01 04 00 01 04 00 01 04   ......5.........
-+|   3328: 00 01 07 30 30 30 30 30 30 30 09 1c 04 00 01 04   ...0000000......
-+|   3344: 00 01 04 00 00 06 62 69 6e 61 72 79 3c 03 01 02   ......binary<...
-+|   3360: 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02   ................
-+|   3376: 00 03 01 02 02 00 02 f1 02 02 00 03 01 02 02 00   ................
-+|   3392: 03 01 02 02 00 03 01 02 02 00 03 01 02 02 00 03   ................
-+|   3408: 01 02 02 00 03 01 02 02 00 00 08 63 6f 6d 70 69   ...........compi
-+|   3424: 6c 65 72 09 01 02 00 01 02 00 01 02 00 00 06 67   ler............g
-+|   3440: d2 73 74 61 74 09 07 03 00 01 03 00 01 03 00 01   .stat...........
-+|   3456: 04 65 62 75 67 09 04 02 00 01 02 00 01 02 00 00   .ebug...........
-+|   3472: 06 65 6e 6f 82 6c 65 3f 07 02 00 01 02 00 01 02   .eno.le?........
-+|   3488: b0 01 02 00 01 02 00 11 02 00 01 02 00 01 02 00   ................
-+|   3504: 01 02 00 01 02 00 01 02 00 01 a6 00 01 02 00 01   ................
-+|   3520: 02 05 51 02 00 01 02 00 01 02 00 01 02 00 01 02   ..Q.............
-+|   3536: 00 01 02 00 01 02 00 01 08 78 74 65 6e 73 69 6f   .........xtensio
-+|   3552: 6e 09 1f 04 00 01 04 00 00 04 00 00 04 66 74 73   n............fts
-+|   3568: 34 09 0a 03 00 01 03 00 01 03 00 03 01 35 09 0d   4............5..
-+|   3584: 03 00 01 03 00 01 03 00 00 03 67 63 63 09 01 03   ..........gcc...
-+|   3600: 00 01 03 00 01 03 00 01 06 65 6f 70 73 6c 79 09   .........eopsly.
-+|   3616: 10 03 00 01 03 00 01 03 00 00 05 6a 73 6f 6e 31   ...........json1
-+|   3632: 09 13 03 00 01 03 00 01 03 00 00 04 6c 6f 61 64   ............load
-+|   3648: 09 1f 03 00 01 03 00 01 03 00 00 03 6d 61 78 09   ............max.
-+|   3664: 1c 02 00 01 02 00 01 02 00 01 05 65 6d 6f 72 79   ...........emory
-+|   3680: 09 1c 03 00 01 03 00 01 03 00 03 04 73 79 73 35   ............sys5
-+|   3696: 09 16 03 00 01 03 00 01 03 00 00 06 6e 6f 63 61   ............noca
-+|   3712: 73 65 3c 02 01 02 02 00 03 01 12 02 00 03 01 02   se<.............
-+|   3728: 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02   ................
-+|   3744: 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02 00   ................
-+|   3760: 03 01 02 02 00 03 01 02 02 00 03 01 02 02 00 00   ................
-+|   3776: 0e 9f 6d 69 74 09 1f 02 00 01 02 00 01 02 00 00   ..mit...........
-+|   3792: 05 72 74 72 65 65 09 19 03 00 01 03 00 01 03 00   .rtree..........
-+|   3808: 03 02 69 6d 3c 01 01 02 02 00 03 01 02 02 00 03   ..im<...........
-+|   3824: 01 02 02 00 03 01 02 02 00 03 01 02 02 00 03 01   ................
-+|   3840: 02 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02   ................
-+|   3856: 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02   ................
-+|   3872: 00 00 0a 74 68 72 65 61 64 73 61 66 65 09 22 02   ...threadsafe...
-+|   3888: 00 01 02 00 01 02 00 00 04 76 74 61 62 09 07 04   .........vtab...
-+|   3904: 00 01 04 00 01 04 00 00 01 78 b4 01 01 01 01 02   .........x......
-+|   3920: 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00   ................
-+|   3936: 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00 01   ................
-+|   3952: 01 01 02 00 01 01 01 07 30 01 01 01 02 00 01 01   ........0.......
-+|   3968: 01 02 00 11 01 01 02 00 01 01 01 02 00 11 01 01   ................
-+|   3984: 02 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02   ................
-+|   4000: 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00   ................
-+|   4016: 01 01 01 01 ff 01 01 01 02 00 01 01 01 02 00 01   ................
-+|   4032: 01 01 02 00 01 01 01 02 00 01 01 01 02 00 01 01   ................
-+|   4048: 01 02 00 01 01 01 02 00 01 01 01 02 00 01 01 01   ................
-+|   4064: 02 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02   ................
-+|   4080: 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00   ................
-+| page 6 offset 20480
-+|      0: 0a 00 00 00 02 0f f5 00 0f fb 0f f5 00 00 00 00   ................
-+|   4080: 00 00 00 00 00 05 04 08 09 01 02 04 04 08 08 09   ................
-+| page 7 offset 24576
-+|      0: 0d 00 00 00 05 0f b8 00 0e f4 0f e9 10 d6 0f c7   ................
-+|   4016: 00 00 00 00 00 00 00 00 0d 05 02 23 61 75 74 6f   ...........#auto
-+|   4032: 6d 65 72 67 65 3d 35 0d 04 02 23 6d 65 72 67 65   merge=5...#merge
-+|   4048: 3d 31 00 00 00 00 00 00 00 00 00 00 00 00 00 00   =1..............
-+| end crash-dde9e76ed8ab2d.db
-+}]} {}
-+
-+do_catchsql_test 25.1 {
-+  WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x%1 FROM c WHERE x<599237)
-+    INSERT INTO t1( a ) SELECT randomblob(3000) FROM t2 ;
-+} {0 {}}
-+
-+do_catchsql_test 25.2 {
-+  UPDATE t1 SET b=quote((true) ) WHERE t1 MATCH 'h*';
-+} {0 {}}
-+
-+do_catchsql_test 25.3 {
-+  WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x +x FROM c WHERE 72<x)
-+    INSERT INTO t1(a) SELECT randomblob(2829) FROM c;
-+} {0 {}}
-+
-+do_catchsql_test 25.4 {
-+  WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x%1 FROM c WHERE 599237<x)
-+    INSERT INTO t1(a) SELECT randomblob(3000) FROM t2 ;
-+} {0 {}}
-+
-+do_catchsql_test 25.5 {
-+  WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x%1 FROM c WHERE x<599237)
-+    INSERT INTO t1( a ) SELECT randomblob(3000) FROM t2 ;
-+} {0 {}}
-+
-+do_catchsql_test 25.6 {
-+  INSERT INTO t1(t1) SELECT x FROM t2;
-+  INSERT INTO t1(t1) SELECT x FROM t2;
-+} {1 {database disk image is malformed}}
-+ 
- finish_test
- 
---- /test/with3.test
-+++ /test/with3.test
-@@ -130,4 +130,40 @@
-   `--SEARCH TABLE w1 USING INTEGER PRIMARY KEY (rowid=?)
- }
- 
-+do_execsql_test 4.0 {
-+  WITH t5(t5col1) AS (
-+    SELECT (
-+      WITH t3(t3col1) AS (
-+        WITH t2 AS (
-+          WITH t1 AS (SELECT 1 AS c1 GROUP BY 1) 
-+          SELECT a.c1 FROM t1 AS a, t1 AS b
-+          WHERE anoncol1 = 1
-+        )
-+        SELECT (SELECT 1 FROM t2) FROM t2
-+      ) 
-+      SELECT t3col1 FROM t3 WHERE t3col1
-+    ) FROM (SELECT 1 AS anoncol1)
-+  )
-+  SELECT t5col1, t5col1 FROM t5
-+} {1 1}
-+do_execsql_test 4.1 {
-+  SELECT EXISTS (
-+    WITH RECURSIVE Table0 AS (
-+      WITH RECURSIVE Table0(Col0) AS (SELECT ALL 1  ) 
-+      SELECT ALL (
-+        WITH RECURSIVE Table0 AS (
-+          WITH RECURSIVE Table0 AS (
-+            WITH RECURSIVE Table0 AS (SELECT DISTINCT 1  GROUP BY 1  ) 
-+            SELECT DISTINCT * FROM Table0 NATURAL INNER JOIN Table0
-+            WHERE Col0 = 1  
-+          )
-+          SELECT ALL (SELECT DISTINCT * FROM Table0) FROM Table0 WHERE Col0 = 1
-+        ) 
-+        SELECT ALL * FROM Table0  NATURAL INNER JOIN  Table0      
-+      ) FROM Table0 ) 
-+      SELECT DISTINCT * FROM Table0  NATURAL INNER JOIN  Table0      
-+    ); 
-+} {1}
-+
-+
- finish_test
diff --git a/dev-db/sqlite/files/sqlite-3.28.0-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.28.0-full_archive-tests.patch
deleted file mode 100644
index aaa6c580f5f0..000000000000
--- a/dev-db/sqlite/files/sqlite-3.28.0-full_archive-tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://sqlite.org/src/info/af53c41a127c314c
-
---- /test/like3.test
-+++ /test/like3.test
-@@ -182,6 +182,7 @@
- # Verify that the LIKE optimization works with an ESCAPE clause when
- # using PRAGMA case_sensitive_like=ON.
- #
-+ifcapable !icu {
- do_execsql_test like3-6.100 {
-   DROP TABLE IF EXISTS t1;
-   CREATE TABLE t1(path TEXT COLLATE nocase PRIMARY KEY,a,b,c) WITHOUT ROWID;
-@@ -229,5 +230,6 @@
-   QUERY PLAN
-   `--SEARCH TABLE t2 USING INDEX t2path2 (path>? AND path<?)
- }
-+}
- 
- finish_test
diff --git a/dev-db/sqlite/files/sqlite-3.28.0-nonfull_archive-segmentation_fault_fixes.patch b/dev-db/sqlite/files/sqlite-3.28.0-nonfull_archive-segmentation_fault_fixes.patch
deleted file mode 100644
index 7278c12b3774..000000000000
--- a/dev-db/sqlite/files/sqlite-3.28.0-nonfull_archive-segmentation_fault_fixes.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-https://sqlite.org/src/info/b2ce5ed175cb5029
-https://sqlite.org/src/info/6e4a5f22811bcd14
-https://sqlite.org/src/info/516ca8945150bdc1
-https://sqlite.org/src/info/e1724f1d618cfbcf
-https://sqlite.org/src/info/c621fc668c6538f9
-https://sqlite.org/src/info/c509d8a8aebe0da4
-https://sqlite.org/src/info/a9b90aa12eecdd9f
-
---- /sqlite3.c
-+++ /sqlite3.c
-@@ -67472,10 +67472,9 @@
-       rc = newDatabase(pBt);
-       pBt->nPage = get4byte(28 + pBt->pPage1->aData);
- 
--      /* The database size was written into the offset 28 of the header
--      ** when the transaction started, so we know that the value at offset
--      ** 28 is nonzero. */
--      assert( pBt->nPage>0 );
-+      /* pBt->nPage might be zero if the database was corrupt when 
-+      ** the transaction was started. Otherwise, it must be at least 1.  */
-+      assert( CORRUPT_DB || pBt->nPage>0 );
-     }
-     sqlite3BtreeLeave(p);
-   }
-@@ -70825,6 +70824,7 @@
-     u16 maskPage = pOld->maskPage;
-     u8 *piCell = aData + pOld->cellOffset;
-     u8 *piEnd;
-+    VVA_ONLY( int nCellAtStart = b.nCell; )
- 
-     /* Verify that all sibling pages are of the same "type" (table-leaf,
-     ** table-interior, index-leaf, or index-interior).
-@@ -70853,6 +70853,10 @@
-     */
-     memset(&b.szCell[b.nCell], 0, sizeof(b.szCell[0])*(limit+pOld->nOverflow));
-     if( pOld->nOverflow>0 ){
-+      if( limit<pOld->aiOvfl[0] ){
-+        rc = SQLITE_CORRUPT_BKPT;
-+        goto balance_cleanup;
-+      }
-       limit = pOld->aiOvfl[0];
-       for(j=0; j<limit; j++){
-         b.apCell[b.nCell] = aData + (maskPage & get2byteAligned(piCell));
-@@ -70872,6 +70876,7 @@
-       piCell += 2;
-       b.nCell++;
-     }
-+    assert( (b.nCell-nCellAtStart)==(pOld->nCell+pOld->nOverflow) );
- 
-     cntOld[i] = b.nCell;
-     if( i<nOld-1 && !leafData){
-@@ -83747,7 +83752,7 @@
-     ** is clear. Otherwise, if this is an ephemeral cursor created by 
-     ** OP_OpenDup, the cursor will not be closed and will still be part
-     ** of a BtShared.pCursor list.  */
--    p->apCsr[iCur]->isEphemeral = 0;
-+    if( p->apCsr[iCur]->pBtx==0 ) p->apCsr[iCur]->isEphemeral = 0;
-     sqlite3VdbeFreeCursor(p, p->apCsr[iCur]);
-     p->apCsr[iCur] = 0;
-   }
-@@ -87258,7 +87263,10 @@
-   if( pCx ){
-     /* If the ephermeral table is already open, erase all existing content
-     ** so that the table is empty again, rather than creating a new table. */
--    rc = sqlite3BtreeClearTable(pCx->pBtx, pCx->pgnoRoot, 0);
-+    assert( pCx->isEphemeral );
-+    if( pCx->pBtx ){
-+      rc = sqlite3BtreeClearTable(pCx->pBtx, pCx->pgnoRoot, 0);
-+    }
-   }else{
-     pCx = allocateCursor(p, pOp->p1, pOp->p2, -1, CURTYPE_BTREE);
-     if( pCx==0 ) goto no_mem;
-@@ -95979,7 +95987,9 @@
- #ifndef SQLITE_OMIT_WINDOWFUNC
-         if( pExpr->y.pWin ){
-           Select *pSel = pNC->pWinSelect;
--          sqlite3WindowUpdate(pParse, pSel->pWinDefn, pExpr->y.pWin, pDef);
-+          if( IN_RENAME_OBJECT==0 ){
-+            sqlite3WindowUpdate(pParse, pSel->pWinDefn, pExpr->y.pWin, pDef);
-+          }
-           sqlite3WalkExprList(pWalker, pExpr->y.pWin->pPartition);
-           sqlite3WalkExprList(pWalker, pExpr->y.pWin->pOrderBy);
-           sqlite3WalkExpr(pWalker, pExpr->y.pWin->pFilter);
-@@ -174132,7 +174142,7 @@
-     }
-     p->iOff += fts3GetVarint32(&p->aNode[p->iOff], &nSuffix);
- 
--    if( nPrefix>p->iOff || nSuffix>p->nNode-p->iOff ){
-+    if( nPrefix>p->term.n || nSuffix>p->nNode-p->iOff || nSuffix==0 ){
-       return FTS_CORRUPT_VTAB;
-     }
-     blobGrowBuffer(&p->term, nPrefix+nSuffix, &rc);
-@@ -174151,7 +174161,7 @@
-     }
-   }
- 
--  assert( p->iOff<=p->nNode );
-+  assert_fts3_nc( p->iOff<=p->nNode );
-   return rc;
- }
- 
-@@ -204287,7 +204297,11 @@
-     i64 iOff = *piOff;
-     int iVal;
-     fts5FastGetVarint32(a, i, iVal);
--    if( iVal==1 ){
-+    if( iVal<=1 ){
-+      if( iVal==0 ){
-+        *pi = i;
-+        return 0;
-+      }
-       fts5FastGetVarint32(a, i, iVal);
-       iOff = ((i64)iVal) << 32;
-       fts5FastGetVarint32(a, i, iVal);
diff --git a/dev-db/sqlite/sqlite-3.28.0.ebuild b/dev-db/sqlite/sqlite-3.30.1.ebuild
index 505ffe1eb7d5..208446dd09ff 100644
--- a/dev-db/sqlite/sqlite-3.28.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.30.1.ebuild
@@ -5,37 +5,51 @@ EAPI="7"
 
 inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
-SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
-DOC_PV="${SRC_PV}"
-# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+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/"
-SRC_URI="doc? ( https://sqlite.org/2019/${PN}-doc-${DOC_PV}.zip )
-	tcl? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
-	test? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
-	tools? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
-	!tcl? ( !test? ( !tools? ( https://sqlite.org/2019/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="doc? ( https://sqlite.org/2019/${PN}-doc-${DOC_PV}.zip )
+		tcl? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
+		test? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
+		tools? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
+		!tcl? ( !test? ( !tools? ( https://sqlite.org/2019/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+fi
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 )"
 
-BDEPEND="doc? ( app-arch/unzip )
-	tcl? (
-		app-arch/unzip
-		>=dev-lang/tcl-8.6:0
-	)
-	test? (
-		app-arch/unzip
-		>=dev-lang/tcl-8.6:0
-	)
-	tools? (
-		app-arch/unzip
-		>=dev-lang/tcl-8.6:0
-	)"
+if [[ "${PV}" == "9999" ]]; then
+	BDEPEND=">=dev-lang/tcl-8.6:0
+		dev-vcs/fossil"
+else
+	BDEPEND="doc? ( app-arch/unzip )
+		tcl? (
+			app-arch/unzip
+			>=dev-lang/tcl-8.6:0
+		)
+		test? (
+			app-arch/unzip
+			>=dev-lang/tcl-8.6:0
+		)
+		tools? (
+			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}] )
@@ -45,22 +59,72 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
 
 full_archive() {
-	use tcl || use test || use tools
+	[[ "${PV}" == "9999" ]] || use tcl || use test || use tools
 }
 
 pkg_setup() {
-	if full_archive; then
-		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	if [[ "${PV}" == "9999" ]]; then
+		S="${WORKDIR}/${PN}"
+	else
+		if full_archive; then
+			S="${WORKDIR}/${PN}-src-${SRC_PV}"
+		else
+			S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+		addwrite "${distdir}"
+		mkdir -p "${distdir}/fossil-src/${PN}" || die
+
+		mkdir "${WORKDIR}/${PN}" || die
+		pushd "${WORKDIR}/${PN}" > /dev/null || die
+		if [[ ! -f "${distdir}/fossil-src/${PN}/sqlite.fossil" ]]; then
+			einfo fossil clone --verbose https://sqlite.org/src sqlite.fossil
+			fossil clone --verbose https://sqlite.org/src sqlite.fossil || die
+			echo
+		else
+			cp -p "${distdir}/fossil-src/${PN}/sqlite.fossil" . || die
+			einfo fossil pull --repository sqlite.fossil --verbose https://sqlite.org/src
+			fossil pull --repository sqlite.fossil --verbose https://sqlite.org/src || die
+			echo
+		fi
+		cp -p sqlite.fossil "${distdir}/fossil-src/${PN}" || die
+		einfo fossil open --quiet sqlite.fossil
+		fossil open --quiet sqlite.fossil || die
+		echo
+		popd > /dev/null || die
+
+		if use doc; then
+			mkdir "${WORKDIR}/${PN}-doc" || die
+			pushd "${WORKDIR}/${PN}-doc" > /dev/null || die
+			if [[ ! -f "${distdir}/fossil-src/${PN}/sqlite-doc.fossil" ]]; then
+				einfo fossil clone --verbose https://sqlite.org/docsrc sqlite-doc.fossil
+				fossil clone --verbose https://sqlite.org/docsrc sqlite-doc.fossil || die
+				echo
+			else
+				cp -p "${distdir}/fossil-src/${PN}/sqlite-doc.fossil" . || die
+				einfo fossil pull --repository sqlite-doc.fossil --verbose https://sqlite.org/docsrc
+				fossil pull --repository sqlite-doc.fossil --verbose https://sqlite.org/docsrc || die
+				echo
+			fi
+			cp -p sqlite-doc.fossil "${distdir}/fossil-src/${PN}" || die
+			einfo fossil open --quiet sqlite-doc.fossil
+			fossil open --quiet sqlite-doc.fossil || die
+			echo
+			popd > /dev/null || die
+		fi
 	else
-		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+		default
 	fi
 }
 
 src_prepare() {
 	if full_archive; then
-		eapply "${FILESDIR}/${PN}-3.28.0-full_archive-build.patch"
-		eapply "${FILESDIR}/${PN}-3.28.0-full_archive-segmentation_fault_fixes.patch"
-		eapply "${FILESDIR}/${PN}-3.28.0-full_archive-tests.patch"
+		eapply "${FILESDIR}/${PN}-3.29.0-full_archive-build.patch"
 
 		eapply_user
 
@@ -69,7 +133,6 @@ src_prepare() {
 		sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"
 	else
 		eapply "${FILESDIR}/${PN}-3.25.0-nonfull_archive-build.patch"
-		eapply "${FILESDIR}/${PN}-3.28.0-nonfull_archive-segmentation_fault_fixes.patch"
 
 		eapply_user
 
@@ -87,7 +150,8 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=()
+	local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
+	local options=()
 
 	options+=(
 		--enable-$(full_archive && echo load-extension || echo dynamic-extensions)
@@ -186,12 +250,6 @@ multilib_src_configure() {
 	# https://sqlite.org/compile.html#enable_update_delete_limit
 	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
 
-	# Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements.
-	# https://sqlite.org/pragma.html#pragma_function_list
-	# https://sqlite.org/pragma.html#pragma_module_list
-	# https://sqlite.org/pragma.html#pragma_pragma_list
-	append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS
-
 	# Support soundex() function.
 	# https://sqlite.org/lang_corefunc.html#soundex
 	append-cppflags -DSQLITE_SOUNDEX
@@ -316,12 +374,12 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	find "${D}" -name "*.la" -delete || die
+	find "${D}" -name "*.la" -type f -delete || die
 
 	doman sqlite3.1
 
 	if use doc; then
-		rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
+		rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt} || die
 		(
 			docinto html
 			dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index e6e2b80e66b5..9d9e818bb9ac 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,4 +1,4 @@
 AUX sqlitebrowser-3.11.1-unbundle.patch 3194 BLAKE2B b2015e90e7f79409fb16d0490081634c47208956a53f4c24aeec3fa217dd165b1fec2bc51b818b82f39fae55a3ca7bb9a79dc58746781e1622707e0b051e845c SHA512 b0082e6373d54a2aee87b84f0194a91139f535da0c7d741e68458e05a6c7e6a46c1b027e8cf0dff455de0cf2c484d2be51bc829bdbedb2169c8fa44d553afd95
 DIST sqlitebrowser-3.11.1.tar.gz 2523481 BLAKE2B c9a92b93795050605aa938cf5c73493b7d887b386da77b4cee206becd70779f00ab39c7a105772cdbe925ebedcfe0277b6ebe7898383db87454e19b050001253 SHA512 31f5315fd66d14fde16b58fe6522da937068c42e21f60aa15c3c04a1318ecac09f68143df108b83204cdc70ec8bac617a8ae196df9b5524690f837d7e7728916
-EBUILD sqlitebrowser-3.11.1-r1.ebuild 1417 BLAKE2B 15bcf22a23c0ae234aedfce650329a5fdd71c83564b83fd26bdfe8b214152acaa3a27dd0858fe2ed6576929371a7127e2badb3e7b88f6a3f657566afd5ee84ac SHA512 f639d89292c98698bdb0c13e14eb71ccfc307f8216e09ac52a40850c3b99607dd7670f12b37c9470de2e09203a9f736fb8ae55232efb6e5ffdfbeb57750fbba0
+EBUILD sqlitebrowser-3.11.1-r1.ebuild 1444 BLAKE2B b8376b59c957b71baf11bcd609d18cee46102a4211383b272c53e9fb214dae89b7010d1cf6f863b4519b15385c949480a9f54846443092ba2d43228646537379 SHA512 10b51ec6943d743443720ee3bc608f37455e557294d822fcd74f38e1ec40cb36116969e9976bae5ee245f81f0c05c5c62d4b38668972ed0fbd34e75358e7958b
 MISC metadata.xml 659 BLAKE2B bf5f352f0227c1408cd9c0720fea6b7bf35e6f843f4e1f6fb3e340d3e7e5ddc09843484da6c54254345cde615993acaeba50027f44f33e0134ac05414e80e8ca SHA512 defe9a90cbcdee9750f9a5dffb8620445efd4d855fa789bad01d80151f4e64676245c2a51670c7418d2e19faa72bf26f4322c3953d610933a5b479985acedca2
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
index 937429c32f84..7816ece23a2e 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3 MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest
index 7c59386a9bdd..34174b75a6de 100644
--- a/dev-db/sqlitestudio/Manifest
+++ b/dev-db/sqlitestudio/Manifest
@@ -1,4 +1,4 @@
 AUX sqlitestudio-3.2.1-libressl.patch 1248 BLAKE2B 7500c5231d03a2c1e2006631b77076a0cb6af49609446544f7e3901b748e87a2be03b232ef8f93714220542fff56f48e92c2de39d8a54889d7472b142071c71f SHA512 6fafceed80e8d072d06060f15787d855bfcfb55a502a73655beca043a73c45101bf5d3168781a2579c9e6aee5d924318240c886fe982cb0c833779d57be97405
 DIST sqlitestudio-3.2.1.tar.gz 9405867 BLAKE2B 53cd8465a6140cf17c602094cceef2fdf74f513f33257b22e1a3d7adcb9c78d8eb2cdaff047920836a9d98429ba0025924ce608f2eab97319feabf063de4c9ee SHA512 9c07f0dc50bf35ad04d0cb06cfc1a306d3f0aa9446e7d737c8187c63cb7dd2c44fb4b960693f2c30a15ece3aac0878701874a9ce3cebfe0c6bf48df10814a574
-EBUILD sqlitestudio-3.2.1-r1.ebuild 3748 BLAKE2B ef74b59ba8bbf8d39a77e4a31d061fb2ed090b2181b3198449efd9d58c175c0e8547597a56dd94d7f3da88a299e678f8ebb2aa53396e5bfb129bb4d48dfa79ba SHA512 29fd5e1257f6ea0b0d56ddb9e44b4e6442a4ccfb67d9815b04a08605158f828bc7f9a28557f2a974fabc98fdff4782b807ed1c52a8a32ef6269a1339c076b2a2
+EBUILD sqlitestudio-3.2.1-r1.ebuild 3775 BLAKE2B 434145097a1175605418515b53506f536e7c97981119040c579c20d8aae4abc20ecf649578d5a94bb475d27001d449be6cfe57706e987c6219644d4556d18937 SHA512 01087e85a42c66ddce282fe74e21314298a25ed7e73e6f02c21ec10f7e5169b8c7e9a5d47503d26d7ee6ef312f9b4f89b3c5db8c9511ad36d009ccd7b034480a
 MISC metadata.xml 427 BLAKE2B 937831b3acf561038a945599a81766c4fd1712d889b8bb0ba2c7b8c0d2414c547e270363b6ece7fd7956b66f1eec2e12bb4b83a2adf2718c14d0271d3c0f0155 SHA512 a6948ce576abceb4df085f103e097a720ef5f959c6f4bb79cc1f1d858e43cea625d5af3c5edf47f5e61c0a537368e60abd77ed3fcf39a9526543de315ef125b2
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
index f1b05ce7abeb..eed8e84a6d17 100644
--- a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
+++ b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="cli cups tcl test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( cli )"
 
diff --git a/dev-db/tokyocabinet/Manifest b/dev-db/tokyocabinet/Manifest
index d0d8ec189336..955801be76f6 100644
--- a/dev-db/tokyocabinet/Manifest
+++ b/dev-db/tokyocabinet/Manifest
@@ -1,4 +1,4 @@
 AUX fix_rpath.patch 2111 BLAKE2B 3aa9797555e0eb02a3d63e4e117e8aff5c7c0a09922cf6b0344777cd95b2480623f05fe68cfe63750ba00ff954bd6bb3e1a587c4e8af31086c94b2b3344cc08e SHA512 c0ee076d048d8ec4a77b036d0503776c4e3ca7a97c30cd8ba41cb0d99707ad5021613e1d308f6e73cc3432e0f71f7b38429ca0edcbc4edfe0d96955fc56b3504
 DIST tokyocabinet-1.4.48.tar.gz 1000485 BLAKE2B 4da2659a90dcee1cc99be286fe0e286ee75bd8179b75a944f229a3cc04169b8007220e36400d4934a7b5fde554bbc1783c4813fdf44b4a3530882ea0a8ef258e SHA512 b9995c838e713c13f781ab41062caefeb5c613f696dab08039f992f6860413d60a513114b83468cafdf7fc5b5e51ab880226972465d532f873f2a55f615e1440
-EBUILD tokyocabinet-1.4.48-r1.ebuild 1577 BLAKE2B 288eecc874a86d32cc1e26bf00f1b00ecca59c65fb0d2362069e473d4b588e5e2441c622faffb03494f8dc4eba7eb73cea9a4786e19078ad4c0be65369b06a7d SHA512 f01bf5876c561cc25b36600e30cb8388bbfd269f36c10c2e3de0d4bc33689263d4b57e4394384de8380010f05c581fb5c12bbf2ca20789daf8e30ada8f1fcbf6
+EBUILD tokyocabinet-1.4.48-r1.ebuild 1483 BLAKE2B a19702d1c2432e20fd66c88068ede91aaa4ee72fc39196587999e41c452505d602b6b8f016daef5e664b1ea3748c758a4c32eec7ae01a5ede2e2b6e717d96293 SHA512 d1980ac19c0fbfea176f82efe5f3a3229faf26d171b2d2768306f6423f56f56d67d2748414fe6c94e71a8ab90e4b5fb69310a454bd25130819a6b33f1db69364
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
index a7c0ed8ebb55..5ce9ea0274ad 100644
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
@@ -42,19 +42,19 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
+	emake DESTDIR="${D}" install
 
 	if use examples; then
 		insinto /usr/share/${PF}/example
-		doins example/* || die "Install failed"
+		doins example/*
 	fi
 
 	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins -r doc/* || die "Install failed"
+		doins -r doc/*
 	fi
 }
 
 src_test() {
-	emake -j1 check || die "Tests failed"
+	emake -j1 check
 }
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-db
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)