gentoo resync : 19.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
commit: b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree: 9fd110f9fc996e8a4213eeda994a8c112491b86d /dev-db
parent: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)
81 files changed, 1760 insertions, 1143 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index cc16c48ec2bb..e7b55f81f932 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index bf4c0cc4bb6d..4136d5c87ee5 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -4,10 +4,6 @@ AUX etcd.initd 821 BLAKE2B 5eba7f0e8d134ff45caba8c1eb3aaf6afb412082b9a5df95925f3
 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-3.3.10.tar.gz 3526904 BLAKE2B 8266212707f8fb280d55deba8dffb44e4d48b906c56034b174848fe6f237d5efba8c15ebea076d799db7f3ec560e2d188fdcc8fe26334ae1cbef0384fe8cf847 SHA512 848e241e816312307f74520b99aeabf7def6862093897035ace16cb230817d8e2681d7d2f1c1ac220d7c2b4c7c0a1262bbe3e4db927524f785de888566d2097c
-DIST etcd-3.3.11.tar.gz 3526863 BLAKE2B 5daf511e0d1d064a141a29de456aca0a837567052e3c742afc535405e04c90c70dd347b90960df2decadc53a38ceaf7acfad9346677cb17f892ece437cdf10e8 SHA512 4274c4988b6e7fe61dbcc88c88ed6647debd7a67c448b9101c77bebeef6400e65b9e2cc930f635c3f59105554411e1ac606c6a146ad6927a01d2e921b1a92949
 DIST etcd-3.3.12.tar.gz 3527586 BLAKE2B fdc4e3e9522c032d951045d4eda7f36743d4fbbb4ea8673bbe00bb38931cd7442910b0b54eeb6df0957439332df498389f3568ba7e8bdecfbd873fecfb3df86f SHA512 63ba6130bd93471260b8d90760455bccef2755e672a9df39224491188c69e4e3e8c1157cfb639c4002fb8a6d16950f7ff448a83e0acbc389162b742f3df6234f
-EBUILD etcd-3.3.10.ebuild 1945 BLAKE2B 784b63fd47b27837f2d8c344ca6318c8f54e47e24a034c068d24935c96f9867df36be67fbe406259524e989a8d17a0c1aa5210938e16363e34300afaed5e70b1 SHA512 a0f1d2555d205e46b82e8db5ebcaae808bf788c0c256f4355bd3792f8666f06bae7a6a9d6f3b24bfc6c88145a097ac1de2759a63f9e6a52c330aa4ebceb5269d
-EBUILD etcd-3.3.11.ebuild 1949 BLAKE2B 57a02f2ded70079e6da6520853058dfc5b069b3a6f965e6768bca48414cff077694b92ac2725f4fa0c6cde9bfe9938a16056a3cf73c7ae366863943a27a5115c SHA512 4370e03e5831a23aaa7826e8bd4ef73b384784ba79d4f904a73f4002e6bfcfa9d3164b20e451a59d6db49928e8fd1f59d1d501f1aa3b7110261def861e317aa3
-EBUILD etcd-3.3.12.ebuild 1949 BLAKE2B 6f0ad2fcb58afba2af80f01dc23c13af419d190e614d3027450195fbeb3e5c17d452c14c0e714c9774b0f4b0140d0f1992a554484a76be3e69fa3063147ba7ff SHA512 2861f5dcb65b7d13c4858751efbc8e9b51804fea1d87b8eea1170f90da58ebdde7839fe4d14c0e4aa5fc4824b0a5d584cbf773910ecbc9901a57fcc588988086
+EBUILD etcd-3.3.12.ebuild 1991 BLAKE2B 856a1e4bde495fcb961a7acb5a985a12b5bfeda9c962d88a42c538d1465368c697348588a641cb673a527f26dde96965ba614209e196d4596fc58041619bbb34 SHA512 17ed0233df8464b24f304dbe1727300c1eaf9ad79382a3aebb7a1dad8e281c6965a67406e064181f8f0beb90c502d05e126962563e83b620abe6675f93513ca2
 MISC metadata.xml 679 BLAKE2B 7374379a18107011df792be631428834334ad8e6da5cfe404f18555e8c168d3fc716a1c8d6cb5cf1d9ccd173737aecf93a165f846865dbb6ba4a76bd4669b446 SHA512 8070d8b51dd3319e8b159072db237dcc5299361c2f74fa086fc4cbc174cc6a5c8f7659310332b54b2275e2bc3d028323c4dfa5775e21693a339f54312582d2f0
diff --git a/dev-db/etcd/etcd-3.3.10.ebuild b/dev-db/etcd/etcd-3.3.10.ebuild
deleted file mode 100644
index b1e380183334..000000000000
--- a/dev-db/etcd/etcd-3.3.10.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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="27fc7e2"
-MY_PV="${PV/_rc/-rc.}"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/coreos/etcd"
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc +server"
-DEPEND=">=dev-lang/go-1.9:="
-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 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/etcd/etcd-3.3.11.ebuild b/dev-db/etcd/etcd-3.3.11.ebuild
deleted file mode 100644
index 40c9067fb1d4..000000000000
--- a/dev-db/etcd/etcd-3.3.11.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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/etcd-io/etcd"
-GIT_COMMIT="2cf9e51"
-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"
-SLOT="0"
-IUSE="doc +server"
-DEPEND=">=dev-lang/go-1.10:="
-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 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/etcd/etcd-3.3.12.ebuild b/dev-db/etcd/etcd-3.3.12.ebuild
index 00de853590ff..de901b0d963b 100644
--- a/dev-db/etcd/etcd-3.3.12.ebuild
+++ b/dev-db/etcd/etcd-3.3.12.ebuild
@@ -39,6 +39,7 @@ pkg_setup() {
 }
 
 src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #651934
 	export GOPATH=${S}
 	pushd src/${EGO_PN} || die
 	GO_BUILD_FLAGS=-v ./build || die
