gentoo resync : 28.04.2018

28 files changed, 194 insertions, 166 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 4224cd0bc359..ac093a6ce670 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 6992f46274cd..81613c26fd90 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -4,12 +4,10 @@ AUX etcd.initd 813 BLAKE2B 3d63e753f2a04b1cba20ddfdbc7d67acd2be14caff08de74d498e
 AUX etcd.logrotated 104 BLAKE2B 3126c99db171af177d6d6368e7e53f3e5e07b9ae2926ff12cb0ff7fb877527df33a91dedcaa4bbbffa190b4f9c2f53868aeca093b93e9cad50718a23eb5fdd46 SHA512 64d3181a936f8bab635a17f90679041c2d70a712307928feae03a517ad02252fc37e25738979bc1ccd0657ef70439e65cb0306759bec3939e940ec382a02d94f
 AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452d26fbaec17ab9c138db86b543c3c88fd3d16ce79487eb2c31ad7bbfb0c5b9cd11eede9b99bd2d SHA512 0074f77a17afe2bb4145f12a6eb312caa3e08cfe8bf35856b79d091ad8786c4223bd91c0a865e789ee9ba180f2672b31721742bb32efd0cd383bc747eb926961
 AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10e20b61ab3df45918747f588b9246085fec925bb39b772e061628aadd030a23a59b65a2fc2243eca1a7f9 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce
-DIST etcd-2.3.8.tar.gz 2206562 BLAKE2B 754930b4b5f0e90386b2b4765a9dbb6790ae509a81d3430c3f7c2c828d90318db3b01a2faea0c7075078096ce74302f2be7444245047534749f49d13a927851e SHA512 4268de32797cab23e9e47784d31d5abd6982068c53d3cc9735a06719740dba45b73f4e067cbc7aa8aef5ca7c56d8be067f1076685ac82f64012b760d8b7f2bfc
 DIST etcd-3.2.17.tar.gz 3064774 BLAKE2B b111082f39dd428d40d8325dc5d1f3507fbd45c2fb12002f87d4a85c60e6d546042b6ae3ecda9e842e7d27b992a17b7899c1b871f25623651a455fd0758b690b SHA512 d526a1c96de04467f23ca112bcb502367f22fd8cbefe29667f097aa7fcec6fce78914c56b2e39fd0131b566803d715cb5fee5e335f9f3f4b86011d00232b5d0d
-DIST etcd-3.3.2.tar.gz 3385493 BLAKE2B e4c2e614b0b868268fbfe3db222caeab2fe65f8fe55026aadff2acc5f1a2769fe3a71f0658e90ca35ccf5b117e7ec30b1f8a62499b6156976dac63118a766b92 SHA512 6320a49dddac527312b75c113428c52c27e0516b7d7235ceddf3009c2edbdc509d2ec425859c5d57591b55109e04aa9737dbe7d1337a6c2307936fa372f8a28a
 DIST etcd-3.3.3.tar.gz 3387223 BLAKE2B bf873ef764a4fa03c2c5b282129a2dc2e7574fd7d0206fb270d61c3a277342a2af145f4e00512c878a31d4102c0f8b0b7090872beb928b574aca97f5fe43915e SHA512 16597bba961d7018656dd4f73d4067218978cc41fa8fafbf9677621bdba2d5e81825d2c74820153a177df1813e5d8ac79e72967ba61be3339feb01bb2f539920
-EBUILD etcd-2.3.8.ebuild 1379 BLAKE2B a6bff7dcfef244a2de25f4bf9168eb41552e394edf4a5e573a5b7dcea580debc3a87008b9d77d717b31b0fe27dcc08cdee76f855865455cde2fd26c16aee00e4 SHA512 ea3065641cac36b9011238603479967c1de5ab6f0ccb61dbc54b751879ff239b43065034b17045eb9467e1870878e4837af88c922f9034899da1359b69be98f3
+DIST etcd-3.3.4.tar.gz 3513132 BLAKE2B 92902c260150259ce5627dbf517c81bdb914c857a901a5f7d8d878a2daad8db931c2d1958a562a612ed62b5ac3080ce54661cb70eabff3430ab9ff65c258544d SHA512 971c47545059dda65d40c2db0928a01b97cf8b1e1b60a6e631e797e3cf1619245430f938f637bea3ab0d01cc2a8974586988727bc9c652b8802e184ad5ad8487
 EBUILD etcd-3.2.17.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
-EBUILD etcd-3.3.2.ebuild 1603 BLAKE2B ecc2eb8cd86fb1ca37d6fd7eecde005fcc3c633bc7569ce54acc5daf947b4be2cc88e596ada2c1e8a7b3d40d44273a143f80b26a2cbb8e851ad8d36b6fcb4beb SHA512 83a23179d8381a126fde6d9e9c521170b3148b78773421893175a81fb48d8b980e93309cc5c40d8993b9039fadc7d75a2ecc03fdc5186d5ba84ac71826dfe68d
 EBUILD etcd-3.3.3.ebuild 1603 BLAKE2B ecc2eb8cd86fb1ca37d6fd7eecde005fcc3c633bc7569ce54acc5daf947b4be2cc88e596ada2c1e8a7b3d40d44273a143f80b26a2cbb8e851ad8d36b6fcb4beb SHA512 83a23179d8381a126fde6d9e9c521170b3148b78773421893175a81fb48d8b980e93309cc5c40d8993b9039fadc7d75a2ecc03fdc5186d5ba84ac71826dfe68d
+EBUILD etcd-3.3.4.ebuild 1603 BLAKE2B ecc2eb8cd86fb1ca37d6fd7eecde005fcc3c633bc7569ce54acc5daf947b4be2cc88e596ada2c1e8a7b3d40d44273a143f80b26a2cbb8e851ad8d36b6fcb4beb SHA512 83a23179d8381a126fde6d9e9c521170b3148b78773421893175a81fb48d8b980e93309cc5c40d8993b9039fadc7d75a2ecc03fdc5186d5ba84ac71826dfe68d
 MISC metadata.xml 679 BLAKE2B 7374379a18107011df792be631428834334ad8e6da5cfe404f18555e8c168d3fc716a1c8d6cb5cf1d9ccd173737aecf93a165f846865dbb6ba4a76bd4669b446 SHA512 8070d8b51dd3319e8b159072db237dcc5299361c2f74fa086fc4cbc174cc6a5c8f7659310332b54b2275e2bc3d028323c4dfa5775e21693a339f54312582d2f0