diff --git a/dev-db/lib_mysqludf_log/Manifest b/dev-db/lib_mysqludf_log/Manifest
deleted file mode 100644
index fdd3e65ea338..000000000000
--- a/dev-db/lib_mysqludf_log/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lib_mysqludf_log-warnings.patch 479 BLAKE2B ffaec94795811f77b6b8a0fe1c56547933add3583fcc45696bf5a8993926484088dda62f214faf85e7278340f2074e7c4356a19f70b48cdb0067487b19f03a61 SHA512 b3de4eebb97ba168574a0c06096484f62e4cf50c794d0755ea9b0872d2731f308763733ea3ec567e76f0801fc3159130da47bdf8c0d6ce06f0812a12345e959a
-DIST lib_mysqludf_log_0.0.2.tar.gz 1892 BLAKE2B 24f4197c2781e0bfd156b73adbea76f7a7580fcc85b55b566357d24896e5485ea7e93523286234ec3f1e39b386f54a63fe6f259053d7589622403655479d47d7 SHA512 674395c145260122bd14055a838b82d69217841364a496a518eb08860ba0beabe35627fe42108663caaf4a8c461d27551de43942ffd4c724d5ab912a2e74474d
-EBUILD lib_mysqludf_log-0.0.2.ebuild 1105 BLAKE2B 7d3313e6fb72ec9f6eba93c54947c917696065a30fda789f5cd1ae9f76fa3f649bba17064d022f51f771fe4e01cf65ebf14240361120092e24958fc42e186e8f SHA512 33b332b75c79b4120c9a48a94d1e6fc2f21a4a10201a866cd90d6134f2b5531654577b4d3ae0f62574a63bffde84d815980ed7535f5735ca7a5a66cb984e7a94
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-db/lib_mysqludf_log/files/lib_mysqludf_log-warnings.patch b/dev-db/lib_mysqludf_log/files/lib_mysqludf_log-warnings.patch
deleted file mode 100644
index 64b59639a328..000000000000
--- a/dev-db/lib_mysqludf_log/files/lib_mysqludf_log-warnings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib_mysqludf_log.c.orig	2008-07-07 01:17:06.000000000 +0200
-+++ lib_mysqludf_log.c	2011-10-18 12:50:52.000000000 +0200
-@@ -159,7 +159,7 @@
- 	} else {
- 		fmt = (char *)initid->ptr;
- 		memcpy(fmt, "%0.", 3);
--		sprintf(fmt+3, "%d", args->lengths[0]<=9999? args->lengths[0]: 9999);
-+		sprintf(fmt+3, "%d", (int)(args->lengths[0]<=9999? args->lengths[0]: 9999));
- 		numDigits = strlen(fmt + 4);
- 		memcpy(fmt + 4 + numDigits, "s\n\0", 3);
- 		fprintf(stderr, fmt, args->args[0]);
diff --git a/dev-db/lib_mysqludf_log/lib_mysqludf_log-0.0.2.ebuild b/dev-db/lib_mysqludf_log/lib_mysqludf_log-0.0.2.ebuild
deleted file mode 100644
index 639f48e5e596..000000000000
--- a/dev-db/lib_mysqludf_log/lib_mysqludf_log-0.0.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MySQL UDF to write to log files"
-HOMEPAGE="http://www.mysqludf.org/lib_mysqludf_log/"
-SRC_URI="http://www.mysqludf.org/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/mysql-5.1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-# compile helper
-_compile() {
-	local CC="$(tc-getCC)"
-	echo "${CC} ${@}" && "${CC}" "${@}"
-}
-
-pkg_setup() {
-	MYSQL_PLUGINDIR="$(mysql_config --plugindir)"
-	MYSQL_INCLUDE="$(mysql_config --include)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-warnings.patch"
-}
-
-src_compile() {
-	_compile ${CFLAGS} -Wall -fPIC ${MYSQL_INCLUDE} \
-		-shared ${LDFLAGS} -o ${PN}.so ${PN}.c
-}
-
-src_install() {
-	exeinto "${MYSQL_PLUGINDIR}"
-	doexe ${PN}.so
-	dodoc ${PN}.sql
-}
-
-pkg_postinst() {
-	elog
-	elog "Please have a look at the documentation, how to"
-	elog "enable/disable the UDF functions of ${PN}."
-	elog
-	elog "The documentation is located here:"
-	elog "/usr/share/doc/${PF}"
-	elog
-}
diff --git a/dev-db/lib_mysqludf_log/metadata.xml b/dev-db/lib_mysqludf_log/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-db/lib_mysqludf_log/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-db/lib_mysqludf_stem/Manifest b/dev-db/lib_mysqludf_stem/Manifest
deleted file mode 100644
index aa8baa543c73..000000000000
--- a/dev-db/lib_mysqludf_stem/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lib_mysqludf_stem-mysql_m4.patch 2494 BLAKE2B ffa4e2b6b46e402b968c357a14cee41890c87d444238d6aca1a1268a37eb4515c248e93a4957d0dc3fa3aedbef5c79c114675b62311280415053f1646c875ba1 SHA512 11c057d563f430fa3fedfb8e1b9d830f2b593004dfca98d4ddf61b8ad4a6f77e67725862469dfc01c2dcabce2e65e64ca735e506344e044feeb51ff82e265c4e
-DIST lib_mysqludf_stem-0.9.1.tar.gz 953171 BLAKE2B 6cd6aeb2a5e856acffafa883f203bc74e11b2929bf760c9de2d7956816372afd961307642369c9653ce75c71044455b88972442318ea22b85dcde7b7bdc705d0 SHA512 d15736da91dc5a6f2b0289694efeb531337ff6a001d39aafca02c9f165ba5901163855b8f03d13a50c2ab9bee58e7fc03d19e893d086ec0022de9dd6921f93b7
-EBUILD lib_mysqludf_stem-0.9.1.ebuild 1641 BLAKE2B 219827447413f02bed15c83243e851860e5843e486752d47d3b61e0651761518a0b0b9224c4fd6e15864e536ee1b6ddc32c743985f0b30dfc7d4eecc67a25a56 SHA512 d2b001d5d05e1ed34ce1453b4519c07478312d41924afdc9f427c43135a49e9ef3d5bbe546c8f8206040f496c205cd6e749b5939ee4b7ca77ac9118e4f633483
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-db/lib_mysqludf_stem/files/lib_mysqludf_stem-mysql_m4.patch b/dev-db/lib_mysqludf_stem/files/lib_mysqludf_stem-mysql_m4.patch
deleted file mode 100644
index c12d1f7d39a9..000000000000
--- a/dev-db/lib_mysqludf_stem/files/lib_mysqludf_stem-mysql_m4.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- config/ax_lib_mysql.m4.orig	2008-05-28 17:31:47.000000000 +0200
-+++ config/ax_lib_mysql.m4	2008-11-26 22:43:48.000000000 +0100
-@@ -87,10 +87,9 @@
-             MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`"
-             
-             MYSQL_VERSION=`$MYSQL_CONFIG --version`
--
--            if test `$MYSQL_CONFIG | /usr/bin/awk '{if ($1 == "--plugindir") print 1}'` == "1"; then
--	      MYSQL_PLUGINDIR=`$MYSQL_CONFIG --plugindir`
--	    fi
-+            if $MYSQL_CONFIG --plugindir > /dev/null; then
-+              MYSQL_PLUGINDIR=`$MYSQL_CONFIG --plugindir`
-+            fi
- 	    
-             AC_DEFINE([HAVE_MYSQL], [1],
-                 [Define to 1 if MySQL libraries are available])
---- config/ax_mysql_bin.m4.orig	2007-08-15 02:22:37.000000000 +0200
-+++ config/ax_mysql_bin.m4	2008-11-26 22:55:40.000000000 +0100
-@@ -43,35 +43,36 @@
-   fi
- 
-   if test -z "$withmysqlbin" -o "$withmysqlbin" = "yes"; then
--    for i in /usr/bin /usr/local/bin ; do
--      if test -f "$i/mysql" ; then
--        MYSQL="$i/mysql $MYSQL_ARGS"
--      fi
--    done
-+    MYSQL=`which mysql`;
-+    if test -n "$MYSQL"; then MYSQL="$MYSQL $MYSQL_ARGS"; fi
-   elif test "$withmysqlbin" != "no"; then
-     MYSQL="$withmysqlbin"
-   fi
- 
-   if test -n "$MYSQL" ; then
--    MYSQLBIN_PATH = `dirname "$MYSQL"`
-+    MYSQLBIN_PATH=`dirname "$MYSQL"`
-   fi
-   
-   if test -z "$withmysqladmin" -o "$withmysqladmin" = "yes"; then
--    for i in "$MYSQLBIN_PATH" /usr/bin /usr/local/bin ; do
--      if test -n "$i" -a -f "$i/mysqladmin" ; then
--        MYSQLADMIN="$i/mysqladmin $MYSQL_ARGS"
--      fi
--    done
-+    if test -n "$MYSQLBIN_PATH" -a -f "$MYSQLBIN_PATH/mysqladmin"; then
-+      MYSQLADMIN="$MYSQLBIN_PATH/mysqladmin";
-+    else
-+      MYSQLADMIN=`which mysqladmin`;
-+    fi
-+    
-+    if test -n "$MYSQLADMIN"; then MYSQLADMIN="$MYSQLADMIN $MYSQL_ARGS"; fi
-   elif test "$withmysqladmin" != "no"; then
-     MYSQLADMIN="$withmysqladmin"
-   fi
- 
-   if test -z "$withmysqltest" -o "$withmysqltest" = "yes"; then
--    for i in "$MYSQLBIN_PATH" /usr/bin /usr/local/bin ; do
--      if test -n "$i" -a -f "$i/mysqltest" ; then
--        MYSQLTEST="$i/mysqltest $MYSQL_ARGS"
--      fi
--    done
-+    if test -n "$MYSQLBIN_PATH" -a -f "$MYSQLBIN_PATH/mysqltest"; then
-+      MYSQLTEST="$MYSQLBIN_PATH/mysqltest";
-+    else
-+      MYSQLTEST=`which mysqltest`;
-+    fi
-+    
-+    if test -n "$MYSQLTEST"; then MYSQLTEST="$MYSQLTEST $MYSQL_ARGS"; fi
-   elif test "$withmysqltest" != "no"; then
-     MYSQLTEST="$withmysqltest"
-   fi
diff --git a/dev-db/lib_mysqludf_stem/lib_mysqludf_stem-0.9.1.ebuild b/dev-db/lib_mysqludf_stem/lib_mysqludf_stem-0.9.1.ebuild
deleted file mode 100644
index fdfa360a4beb..000000000000
--- a/dev-db/lib_mysqludf_stem/lib_mysqludf_stem-0.9.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs autotools
-
-DESCRIPTION="MySQL UDFs which provides stemming capability for a variety of languages"
-HOMEPAGE="http://www.mysqludf.org/lib_mysqludf_stem/"
-SRC_URI="http://www.mysqludf.org/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/mysql-5.1"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-pkg_setup() {
-	MYSQL_PLUGINDIR="$(mysql_config --plugindir)"
-	MYSQL_INCLUDE="$(mysql_config --include)"
-}
-
-src_prepare() {
-	# add AC_PROG_CXX to configure.ac
-	sed -i -e 's|\(AC_PROG_CC\)|\1\nAC_PROG_CXX|g' configure.ac
-
-	# fix ax_lib_mysql.m4 + ax_mysql_bin.m4
-	epatch "${FILESDIR}/${PN}-mysql_m4.patch"
-
-	# fix and clean libstemmer_c
-	sed -i -e 's|^\(CFLAGS\)=|\1+=-fPIC |g' libstemmer_c/Makefile
-	rm -f -- libstemmer_c/stemwords libstemmer_c/*.{o,a} libstemmer_c/*/*.o
-
-	edos2unix installdb.sql
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-pic --disable-static --libdir="${MYSQL_PLUGINDIR}"
-}
-
-src_install() {
-	local X
-	emake DESTDIR="${D}" install
-	dodoc libstemmer_c/libstemmer/*.txt
-	[ -f ${PN}.html ] && dohtml ${PN}.html
-	[ -d doc/html ] && dohtml -r doc/html/.
-	for X in API AUTHORS ChangeLog NEWS README *installdb.sql; do
-		[ -s "${X}" ] && dodoc "${X}"
-	done
-
-	# remove obsolete *.la file
-	rm -f -- "${D}${MYSQL_PLUGINDIR}"/*.la
-}
-
-pkg_postinst() {
-	elog
-	elog "Please have a look at the documentation, how to"
-	elog "enable/disable the UDF functions of ${PN}."
-	elog
-	elog "The documentation is located here:"
-	elog "/usr/share/doc/${PF}"
-	elog
-}
diff --git a/dev-db/lib_mysqludf_stem/metadata.xml b/dev-db/lib_mysqludf_stem/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-db/lib_mysqludf_stem/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index 8cc212d89df2..d52e7501d9e6 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -8,5 +8,5 @@ EBUILD lmdb-0.9.18.ebuild 1239 BLAKE2B cf75faf2a5fe6fd306eb7a28c2372a3bcb3a4395f
 EBUILD lmdb-0.9.19.ebuild 1849 BLAKE2B d9e235c2aa7ff06d2b6cdf6b6e29544a02d1aaa7ae7248afdf661c3ba4ea0ddbb0e7ed9ec7796e73b1865a430a2a8380236a3206e54a8eca054ba95ff9e1d820 SHA512 791cca180d0d429d64f197a627dd8d94c48e8502d38011be358fc901e521cdb3996653b2cc0c519b9e1e5a58815134e99e64f09d50bcc72444eb2990ac2879ad
 EBUILD lmdb-0.9.21-r1.ebuild 1960 BLAKE2B b2686f3859333a1f60b4e1053e40e7214ed3196e35b88956ada044f6655c7ae3a472e999db56d08bfeeb3d6520853b1091dc6d8a321827e67903c87e8aebbe15 SHA512 288aec449c08655fe4572451f2960cd6c489158198fc787cb5ec3bd489578995f651bd5d13c36924ef35c2497dd157ae46a78dc9b5e18b31f913753a2a8157bf
 EBUILD lmdb-0.9.22.ebuild 2322 BLAKE2B 119d9c927f512ecb24aaeaba41641e3fa7bcfe99a9a2c31f27a6152d6a7d1976ec139677ea90a26e3e76f1aa011e16a554d7ca10391ca4d919de56649916f4a8 SHA512 c7f3540619dc06ef582539730f5060c1a2e784c410b91c7fc977749c3e78829e59cf424b6c9c15700168a22f48b22ae554700961374f42f339cd352c50d8c6d9
-EBUILD lmdb-0.9.23.ebuild 2284 BLAKE2B 04a9d94b39c25ab9360c0141339329898bbcc4839a0fa13240461e2b67a9b352b08ee1c546c828be3d03668bbcf3d18fc5dd69b1e81bf2b1f2dde5e051a866f9 SHA512 37f81b1ee1edcebf9b7bb4a87c7c79a42839470bc8c8d4fc6e3ea9e771a95546eca32f60d33a12167efcee420adb46c0c783a8300a0a2f574781e78aa6097245
+EBUILD lmdb-0.9.23.ebuild 2281 BLAKE2B 653bd0c789e63df48dec191cfc80565f8755248ee9c131cfc82448b80fb952c794ba9b365f57c05992dfe45aafa4d205e8379c0f791e8dbe91384893228efe8e SHA512 b1c1cbe8a055f6c480347889bb1fe28e37b98229191c29890f68f873628be3e22be71207477d7bec5323fd60e7931e9b3255bde55a763557b0191e62b3cb2354
 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 65a2931f0dd3..676ccb0568de 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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 2498d73ec5c5..78a6c144edc4 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,14 +1,9 @@
 AUX gentoo-layout-3.0.patch 311 BLAKE2B 4c2f0ae8aa53d605bcaf134274d3b549ec970b43cc68eed1ac71cf089c9fa32a1343d7ebfdf428e7f25032f5782aecfb86fb8f78528ffc708ab15dc7285a24e7 SHA512 4d5a48b4dd66aab04ba597b30e96b4601c6745acca21be1daf051ba6ce1e8fef1a0efa46d8e81da1ecdc893a8ee471bd8c7ed0c5436ee33b8b4f7cd18fdca1a5
 AUX mariadb-connector-c-3.0.6-provide-pkconfig-file.patch 1838 BLAKE2B 454433d5815e818bb3cb08241b1629e7cb2e8c6b33d09e241db11cc7f18e73a8cbf40567fe47a613c420581f8487c39478bcbef22da4ba21b77a10f71e4b11ef SHA512 a3ec1a1702d2d5ae5ea6ef93e9bc7f01df548c65574b177a20e8b29694b078ebd67a409ed253467d1db38895e66285eaf73e604a507bfb09384bc3d15325cb60
-AUX mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch 998 BLAKE2B 7c07b70ec752832d62757ee08a6f56b59d47e11c68d5333308878ef6b030a3b959bf2d6ba6ec37f0960f1e5f0be702c974f53c81886cc7a8348d4eeca4eaaa03 SHA512 06fdd1bdcbe9550257e4947bae25870525f59a729c7b78eee703990b17b9ada152d32f80f1bb57f67455bc143725a7f166cf34f9de1edcd40c49e49a2d2a6826
 AUX mariadb-connector-c-3.0.8-fix-pkconfig-file.patch 630 BLAKE2B 4d087835c14334ebfdbfcf69df16e948dfd0c46c194d56ba44516bfb647ff518d766170d95c3c86f39211555f25993d95b57c516a357bb3db52b8428273aad48 SHA512 9949b6e6ea2fe325279a6459ce6119524444dbec65cd509549bdc89d5a4c9afb6c39abe2d4e1ab64f6c7e917279f83a323f93d3fe7bd79a8d519976f8c786028
 DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
-DIST mariadb-connector-c-3.0.7-src.tar.gz 667274 BLAKE2B 75d2d548d51889aecc8af56cbeb61f5eaf21e60924b70dd0559214de464eae209743febdb5d443797f853bc902352f7333aefe84cb367f61f7bf2c341a4a8ac2 SHA512 70facae6234f180d94c0526845a3bf7723d6de3b6871544cb8cea35311fec0537c6342fbf4f024d0dca58ee618642c38748ae73628fcba334064a3c15d307219
-DIST mariadb-connector-c-3.0.8-src.tar.gz 674455 BLAKE2B eca5972f8443c78cdc9f450e7e88ee1c69e2a004664916a0f7dfd9a1ab8242c9e11d3cafcd95323262223fba5d68c5d489d4f61fdddb8369cf603cdd563cfe51 SHA512 d9f970c7ac164ef7d8dd748bf2f749cc1f877a9c8f68a1d57e9ff62d95046bb9505619feca1f1d0d1cdefc1ac49489742aadf4ad9e47c8e6a9b8b40c56eed788
 DIST mariadb-connector-c-3.0.9-src.tar.gz 668142 BLAKE2B f61f855c334268b1cb079abc566a600093d7e0bdd164c22045000e337f43d2b57d14988cba1b3fd2f6316f6e0d949be7e67ac73410ddb1abc66e0faa16422946 SHA512 6f45bcd4bee07f6d72d1c4fee0bdb903ef4fa879eb7508156bc885a5657caf69b145d95647c4bc663eb2a2b03569b41ef9d87ca532b77901c2f67fd608048a1a
 EBUILD mariadb-connector-c-3.0.6-r1.ebuild 2816 BLAKE2B 38450ea224a5f0e960abc65ebce37121ed02d1ec0d5bfc7c2d7a124c9ffd77f10090247493eb0c758b991e40cb8a845fe13355ba8e32b64bb2ca90fa957aca76 SHA512 f5670d8174889c3ccc8b7693cdd97d39c1c0d597d5980c6a5d15317662bffebea1e3b6573c438b076362c8c46649dedf8f285d90ac4f5ffb4eed4d4db82b0378
-EBUILD mariadb-connector-c-3.0.7-r1.ebuild 2828 BLAKE2B 3c7d2eefda6d8ee874c7570827ab015223f9bab0d7c649184d02492cdd319e2a7c281818cf633736e68f000203f23093ad40fdab31e185b4d5d1e1da7488992f SHA512 f45c2e1980bb4be51137b2658213a689acdc13f449704c2406f089179fb8ec897119b3c04fda353ffaad86c7f8bc33e2c2b25b6b56ec1be1eed8be68274970a6
-EBUILD mariadb-connector-c-3.0.8.ebuild 2869 BLAKE2B 39729738d90fbaba3033d87eefd808e5c14d04f746fa2b58f656822943ddb74b350c4c7c90eedf18657e2b793916dd1fd508439cd3bec1e70fb5a2d5e6200aab SHA512 0e55ef203af16d3cb6e000802a1d878d316806ab15f3945e12e1c61a9c14c5aef382a7776065d44376c496ed2558bbfd6bfcc86e7868355ee1f9a356460e17bd
-EBUILD mariadb-connector-c-3.0.9.ebuild 2869 BLAKE2B 39729738d90fbaba3033d87eefd808e5c14d04f746fa2b58f656822943ddb74b350c4c7c90eedf18657e2b793916dd1fd508439cd3bec1e70fb5a2d5e6200aab SHA512 0e55ef203af16d3cb6e000802a1d878d316806ab15f3945e12e1c61a9c14c5aef382a7776065d44376c496ed2558bbfd6bfcc86e7868355ee1f9a356460e17bd
-EBUILD mariadb-connector-c-9999.ebuild 2869 BLAKE2B 39729738d90fbaba3033d87eefd808e5c14d04f746fa2b58f656822943ddb74b350c4c7c90eedf18657e2b793916dd1fd508439cd3bec1e70fb5a2d5e6200aab SHA512 0e55ef203af16d3cb6e000802a1d878d316806ab15f3945e12e1c61a9c14c5aef382a7776065d44376c496ed2558bbfd6bfcc86e7868355ee1f9a356460e17bd
+EBUILD mariadb-connector-c-3.0.9.ebuild 2318 BLAKE2B 3bfe94b1f26a60a13f8a9a9d83bdd387e9c2257a0f0502e1013c4dc4c7c06dae5c31af9efe1ac5b4ff543d9a1a2a6335b8b5b8465ac75bdf3170015696caf3cf SHA512 114a5963a7e1364f0f94063042bb98bc8d45664e6ef54b1cabfd39154b2b6815c41bd597e83ab376dc0d22d10b30e9be154ddc7908560089e4fba84c7271e18b
+EBUILD mariadb-connector-c-9999.ebuild 2362 BLAKE2B 6a73cddd218a6b850a906afe3e1e1273bf73d0639d1e32a0af156294b1525dd554b321bf51d9b426c609e00541637c3e7607c7cd6b065e1cc71e845d52055ecb SHA512 cf2b2b46343b5f03eb7bc4e8b001afc712cc1dd1a667eaca7cd9b5696d153647c982cd2ec37cca5a2c2cefc1998bbd3c629957254cec9f76df109d8b2c68e413
 MISC metadata.xml 324 BLAKE2B fab5394015cd337683f65a257556ed0f15e35826bb0a6ce75a7033cd5931455ff2bed527064d698e9b3165f2cfcaff8a4bdfcad0b830482ae2e4389a79d529fb SHA512 1fe9e5d5d9f8e817ce49117fbcc6a6d706a090752606647496f2b7a25de51bfb641a408ff0cdaf626d83eb5c314d2e28c3f29532307d942cb41498edf4b44aa6
diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch
deleted file mode 100644
index 1fe06e2c8e5e..000000000000
--- a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/673218
-
---- a/mariadb_config/CMakeLists.txt
-+++ b/mariadb_config/CMakeLists.txt
-@@ -59,5 +59,5 @@ INSTALL(TARGETS mariadb_config
-         COMPONENT Development)
- 
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc
--        DESTINATION "lib/pkgconfig"
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-         COMPONENT Development)
---- a/mariadb_config/libmariadb.pc.in
-+++ b/mariadb_config/libmariadb.pc.in
-@@ -7,13 +7,12 @@
- #
- 
- prefix=@CMAKE_INSTALL_PREFIX@
--includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@
--libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@
-+includedir=${prefix}/include
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
- 
- Name: libmariadb
- Version: @CPACK_PACKAGE_VERSION@
-+URL: https://mariadb.com/kb/en/library/mariadb-connector-c/
- Description: MariaDB Connector/C dynamic library
--Cflags: -I${includedir}
--Libs: -L${libdir} -lmariadb @extra_dynamic_LDFLAGS@
--
--
-+Cflags: -I${includedir}/mariadb
-+Libs: -L${libdir} -lmariadb
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild
deleted file mode 100644
index 2cd32bf0db31..000000000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="git-r3"
-	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
-else
-	MY_PN=${PN#mariadb-}
-	MY_PV=${PV/_b/-b}
-	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
-	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/mariadb_version.h
-)
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test"
-
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
-		!gnutls? (
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		)
-	)
-	"
-RDEPEND="${DEPEND}
-	mysqlcompat? (
-	!dev-db/mysql[client-libs(+)]
-	!dev-db/mysql-cluster[client-libs(+)]
-	!dev-db/mariadb[client-libs(+)]
-	!dev-db/mariadb-galera[client-libs(+)]
-	!dev-db/percona-server[client-libs(+)]
-	!dev-db/mysql-connector-c )
-	!>=dev-db/mariadb-10.2.0[client-libs(+)]
-	"
-PATCHES=(
-	"${FILESDIR}"/gentoo-layout-3.0.patch
-	"${FILESDIR}"/${PN}-3.0.7-fix-pkconfig-file-r1.patch
-)
-
-src_configure() {
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_EXTERNAL_ZLIB=ON
-		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl ON OFF)
-		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
-		-DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_LIBDIR="$(get_libdir)"
-		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-		-DINSTALL_BINDIR=bin
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	if use mysqlcompat ; then
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-	if use mysqlcompat ; then
-		dosym mariadb_config /usr/bin/mysql_config
-		dosym mariadb /usr/include/mysql
-	fi
-}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild
deleted file mode 100644
index c957edaec2de..000000000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="git-r3"
-	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
-else
-	MY_PN=${PN#mariadb-}
-	MY_PV=${PV/_b/-b}
-	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
-	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/mariadb_version.h
-)
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test"
-
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
-		!gnutls? (
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		)
-	)
-	"
-RDEPEND="${DEPEND}
-	mysqlcompat? (
-	!dev-db/mysql[client-libs(+)]
-	!dev-db/mysql-cluster[client-libs(+)]
-	!dev-db/mariadb[client-libs(+)]
-	!dev-db/mariadb-galera[client-libs(+)]
-	!dev-db/percona-server[client-libs(+)]
-	!dev-db/mysql-connector-c )
-	!>=dev-db/mariadb-10.2.0[client-libs(+)]
-	"
-PATCHES=(
-	"${FILESDIR}"/gentoo-layout-3.0.patch
-	"${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
-)
-
-src_configure() {
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_EXTERNAL_ZLIB=ON
-		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl ON OFF)
-		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
-		-DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_LIBDIR="$(get_libdir)"
-		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-		-DINSTALL_BINDIR=bin
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	if use mysqlcompat ; then
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-	if use mysqlcompat ; then
-		dosym mariadb_config /usr/bin/mysql_config
-		dosym mariadb /usr/include/mysql
-	fi
-}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild
index c957edaec2de..854813a44d91 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://mariadb.org/"
 LICENSE="LGPL-2.1"
 
 SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test"
+IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
 
 DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	virtual/libiconv:=[${MULTILIB_USEDEP}]
@@ -43,16 +43,7 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 		)
 	)
 	"
-RDEPEND="${DEPEND}
-	mysqlcompat? (
-	!dev-db/mysql[client-libs(+)]
-	!dev-db/mysql-cluster[client-libs(+)]
-	!dev-db/mariadb[client-libs(+)]
-	!dev-db/mariadb-galera[client-libs(+)]
-	!dev-db/percona-server[client-libs(+)]
-	!dev-db/mysql-connector-c )
-	!>=dev-db/mariadb-10.2.0[client-libs(+)]
-	"
+RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/gentoo-layout-3.0.patch
 	"${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
@@ -86,18 +77,10 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	cmake-utils_src_install
-	if use mysqlcompat ; then
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so
-	fi
 }
 
 multilib_src_install_all() {
 	if ! use static-libs ; then
 		find "${D}" -name "*.a" -delete || die
 	fi
-	if use mysqlcompat ; then
-		dosym mariadb_config /usr/bin/mysql_config
-		dosym mariadb /usr/include/mysql
-	fi
 }
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
index c957edaec2de..e6c4b2e68967 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://mariadb.org/"
 LICENSE="LGPL-2.1"
 
 SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test"
+IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
 
 DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	virtual/libiconv:=[${MULTILIB_USEDEP}]
@@ -44,13 +44,6 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	)
 	"
 RDEPEND="${DEPEND}
-	mysqlcompat? (
-	!dev-db/mysql[client-libs(+)]
-	!dev-db/mysql-cluster[client-libs(+)]
-	!dev-db/mariadb[client-libs(+)]
-	!dev-db/mariadb-galera[client-libs(+)]
-	!dev-db/percona-server[client-libs(+)]
-	!dev-db/mysql-connector-c )
 	!>=dev-db/mariadb-10.2.0[client-libs(+)]
 	"
 PATCHES=(
@@ -86,18 +79,10 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	cmake-utils_src_install
-	if use mysqlcompat ; then
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so
-	fi
 }
 
 multilib_src_install_all() {
 	if ! use static-libs ; then
 		find "${D}" -name "*.a" -delete || die
 	fi
-	if use mysqlcompat ; then
-		dosym mariadb_config /usr/bin/mysql_config
-		dosym mariadb /usr/include/mysql
-	fi
 }
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 09f925f62941..64a8479f7d0d 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,5 +1,5 @@
 AUX my.cnf-5.6 5144 BLAKE2B 2f977b6a92524cfabbdd19058430c62dd4d03a0587036f49057eff69fda04c148a4dca8e58abe418a2bdc0fe1ef3c780cf53d7214fb51f13d5a4b2a4f7a3b8e9 SHA512 db4bdde6f82d9bd33026477d89d8191ddc4099586273ca4aa3f2dcd09572f887d03f79c2ce00bf74d01c21a18384b05516982bdcf31a6c458631315ea75c4cab
-DIST mariadb-galera-10.0.35.tar.gz 66950519 BLAKE2B a0b48de41234d1800c1734782bd604d30512e3d33d1937cd3e79f68ec804089166223ba53450ef630779d2b74bc4ace611dc748b4ceca7ed4e4151f97d693655 SHA512 e0160ef74d45c332edf49f21bb673b926008cba9ba650f97a47d7631260b2517db19e1730b76be77af4ee384aa5cc9b3453a24da57c48ab5f062f937494aee87
-DIST mysql-extras-20180515-1334Z.tar.bz2 321462 BLAKE2B 48fc1e0058fa824e6234b0f3319d261997e99f334c8583c0def4cdac4b59f2380d7153ab0fa2ca9a6ab15e35899c2a7586e3b61f4044c4c949110cc8ab9fb0e6 SHA512 de3000f0c65eed9595b52d53205cdcac60cb4a06a5aca27057c8beca6a7890f453aeeda0bb8487b8de75cfb4caa48682b7706273574876c5cefd0d03988c4f7e
-EBUILD mariadb-galera-10.0.35-r1.ebuild 27201 BLAKE2B d9a1443ed469f5ca28e4e25c494064877ae0363a46b6834488a83511da3e4149f4a033ec97da8e80a756e2b106a912748a4b78a46177543b4b1380ec2dab2a51 SHA512 df449a5020ee5d6993ad29026799d5987fb7c0bf3fd1de6fa2d1af521907fe71bb48e08ee6ffdd93722c823cb8719c3122e17aa7dcfba69cb9534d8d77b1fae2
+DIST mariadb-galera-10.0.38.tar.gz 65157071 BLAKE2B c54341395101e27dd25183da3d09e7ddf72a07cf440a8aea5daa998d53012a93e1f04bb5020dba28d1337b5f11448be6ae3d8624c437db0cf090eff2aa10151d SHA512 219c2400ebdbf4c6933af1d2d1f88c7f795a988b408676a3c93dbb8c82bdb782f661e9a60f5e940baf31feda8e584e9764918e59cfbdfa1356af8712dde17425
+DIST mysql-extras-20190310-0358Z.tar.bz2 331100 BLAKE2B 69f2b1ee404247e04b7d368c08c429f783fa45dface295be9fa2d94822d052a08a40e6a57bec3afc38886eb0badfcb52c92974c6df033bb90be66abb3f05249a SHA512 5fd4a320e4c224514b054cffbbdf3697ed7351cf71ee779c311f024388bbf12673821b0e12994acbccd30fe119214ea4b53edf87e2cb37be39d0448e4b2cf70b
+EBUILD mariadb-galera-10.0.38.ebuild 27681 BLAKE2B 1387526e164ee261fa21976028ef7bc2e80b273c4e2722d286284b2bf62e66bd50dec2e5b6d977aed1a00a483ac319264434dbfded47661905125336f658d909 SHA512 7d7917cad83f6a5ce0a063635e20e8791ae6855a33a0b33e2db8ee149bb28758621b71b560501f34f4a96a73400bedaf8746c2eb8de668c21db9c618ca1a7ab1
 MISC metadata.xml 1731 BLAKE2B 0e8a98423e36b3dd621d42ce512063fa8d703cb5254616fd2549cc6f2b03df3d521502b3def93b93000ea4c8b9c24d0bba01bb1417d88c2b2689dcf31876e996 SHA512 09073b18f31f6684cd0ecde266a1c41e7520baf8aa5ff31f19a815ce3f5fea3b1302e0eb702d377f5eb3535c5a7e2828965446b631bbf91219a8c898d1ee8c9e
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.35-r1.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.38.ebuild
index 90a0f496067d..b4d1da15624a 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.35-r1.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.38.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20180515-1334Z"
+MY_EXTRAS_VER="20190310-0358Z"
 SUBSLOT="18"
 
 JAVA_PKG_OPT_USE="jdbc"
@@ -29,7 +29,7 @@ LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0/${SUBSLOT:-0}"
 IUSE="bindist client-libs debug extraengine jdbc jemalloc latin1 libressl
 	numa odbc oqgraph pam +perl profiling selinux +server sphinx
-	sst-rsync sst-xtrabackup static static-libs systemtap tcmalloc
+	sst-rsync sst-xtrabackup static systemtap tcmalloc
 	test tokudb xml yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
@@ -77,7 +77,7 @@ COMMON_DEPEND="
 	tcmalloc? ( dev-util/google-perftools:0= )
 	systemtap? ( >=dev-util/systemtap-1.3:0= )
 	!yassl? (
-		!libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 )
+		!libressl? ( <dev-libs/openssl-1.1.0:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
 	>=sys-libs/zlib-1.2.3:0=
@@ -96,7 +96,6 @@ COMMON_DEPEND="
 		tokudb? ( app-arch/snappy )
 	)
 	>=dev-libs/libpcre-8.41-r1:3=
-	!client-libs? ( dev-db/mysql-connector-c[static-libs?] )
 "
 DEPEND="virtual/yacc
 	static? ( sys-libs/ncurses[static-libs] )
@@ -137,6 +136,14 @@ pkg_setup() {
 			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
 			die
 		fi
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
 	fi
 	java-pkg-opt-2_pkg_setup
 	if has test ${FEATURES} && \
@@ -203,16 +210,15 @@ src_unpack() {
 	mv -f "${WORKDIR%/}/${PN%%-galera}-${PV}" "${S}" || die
 }
 
-disable_engine() {
-	echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
-}
+src_prepare() {
+	_disable_engine() {
+		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
+	}
 
-disable_plugin() {
-	echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
-}
+	_disable_plugin() {
+		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
+	}
 
-src_prepare() {
-	java-pkg-opt-2_src_prepare
 	if use tcmalloc; then
 		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
 	fi
@@ -228,28 +234,29 @@ src_prepare() {
 	local test_plugins=( audit_null auth_examples daemon_example fulltext )
 	if ! use server; then # These plugins are for the server
 		for plugin in "${server_plugins[@]}" ; do
-			disable_plugin "${plugin}"
+			_disable_plugin "${plugin}"
 		done
 	fi
 
 	if ! use test; then # These plugins are only used during testing
 		for plugin in "${test_plugins[@]}" ; do
-			disable_plugin "${plugin}"
+			_disable_plugin "${plugin}"
 		done
 	fi
 
 	# Collides with mariadb-connector-c bug 655980
-	disable_plugin auth_dialog
+	_disable_plugin auth_dialog
 
 	# Don't build Mroonga or example
-	disable_engine mroonga
-	disable_engine example
+	_disable_engine mroonga
+	_disable_engine example
 
 	if ! use oqgraph ; then # avoids extra library checks
-		disable_engine oqgraph
+		_disable_engine oqgraph
 	fi
 
 	cmake-utils_src_prepare
+	java-pkg-opt-2_src_prepare
 }
 
 src_configure(){
@@ -464,6 +471,10 @@ src_install() {
 		for script in "${S}"/scripts/mysql* ; do
 			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
 		done
+		# Manually install supporting files that conflict with other packages
+		# but are needed for galera and initial installation
+		exeinto /usr/libexec/mariadb
+		doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
 	fi
 
 	#Remove mytop if perl is not selected
@@ -471,7 +482,7 @@ src_install() {
 }
 
 # Official test instructions:
-# USE='extraengine perl server static-libs' \
+# USE='extraengine perl server' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mariadb-X.X.XX.ebuild \
 # digest clean package
@@ -800,9 +811,8 @@ pkg_config() {
 		--max_allowed_packet=8M \
 		--net_buffer_length=16K \
 		--socket=${socket} \
-		--pid-file=${pidfile}
+		--pid-file=${pidfile} \
 		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-	#einfo "About to start mysqld: ${mysqld}"
 	ebegin "Starting mysqld"
 	einfo "Command ${mysqld}"
 	${mysqld} &
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 69c713574cfe..b5b66dc433df 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,7 +1,7 @@
 AUX my.cnf-10.2 140 BLAKE2B 3a56b7e38c3dc00215cae4bdc3270e30e85299d3290c0c995a611e4b8b15e66f40d6ac40ab18369e7863742ab6eda94259be5a7f363a26020c6fce28a7582e94 SHA512 85c650670e364f5f71842d9ab07b59c5de6e26e774e7192102562e56f94ed5f8fbc487cef31c134209c22b72fde38f7f53b7279cead97a8af608436d1ecc8857
 AUX my.cnf-5.5 4805 BLAKE2B 39ffb485329b246867db03977661441ebfa71c8ac6275d5263ddfdaf189bad54b27884b98f6f901d9850514011c31b08f5ed7ef3e330a6a2cc7a91229fa524a8 SHA512 2826b9c5d751150e57bf11665d05257fae6e20fb97fae72fdcb460b653bd96198b5cbc94db6bf81c17e36e5554fbcec8dfd717f554b55a5d5d090e17ad49c819
 AUX my.cnf-5.6-r1 4597 BLAKE2B ae7eb874421819b8ce8e3c21e00f21bba1fb508a8d0ea4825f110b42521deca01726d3a8154c1c541119592b809ef6263d13e7701eba7dc8af201b3777c6d226 SHA512 5670fc67032656c5079fe5190ffef5443d5646ffae00d42e231c584e7688578a7df33dbe473749ea160e978152f5d94325eb023c748826aee89866694bc050f8
-AUX my.cnf.distro-client 637 BLAKE2B b9b6b01195a4e2523a0a1cb7efdf5c35579d394b12b7426cc7f2e65485d8c5bd54622b096be12fb9c1b252fc7311278d79ff922ba9332074e4f06419c5dba68e SHA512 85c0b0eb4281b398ca7c010042d69b4306ccebae9838bf7a1ee53c0d6bb12b20f95bcbd3bb359b107b018d456d7bcae8d168757ff34028ce69357ce3f3fbd54e
+AUX my.cnf.distro-client 643 BLAKE2B 5ffd286907ee28c92c85bbcc9a6266555733f1115f2d6b8009183dba6939b978ae8d1b8e0a53e672b8e1a1f621650399231723603fc5f96ef7218db84236e176 SHA512 801f6ab8be3110bb4dc38eaa4367715b8d342b69cadfe13dff987ef6c3aedb67d19449f8f2483e63df5d8b444ca30701b0d96f85e211de6b1e3db923b029acbc
 AUX my.cnf.distro-server 998 BLAKE2B a7f2977a96d394cb7e24d72d82a1c21095c4b55607e5ca4a2c10619278796c328931a5ec076c15b60afef370c2e5da02ca0c628f330e876b4d2c984eeb54df5f SHA512 d9ab6f7fdfe08e6c242f84410ec680ef6aa6778c4bd55fee67c644e1a7d997446d8ef2129be6fc9833d16fe40cf17e09cdf0cf015f06bb145bbf9cfecb51e882
 DIST mariadb-10.0.35.tar.gz 66551252 BLAKE2B 69cc9c78f7c47a4b1760940cb0f395b4053fcc47c1087a0c2af873d4a998ee60915e1f4e64f7fe6474c7c1fa3dabe48a3b6621c67893b20526f01e56b0542e7a SHA512 01fc8d48be3f3847bb222835436ab938c6c5b5ac8ba6cc87b3b6d2a2201b7ab4b152dc1f7d9749c89de90097d50052714ac08aafbbb117fffac32bfb47e74779
 DIST mariadb-10.0.37.tar.gz 64728382 BLAKE2B 3d794633cc400013be05c326681f11f8b27c7d6758b43f357ca93976a75ff931f6f6d205510b5df305c6f487485864d346e4fa14383be32dafcf2b8756eb045a SHA512 c3ba749f519cce3bb63fec6ee6819ad931f72d54258d4b7700c515cfeb137453271a408a9a353bf78715fe66a0c06539bdbf15f1c556a7b89a5c01af84f7fd49
@@ -10,18 +10,18 @@ DIST mariadb-10.1.34.tar.gz 65298561 BLAKE2B 3f3af7b8bad68a08f69befd3f3e7bd88b8c
 DIST mariadb-10.1.37.tar.gz 63492946 BLAKE2B 0f19b402c597443ef970cbe2a2d85d51743cc2d05ab741897efb150f007d7be8b645706a2d0dc5a9f91c7a380d2313840f77d6e9b15f3335495f275b415e5a33 SHA512 b7c35cd67ad265ce2e3a4db20a2ae2b78745db96dc70a211f027a39b6dbb3dc900991c2ee1021ee6a97d12489c3e2a70252e2adf348a458af38b99c3de5a4f25
 DIST mariadb-10.1.38.tar.gz 63535685 BLAKE2B c179ea2f60287c2bc1c0d1c47ae989ac2653a24063e8344cef2f3062fc6798e18b969e8f9aa8287104ce2518e6c644cb8d3a4650b5a0bc5dfde973e76e618955 SHA512 184582f3a902a989ba3d9c4d21288c014c8b469adbbb4cbabc621c5006022cef29baed8c1140ed4476b124da83b76dfa414295ed0c3374be826e75aca953a77b
 DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b SHA512 cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2
-DIST mariadb-10.3.12.tar.gz 70666408 BLAKE2B 90e734a5617e44e2c273a1cd22ed2f81493e9458249dc0eb478c3b2b106dd7a0f81d130841be7632272bf6dc01e64350057c2d3e8162e8e8cef1f5a4ac2fb18c SHA512 9dd2939684c4591db306be6afb34663626dfaae133f88dd31125c759dce16b9e9d767a9254e30d9ee5fa2ea027e223dd4799effba8a8b0e4638d5de9e2512003
+DIST mariadb-10.3.13.tar.gz 70745600 BLAKE2B f62b6de0566910cd0995954e3b84528bca4d8b99dab79ce1e8b5d4076a223890fc0bb7b43ac3d81c81c0b907cabbc3b042eab936b845ef18d259793759b05d51 SHA512 3cbd93291aa43b235e5b81d953ea69fb32df54fb518f922f69b5485952f01fae693c77b0efac37f414ed7ff132d3b58f899812bdb7be8a5b344c3640e2c3a0dd
 DIST mariadb-5.5.63.tar.gz 45946425 BLAKE2B bddfd67d8393ec22c4bc8d7dab2838825394636bd690c04574bdc4da84fbf6c779fcae7f6be5d596458baa732cb5278475f308f03df083cdfcecffc486950d81 SHA512 4699d8af2210e12d0eea659a4d3fd4bfa68ce11a38cffaf939a96cb7a1fe64dd0827d39c3a0a36fa7cc1981a804a9af7a6d5cfaf23a8cfc8440e54c0163c2acb
 DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 8b5feb32085dc35b2f68dae985b2d266c4eaa0e956b490050a2df04bbff99bf8623b67e75af9326d84e3ad625c4d86b0d21d23c9a96df5a0c9cd5ed730958970 SHA512 fbd7af9284bbf09d55f128361e7cc52d94f24ac491aac800cd6d61f2e444aeca66a4d5e6ae94c2fb4044e00cec9b232bae9a76a229f87f19d90b7aecf70792ec
 DIST mysql-extras-20181104-2252Z.tar.bz2 328613 BLAKE2B c869dbdd8eb8ab6706b52815fae88e0789b955b9d3e89eac305e6de6e1bc9e78ea10ac58efeac0d6478c7f83587910834e9b4c44e3621224f006daae44dc2bf3 SHA512 e0dff23aa6420a9cfcf2f60464381d4b08194759dcd96910cdf94075fa71e90b74fa3dae700f279f421fee68315af37e47054c9422adeb6cc757fa968a1b65bf
-DIST mysql-extras-20181211-1735Z.tar.bz2 330779 BLAKE2B 4a41b9067a8b8bc5b595ff8dfeaa20d6577083ad1f6a0d1b56d29663cd436abc611a2ff394fafb8d466771c8676e2019a415554b830f20828ace31eb5b7e082a SHA512 03db4b1b483395eeba57d049c10a07ef50b26ba97f3fad74aa6a19f8835aea60106bbc86dea2a168ec613d9b2caa016240d8d888e42823d383fa3466f8b262d4
+DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43 SHA512 ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c
 EBUILD mariadb-10.0.35-r2.ebuild 27520 BLAKE2B 09bb435fc35e43e9d5a9f0bb234d7583d8ceb55f19e46176def7d1d4370fe99aedb89e28860cc49134f693bf0f49ff4333916441742da72cf65ad7ef6353c72a SHA512 159b2c09d0da83841f77822b4501cc4302758711c9db9447e6c34ebe6185801cbacb4774060d238f7c5aee4595ccc4e0e05f062300f38e27ff86a54a2dce4a95
 EBUILD mariadb-10.0.37.ebuild 27521 BLAKE2B 2dee454767b07e9ef957a3d44d3abebb3bace6a7119b81c7662051a3db9315382d3ea1f73dd03380da695ba16d724560d2b03eea3dd09eb206abcaee1358de7a SHA512 d90e140866541db92272855beb315aea7f037304e018efa6ac090b9d838864de0b7efe24d63ffdc2bc605ce659e0a8b722e2c7650ba21d740ab7d337ddd2c9d2
 EBUILD mariadb-10.0.38.ebuild 27526 BLAKE2B a54b23cb96de54e5cde1f901d1d818245c1c1e5db84f819306a5a38240e8c5f5635bd2c81081213a20a14bf6f4175a1e24acaac4a6e1ec3613804b019e3a5d46 SHA512 0e97dc59e03cef47825e2829166064ecff46f410314e0ddacbe6552a3504318fa6ef01008ab13d437cd384418baaf5ad58b96290093f55c14319305fa5967a06
 EBUILD mariadb-10.1.34.ebuild 29472 BLAKE2B 859741b70abf8c2347395b26b7543f36be94165141227bb7dc75f054768490bf891eea5bd2f171aa0c0f8caed7603abf1347a0087caa10e55ce920aaa9c6677b SHA512 ff30a1fcdcc72b8324dec1be29db63a1792ca58474744f0c02014b1fba28d856ac0f154235b0889aedcc95cf24c4b58fcfd681458be726609861ba6f4220ad8f
 EBUILD mariadb-10.1.37.ebuild 29474 BLAKE2B dba8dc78e78319041edbf8583ed9584f74964ee114a55a2e77702b086e878905d098dacbf01a8fa802f69c8252cfc0a763fbce7412fc69ccdb8dc78b20bd1a56 SHA512 0cc0d703727393dd5c601027c156b194ff6957e46935077fda1312da37ae6b0aa4282b51666b849ac7414ed3d4ead2640b530ffc8e6cd04bc5c9df2d3502848a
-EBUILD mariadb-10.1.38.ebuild 29468 BLAKE2B 508bc25ea3b8a0f9275d82bb591ccf48aed66f63290f910570ab8019a7f9b7e9ecb1863bb8d71ff2fcb2318c91e1387b5bd9e679314c682531662f9a59da9cec SHA512 880d95e14d4034b8f2a5d13fd39cffdd33b37bc3f40901c4477aafc4656beadba14fab7585bceb809c61c2ab228451835c4b75e8774aa572411a91a14b0cd7f7
-EBUILD mariadb-10.2.22.ebuild 32138 BLAKE2B 66e09920cd144d53ef3e8f34c24395348cb13b1751c796d83cab4fe7f9da63a85380c7249d4f31e40c08d63c1d2213fa7a84da155ed9386392de483e5e4b5ec7 SHA512 6f95abb7c46b434516aa82815be7bc43ca5c744952addfcc2ef20ddece0a1654a4ea15c4c2c677e3b5161cd64bcf7dbdd8b8d209846239f1878e5e38e0de2993
-EBUILD mariadb-10.3.12.ebuild 32159 BLAKE2B e88a0109fec3ed85753d5e7bb907a1f675fb323340d0e8ba6cb8ae2cee01646f8a94bf894dfaafaa69b7928e391a2a4638de4ac3fc714ef4d3eca16e611e7371 SHA512 c0bb9f9634cf7c6a961310648d871f7df95a82c39f38856df9692835b07a1b90f533cbea6b8e164e62be7a1e395efdffbb8bdd0b6c4d92877ca6ab942840a4ed
+EBUILD mariadb-10.1.38-r1.ebuild 29468 BLAKE2B 732ff5a8100367d21f32cdec167f2a144663936a06492d24219cdc1edb980990f9d66ba25af4e72f019ec9d5ec7a790903c717cce3ff9e18d3cd4447ef2102f2 SHA512 cc0026d43b7d4786d1be045c53e68bf06586134bd1d1471dc9e929799eea437a582b34716baf9e192d4b7469712c7cd720500c5727d7a12a8c3b2cc0432d6b90
+EBUILD mariadb-10.2.22-r1.ebuild 32486 BLAKE2B 0899519ad4bc284c94b9159f8d3c31a55bf4843c389ba065dc09bc5e11165f63b13d3e069603f1eb2680924d36ece47a44aa6892de6dac25eb3bf091269330f1 SHA512 8aab092eb3fc54bbe975e7971758082b01aa52c691deb572dded92ea27045e2ba7a28314df55978fd0c446d12baef27d74d9d64428ffb6cc1ff222d10ff0754c
+EBUILD mariadb-10.3.13.ebuild 32156 BLAKE2B 614cef34e9b4c1048144d5ab6d550d076c008892537c73aff3554b35d86963b6f1cfbaee7a3b4f5abbda0ccff1edbac63dd2a4bd80de167080478b9d328bb47a SHA512 8a7eaf5e95e33fa6f25f95abd6664e0556a7b22affa285d48ea9b97a5bd3affbcaa39dd762e4298d117ed437fffbe311cbd54e5d6e139593fceab75627221dc9
 EBUILD mariadb-5.5.63.ebuild 27054 BLAKE2B fb6b085846137c6607ccb1b58fdaac6abe8999ad67102b3993b52340dd4c7805640379b79c0a0fe300b237438f836a8b62794c423ebc47707b414f7712214919 SHA512 d9356369a5e93dc1dd1a6c6c332ceac7306cc14b33068739d5fef621ea6f14bf2a36e0b8a9f39500ccb8fb7cf35dae013c9303ade0002459971f48d28097d3de
 MISC metadata.xml 2611 BLAKE2B d1b6b11359e92a3d9cb2c58ed35a15e3cf42ab616ed907fa36a5f777168a805ffd03d01bd13fcd30352ef6c5e8b1d80f4e882ffaf8f6445ed3fce2bcc2a92923 SHA512 80395b35839acebbb18ac8d01e8c806bd89f18d32f85fcba41f41ecfc4f1f869dc8c51c90bb21ebd3c9ac30d51d47869a4dcf3b8ce73967e337e6e396b267c97
diff --git a/dev-db/mariadb/files/my.cnf.distro-client b/dev-db/mariadb/files/my.cnf.distro-client
index 4bbe0f976c63..1b9cdabdb2f3 100644
--- a/dev-db/mariadb/files/my.cnf.distro-client
+++ b/dev-db/mariadb/files/my.cnf.distro-client
@@ -4,7 +4,7 @@
 [client]
 socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
 character-sets-dir				= @GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-default-character-set=utf8
+loose-default-character-set=utf8
 
 [mysql]
 # uncomment the next directive if you are not familiar with SQL
diff --git a/dev-db/mariadb/mariadb-10.1.38.ebuild b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
index 4f84cf1ee6fc..3ad1109b657a 100644
--- a/dev-db/mariadb/mariadb-10.1.38.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20181104-2252Z"
+MY_EXTRAS_VER="20190305-2052Z"
 SUBSLOT="18"
 
 JAVA_PKG_OPT_USE="jdbc"
diff --git a/dev-db/mariadb/mariadb-10.2.22.ebuild b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
index 1097aad248b3..1c7bc36bc7dd 100644
--- a/dev-db/mariadb/mariadb-10.2.22.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20181211-1735Z"
+MY_EXTRAS_VER="20190305-2052Z"
 SUBSLOT="18"
 
 JAVA_PKG_OPT_USE="jdbc"
@@ -225,6 +225,12 @@ pkg_postinst() {
 			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
 			elog "This option should then be removed for subsequent starts."
 			einfo
+			if use sst-xtrabackup ; then
+				ewarn "As per https://mariadb.com/kb/en/meta/xtrabackup_warning/, XtraBackup"
+				ewarn "as an SST is broken by default beginning with 10.2.19 with the setting"
+				ewarn "innodb_safe_truncate=ON.  Please migrate to sst-mariabackup instead."
+				ewarn "sst-xtrabackup is being removed in 10.3 and higher."
+			fi
 		fi
 	fi
 
diff --git a/dev-db/mariadb/mariadb-10.3.12.ebuild b/dev-db/mariadb/mariadb-10.3.13.ebuild
index 3876e70c8cf5..8d049d3508ee 100644
--- a/dev-db/mariadb/mariadb-10.3.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20181211-1735Z"
+MY_EXTRAS_VER="20190305-2052Z"
 SUBSLOT="18"
 
 JAVA_PKG_OPT_USE="jdbc"
@@ -31,7 +31,7 @@ SLOT="0/${SUBSLOT:-0}"
 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
 	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
-	sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
+	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
@@ -60,7 +60,7 @@ fi
 
 PATCHES=(
 	"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
-	"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20018_all_mariadb-10.3.12-without-clientlibs-tools.patch
 	"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
 	"${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
 	"${MY_PATCH_DIR}"/20035_all_mariadb-10.3-atomic-detection.patch
@@ -124,7 +124,6 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 		=sys-cluster/galera-25*
 		sst-rsync? ( sys-process/lsof )
 		sst-mariabackup? ( net-misc/socat[ssl] )
-		sst-xtrabackup? ( net-misc/socat[ssl] )
 	) )
 	perl? ( !dev-db/mytop
 		virtual/perl-Getopt-Long
@@ -135,10 +134,8 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 "
 # For other stuff to bring us in
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-	 server? ( ~virtual/mysql-5.6[static=]
-		 galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
+	 server? ( ~virtual/mysql-5.6[static=] )"
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]] ; then
@@ -583,6 +580,14 @@ src_install() {
 	if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
 		rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
 	fi
+
+	# Remove broken SST scripts that are incompatible
+	local scriptremove
+	for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
+		if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
+			rm "${ED}/usr/bin/${scriptremove}" || die
+		fi
+	done
 }
 
 # Official test instructions:
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index e9c71dfbf2e5..c4d600c83238 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,4 +1,3 @@
-AUX mongodb-3.2.10-boost-1.62.patch 702 BLAKE2B fb3822a1a212aae30f6fbb33a4a87f5f7d0992dfc94b95247e8a0253ed453035aa8f1ba3b9912d3cd1245561d4e529b4e29ab1cf109430c4d2fef51ca33c1bd8 SHA512 79edfd1a6eaba597b31a82e54722dccab288d8b8840a53f79140b5fca221b5acd9fbc770d99e46ea9fa0da502cdf18dd35d982c95a4aa341806c3d8b61fc732f
 AUX mongodb-3.4.0-fix-scons.patch 1411 BLAKE2B 6e5975b70ec7f281ea2cd101b16ee2849762fa1dd8427522eb3b01cd1738e60ece013bf23d07c180c58af024aebd141ca7fdf80bc240701f48556da46d3787ab SHA512 2e29c91a22663259d2f5413fbb2652702bceb122899e50a8969fb82d74a64a78649e79b005e20e6640740c089b1cee19080890eb8d9344c2ce355a977146b770
 AUX mongodb-3.4.6-sysmacros-include.patch 1419 BLAKE2B f07ab093f13ea2b9675538dc99e2e58f85019edffad05bbbf3032f85f8ef881020cc9bf25bc62ca13344e7b8b7dd3b04954c76974c512a41ea5a7a2045de2b34 SHA512 ab269ec003b74848f981021f5eb09e38216d75dd9d1b8a155068b2a335d9ec9d1f5f575028ae9b4b0d8745d15e464cb05b70aabc6c28c984115574c6747afc05
 AUX mongodb-3.4.7-no-boost-check.patch 641 BLAKE2B 0dc3a426b28cd80d7b3361ff9c6747aff64dd27c1bc01a9717c2dd1c160b66f53feb72fd2ead385c220ebe92a8c7b8fa6b04fb3fa8437dba17d5f8346665f6b8 SHA512 812eaaadb6f265cfc904e8f3a7ae8276e42e3968529914179efab5e44f1951ab46ac3bbcfb259f924b20a8ca61d2ebcf72b7103ea9d5f25594ff8e9e3e85836b
@@ -14,13 +13,19 @@ AUX mongos.conf-r2 648 BLAKE2B 420bebfafc1ef4af4b90580077a803fe30f37d63eca6509e7
 AUX mongos.confd-r3 470 BLAKE2B 9cf6f201d337430901d957a5a0811ff11ac2e81814aac2120c5018e6ec4c38b5ca22d19caea593834416c63609c69a8294227fb6b30200b41dfb29799cc5c1b4 SHA512 952fb9cf5d3eeea2006b101e23142e408c98d66d1f4f868f6ea5a4df6a6331ddcbcbdfb24f4b031c1a8c42652141a3684073b96dfc0b3fbd21dc6b5bcf0e36cb
 AUX mongos.initd-r3 422 BLAKE2B 90872d0d8cdc5e33e3eebee848f58a2db0511d48b496ba9318117b74ad9265ead53a21b7d1790729a62d61839099bee315ace8ff3646c01e096a943c2251bf88 SHA512 bf5897614d59c6b4e72529b126408a62ea37d9e9368e5ff69c8fcf2bad3ec09065cff09467f82117a892c51090018706d2f38c03cb9a974a61a49bd9efa0f144
 DIST mongodb-src-r3.4.16.tar.gz 40093657 BLAKE2B 7123444dbdd0b2ad3adfb3391e0177d33c1b6c6a4ea83027821c564faad047a736e52926bc15c58bef59c18282436e913fd3bc9963705e030da01356f83ea367 SHA512 e22eb1fe2a832fed8305200614988c5ecfd619cee44fe2263bffa151732c0e26584084e64065dbc65152be6e5c1767a538193770359bea92f3703c72239075db
+DIST mongodb-src-r3.6.10.tar.gz 40562421 BLAKE2B c4fbb9e9586350503df84b344e5c0e05176e681f50a0e96551f157c81c85b71e45c235f0788c1886aa5b6b79fa452afa1a6e8de4acfbfe4c4a0ae62379599f86 SHA512 e0833885a2b1fc14d99749304bd83931a9016039fa32826f9961653601975474f37003eb40fbe8cc5b09644ea447cdc59ccf63110b527d51d4c772cfff88804f
 DIST mongodb-src-r3.6.8.tar.gz 40428295 BLAKE2B cc02f73cfb49fb38ccabaad5a02610ce73fc41895ce944e48669e254bcbc70c8872a1bd7f8e04371fae4fcd9af2466fd8550367dd1d1da5cee50b86fc5023bf2 SHA512 c981f3269be3bafb59aa89d36c39a801fd7007b60db6c09b4616a559aaf8e50b34cabbdac2b59f23552c0a5112913fba468f7e2ed9a5f4daa3702dcffdf34999
 DIST mongodb-src-r3.6.9.tar.gz 40515460 BLAKE2B 5637e7b5cc4b3c7874fedacbe0b05dac1b3dde3ae1c58ecbfc8caf9526c0a8696bdfa1b9b40ffd1adfc81ef90fcb7a41de2c53ccce09da8b7879b9ab2f238eb7 SHA512 00202820570ba5cdc16951b1cb0e9b52bcb8362cee252c857b84d9107761f4061496fc3379ceae6e052f14477d702714384ad1b24eca2c4173af2506a8d1f39f
 DIST mongodb-src-r4.0.3.tar.gz 49435646 BLAKE2B 1663823d48ec6d93b30b4d68a09bab164291530fd4966fcdd07ffbaceaf25d9fc5c7480d0d794fdd374fa3a2d11f19d87556cf0c47198a13f9d8fb5ccf7f0343 SHA512 c77a01d8d16322514f42030c46a0aa9cedb90f186375222eeb31648060265006b5e929bdde6ca8e7ecd71018f7c19f5bade463d98db0f053d586ffc8adc99550
 DIST mongodb-src-r4.0.4.tar.gz 49462543 BLAKE2B a1193ebc6ed818d4e5f27bff1792b6c6c193ff063cae36f2f7adcf63a3b780658d221691c58f42e494ec514d78c81d093067ea7dce8c7158a28846434f493821 SHA512 7e434c8ac715793d7b0015116af72cde766bae953cdc38653a2746ef4a76898dec58f8ee607d9357b87fa11e5a1f0248ae739473ded2d3dcca2b2801434b07e2
+DIST mongodb-src-r4.0.5.tar.gz 49507822 BLAKE2B ca5853c632631a06300247d4d3bfee153ffdde2fcbd313ab95472e6721d92a67f464af32c745a297401132287f66b1b78e0eebe583008689d1580b99422d7e68 SHA512 4a544ad40d75583b38a6a97a0a6e4fae7d0d7a740aa1f993adac6855c5f7fae43b4cf6966e58d16ec716e8b93c770a3dc3997c2785597b5e37dfc7aafa516976
+DIST mongodb-src-r4.0.6.tar.gz 49511958 BLAKE2B c372bb858528cb825db4edf11db636ad71c63148b84838f64cefe886b37631482c1e22eb99dfc557c3f51706d1d2f61b893bfd301cdeb8772a2d85ad75f8f48c SHA512 72e04154cf221833522bb0c2cc99acc2a86d20e2dcbf1f8c6ff0a870edf7b2529a55b6821c664805c00c12a311ae374a276ef1e3ccea1ed84fb125bb8726906a
 EBUILD mongodb-3.4.16.ebuild 4086 BLAKE2B 09d968fc68f4a3c717ce1e4b2f714464c04251fa8c241c9492a26f3777fcc458d7d27810530129753756012341924773c46bea0474900dd7289edb7778283187 SHA512 6f29c0d7dcb54403fe689f168652586bc4fae81de2b0d28f284046ab33c1e3ad94fbed3815ba2fd2164eacd12e9f43bdd1943179778175d6fe3097165a2410e0
+EBUILD mongodb-3.6.10.ebuild 4230 BLAKE2B 7dcdae9c745188715aab750f024ec651f9c7af64f00d78d5dd293afca61fd1a8e0cc07bf15ae08bb6b6de8a77c19a81cb3fa1dccbe71b022b237d20462038bc7 SHA512 cb123077b262bc4b17ea31a741cf77c48dca7b24d090d0b7428487daba6112a0f21f1397d6e9e03837edf92ed591ed8c2565a2b29463cb1d4a54b3ab5aca91d5
 EBUILD mongodb-3.6.8.ebuild 4196 BLAKE2B 5c5a72caa94102818cc03de85afc8d4c2818775814a9dd04555db4c1676dda953c8e64e3d222e35e96dfa90a26a18d9825c910f48102c6d574e8de816749523e SHA512 f6f83c1dd60eb8887457135b82194dd16c874678369a3b3a29907406b921502100e6d52d08b4dca6d9777d6d6c6453e6f134b08550304b0321138fb296e259dd
 EBUILD mongodb-3.6.9.ebuild 4187 BLAKE2B c491023d742537e146667c049040132f58811e0fa1c051d1cfd13ace7b45330f8ed03f431a18c6e79ad4c9fb4f0b909752332d70d0329275848e2ce06a83eff0 SHA512 44f1661569143ddb3138b0ba04001ae6de049f3269b2fbb3bea0f0a55cdb4ffc616042009c3887945d065f6951b1ff0274607e5cf7a2fc509ce78717bcf0bf74
 EBUILD mongodb-4.0.3.ebuild 4198 BLAKE2B 8ecf5ad9712f6c5f3257df6dbd7dba686206c5498287cd39082920a9bbdaaf75585bb205cf09c515d27331a404f2b493d222bcf22d15c6904933bf753db04d01 SHA512 1f0932d7f192b2526d48389375aacc1f73e4b388f6ad46014d47eb18583940c13c9356288db29270d199f5e8930882842128df42c98171a7abf1cc582ffcb210
 EBUILD mongodb-4.0.4.ebuild 4198 BLAKE2B b7582d2142231b062780de2503eb1f849ecfc1f033680d8a657c1b6e8f6d3c08a7c2d0855e35cf066f2600193e56c8b2b3dd327e7d3268eadd1a91765f992c6f SHA512 8fe7eeba925e8f91fceb6ec5e7147be6b808dd6df0202ec08eb2e2d416151194537a6a719d75efcee0faa23a03ac9a40e6bd472ce8509173d16d9f42c192e31b
-MISC metadata.xml 835 BLAKE2B 6aaa10090846882c813db2fcbec27e9bb8d8ab5b34bbb0f5ac7b0de922606a6382be60f30a19502694022a38dc7c67f03b986d5cd1473e530ab4d05f5ee233a0 SHA512 8d190ebb08b6951c9c9ce39872c0c76b6236a0687980577eae7b2181c0bccacc60ccc67cccc4edc05aa21f4d9d65621eb57f803aab91c7ace6ab794559c9d08a
+EBUILD mongodb-4.0.5.ebuild 4231 BLAKE2B cbcc36b52afa5d2ff4e6482c801297d88902b9a09576d1ac355d922e4c66333ebf62e2cfdeab51145bc0c1717587eceae4c817e5ce25ba22620fd85b9d14c60b SHA512 98180763eb93b00c464e3930eb6f4aca8b71a85299f3990a1e21be5f882a0eefc94c297919e072504c18c59b661aca851c347c8b06c3b96364abdff17266aab4
+EBUILD mongodb-4.0.6.ebuild 4231 BLAKE2B cbcc36b52afa5d2ff4e6482c801297d88902b9a09576d1ac355d922e4c66333ebf62e2cfdeab51145bc0c1717587eceae4c817e5ce25ba22620fd85b9d14c60b SHA512 98180763eb93b00c464e3930eb6f4aca8b71a85299f3990a1e21be5f882a0eefc94c297919e072504c18c59b661aca851c347c8b06c3b96364abdff17266aab4
+MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36
diff --git a/dev-db/mongodb/files/mongodb-3.2.10-boost-1.62.patch b/dev-db/mongodb/files/mongodb-3.2.10-boost-1.62.patch
deleted file mode 100644
index 30a3bdff45f8..000000000000
--- a/dev-db/mongodb/files/mongodb-3.2.10-boost-1.62.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Derived from http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/databases/mongodb/patches/patch-src_mongo_db_fts_unicode_string.cpp v1.1
-
-* Fix build with boost 1.62.0
-
---- a/src/mongo/db/fts/unicode/string.cpp	2016-09-26 12:10:04.000000000 +0000
-+++ b/src/mongo/db/fts/unicode/string.cpp
-@@ -274,7 +274,7 @@ bool String::substrMatch(const std::stri
- 
-     // Case sensitive and diacritic sensitive.
-     return boost::algorithm::boyer_moore_search(
--               haystack.begin(), haystack.end(), needle.begin(), needle.end()) != haystack.end();
-+               haystack.begin(), haystack.end(), needle.begin(), needle.end()) != std::make_pair(haystack.end(), haystack.end());
- }
- 
- }  // namespace unicode
diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index 32785d23917f..5379d9760d42 100644
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -14,6 +14,7 @@
 	and powerful queries).
 	</longdescription>
 	<use>
+		<flag name="lto">Adds support for link time optimization</flag>
 		<flag name="mms-agent">Install the MongoDB Monitoring Service agent</flag>
 		<flag name="tools">Install the MongoDB tools (mongoimport, mongodump...) from <pkg>app-admin/mongo-tools</pkg></flag>
 	</use>
diff --git a/dev-db/mongodb/mongodb-3.6.10.ebuild b/dev-db/mongodb/mongodb-3.6.10.ebuild
new file mode 100644
index 000000000000..5806eaa2e2e1
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.6.10.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3:=
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.8:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-python/cheetah[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )
+	test? (
+		dev-python/pymongo[${PYTHON_USEDEP}]
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 3.4; then
+			ewarn "To upgrade from a version earlier than the 3.4-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 3.4-series. Then upgrade to 3.6 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
+		fi
+	fi
+}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.0.5.ebuild b/dev-db/mongodb/mongodb-4.0.5.ebuild
new file mode 100644
index 000000000000..bb2a9fb04dc3
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.0.5.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3:=
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-python/cheetah[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )
+	test? (
+		dev-python/pymongo[${PYTHON_USEDEP}]
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
+			ewarn "To upgrade from a version earlier than the 3.6-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 3.6-series. Then upgrade to 4.0 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
+		fi
+	fi
+}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.0.6.ebuild b/dev-db/mongodb/mongodb-4.0.6.ebuild
new file mode 100644
index 000000000000..bb2a9fb04dc3
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.0.6.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3:=
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-python/cheetah[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )
+	test? (
+		dev-python/pymongo[${PYTHON_USEDEP}]
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
+			ewarn "To upgrade from a version earlier than the 3.6-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 3.6-series. Then upgrade to 4.0 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
+		fi
+	fi
+}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index f063f300733d..bd0f17535fa3 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -12,9 +12,9 @@ DIST mysql-connector-c++-8.0.11-src.tar.gz 2322951 BLAKE2B a1ea47c0440beae189214
 DIST mysql-connector-c++-8.0.13-src.tar.gz 2174609 BLAKE2B 5293ccfb7ad3bd6d50e0518db402d93f707535498ff1f608acc5c642cdc2c671601cbb7c14c7e6ec66fea8bdcb22effbb90e0ee2c207e8e82be7a2b446512f24 SHA512 0c260eff0002f5abc177049b9d050daf3b7860634355c10c02cb0ece18a3d1505454d67d8742d7e879c0cc6b44f8045f75e64d79bdd0bbfc211de9903abec902
 DIST mysql-connector-c++-8.0.15-src.tar.gz 2210243 BLAKE2B 45e0ffa2134c9df5a7e311963c7f2c58b5d7cfc0eefd80a5dc323bbe34ba60d40c79154f932e19c5f8e18ae45d0b61d304b7b7daba4955f92f830cf20c718931 SHA512 9a217b8f61babe5dac405be19b12d34b22673e779433d880a3aa31ea2e128f93434599a3fe0c1150b3f7b8c4d03f595d545d8cc33342a60561a2f60bff71ef14
 EBUILD mysql-connector-c++-1.1.11.ebuild 1619 BLAKE2B deca616c2dfe247328a82ed6dcee22ac8318979b78ef2d26264cc8c29d26aade47d00f2fa9367dddf21cd0a8703216d6370da1dcc96153054704541e39c31129 SHA512 8af584556114a0b5266af95b82e00d94c16dbd5c6b49c6cf25ad855f8fb4fb65ad9a2d752ce7ae4efaf4df7f2bdaa775cb712a89b0a8c4283e3e7d4fc0f29e9e
-EBUILD mysql-connector-c++-1.1.12.ebuild 1586 BLAKE2B db9fd1e93aa373e3631ce3980f385d98918983b7cf7e350bc9723e1fcb6a87dcfda80d872de798ec8c28ed9a09cbf618e6835ff55397086edad08cc3a22fcd94 SHA512 08986b4273f8766442b10ee1433d4bb0cdbc692bb4d23b4589c86f7629027b3d8a1b0456bd79afbe4d0ab94e0da530266885f370012779e618ec64283d9fcf91
+EBUILD mysql-connector-c++-1.1.12.ebuild 1646 BLAKE2B 66e94a142efcb3a7b3111d930519d9fd53be1a500f7ee1cfdcec93ae4d5cf05f6241638c8a5b6305c29054e35dda43907a0ff2a47132eb79a8215e5ec65634c1 SHA512 907fbbab27519498402b914c8f1188d60814ae0e7ebbcc72d8dfa53620f2b52db686ab880cef61f4b37e210177e75fc3d114a5ccfaa1bbcde6df76a1b4070077
 EBUILD mysql-connector-c++-1.1.9.ebuild 1568 BLAKE2B 767d7a824046b4b1b18967abc04ae51b0610b15af54d8f1491b7d0731a2a25add4ff0bf2dd0445c793737eaf897205216e554e4405f2ab3d3eec30ef0662edc4 SHA512 55070fa6863b2e3cffc3e7f71bd2b652b198ae824e256b6f72d9c525602582c05a57262ba7f33bf01802551617d4963f30b3bbf15818a4fd1a406ac6286aa65e
 EBUILD mysql-connector-c++-8.0.11.ebuild 831 BLAKE2B cd00b3ef8d70e64c8fa7d4852a45d58f060fa443dfb90ebffdb3fa11310d4afabf0396eb05ec4af04b2d3fb3115f38b10eb76a1a302d9d7a1cbb5b4f7e61fda0 SHA512 8de6feaa69664b8faea224769777b7050470fd0b60c0d317e00049bc0e29471bac94274ae0da4239ff211651bf3775df0526d29a02d39d88b1d107bddbb44ee0
 EBUILD mysql-connector-c++-8.0.13.ebuild 840 BLAKE2B ad79745000c37f90f50ffb434613bdabcdf7cc8c8fb93e24e2148f08e65414f5bfcbd792a6b942494b776bbcd8b0717760d8576dc77d78607aeba473a2e5878a SHA512 8ed227a9269efc07223a71798225f4e573904aae94126c549e32abcf4e02459269c570a7d8e4e4db3ec7a825636a77feab6b1752ceaf23d4416cc42d4ea94e8b
-EBUILD mysql-connector-c++-8.0.15.ebuild 849 BLAKE2B 3b5c46fb10763ce2bfe7b12a4aa1736e78dad49338778d43b3de9f1be5f8d87db701c8629af5471ad36607905da4efab21040da2e2a4de1e29f536a48b3ca09f SHA512 0615c16d84fe686c210f49e366d4bfe1cf056e9f15b36000c405d794ddbdf1ea00ba1cc8977574d22a96bcc19f9997d5194a5fdbcbb4f8288b84d79fafb2282d
+EBUILD mysql-connector-c++-8.0.15.ebuild 909 BLAKE2B 3a0fa261424e3ce299cf1d10ff5ace8e8bedc4e91fd0eb098916ca1b2d2353562a21d4aaf3fb73c119a665ad64da113036fba6ad9a02a6199306cece67b1f835 SHA512 32c8692e66ed3805c3e01ad5b4e66b04bc0a750e1fd270fc52f70777242abd21d5f11acdff27210b9194190e2ea1bfb3d203e264986c985f0d13210618e51047
 MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12.ebuild
index 5bb2921319c8..9fe978903a8c 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12.ebuild
@@ -13,11 +13,12 @@ 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"
-IUSE="debug examples gcov static-libs"
+IUSE="debug examples gcov libressl static-libs"
 
 DEPEND="virtual/libmysqlclient:=
 	dev-libs/boost:=
-	dev-libs/openssl:0=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	!<dev-db/mysql-connector-c-6.1.8"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.15.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.15.ebuild
index 0f81eed7d57f..2b7374017ca9 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.15.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.15.ebuild
@@ -14,15 +14,16 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+legacy"
+IUSE="+legacy libressl"
 
 RDEPEND="
-	dev-libs/openssl:0=
 	dev-libs/protobuf:=
 	legacy? (
 		dev-libs/boost:=
 		>=dev-db/mysql-connector-c-6.1.8:=
-	)"
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}-src"
 
diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index 6a6bda0bde78..53fdcc8e2d87 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -1,9 +1,13 @@
 AUX conf.d-2.0 2944 BLAKE2B 94b94868e840267c5bf604226af11a4c806f48111472e417d725b51f48e38b8a4bd0dbbe8f9dba95c2250590c23bc0f9bc301203fdf399cd141055e54fa9a067 SHA512 2781e2caefed0c8be9c612f92cecf5a572dc17b97519034637a2b3f98a88af02dd8973f6c6b2af524d235067df6866409d1fe9d56740bfd0efb09948073c8d3b
 AUX init.d-2.2 5720 BLAKE2B 6d81ee1275439e59926ac0f2dbaa2f4b1ceed130f9047d7f6c19d27927fb0432701121554a77205f6f803c9f4e6e0ffdbf96ac8d6ff2f7ca149637585b859df4 SHA512 df1c85d527ec1805bf5ca22f5db37714ace6c55e4095ecf2e4cc1c4dad8a4aa6539282b11cb9c6a85b72e2412e1fbae90d85a8dfcda077bedb667bf784e4c613
+AUX init.d-2.3 5722 BLAKE2B 63653c5f09312899e81502aeaddc3e19cd8813ed0735baccc8c9d42b344a668dfa745366bcab24bce9b0c137c44db3052b95c5f767dd16ce22cd272417319655 SHA512 7c160885a6240be789d15f0fc257d90db3edaeb50e3695c3ae3c040c1a485367e7f72749ce5f86832b683e611eaf5c012353d58fb2382ed7e37d96c7a28d815f
 AUX init.d-s6-2.2 4978 BLAKE2B bdda1ecc926a5236be865487cca01974865c7d0c8e115b0bf4e5f791293ffd3be3976730fc21d3a4f2f81389d88c40d6b427d67dfeaa694ba8487e19f03b0aa1 SHA512 77d3691837a08d117dbaa8252368ab54f1bbd5969189261e498e57cacd158b87e5600b3c2ce62b25f72b8bf5b9a08f26d56fe93b6e2e96bc58c208d92ef1befc
+AUX init.d-s6-2.3 4980 BLAKE2B b165f6a87cc3570ef6aa28d82dedbd0bc5e151c73e7a97bca62e474af15ae9cb91869f1f2d0a12618c972aa8d4b2100202671b736b6b184c6d9ad644f5955fe8 SHA512 61bfffb8a7af2fa5f2cd0f9e21930e5a2527bd9f2ada617d1b1c06110e247c78b4889f3a80d426eb2b9fcf0c312c6d0cbdc4b501690219f35b9b10d693f538a9
 AUX init.d-supervise 5303 BLAKE2B ae0b30000d74028866512156e6d565e1bc4456680521e7af9195ffed2a7b75b0504c313b78d3629d0d2894c0ea980e8d8049624862200e64e82087e37bbb8d53 SHA512 149710600ca4780434e07101aa164e84d7decd86fdc4c2a8c5c37d2a965aff4626408885f98456773c6f8fb27eeeb5ab7028ccf73088739368c45f8ad9d587c4
+AUX init.d-supervise-2.3 5305 BLAKE2B 17f8b752f9cb073a4ac246e8e23c23bf2fbd4a6164c897e1598d39e8670b67f61d99b5a52f12e97e6edc984b48ac06787245c4569508984da84ab193c7c3a904 SHA512 232af963b96ce93c3628bfc154db7a495eae93595b9a720cf6f0c65100a18fa1e128affed9a6cf73ba2f6fe3344356661e8c8e4cbb55c6ed1a6e548c267e47c7
 AUX log-s6 373 BLAKE2B e4579d7288c7e05c1abba55c29759eb3b0b49153c7b134e28b7308ba83e33c409d82ddc2e9794d0a398330b5b72ac33d165c6140259857ce3204928b20c2f6ac SHA512 e686bc0a4d9d5daf263c5a5f6bb883da1495feb9910f93c791af2d858b2adbf7cfc785c336ce470609f3f7bd12dabb97b470453bd67316feef5ed4df9ee9307d
 AUX logrotate.mysql 368 BLAKE2B 0eb2411785e53e4ec521139943633bf7f765df532e89d626bf2387c9bc8012c4caba019615feb13eeef48e8ace55207b5d93469b323488a93f24f62a3ba32ac0 SHA512 71e6aeec21e220157fb07a609475c626e0698f556db20f5e2876117d1d46a2f297520b2124458e8b8077f9a128e27540ffa1b77cadc5eb372a502edfb804fed1
+AUX logrotate.mysql-2.3 384 BLAKE2B f7d8dae2b35283b5a7cd47418c4f43343549750a9146c522af3e093274acb24389d7ed997a20e78cbba60ccedcf9ddc667014062dd9e5a0665a61f4e3c4e1ecc SHA512 f682919b9f82649ff9fbe21287c93f0f0c434f64907476674c95dcf85bc19b9328cef1924da8247148e6424eefd4957ae86b5238f3200c71584347fe95709b53
 AUX mysql.conf 37 BLAKE2B 66f792ee51ca18e692e069a2627dd3a122dadbd0cf9097857da049ade3cc21fdc45bd7725c68def448a2763e5688ade468c17f53776b780be6f6d2a0245b1b7c SHA512 7b4940666d21f09fda47e2b24bd252c83af4372f34f1b3410c59d8f439fb7c0166d5a1b8d857bf67f2263f15d95a0fa0b67f225152a18c180b67d28f4ceb5f00
 AUX mysqld-v2.service 1208 BLAKE2B 9dad4cfa0a102fe7705f4d1db042d0c65d66e669b51b8536f0dbdc1ca3d149076ee71a373efc0cfa3ca900e87c8ccb91aa0beeb10bf8634553ddc3309ba3b2c9 SHA512 2016ea7d9c8fe9447675ec9612655f1b955a3f04ce417ebb1c7a8a86a29ef176a5737a9bd3bc5e45508e2e23a764a763897881b511f65635193291e212fd58aa
 AUX mysqld-wait-ready 1758 BLAKE2B 2a6ccc105cedc78e4e8acf77fd13f8083af80b3488572079bd063fac263382cd37a85cf40c02ffa8a9a047f146402dc2f7bfef91d47487003b64c84cdc8196c9 SHA512 ad4a850d045149df156c8236ae114e94887626e3ca803dea9bcc3909349043b51357a71ac17d694e0217f7856e076a0736267fc1ea3dedbef8a319fc9014c01b
@@ -11,4 +15,5 @@ AUX mysqld_at-v2.service 1170 BLAKE2B d02f7ee3549d273d309e8e6e5cd8c2f987c6feab42
 AUX run-s6 268 BLAKE2B ebc9c74527257e1a35a4671afe2d34d9ed9868db0e0f33eebe655b31317a4ceeb02affe471ad49007534a9ce0a9399d9f14af664488ae753e207cf97d467107b SHA512 82be247195f6d9d230b063e9bda393bab8855382c2f3e5eb4d427fc1eb7e23dbd8c90939224ff2b5e4116a5c9d3f26ebdc9b9f548cde91e7c1217f4f8500c0d3
 EBUILD mysql-init-scripts-2.2-r3.ebuild 1899 BLAKE2B c7406995ab4a0ecdb9bcd20a9384e269e4dbd55d87c21674cd7b4c31d937468448818bd9c06286b5595fe138b2fb5d6cd2faeec0276e08e0e0f24a6b8b96426a SHA512 2b2873467515d34b6afb03b06f73d8420b5228924362866ab3ba0353ff59509b4aa37db0cc3ccb5f6529a8a732b1a3a405f0b4d30bd288bf518a899884146c2a
 EBUILD mysql-init-scripts-2.2-r4.ebuild 1983 BLAKE2B d322fc4243b6ac3c4540c1f0f312d5baf8658234e3182ff52cbb2442f59d4052ccf662d337780ac0a77611e846ac03b9da116f6e294f4cede62694c1fc2e6d52 SHA512 ac578f3ea527efe1e5b233a075d83e5e1f49785c23c3d5e6557123859d81adef4a5ca51d91fb70f1320bceb4f9fbe2cada8334d831961061a9bba216ce55306f
+EBUILD mysql-init-scripts-2.3.ebuild 1988 BLAKE2B cc676a418285d581c4e1422073e4063b87f544e401f3825622befb6b971ebb68b29ac1d741ae908dbbc4816948644744d1c2f5c63266c3b0ac5c63fd0dd9c6d9 SHA512 568b832d444cfad9b6457c7e9b4add14f0bd5d29a009c78b37591a6b1a84b07b632c4756cbaeb6ca76cd33f057c766ea590b7ae1ec9aebd165f7d35daafdcf81
 MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mysql-init-scripts/files/init.d-2.3 b/dev-db/mysql-init-scripts/files/init.d-2.3
new file mode 100644
index 000000000000..f587e26f7322
--- /dev/null
+++ b/dev-db/mysql-init-scripts/files/init.d-2.3
@@ -0,0 +1,194 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_stopped_commands="bootstrap_galera"
+
+description_checkconfig="Verify the server's configuration"
+description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
+
+depend() {
+	use net.lo
+	# localmount needed for $basedir
+	need localmount
+	# This service has its own timeout and may need to wait for repairs
+	# or remote synchronization
+	keyword -timeout
+}
+
+get_config() {
+	my_print_defaults --defaults-file="$1" mysqld server mariadb |
+	sed -n -e "s/^--$2=//p"
+}
+
+mysql_svcname() {
+	local ebextra=
+	case "${SVCNAME}" in
+		mysql*) ;;
+		*) ebextra=" (mysql)" ;;
+	esac
+	echo "${SVCNAME}${ebextra}"
+}
+
+stringContain() { [ -z "${2##*$1*}" ] && [ -z "$1" -o -n "$2" ]; }
+
+bootstrap_galera() {
+	MY_ARGS="--wsrep-new-cluster ${MY_ARGS}"
+	mark_service_starting
+	if start ; then
+		mark_service_started
+		return 0
+	else
+		mark_service_stopped
+		return 1
+	fi
+}
+
+start() {
+	# Check for old conf.d variables that mean migration was not yet done.
+	set | egrep -sq '^(mysql_slot_|MYSQL_BLOG_PID_FILE|STOPTIMEOUT)'
+	rc=$?
+	# Yes, MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING is a hidden variable.
+	# It does have a use in testing, as it is possible to build a config file
+	# that works with both the old and new init scripts simulateously.
+	if [ "${rc}" = 0 -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then
+		eerror "You have not updated your conf.d for the new mysql-init-scripts-2 revamp."
+		eerror "Not proceeding because it may be dangerous."
+		return 1
+	fi
+
+	# Check the config or die
+	if [ ${RC_CMD} != "restart" ] ; then
+		checkconfig || return 1
+	fi
+
+	# Now we can startup
+	ebegin "Starting $(mysql_svcname)"
+
+	MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+
+	if [ ! -r "${MY_CNF}" ] ; then
+		eerror "Cannot read the configuration file \`${MY_CNF}'"
+		return 1
+	fi
+
+	# tail -n1 is critical as these we only want the last instance of the option
+	local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
+	local pidfile=$(get_config "${MY_CNF}" 'pid[_-]file' | tail -n1)
+	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
+	local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
+	local wsrep="$(get_config "${MY_CNF}" 'wsrep[_-]on' | tail -n1 | awk '{print tolower($0)}')"
+	local wsrep_new=$(get_config "${MY_CNF}" 'wsrep-new-cluster' | tail -n1)
+
+	if [ -n "${chroot}" ] ; then
+		socket="${chroot}/${socket}"
+		pidfile="${chroot}/${pidfile}"
+	fi
+
+	# Galera: Only check datadir if not starting a new cluster and galera is enabled
+	# wsrep_on is not on or wsrep-new-cluster exists in the config or MY_ARGS
+	[ "${wsrep}" = "1" ] && wsrep="on"
+	if [ "${wsrep}" != "on" ] || [ -n "${wsrep_new}" ] || stringContain 'wsrep-new-cluster' "${MY_ARGS}" ; then
+
+		local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
+		if [ ! -d "${datadir}" ] ; then
+			eerror "MySQL datadir \`${datadir}' is empty or invalid"
+			eerror "Please check your config file \`${MY_CNF}'"
+			return 1
+		fi
+
+		if [ ! -d "${datadir}"/mysql ] ; then
+			# find which package is installed to report an error
+			local EROOT=$(portageq envvar EROOT)
+			local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
+			if [ -z ${DBPKG_P} ] ; then
+				eerror "You don't appear to have a server package installed yet."
+			else
+				eerror "You don't appear to have the mysql database installed yet."
+				eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
+			fi
+			return 1
+		fi
+	fi
+
+	local piddir="${pidfile%/*}"
+	checkpath -d --owner mysql:mysql --mode 0755 "$piddir"
+	rc=$?
+	if [ $rc -ne 0 ]; then
+		eerror "Directory $piddir for pidfile does not exist and cannot be created"
+		return 1
+	fi
+
+	local startup_timeout=${STARTUP_TIMEOUT:-900}
+	local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000}
+	local tmpnice="${NICE:+"--nicelevel "}${NICE}"
+	local tmpionice="${IONICE:+"--ionice "}${IONICE}"
+	start-stop-daemon \
+		${DEBUG:+"--verbose"} \
+		--start \
+		--exec "${basedir}"/sbin/mysqld \
+		--pidfile "${pidfile}" \
+		--background \
+		--wait ${startup_early_timeout} \
+		${tmpnice} \
+		${tmpionice} \
+		-- --defaults-file="${MY_CNF}" ${MY_ARGS}
+	local ret=$?
+	if [ ${ret} -ne 0 ] ; then
+		eend ${ret}
+		return ${ret}
+	fi
+
+	ewaitfile ${startup_timeout} "${socket}"
+	eend $? || return 1
+
+	save_options pidfile "${pidfile}"
+	save_options basedir "${basedir}"
+}
+
+stop() {
+	if [ ${RC_CMD} = "restart" ] ; then
+		checkconfig || return 1
+	fi
+
+	ebegin "Stopping $(mysql_svcname)"
+
+	local pidfile="$(get_options pidfile)"
+	local basedir="$(get_options basedir)"
+	local stop_timeout=${STOP_TIMEOUT:-120}
+
+	start-stop-daemon \
+		${DEBUG:+"--verbose"} \
+		--stop \
+		--exec "${basedir}"/sbin/mysqld \
+		--pidfile "${pidfile}" \
+		--retry ${stop_timeout}
+	eend $?
+}
+
+checkconfig() {
+	local my_cnf="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+	local basedir=$(get_config "${my_cnf}" basedir | tail -n1)
+	local svc_name=$(mysql_svcname)
+	ebegin "Checking mysqld configuration for ${svc_name}"
+
+	if [ ${RC_CMD} = "checkconfig" ] ; then
+		# We are calling checkconfig specifically.  Print warnings regardless.
+		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
+	else
+		# Suppress output to check the return value
+		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null 2>&1
+
+		# If the above command does not return 0,
+		# then there is an error to echo to the user
+		if [ $? -ne 0 ] ; then
+			"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
+		fi
+	fi
+
+	eend $? "${svc_name} config check failed"
+}
+
+# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
+
diff --git a/dev-db/mysql-init-scripts/files/init.d-s6-2.3 b/dev-db/mysql-init-scripts/files/init.d-s6-2.3
new file mode 100644
index 000000000000..5bf62e3ef937
--- /dev/null
+++ b/dev-db/mysql-init-scripts/files/init.d-s6-2.3
@@ -0,0 +1,163 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net.lo
+	# localmount needed for $basedir
+	need localmount s6-svscan
+}
+
+get_config() {
+	my_print_defaults --defaults-file="$1" mysqld server mariadb |
+	sed -n -e "s/^--$2=//p"
+}
+
+mysql_svcname() {
+	local ebextra=
+	case "${svc_name}" in
+		mysql*) ;;
+		*) ebextra=" (mysql)" ;;
+	esac
+	echo "${svc_name}${ebextra}"
+}
+
+stringContain() { [ -z "${2##*$1*}" ] && [ -z "$1" -o -n "$2" ]; }
+
+bootstrap_galera() {
+	MY_ARGS="--wsrep-new-cluster ${MY_ARGS}"
+	mark_service_starting
+	if start_pre && start ; then
+		mark_service_started
+		return 0
+	else
+		mark_service_stopped
+		return 1
+	fi
+}
+
+
+extra_commands="checkconfig"
+extra_stopped_commands="bootstrap_galera"
+
+description_checkconfig="Verify the server's configuration"
+description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
+supervisor=s6
+name=$(mysql_svcname)
+s6_service_timeout_stop="$((1000*${STOP_TIMEOUT:-120}))"
+#s6_svwait_options_start="-U -t $((1000*${STARTUP_EARLY_TIMEOUT:-1000}))"
+svc_name=${RC_SVCNAME%-s6}
+s6_service_path=/var/svc.d/${svc_name}
+
+start_pre() {
+	# Check the config or die
+	if [ ${RC_CMD} != "restart" ] ; then
+		checkconfig || return 1
+	fi
+
+	MY_CNF="${MY_CNF:-/etc/${svc_name}/my.cnf}"
+
+	if [ ! -r "${MY_CNF}" ] ; then
+		eerror "Cannot read the configuration file \`${MY_CNF}'"
+		return 1
+	fi
+
+	# tail -n1 is critical as these we only want the last instance of the option
+	local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
+	local pidfile=$(get_config "${MY_CNF}" 'pid[_-]file' | tail -n1)
+	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
+	local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
+	local wsrep="$(get_config "${MY_CNF}" 'wsrep[_-]on' | tail -n1 | awk '{print tolower($0)}')"
+	local wsrep_new=$(get_config "${MY_CNF}" 'wsrep-new-cluster' | tail -n1)
+
+	if [ -n "${chroot}" ] ; then
+		socket="${chroot}/${socket}"
+		pidfile="${chroot}/${pidfile}"
+	fi
+
+	# Galera: Only check datadir if not starting a new cluster and galera is enabled
+	# wsrep_on is not on or wsrep-new-cluster exists in the config or MY_ARGS
+	[ "${wsrep}" = "1" ] && wsrep="on"
+	if [ "${wsrep}" != "on" ] || [ -n "${wsrep_new}" ] || stringContain 'wsrep-new-cluster' "${MY_ARGS}" ; then
+
+		local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
+		if [ ! -d "${datadir}" ] ; then
+			eerror "MySQL datadir \`${datadir}' is empty or invalid"
+			eerror "Please check your config file \`${MY_CNF}'"
+			return 1
+		fi
+
+		if [ ! -d "${datadir}"/mysql ] ; then
+			# find which package is installed to report an error
+			local EROOT=$(portageq envvar EROOT)
+			local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
+			if [ -z ${DBPKG_P} ] ; then
+				eerror "You don't appear to have a server package installed yet."
+			else
+				eerror "You don't appear to have the mysql database installed yet."
+				eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
+			fi
+			return 1
+		fi
+	fi
+
+	local piddir="${pidfile%/*}"
+	checkpath -d --owner mysql:mysql --mode 0755 "$piddir"
+	rc=$?
+	if [ $rc -ne 0 ]; then
+		eerror "Directory $piddir for pidfile does not exist and cannot be created"
+		return 1
+	fi
+
+	# Prepare env files to source
+	mkdir -p "/var/svc.d/${svc_name}"
+	echo "MY_CNF=\"${MY_CNF}\"" > "/var/svc.d/${svc_name}/env"
+	echo "MY_ARGS=\"${MY_ARGS}\"" >> "/var/svc.d/${svc_name}/env"
+	echo "basedir=\"${basedir}\"" >> "/var/svc.d/${svc_name}/env"
+	mkdir -p "/var/svc.d/${svc_name}/log"
+	echo "SVCNAME=\"${svc_name}\"" > "/var/svc.d/${svc_name}/log/env"
+	echo "S6_LOG_OPTIONS=\"${S6_LOG_OPTIONS}\"" > "/var/svc.d/${svc_name}/log/env"
+}
+
+start_post() {
+	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
+	local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
+	local startup_timeout=${STARTUP_TIMEOUT:-900}
+
+	if [ -n "${chroot}" ] ; then
+		socket="${chroot}/${socket}"
+	fi
+	ewaitfile ${startup_timeout} "${socket}"
+}
+
+checkconfig() {
+	local my_cnf="${MY_CNF:-/etc/${svc_name}/my.cnf}"
+	local basedir=$(get_config "${my_cnf}" basedir | tail -n1)
+	local svc_name=$(mysql_svcname)
+	ebegin "Checking mysqld configuration for ${svc_name}"
+
+	if [ ${RC_CMD} = "checkconfig" ] ; then
+		# We are calling checkconfig specifically.  Print warnings regardless.
+		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
+	else
+		# Suppress output to check the return value
+		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null 2>&1
+
+		# If the above command does not return 0,
+		# then there is an error to echo to the user
+		if [ $? -ne 0 ] ; then
+			"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
+		fi
+	fi
+
+	eend $? "${svc_name} config check failed"
+}
+
+stop_pre() {
+	if [ ${RC_CMD} = "restart" ] ; then
+		checkconfig || return 1
+	fi
+}
+
+# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
+
diff --git a/dev-db/mysql-init-scripts/files/init.d-supervise-2.3 b/dev-db/mysql-init-scripts/files/init.d-supervise-2.3
new file mode 100644
index 000000000000..e611995b9a04
--- /dev/null
+++ b/dev-db/mysql-init-scripts/files/init.d-supervise-2.3
@@ -0,0 +1,180 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_stopped_commands="boostrap_galera"
+
+description_checkconfig="Verify the server's configuration"
+description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
+
+depend() {
+	use net.lo
+	# localmount needed for $basedir
+	need localmount
+}
+
+get_config() {
+	my_print_defaults --defaults-file="$1" mysqld server mariadb |
+	sed -n -e "s/^--$2=//p"
+}
+
+mysql_svcname() {
+	local ebextra=
+	case "${SVCNAME}" in
+		mysql*) ;;
+		*) ebextra=" (mysql)" ;;
+	esac
+	echo "${SVCNAME}${ebextra}"
+}
+
+stringContain() { [ -z "${2##*$1*}" ] && [ -z "$1" -o -n "$2" ]; }
+
+bootstrap_galera() {
+	MY_ARGS="--wsrep-new-cluster ${MY_ARGS}"
+	mark_service_starting
+	if start ; then
+		mark_service_started
+		return 0
+	else
+		mark_service_stopped
+		return 1
+	fi
+}
+
+start() {
+	# Check for old conf.d variables that mean migration was not yet done.
+	set | egrep -sq '^(mysql_slot_|MYSQL_BLOG_PID_FILE|STOPTIMEOUT)'
+	rc=$?
+	# Yes, MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING is a hidden variable.
+	# It does have a use in testing, as it is possible to build a config file
+	# that works with both the old and new init scripts simulateously.
+	if [ "${rc}" = 0 -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then
+		eerror "You have not updated your conf.d for the new mysql-init-scripts-2 revamp."
+		eerror "Not proceeding because it may be dangerous."
+		return 1
+	fi
+
+	# Check the config or die
+	if [ ${RC_CMD} != "restart" ] ; then
+		checkconfig || return 1
+	fi
+
+	# Now we can startup
+	ebegin "Starting $(mysql_svcname)"
+
+	MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+
+	if [ ! -r "${MY_CNF}" ] ; then
+		eerror "Cannot read the configuration file \`${MY_CNF}'"
+		return 1
+	fi
+
+	# tail -n1 is critical as these we only want the last instance of the option
+	local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
+	local pidfile=$(get_config "${MY_CNF}" 'pid[_-]file' | tail -n1)
+	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
+	local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
+	local wsrep="$(get_config "${MY_CNF}" 'wsrep[_-]on' | tail -n1 | awk '{print tolower($0)}')"
+	local wsrep_new=$(get_config "${MY_CNF}" 'wsrep-new-cluster' | tail -n1)
+
+	if [ -n "${chroot}" ] ; then
+		socket="${chroot}/${socket}"
+		pidfile="${chroot}/${pidfile}"
+	fi
+
+	# Galera: Only check datadir if not starting a new cluster and galera is enabled
+	# wsrep_on is not on or wsrep-new-cluster exists in the config or MY_ARGS
+	[ "${wsrep}" = "1" ] && wsrep="on"
+	if [ "${wsrep}" != "on" ] || [ -n "${wsrep_new}" ] || stringContain 'wsrep-new-cluster' "${MY_ARGS}" ; then
+
+		local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
+		if [ ! -d "${datadir}" ] ; then
+			eerror "MySQL datadir \`${datadir}' is empty or invalid"
+			eerror "Please check your config file \`${MY_CNF}'"
+			return 1
+		fi
+
+		if [ ! -d "${datadir}"/mysql ] ; then
+			# find which package is installed to report an error
+			local EROOT=$(portageq envvar EROOT)
+			local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
+			if [ -z ${DBPKG_P} ] ; then
+				eerror "You don't appear to have a server package installed yet."
+			else
+				eerror "You don't appear to have the mysql database installed yet."
+				eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
+			fi
+			return 1
+		fi
+	fi
+
+	local piddir="${pidfile%/*}"
+	checkpath -d --owner mysql:mysql --mode 0755 "$piddir"
+	rc=$?
+	if [ $rc -ne 0 ]; then
+		eerror "Directory $piddir for pidfile does not exist and cannot be created"
+		return 1
+	fi
+
+	local startup_timeout=${STARTUP_TIMEOUT:-900}
+#	local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000}
+	local tmpnice="${NICE:+"--nicelevel "}${NICE}"
+	local tmpionice="${IONICE:+"--ionice "}${IONICE}"
+	supervise-daemon \
+		${DEBUG:+"--verbose"} \
+		--pidfile "/run/${SVCNAME}.pid" \
+		${tmpnice} \
+		${tmpionice} \
+		--start \
+		"${basedir}"/sbin/mysqld \
+		-- --defaults-file="${MY_CNF}" ${MY_ARGS}
+	local ret=$?
+	if [ ${ret} -ne 0 ] ; then
+		eend ${ret}
+		return ${ret}
+	fi
+
+	ewaitfile ${startup_timeout} "${socket}"
+	eend $? || return 1
+}
+
+stop() {
+	if [ ${RC_CMD} = "restart" ] ; then
+		checkconfig || return 1
+	fi
+
+	ebegin "Stopping $(mysql_svcname)"
+
+	supervise-daemon \
+		${DEBUG:+"--verbose"} \
+		--stop \
+		--pidfile "/run/${SVCNAME}.pid"
+	eend $?
+}
+
+checkconfig() {
+	local my_cnf="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+	local basedir=$(get_config "${my_cnf}" basedir | tail -n1)
+	local svc_name=$(mysql_svcname)
+	ebegin "Checking mysqld configuration for ${svc_name}"
+
+	if [ ${RC_CMD} = "checkconfig" ] ; then
+		# We are calling checkconfig specifically.  Print warnings regardless.
+		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
+	else
+		# Suppress output to check the return value
+		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null 2>&1
+
+		# If the above command does not return 0,
+		# then there is an error to echo to the user
+		if [ $? -ne 0 ] ; then
+			"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
+		fi
+	fi
+
+	eend $? "${svc_name} config check failed"
+}
+
+# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
+
diff --git a/dev-db/mysql-init-scripts/files/logrotate.mysql-2.3 b/dev-db/mysql-init-scripts/files/logrotate.mysql-2.3
new file mode 100644
index 000000000000..6a3b9eeb2ca9
--- /dev/null
+++ b/dev-db/mysql-init-scripts/files/logrotate.mysql-2.3
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+/var/log/mysql/mysql.err /var/log/mysql/mysql.log /var/log/mysql/mysqld.err {
+monthly
+create 660 mysql mysql
+notifempty
+size 5M
+sharedscripts
+missingok
+postrotate
+  /bin/kill -HUP $(cat $(my_print_defaults server mysqld mariadb | grep 'pid[_-]file' | cut -d = -f 2))
+endscript
+}
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3.ebuild
new file mode 100644
index 000000000000..b3283cf3ba24
--- /dev/null
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd s6 tmpfiles
+
+DESCRIPTION="Gentoo MySQL init scripts."
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+# This _will_ break with MySQL 5.0, 4.x, 3.x
+# It also NEEDS openrc for the save_options/get_options builtins.
+# The s6 support was added after openrc 0.16.2
+# mysql-connector-c needed for my_print_defaults
+RDEPEND="
+	!<dev-db/mysql-5.1
+	!<sys-apps/openrc-0.16.2
+	dev-db/mysql-connector-c
+	"
+# Need to set S due to PMS saying we need it existing, but no SRC_URI
+S=${WORKDIR}
+
+src_install() {
+	newconfd "${FILESDIR}/conf.d-2.0" "mysql"
+
+	# s6 init scripts
+	if use amd64 || use x86 ; then
+		newconfd "${FILESDIR}/conf.d-2.0" "mysql-s6"
+		newinitd "${FILESDIR}/init.d-s6-2.3" "mysql-s6"
+		s6_install_service mysql "${FILESDIR}/run-s6"
+		s6_install_service mysql/log "${FILESDIR}/log-s6"
+	fi
+
+	newinitd "${FILESDIR}/init.d-2.3" "mysql"
+	newinitd "${FILESDIR}/init.d-supervise-2.3" "mysql-supervise"
+
+	# systemd unit installation
+	exeinto /usr/libexec
+	doexe "${FILESDIR}"/mysqld-wait-ready
+	systemd_newunit "${FILESDIR}/mysqld-v2.service" "mysqld.service"
+	systemd_newunit "${FILESDIR}/mysqld_at-v2.service" "mysqld@.service"
+	dotmpfiles "${FILESDIR}/mysql.conf"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate.mysql-2.3" "mysql"
+}
+
+pkg_postinst() {
+	tmpfiles_process mysql.conf
+	if use amd64 || use x86 ; then
+		elog ""
+		elog "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package."
+		elog "If you wish to use s6 logging support, comment out the log-error setting in your my.cnf"
+	fi
+
+	elog ""
+	elog "Starting with version 10.1.8, MariaDB includes an improved systemd unit named mariadb.service"
+	elog "You should prefer that unit over this package's mysqld.service."
+	einfo ""
+}
diff --git a/dev-db/mysql-udf-base64/Manifest b/dev-db/mysql-udf-base64/Manifest
deleted file mode 100644
index 7151fd1aa582..000000000000
--- a/dev-db/mysql-udf-base64/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX mysql-udf-base64-signedness.patch 879 BLAKE2B ed3876d8b314ef0030006afde8f3f3345b2fdff9f6b39cdb6e2173f585da326e64a2106b76696e94cdfb30ac0ad1cd46663809373ba431dcf6ecc19970671b77 SHA512 7bbd3c477feacecf2bcb8297e1ab482c5b67efbec8cc475627886d4bc48105ca31d32b49fa9ee0d7d0948d94d9d202a2d48c82ebf0e19dd2f3f3da1da362a7ba
-AUX mysql-udf-base64.sql 205 BLAKE2B 3f69177e24534c39886d3027715a50b4bfd4d15d672e8d42f678c2a183798b4d18db69befde4365d08ccab477fba8dcd8ffc617615965f096dd326dfc18c58e0 SHA512 d223b2dc206930a46c6c2c5311f4cbeb5757c7a66b5c5f345533e2d319dc6185eada25b98ef1d5b05c2b804c0f92f22e99b3a340a8b9bb332d8adc00585997d2
-DIST mysql-udf-base64-20010618.c 7106 BLAKE2B 3f295cb172a3a9c3ea89b8cc24b03d8cdc1113ec8df00777069c8fe892fa91df3b2dc8da4193acd74c69c61c3144c4f429fc8d54fbe7cc4f7caba3b10cabe76d SHA512 23d2d1da7481626ebdb8ca3e31d01ae17903ff431415c7bca6ab20e414dc8751ab105a73e55b66a380e0e11ac0fc949b79d5f3c34f3d353abc1a52627be45f86
-DIST mysql-udf-base64-20010618.readme 222 BLAKE2B d030fa20512cdc6a8efe32aa7e11af307016f49b433f76cc5b66d62a6b602d3198a5924cea4e3012395e8e243ee82a298d437415f5989b94bb6c14fc4da96066 SHA512 2e2a17d7d1f1435bda59c89529e38a4843be814de5cb0db57643f8feb99a59cadf1e518e2903c470cd5931a964541dc5cc5d1b7f9041e7ed49442c37f139b2aa
-EBUILD mysql-udf-base64-20010618.ebuild 1429 BLAKE2B 8b5a50219307fd4f49e7b7e43d0cbee7425e7d4971ed8aeda0b8434057f77666d16796e92e33e7016df46e3ce145d8129e41be087e9a5e2a13cc4152ef2fb576 SHA512 6ac0dd2e8128945f8d8ace8ae5c9227a2224fcd51513b4a52f24f238f75511b9ca1d5b1076807356ea36ac3c83157b7dea42fd6f856e4b25085028c7d49eabf3
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-db/mysql-udf-base64/files/mysql-udf-base64-signedness.patch b/dev-db/mysql-udf-base64/files/mysql-udf-base64-signedness.patch
deleted file mode 100644
index 5084a9dd0128..000000000000
--- a/dev-db/mysql-udf-base64/files/mysql-udf-base64-signedness.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- mysql-udf-base64.c.orig	2011-10-16 14:17:13.000000000 +0200
-+++ mysql-udf-base64.c	2011-10-16 14:18:41.000000000 +0200
-@@ -49,7 +49,7 @@
- #include <string.h>
- #include <mysql/mysql.h>
- 
--static char base64_table[] =
-+static const char base64_table[] =
- { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-   'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-   'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
-@@ -101,7 +101,7 @@
-   unsigned long len;
- 
-   /* *is_null=0; */
--  current = args->args[0];
-+  current = (unsigned char*) args->args[0];
-   len = args->lengths[0];
- 
-   if (len <= 0  ||  args->arg_type[0] != STRING_RESULT )
-@@ -211,7 +211,7 @@
-     }
-   }
- 
--  current = args->args[0];
-+  current = (unsigned char*) args->args[0];
-   len = args->lengths[0];
- 
-   if (len <= 0  ||  args->arg_type[0] != STRING_RESULT )
diff --git a/dev-db/mysql-udf-base64/files/mysql-udf-base64.sql b/dev-db/mysql-udf-base64/files/mysql-udf-base64.sql
deleted file mode 100644
index 619d4b0013d2..000000000000
--- a/dev-db/mysql-udf-base64/files/mysql-udf-base64.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-drop function base64encode;
-drop function base64decode;
-
-create function base64encode returns string soname 'mysql_udf_base64.so';
-create function base64decode returns string soname 'mysql_udf_base64.so';
diff --git a/dev-db/mysql-udf-base64/metadata.xml b/dev-db/mysql-udf-base64/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-db/mysql-udf-base64/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-db/mysql-udf-base64/mysql-udf-base64-20010618.ebuild b/dev-db/mysql-udf-base64/mysql-udf-base64-20010618.ebuild
deleted file mode 100644
index a7b4b06a6907..000000000000
--- a/dev-db/mysql-udf-base64/mysql-udf-base64-20010618.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-MY_PN="${PN//-/_}"
-
-DESCRIPTION="MySQL UDFs that provide base64 encode/decode"
-HOMEPAGE="http://mirrors.sohu.com/mysql/Contrib/Old-Versions/"
-SRC_URI="http://mirrors.sohu.com/mysql/Contrib/Old-Versions/${PN}.c -> ${P}.c
-	http://mirrors.sohu.com/mysql/Contrib/Old-Versions/${PN}.readme -> ${P}.readme"
-
-LICENSE="PHP-2.02"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/mysql-5.1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-# compile helper
-_compile() {
-	local CC="$(tc-getCC)"
-	echo "${CC} ${@}" && "${CC}" "${@}"
-}
-
-pkg_setup() {
-	MYSQL_PLUGINDIR="$(mysql_config --plugindir)"
-	MYSQL_INCLUDE="$(mysql_config --include)"
-}
-
-src_unpack() {
-	cp -f "${DISTDIR}/${P}.c"      "${S}/${PN}.c"
-	cp -f "${DISTDIR}/${P}.readme" "${S}/${PN}.readme"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-signedness.patch"
-}
-
-src_compile() {
-	_compile ${CFLAGS} -Wall -fPIC ${MYSQL_INCLUDE} \
-		-shared ${LDFLAGS} -o ${MY_PN}.so ${PN}.c
-}
-
-src_install() {
-	exeinto "${MYSQL_PLUGINDIR}"
-	doexe ${MY_PN}.so
-	newdoc ${PN}.readme README
-	newdoc "${FILESDIR}/${PN}.sql" ${MY_PN}.sql
-}
-
-pkg_postinst() {
-	elog
-	elog "Please have a look at the documentation, how to"
-	elog "enable/disable the UDF functions of ${PN}."
-	elog
-	elog "The documentation is located here:"
-	elog "/usr/share/doc/${PF}"
-	elog
-}
diff --git a/dev-db/mysql-udf-http/Manifest b/dev-db/mysql-udf-http/Manifest
deleted file mode 100644
index 59116e9ac75a..000000000000
--- a/dev-db/mysql-udf-http/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mysql-udf-http-stdlib.patch 262 BLAKE2B 7d80e33afafc57072ffc2bff22a3ff297dfc5311e1d13ebb668b32e371e3dde4a71859ff268b567a237f640bc2f01679065f5c5ab13223501cdd5a89e85ca66a SHA512 9e914bafffa08ace217ffab6de9497cf0cbe4bcc2f5c10fb9c381e540cc700bdf356fdde8edcce539e3e0d2728083451e5ec147c24bf63c9861d35b3030a6b77
-DIST mysql-udf-http-1.0.tar.gz 322160 BLAKE2B 50097f0e58b6adb23b51f6aa760fdb58c226196d274f1a115da7824be459538feade2365cdbc15e8c5a4fbeddd5513d73fa7773f69a41e305d8687917600d4d1 SHA512 84feb7cfec052e368131bdf44937868339d9d8694128cd5257aa248ce3d1e2e660f3df1e7da99f64b3954fa66c29ed7af5a809fa5ebbd93a96c6cd2ec2ec81de
-EBUILD mysql-udf-http-1.0.ebuild 1303 BLAKE2B 7e496664c99bef30023e2bf3d1679b7d21cad9006cbb6babd9d010c932a77ac9c487b1d05cbfbef70f57b6db9ad1dc8f1f19def2ea3309c1f0ae6147606dec61 SHA512 bdbbc1ddb92411972cfd1365cf3745669006f86710a17a5d3adc6232c33e2e5868b3ca1f272a9dcd57a444cac1ced5cad38dc2a28a97a403c09302af73a64306
-MISC metadata.xml 251 BLAKE2B a8ed853b16c23d8a55dfce0a0cf8b7072a29c573b7bbac0b538173766e320222aef7ea91789c9a9a90e0a191505f2c5986c508352fb2277aae4773089b4ec773 SHA512 e1e841d7dcee0bb517f95e3e36a03deb356ff186b63674f3f4b87cf29daed5b3070ac9442eec72c84820a4c01ef0f715b8589f496495a4a8eac2c4d4be48815d
diff --git a/dev-db/mysql-udf-http/files/mysql-udf-http-stdlib.patch b/dev-db/mysql-udf-http/files/mysql-udf-http-stdlib.patch
deleted file mode 100644
index 6e371fc4a835..000000000000
--- a/dev-db/mysql-udf-http/files/mysql-udf-http-stdlib.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/mysql-udf-http.c.orig	2010-09-06 06:00:32.000000000 +0200
-+++ src/mysql-udf-http.c	2011-10-18 16:36:37.000000000 +0200
-@@ -2,6 +2,7 @@
- #include <string.h>
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <curl/curl.h>
- #include "mysql-udf-http.h"
- 
diff --git a/dev-db/mysql-udf-http/metadata.xml b/dev-db/mysql-udf-http/metadata.xml
deleted file mode 100644
index c28680ca19b4..000000000000
--- a/dev-db/mysql-udf-http/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="google-code">mysql-udf-http</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-db/mysql-udf-http/mysql-udf-http-1.0.ebuild b/dev-db/mysql-udf-http/mysql-udf-http-1.0.ebuild
deleted file mode 100644
index 76152f4b2812..000000000000
--- a/dev-db/mysql-udf-http/mysql-udf-http-1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs autotools
-
-DESCRIPTION="MySQL User-defined function (UDF) for HTTP REST"
-HOMEPAGE="https://code.google.com/p/mysql-udf-http/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/mysql-5.1
-	net-misc/curl"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	MYSQL_PLUGINDIR="$(mysql_config --plugindir)"
-	MYSQL_INCLUDE="$(mysql_config --include)"
-}
-
-src_prepare() {
-	# fix README
-	sed -i -e "s|${PN}\(\.so\)|${PN//-/_}\1|g" README
-
-	# fix Makefile.am
-	sed -i -e "s|${PN}\([_\.]la\)|${PN//-/_}\1|g" \
-		-e "s|\(-module\)|\1 -avoid-version|g" src/Makefile.am
-
-	epatch "${FILESDIR}/${PN}-stdlib.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-pic --disable-static --libdir="${MYSQL_PLUGINDIR}" \
-		--with-mysql="$(type -p mysql_config)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README
-
-	# remove obsolete *.la file
-	rm -f -- "${D}${MYSQL_PLUGINDIR}"/*.la
-}
-
-pkg_postinst() {
-	elog
-	elog "Please have a look at the documentation, how to"
-	elog "enable/disable the UDF functions of ${PN}."
-	elog
-	elog "The documentation is located here:"
-	elog "/usr/share/doc/${PF}"
-	elog
-}
diff --git a/dev-db/mysql-udf-ipv6/Manifest b/dev-db/mysql-udf-ipv6/Manifest
deleted file mode 100644
index 9f455084f5aa..000000000000
--- a/dev-db/mysql-udf-ipv6/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mysql-udf-ipv6-warnings.patch 767 BLAKE2B 789e9ec57aa89d57385a38c73c363b51e05bde55fa844c6576bf1bfd9d6ed64137dc8a162d83fc8af6c4884e6da93653e0314f3dd11a18b0c2c0fcd0da4bf42d SHA512 6a8c3e771b49c9bb6b59b9eb460128cba37de16aaec8d52dab2d707e23163200be68b39e95290d0f773e1349a088877405fd8d86446e74e60bccb84a82435f9c
-DIST watchmouse-mysql-udf-ipv6-01c591b05b79.tar.bz2 10105 BLAKE2B c3f7b71c240af4e89b369b519d03d43cc3fd120d3c66a115ac6869c95ee4cb6ef0d8fc9c9fbc9d86c41eacf50af133db2ff96537c4c8418d32bea11db2247eb5 SHA512 21bcd207076dfbab251b343eb4bf9dd8f783f0ce666ba266b2b9101acfcb764dbb1b4cc2f4b0608a128d0e684b31e9d97d58978b2cdb3a5452c1656780671287
-EBUILD mysql-udf-ipv6-0.4.ebuild 1535 BLAKE2B 81c8f882367cf83986d67e220ec731d45b54cbd9914cf953ef5de10947a907313cef49283563c417709ff62288a8d9c25eaf141d7f1caa840f41aa3715783bb8 SHA512 ad6ad66d4aa9b40b631a51909182a6306a9847d60f05e8c00532a33d7198a98f222426c519d75b1b14db22b8ff6ba036b0031003b3450cdd10d89bc45ac84449
-MISC metadata.xml 260 BLAKE2B c5666bbb5541ad456c9e76699751867b923714eb5624f3f1bc7823fd94aad2be3c02aeacecacd9b8fe3d598ef759a8b0ff00e6e718c06b3e35906f2d293e249d SHA512 0c8d4eac647683711cc2f9a1c2c273bee8fd5a1a9694a0f182bd2b63f0be8beb0468e7fdc704babf10f531099e50cac0700ea39402583847eb28cd909832e370
diff --git a/dev-db/mysql-udf-ipv6/files/mysql-udf-ipv6-warnings.patch b/dev-db/mysql-udf-ipv6/files/mysql-udf-ipv6-warnings.patch
deleted file mode 100644
index 392ecd3c4f53..000000000000
--- a/dev-db/mysql-udf-ipv6/files/mysql-udf-ipv6-warnings.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- mysql_udf_ipv6.c.orig	2011-08-10 10:45:49.000000000 +0200
-+++ mysql_udf_ipv6.c	2011-10-18 16:27:58.000000000 +0200
-@@ -282,7 +282,7 @@
- {
-     unsigned long length = args->lengths[0];
-     long long mask = *((long long *) args->args[1]);
--    unsigned char mask8, i;
-+    unsigned char i;
- 
-     if (!args->args[0] || !length)
-     {
-@@ -299,7 +299,7 @@
- 
-     // my ugly get-the-job-done 128-bit masking
-     memset(result, 0, INET6_ADDRLEN);
--    for (i = 0; i < INET6_ADDRLEN, mask >= 8; i++, mask -= 8)
-+    for (i = 0; i < INET6_ADDRLEN && mask >= 8; i++, mask -= 8)
-     {
-         result[i] = args->args[0][i];
-     }
-@@ -347,7 +347,6 @@
- {
-     struct addrinfo *info;
-     char *addr;
--    ushort i;
- 
-     if (!args->args[0] || !args->lengths[0])
-     {
diff --git a/dev-db/mysql-udf-ipv6/metadata.xml b/dev-db/mysql-udf-ipv6/metadata.xml
deleted file mode 100644
index e3473b0dd86d..000000000000
--- a/dev-db/mysql-udf-ipv6/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="bitbucket">watchmouse/mysql-udf-ipv6</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-db/mysql-udf-ipv6/mysql-udf-ipv6-0.4.ebuild b/dev-db/mysql-udf-ipv6/mysql-udf-ipv6-0.4.ebuild
deleted file mode 100644
index e7bcc4490033..000000000000
--- a/dev-db/mysql-udf-ipv6/mysql-udf-ipv6-0.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-MY_REV="01c591b05b79"  # checkout revision
-MY_USR="watchmouse"    # user name
-
-MY_P="${MY_USR}-${PN}-${MY_REV}"
-
-DESCRIPTION="IPv6 and internationalized domain (IDNA) functions for MySQL"
-HOMEPAGE="http://labs.watchmouse.com/2009/10/extending-mysql-5-with-ipv6-functions/"
-SRC_URI="https://bitbucket.org/${MY_USR}/${PN}/get/${MY_REV}.tar.bz2 -> ${MY_P}.tar.bz2"
-
-LICENSE="EUPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="idn"
-
-DEPEND=">=virtual/mysql-5.1
-	idn? ( net-dns/libidn )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# compile helper
-_compile() {
-	local CC="$(tc-getCC)"
-	echo "${CC} ${@}" && "${CC}" "${@}"
-}
-
-pkg_setup() {
-	MYSQL_PLUGINDIR="$(mysql_config --plugindir)"
-	MYSQL_INCLUDE="$(mysql_config --include)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-warnings.patch"
-}
-
-src_compile() {
-	_compile ${CFLAGS} -Wall -fPIC ${MYSQL_INCLUDE} \
-		-shared ${LDFLAGS} -o mysql_udf_ipv6.so mysql_udf_ipv6.c
-
-	if use idn; then
-		_compile ${CFLAGS} -Wall -fPIC ${MYSQL_INCLUDE} -lidn \
-			-shared ${LDFLAGS} -o mysql_udf_idna.so mysql_udf_idna.c
-	fi
-}
-
-src_install() {
-	exeinto "${MYSQL_PLUGINDIR}"
-	doexe mysql_udf_*.so
-	newdoc Changelog ChangeLog
-	dodoc README
-}
-
-pkg_postinst() {
-	elog
-	elog "Please have a look at the documentation, how to"
-	elog "enable/disable the UDF functions of ${PN}."
-	elog
-	elog "The documentation is located here:"
-	elog "/usr/share/doc/${PF}"
-	elog
-}
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index e0763dacb9df..320c2c6f3349 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,7 +1,7 @@
 AUX my.cnf-5.5 4733 BLAKE2B 89af4a9dbd4828a40aa91b294cef15ec8afbcb614ece424614d0bd2d047273906ccb8e4518a48d530f55e898b6c75403d61aa7a733d5bf50f0f0640c55471505 SHA512 6a5d183f1aeb30d9096838ac010c8f2dc004448924b3606bd03c1a5e0336a20fe5fcef1d2cd772977a167268fcff51a4b663f1f73a37d3066983621a8ca6c004
 AUX my.cnf-5.6 4504 BLAKE2B 5d904925d12ad4c3826426e7e7790800028c9adf9b42692adf3260cd8dae910338683fbcd3e5148f113c1ab27481e5ffe61871716a069c50f295cf756b3e685c SHA512 866aa700460c2962bad6294b271efad09ef285dd428ab01551078be9972d2f961fbdf56aef7927439784711022e92a96f2eba30cd297f056f6562e8817c89aae
 AUX my.cnf-5.7 138 BLAKE2B 71862b4b77334ab74002237453d2c7f6b51cd1ae57dba3b00b19e216d3f10034796de9aa618efb11482cef78b7c7e50393b5f665810d03321b5ca770ac8a6144 SHA512 1d7250689005c948f4a849959baf33f5f0fda099f230611651919ed053fb563daa19d996b7ca6714e224174172fb504f4d7d08e9d449a7e1203e32cf3fdec782
-AUX my.cnf.distro-client 631 BLAKE2B 9ba4edf4398410ef40bf7312a485edd70a807a9da37c69bb6f6bee2c58a722fef1b9f37d28f09f41912722451cc0e9913218d15be472a853a942119f019bf486 SHA512 f40539a56afe79b7c0dff14de46690fd67e8350755b27fbb490d914001c01836cdf9f851aa461bd8b60943ef2ca084b70e48d995f5c18bcc241309f3473c610c
+AUX my.cnf.distro-client 637 BLAKE2B b0812e0e03aa9a3b2e55e08b933a0b41b6afd95ded61f4d9d7c34a2d3810ec38520abd0d89e1c6565f61d4cd8a36d653f9f3199b3dd6a91345cdb5ff962685d8 SHA512 74bd1d9a58075d0a6195be1f94db310bcbe8da532b03844e6fa1ff84676e84843fc9adf9aed06b7e4db53c9aa24ef0885d96de0ccfe4c6ad98afe4c145d43f4f
 AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1fd14b4c2dea398814beda3c09aabea04dd3a9e145464524c629e7e69dc257d1245e0a46dd8584b7f685172 SHA512 cf172edc23d3dda49c21af6b8adef8aa13694d8ceecddf1d612d4ae34d00ba53c51ae4ae7ca4d11083eeacb5d862f59a855a9d80e9e448ab8bbf17f42aac2650
 DIST mysql-5.5.61.tar.gz 21027098 BLAKE2B b7589f632a211349fc34cec94e333b878e07113969bf5cf6f78cd37435d95b15c03eaf188ed09768033b182de125c9f018a5fe902094f17ab891f94cab9de6dd SHA512 978384915c145ec8f0d85deb764154d8d4a9764f2d342928bda6ad43a00bc110aa888895416d2ba5684a4432e433037990dd3fe8c5caf024faa487bc2e153f49
 DIST mysql-5.5.62.tar.gz 21111902 BLAKE2B f1cbb1c6b4dfac11c2c517a57a5c6216ce43766cc247b3c9b387326a7f6446cbc21ddb42bd95afa658c3b0ed2568a29563ceea248c6ec63364ce210119d39cc2 SHA512 1080a3989c20bbbfe98739f99dacd183f2087ceee5147845852144240386808568af4c908ecdbccdcb6114000ab760ed7257492834d50018eff9520260fd91ce
@@ -14,13 +14,13 @@ DIST mysql-boost-5.7.25.tar.gz 49107578 BLAKE2B 8a43479c496ce45e71df905b0cb6da44
 DIST mysql-extras-20180804-2323Z.tar.bz2 322215 BLAKE2B cca9e502e375bf43473335868517f6c450fc7bcf03e55de5a294c8bdcfcac2bb783dec09bbb3b6c30a561ba7e3a943543c017e2d42b61d466e699acdef4c0231 SHA512 efd9d416f394cc61b977ab76f05ab3acc5803ff8bdee8e1dbc65cc5b3f07e4f9742140d9586c028908b10fcc44f21c98ebffdebcc5c3578acbe05b07526bcb3d
 DIST mysql-extras-20181023-0012Z.tar.bz2 327834 BLAKE2B 91a82cbcecbbbe94933da0d8c26cdfee0171602785b2f717fbfec7da422f0ec36f26e897a3c21695f4748017d36c9956cbef03d0852246468368b812a604df82 SHA512 94996708a9da4d55c3aab74f75b74fa4aa80e3fbbb87d9dfe6c1596a934aceed466b7c853e38d9b63f59660763ccef617defc4e6e8770451c21a252250f4e7fa
 DIST mysql-extras-20181111-2314Z.tar.bz2 329013 BLAKE2B fa928b699ef0e6f092e028fc1331cc33953d9855e784998fb2f8c1f1712e9424567b2d2b6b7c5ca375f178309522b3596fcba7babdbed7c85b87ae4b85e5db22 SHA512 5cc4d16c5c6b0491fb9532469ec0b9c65e27e1514d561ea4180845a1578fc8e7ba00fca479b9a784646846f5147e4f676340f639b78c3f5ee140dda26bd5bff2
-DIST mysql-extras-20190126-1919Z.tar.bz2 331144 BLAKE2B 27fe6846a2c98a3027d0a63ad08d72e29f0dfff456de2ad942760a5d1005ea6fe5bbebacacf44308975eacd3ed824883b74e1be3930bd329965e2ec1a4d0384f SHA512 e3a54f721e71cbd9db2b907500cb42c526914be1307a316bbba27e8124580b574c1c9a1fe6d30228cc6d2a1a6ba0797cee3628a69f1536e0467bbcb5151986cd
+DIST mysql-extras-20190303-1852Z.tar.bz2 331026 BLAKE2B ee033fce8f1b6a58f1f690710fb9709a585cd45564b35e71d4f840a3a7f83a5d80f53c24236c9976319abd89c68c62c74a7111517f1b9721d3cbd0898bf0dd8d SHA512 30361a0b848ed27f9170b1116458a9bc13b1b585c5fa1933c99927541c31e9bda4008b0563f2fc7db286f998089ebebf1fe3f18fce7a45e62acbf769ac62d8c1
 EBUILD mysql-5.5.61.ebuild 25515 BLAKE2B 2e8a5ff36ec6003ff7e4d746157afe8af9d462537d2808ab6cfe4d469cee1a594df38aafddcb010d0157335b42253f12474614f4eec85729f79d2e05a28cb8b3 SHA512 9ea05d2509c6693d71c5ce048e11393a77cf50570fa19f40500900284b9e5e5d1097de5c82fa518058ea773ac8fd30131a9c153b4effb371f4ce04f454e8867e
 EBUILD mysql-5.5.62.ebuild 25693 BLAKE2B abb1400994767e1a29259fda70531e27e9160b849a6228802baa440f8a5c8244393cb155ac9985f04353c8b35516e653a563c2eb84b72a714c5ee81d016e5d27 SHA512 759b82802fdeb7840b0da3e4ef1d6e7b1f32d7bd815ba780b11e57143b52bcb7eb483c008d25670f4626968028a46f7080abff247e5d2047f6b500ac67888ad4
 EBUILD mysql-5.6.40-r2.ebuild 25714 BLAKE2B c78b1d8b2a77d095302f7e203c3ee6c0c2014770944072b87bd77f97972fcb6db52b05088adacbc821ce2e8f3dbb780bd40d850e381b866458b0d530fd11ea5d SHA512 b6301834c7813714f18f9763922d10e6faa33675705ba479c6d76e3c5673d903b0683f64a8281836bd6be396f398ed1bee14f9e6c8ddfe30b84ad1ac66a8be48
 EBUILD mysql-5.6.42.ebuild 25955 BLAKE2B de075ce30850d5f2fe17a5aaf02e5888d62634028a042105ac4bff9a90dbec7803c6b1d348e35267be6b4b12afa8f12f4a02f969c536890bf7970cb4e466907c SHA512 56aa82fe363e091a6db7b307318f14ff93ded6eba2a61142eb3e026205740b02dca8587e23accf2ff757e941b0d4b2a0e7ab386b879d7cee35976facbb7aec94
-EBUILD mysql-5.6.43.ebuild 26062 BLAKE2B e1ff15d2b2ce79363f233516a9433b3bc82513c651f8a1554352dd5e33d3364620c9f9e20f6c4ead00edbe86e81e78e007e3444840d9852a2adf3313a2add326 SHA512 dd269ad6408bb554c6bde9c7615fee36c361946994dcf1be7894735361211880273fe9e5a712b0b5a95b11ce430cb026b1c84d5f74dcc605602d37e8b4ac669c
+EBUILD mysql-5.6.43.ebuild 26059 BLAKE2B 505474602b731f0eaf5eb5aae7d430185571fbf9deac9f30036b84a80871078fd96c96b510b0e0419243ea313c31e5c8cad0e5a3609e0352b02b0fd82dbcb697 SHA512 8e96c53d44b304f787dd4648bd3ad4fd268f6194a8edd918cb81003a47ae6a34a7b7331b71333323ca33d5a6ef20767ab291fe68222f2f8cce86c96cf25f3c85
 EBUILD mysql-5.7.23-r2.ebuild 30078 BLAKE2B 57bf58e862639e651335a10a8c4dfc5f7f0f76bfb0545414d697875906d917131fedd3e9d0e58f57b886d8cae55adbd2a104ee3632d49b4ba0669b93a1a68bff SHA512 dfbb88e79b717ceb615246a806123ee2d30c1632cfb40d0bb9e04a9204565a92afbb2b37245794c15985e99a60d2adc46723b97e455fb85e137079d6192b148c
 EBUILD mysql-5.7.24.ebuild 30386 BLAKE2B ecf0c03821af6a21467b53a02e6e0a0ae2f7e5d267ff4669266d34cdb9fddb7defbd8a4013dd3a1f8a103c84da4c6eddafae06fc1ebc4bf94c9769e64dbbfc1b SHA512 f8b372573d82b513ea1d82a1e00d728501c483ef949a2411c05ac93a8d2d90162d6992b58d3a101fefcbac541f9f37dcfa2263ac49231839d338af158557153f
-EBUILD mysql-5.7.25.ebuild 30464 BLAKE2B 7e32811064277d7364181db28ebd1dafaf9af06b62336cf65644f34c5951f10bc961e6e5eb07df15a055dbfe6b1404e6b012261cde3f75f326e67b5071109eaf SHA512 887af8e5399c61d78f506e867d3d536e13917a1276b8c90634efff8d374aee14b634b1f9938cd66075dac764ad52fe65ea6e9ce8ceee99bd04f05a8ccbdb1fb5
+EBUILD mysql-5.7.25.ebuild 30461 BLAKE2B a8cc74144d566d490edd78cbff62e04281b4d6d44e0bf5b0b0c132cd528375a2a46e0d5f626a34bc1e3acd4658677f21af405cd54883471719be665e5145c531 SHA512 0a04e9d8a9297cd7c26872e7eb43cda94ac135acdc3bf73e4d4ff588a4e9544f2d097adac65be320549f883c8880fbc50f9236ea6031643192cc4f62b119b991
 MISC metadata.xml 1539 BLAKE2B 0bc66c5855bd1f4353a7f0b551229d68a940478687b4f38653f973e4a5cfcb946c86bdc2d8318aa96aba43598eb476b995005f26727dfa176ced00fbe2b129a1 SHA512 bc0ce8a3de5e55d954f65eec657930af069d3550f485334f80dfa4c6d17c6298d0609d1ba4fe8b6c988f8ad007858f147c17f1354c207891ac1a062a36af50ad
diff --git a/dev-db/mysql/files/my.cnf.distro-client b/dev-db/mysql/files/my.cnf.distro-client
index 8bf183634304..a5a0dcb0c16a 100644
--- a/dev-db/mysql/files/my.cnf.distro-client
+++ b/dev-db/mysql/files/my.cnf.distro-client
@@ -4,7 +4,7 @@
 [client]
 socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
 character-sets-dir				= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
+loose-default-character-set=utf8
 
 [mysql]
 # uncomment the next directive if you are not familiar with SQL
diff --git a/dev-db/mysql/mysql-5.6.43.ebuild b/dev-db/mysql/mysql-5.6.43.ebuild
index e77fb13c4c43..ae9963a37ee5 100644
--- a/dev-db/mysql/mysql-5.6.43.ebuild
+++ b/dev-db/mysql/mysql-5.6.43.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20190126-1919Z"
+MY_EXTRAS_VER="20190303-1852Z"
 
 CMAKE_MAKEFILE_GENERATOR=emake
 
@@ -37,7 +37,7 @@ RESTRICT="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.25.ebuild b/dev-db/mysql/mysql-5.7.25.ebuild
index 80d8e5aaeeb5..331eb7b7e40e 100644
--- a/dev-db/mysql/mysql-5.7.25.ebuild
+++ b/dev-db/mysql/mysql-5.7.25.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20190126-1919Z"
+MY_EXTRAS_VER="20190303-1852Z"
 
 CMAKE_MAKEFILE_GENERATOR=emake
 
@@ -34,7 +34,7 @@ RESTRICT="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
@@ -55,7 +55,7 @@ PATCHES=(
 	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
 	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-libressl-support.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.25-fix-libressl-support.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-add-missing-gcc-8-fix.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-round-off-test-values-for-same-output-on-all-architectures.patch
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 0db46382c30c..83a8eb1a197a 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,11 +1,11 @@
 AUX my.cnf-5.7 138 BLAKE2B 71862b4b77334ab74002237453d2c7f6b51cd1ae57dba3b00b19e216d3f10034796de9aa618efb11482cef78b7c7e50393b5f665810d03321b5ca770ac8a6144 SHA512 1d7250689005c948f4a849959baf33f5f0fda099f230611651919ed053fb563daa19d996b7ca6714e224174172fb504f4d7d08e9d449a7e1203e32cf3fdec782
-AUX my.cnf.distro-client 631 BLAKE2B 9ba4edf4398410ef40bf7312a485edd70a807a9da37c69bb6f6bee2c58a722fef1b9f37d28f09f41912722451cc0e9913218d15be472a853a942119f019bf486 SHA512 f40539a56afe79b7c0dff14de46690fd67e8350755b27fbb490d914001c01836cdf9f851aa461bd8b60943ef2ca084b70e48d995f5c18bcc241309f3473c610c
+AUX my.cnf.distro-client 637 BLAKE2B b0812e0e03aa9a3b2e55e08b933a0b41b6afd95ded61f4d9d7c34a2d3810ec38520abd0d89e1c6565f61d4cd8a36d653f9f3199b3dd6a91345cdb5ff962685d8 SHA512 74bd1d9a58075d0a6195be1f94db310bcbe8da532b03844e6fa1ff84676e84843fc9adf9aed06b7e4db53c9aa24ef0885d96de0ccfe4c6ad98afe4c145d43f4f
 AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1fd14b4c2dea398814beda3c09aabea04dd3a9e145464524c629e7e69dc257d1245e0a46dd8584b7f685172 SHA512 cf172edc23d3dda49c21af6b8adef8aa13694d8ceecddf1d612d4ae34d00ba53c51ae4ae7ca4d11083eeacb5d862f59a855a9d80e9e448ab8bbf17f42aac2650
 DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
 DIST mysql-extras-20181017-2201Z.tar.bz2 328311 BLAKE2B f1b179e0f2d63105f03ba238125e6cfa2c0cbf2084251b6c344bd02517899322bd161470eddab28c514349caac6401c35909b2f37264fdaf2dc196a309d3cc27 SHA512 26e26a3ad926bc9267d89f0bc34b030bc6292f21d3007185c4c1155beaa608566b4268f93edb64fd6156dbae80ac4f2817e78c1e92e90985e2675c2b1f97854e
-DIST mysql-extras-20190126-1919Z.tar.bz2 331144 BLAKE2B 27fe6846a2c98a3027d0a63ad08d72e29f0dfff456de2ad942760a5d1005ea6fe5bbebacacf44308975eacd3ed824883b74e1be3930bd329965e2ec1a4d0384f SHA512 e3a54f721e71cbd9db2b907500cb42c526914be1307a316bbba27e8124580b574c1c9a1fe6d30228cc6d2a1a6ba0797cee3628a69f1536e0467bbcb5151986cd
+DIST mysql-extras-20190303-1852Z.tar.bz2 331026 BLAKE2B ee033fce8f1b6a58f1f690710fb9709a585cd45564b35e71d4f840a3a7f83a5d80f53c24236c9976319abd89c68c62c74a7111517f1b9721d3cbd0898bf0dd8d SHA512 30361a0b848ed27f9170b1116458a9bc13b1b585c5fa1933c99927541c31e9bda4008b0563f2fc7db286f998089ebebf1fe3f18fce7a45e62acbf769ac62d8c1
 DIST percona-server-5.7.24-27.tar.gz 81757023 BLAKE2B 80c28ca3195874133b127ba7268aa6a6af89f4d1a38ee34f0a761e8c35b8da2c8a94781e7672e241164b9887549846875fc294e36e4229f8e2c4d3f65562350e SHA512 f2a5af3c75577da911bcee5bf962e5b6d723ede1a21f19f9211cda1a7e37a3523d904ea0af6fa9787418959c8824c0cf48726b8b0a426b81df01e5a51214b70d
 DIST percona-server-5.7.25-28.tar.gz 82296869 BLAKE2B eb12f185be6885e124f8fe5d434c0bba22a67fc2d82a28a52b6f7852722ce046a9a5c30ee5c55280b8046786c39336b131c94c05601580ab81ccf0113254f609 SHA512 e323e092d2af39969edc36d647400c20b50ec059b379f9ac32e71d88524940130639ebb2591d4126d6796e111c31c3a03ab1d00726471be00e1662417e5e63b3
 EBUILD percona-server-5.7.24.27.ebuild 35329 BLAKE2B c55fdfe8e6a642527223991fba51c1538d0b9bc1dab3aa371f205177f9f89790b96c14a0203269a87f6ee4ee950097bcee770b5f78e9d262025549b7aefe50fc SHA512 7450b66e5db69026a17f5da743948af9c23f5f759a2b5416ab077cc85c6e2141ee5aa312bf2bcbf77f30c0cd4e9f87ccf288469307038516cb8a6d4887f131c6
-EBUILD percona-server-5.7.25.28.ebuild 36188 BLAKE2B f042a1a4a225dd2698db02d274fc808ad44179ebe0681740272dec8540c9a67b620157d29c53d726ae2ba4e77865ff24454f07f974b347283f7eb9086078289b SHA512 4be53ecea0cfc6f89c323c27858536155af2f943da576ff285461ba7e0e79035e3f010648400c06f6538a6c18b93398a52cd0e0ccb1bde40bcb42c9d084a7fe8
+EBUILD percona-server-5.7.25.28.ebuild 36188 BLAKE2B 1d4b219e49db090b90b1a3986653205d89af2f9848f790d2cba620cfa0bdac197a84a43ede5e2e846162ceb951387fabe676b282b7aed9a07e94099d8459b4eb SHA512 664f2b505fde195cf5ccac21162826b66dfa0c9dc7b2a5e4535e4e0a15400d42331598e846fd97b8b05483512b9c86a7cac232f903781140aed00ad512e80511
 MISC metadata.xml 1416 BLAKE2B a479a1bc7b6e5947ccef2fdf097d3dd91af932500483112c05b86c5d60ab6ec1ac4179bee0fa291a746281054baa791152cac7a34c8c79a0ad4fd8f5e3d1bcf9 SHA512 ec92d201154c3af80aa4cdcd1eae207827a1b2711cfe7b1a9b0153268a33e472329011c56ec39a009776c629163fc9d4f9e77ad2b00461f07199f3dd12db0b52
diff --git a/dev-db/percona-server/files/my.cnf.distro-client b/dev-db/percona-server/files/my.cnf.distro-client
index 8bf183634304..a5a0dcb0c16a 100644
--- a/dev-db/percona-server/files/my.cnf.distro-client
+++ b/dev-db/percona-server/files/my.cnf.distro-client
@@ -4,7 +4,7 @@
 [client]
 socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
 character-sets-dir				= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
+loose-default-character-set=utf8
 
 [mysql]
 # uncomment the next directive if you are not familiar with SQL
diff --git a/dev-db/percona-server/percona-server-5.7.25.28.ebuild b/dev-db/percona-server/percona-server-5.7.25.28.ebuild
index e2bb3596ff7b..5a4345214857 100644
--- a/dev-db/percona-server/percona-server-5.7.25.28.ebuild
+++ b/dev-db/percona-server/percona-server-5.7.25.28.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20190126-1919Z"
+MY_EXTRAS_VER="20190303-1852Z"
 
 CMAKE_MAKEFILE_GENERATOR=emake
 
@@ -64,7 +64,7 @@ PATCHES=(
 	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
 	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
 	"${MY_PATCH_DIR}"/20018_all_percona-server-5.7.23-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20018_all_percona-server-5.7.23-fix-libressl-support.patch
+	"${MY_PATCH_DIR}"/20018_all_percona-server-5.7.25-fix-libressl-support.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-add-missing-gcc-8-fix.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-round-off-test-values-for-same-output-on-all-architectures.patch
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 592d2beeaa41..30260f68d3f6 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,5 +1,7 @@
 DIST pgadmin4-3.0.tar.gz 28915010 BLAKE2B 7e6dccd91f082f7b5514f5d3abdf4653a9961b4efc706e10ce58d817785d514508233e25068762fe0e4bca4c1a3cf10a2515afa38e6f9ba3c99b4af3fa32f3d2 SHA512 5921340176e6748ef13112d906061f195d4bb2f73917d762371bbaeb44ef66cf8e0edcd1cd241eb78dae46ed0b3af014c749468a930fb0c0983b38b2c54dfc3a
 DIST pgadmin4-4.2.tar.gz 32382384 BLAKE2B c96806302e7c298e9fcdee3ada8fc519431eb3de778c55445de648e2867dc32168c5ad38209da63ac2d181612b2edfdd532f11ccd6020ab187c6fe23ef6272a6 SHA512 d3d242904c65f0af871890954c24005b4849b88599cde9a7cb82e077ff5db5a8c5f015c4af0b135d68f02daad42492af71373831c2212a36672af8d7621c3b2a
+DIST pgadmin4-4.3.tar.gz 22480328 BLAKE2B 4a7527b59d3b9f3cbfa63003c09ffe2c826dd965e906c46939324182ffa5c9c0e0258fd56be1480555ed4cbc1b42231727d632ccc7c3339982412654100db38e SHA512 db072bab1dcd0a18b9c423b95847c7873b9f458168ebaaf6473a9de5b44b3134e39f5b84aeba0a6ada42b1e867e359e44bda84bf55377cb0abc169c7455852b6
 EBUILD pgadmin4-3.0.ebuild 3481 BLAKE2B 697a5b6250d747aff9b4216603077a977a84c44bd344f935315eb0ca9a41b85527b32df819738d42626759fb8244392c15edd4909c9b8f03cdb82debf24f5172 SHA512 5f14d65bc3dac207fd3ced4105be3115cd0821a6a5054ce9d150d31d19ca5de44c66b3971444e200d79bfc6b11949cd437a0cbec388f26beef94ccdacb1c3b19
 EBUILD pgadmin4-4.2-r1.ebuild 3550 BLAKE2B 33cb384fe3f047cb6be2631a60094e50f103925fae6fc12d4258a4d5127129f664c3eb1ab86b04b739a2308af5fee9811be579ec9a7302459c4406934e39159c SHA512 f27da6b6bc91041bfbcb96e3066baf1467855de8a9862493b5916aecec83125a6e6bbf5d982aea678149b6f7f90b24cc0411690c8af3bd345d2c044168a44137
+EBUILD pgadmin4-4.3.ebuild 3550 BLAKE2B 33cb384fe3f047cb6be2631a60094e50f103925fae6fc12d4258a4d5127129f664c3eb1ab86b04b739a2308af5fee9811be579ec9a7302459c4406934e39159c SHA512 f27da6b6bc91041bfbcb96e3066baf1467855de8a9862493b5916aecec83125a6e6bbf5d982aea678149b6f7f90b24cc0411690c8af3bd345d2c044168a44137
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-4.3.ebuild b/dev-db/pgadmin4/pgadmin4-4.3.ebuild
new file mode 100644
index 000000000000..17dde22510ef
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-4.3.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,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="mirror://postgresql/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/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 9d031880d050..07c7e8154cdf 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -6,8 +6,12 @@ AUX pgpool2.initd 2162 BLAKE2B b04f6b952507b8e4815c7b27f09b59ffe64f6262719c54903
 AUX pgpool_run_paths-3.6.5.patch 11626 BLAKE2B 5d0b7a49b3c8bf2f2d69d369894e9976037025b289b0ec0f2cf11ed9862347dc4cb166af2cbd65637de40fdae09809a9232b0638cf69339901d6f3f67e9ddcd5 SHA512 ea718378d0ea14fa48975a899df26bc8aafa1e61b0d3f264ead81031a21d68284f4af5ce065c5534d113faf36724c880ce280665e148ec623e9fea9c8f91c77c
 AUX pgpool_run_paths-9999.patch 11759 BLAKE2B 35df553f704846cc4ff8d67e5e6b54ca8ed0a5817a148c359b47cae7ff388fe2bb57600113d7f8ac9afe760ea75e3ddd410d111c2ef87aea3c3fb38671d59260 SHA512 109be0f3bcda49db14ebb86d6e9347aa0a47d582ac1a1438b07719f9fa503045cc5b65a27964c3c0b1690ef489f752a497e3b050b816569d0ce01193dc007259
 DIST pgpool-II-3.7.7.tar.gz 3325039 BLAKE2B 47f4d48b811af0fb6626a6ea4b46bd81d13997fa8756f533711f733eed7526ea79bbc929cf894911cc5697c37fd5fde0306eaee485f00b6c41c2701bf08c972c SHA512 9766d011f8a93ae292770b24915f6825d037d55ad3f75be131a58a9dcfb4d1a61f572f2c48f69ee0d3c6cbdfe76da15e417c26f102c646c3d9e1a2f71d205374
+DIST pgpool-II-3.7.8.tar.gz 3337039 BLAKE2B bce75be04d3c37dffecbc0a1f029d6e97f316cc2497de032ccd4862acc6e7ae64f12ffffdb42a99141e548a2cc616ed02d7eef6ca2f63e222fb400cbad72828c SHA512 0f4e337c2307368cfd38f29c63b9267dd3171dc4b9cd2c59cff564295908e2f561230156a5b690e4d87ce4c8b3174d01b081147e7f5d8ff403d3adc8e7cea7e7
 DIST pgpool-II-4.0.2.tar.gz 3576212 BLAKE2B 4027b8d02f4422900e674ee49a1946521b0737e73c9cd73363cd1ad1328de294bdec219bb8df55db58c6b2da365f8094e6b2228e13f1d24f35f7fb373280bd66 SHA512 9014c34f69cdcb3064a3713ed97fa0847f5572866db709c53f703b2ff996dbb31988d6573fcd85c9bb715bb54b9c215adaf11eb2f90193371be804ec37ac955e
+DIST pgpool-II-4.0.3.tar.gz 3715976 BLAKE2B c5ecfebc44ee4d6ab8fda5ae0854bb51423252ba518b356a37d3b125bc8f4fac048f6f944fdf9b1ee785aae5ac3eca4c4196adf218bc071dd90b93da5c6e6c08 SHA512 76ffbc8df120d4ef68b761684a1805c0349665375f549cd3a194f7d09b9bbdf70d0824da0cbe975e6d15f850704c4fc7c1a2218f551f88f2ce56f542bdfee9b8
 EBUILD pgpool2-3.7.7.ebuild 2637 BLAKE2B 11d6f1983309788e808af8e72d27a6b7fcfb18b71135215786046b9766509a7674ad52ef1b861ddc4d1156cba0fce62a768932e6509e8a0868984da4be4cdb85 SHA512 421c34bfc8aa2bdae0e213dfee556328b0b784af973ae8de8c6c84e2f4b433ce0afc34d16342b0d02abeabd52b828da188d53c73143b66e3b9e00d0c123fd675
+EBUILD pgpool2-3.7.8.ebuild 2639 BLAKE2B 34d313e94f20b68a44ae43819c0ce0c841fba808a363d940b49dc42c4f727b2f77ac103e2eb9996d7a6061db3b093ada25141c4d386935a54f87732930f4f002 SHA512 95578835aaa5a48c8f259ce297978dbaa7ebca684fa4080f7d4ee5923c9546a1cfddc6d34d0e87b0b647e9091eda34f492c91e88422ea5a0ac9a26c06b1d812e
 EBUILD pgpool2-4.0.2.ebuild 2643 BLAKE2B 3a1a873d73bca65bc0aada8ffabd5bf249cb47f0931c40aa48c23718fef7560cda55c005195ca180af9f2fdfbc45f36ddcc3b2e154a9803e3393a4c03f91f6f6 SHA512 62f6f2ec58d9c8b6fe21b0f344a22f4e9b4fe7d0de0d15473ff5c004c83e68bd535c02b0ea3b4412a61e79e4d2694b7a31221208eb7cebdfd23cd8f4acd715f9
+EBUILD pgpool2-4.0.3.ebuild 2645 BLAKE2B 96f9dc6083536ba5a0ec49faba18e87f3a6c8c357486bff8fbb348bfc2719f44f8f1a06382fbe46a59b01c0334cdf843faa011e7ba36f29d6e5a0c1da18c3e90 SHA512 d65dace277b41ff1f2f49168f6010fdf411df41624c3917e58f9b526c6f83eb75148133e253178329dd5623a074c6b18240d00831ae61337f673bf9ff22c1050
 EBUILD pgpool2-9999.ebuild 2720 BLAKE2B a63e0ba961271a6719fd7fab4a57280fd22eb93ada6d7a37a2c8d7bad381f64b4f160461adc4de760e1b1747cf9536ba56027d7a93710cff3d76251b3453a8ca SHA512 8e3c7a0e2c2562d31974dfd9a9503f1d2c20499b34f69fdd0ca26cf08f344fb115a5f65251e854e9fae9bbd6d007f5d1d9243c17b84885e359f42bad0c6ef5b9
 MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/pgpool2-3.7.8.ebuild b/dev-db/pgpool2/pgpool2-3.7.8.ebuild
new file mode 100644
index 000000000000..59df68c3ad24
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-3.7.8.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{3..6} 10 )
+
+inherit autotools 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 libressl memcached pam ssl static-libs"
+
+RDEPEND="
+	${POSTGRES_DEP}
+	net-libs/libnsl:0=
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	!!dev-db/pgpool
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	postgres_new_user pgpool
+
+	postgres-multi_pkg_setup
+}
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}/pgpool-configure-memcached.patch" \
+		"${FILESDIR}/pgpool-configure-pam.patch" \
+		"${FILESDIR}/pgpool-configure-pthread.patch" \
+		"${FILESDIR}/pgpool_run_paths-3.6.5.patch"
+
+	eautoreconf
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	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_enable static-libs static) \
+		$(use_with memcached) \
+		$(use_with pam) \
+		$(use_with ssl openssl)
+}
+
+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/pgpool2/pgpool2-4.0.3.ebuild b/dev-db/pgpool2/pgpool2-4.0.3.ebuild
new file mode 100644
index 000000000000..6bfa9756868e
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-4.0.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{3..6} {10..11} )
+
+inherit autotools 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 libressl memcached pam ssl static-libs"
+
+RDEPEND="
+	${POSTGRES_DEP}
+	net-libs/libnsl:0=
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	!!dev-db/pgpool
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	postgres_new_user pgpool
+
+	postgres-multi_pkg_setup
+}
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}/pgpool-configure-memcached.patch" \
+		"${FILESDIR}/pgpool-configure-pam.patch" \
+		"${FILESDIR}/pgpool-configure-pthread.patch" \
+		"${FILESDIR}/pgpool_run_paths-3.6.5.patch"
+
+	eautoreconf
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	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_enable static-libs static) \
+		$(use_with memcached) \
+		$(use_with pam) \
+		$(use_with ssl openssl)
+}
+
+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/pgtap/Manifest b/dev-db/pgtap/Manifest
index f248503bdda9..db327672af62 100644
--- a/dev-db/pgtap/Manifest
+++ b/dev-db/pgtap/Manifest
@@ -1,5 +1,3 @@
-DIST pgtap-0.98.0.zip 270583 BLAKE2B 25d409f5fc63bc7059e8a4ffd3cb460885648f8569cd10ca05d4c5fbe09af323ecc719d663f81389d45f4a4910ca77beef968e264a0d3f4fabf63fa30b8b98ac SHA512 478841aa9cf378120713b90f33dc16d40fdd030ee1856edd4bfa288a7803cabad09661cf5219925335d9220e12b6202a1fcd8cc0fc55d1974d1e98dc0f6ddac0
 DIST pgtap-0.99.0.zip 275915 BLAKE2B 33499dacc0019ecbe85ff3dc4fcc243b6102e0b7e7018d70b17cda44b8d22d8260229ab732db9900296232e0801070722bf97a752734ea7d389dc8ae57198b6f SHA512 c1b39bf2c041d759006d692229a67af1520b6a3d23fdac43f0781cac9ce69e7714fc854d1e45f1cb3ee188a20dccfb7904bc4dd1513699189fae70f425c13b5f
-EBUILD pgtap-0.98.0.ebuild 488 BLAKE2B 4c9e215882a272b5cfd2c58c75cc3e589cabf79f1653d1eaf259fb198316dd3fb98b0d7792e742af88e9931039c29a5c459205c9624d15f8cb1e212bb39b46a7 SHA512 ccb8d89695c5ac7d4eaf8cd281bb4f29fdd85e490e7d6aac4a78b62c09c4d1a6f0601f728ed52a83e0cac543e1f862836872ea9717967190f06f169e31353e9b
 EBUILD pgtap-0.99.0.ebuild 589 BLAKE2B 2f277a6594abeae0c71f90d7156379f375ff472292ade635116f7ca7f1666f692b99786905222cac67fd3589357d628db733fd3fc76cd1b088d6df33cbd6a697 SHA512 ce01a7b0fd4c431c954ba8f610b0a88236a840f4fc27fdcf7f5e13919d33914163078380fad5bc1be4c83a36276e1383e63adc0669e35b7d1598eb55748e264a
 MISC metadata.xml 628 BLAKE2B 8a671273bb0de6f11d5ea56a3bf38e9eee05c0a70ff8cefe183f0eb798afbead29e96d5a45f764e2afc437cc97d91590e648c6716a8dd8fa7a6cc9f072332e0c SHA512 1c06c14ea5af9248950e6c10ab877b0725c4885082211db94b8a195fdf0dd115dc584a325655b7155895ec4382008e03511aa238d43179310fbe3dc835f5270a
diff --git a/dev-db/pgtap/pgtap-0.98.0.ebuild b/dev-db/pgtap/pgtap-0.98.0.ebuild
deleted file mode 100644
index 132d08707734..000000000000
--- a/dev-db/pgtap/pgtap-0.98.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{3..6} 10 )
-
-inherit postgres-multi
-
-DESCRIPTION="Unit testing for PostgreSQL"
-HOMEPAGE="https://pgtap.org/"
-SRC_URI="https://api.pgxn.org/dist/${PN}/${PV}/${P}.zip"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="${POSTGRES_DEP}
-		app-arch/unzip
-		dev-perl/TAP-Parser-SourceHandler-pgTAP
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index fe07e76768a8..876363331d27 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -22,9 +22,9 @@ DIST postgresql-9.5.16.tar.bz2 17506874 BLAKE2B ce5c804315ce5d7ac95af2455322801f
 DIST postgresql-9.6.11.tar.bz2 20009048 BLAKE2B aa3e5b1e63c983226ea71737982e62eaff655af7e0f55f20ec886f5d7406b1e30e2fe5378b0dd1ef59e777f862ccc2386121653853d4c186a1b4853a9bbb1591 SHA512 a4314f92d1a661af4076d8c120533ecae76d91461043b8a6ad22dd6e5b562e0bf019bc7f3157a26d9666ba5866e254613ae5b690310168b029795dc088f8c060
 DIST postgresql-9.6.12.tar.bz2 18759442 BLAKE2B 067b307318f65616651ee4502f420a84df26e906350f07ce5ab4a769608075f0d017b6d84b0ce5045662ab379e236b66cf751f7950d026f011d0915efcdfab3e SHA512 3a7a96caf682461f1f9bffdbe2b72b1ce00cc6680145e00c139e4af8b9dc8b8679fda1626de65921d6e187fa9290efc930584b98f1fd2aba1ba3d790a741a415
 EBUILD postgresql-10.6.ebuild 13811 BLAKE2B d182148b6aa53049dc6387b9c18a98248ec6b2a66811c877c05b6c2e08bb3e10669b288fa96d4e39f6b29449cf86424176f3983df8146a4b230ee0e0d59bcf60 SHA512 043bd74949a04514b05058dc699e5876babd6b780c67760fa84a9a73d95c2c209d03c2de0b110083f7779d51815f0f093140ad052fc7ab7cf65a722858c2618f
-EBUILD postgresql-10.7.ebuild 13821 BLAKE2B 3ba0ab38b87235a273fd6d0b31d68accc7ac999b397b15bf70bed1220397e31f007230b49ff862784437eeba480eeb560fdab90a3b81ffd0954d0fbec67ff98b SHA512 b69de5991dcf54114ee6628d8fe9cff8706a9774053ff909945c820929079dcc3aeba0acbd9fe290e07d9a87647611307614add6848fe1bd1ae8777e5004e6fb
-EBUILD postgresql-11.1.ebuild 13833 BLAKE2B c05814f541269f5c38852063e02c37360de5a0903fd5deca35511606e786dd21b73c975e01f569b39988c765d5509e0287d8f797f5d1def322f4ab8830dac51f SHA512 fd55e3fe9de7ac169af0a3f3783038462f3760caaafbfd918e4c552a875c5b3948cfc1d14b157fad69baebd42bdb2b5261ed89a36fcccf2774faa212897152e2
-EBUILD postgresql-11.2.ebuild 13842 BLAKE2B da4259f4cf98bcc6e151891ca20278a665db766634d252731a155324de62ca99d11626ec9324d5a8d6eac216fe034ad89585213fd40083c808609e48b14691be SHA512 9fb379b9250298e73f7231da947ae92fa4c6f2ca76e577357779b8a49390d531facc382cb83f793a89e1f6f0f7bfc07747612c06ff33816f8d69e3eec2e73f2b
+EBUILD postgresql-10.7.ebuild 13820 BLAKE2B bf402c47f852ddbb73682f0e27082f310875ae0247fe6e4e0308ee9bc56fa3ef166eb6ea53b681380f77c0fb395cd460640008dc09d1816680522ab1d90d5b46 SHA512 4fcc182bb8f33b61c1b524a2b5c4cbcbd4c72220a68e3f762107223d7db85877b283882ac9bdd95b219f485647afe1c5037628c365ab7e786ca189401c7eafb8
+EBUILD postgresql-11.1.ebuild 13832 BLAKE2B c6e234f943b505d7f9343a158be2bc9f719c24a241e5533ad6687b955c5391198bda2d019097cca552f890fb459142e7d01c783dfe8c28901b3b5ff1c08f31a4 SHA512 7bb523a4766a75d9b6a82a4bc2fd062f4c601b8cfa108f51142c60e73fde828ce76ec20a95ab6a8ac20e8faec54204d4482bec18f5b109de5ac468677a483c57
+EBUILD postgresql-11.2.ebuild 13841 BLAKE2B 4f60bcd110310bb6b7c7e4391c0c782a7050c967dc6634b79350151cf5ae809228812c396f7db27101c73cd2eb4617148ed26b510a60dbb3adc5edb02f5addbf SHA512 179c0f8cadad634d43aa7b7c54bf202302f8db5d06d616c582ada568684a8163c6bf98523213175bfcf15f3d066ad12e7607f37327e8c9b5c166feee64ebe173
 EBUILD postgresql-9.3.25.ebuild 13560 BLAKE2B dad258dd261b0db61ae0dab4c94824abf347d2b7c155e49811801b81ac2b3449b377614e940c91d70240a9cb3ee34013494f6dcfce8fe24b1301b7a47160dcec SHA512 43ecdccecd395977956b26c6376f42eb79e7389c87fcca17dd27effe4cc847d5548df8b368572af9f70b80a77f62ec4a7e17c3bb78105ce854faf5343e9e38d6
 EBUILD postgresql-9.4.20.ebuild 14370 BLAKE2B a7f2e2bfa0b5ee85c11d525b6f29c3194e040495bf49ebfdbcae4dae5ea915325d98abc672b4727a985e056b0f0e9e9c85eb079164f93e94c55df0be68a04326 SHA512 5745139858d20d62c90a843060f5a57378c7590b1b26cf8a41f84603555973f581d06120b237a0fecf1a9d239a7af885761c75483addb955983528da44dd0d47
 EBUILD postgresql-9.4.21.ebuild 14379 BLAKE2B 31b1a7703f0e21acc50df8fb675843dbe511cbc0f635e36f1eaf72b80bbfb6eea815c90c5d8836284b793392bbe1ad654e98736e9135729abd1735cfa51ec12f SHA512 9d4ebf78f3aa24a603dcae5d6726d556fe89038193010e5018db84678e600185e54c8879f497d90579ee2e19ba074f91876aa004f5395a7f4a4e44ded1ec34c0
diff --git a/dev-db/postgresql/postgresql-10.7.ebuild b/dev-db/postgresql/postgresql-10.7.ebuild
index 905d15e31053..d7f89ecea034 100644
--- a/dev-db/postgresql/postgresql-10.7.ebuild
+++ b/dev-db/postgresql/postgresql-10.7.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT=$(get_major_version)
 
diff --git a/dev-db/postgresql/postgresql-11.1.ebuild b/dev-db/postgresql/postgresql-11.1.ebuild
index 09481404e409..b4d779a4470f 100644
--- a/dev-db/postgresql/postgresql-11.1.ebuild
+++ b/dev-db/postgresql/postgresql-11.1.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-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"
 
 SLOT=$(get_major_version)
 
diff --git a/dev-db/postgresql/postgresql-11.2.ebuild b/dev-db/postgresql/postgresql-11.2.ebuild
index f19bc98f9e9e..ef7584eee93a 100644
--- a/dev-db/postgresql/postgresql-11.2.ebuild
+++ b/dev-db/postgresql/postgresql-11.2.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-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"
 
 SLOT=$(get_major_version)
 
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index af7293f067e2..31f305a14395 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1,5 +1,7 @@
 AUX qt5-sqlcipher-install-path.patch 542 BLAKE2B 099aec88aa739615c444478dcf946a11782d34bcda0ea9905d88a766745a063b97f1198d0e03bb7222f338293178dad2c00d430eab7754475766ebfdf95a785d SHA512 a46bb590fe8f56f61d404b4c5deba362f70ecf3044fd746f5de3a897cf884aada1bd2345e768774e674ee8e91bd162775b6f2131e4f822cc91fae22c4d71bb13
 DIST qt5-sqlcipher-1.0.1-qt-5.11.1.tar.xz 8528 BLAKE2B 981565882399943c6ab47b09968c27fa9f53cade5baee66259e416d749905a6bf7a9c1c27ed8165d7b6fc0a72fee85d51bb9ac0c3819b9dab5e89e741e880b13 SHA512 9d64b12990cd81ad1e81b941ff970388c8e7f34fd446ecd4ce2ed58e3f8e50acc06fe88fc0f6693e48b19422e70372516bc36b5c71908e18096e092f261c9eff
 DIST qt5-sqlcipher-1.0.1.tar.gz 56994 BLAKE2B 9de780126bc7ba99e23b529e6e45d629e9b20d52dfb4d91fcb7c8a6b77b8a8bc17bedaa40a288c4af32e40cc563631e164428be0f8c5a81ffa6143acc58b2e55 SHA512 ba83ba1d98b7764c7ad4bf776b1f39baff44ff6189e51cbc2131150e5a4c2962a21134d21d5ed41f171629395c721fce11ee911d080d304566033d53c552642a
+DIST qt5-sqlcipher-1.0.1_p20181221.tar.xz 27668 BLAKE2B e9f7a380be72997a1364ff985271b421230ea75b80200fc1cb4d58946abcb5a98504e458811e9b6641a84a4f8bc7145fd9d6746a147f98bc886e8c2639698646 SHA512 408f71b7fdb26aea3f0419ce0fb295a438c247aa1649756a20b6743571dd9d45cb17d46f5b261a1fd611df4fe39a9dcd6cbd36180bf3742b0abba8b02a9a2d9a
 EBUILD qt5-sqlcipher-1.0.1-r3.ebuild 1281 BLAKE2B e3b45a2ef37f67bdc021c6c8b5108af6cc6def1dbab04c8c4a5b19991751cf2b16cfb12ec444a413b9e5b5f1c2915170d5cde70c2f7ee3668261ac04bdf7ef3e SHA512 3a28c4a2c67c2b5ce77d92843b549c26df8d222c540c369217b09947ccdbf1b472a8a0869eb86a831b3fa8ac9be9584cf1ba48d94766ea8fb725baf00beeaf0d
+EBUILD qt5-sqlcipher-1.0.1_p20181221.ebuild 1226 BLAKE2B ae61660cdc3fb6ec76999904048130b4069093c6ac3ec44651a069c1820356efccbffcd668e46916cae1169897866e5c6176b3e4708fe0740c9b30e2a60fe1e2 SHA512 b9610f70d2ec403741e388be772f0a343165f380314d492dc8cb9f20d46801a88f93269be947f9780563b4a1d3b2a4fe8d279fd6f534ad6e6b5bd8b032a17135
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20181221.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20181221.ebuild
new file mode 100644
index 000000000000..744c62f7f414
--- /dev/null
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20181221.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Qt SQL driver plugin for SQLCipher"
+HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="LGPL-2.1" # version 2.1 only
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-db/sqlcipher-3.4.1
+	>=dev-qt/qtcore-5.7.1:5=
+	>=dev-qt/qtsql-5.7.1:5=[sqlite]	<dev-qt/qtsql-5.13:5=[sqlite]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+DOCS=(README.md)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-install-path.patch
+	sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die
+
+	local v=$(best_version dev-qt/qtsql:5)
+	v=$(ver_cut 1-3 ${v#*/qtsql-})
+	[[ -n ${v} ]] || die "could not determine qtsql version"
+	if ! [[ -d qt-file-cache/${v} ]]; then
+		local vc
+		case $(ver_cut 1-2 ${v}) in
+			5.7) vc=5.7.1 ;;
+			5.9) vc=5.9.6 ;;
+			5.11) vc=5.11.3 ;;
+			5.12) vc=5.12.0 ;;
+			*) die "qtsql-${v} not supported" ;;
+		esac
+		elog "qtsql-${v} not in cache, using ${vc} instead"
+		cp -R qt-file-cache/${vc} qt-file-cache/${v} || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	./qsqlcipher-test || die
+}
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 6ea50dc11217..067bd698ab3b 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -16,11 +16,13 @@ AUX redis.tmpfiles 61 BLAKE2B 1c3bf8aa105940c408163f61c63ed16b86de7a979cb5143d15
 DIST redis-4.0.10.tar.gz 1738465 BLAKE2B 572cbb3d2d5d7209f81ebd53ee68f40b404d0e4623bd1864845bf1f47135d4e097a6974d346ffd845d848c39ace6d3fb9f1a347e0c9d16d06d22aed7a8b3ae7b SHA512 0978dabaf637e61889d492fd3629acd58ca8fb0c0088cdd7036ffd1a7ed3f018c107039d4c96bd61d0b7d35757df2366d051f57d77ffb5642aca0e5651b30603
 DIST redis-4.0.11.tar.gz 1739656 BLAKE2B d94f380ad1600e58942cc5b27b512984396cdbb06ea6e947c7d7ce5b8ecdb8a2a56c6356af2caa82a96887a610716c9575b78eb2f46da89efb940febc1c30f22 SHA512 f0054af9ca2143731a397b2b21285387707b7f40d9326ba15225feb1a2ff470fab5194308342f63bbe1081f84c7e9ef19543c5a8e3eae49e17bfc515c64201f0
 DIST redis-4.0.12.tar.gz 1740544 BLAKE2B 620dba8b81fc76a46880c3a4a7ee9d9835e7b19e6d321598a717892f6f03fa805db79847442744a2af8f77ae403b6e1df02299da9a0835f6092a74e3804dde48 SHA512 d19020f7ebed9ad5d04c6e1cb7e2a49dd1e226fe17d86e860df11bcb798c61c09f6f9fc3572a7ee32232ac34ec5eb1d6189f8139b5991bd87297c5243c3b54d2
+DIST redis-4.0.13.tar.gz 1740715 BLAKE2B 73d129906b2a2ceb91d1144f8c8aeb970221f7ef4d1d0f0bac0aada6976ba6b2b4fdbe7cca29e350e8258986ee2607526896fcfb90536596a5fd556c6186faa6 SHA512 c220420bf6cb2781a3fb9e002188b1663743c89c262fd5aff02e585c969b56e7691fe1073e7427e6d38cf7b5a096f86b83af84cfa6b01a5bdf56048789e0bb70
 DIST redis-4.0.2.tar.gz 1713990 BLAKE2B 307ab76b336f7520e14a23a1577c46e1b63cc5a5a5b6afb725cb87934fbcb62107085671fd1072d1142ce8e92f069e6b6064c9f4468335bc6997897c8f494471 SHA512 1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4
 DIST redis-5.0.3.tar.gz 1959445 BLAKE2B d1c3247d77aa3b1076d0e1a0dcce74dcfb14a0ad3776603ef8154d7868f9f3efcf2138cb08581eee1974e9d76658d07456d6e9795391321b1f1f8bca7f9d40f5 SHA512 5915b14502438bf7c3f56e38640dda54b095bd87501aefa6e386c9cef48e8d1e625e980643d128d91b8cab26dd51d5d99ca66fa638dc04e5ba315fe43f11f58b
 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.2-r1.ebuild 3807 BLAKE2B 7dbd27ad7593b53f1f7184321ba33f140072ef946859b33cf8dacf7eb98c9d7398c512ce403132bf3b9fece12e73cc0e4dd5cca1dbc220d50dea105ea87ef774 SHA512 d7744c01cbf4b6f1fec17ce7733a31f4deb3e925afbafb3a9aaa360d9598aff78b44c3bcadc54e82c809ff6ba0211e475d32f96ec4244f6081e3f5cfde1b1daa
 EBUILD redis-5.0.3.ebuild 4011 BLAKE2B b99054eb7a1cf93cfd293b4884098eb12e41564f2505ba49d179c824a7e78a236f03f31198d3073ea882c6df327f2d5668f4e043632da55b5a25ef2c865000d6 SHA512 cf61adaa5d6e003abdd5e507f9d540699fe5d3ef593a1cd63507de9e8475a44265ad2385fb8f794e11f3f0908509b8552748f5280810a5ae2bc2d84d41110a16
 MISC metadata.xml 440 BLAKE2B b853160a8483ff59c413a37b8fd1703283cc80c5ea9de092654dd1809bdc6ed3dc98fb6285a3f33bfea136bdf3db4065b3e22c34f7458e9e83aa63e137a13eb3 SHA512 7c125eed761e5f4c868a3fd5539d5182b9c4da6ddeb0cb82a46dc6d0cc682410eb100168ddb4b5fb214d6092395394cefef5bc8fd3dcce818542d30748f9bd17
diff --git a/dev-db/redis/redis-4.0.13.ebuild b/dev-db/redis/redis-4.0.13.ebuild
new file mode 100644
index 000000000000..a1d588da3ae0
--- /dev/null
+++ b/dev-db/redis/redis-4.0.13.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic systemd toolchain-funcs user
+
+DESCRIPTION="A persistent caching system, key-value and data structures database"
+HOMEPAGE="https://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"
+IUSE="+jemalloc tcmalloc luajit test"
+SLOT="0"
+
+# Redis does NOT build with Lua 5.2 or newer at this time.
+# This should link correctly with both unslotted & slotted Lua, without
+# changes.
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) )
+	tcmalloc? ( dev-util/google-perftools )
+	jemalloc? ( >=dev-libs/jemalloc-3.2 )"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/autoconf-2.63
+	test? ( dev-lang/tcl:0= )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )"
+
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+pkg_setup() {
+	enewgroup redis 75
+	enewuser redis 75 -1 /var/lib/redis redis
+}
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}"/${PN}-3.2.3-config.patch \
+		"${FILESDIR}"/${PN}-4.0.1-shared.patch \
+		"${FILESDIR}"/${PN}-4.0.1-sharedlua.patch \
+		"${FILESDIR}"/${PN}-sentinel-4.0.6-config.patch
+	eapply_user
+
+	# Copy lua modules into build dir
+	cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
+	cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
+	# Append cflag for lua_cjson
+	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+	append-cflags "-DENABLE_CJSON_GLOBAL"
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
+
+	# Use the correct pkgconfig name for Lua
+	has_version 'dev-lang/lua:5.1' \
+		&& LUAPKGCONFIG=lua5.1 \
+		|| LUAPKGCONFIG=lua
+	sed -i	\
+		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
+		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with luajit)
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	tc-export CC AR RANLIB
+
+	local myconf=""
+
+	if use tcmalloc; then
+		myconf="${myconf} USE_TCMALLOC=yes"
+	elif use jemalloc; then
+		myconf="${myconf} JEMALLOC_SHARED=yes"
+	else
+		myconf="${myconf} MALLOC=yes"
+	fi
+
+	emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
+}
+
+src_install() {
+	insinto /etc/
+	doins redis.conf sentinel.conf
+	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
+	fperms 0644 /etc/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd-r1" redis
+	newinitd "${FILESDIR}/redis.initd-5" redis
+
+	systemd_newunit "${FILESDIR}/redis.service-2" redis.service
+	systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
+
+	newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
diff --git a/dev-db/rqlite/Manifest b/dev-db/rqlite/Manifest
index 49158ad55e2d..48042c32f524 100644
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@@ -1,30 +1,17 @@
 DIST github.com-Bowery-prompt-8a1d5376df1cbec3468f2138fecc44dd8b48e342.tar.gz 11452 BLAKE2B 1ac543b49a5133e2a9c0d2142cbd8044aa7c37ddd8282e95f747c9e71e1d79c1966c0295b8bee9a1d3b69bbbc117d0d96729c3fa6c65636101fe593513850c4a SHA512 3d39623c0843ef17f06024a756b4ffaaf564c595e8b24f9a88aa8f05183d17dc8e1a5f008b860fbcaa8ca7c101b5867da972de48a35b4b58ac02a024a4197b9a
-DIST github.com-Bowery-prompt-94b504f42fdd503acc3b3c79ec2b517d90e0de8a.tar.gz 11343 BLAKE2B cc2666f68db87466e66f30840b173ff7fc8cb3b55b7fb0ee01fb0c0e1f90cbe582ab04e40b2484d115e765d2123da5c01b2a83800dc568bc8567f0f3e1e8f7f9 SHA512 51013116829fd7287535effed3f808351dc1a664429fb4a8c87a17e637b77654013a65022c5254ab2df3d8a1f2421dd98ef4e03263e84ee7a79d8f7070a471d0
-DIST github.com-armon-go-metrics-783273d703149aaeb9897cf58613d5af48861c25.tar.gz 22373 BLAKE2B dd4daca721ac0643f6ba4300966217ec57cb5d21c495029fb356badacfb4032a275807d7498a8fd1bd97315e70ee0c2d3501ae7e3bb072feea94787c5ca8f608 SHA512 a1a245cd9ccc07af7fc30bff358819389a18d1be21179626a2e79f0ccb82d71f7a4ad009d8919bbdfb547176346716c3f0b1f764f0e75171381a56aeb066685e
 DIST github.com-armon-go-metrics-f0300d1749da6fa982027e449ec0c7a145510c3c.tar.gz 23841 BLAKE2B 56cf9fe2811703bbc8603e06a1ac94ef6a1f430924bb63f91b6359c441ef63e8734d511c39392c1025f54c2bed0db81406d2390cd324cacb4a7bededa17c9280 SHA512 6388b3b4e20cf0511bbe3c8d8e58493aa8d80d64f6fa74db26e06df89ebea25cdafb476b65d46a12fc920ecf6ffaa1ecf991adec1033572c5015e4e64ef8be61
 DIST github.com-boltdb-bolt-fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5.tar.gz 83950 BLAKE2B 04b9aa5632ccf231f319e8d25309f024a2a60c84e8eafac8b4bc16152fb7581d1a563903034e47668d7e9c61fdd6828294342c5b84d843e70367e578864ba4dd SHA512 5effccc7dadb214ef5ce53092db48c04ae25a388962c58732190c34f4537b579ef645ae579df5d0de30645574ff753486a6f743bf4fd58ec1d2aff76ba537694
 DIST github.com-golang-crypto-64072686203f69e3fd20143576b27200f18ab0fa.tar.gz 1645102 BLAKE2B fc2e19db0b9abd399e501b357407585f26104125c37947e97905b33227cdbd66fe213b31f08a6de97fbca2fb65e1e5e52a3bec14711ce15da6c141dc93f1f429 SHA512 7dec96e1c7928cfa812731462774f208c5056b859f41b234d4d06f3caee665782abee612896417e8c807926384bba18466853135f875dd7da4a655fcaaf09e0d
-DIST github.com-golang-crypto-a3beeb748656e13e54256fd2cde19e058f41f60f.tar.gz 1611181 BLAKE2B 2d2d8d25d30e1e517b2e4e79bc5e6b2121d5420739cf7eaf1838b2cde7bf01e122d272dc125f739fc87cb0a898175ec57a783187f6500aff19b4886e42d2b746 SHA512 a0255fdb06727d660e7c3f6f7c23cb3a14b6341c2f1745f78fb967864ecac980d9ec6619b22da4309078ab95643955e1f896ef645c40247fb931dd21da4c410d
 DIST github.com-golang-sys-054c452bb702e465e95ce8e7a3d9a6cf0cd1188d.tar.gz 1243068 BLAKE2B 51264c0d11349b3a07e2121bdf6b183f5b68e3e5a6d05b2293ab6dbe50eb00595f3dd485d2ac6ce609e86d58caac4013cd0f7fc6cb69dd2f2bce92e954c7d3a6 SHA512 e8afff9afee064b160c0f627d6dbedf0151543a9fced6e023ded7f646c4e15e63da9c111d23d25f30861ca72a21a372767e257607fe85eef4fa5f3efd6c1dcb5
-DIST github.com-golang-sys-c11f84a56e43e20a78cee75a7c034031ecf57d1f.tar.gz 971425 BLAKE2B 2b052ad1211863234b767d77b3757b93a755d5f533e677247b2c63bb16a9c1f9caa85d3c507f86f30c568bf2bc17f6bd7766a389364d3c684c3c0f508efa4047 SHA512 40937a901f32b6e1ddf0350a804bdc93b2a17c1c2bb42c09f6522c87c465b8ac4dd3e68057ef7a99b21894ee4b31583a51b49c484cdcd77ff4e195e0fcc8bcc5
 DIST github.com-hashicorp-go-immutable-radix-27df80928bb34bb1b0d6d0e01b9e679902e7a6b5.tar.gz 19298 BLAKE2B 3d5f810ab1be777994b1a43e3334509f8558390a68056d299942e6cb8fb8f5957d250567b52925f137c9a17730bff8a438219e4ae9e3ab4fd331fc9dea6a5f58 SHA512 481b97db22ec3196c9e3b115ae1891884ffa15e3f83282a5deb32f6ea74d73a02f8046417ac9fea1fc0e23540445a0db303dec247448ff2eef0defe3225e33e1
-DIST github.com-hashicorp-go-immutable-radix-7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz 18972 BLAKE2B b66c34ca0286353bd19154c735a8a2cc3d6469c68cb4a0a58a7709c29d472d37506366e56c2a6de2e1a6685bb312aa79c63100704668063c4297e9e70df980ad SHA512 3b237511fca5c8bf17f718cc8e71479e839be8db3b71a1abb418bd25fe0ed05d80e954a231093cc7f13bacbcf2a98b2d8d82b2586cbc3a7d6ab5aca75c817a1f
 DIST github.com-hashicorp-go-msgpack-2e9170ac1d8fb32e1e645d8364e4d8f21b530bb3.tar.gz 49690 BLAKE2B 4d37805b48b3482c2c0e4a340e5da37d7dea9e507279e9c7de7cd929588cc1a49e375089bd2c649767b89b2a3dec514935cd6eb8ea8700732dd8ef6704ef784e SHA512 6b966fbbab13c866a5c1a2fb679e3554a1c349c589b75c436b19da2c42326d4876e7b31e06c81a2b7e5157d39b7d61d0554283996e7ec80d4855bd9f3b88efee
-DIST github.com-hashicorp-go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz 49488 BLAKE2B 03d54419cc6fde9b6d51935d49ba2828471a06615e556355352837cc962608144afc505fa31375c0a1907c68752a633bd13618ae849141f853c0d83f4824ae38 SHA512 7e60a122cca007bf5455d6e15f77c24eaa5739deedc9e0c158282249e84698f873628bffa9eb7d23c1c59bda7632b1968ca770c8e1796e2d50750ac86e80fcb2
-DIST github.com-hashicorp-golang-lru-0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz 12907 BLAKE2B 8c9abac355ad96db8511807b8ad01f62a0748801328e004d90776f3a3093d7ad08ec07f4fcf48d801f3bd233df3e13dc179fc74736bce0b8a201407cdd7abd68 SHA512 ad1b89546de54da93c81648b8bce3cf6dbb0b4595df670ea569f2f5fc9e297c6465f280e6ef443cafdb09430767fad70d4020069b512b496d6157f72499a697c
 DIST github.com-hashicorp-golang-lru-20f1fb78b0740ba8c3cb143a61e86ba5c8669768.tar.gz 12932 BLAKE2B bc1b79ee6e403aac18a857bd6bd1083258a33f492821d141e66e7e851593c8ffa466e86edaee0e27a9ca04402b079c7fd53430c3e250924503e64407c299835a SHA512 bb057b39581e832316d52be23312d482f242a5f569feccd8a1c0b7365bda07ea6818b5c643da4610a37030e572bf395b2c62c30cceb12f94b928567e0b8db989
-DIST github.com-labstack-gommon-0a22a0df01a7c84944c607e8a6e91cfe421ea7ed.tar.gz 10631 BLAKE2B 6ea84f719457d91405bf640c03f4081b4e117f75cad299fd7bad5a6d13baeca56e243c38f50f5db4eefa135d5eb49a518038057e7e7b5c05908c5d2938e72d95 SHA512 d3bfe9329ae61ca8bfb842d4af95151eadbe8c3c13c53cb12c0c081dc0fb6fa6907ac11072bb58f6576d497f8cdd4fe026f5e473927729430e0320dac1c56956
 DIST github.com-labstack-gommon-34167a09256a4fcb5d26dd88d02b7b353d86838a.tar.gz 10067 BLAKE2B 250322a59273e753485d9584cb98f7e1c80e6997ca01ec184626d8825e586a2d6af74bd4a12ee9c820f10815d7abf13d5f326b219be01e5d8c7af2c9edbdd1ec SHA512 22b69c364ba83cac9b5753673541966a6414ae86f8add69083288b542bf4be99dbfd2a4e84daa36150efd2d23534c7edaa44f6875865d7e2118af75e53fcc51b
 DIST github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz 8208 BLAKE2B 4cd558c21bd893f17280c05550015f2f8148344d50dbd958f7cc7fa68d06223d0e732ace81c445f0091357d6d0a1564efd7d246af5cf432de0d8728f5cb1d250 SHA512 fc274e5699b637e953b31e5014b759f0367d925c289f9eabd7538eaf916ec8a7613e3eaf6d8f9294869f54e943448cca21130daccf1717525aa123761026902e
 DIST github.com-mattn-go-isatty-3fb116b820352b7f0c281308a4d6250c22d94e27.tar.gz 3370 BLAKE2B 2ce316c2bdc2a16f58c49aae391b68d03d1c34da733ce17c030116e121c5e872b9b0e1460a927116bd55769762dd9f8361f38b141c793444da21b37941cdeb28 SHA512 85c5b9af5a5d37d3cb0f8cbcc3efa1ecc20eaf12c77ac64a77f9a9c55611f96d6dfcc88389ae1f127d7a4bee0bf3dd9ab31e0a26d5fd26631a13bfb76db3035a
-DIST github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz 3383 BLAKE2B 2034048312c4abc88a813d8ad83013f57e9a23477ecd847e92c3cf30e909e209f9a65acacf41d80b3569770c1400e338115c42fd48d358b66f68ccde69a9008d SHA512 1714a9e9ac7ad2ff30825328723b4c9a5c5f7544e876c6fe79b84c72ba1dd9bfcd6ded2308f6fcae8f1c893d22b84d6c72dfd30742edaa2a5b0d8e88eee27421
 DIST github.com-mattn-go-sqlite3-3fa1c550ffa69b74dc4bfd5109b4e218f32c87cf.tar.gz 2245850 BLAKE2B 36ffee019db557a78afeade9dda3d5e588e0fc95a823ae3ecc9adc427bed07140bfba299b14c4ec7f6708013133c21ae20544ad2c4ea1e0938342f62a766eeac SHA512 c22e68b97ea9ffe888e93f2b93ce4a372a25b8996976a5fb6142513c63cc40922ddf205fb037d064f1cd4ce1db0dc01670c6a3c352e4d61d769ce8a461cc797f
-DIST github.com-mattn-go-sqlite3-b8b158db6fdb72096ff3510373df0f61ea8de773.tar.gz 2122948 BLAKE2B 4f1535c0eb1b834bd4c0a97618737baed80ecb007cd69089279cb28ae87e3cf4323af83b52e1436c0f7a41eaeebdba671d5a3f00ce9729347856ea398d0972e5 SHA512 6cd20f78a5cd776fdf613c4d894257fe71424e7bb77d293873585e6a391c526305f4747ede509a3c99475173a056f31450e025bd26d2bcc72fdf3fec1c1b250e
 DIST github.com-mkideal-cli-a48c2cee5b5ee91096961d344681edc2083b9422.tar.gz 47037 BLAKE2B dce860977642d153df54c26ccff9ad98f8084bdeacd4a32f5be9599fea17cbccc093dc9995710aa09aa1eaa582eb8cca4c7413f9a8f720a762dc7c31605121b4 SHA512 34fa312d83ad67a2f8419ed23c075cd3075623561273457f38e66ca0d514c065663976306af52236dfe34ad215b90ef7e3d80f482463c290d91dd9103d122e34
-DIST github.com-mkideal-cli-a9c1104566927924fdb041d198f05617492913f9.tar.gz 43950 BLAKE2B 54dccb6118338884784dc36f6c0b6e2ae249b322691e57ed94c04a5a2f35c1362ed240a9b4385abbef9a40a6d6bc6fde573259edef7772172d7ce927e6fcfe51 SHA512 ced5936b659673383295da6a55c21767ed21ba91ca6aed0fd27e8cd317026bf1bcb29da9e7d714f93fe783aa54a9e58d435c56aa84e8ff06c59a333dc9150499
 DIST github.com-mkideal-pkg-3e188c9e7ecc83d0fe7040a9161ce3c67885470d.tar.gz 69219 BLAKE2B 6df0a553da3a225352c4e712c2fb7f12b73850e0e1c9d0aaf9eb0dc917c36a026a10db1b8b23d45070567d209a6298fef84e794347fdd1951d0ec421fa1c72d4 SHA512 1c6b5cd345da17f8c2691a4f132bcb8ce1e794db54ecdcf2bf20392bb2f3195db6c1579ffd220bb21f121ccbec0c8c9ea4160a4a6c38734c68d1e163622ec1cd
-DIST rqlite-4.3.0.tar.gz 363060 BLAKE2B 7384ab6311eb3e042aa156a3879090d0c7efa1a29aba463d844adc693630f256bc91ac52ba765474e6bfa192ca06538c9d22a3f1503b76dcdcc83dca4d1d6fb2 SHA512 c1dc8f24ea1295d7495e59a53308480c8c21203fd6cbd9aca9f5c88530e4d0418b9b6d8d535f0e7ec3fec633d94b2e6a16ba063b3d342688e935ae2340e31cab
 DIST rqlite-4.4.0.tar.gz 363210 BLAKE2B 50c25d09a6dadbee5245ae518668e53fa0abdd61bc0bbe000e1e235d03547c1dde2417c96e825c6fbe96e179d68f84061cdc98e5559ee773dc545432b3d95c05 SHA512 c7801c60627b9097677decdd55e8d91b9dce470416a57c7e217cdd255d935d3d9bb1333e784fb90329da7a304f28cc71d782a944162cb98d5dcf52cab9bb544f
-EBUILD rqlite-4.3.0.ebuild 2005 BLAKE2B 0e96efd821181471a086b09e3bbadf38f63927b92b236d77de77e1e2980a3e31dc2bd28d53091e0a039a14d27e585296078a44b611940022845b80ba7338e7a3 SHA512 e2e336ad48a7d1ea22526ce92f93a3a2ae65651bce327550132952c9c6a2e48103bb4a285aab01e5e4b6d48aa2065c6a1364595a6c4f56909dfd421af4c9ba20
-EBUILD rqlite-4.4.0.ebuild 2002 BLAKE2B 3d188599537f5e6b266a60d6a4c2262cefe7fecbd8238969f4fb268c05cd30391cc3a63d8a07648011f8b5348dfd3ac0c6744cf230f7dd4411db1c3b7352d078 SHA512 4cd414e122a6de324074cd088b9f75e7250492f47143ea6e75e1165693d543b1b575d19c75e5ebe35daa32b1f8628dade229a103c85d6fdc5ee7ec12ca35cb87
+EBUILD rqlite-4.4.0.ebuild 2044 BLAKE2B 94cd12e16fe1ad07bc6bacafaa8bb4abdba5e67d220b4f14fda5753147664dcdf3175bc229de5b025493f2786407192de578a5c177c40b1af98ecc37b2ae7359 SHA512 20f3d969930a39d5d0a293574d09ecf1eb7c07d39c20bcd68591700e1a6c60033cdb46c1024f8b2240c57700f5b24fa108d671d43cb936a2a42c31a48d600f3b
 MISC metadata.xml 304 BLAKE2B aa848abaaeaf54cb85ddb9600c6044a9ed2f3e446f3131f3725431b3a3eefa0058a8c962c708f1735dd97caee1c25a461da3f6fd622b521ad36234157580f6f4 SHA512 3e536da8ed6a50cbffad3574074029e67b25627d80050f388742e7b086ffa73e6fd93fa307cc267bc23b4eca080ddefa7845a3ac90ad3736862362f9c0e29c92
diff --git a/dev-db/rqlite/rqlite-4.3.0.ebuild b/dev-db/rqlite/rqlite-4.3.0.ebuild
deleted file mode 100644
index 52a09d755d7c..000000000000
--- a/dev-db/rqlite/rqlite-4.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/rqlite/rqlite"
-EGO_VENDOR=(
-	"github.com/Bowery/prompt 94b504f42fdd503acc3b3c79ec2b517d90e0de8a"
-	"github.com/armon/go-metrics 783273d703149aaeb9897cf58613d5af48861c25"
-	"github.com/boltdb/bolt fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5"
-	"github.com/hashicorp/go-immutable-radix 7f3cd4390caab3250a57f30efdb2a65dd7649ecf"
-	"github.com/hashicorp/go-msgpack fa3f63826f7c23912c15263591e65d54d080b458"
-	"github.com/hashicorp/golang-lru 0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
-	"github.com/labstack/gommon 0a22a0df01a7c84944c607e8a6e91cfe421ea7ed"
-	"github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade"
-	"github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"
-	"github.com/mattn/go-sqlite3 b8b158db6fdb72096ff3510373df0f61ea8de773"
-	"github.com/mkideal/cli a9c1104566927924fdb041d198f05617492913f9"
-	"github.com/mkideal/pkg 3e188c9e7ecc83d0fe7040a9161ce3c67885470d"
-	"golang.org/x/crypto a3beeb748656e13e54256fd2cde19e058f41f60f github.com/golang/crypto"
-	"golang.org/x/sys c11f84a56e43e20a78cee75a7c034031ecf57d1f 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"
-SLOT="0"
-IUSE=""
-EGIT_REPO_URI="https://${EGO_PN}.git"
-EGIT_COMMIT="77e345b97c5597c1ef86e75e690539de369b8dd3"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_compile() {
-	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_install() {
-	dobin "${WORKDIR}/${P}/bin"/${PN}{,d}
-	dodoc -r *.md DOC
-}
diff --git a/dev-db/rqlite/rqlite-4.4.0.ebuild b/dev-db/rqlite/rqlite-4.4.0.ebuild
index 08528458fc93..f77d97d23605 100644
--- a/dev-db/rqlite/rqlite-4.4.0.ebuild
+++ b/dev-db/rqlite/rqlite-4.4.0.ebuild
@@ -37,6 +37,7 @@ SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 S="${WORKDIR}/${P}/src/${EGO_PN}"
 
 src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #678966
 	GOPATH="${WORKDIR}/${P}" \
 	GOBIN="${WORKDIR}/${P}/bin" \
 		go install \
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
commit	b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree	9fd110f9fc996e8a4213eeda994a8c112491b86d /dev-db
parent	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)