diff --git a/dev-db/etcd/etcd-2.3.8.ebuild b/dev-db/etcd/etcd-2.3.8.ebuild
deleted file mode 100644
index f20ed84c75b8..000000000000
--- a/dev-db/etcd/etcd-2.3.8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user systemd
-
-KEYWORDS="~amd64"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/coreos/etcd/"
-SRC_URI="https://github.com/coreos/etcd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc"
-DEPEND=">=dev-lang/go-1.4:="
-RDEPEND="!dev-db/etcdctl"
-
-#pkg_setup() {
-#	enewgroup ${PN}
-#	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-#}
-
-src_prepare() {
-	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
-		-e 's|-ldflags "-s.*"|-v -x|' \
-		-e 's|-ldflags "-s|-v -x "|' \
-		-i build || die
-	sed -e 's|go test|\0 -v|'\
-		-i test || die
-}
-
-src_compile() {
-	./build || die
-}
-
-src_install() {
-	insinto /etc/${PN}
-	doins "${FILESDIR}/${PN}.conf"
-	dobin bin/*
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	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}"
-	dodir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-	fperms 755 /var/lib/${PN}
-	dodir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	fperms 755 /var/log/${PN}
-}
-
-src_test() {
-	./test || die
-}
diff --git a/dev-db/etcd/etcd-3.3.2.ebuild b/dev-db/etcd/etcd-3.3.4.ebuild
index 88b1e478fe0a..88b1e478fe0a 100644
--- a/dev-db/etcd/etcd-3.3.2.ebuild
+++ b/dev-db/etcd/etcd-3.3.4.ebuild
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 2efa61ca639d..c0ddf25af408 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -15,7 +15,7 @@ DIST mariadb-10.2.12.tar.gz 72818636 BLAKE2B 50a72b8096ae8bd5dc635352fc35d22322a
 DIST mariadb-10.2.13.tar.gz 72591913 BLAKE2B 5abc3fefc5b02f099254b8a3a832a20793989a316efdc22b146cf78b5b83fcb3e4e617fce1b9161194e3f54b7bb469de3bb656319048fb137915af24e21f6aa2 SHA512 4c6038f134a32f50daa3172b367588240ef20a6f6cfe36d830e427cf52d315284481f5300d3db32d9e81ddd352dbea01fd4230f4e4d79e175d97c0c49331a4ca
 DIST mariadb-10.2.14.tar.gz 72607526 BLAKE2B ca0c73e30e15265a7a1599d9bd4b64e030aaf92fcdbe18fda39eaf071c88c90b32a16ea5d9c63130e3853572a30a0c5870e6389e6dcb2a3eb690311cdb9bde3c SHA512 12195cc8c7a97619024d6b8b37558a43f4f543efff257a7a3dbb10e8a6e064ec2f0740554cf50cc83576b74ba355cf00f3c99855bc2bcf68b90c1fa90c850026
 DIST mariadb-10.3.5.tar.gz 70945381 BLAKE2B 10f5f08a64b3d046f8255a5ea9bb1661b7a88d130b0a89b41c8f98abbe3c04cc13154e1ad6c012ef97a396f055ca5d748998f1e7d6dc89ca73a3b61f70749457 SHA512 e7f2ffd38da4e4dbd214bc97e30216682b6f8ca368bcbd5717fb408a6110f26da4472cd7ac0d288c817eb9c6426a063cff8d582e03fe8a1219c0d70508e5a004
-DIST mariadb-5.5.59.tar.gz 45804920 BLAKE2B e24792cb5427e2c3254e83cfa355b8cf4350bc488b2477daa4ef4ee41d3c33c7d0b124eb9a615ccbccec693313fd83e3f13f633cc08ea725b78b179cc813f809 SHA512 facebe62cb9b55518fe669b65f939974aa33c308983c4c3ab6897fb500ec10aa407489e936e56d1269ea5e533655c4be8d0b5d78b3eeb3882ce1b96113a66afe
+DIST mariadb-5.5.60.tar.gz 45822878 BLAKE2B 150a2d7108db2db18d66b56d961b05f8746f744e9453e341fde21f93bd846a3091a44c5df3baed6774d0ad12b8dc806b9bfdd177b4149f5be9d37af2a298f807 SHA512 eacf6ec57d46b00701b5038a67745174060d592b0e425466149c9a1b6dc1ac0659a36e57e82bf7e9f7865d8eac3dd50d0737630bd6220002d168b5b574437e4c
 DIST mysql-extras-20160721-1526Z.tar.bz2 301788 BLAKE2B 23ef75d0122e9e18382f708a86c61624e0437fad593b7f02ccb2b3939d710404e18e3b70617ed400e5f6947d3a92d2867a5f7d98bf61597442e99989f60ca4f7 SHA512 c7450039780e4e2684c932ba7c291c1de25dd1a64e4c6e88aa13b790768b4100955f36ae4a3bf983569ea23b43be02da6dad3d5985c1163ec9e8aa91f0efd85d
 DIST mysql-extras-20170310-1426Z.tar.bz2 307052 BLAKE2B 2c364678301c97ae5c88551a78caa633377f20dd45ce3e43516f8909f7bfa1b3ed5b115dd314540e7ea96f4232f7265d8fc50099da51934a0e38561bbeff84e4 SHA512 2dbb3e46f14fbd0be9ee0e3a8ff2e4d5325f9a9be332014ea556283c0bc5f53349952d267d6713fac5b54e3167a66ddd36f18b18b79ca6b68ede399399488157
 DIST mysql-extras-20170316-1355Z.tar.bz2 308933 BLAKE2B e515f5926a0cbba86fdaaa9295e9d1f7d5f36e401f73de0d9d3c837a7f2d2a4f48c8a1bb5dadefad73a1aa676c9c5aee3571342d594644918cfca2861f2ba253 SHA512 5bf7938bfa5989da85216fbca4575397fc05c83e1afac76bd6c0b338a876caf37194f53a2a933d6f69eb31727ca005be617e53a8fdd0a95d8f1f68684c4ba68c
@@ -28,9 +28,9 @@ EBUILD mariadb-10.1.24-r1.ebuild 7175 BLAKE2B 6d92e08b3197423710e91f0f56e1fff64b
 EBUILD mariadb-10.1.29.ebuild 7305 BLAKE2B b5828f97361eb989638654f3399e1a036c12356c5cb90c2e62caf1055497b6f0e1c4f3587d1fe599d2da4cb1059c5aa676109e0aad88306d8136753c22c87854 SHA512 a0b25e416d701f557a017c4b6c454c6359406da3c43da0dda3c892020961b27888412582a892fedce4484c4412ce774fab45f868074b7ac053ba530339288337
 EBUILD mariadb-10.1.31-r1.ebuild 7804 BLAKE2B 67d90c7ef1ef2f1f93be7772a7d7495f0c7f3d24079ea2c4784357cd269b3e154a03ae9d9e96a68e10ee466adf41fdfaf509f3c7a497d990e1f38abcdab22d35 SHA512 b307c86ff8908afd2ad7b3969f7e98b3397407e0df669a1d0ae75d8a7cf29ba59c1ac556d182284f86fbb722f758f022e1877ec33ecfae449302448b803a0f18
 EBUILD mariadb-10.1.32.ebuild 7746 BLAKE2B e180454e92e0d59b5d4aa2c4bebd4df0e7dbdc4cee8f48b008efaba06086a7a221d89926356afc97187386527a332d7f59c0d15e1dbe8ae113050354026e4c72 SHA512 f54f62ac128d9b03bef2f67eb2e35cdcf85f22b212388263c86bbf16108196cb689c08f67d7fe2cc1c259921357bf6aac364954a321e45ff710fb58493399c85
-EBUILD mariadb-10.2.12.ebuild 32462 BLAKE2B bc420743a09e2349535536d85d323f1c6bde584b11da0faf9d80ff39820b0535686b7f4b5568a5091354ed88959190e0b66508068d47ed01e5f47742450cd1f9 SHA512 92da852d9aefbb1d5245943a0b86073aa013df5f491d4228a85795e450468d59caebd4e7812c4c065b8f9b65d86b8b3a5c16295b2d4a99e39897d48e7900081b
-EBUILD mariadb-10.2.13.ebuild 33108 BLAKE2B 5100ee8a36ea788132c9f121614b950a5d54e43d963339c438a5f59829265e3408e4bd1b4ba8f1fb125d72579795cef232bd72c2c16a58f97f0c5244f2923d97 SHA512 195c6c6d01a7e6a945a6a8880449bec22170008d285c95b5ec6c9473ca1ff4ec99d64d0b4d45b46e67ac3ac992b233ddf0306a286709cadaa21347b5cfc82aad
-EBUILD mariadb-10.2.14.ebuild 32975 BLAKE2B b3f098cee05860692a98570d301d6ace6a404d0cb380eed6a3cf07d8006740f6926c863653dab7e90bf07b1947026fecfd531cf9996ad238425b4dd4b6d65bcc SHA512 f610df3ab3a171e78e469571cc009e16c9dc37bbcb66d1681d4df48a444bde79462045c6d2b1f49ce7608174693f004fc82e1c6358a84fb75866ddb114c89c63
-EBUILD mariadb-10.3.5_rc.ebuild 33075 BLAKE2B 6ecdfe057de4996adac5e4b3f5e6cd50d33f7c4285e65a3947231859c5a496b47a87e76aba605cde08947001611ea182dcc1ce956c169aea20d1cfd5cc69f0ce SHA512 23a353acdab8349bb063634e7510d9608ce5ae3f3d700ce0007129d875643df336057269f41b92b24d2b8480bcb4cb2faa6d0da84afc00f64fa3e189874ce25e
-EBUILD mariadb-5.5.59.ebuild 4220 BLAKE2B 15d84c6e8405e0f2339a1fa2c1dac8c5cb5d070f083219e5b0b6b6f59b83a5d147f049a7874f4109bea38a295be86f560faa6bf21b8665a2696a9ef4ff09ad08 SHA512 0397ba6f08cdedcb3812b61044d6d58b42db9009747fd1a0af53e450d530b56bbb748ffdd0a9c3de7dc535f9e4566e2513a7ea01fe893f250b9a31fa074de5e1
+EBUILD mariadb-10.2.12.ebuild 32434 BLAKE2B f3f70f463a04a3d8a679fff49963b7a7bcbac5bd46b7a847e85c7d7aee9ea36bb07c1667cd7e3b966e95240cddae18545bcc0b03b43b10c079f02f01784b2a37 SHA512 be2a4fff80b1e0d6bb0c6c074992075c21670933dc158a5bd320000e3c3fbe72862a4bbcc3455cd824ae1c1ff6545f0e54f866a6a7fb9f5c494f0082a80f2f6f
+EBUILD mariadb-10.2.13.ebuild 33080 BLAKE2B 8be8896c4cc6ee27261d97e72dd728e2f65ba15cdd521afb573abdbb82d4d13353caada2929bc78df2759b461b164efe1c3e4e4d07aad55e27de7939ad86533e SHA512 5da49aae23719fcc3fe21f515005aa1d873ab7d1f8f7ae87ae00f75693150241633fa41830909bbee69c11b4ea38211b75ca762845f641da1a5ba2b81ed6631b
+EBUILD mariadb-10.2.14.ebuild 32947 BLAKE2B 5c122a092e9f51943ec1c7249b9cbb7c30545c4259a27605925e0b76e8b8d5b9728275f9510a314950a711a135a89cb031c353843024d0485f027372e20b68bf SHA512 a09520366102f9085c111218001b26babc235ed4105019fba497e8720d18fc287c6f9e59e4b51e9eb0f867d5483ecb73203d163375b2367e004429cbe3ec2f8f
+EBUILD mariadb-10.3.5_rc.ebuild 33047 BLAKE2B 7a5f2781da57a983bd2ca3f8aa1ff3d4d1794ab9eb2dbd98d928465f0adbd445acc01a36abff6493394dcfb6e20b4c24ff34b2c8e51bf355706ca8bc253415c3 SHA512 9c12e336fc9afd053f0ebf098bac5b71ca40e60bce6e319aa59d8026852406f067a6a931dd6bf32a653ac3b399893994142992e1ba8f9fc6ef4e472367848a25
+EBUILD mariadb-5.5.60.ebuild 4254 BLAKE2B ee31137be4020cdb3626a93981eb2c667b4c9f8a543d52e272f4c2721f8ded71305a1caab6319a3a7cad25cbdf17a736abae3eb01062ffe5cc54c66da1b9703d SHA512 9d9ffc8ca65d6e4f7a64f4e6c1477096d46404d3a4401db1687ab5507452bbf4afb294667a2b01f7db8ba6953b8d935a40211fb006273462723846b960248920
 MISC metadata.xml 3172 BLAKE2B 9b546b51359c0881ee5ce452c89e788ff27300471433fb9d1eb28b3f72d47cd84787eac1d7fd536a8133aa56dd4dd9c1139afb4b3e83b463ce12b7d6cb0fa35f SHA512 143381d9443b778b4f8fb5545c6e8ac59e54eaba20458eecb757e292650a1fd5a470ded204f25c173f456cc222bd32f8b9885e00ecb00c9b4abfd639c9e98391
diff --git a/dev-db/mariadb/mariadb-10.2.12.ebuild b/dev-db/mariadb/mariadb-10.2.12.ebuild
index 29a68b7734cc..73d4cd9e20ec 100644
--- a/dev-db/mariadb/mariadb-10.2.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.12.ebuild
@@ -504,8 +504,8 @@ multilib_src_install() {
 	mysql_init_vars
 
 	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-	if [[ -f "${D}/usr/include/mysql/server/private/config.h" ]] ; then
-		rm "${D}/usr/include/mysql/server/private/config.h" || die
+	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED}/usr/include/mysql/server/private/config.h" || die
 	fi
 
 	if ! multilib_is_native_abi && use server ; then
@@ -514,9 +514,9 @@ multilib_src_install() {
 	fi
 
 	# Install compatible symlinks to libmysqlclient
-#	use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
-#	dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
-	dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
+#	use static-libs && dosym libmariadbclient.a "/usr/$(get_libdir)/libmysqlclient.a"
+#	dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so"
+	dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
 
 	# Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
 	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
diff --git a/dev-db/mariadb/mariadb-10.2.13.ebuild b/dev-db/mariadb/mariadb-10.2.13.ebuild
index c9a11e7250ca..2eff8c74630e 100644
--- a/dev-db/mariadb/mariadb-10.2.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.13.ebuild
@@ -534,8 +534,8 @@ multilib_src_install() {
 	cmake-utils_src_install
 
 	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-	if [[ -f "${D}/usr/include/mysql/server/private/config.h" ]] ; then
-		rm "${D}/usr/include/mysql/server/private/config.h" || die
+	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED}/usr/include/mysql/server/private/config.h" || die
 	fi
 
 	if ! multilib_is_native_abi && use server ; then
@@ -545,9 +545,9 @@ multilib_src_install() {
 
 	if use client-libs ; then
 	# Install compatible symlinks to libmysqlclient
-#	use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
-#	dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
-	dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
+#	use static-libs && dosym libmariadbclient.a "/usr/$(get_libdir)/libmysqlclient.a"
+#	dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so"
+	dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
 	fi
 
 	# Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild b/dev-db/mariadb/mariadb-10.2.14.ebuild
index 86c88b6342e4..3c62b609a1e8 100644
--- a/dev-db/mariadb/mariadb-10.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.14.ebuild
@@ -532,8 +532,8 @@ multilib_src_install() {
 	cmake-utils_src_install
 
 	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-	if [[ -f "${D}/usr/include/mysql/server/private/config.h" ]] ; then
-		rm "${D}/usr/include/mysql/server/private/config.h" || die
+	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED}/usr/include/mysql/server/private/config.h" || die
 	fi
 
 	if ! multilib_is_native_abi && use server ; then
@@ -543,9 +543,9 @@ multilib_src_install() {
 
 	if use client-libs ; then
 	# Install compatible symlinks to libmysqlclient
-#	use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
-#	dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
-	dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
+#	use static-libs && dosym libmariadbclient.a "/usr/$(get_libdir)/libmysqlclient.a"
+#	dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so"
+	dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
 	fi
 
 	# Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
diff --git a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
index 33cd1b5332c0..69e55e88ddc5 100644
--- a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
@@ -536,8 +536,8 @@ multilib_src_install() {
 	mysql_init_vars
 
 	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-	if [[ -f "${D}/usr/include/mysql/server/private/config.h" ]] ; then
-		rm "${D}/usr/include/mysql/server/private/config.h" || die
+	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED}/usr/include/mysql/server/private/config.h" || die
 	fi
 
 	if ! multilib_is_native_abi && use server ; then
@@ -547,9 +547,9 @@ multilib_src_install() {
 
 	if use client-libs ; then
 	# Install compatible symlinks to libmysqlclient
-#	use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
-#	dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
-	dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
+#	use static-libs && dosym libmariadbclient.a "/usr/$(get_libdir)/libmysqlclient.a"
+#	dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so"
+	dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
 	fi
 
 	# Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
diff --git a/dev-db/mariadb/mariadb-5.5.59.ebuild b/dev-db/mariadb/mariadb-5.5.60.ebuild
index 96f116e1a1e3..84fdbafdf4a2 100644
--- a/dev-db/mariadb/mariadb-5.5.59.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.60.ebuild
@@ -17,7 +17,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
 
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	ssl? ( !>=dev-libs/openssl-1.1 )"
 RDEPEND="${RDEPEND}"
 SLOT="0/18"
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index b70ac1dfccd6..ce808ed91c21 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -24,5 +24,5 @@ EBUILD mysql-5.6.37-r1.ebuild 6157 BLAKE2B e4dc21ce1095263789262ef65c5d70d53d20c
 EBUILD mysql-5.6.38.ebuild 6466 BLAKE2B c85ee0bd78a7b75a328a72120444277c9425886e06dc9134662669c73af4d1da45c6d49943f44fbe518379d0babd0590a3ae127f7552862aeb6eacbc18e6cd1c SHA512 e4272584a5de91df2b5f4fee2060e3ca3b5151472bc5e9d472004fdc213f0fc9527874958995bb039847f7f5da97047fc3e9b12f61cecdf03b9d3f65d707be78
 EBUILD mysql-5.6.39.ebuild 6520 BLAKE2B d21e873fb57b7b311e7c06d680963794f1b7eb63c118a90aba8d4d036b0449c109e7c50c58a7616bf0b6545225f505fa5a6bcbcb3c0b095ba7c09dc3d296cc63 SHA512 e3c0b406a9c738d0474428c3007888d70832cd61c5a1d1bfad9ff9842f54c67f9494ca81e9647621b68a7e8ccb40af2ecc7fec4118538e569aeb58fe797c54e5
 EBUILD mysql-5.6.40.ebuild 6526 BLAKE2B 08c92c74325dfab7d6106c3397129a5da95f52598185cf379985097f99e373cd9c0fbc0afa5a12643eb7212a10b63f1263eecb92556315943b59139d938cb7cb SHA512 2298baeeda2edf1d75e9a697e86428b81ded08fb58513942698e24ec4c8d16a295ed5abbc899faeb30bd5f3359f85bcde218c01020802727cf4816b7b447cd42
-EBUILD mysql-5.7.22.ebuild 26914 BLAKE2B 47d6b01bc57e585b60c3a808c6fc5766f94d8aa3962cc22860eebfc19779e5a1cff7820e428d0d0c4468e218afcda6b16403e792e96cdaeed3af8714ffc0f95f SHA512 8e5542bd793df5786a7b31addcb0d68c7435a4aab8ecf3e4fc6623ce883f9e7c0f3335e5ba06bb36957598ebbf59fbc70b4d63c745dc02f03eb6b44118b6cb5e
+EBUILD mysql-5.7.22.ebuild 26980 BLAKE2B a2c3f202b3afdaa6567c149eebf53fec89199084734b79102374f160fcee19c053fe4e0879f222116eb74124e1324dafab7b3d9248dba1de487222b78863b9bf SHA512 44cfa62bdb399a0f9977a885f4401867c65a99f11fe9bfdf376088e43c3fd2df1abf44c1a618689a11705769290102d3b2de2aa38071c52910cebc9a2d7a6614
 MISC metadata.xml 1916 BLAKE2B da2c681ac07c234aa7ecc6f52a1ed63bf49241f7cb270733d0acf523ae5c420bb8f91628bf8510f9365b137ddd63224fd9da6a00df976832947ce043da49a602 SHA512 eac8cb1f76264b46137794c7c47907579af51ac9184aba324f3951135f60dc58c642efdd0a7a3e5c438322f8de4066425ec306d0924472853413be2fd19cbaf9
diff --git a/dev-db/mysql/mysql-5.7.22.ebuild b/dev-db/mysql/mysql-5.7.22.ebuild
index 5e447c166666..c833881e7bc3 100644
--- a/dev-db/mysql/mysql-5.7.22.ebuild
+++ b/dev-db/mysql/mysql-5.7.22.ebuild
@@ -207,6 +207,8 @@ src_prepare() {
 			"${S}/cmake/ssl.cmake" || die
 	fi
 
+	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
+
 	cmake-utils_src_prepare
 }
 
@@ -273,6 +275,7 @@ multilib_src_configure() {
 		-DWITH_RAPID=OFF
 		-DWITH_LIBEVENT=NO
 		-DWITH_CURL=system
+		-DWITH_BOOST="${S}/boost"
 	)
 	if use test ; then
 		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
@@ -307,7 +310,6 @@ multilib_src_configure() {
 	if multilib_is_native_abi && use server ; then
 
 		mycmakeargs+=(
-			-DWITH_BOOST="${S}/boost"
 			-DWITH_LZ4=system
 			-DWITH_NUMA=$(usex numa ON OFF)
 		)
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index ee65541078b8..e8e728e453ce 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -4,7 +4,9 @@ AUX pgpool_run_paths-3.6.5.patch 11626 BLAKE2B 5d0b7a49b3c8bf2f2d69d369894e99760
 AUX pgpool_run_paths-9999.patch 11759 BLAKE2B 35df553f704846cc4ff8d67e5e6b54ca8ed0a5817a148c359b47cae7ff388fe2bb57600113d7f8ac9afe760ea75e3ddd410d111c2ef87aea3c3fb38671d59260 SHA512 109be0f3bcda49db14ebb86d6e9347aa0a47d582ac1a1438b07719f9fa503045cc5b65a27964c3c0b1690ef489f752a497e3b050b816569d0ce01193dc007259
 DIST pgpool-II-3.7.0.tar.gz 3269076 BLAKE2B f7a396e82022a35e5f46fb644ca4a9007db3abaf97f8249d88bca00abf5d33abe7d47f705e959f7fb910885bf49f68bd5f965aae3085d12076d3100cca2f25f8 SHA512 cf8eef3a2ec761b51f9e6a72b5211810de57ad9b40b1738067616478b6486a813782588bfc92f6f351334d9514b1394551230c486fa0ac2f6c18a0490f22bbe2
 DIST pgpool-II-3.7.1.tar.gz 3237755 BLAKE2B ec196e384c9c4c03a28081fbb74b820c7480e2a98427441572142bd80bff6d2adbbda9bc19df1c70f4699af28fcac5f09161a5938df633bb9eba52c0d9dc24ac SHA512 2a83f573ca2a720ee7beb75d8d1380747e29b2bb3c809f51bd0f8e4423d67f882ce2acb7d9ea118c55313e969aba3bf94a0d5b190eb905123d43c09df25e00ef
+DIST pgpool-II-3.7.3.tar.gz 3259752 BLAKE2B 398257b2a647039a634d52b0e23ab1584aaa67f58d6f234f03bf2e99380b346b4ff51647f876d0789c484e88fc149a2af5a5b1b8fd3aa48323aada064ea3421d SHA512 c7fea570f11dfc348b0099fde074f61a15e6979b6f16526d24d73b26d723edfdbadbcf10e90c2111aeb72599970718d3cda4abed3e99e8a711cf03b715c29624
 EBUILD pgpool2-3.7.0.ebuild 2489 BLAKE2B 1b2fd9bcb5c00ae160e80220e22aded619d7e769de630372c13ec1d8a3bb073b76a7aaac66861af6ea41242a35ccd8ac2ed2048cdb0ab0df884063e2a574f1f1 SHA512 8733a16433afcd1684c0ac5e38a3623ff1cea9a1fe4925f80d36e9cc0a4d45ddfe8ddd9edfd0695661a2cb0ed56c7ac917fb09dc4983a4f82351626f611bb4fb
 EBUILD pgpool2-3.7.1.ebuild 2491 BLAKE2B 0b2d0df464b71f63a9ab7a794a37eb0fb5a9617748ef149225552bdee4af01ae586a4a42276d93b5667f794c5f4c595b75c2f2fd9b26ce1f6ded370b02295adc SHA512 4a15fbb5fb53908a5a61c0649b8838ccaa4ca4f1f78ff411b9e30d8b2109b2069c3a430e58c849bfe4496c4894011e53350a3d5f8095f0bb138b7453b3f8c441
+EBUILD pgpool2-3.7.3.ebuild 2491 BLAKE2B 0b2d0df464b71f63a9ab7a794a37eb0fb5a9617748ef149225552bdee4af01ae586a4a42276d93b5667f794c5f4c595b75c2f2fd9b26ce1f6ded370b02295adc SHA512 4a15fbb5fb53908a5a61c0649b8838ccaa4ca4f1f78ff411b9e30d8b2109b2069c3a430e58c849bfe4496c4894011e53350a3d5f8095f0bb138b7453b3f8c441
 EBUILD pgpool2-9999.ebuild 2440 BLAKE2B fcc37575bc095fe15b6176f351e86b97f5c5ea8385a3cd6100f3ebb4031e429b026b850c5c8b78770900e1d7fdee95e2e99190755c1b2a0204d2f37009d20bda SHA512 b2fd29cf9643d0cf093c64db9283dadcaa39fec6cca1ca8f1cb1cdd85265cbcca2fc30a52a041d2683328235c8717cead2083813f8b6365ad3465c620f0ec0a1
 MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/pgpool2-3.7.3.ebuild b/dev-db/pgpool2/pgpool2-3.7.3.ebuild
new file mode 100644
index 000000000000..4a6fed48f203
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-3.7.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{2..6} 10 )
+
+inherit postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="http://www.pgpool.net/"
+SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc memcached pam ssl static-libs"
+
+RDEPEND="
+	${POSTGRES_DEP}
+	net-libs/libnsl:0=
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? ( dev-libs/openssl:* )
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	!!dev-db/pgpool
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	postgres_new_user pgpool
+
+	postgres-multi_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	local myconf
+	use memcached && \
+		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
+	use pam && myconf+=' --with-pam'
+
+	postgres-multi_foreach econf \
+		--disable-rpath \
+		--sysconfdir="${EROOT%/}/etc/${PN}" \
+		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+		$(use_with ssl openssl) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	# Even though we're only going to do an install for the best slot
+	# available, the extension bits in src/sql need some things outside
+	# of that directory built, too.
+	postgres-multi_foreach emake
+	postgres-multi_foreach emake -C src/sql
+}
+
+src_install() {
+	# We only need the best stuff installed
+	postgres-multi_forbest emake DESTDIR="${D}" install
+
+	# Except for the extension and .so files that each PostgreSQL slot needs
+	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	# Documentation!
+	dodoc NEWS TODO
+	doman doc/src/sgml/man{1,8}/*
+	use doc && dodoc -r doc/src/sgml/html
+
+	# Examples and extras
+	# mv some files that get installed to /usr/share/pgpool-II so that
+	# they all wind up in the same place
+	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+	into "/usr/share/${PN}"
+	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
+	insinto "/usr/share/${PN}"
+	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index fc26f1bbeef7..5bfa69f6f90b 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -5,8 +5,8 @@ DIST phpMyAdmin-4.7.7-all-languages.tar.xz 6411768 BLAKE2B 59ea3c69ee6bd019d5ff6
 DIST phpMyAdmin-4.7.8-all-languages.tar.xz 6218056 BLAKE2B 879ef6703711725781fcf3b4c9ab607741c4df0d2f1955f632087e33b599e54128c0811dbd125d9015a0ec597dd6d9af54e7136e91f8637badf698ad7a30b8ba SHA512 ae6edcfba72413a6e0af0b120a99809320a840ab332ae77263f21e14f3b34a38cca70591628ba5818d6732ff6d23551ea51cbf6a75012d2326d0fab1c2a1b9ae
 DIST phpMyAdmin-4.7.9-all-languages.tar.xz 6370604 BLAKE2B 28ae240ffe092eac1d1226d37c520417c2949b548fa3b3f7ebe93f26d113b3518cad28f28feb8c47446ecc4573dfe32cec747dd1eedf5a9862a70bfcfaafbd4e SHA512 8788beb62e8a049197e52dc75a797705a7aec9fa748a00f858ecd6d912aa5907f5d9de042d50880c5ab55b7479f194d32dbb6c01706130e70fec5c95c51ca08d
 DIST phpMyAdmin-4.8.0.1-all-languages.tar.xz 5926908 BLAKE2B 4209d6d5e57c1757a232c8a765d45ef5e8384d99cd94a389593080d6f1bfb2a64295acaa092f9fc435a7d4853ae553762721ddd4e69cb67de651a42376657c3c SHA512 4849ee320caaaa9a6af4d1cfba3fba32089b3bd932c89dcef3823a441691c52c722818099b7f4f5e1713bb3a38f55a6c9b6706ab5a12f131dda97172513d8549
-EBUILD phpmyadmin-4.0.10.20.ebuild 1562 BLAKE2B 402c8f669c785bb084a8d7af247c62cd070eced8a613b43303bb2bb44781041f3e099fe5a4ff5817e63ff8260b898f4bed232ffa7e358075991bbe6f5a5656cd SHA512 e15e47f37a54090574b4c4554ff295fb9ad73543aebed5718e28575c238b3e59c393b091eb34ddccc04be8297b08deb442d27e12c595f846d8810aa50561af64
-EBUILD phpmyadmin-4.7.0.ebuild 1568 BLAKE2B bf1ade74bd74565b12e48237ed3acd11fbe066aeae08d8336cde2dcf104e6caeefa351aa8da751673cae6430e0b96bdf93ee382b3df22e22ead06d434c6b17a4 SHA512 9ba65eb7c35fe80be1f4bfe6a967e72e4e287f868f6126120f972ff12ade1def36a6bdfe02a8ed8b9cf9fc71f8c8561de4696567fe539b414e5ddae1932a0a0b
+EBUILD phpmyadmin-4.0.10.20.ebuild 1563 BLAKE2B 59ab26f810db9c5f0d702399b567d4f19a60be0cbfc19685aff37a4fcfd671103759c3b988dfe6b7d98417b960e4d436bd633fe4ba82d9f0abf8bcf874f3011d SHA512 03a5ea982d7f550524efb204330692e103dc8e2b36eb776e5f5937ccb5ecb5844368f923d11f4c767d7f5ac8d5c0b396ec4dfd823c32110247c11707e6cec740
+EBUILD phpmyadmin-4.7.0.ebuild 1569 BLAKE2B 8582b641380f4a9c47dc3ff62a32774b35f2c252774c91a8ddfa8e7470c8649a192984ccf4124d21af09a3843c1a8d0d520907eb51d50c368d166f1b570ffb1a SHA512 dbc88883d5605423c3ed17563736c1f7e862fcf60e9f162d057229dbd8e372b056072fca592063349361be2a2baeab0ca3ca3a36b4af7130758836a95f1988b7
 EBUILD phpmyadmin-4.7.7-r1.ebuild 1565 BLAKE2B 59d5b4629506f6a55ec18f88c425c11f5b78c58cbac7b8135407d5f7dde604b98de08e5721733ead514cd600d6f2f4b45a3958faaf99689c8b6de5db27691270 SHA512 448aabfb29e2f7f52e5763e4c1e9c6e4d5e5872454a4fc930d36c6df2dc490b1401662454a65df7dafdb68fcd414b9583430a1f699bfc1d2995e5d6c1c16d76f
 EBUILD phpmyadmin-4.7.8.ebuild 1565 BLAKE2B 59d5b4629506f6a55ec18f88c425c11f5b78c58cbac7b8135407d5f7dde604b98de08e5721733ead514cd600d6f2f4b45a3958faaf99689c8b6de5db27691270 SHA512 448aabfb29e2f7f52e5763e4c1e9c6e4d5e5872454a4fc930d36c6df2dc490b1401662454a65df7dafdb68fcd414b9583430a1f699bfc1d2995e5d6c1c16d76f
 EBUILD phpmyadmin-4.7.9.ebuild 1569 BLAKE2B 47a60e3d4c06cffc24717efcb8dd15040843407540afa833e3a1019c7bf45532e661a8ba770ec0e0dbdeb77b8274ec24eb44100a53920000805103ed6547259d SHA512 f55ba14d91a2b796e8a2e447458ae713242aede0c00b8a3863907d8a428e502abf5d3cd20cd05ca199185e51bd72b3ac303c1ce0db51e747ab9855d39f53607f
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild
index a9120f420d5b..7897b8451a16 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
index 5ef8db1963ed..4cfb0dc84d8f 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index c51fb3be8e7a..4e4a1ac8b3e8 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -1,7 +1,9 @@
 DIST pspg-0.8.0.tar.gz 850508 BLAKE2B 2f2fb7f094f72f0b5d1c959ab73a355ea2ced155fdb64adef21eb70c4991b057e31688128f50db2d6a84ab850b57ab59d50c0dd5ba06998af11ff3a5479cc9bd SHA512 758d47e041f4c7c91ad2033fb95e6d33a27b6f896077dbcb287331496e47740c31c6ba6bf7ea01ad6c1a3c3d4c5e525b268795a16f9c819f4d489d3e98fa3092
 DIST pspg-0.9.2.tar.gz 855891 BLAKE2B 0e0a992e5885ca4b2e058d19df2d9c7eac862e1a45e8d80f31df33ab2f3c02616c67cc528af6a52225db938a0c1f27352e13c7dfd01b15bda908bbf3ee9ef128 SHA512 8ad31a5e744db96bec7cfea7d128aa4ac3b44ab51c3dd1d0661178c1d139571a955143a3ccfe6556ce2a215ec193a45224720794da5d2af1e93beb2fa713aea4
 DIST pspg-0.9.3.tar.gz 856766 BLAKE2B 3e1b41f786abd8e964adb87411ba9dca7bdc0ed07a02e51a869dfaca491497478818d85de32846d675ee90f32f01f693ea33ce0166bb939457c55799aabf900a SHA512 79c019ef30a1a06c15793e7b51f7e1cabd79711d3a2a4360933c219b01e9c8d8390a82b87bb1be5316cabbcad3705adca8dd09714e6e994d7aca0b94ddcf06c0
+DIST pspg-1.1.0.tar.gz 861442 BLAKE2B b62fa7e92cf4baae31da08b8f14eb18a54dd0912c08c73764f4571b5bcc22ff21e0ceb3809c4f0fb33c490241b2135594b1d2fb9fcb9006287ced9a031b75ffe SHA512 84db26b5fce668938f76a6250caca8a394b439d6496de411305605da1ec35cfe79e444a56e73423e56bede21f5da3208b140be0d995e9cf575ba76a5bd0d49b1
 EBUILD pspg-0.8.0.ebuild 387 BLAKE2B b2f49b9e1bc7a032b064e2d65cb832c1177a51fabfaaf2b466d024346635bb9af319f0c656328d0084519ba12697f4a385627194f34330cdcc28b7644298acd2 SHA512 27636211a65612ed5424d4984e737e751677048f41c91cfab69f5de351f875622a8edc68c26e69ad9a2cf13b0e294dff07742c037f57262f1149966ca53717b8
 EBUILD pspg-0.9.2.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
 EBUILD pspg-0.9.3.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
+EBUILD pspg-1.1.0.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
 MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pspg/pspg-1.1.0.ebuild b/dev-db/pspg/pspg-1.1.0.ebuild
new file mode 100644
index 000000000000..9b1b64baa6d0
--- /dev/null
+++ b/dev-db/pspg/pspg-1.1.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A better pager for psql and mysql"
+HOMEPAGE="https://github.com/okbob/${PN}"
+SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:*"
+RDEPEND="${DEPEND}"
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index bc2711877e65..e6db698e3d34 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -31,10 +31,10 @@ EBUILD redis-3.0.7-r1.ebuild 3312 BLAKE2B f7eb238c4cfb353330436453849d12ef8c1e0d
 EBUILD redis-3.0.7.ebuild 3312 BLAKE2B f7eb238c4cfb353330436453849d12ef8c1e0d083f7af2a7a7813cf5db478281499dc36757a3f1bad06e65cfc7decd604edeb087b02485e6922ddf30bc13e88f SHA512 de42869cd28e6b9f7ce63ef0baaa64acc0b5465d2bb2a0c23013a42c0a00059a18620ab428eae88b33f4d6a3b37b2e6cc0dc71135af807dbd9d524908d1d80fb
 EBUILD redis-3.2.5.ebuild 3578 BLAKE2B 140d00e2acb3c78d6f089689b911e77df1a0b4cac32dfac312040639fc1935a8a08fdf97be95fbbe83862de22ef43d08d137e58716db1523b57ac5d90122a64e SHA512 72d8563a1eee0e62d34a3c04583c210a95c0fdd306512f63714324ac6e1302f5a06debb56bae083f9102eef9cade1674f6d5dd746ca7ab796e70592aef659021
 EBUILD redis-3.2.8-r2.ebuild 3579 BLAKE2B e6813a5e2b7b85c0c2b2628cae28ec894c05f89f82b59dbdd0916bd02d8c94aaf12b01a83374d6651112374144231862f49810ef6dc98eacf9a02b6cd02bca4d SHA512 3acf577e2509cf29ae5274117ec5c512fe390167d88c38b6fd375a5d145e4b94704990b23e3a18d6e8ab6c91e5d5bebb5d6c9330a9975b7ef9aa2d14c0914282
-EBUILD redis-3.2.8-r5.ebuild 3886 BLAKE2B ea98fec96f660ef6c663d3700d8b90ee6a98c904e6c798e81416d14609e238e395d6096cdea1dafd0d7591b401b68803c44dd4c9d7831c43168643cea458b05c SHA512 ff68d691ee3555a74e6e4305d54d9848137d0887b6c96a97b81f48adfd06129291a51eac1c87cf358b8670dad93dc372d8e70455efa348f5ec296ec0035af6be
+EBUILD redis-3.2.8-r5.ebuild 3885 BLAKE2B 9bd2e7d34f420c941ba417456062366f0104dab670b65788d29c01cfc9334d4f055807b2abbc2887f4c0950d13c712faeb28393cf0fd2b7069cf691861bd253b SHA512 0718b7fd24fc213c3684711bd348bb23e47d7ff0b3a4b0aea314c700e50505a0e8a9a18a606b56c61311b328c5200d2df44d8bf0360a964889b280905a7c1fbd
 EBUILD redis-4.0.1-r1.ebuild 3722 BLAKE2B 9f99ed17dbac2e4249e425293b769b87bbce62865e6cbfed53eba91578c14c1e97c636f460b3c2738162f89a771fb833bc3158db1f4ac41440b244ffd855b49c SHA512 d928b9714a9c028fbe14286c975a5ba385384c4ff32311e060252ccf9802e2f58d945d261a9fd5cd512d7142cb82fdb41a44955c046c253ee399e09578b42a0d
 EBUILD redis-4.0.1.ebuild 3507 BLAKE2B 4418b445f34274ae86edd3033552935fd8e740ab0c1029cdf9f43f2fcc7bf0e1fdaf0fa07d6504af4c4975af09fe2ea808ce0e515d8f5a4809cb84b664f6672c SHA512 e0a258e5e2333d9c88d5ebba37f52cb772bb17d77b719edc0ce443a3a2ac09cd064766fcf7541503fe656ca2f77d890ae911f518b2552e2673f650cc8bd4d13d
-EBUILD redis-4.0.2-r1.ebuild 3809 BLAKE2B 3a44f14b32a02ccc6ff1f31136d17d30a8847cc561d1d44d434b4191bab567d65155993b8ed490288321053dda02e1cd141c06820b03df7aa9f59c9681cd8778 SHA512 8a1c7015ec5538be3349487a23426cd448fe405a6e44197ccef1ea1f4b808af327c69003ccc5d8ee5c988c90907bce58c813eaaa4a68e5829e7458d3fba5fd11
+EBUILD redis-4.0.2-r1.ebuild 3808 BLAKE2B d851e6517e2fb20497bf65483f75a073ff7e15846ddc8cf8784b0df5b9a60c76be2d5e7d2afbe53370a88b657276e79f4d4f60e9d2af8c591f805a6f7fab10ab SHA512 ecdce5d8d049bc3e5596abc464b3fdd6871b94975453df1441bf8651a56e0410728b63f210889e058d04ced2a309084ff3194e46525fffbbed1b8feed488be0e
 EBUILD redis-4.0.6.ebuild 4074 BLAKE2B 8c650824c8216e360014750cfe64d205dc02d33b6997b31f4e1a282836c670e97c2c4158818b226a98a3b0cb1954def0ac356c5f154e93e6d41356fb68ec6550 SHA512 f864f88c8ce91cfb73448e4427b82d7a76276dfad851004e9b13f96c395e369a101d878cfba65f277aae878885b58202d0b52c0d37a160419aa55904ad8cb7f7
 EBUILD redis-4.0.7.ebuild 4074 BLAKE2B a6190e8b3223f516c48889f5bd455e7c94c1c68e0f142f8370fc74931d7b9fb79621bae4a080956eb8cc9cf00ece885535c2e3a17e717d1c2c069e61bed479ee SHA512 aafbb4f1a85133e3baf0b73f026281c6dba2cd2146c9d3a9e5fa610e5e1ca5a9ea8458b9b031345f7346b74e42fc2a238f3824ddf12ec7d83ba571ebe7d18e3d
 EBUILD redis-4.0.8.ebuild 4074 BLAKE2B a6190e8b3223f516c48889f5bd455e7c94c1c68e0f142f8370fc74931d7b9fb79621bae4a080956eb8cc9cf00ece885535c2e3a17e717d1c2c069e61bed479ee SHA512 aafbb4f1a85133e3baf0b73f026281c6dba2cd2146c9d3a9e5fa610e5e1ca5a9ea8458b9b031345f7346b74e42fc2a238f3824ddf12ec7d83ba571ebe7d18e3d
diff --git a/dev-db/redis/redis-3.2.8-r5.ebuild b/dev-db/redis/redis-3.2.8-r5.ebuild
index eea23ad53470..b59739ff808c 100644
--- a/dev-db/redis/redis-3.2.8-r5.ebuild
+++ b/dev-db/redis/redis-3.2.8-r5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://redis.io/"
 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"
+KEYWORDS="amd64 arm arm64 hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 SLOT="0"
 
diff --git a/dev-db/redis/redis-4.0.2-r1.ebuild b/dev-db/redis/redis-4.0.2-r1.ebuild
index 73d2acfb02ca..133718b4c145 100644
--- a/dev-db/redis/redis-4.0.2-r1.ebuild
+++ b/dev-db/redis/redis-4.0.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://redis.io/"
 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"
+KEYWORDS="amd64 arm arm64 hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 SLOT="0"
 
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index b61f4b696c34..caf1ebed7a91 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -9,6 +9,7 @@ AUX sqlite-3.22.0-full_archive-headers.patch 693 BLAKE2B c94193298bf3d3ba22c78ed
 AUX sqlite-3.22.0-full_archive-tests.patch 7566 BLAKE2B c59f71e46eaa7af45cc2046db2eaa73d8da3e7fc14341fca8418cf77eecb14b6278f54fd9932ff5f5a6f2d53e4dd9f07b88ac7e343533020e4650f1b2a4642f8 SHA512 a9dcd1e3caba1454c22b051c31237ce82b4e5e79783581111e3ef3cbf937b7bb139a569db5df7eeccc221113421cf4765af45a499bc5dc335f8ff5c5b2cf9d43
 AUX sqlite-3.23.0-full_archive-build.patch 13851 BLAKE2B 2de321270247cc436ba5261b75c03534ce43ee415566c896d59ea5e96633887a738e32e15ddaf5fe33c1d594bb60669df8480f210c4bd8c1c4bd0f22e086a18a SHA512 20a1ef769fa9420ebc66941ba6889cdb8e6eca6567662af7462fb5f8618b656e0e57ba86be3abc34e4437fcc979c9b811a117a841ea60a89abf2f2629f7c83b0
 AUX sqlite-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch 796 BLAKE2B ef4f5a9824f2a5492912f9076b9b9db96552e675264e04b093ed907f8b47175b680cab4a4934763910b5320b3f7c5fc2f230b026ad76af6172325abae7cce2c7 SHA512 81ea6bba9f1b06e77f7a5019eeb3e4abfb542c929b00f8d327f8b47101ad046bee40e49c12df00ce50c35ca2ec1906fd82b3fd75d4e5c97db61fa1cc9997d31c
+AUX sqlite-3.23.1-full_archive-tests.patch 621 BLAKE2B e1a479521fa032f7d622cffeb9e1b549b6e8471855695f583cdef1bf5f41d5e2cdef62f3f5c8c22cc2c8d6d0eae50f2c5396a2b141390295b3373313c19070bd SHA512 ddcccbc208068b7b58d3510d621c4a2cc76b8f00066f9e85b22fa26d0a9a73cba64b955bb2dd7795ceb0af8cdf7525332f773ebe3c9d566f6af222bcebf439e2
 AUX sqlite-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch 349 BLAKE2B 89bafb8ecc94927eaecd5619a159519a885fad36989ea53ca0a28857182c954d6763088cb1a5b9d0bba026c1fb90f39f7fc64125fd7f71a5c29e897c7ad6e3ce SHA512 d8e6bdea949e0940ad47fbb59c15d90b15125ff456da640b02d5f8ec26432595aacdb0f4b6aca3e427fa407c4c0297bdf27fecf70d8a8883d15e72fa4b71dc92
 DIST sqlite-autoconf-3200100.tar.gz 2565638 BLAKE2B bd1d32c211ea906cb2dbf78ea54d364db1a642d8a3b2751a427521a9da3391a2cd23c1ecdc5ff70b68f4166c583e69373f566cb04847295542185ab598e79c1b SHA512 56e3d326ea2225cadc628c3518d46d9f7c4bafa0e3612f2b7ab0dc0d79fcbb7e095f6d84a9a48e1c6d83adcdc8706ad5ac4404f0f622c7fe38cfde3a7e7e69f0
 DIST sqlite-autoconf-3210000.tar.gz 2568942 BLAKE2B 83a7095fd5fd5447a3c16816ceb9f51f393de9689942bd4eb4c6eafe357a1dd1783500f8faf2765fa6628da6a39f550237b661af1337ac063ca285f5f0a5218e SHA512 8f00708965eacef171620c49538f75768d350ec3f2bfef412a5c70af865ab03b6a64ce1e65d9fdb3d66f4d00262a30fc162b01fd69f63c05c14d5243374b6298
@@ -25,5 +26,5 @@ DIST sqlite-src-3230100.zip 10849436 BLAKE2B 6bed0a45c83ddb51d665835d174f623b30b
 EBUILD sqlite-3.20.1-r1.ebuild 8072 BLAKE2B 0b1c72b1efd206d11ddddea689032b7680b1909ffc1f0b46a1819dba8d62a7ee44674a124c4c529d47cc11cd378510436b1333a4d0ecb88a718a896cc047a1e8 SHA512 e819cbf0aff755be74c04b096495b909cd43d50162e7c243a67936169e42db5113880fc47e5d2da26aa0ff84a87d71bb9007eb87a026dd302d58deb5db0409ac
 EBUILD sqlite-3.21.0.ebuild 8454 BLAKE2B 87a6fcf651090d1440710bf253252ecd81164f91da4a6c2dd2a5dbc9b8e8db22f4569ddb48c7ad10efb1f930f91b37f1ac8b49621ec671c4ba64f394a3e53326 SHA512 a9d711fd29747bfa9829d6ad0c78d50fc08044e31011b2be746e2857bf8dc2969ba64c4fe80de8c9f928ca677ae105eda46b48d89ee2e9e13622fc26dabfa72f
 EBUILD sqlite-3.22.0.ebuild 9312 BLAKE2B cdeedf176f05d9e42f4b608f090a5c6c2d4f8dc6e5b36fb67114ee3a0d3f795e1303ffa4968622a5313d126911fc92daaed43084587078534afe0f51c96e734c SHA512 74115a4e493e8ba91b59ba8b866412a23779bc9246c9394e1ce3971304ae51583161211efdeb92a05787bd4985f8f6e1fd6b3d4e0a1d60194b06e7ac45348a00
-EBUILD sqlite-3.23.1.ebuild 9656 BLAKE2B 9c9cb9eede7c81e5b197eef73b02325ef88e5c30f7fd8e385a2b9881b07059b5c823559a95e00c4b0a7e05daf057920e6b85b3e43c005ef1fd4e1bb03cc15971 SHA512 593e72aea4692cdf6bcc6f323e9ee7b6d0476575098700c06d90e53bd859389679c7ec6f85541f5ad31d34eb53d0a0c4db9ab1eadc1d8ae9e9e33eb6f25851af
+EBUILD sqlite-3.23.1.ebuild 9715 BLAKE2B f710775e72e39796964180aa8d14603cdaee69e7264ca908627f8145c821a6b3de465368c308e3242453ed0e2e9f766cc99bda1abca2c2aafc9c032f9c00ad4a SHA512 0f0778e3391e13e1dde292d8f78ebad1ff6ef6dd299a90016ca4070a4b096db6c733829a63b9624b88b8ea0918f881e1a9468cd2d1f21325c323b9a189b80def
 MISC metadata.xml 723 BLAKE2B 8866fbde770e7b8582de27303c72df047db80e0d70b1a1ceca0951a05b51bb704452071ceb6c29ecf3704d523888351615d1798aaab092e6b7505d4c6e3698ad SHA512 40616710b1d4edd3e24b5ac0797c1c9b606aeacac9f9543722bc9529e7c2c704a0c10b0ca68a5ba6e0a0ee8bc605212e8a49a050c8687afbdd7dbf28d6d4506a
diff --git a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch
new file mode 100644
index 000000000000..7237fbfc0f30
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch
@@ -0,0 +1,27 @@
+https://sqlite.org/src/info/893e6089c875e947
+
+--- /test/zipfile2.test
++++ /test/zipfile2.test
+@@ -52,17 +52,15 @@
+   CREATE VIRTUAL TABLE fff USING zipfile('test''zip');
+ }
+ 
+-if {$::tcl_platform(platform)=="windows"} {
+-  set res {1 {cannot open file: testdir}}
+-} else {
+-  set res {1 {error in fread()}}
+-}
+ do_test 2.0 {
+   forcedelete testdir
+   file mkdir testdir
+   execsql { CREATE VIRTUAL TABLE hhh USING zipfile('testdir') }
+-  catchsql { SELECT * FROM hhh } 
+-} $res
++  lindex [catchsql { 
++    SELECT * FROM hhh;
++    INSERT INTO hhh(name, data) VALUES('1.txt', 'file data');
++  }] 0 
++} 1
+ 
+ 
+ set archive {
diff --git a/dev-db/sqlite/sqlite-3.23.1.ebuild b/dev-db/sqlite/sqlite-3.23.1.ebuild
index 863c3cd57b6c..48ce15aead88 100644
--- a/dev-db/sqlite/sqlite-3.23.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.23.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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"
 
 RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
@@ -52,6 +52,7 @@ src_prepare() {
 	if full_archive; then
 		eapply "${FILESDIR}/${PN}-3.23.0-full_archive-build.patch"
 		eapply "${FILESDIR}/${PN}-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch"
+		eapply "${FILESDIR}/${PN}-3.23.1-full_archive-tests.patch"
 
 		eapply_user
 
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 76e50148d678..4ffbb7831557 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,7 +1,6 @@
 AUX unixODBC-2.3.5-CVE-2018-7485.patch 5224 BLAKE2B a21d659f75f9ae11a6d78a4a74b0591786800e14f22d7fb4c7ef5005e0630b95453a319d9254bf3f5e423e74ae36c6a7bd097f3193869757b2bea34f8974e358 SHA512 a4d5dfafe75ea0e85feed76cf18474a89fcf6719ee58d0b56d57959526db2511df2df691bf9af2e1a34c716d2d90f6d274b48a11cfb7add74df799d1f1f67387
 DIST unixODBC-2.3.5.tar.gz 1633390 BLAKE2B f7c70740471b0c6ff298f2377a3895efbf160764adc4f607dfb65de2873ea3a39a2852399feaca50fc389875e20a10b3cd0389ba9e9f02d0548312d8063f5af5 SHA512 94b5ebb887571f4fa801ae4305cd6cb4eb0d03682fac1eb0422cdd13b046b077e60bff8286c578b0b5e291cfbc0bc8695495e39c3713858d2eeb7b38459397d5
 DIST unixODBC-2.3.6.tar.gz 1661914 BLAKE2B 75162344e2b2713ae056dae0a2c1be31994ef350b4aa3ee7ae924b17527f35e0b7c9bb5a23763ab71553ef67a025d2a6549e564507b95991d6a193e165f1e774 SHA512 6518a4169946e847dd710d54724a44d268b98954d30064eadadb703edbbeafac05bd1f42a6845c2fdcdab7ae8987800acd1a5f6b4b96de5f3c8c3e4bc370fe30
-EBUILD unixODBC-2.3.5-r1.ebuild 1824 BLAKE2B fce97f3b8cd5c67369cdc7b0fd187a5fcd5eca5509390238be2363c9f59829942a15a9a4f97ea96b0243697453bb6f721f01a18aa38d3da031556a9d3214ef18 SHA512 24e10717cb139308d40fb9b4407769e9cd9c7adcdc8751681144c27f83ddb53708b4ec3be3969a09e02574d95a3d361605a9426fb10b7f533930352c41096404
-EBUILD unixODBC-2.3.5.ebuild 1769 BLAKE2B 6354f532b5ea6900e6a7ce27b1d87517e4a2fbd8f193f93e9e18202b7fa7e5cb6717067999ec46f3e3413d23b36e137120c1f004055e94bb921f82591cc06270 SHA512 6e90ba612c0f6e103bd7c1e956147ac4dc95602fd68647102f01f4cd2eaa4481536254c59eaffe646f885c8ac47b0876f4939052ee29551ab003daface362414
+EBUILD unixODBC-2.3.5-r1.ebuild 1823 BLAKE2B 0f4b7d0a35578c1c9186c22fd32d9106fafda288547f7ccc61e5ec8193a5ae4516f5df556d60f802eefa254e04bb7bfe3945a429a90b6e9bf2b4ed4acfd9363a SHA512 e6131b1f334ef2274fbd0bbe6b90dd8fdcb09804d940e76e7745aaf039e40999a8bba616f4b471d4add98624047c60aec372e381317a7244902898718043a690
 EBUILD unixODBC-2.3.6.ebuild 1785 BLAKE2B aa3ba92f38344e7a48517ecc302ea184dd9eb67831c19c34825266f7f75c71eec9c49b681d5278d72807a210d748764d260044f54f5e2ecea965729dfd387be2 SHA512 e4fd0ecdd6c81b331e4ff4f6a8e9aafb483712c8dab16c2334a04b29764eb500764c258969636696594db40af820b0421f91388c3627c7d7108e8a15169b6a3f
 MISC metadata.xml 366 BLAKE2B 9832224237ae18987939d9c0f657c6666114a5ce41af09a3a5a423d666ec70d9c5cd4fec1d82134b68e2e96b1a3e390977a0cd95001d325465d75b2b9b311d64 SHA512 e47157f178b585272b5c11682cef0c7b7dec227ded178d3427e91632f754db869deb72a6c1b258dfc90f6760028d3045d1e703874ae24111f8deb9db629b8c29
diff --git a/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild b/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
index a4ba391c6e1f..cd3b800e0238 100644
--- a/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"
 
 RDEPEND="
diff --git a/dev-db/unixODBC/unixODBC-2.3.5.ebuild b/dev-db/unixODBC/unixODBC-2.3.5.ebuild
deleted file mode 100644
index ecd0f80dce25..000000000000
--- a/dev-db/unixODBC/unixODBC-2.3.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit libtool ltprune multilib-minimal
-
-DESCRIPTION="A complete ODBC driver manager"
-HOMEPAGE="http://www.unixodbc.org/"
-SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+minimal odbcmanual static-libs unicode"
-
-RDEPEND="
-	|| (
-		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-		>=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
-	)
-	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
-
-multilib_src_configure() {
-	# --enable-driver-conf is --enable-driverc as per configure.in
-	myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/${PN}
-		--disable-static
-		--enable-iconv
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable !minimal drivers)
-		$(use_enable !minimal driverc)
-		$(use_with unicode iconv-char-enc UTF8)
-		$(use_with unicode iconv-ucode-enc UTF16LE)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use odbcmanual ; then
-		# We could simply run "make install-html" if we'd not had
-		# out-of-source builds here.
-		docinto html
-		dodoc -r doc/.
-		find "${ED%/}/usr/share/doc/${PF}/html" -name "Makefile*" -delete || die
-	fi
-
-	use prefix && dodoc README*
-	prune_libtool_files
-}