gentoo resync : 02.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
commit: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree: c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /dev-db
parent: 6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)
47 files changed, 2156 insertions, 486 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 8c05d7e64354..20e25e40e390 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/cdb/Manifest b/dev-db/cdb/Manifest
index b45728960314..33f4cedfb90f 100644
--- a/dev-db/cdb/Manifest
+++ b/dev-db/cdb/Manifest
@@ -1,5 +1,5 @@
 AUX cdb-0.75-errno.diff 243 BLAKE2B e0b2433529e8ade1c4802353017948fd709f47843f339d8e1f77f9c665ece80721613d2dce8c9e67b595ee03f9b7298b04f927a26ad0bf8b5e38a10836799c81 SHA512 03c64d2ab185c16d88f51aaa12d1ca06102444c3eed9d712fcd53e6b8eaeeeacbdf525d91c7fc3eb28bf88be776de4748157d596103b9fc7776a5bde05eef4c4
 AUX cdb-0.75-stdint.diff 11423 BLAKE2B 85f0c3d1b2908c001ebdb055ebe4d7a79bf16a61d1d3ce8295e17cc9c0d5f1d7859465e3dba377a2857741ef082efb621c0cb77179bc6208b35120d390b71f53 SHA512 0308d25c6f9ee3b8fc49e75a2e69c7cdbf8cca7dbf165b3a107d5e2717051f6c68df04a962456295c56e6dde97ee0777944cf406c3eb48f4b7f39ecfaf56f877
 DIST cdb-0.75.tar.gz 54162 BLAKE2B 7b488bf330b2aac88a1cca82a6a49e24d0fd953c77935231a31bd72cc0936a37628736b5b22ea0d58aaa77cd118976ab8aa82ccc080f99e190e3f1db5d51b622 SHA512 6faeab91a77457348b58f685e81000b83fb609691317198a06284c5c62dee1e4d6138f90be1e727021f279d740169c175a21b23c96adb39a654e3f7fafdf36c0
-EBUILD cdb-0.75-r4.ebuild 1501 BLAKE2B c902dc285bd0ece506899636df6008a2a56653812c25344624f5eef7f1bff8b60d674173fdd8f5bda7723e554e841658f81639cff7aca282f035007fedcb968a SHA512 ab8e65b45cd1de6533f61e69d79cb26f84c18545e644c8d62c49d69bf99cfc945be9f1a53ae67c17f21a5e595189c722427382b92af2d33b404a3ea1a750a75d
+EBUILD cdb-0.75-r4.ebuild 1500 BLAKE2B 5fde9966aa9746487aac81b989d7fad91c348cc9628a1e9b7105ca27efff62d7e4c3bc434e418fea50dfb353745fc51be45c85c5d4b3507a7226f68febd37722 SHA512 4286df10538dee2499a072f2826ecb2b412fd9c1b2256d4cca7bfe15e2062587e3d2c1515a68a099dc04db8c7f1314cebd35d37ef333254f1e9cdee22dfe45d7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index 2c365e5f26c9..0525b98345af 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils multilib toolchain-funcs
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 
 DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
 HOMEPAGE="http://cr.yp.to/cdb.html"
diff --git a/dev-db/cockroach/Manifest b/dev-db/cockroach/Manifest
index d754aca3fc5a..761aada78767 100644
--- a/dev-db/cockroach/Manifest
+++ b/dev-db/cockroach/Manifest
@@ -10,7 +10,9 @@ DIST cockroach-v1.0.3.src.tgz 69127502 BLAKE2B 803f88e19a6128f18024748610c1af3e9
 DIST cockroach-v1.0.src.tgz 68753479 BLAKE2B 6377614e9fee896a0115909b02d8a191a7aabe8da341c98547c0ac496d2e8fcce801e35f93a8a126c9d65c1106e0217359b161825a11597da1db113ca6a51216 SHA512 d74ad9546908535f9a7ad4172a04a5f86f5ed22698bbb005aec7478a52632e0497a966b859fd68b40894eb7ee68bfa80dc4188d198f2f23725b9cadd50a55191
 DIST cockroach-v1.1.2.src.tgz 79607942 BLAKE2B 39ce9db2ada1c9a5727431438d4d8fe0d5a31af3161816ee7af672c69909aa6b4681edabdfabc332c00ba3b0a142ea7d700851c8833b80947fdbcc88b7fa2c7e SHA512 385e33ec30c23d84403938420a2fcd66edff02a5c4b9d6220ce3683d833f065010953fd78ee57120c24f2947509b2fd29eeee2a45fd3ad47c16a6c8d779534d2
 DIST cockroach-v1.1.3.src.tgz 79615899 BLAKE2B 86d9a63a5e5e8f21114dda500f30a007bf64769b76322fae282d06fa9eb63eb8a965bf990378c624ccac66124efadf1a0dfdebbc8dc8c6f04173e20334341e89 SHA512 f6dc4178e91fd47aec1fce658c9d621183f0bdcdc6101b87f8187757ab9b965c27e48d0d628dd9c10a386bc1a2f184d9d03270243baf0ec4758c812caac5fda1
+DIST cockroach-v19.1.1.src.tgz 103054418 BLAKE2B eaa4f0e24f74a4bbc9a209b8778431ddc7944d0735eef0e136cfcdf820e70ad17eb4781757c325906e65d56d4c36881c294e0dd79d9e153359be859fc7ee887a SHA512 a7051fea3808b785e8d0047b0273021119d0eb1d12f5c680afa649713a79b155aff0bfa8ec123eebea095549308d002ba82dee3eb94b66c6f729d80115d20c06
 DIST cockroach-v2.0.1.src.tgz 45511681 BLAKE2B 9d0828e5e6bd41bb5590e58f0e18b8a07169335b9ff1284daf89b48dae6eea3cdb683bf8af703b5bac46978e8c37b4a092c53a3d7e18de626acc2095a7daf2a2 SHA512 ad7c64dc70cde6bbd10cabafe595ce35deeda9284880bebde75e41a4b1355aa85f01fb8c6b6ff0bae498b4b04a8d7d60bafc986c49875cff9ccf0ead0bc481a7
+DIST cockroach-v2.1.5.src.tgz 89931919 BLAKE2B 7ed310acf18cbe7c8bafe5992edd3350d9e7654cda86931dbfd64fe17043140132ec019de9f1f44d61bc92d2461618c81e60fffb014446521e747a57f6b5d442 SHA512 3ef2ad985b463e681cdaffe5590543024ca11e9c0c5528415b47bdd4cdfd42504cbc21a350449fea6da08625f801ef94fe51f55be1e9a62bac27fce0cc7b73c1
 EBUILD cockroach-1.0-r1.ebuild 1703 BLAKE2B 263b32177c96e6c5f4512c6eb60cbef7310fdbac297f5219f3e3d8ba708befe6ccc7a0eb43467c6dbc4c01542e5eddd899b01d61b0b6aa67fa3950d38b879767 SHA512 f9d54c7b9395e8ef6552211535641b9241df50d922f6c2e8c74c1782538ea25953c8c15fd89bf6ab17c6264b75bcfd23b5fd27ea9b4054f6579a2753b81c9eb3
 EBUILD cockroach-1.0.1.ebuild 1701 BLAKE2B e011a698cd2493fe26d24112a8ae8b9184ff66c7a1bcf25f6933c19374f036781ff093f7d84048c4df219aa93b66b4f3879af68b6835f9c02e62c503d8597841 SHA512 61ded57cbd28008a27b3b8a2e048a89a70be76317d350c29554ac0450de8932c275aedb63f6d032997013abb63b8a29aff4dae107bccf7876d7afe7ed14149df
 EBUILD cockroach-1.0.3.ebuild 1701 BLAKE2B f9e7fb748c2495586fc600dec992a0272cb89a39a48131ae687a469d1ffcda0b6fe5bad83751b514d8f3906c9f6defdfadb3175db34dbf0c9317143865c7cdbb SHA512 b1a0a2adb8555a227bdb9caff6a91efba4c010a82372b5ad446ab2feb9b68a98456b5b60c14513e5aeebae290a56fd936a8c17194821d12f2b910e8e0f3d1979
@@ -18,5 +20,7 @@ EBUILD cockroach-1.0.ebuild 1689 BLAKE2B 1a9afdfb31ac9142f4a21cda3274eea404593ec
 EBUILD cockroach-1.0_rc1.ebuild 1593 BLAKE2B 511ff8271f507e055d792d98f12f1adce3eba73b15d198e4adf33d7ac1ba61eefa5c9a436ae8b1b474aac802e961205a49195187067f53320ffe038308a8df13 SHA512 6f273468fd5b869144d474027dd644a9031c18f1b18525c89775c9d8eacdeb59d64b195216189ebe6a2251973abc500b2f3047fc88af7d97aa9798c0db8fa16a
 EBUILD cockroach-1.1.2.ebuild 1701 BLAKE2B f9e7fb748c2495586fc600dec992a0272cb89a39a48131ae687a469d1ffcda0b6fe5bad83751b514d8f3906c9f6defdfadb3175db34dbf0c9317143865c7cdbb SHA512 b1a0a2adb8555a227bdb9caff6a91efba4c010a82372b5ad446ab2feb9b68a98456b5b60c14513e5aeebae290a56fd936a8c17194821d12f2b910e8e0f3d1979
 EBUILD cockroach-1.1.3.ebuild 1784 BLAKE2B a23a4d6971c40d68bd280917159ef280c534da3339a48ff1d60351ed63f78be331e323a2d311b3a051db072f4dac88dadf7cc460cd2a2f7f59d19dbc7656176d SHA512 48e34da012ea4ffe51278e2d921a6a93e444b9e4a07855664e468d966f867c341c478afa9ea1f41fb31fcb8f6f94e373811e6bea879a4042a3d23f05d24d220b
+EBUILD cockroach-19.1.1.ebuild 1824 BLAKE2B 11514ea1b9923318be05fe7958aadae67795dc00620ae7191a1ade866dc4e31468130d30e7493d5e87e5d8427a02a6055728979f6b01120ac9b4fc14472707f7 SHA512 5ed2cc7899152a98314aca9d39b3791c14b838b9621011ab23d9e69a968ea37af923e5ce22e147ec7309433a3ef8e1e5e5e587b71174a962c039f2071c8f5039
 EBUILD cockroach-2.0.1.ebuild 1820 BLAKE2B b16dd86cb9bb805db65d47c36bcab1942443942473b96c74c95a53ee55a1878e61247dc58945119bd6a09a1a0ac3bdc5cb9f9ec6fd28db2ab8acdea55b540ca2 SHA512 e8d4fac1f1463ea4643630662d92d187207fcd299bce5c92532ca184fdbf73981e98f07ce5ea56044f255f70a579a46bbfcd202f35a5b1563c0c7b842fddaca2
+EBUILD cockroach-2.1.5.ebuild 1827 BLAKE2B 594d54f1abebfe8d6bf71069ac6addb73328c47b3befb33c2414efa9ae80807f157adab4af2319f1cb430f6ba82799858361d839d1ee51091ef294157115d157 SHA512 ad3de8256f586d8f03eff83db12a6c4ebaf205c416e52ec3dcce09014794c46dba6fcfef2ba98b5c87ad3b6d5f805c83edf6282e226caca75cdc09662d42d802
 MISC metadata.xml 409 BLAKE2B 0fa2933efa8102fa19917f3268b4424257f26efdd94698d22253ed62b562dddc53e09a9312069a9bcf817ccd3f6a0b4423c04c8d8dcbe387e7b30d727e8bdd0c SHA512 e4494324632e55e32fdfe7c1d1b25301b8f7cff3f7475efaf7c6c59d435777eab7245bb200b39b90121babce4e1573038fb0f42e586854a820e1489c1afddd19
diff --git a/dev-db/cockroach/cockroach-19.1.1.ebuild b/dev-db/cockroach/cockroach-19.1.1.ebuild
new file mode 100644
index 000000000000..b4fd44218a0a
--- /dev/null
+++ b/dev-db/cockroach/cockroach-19.1.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PV=v${PV}
+CHECKREQS_MEMORY="2G"
+
+inherit check-reqs toolchain-funcs user
+
+DESCRIPTION="open source database for building cloud services"
+HOMEPAGE="https://www.cockroachlabs.com"
+SRC_URI="https://binaries.cockroachdb.com/cockroach-${MY_PV}.src.tgz"
+
+LICENSE="Cockroach Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=app-arch/xz-utils-5.2.3
+	>=dev-lang/go-1.8.3
+	>=dev-util/cmake-3.8.1"
+
+S="${WORKDIR}/cockroach-${MY_PV}"
+
+QA_EXECSTACK="usr/bin/cockroach"
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Cockroach cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	enewgroup cockroach
+	enewuser cockroach -1 /bin/sh /var/lib/cockroach cockroach
+}
+
+src_compile() {
+	# workaround for https://github.com/cockroachdb/cockroach/issues/20596
+	unset CMAKE_MODULE_PATH
+	emake build
+}
+
+src_install() {
+	dobin src/github.com/cockroachdb/cockroach/cockroach
+	insinto /etc/security/limits.d
+	newins "${FILESDIR}"/cockroach-limits.conf cockroach.conf
+	newconfd "${FILESDIR}"/cockroach.confd-1.0 cockroach
+	newinitd "${FILESDIR}"/cockroach.initd-1.0.1 cockroach
+	keepdir /var/log/cockroach
+	fowners cockroach:cockroach /var/log/cockroach
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "The default setup is for the first node of an insecure"
+		ewarn "cluster that only listens on localhost."
+		ewarn "Please read the cockroach manual at the following url"
+		ewarn "and configure /etc/conf.d/cockroach correctly if you"
+		ewarn "plan to use it in production."
+		ewarn
+		ewarn "http://cockroachlabs.com/docs"
+	fi
+}
diff --git a/dev-db/cockroach/cockroach-2.1.5.ebuild b/dev-db/cockroach/cockroach-2.1.5.ebuild
new file mode 100644
index 000000000000..1cb7ed140e60
--- /dev/null
+++ b/dev-db/cockroach/cockroach-2.1.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PV=v${PV}
+CHECKREQS_MEMORY="2G"
+
+inherit check-reqs toolchain-funcs user
+
+DESCRIPTION="open source database for building cloud services"
+HOMEPAGE="https://www.cockroachlabs.com"
+SRC_URI="https://binaries.cockroachdb.com/cockroach-${MY_PV}.src.tgz"
+
+LICENSE="Cockroach Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=app-arch/xz-utils-5.2.3
+	>=dev-lang/go-1.8.3
+	>=dev-util/cmake-3.8.1"
+
+S="${WORKDIR}/cockroach-${MY_PV}"
+
+QA_EXECSTACK="usr/bin/cockroach"
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Cockroach cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	enewgroup cockroach
+	enewuser cockroach -1 /bin/sh /var/lib/cockroach cockroach
+}
+
+src_compile() {
+	# workaround for https://github.com/cockroachdb/cockroach/issues/20596
+	unset CMAKE_MODULE_PATH
+	emake build
+}
+
+src_install() {
+	dobin src/github.com/cockroachdb/cockroach/cockroach
+	insinto /etc/security/limits.d
+	newins "${FILESDIR}"/cockroach-limits.conf cockroach.conf
+	newconfd "${FILESDIR}"/cockroach.confd-1.0 cockroach
+	newinitd "${FILESDIR}"/cockroach.initd-1.0.1 cockroach
+	keepdir /var/log/cockroach
+	fowners cockroach:cockroach /var/log/cockroach
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "The default setup is for the first node of an insecure"
+		ewarn "cluster that only listens on localhost."
+		ewarn "Please read the cockroach manual at the following url"
+		ewarn "and configure /etc/conf.d/cockroach correctly if you"
+		ewarn "plan to use it in production."
+		ewarn
+		ewarn "http://cockroachlabs.com/docs"
+	fi
+}
diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index e4dc35a760a5..8b46727610e4 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -1,6 +1,6 @@
 DIST freetds-dev.1.00.341.tar.gz 3002134 BLAKE2B c9396c1f205e13c9f3449bef19830cf3b6c2fa72539555ebd6bc1532c014472c862ba2ac7f495bee8f53d640d628c6b15bb50183585d43cf3dbbea4e314636d2 SHA512 fd691535dfa5c97463ff72056cfa5721557b71e41b6186ffcb08e193e51214cf966a33ee55b8e538a6f035aeeef14ac5b15fe8758f1afea9e1252a3b8951ba58
 DIST freetds-dev.1.00.558.tar.gz 3151542 BLAKE2B e7b7eb1d4bad1472a675e7657d524837a27ba18176cf410ebad6dcb949cd59bb50e932526790c816c05cf0ba02fb750a1cfbcda10073e5cbf8908bdc4ceb9cc5 SHA512 763f04ae36be8385f9be955defd2d91698389836e80e19019f0da0ee15515d8b7e3733f7659362a307b492dc83830f0a7f27d2a68cb5b56e2ef171ac1dcfeeca
-EBUILD freetds-1.00.341-r1.ebuild 1913 BLAKE2B 07be1119c77a70b99c9b32234f0ecae224d0587544691783cd627aaf15b66fc3d8b8df17c0912a665d8f095b890aaab736d8f1e08a576fabe9ffaf91100a3632 SHA512 95f2f9c3778c9da63591be505e89efd4b9922e7fc4abda0c454e9908f02ba22a30fc1a473e79808433eef814017beb862b380d1e2f1503363aad9fd208bffa95
-EBUILD freetds-1.00.558.ebuild 1921 BLAKE2B 13bbeec39875647163f1fd0d955e85547e7f899c14d057962a193e72a0996bc9ed89e23898aab2b99f902605f76976ce0a1ecbf10c1b8228957a25fa1b939e36 SHA512 4a8de64a5d6221ea92ca79dd9d39d1a67ad239b5a7000b51dd17c0ad9a771178a06829a73510bc4a9b1d7a77fa7c6f04226ecf42979e3b00ed93d5476be7c14b
-EBUILD freetds-9999.ebuild 1603 BLAKE2B 4a6149df3ad684b7246fed4f19c457f8a74c12a6ad89114d04890a86f9a41a02f7023c07dc55c139865091aed89a70accf993dc77bae4ffdc1f0bb3ff1698794 SHA512 264144b12f57bd34d1ace56458e4ea2cda0f4f5fd9f789373d8e7b4695cdf910562441359218b0c7c8bac446c8fa5673c56a37d0cfef444fc6d11fe57f2121b9
+EBUILD freetds-1.00.341-r1.ebuild 1914 BLAKE2B a739c9f05f37b5876d79074a47d018bb9742ee1a7461fab15dac1db5d9b01b8442412c6a06245b93619bc16bec74bb92edc965a81a8437930235beda4a3933f3 SHA512 2709b5630a970e0beca0cc70b7b9778da7bb1875646a5d68bec6ec46f98e854395a0638c273c2aaa31d3f2f16d970b2a4b11e4671abc32d08c386128d661d5ca
+EBUILD freetds-1.00.558.ebuild 1916 BLAKE2B d27b8dcf799d78988ada22a9975a594348fa0ccef84920011524dc1c3481a70d90c8ea011a20e655a62629a9c0822111cdb05392c3cc6fe08f21055fc5e3d094 SHA512 2cc78b860e8c538018e49649eac1af94459e68ee00563367793461e460e6da0fa649aeef5cc6e1d63026c08f8fe8d0ec39fe0ca5d4748627a5ef8c7f32cd2c0f
+EBUILD freetds-9999.ebuild 1601 BLAKE2B a7dc691ca1e9785e216015af2ca9defb1191ad2a2178677192e0a747d94b430bc12caa403bb9ecfc81f966a770c5a67f08b59ef24ab9730459bc13eac25cd32d SHA512 d7a1ace59c852d24f8c58a70bb0b44261d08dbe92e63a725beaf3b347053a21f5d9162233eb79fc9e296251820c17f87bc60b24b86bef7950a5fa100a65f7f3b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-db/freetds/freetds-1.00.341-r1.ebuild b/dev-db/freetds/freetds-1.00.341-r1.ebuild
index 56072f26e1bb..27e73e304acd 100644
--- a/dev-db/freetds/freetds-1.00.341-r1.ebuild
+++ b/dev-db/freetds/freetds-1.00.341-r1.ebuild
@@ -8,7 +8,7 @@ EAPI=7
 MY_PN="${PN}-dev"
 
 DESCRIPTION="Tabular Datastream Library"
-HOMEPAGE="http://www.freetds.org/"
+HOMEPAGE="https://www.freetds.org/"
 SRC_URI="ftp://ftp.freetds.org/pub/${PN}/current/${MY_PN}.${PV}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-db/freetds/freetds-1.00.558.ebuild b/dev-db/freetds/freetds-1.00.558.ebuild
index 5da473b6d29e..c8a203c3c42c 100644
--- a/dev-db/freetds/freetds-1.00.558.ebuild
+++ b/dev-db/freetds/freetds-1.00.558.ebuild
@@ -8,12 +8,12 @@ EAPI=7
 MY_PN="${PN}-dev"
 
 DESCRIPTION="Tabular Datastream Library"
-HOMEPAGE="http://www.freetds.org/"
+HOMEPAGE="https://www.freetds.org/"
 SRC_URI="ftp://ftp.freetds.org/pub/${PN}/current/${MY_PN}.${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
 
 IUSE="debug gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs"
 # iODBC and unixODBC are mutually-exclusive choices for
diff --git a/dev-db/freetds/freetds-9999.ebuild b/dev-db/freetds/freetds-9999.ebuild
index ec6e2cf418f3..a18ef188436e 100644
--- a/dev-db/freetds/freetds-9999.ebuild
+++ b/dev-db/freetds/freetds-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools git-r3
 
 DESCRIPTION="Tabular Datastream Library"
-HOMEPAGE="http://www.freetds.org/"
+HOMEPAGE="https://www.freetds.org/"
 EGIT_REPO_URI="https://github.com/FreeTDS/${PN}.git"
 
 LICENSE="GPL-2"
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index e14b847f9efe..0c095e25e9f1 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -13,6 +13,7 @@ DIST mariadb-10.1.40.tar.gz 63573615 BLAKE2B a57f89c3a9cbfdfc7ff85ec6d7f4231f29a
 DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b SHA512 cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2
 DIST mariadb-10.2.24.tar.gz 71965656 BLAKE2B 2e78d7fc98fe6221126b7700c821ec4294af9d474f440857530b41d5633821b9995b732bbcdcba14c6a01f5decc56f506c99def4dc1a9a4dd52253d3045a88c6 SHA512 bd0e8c506e94f063b6cfbb1e7e872b4fdbe9ab704e07ff3af1e1efabb89daa39fec3b06ec5294d9a19fdc680da082d095cd3c5f9e4c4ee6f9ee5ae0514d6bb6f
 DIST mariadb-10.3.13.tar.gz 70745600 BLAKE2B f62b6de0566910cd0995954e3b84528bca4d8b99dab79ce1e8b5d4076a223890fc0bb7b43ac3d81c81c0b907cabbc3b042eab936b845ef18d259793759b05d51 SHA512 3cbd93291aa43b235e5b81d953ea69fb32df54fb518f922f69b5485952f01fae693c77b0efac37f414ed7ff132d3b58f899812bdb7be8a5b344c3640e2c3a0dd
+DIST mariadb-10.3.15.tar.gz 70824529 BLAKE2B 6a84430e280db287859bd82cc2b6bb63bddd9188e599165d6ccb3e0fa75cb9de083d3d8d267b7de9de70be692a45b72570c8943d949c43673b3c1387623bb0b0 SHA512 35332ac32cba27fef1b4ddd2209236853f4309756fd121fbdbd2b6be0651e817cedc80e276b89ccfa4bc76760811434fab45a4d380d0ebd500c7d9bd7377fe93
 DIST mariadb-5.5.63.tar.gz 45946425 BLAKE2B bddfd67d8393ec22c4bc8d7dab2838825394636bd690c04574bdc4da84fbf6c779fcae7f6be5d596458baa732cb5278475f308f03df083cdfcecffc486950d81 SHA512 4699d8af2210e12d0eea659a4d3fd4bfa68ce11a38cffaf939a96cb7a1fe64dd0827d39c3a0a36fa7cc1981a804a9af7a6d5cfaf23a8cfc8440e54c0163c2acb
 DIST mariadb-5.5.64.tar.gz 45953561 BLAKE2B d6efe53e520b829ec337a00efadd7d813afd5e3ee6ac5a298773c7cd1b724d01856979317fe2bcf814af3bdabdbd7c6c3d2e27a60b4cdf6032b1dfd64e54d84d SHA512 3e93044eb30d2ce50fefce503f16f4b542fd647ff4367675147ebe1b1f576b4fbad5c0bb25670136d0758d2b8b0c571119244c87d66565bb9b3471811f5dc6b8
 DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 8b5feb32085dc35b2f68dae985b2d266c4eaa0e956b490050a2df04bbff99bf8623b67e75af9326d84e3ad625c4d86b0d21d23c9a96df5a0c9cd5ed730958970 SHA512 fbd7af9284bbf09d55f128361e7cc52d94f24ac491aac800cd6d61f2e444aeca66a4d5e6ae94c2fb4044e00cec9b232bae9a76a229f87f19d90b7aecf70792ec
@@ -28,6 +29,7 @@ EBUILD mariadb-10.1.40.ebuild 29512 BLAKE2B b87872354f3fad04ea8267fbed91397510e4
 EBUILD mariadb-10.2.22-r1.ebuild 32515 BLAKE2B dcf2376e7f0f3f47ae5d3c997f2feda6441bf340bcdb26c64220932ee3c3971da712b5567df7cc76ca4528136673348c8335208fe72c91926bb3ca025d899d6d SHA512 cfd00d2fe5499e8378d025e886da35e9e5a29edc4fc0104d0daa783a3ac054c56d24a23cba21f82e0640cfe3fe6b64598128e42b131944b7ac14e544bbc2db8d
 EBUILD mariadb-10.2.24.ebuild 32530 BLAKE2B abfdf9b1131eacbf59acbbdd250c58609db09b306cdc7ffbad02aa7b2b5e976f528c988a489e71c108bc9ead860aaddfdc3ab51af5d851b69f11e62056fa84d7 SHA512 d25d74d44ebff3f9857f1600fd974d4190739cf83aff6a897753847ff98d502951bba97798d7f049cf9053ecd5f8d9df992ba0de5d92f769595e624d8fe547be
 EBUILD mariadb-10.3.13.ebuild 32189 BLAKE2B 1a79ec6ce0ce0bc6d9000368712d25a0d9d0e096f244d3422bb56518fd20439b3c701291d9b75a45420ac6fe1e2dc0d81cf8142c80334001a9ac6087a66a8004 SHA512 a474f4856bd10379da5173f843ff476379672839d68793c5436a8b7618ef1637050b61ddee11f1cb423cf33aacd28fb5e03d03e73b0a415c3a9e7ea7ea8f45d1
+EBUILD mariadb-10.3.15.ebuild 32225 BLAKE2B 95ba72ff67806f04371bb1fcd88461609c5bf74cf81fd1022a2c592aead3a0f98fc91b32df5303dc8680209f2a760e99f957839e07c54dde93378903c010560d SHA512 b444bbaa65de8f4535fb6ffd3a2062f74426d316e9cff4e341362a15a3ccaedcf45cbf5478ee308a2e997261b4967ab52bd51413c4e76b070867705ffdad50ce
 EBUILD mariadb-5.5.63.ebuild 27054 BLAKE2B fb6b085846137c6607ccb1b58fdaac6abe8999ad67102b3993b52340dd4c7805640379b79c0a0fe300b237438f836a8b62794c423ebc47707b414f7712214919 SHA512 d9356369a5e93dc1dd1a6c6c332ceac7306cc14b33068739d5fef621ea6f14bf2a36e0b8a9f39500ccb8fb7cf35dae013c9303ade0002459971f48d28097d3de
 EBUILD mariadb-5.5.64.ebuild 27101 BLAKE2B 1ac27c83ba4942c415c073e69e27047418237d4b51bdbb2fd471678c27502e67cddb56f794b957e4fed9ab0e4c03bad5d78db0ea9d6c07100bc87a3533d5285e SHA512 602085111323ab3c8049a7c7a40797dde9928c3f70d15d11eae2128773dd5c71c286565f4a4cdec032f6d03327c1e65df88a520874efaf91d0011951cbfab73c
 MISC metadata.xml 2611 BLAKE2B d1b6b11359e92a3d9cb2c58ed35a15e3cf42ab616ed907fa36a5f777168a805ffd03d01bd13fcd30352ef6c5e8b1d80f4e882ffaf8f6445ed3fce2bcc2a92923 SHA512 80395b35839acebbb18ac8d01e8c806bd89f18d32f85fcba41f41ecfc4f1f869dc8c51c90bb21ebd3c9ac30d51d47869a4dcf3b8ce73967e337e6e396b267c97
diff --git a/dev-db/mariadb/mariadb-10.3.15.ebuild b/dev-db/mariadb/mariadb-10.3.15.ebuild
new file mode 100644
index 000000000000..ac4aefb98391
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.3.15.ebuild
@@ -0,0 +1,974 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20190305-2052Z"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils systemd flag-o-matic prefix toolchain-funcs \
+	java-pkg-opt-2 user cmake-utils
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+	SRC_URI="${SRC_URI}
+		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+fi
+
+HOMEPAGE="https://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+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 static systemd systemtap tcmalloc
+	test tokudb xml yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="!bindist? ( bindist ) libressl? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+	server? ( tokudb? ( jemalloc !tcmalloc ) )
+	?? ( tcmalloc jemalloc )
+	static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
+	EGIT_CLONE_TYPE=shallow
+	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
+else
+	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
+fi
+
+PATCHES=(
+	"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.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
+)
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	jemalloc? ( dev-libs/jemalloc:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	>=sys-libs/zlib-1.2.3:0=
+	kerberos? ( virtual/krb5 )
+	yassl? ( net-libs/gnutls:0= )
+	!yassl? (
+		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sys-libs/ncurses:0=
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	server? (
+		backup? ( app-arch/libarchive:0= )
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+		numa? ( sys-process/numactl )
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( virtual/pam:0= )
+		systemd? ( sys-apps/systemd:= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.41-r1:3=
+"
+DEPEND="virtual/yacc
+	static? ( sys-libs/ncurses[static-libs] )
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+	!<virtual/mysql-5.6-r11
+	${COMMON_DEPEND}
+	server? ( galera? (
+		sys-apps/iproute2
+		=sys-cluster/galera-25*
+		sst-rsync? ( sys-process/lsof )
+		sst-mariabackup? ( net-misc/socat[ssl] )
+	) )
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
+	 server? ( ~virtual/mysql-5.6[static=] )"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+		if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} with tokudb 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
+		# 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} && \
+		use server && ! has userpriv ${FEATURES} ; then
+			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+
+	# This should come after all of the die statements
+	enewgroup mysql 60 || die "problem adding 'mysql' group"
+	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+
+	# Here we need to see if the implementation switched client libraries
+	# We check if this is a new instance of the package and a client library already exists
+	local SHOW_ABI_MESSAGE libpath
+	if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+		libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
+		elog "Due to ABI changes when switching between different client libraries,"
+		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
+		elog "Please run: revdep-rebuild --library ${libpath}"
+		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
+	fi
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+	if use server ; then
+		if use pam; then
+			einfo
+			elog "This install includes the PAM authentication plugin."
+			elog "To activate and configure the PAM plugin, please read:"
+			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+			einfo
+		fi
+
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+
+		if use galera ; then
+			einfo
+			elog "Be sure to edit the my.cnf file to activate your cluster settings."
+			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+			elog "The first time the cluster is activated, you should add"
+			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
+		fi
+	fi
+
+	# Note about configuration change
+	einfo
+	elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/${PN}.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+}
+
+src_unpack() {
+	unpack ${A}
+	# Grab the patches
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
+
+	mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
+}
+
+src_prepare() {
+	_disable_plugin() {
+		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
+	}
+	_disable_engine() {
+		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt"
+	elif use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	# Don't build bundled xz-utils for tokudb
+	echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+	sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+	sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
+	local plugin
+	local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+				locale_info qc_info server_audit sql_errlog )
+	local test_plugins=( audit_null auth_examples daemon_example fulltext
+				debug_key_management example_key_management versioning )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_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}"
+		done
+		_disable_engine test_sql_discovery
+	fi
+
+	_disable_engine example
+
+	if ! use oqgraph ; then # avoids extra library checks
+		_disable_engine oqgraph
+	fi
+
+	if use mroonga ; then
+		# Remove the bundled groonga
+		# There is no CMake flag, it simply checks for existance
+		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+	else
+		_disable_engine mroonga
+	fi
+
+	cmake-utils_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mariadb
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+		-DINSTALL_SCRIPTDIR=share/mariadb/scripts
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_LIBEDIT=0
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+		-DCONC_WITH_EXTERNAL_ZLIB=YES
+		-DWITH_EXTERNAL_ZLIB=YES
+		-DSUFFIX_INSTALL_DIR=""
+		-DWITH_UNITTEST=OFF
+		-DWITHOUT_CLIENTLIBS=YES
+		-DCLIENT_PLUGIN_DIALOG=OFF
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+		-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+		-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+	mycmakeargs+=(
+		-DWITH_READLINE=$(usex bindist 1 0)
+		-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+		-DENABLE_DTRACE=$(usex systemtap)
+	)
+
+	if use server ; then
+
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			mycmakeargs+=(
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO )
+		fi
+
+		mycmakeargs+=(
+			-DWITH_PCRE=system
+			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			# Build failure and autodep wrt bug 639144
+			-DCONNECT_WITH_MONGO=OFF
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+			-DWITH_MARIABACKUP=$(usex backup ON OFF)
+			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
+			-DINSTALL_SQLBENCHDIR=""
+			-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+			# systemd is only linked to for server notification
+			-DWITH_SYSTEMD=$(usex systemd yes no)
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+
+		# Workaround for MDEV-14524
+		use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
+
+		if use test ; then
+			# This is needed for the new client lib which tests a real, open server
+			mycmakeargs+=( -DSKIP_TESTS=ON )
+		fi
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DEXTRA_CHARSETS=all
+			-DMYSQL_USER=mysql
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DWITH_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		if use jemalloc || use tcmalloc ; then
+			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+			-DWITH_SYSTEMD=no
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED}/usr/include/mysql/server/private/config.h" || die
+	fi
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	if use server ; then
+		mycnf_src="my.cnf.distro-server"
+		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+			"${FILESDIR}/${mycnf_src}" \
+			> "${TMPDIR}/my.cnf.ok" || die
+		if use prefix ; then
+			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		if use latin1 ; then
+			sed -i \
+				-e "/character-set/s|utf8|latin1|g" \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		eprefixify "${TMPDIR}/my.cnf.ok"
+		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		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
+	if [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl ; then
+		rm -f "${ED}/usr/bin/mytop" || die
+	fi
+
+	# Fix a dangling symlink when galera is not built
+	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:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	_disable_test() {
+		local rawtestname reason
+		rawtestname="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}'"
+		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ $UID -eq 0 ]]; then
+		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake-utils_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+	# Enable parallel testing, auto will try to detect number of cores
+	# You may set this by hand.
+	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	# Run mysql tests
+	pushd "${TESTDIR}" > /dev/null || die
+
+	touch "${T}/disabled.def"
+	# These are failing in MariaDB 10.0 for now and are believed to be
+	# false positives:
+	#
+	# main.mysql_client_test, main.mysql_client_test_nonblock
+	# main.mysql_client_test_comp:
+	# segfaults at random under Portage only, suspect resource limits.
+
+	local t
+	for t in plugins.cracklib_password_check plugins.two_password_validations ; do
+		_disable_test  "$t" "False positive due to varying policies"
+	done
+
+	for t in main.mysql_client_test main.mysql_client_test_nonblock \
+		main.mysql main.gis_notembedded \
+		main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam ; do
+			_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	_disable_test main.plugin_auth "Needs client libraries built"
+
+	_disable_test main.func_time "Dependent on time test was written"
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd > /dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1`
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_config() {
+	_getoptval() {
+		local mypd="${EROOT}"usr/libexec/mariadb/my_print_defaults
+		local section="$1"
+		local flag="--${2}="
+		local extra_options="${3}"
+		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+	}
+	local old_MY_DATADIR="${MY_DATADIR}"
+	local old_HOME="${HOME}"
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	export HOME=${EPREFIX}/root
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+	if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+		MY_DATADIR_s="${MY_DATADIR_s%%/}"
+		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+			else
+				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+				|| die "Moving MY_DATADIR failed"
+			fi
+		else
+			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Attempting to use ${MY_DATADIR_s}"
+			else
+				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+			fi
+		fi
+	fi
+
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=15
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
+		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
+	fi
+	if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
+		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
+	fi
+	if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
+		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
+	fi
+
+	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "(${ROOT}/${MY_DATADIR}/*)"
+		ewarn "Please rename or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+		einfo "Please provide a password for the mysql 'root' user now"
+		einfo "or through the ${HOME}/.my.cnf file."
+		ewarn "Avoid [\"'\\_%] characters in the password"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same"
+		fi
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+	fi
+
+	local options
+	local sqltmp="$(emktemp)"
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see https://bugs.mysql.com/bug.php?id=31312
+	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+	for opt in grant-tables host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+		; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+	done
+
+	einfo "Creating the mysql database and setting proper permissions on it ..."
+
+	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+	PID_DIR="${EROOT}/var/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]]; then
+		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]]; then
+		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
+	fi
+
+	pushd "${TMPDIR}" &>/dev/null || die
+
+	# Filling timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+
+	local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
+	[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
+	einfo "Command: ${cmd[*]}"
+	su -s /bin/sh -c "${cmd[*]}" mysql \
+		>"${TMPDIR}"/mysql_install_db.log 2>&1
+	if [ $? -ne 0 ]; then
+		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+	fi
+	popd &>/dev/null || die
+	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+	|| die "MySQL databases not installed"
+
+	use prefix || options="${options} --user=mysql"
+
+	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+	local mysqld="${EROOT}/usr/sbin/mysqld \
+		${options} \
+		--log-warnings=0 \
+		--basedir=${EROOT}/usr \
+		--datadir=${ROOT}/${MY_DATADIR} \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--socket=${socket} \
+		--pid-file=${pidfile} \
+		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
+	#einfo "About to start mysqld: ${mysqld}"
+	ebegin "Starting mysqld"
+	einfo "Command ${mysqld}"
+	${mysqld} &
+	rc=$?
+	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+	eend $rc
+
+	if ! [[ -S "${socket}" ]]; then
+		die "Completely failed to start up mysqld with: ${mysqld}"
+	fi
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
+	"${EROOT}/usr/bin/mysql" \
+		"--socket=${socket}" \
+		-hlocalhost \
+		-e "${sql}"
+	eend $?
+
+	if [[ -n "${sqltmp}" ]] ; then
+		ebegin "Loading \"zoneinfo\", this step may require a few seconds"
+		"${EROOT}/usr/bin/mysql" \
+			"--socket=${socket}" \
+			-hlocalhost \
+			-uroot \
+			--password="${MYSQL_ROOT_PASSWORD}" \
+			mysql < "${sqltmp}"
+		rc=$?
+		eend $?
+		[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+	fi
+
+	# Stop the server and cleanup
+	einfo "Stopping the server ..."
+	kill $(< "${pidfile}" )
+	rm -f "${sqltmp}"
+	wait %1
+	einfo "Done"
+}
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 8823d31759e7..1dd29c5e057e 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -8,7 +8,7 @@ DIST mysql-workbench-community-8.0.14-src.tar.gz 15631739 BLAKE2B f37dbe83ecc642
 DIST mysql-workbench-community-8.0.15-src.tar.gz 15631418 BLAKE2B 4bfea1e4dbdda2bef856bd1601d85a1196052d7abc253eb1e291a5d2b5a6b807875e0367a6e542975a12529d142695c1b45f9f1b9b8e094cdf6183f1b1b11b43 SHA512 f6b1dedd0fd97aae0da04fb5a7ebaac980753386f10588dcec2c77fdf5832caf4ee10f277d338f74a1551d8071b17ae4724386e7e62e2bf8421377b304c31055
 DIST mysql-workbench-community-8.0.16-src.tar.gz 15653536 BLAKE2B c76cd35e88167641037a779b85245c620b31e2a2943260309d8ba461391892d9ec5856023c8eb25e1ea40c12ece796a1d2e36f1638187db4bd2739eb273232c9 SHA512 e9495e78aec58f70cc586ad73908408d3b8d5071c815279c1019d5268c97f53f10f4e59a47fe0ffea03b795de8e283c1175e03e2585a81fc58b62461d665cfe9
 EBUILD mysql-workbench-6.3.10.ebuild 2858 BLAKE2B 09cfdc16accc4772a41b3f0de95982bd5aae411309bcc0b17efb7f4cb801ba94f4f9898226b7ddec30ff4544094f9526b4f93c34e535a4a306e65d021a57acfb SHA512 abe0d26d0e9424262d58b9063cfc2f979af87bd084339fc7a2d9384d188d7f762401ba6223b86a3ba73de9774d2eaef16c8b7d08d2bca4dc177684dd3828bd97
-EBUILD mysql-workbench-8.0.14.ebuild 2720 BLAKE2B b226b0dbdd20925395c3f98be1377688b9cd320463a16ce8f169627632acdd41c19edd140b74d1273aea1ae00c1f1fd2fb3da8c7e2f31bfdebfae3435ff19b2e SHA512 4654925e83b481f0e47c65319165b18b55965c43db2ea056e5a576d55381ecd76335a33c6c81d8d7113fa1a20cf9d1ba8503f83f3595b1c462a33b5d86111473
+EBUILD mysql-workbench-8.0.14.ebuild 2719 BLAKE2B 0dce51095fdab897c7ce6b089f557917edd8242067289730e47d5d7fc6ebf841ce621f29279ef302bcc25cbc88d09fd5a6d3c46af2379b3a72b22cef2bbfdd01 SHA512 903e9d3fba8d49ad5c47ff2d7e40ccd88b774d2ac85d8396d7d3c9cb80ab0e5e190a17cf8a46848664c209bc26a79dc3bb008b9ee9df3a07292ef4f58eb30776
 EBUILD mysql-workbench-8.0.15.ebuild 2720 BLAKE2B b226b0dbdd20925395c3f98be1377688b9cd320463a16ce8f169627632acdd41c19edd140b74d1273aea1ae00c1f1fd2fb3da8c7e2f31bfdebfae3435ff19b2e SHA512 4654925e83b481f0e47c65319165b18b55965c43db2ea056e5a576d55381ecd76335a33c6c81d8d7113fa1a20cf9d1ba8503f83f3595b1c462a33b5d86111473
 EBUILD mysql-workbench-8.0.16.ebuild 2639 BLAKE2B 6c098dd06091de5bfbd409adf57157675b6fad999fb4f3e2384a940233d7d1bfd5c0801edf6cd58089a86e9a319da612b95d4a8b46fd1dee58711f187bb47ca1 SHA512 275b70d0bda900f19e36b51d067d9e2078860c85eb071302567ed734d3bc04fe026fcdc57f3ba97a5103e0889002ee5e0acbf97da6ce64590b6bfa8333a41600
 MISC metadata.xml 310 BLAKE2B b0d985e39bb17865a05907e5449723c2bf862d9f3ae7f8570173c9cff443171feef6694db26a51880f8c1a4b1e3834ca7ab9bc7c2057fd6f8930b9d1c1c02cdd SHA512 f284063d72f2218f8ed60a74b43f252d608865682b8c0447f52016a02a7cbf6d45a226787d893328dd31946ade1cca78ff7556896183b4422c4142a8935a2193
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
index c5dfe62875e0..6b14e1edca13 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz http://www.antlr.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 45aac169b145..6058b4678a70 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -16,6 +16,7 @@ DIST mysql-extras-20180804-2323Z.tar.bz2 322215 BLAKE2B cca9e502e375bf4347333586
 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-20190303-1852Z.tar.bz2 331026 BLAKE2B ee033fce8f1b6a58f1f690710fb9709a585cd45564b35e71d4f840a3a7f83a5d80f53c24236c9976319abd89c68c62c74a7111517f1b9721d3cbd0898bf0dd8d SHA512 30361a0b848ed27f9170b1116458a9bc13b1b585c5fa1933c99927541c31e9bda4008b0563f2fc7db286f998089ebebf1fe3f18fce7a45e62acbf769ac62d8c1
+DIST mysql-extras-20190524-1046Z.tar.bz2 331517 BLAKE2B e6d48e34b0a7f7176de8740971f8151923beb20a520df73c22d44005059ef6779ad5aa8437e30018b9bbfe1d6d69043cbd8522b6f3662746205193b44372a6b3 SHA512 2f7238578f3aabd1701e1c54da36bc0100c9479871e3c77b22131fd6cde865037307f93b3343ea5e52251c45ef35cdc52cc2dec5a26d44fd41700598282c5c2c
 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
@@ -23,6 +24,6 @@ EBUILD mysql-5.6.42.ebuild 25955 BLAKE2B de075ce30850d5f2fe17a5aaf02e5888d626340
 EBUILD mysql-5.6.43.ebuild 26058 BLAKE2B 900da4370bcf01f3bb6f3c54220e80beddd4243724603c839caddc644504c6255bb68fc3b99522e23df7f7b0290edd859ffcced2819dcc7bbd8ec80a26eeafd3 SHA512 9f33a0924fab366635627643e85d33a8404b27afa098eb7411a9f223b9f4d90a3a4ff2dd47261de1d235ffa5865c44808e053329e21d8728c418b7c890ea026b
 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 30466 BLAKE2B 3622e31330f47924ea99c0b31ede3b755a2bcead553730fc3728f6eb505493e90b0206af7235017f80dcecc297ae6dd3022255ca1884de251db0033140a9b3dc SHA512 85418f95306981b3d3ee0ecd91abf3b2c212c4b7d708ad70834a6df3f5e941c0469f5ba29079adc4e51477e01836ae316c1ad86452ee9d705e1180ac4854fc9d
-EBUILD mysql-5.7.26.ebuild 30477 BLAKE2B 61ae7d6a7de17cea9baafb3bee71c7811b963ad078defb7a725878e2274e959422292c15d69f680e50fa83859e004b7c484ab6b157b3b6c71d2368d18fcc5c58 SHA512 f9e3a2e8deda27ecc3cb27fea0f321c37af94a5afb36bef19928eb2b39f5ebca8edc60afde2354aae7d64d892687c3c63b22343d1a5664ed5a3603a5891e6829
+EBUILD mysql-5.7.25.ebuild 30466 BLAKE2B 09a9d351068993f776edaec7df6af40709ae1f29edfccb5c0881cb4e6c3c30370eb5dd605972eb2da02c9f1cc981d809a7fd4a5f61f61ac5b91b714e9ef8b8c6 SHA512 a8adb0af5cadb08556c2d19b6a0e7c659568dd36fc4448db2808e74bbfe6c7690d33e36b7d3ed91148b00d7093b1a09a7e522a17101fe35f9da1940d2751db2a
+EBUILD mysql-5.7.26.ebuild 30477 BLAKE2B 799f6a4d605e4e91858df8eaee9695c657c179043c2555d7c69f5bc344606b3a9c8780fafe9455346c166b4e4171bf478e576b29f8ad2cafa795b1d6b29d0c46 SHA512 690fde2496a52872512df7d057bb6f0eacb4b7157848949853fe66d0257cde4a1d02df5adeb4469aa398978d64c5b2ded85787cf1fc6c4125eb1cb25ddb6b2f8
 MISC metadata.xml 1539 BLAKE2B 0bc66c5855bd1f4353a7f0b551229d68a940478687b4f38653f973e4a5cfcb946c86bdc2d8318aa96aba43598eb476b995005f26727dfa176ced00fbe2b129a1 SHA512 bc0ce8a3de5e55d954f65eec657930af069d3550f485334f80dfa4c6d17c6298d0609d1ba4fe8b6c988f8ad007858f147c17f1354c207891ac1a062a36af50ad
diff --git a/dev-db/mysql/mysql-5.7.25.ebuild b/dev-db/mysql/mysql-5.7.25.ebuild
index baea2685372a..a66ab389e877 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="20190303-1852Z"
+MY_EXTRAS_VER="20190524-1046Z"
 
 CMAKE_MAKEFILE_GENERATOR=emake
 
diff --git a/dev-db/mysql/mysql-5.7.26.ebuild b/dev-db/mysql/mysql-5.7.26.ebuild
index 99cb2805dc75..ffd198b3867a 100644
--- a/dev-db/mysql/mysql-5.7.26.ebuild
+++ b/dev-db/mysql/mysql-5.7.26.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20190303-1852Z"
+MY_EXTRAS_VER="20190524-1046Z"
 
 CMAKE_MAKEFILE_GENERATOR=emake
 
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 2d00861c261a..85ba2e5653a9 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -2,7 +2,7 @@ AUX my.cnf-5.7 138 BLAKE2B 71862b4b77334ab74002237453d2c7f6b51cd1ae57dba3b00b19e
 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-20190303-1852Z.tar.bz2 331026 BLAKE2B ee033fce8f1b6a58f1f690710fb9709a585cd45564b35e71d4f840a3a7f83a5d80f53c24236c9976319abd89c68c62c74a7111517f1b9721d3cbd0898bf0dd8d SHA512 30361a0b848ed27f9170b1116458a9bc13b1b585c5fa1933c99927541c31e9bda4008b0563f2fc7db286f998089ebebf1fe3f18fce7a45e62acbf769ac62d8c1
+DIST mysql-extras-20190524-1046Z.tar.bz2 331517 BLAKE2B e6d48e34b0a7f7176de8740971f8151923beb20a520df73c22d44005059ef6779ad5aa8437e30018b9bbfe1d6d69043cbd8522b6f3662746205193b44372a6b3 SHA512 2f7238578f3aabd1701e1c54da36bc0100c9479871e3c77b22131fd6cde865037307f93b3343ea5e52251c45ef35cdc52cc2dec5a26d44fd41700598282c5c2c
 DIST percona-server-5.7.25-28.tar.gz 82296869 BLAKE2B eb12f185be6885e124f8fe5d434c0bba22a67fc2d82a28a52b6f7852722ce046a9a5c30ee5c55280b8046786c39336b131c94c05601580ab81ccf0113254f609 SHA512 e323e092d2af39969edc36d647400c20b50ec059b379f9ac32e71d88524940130639ebb2591d4126d6796e111c31c3a03ab1d00726471be00e1662417e5e63b3
-EBUILD percona-server-5.7.25.28.ebuild 36188 BLAKE2B 1d4b219e49db090b90b1a3986653205d89af2f9848f790d2cba620cfa0bdac197a84a43ede5e2e846162ceb951387fabe676b282b7aed9a07e94099d8459b4eb SHA512 664f2b505fde195cf5ccac21162826b66dfa0c9dc7b2a5e4535e4e0a15400d42331598e846fd97b8b05483512b9c86a7cac232f903781140aed00ad512e80511
+EBUILD percona-server-5.7.25.28.ebuild 36188 BLAKE2B 8f328977e7890dd7efb905691308d0183588f8eea097f3ad78a4645544a4c797f8104ad7741c46486726e955d1c9a04cb57f4f42c8aaeb24aae6620aea2c36d9 SHA512 28a5c0bcb08654fd107db48ce397e7dc0ef1fc4473231ff8926eeb39cc14d6c96d4dd7356dbde1746e0f8dad175eeb8f3012eefe52a74438bf22ebf7cce7984d
 MISC metadata.xml 1416 BLAKE2B a479a1bc7b6e5947ccef2fdf097d3dd91af932500483112c05b86c5d60ab6ec1ac4179bee0fa291a746281054baa791152cac7a34c8c79a0ad4fd8f5e3d1bcf9 SHA512 ec92d201154c3af80aa4cdcd1eae207827a1b2711cfe7b1a9b0153268a33e472329011c56ec39a009776c629163fc9d4f9e77ad2b00461f07199f3dd12db0b52
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 5a4345214857..f32804b6b57e 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="20190303-1852Z"
+MY_EXTRAS_VER="20190524-1046Z"
 
 CMAKE_MAKEFILE_GENERATOR=emake
 
diff --git a/dev-db/pg_activity/Manifest b/dev-db/pg_activity/Manifest
index f4c00f73c1c4..d5be8169277b 100644
--- a/dev-db/pg_activity/Manifest
+++ b/dev-db/pg_activity/Manifest
@@ -1,3 +1,3 @@
-DIST pg_activity-1.2.0.tar.gz 88863 BLAKE2B 2436b206bc9aec2d5ee678e753191020520f282f62e25f23aa8182bbc215716b82bf800af5e68567c0cff7eb3ff9ff02c46b8f646e4ffc4d2401e89830d8811a SHA512 0bf2f3f746755cb3bc6cbff6a9377d172b15a82c836a19cd52ef8073c39cbb8ffaf2f9583fca437cabc7251bab55a874e1ee8e0559778881d42bcc030bf5d0c4
-EBUILD pg_activity-1.2.0.ebuild 623 BLAKE2B 0734295c8ddb694cb0ac1a10831aacc3fdec44b9d426918c27170918bc301cb76a665d786cf7f5fbd39658bedae20133cd6f35cf20dd417c07682c3daebb39c1 SHA512 1f7debcfb9165f69f7e52b8f40470e3449a4aa4fb8773f2a1ed5baea0c158d74f9758d430a1f513fde5ebc6dfba45f27823bff8fb49966acac27c8ba4e197d32
+DIST pg_activity-1.5.0.tar.gz 92392 BLAKE2B ffe39f602773e0e63ca9bc8a5c96a5dad6a0862aa622b7bf4f3073d869c33bf6e4b79a152a3c956e780d70852aaedf3172a693536436ecbbf89e6943e41ba654 SHA512 01e3d2a1f0c839e40d1da79197dd8a405dee302d46495b972f11e3672e52becceb6211cccc6e1a5c711ca36247dcead6e959435d5f4eb1735556073b6c834904
+EBUILD pg_activity-1.5.0.ebuild 615 BLAKE2B 86dc87e83a36d44c164a04546db38ffbff8258d05bb9e7c6461e57b819af7d2f22c5e65c0c5bc3b24231d937537e46d5448d1f98805945d5cfdc715a2f6b0b54 SHA512 b5efb74fe8447f1be4e3a72796fd1e73028af59bfe6b7cc56affc0735694999f512dfeb286d98d0f961cc7ee05fb680f02337146e2d82f6faa0d42b037e4b807
 MISC metadata.xml 339 BLAKE2B e80c6ca98d1020eb5d6dffdd9cc41239d8dee1131c977d54666293044bd1804e08b3d88a439e867df26e541bc75a084752a19287591643a1cd20e687e9f7e223 SHA512 db6f9da66f99eb53ef5c118ebb7e6d2ecde79c118a0a7b3094375405cf02700bb2f423b830d23ad4819819557bf35a1073a67bafe0de01654f9651e956840355
diff --git a/dev-db/pg_activity/pg_activity-1.2.0.ebuild b/dev-db/pg_activity/pg_activity-1.5.0.ebuild
index ab84a426b26f..4dfd633a9d5a 100644
--- a/dev-db/pg_activity/pg_activity-1.2.0.ebuild
+++ b/dev-db/pg_activity/pg_activity-1.5.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
@@ -9,7 +9,7 @@ inherit distutils-r1
 DESCRIPTION="Realtime PostgreSQL database server monitoring tool"
 HOMEPAGE="https://github.com/julmon/pg_activity/"
 SRC_URI="https://github.com/julmon/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 SLOT="0"
 LICENSE="POSTGRESQL"
 
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 9a66a6469bdb..b20857a1d47c 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -4,10 +4,15 @@ AUX pgpool-configure-pthread.patch 251 BLAKE2B 69ae31095583e4615117fbeb08ceff520
 AUX pgpool2.confd 649 BLAKE2B 1c520c4fa954c7411c1b700c03bf4e39196c599eb239cf86412fcf491759ca6f46b1264e7647a8d278ac45da3e20702f6f077dfbcccf83cb3f45575dd3571308 SHA512 5f9a4fa1e68161049ad767d64c764fbf70e84a4239e58119455a45a7e45d86ea2d19b617147cf891053e0dad4420c84704d67015334c7d41bad05b260d70e910
 AUX pgpool2.initd 2162 BLAKE2B b04f6b952507b8e4815c7b27f09b59ffe64f6262719c5490377fdbc5f8490cdead18fdbeb0ce8379d9cbd4bbb1aa21221d61853ff49a456a5ef6a8d78f3f5129 SHA512 05dd358d20bae60cfdefd7116b1111288b5a2be6d68a9dc40eaf6ba641524d422f2faac79bd3c629cee4f8b1ca601a9b6e303d4228e538d742ea407b6190ee53
 AUX pgpool_run_paths-3.6.5.patch 11626 BLAKE2B 5d0b7a49b3c8bf2f2d69d369894e9976037025b289b0ec0f2cf11ed9862347dc4cb166af2cbd65637de40fdae09809a9232b0638cf69339901d6f3f67e9ddcd5 SHA512 ea718378d0ea14fa48975a899df26bc8aafa1e61b0d3f264ead81031a21d68284f4af5ce065c5534d113faf36724c880ce280665e148ec623e9fea9c8f91c77c
+AUX pgpool_run_paths-3.7.10.patch 14548 BLAKE2B 89a18a3c3d4426d82978e303836ff4fafc8d7b4c36154a015c0dadf2e3eb1fa8f19ecf75f39a513b15bca8bfb543ea99e718fff0fa8ef5fde39ecbbe40469df9 SHA512 ea9541a5f9d27011005ab0fd04e2945dea1befaf060429c6a66e0c2091ac8b73a74b01174e5e409c189420405734e73fe2458fce56f4d7b56303957c450bd42d
 AUX pgpool_run_paths-9999.patch 11759 BLAKE2B 35df553f704846cc4ff8d67e5e6b54ca8ed0a5817a148c359b47cae7ff388fe2bb57600113d7f8ac9afe760ea75e3ddd410d111c2ef87aea3c3fb38671d59260 SHA512 109be0f3bcda49db14ebb86d6e9347aa0a47d582ac1a1438b07719f9fa503045cc5b65a27964c3c0b1690ef489f752a497e3b050b816569d0ce01193dc007259
+DIST pgpool-II-3.7.10.tar.gz 3375419 BLAKE2B 96d589e9a3eff631bd4bffdcf321b3b532e5f0985dd4a5948fabc3228400305dc98fbf17ba64e162ecbaecca400e1bb3cad6fc954b2d624292f6f22deb48a789 SHA512 a89c392e336f5dd608c6876011f996fa1e4d7cb4b0eef31c24b2338ac287b72b73948e82429715d38fd9a7a6598f56828192722a2a8ee0d473738b804c4a2a48
 DIST pgpool-II-3.7.8.tar.gz 3337039 BLAKE2B bce75be04d3c37dffecbc0a1f029d6e97f316cc2497de032ccd4862acc6e7ae64f12ffffdb42a99141e548a2cc616ed02d7eef6ca2f63e222fb400cbad72828c SHA512 0f4e337c2307368cfd38f29c63b9267dd3171dc4b9cd2c59cff564295908e2f561230156a5b690e4d87ce4c8b3174d01b081147e7f5d8ff403d3adc8e7cea7e7
 DIST pgpool-II-4.0.3.tar.gz 3715976 BLAKE2B c5ecfebc44ee4d6ab8fda5ae0854bb51423252ba518b356a37d3b125bc8f4fac048f6f944fdf9b1ee785aae5ac3eca4c4196adf218bc071dd90b93da5c6e6c08 SHA512 76ffbc8df120d4ef68b761684a1805c0349665375f549cd3a194f7d09b9bbdf70d0824da0cbe975e6d15f850704c4fc7c1a2218f551f88f2ce56f542bdfee9b8
-EBUILD pgpool2-3.7.8.ebuild 2637 BLAKE2B 11d6f1983309788e808af8e72d27a6b7fcfb18b71135215786046b9766509a7674ad52ef1b861ddc4d1156cba0fce62a768932e6509e8a0868984da4be4cdb85 SHA512 421c34bfc8aa2bdae0e213dfee556328b0b784af973ae8de8c6c84e2f4b433ce0afc34d16342b0d02abeabd52b828da188d53c73143b66e3b9e00d0c123fd675
-EBUILD pgpool2-4.0.3.ebuild 2643 BLAKE2B 3a1a873d73bca65bc0aada8ffabd5bf249cb47f0931c40aa48c23718fef7560cda55c005195ca180af9f2fdfbc45f36ddcc3b2e154a9803e3393a4c03f91f6f6 SHA512 62f6f2ec58d9c8b6fe21b0f344a22f4e9b4fe7d0de0d15473ff5c004c83e68bd535c02b0ea3b4412a61e79e4d2694b7a31221208eb7cebdfd23cd8f4acd715f9
-EBUILD pgpool2-9999.ebuild 2720 BLAKE2B a63e0ba961271a6719fd7fab4a57280fd22eb93ada6d7a37a2c8d7bad381f64b4f160461adc4de760e1b1747cf9536ba56027d7a93710cff3d76251b3453a8ca SHA512 8e3c7a0e2c2562d31974dfd9a9503f1d2c20499b34f69fdd0ca26cf08f344fb115a5f65251e854e9fae9bbd6d007f5d1d9243c17b84885e359f42bad0c6ef5b9
+DIST pgpool-II-4.0.5.tar.gz 3768842 BLAKE2B 2756d23db950a037a9203aae41293535de25d11bf9860f509040bf5b483ae5fb9e651c8189ee5f0a9398a45d20d2c54566769945e38c52361c160a1162a8e3af SHA512 897df553dba3a1800adae5d22ed4f4fe210a3013fb533730837591244877eeaf0e4090d1a0c65e189b71798b5c303ea22e2198f6317b54f74f10ba48fa2188c6
+EBUILD pgpool2-3.7.10.ebuild 2642 BLAKE2B 509e1fc0b475bb66aafcb6ab14c28f4b28c9c059fd7421b84b485309a38e95179e0e8d2d523c084442e8ec57d7a01296796c46dc39d3677e00c8d13dc1b28498 SHA512 aab742d98796c688ca0f175512919f97f92f56da56d85370184ceffc00ebfa18fd65cd0ecf9405ce40b8ed6648474986ddbe81464fcb68ffa18cdc23e8a43a51
+EBUILD pgpool2-3.7.8.ebuild 2639 BLAKE2B fc593487bd9393dae1f56ddebfacbefa99f6801be0a7e674750ffaee5b095399b6af0bfddc888c8c216d42c03cbe140bc7a2a4f3f3d6b56250fd73f2e11e0327 SHA512 a4549c126c7d4c37bcd130cba470666cc93a4eb039d21b2096a7c9f4cd02258fd248731ccf4b3daeff285381d494df1d998c760801dd22ab2635b349c195bf4e
+EBUILD pgpool2-4.0.3.ebuild 2645 BLAKE2B d7d9afef024a3cd2df6a13eb3a037c55be7d4f28b13f751a72d3de0857397432094d139cbcecf109f9b1fdbfd8794f08908368775a0821531cc8c2f2c3a71a6d SHA512 c4e89b31755d5033385bf939715ca4977dcb93d0d4b55c81b18e9fde2292aeb58c2352c3ede83449052423042913f977a784d7f726a0b879a21d58c29bfbe7fd
+EBUILD pgpool2-4.0.5.ebuild 2648 BLAKE2B 95c398868dddee909756512e95fa8953026ac844691626b055f27bb22714f7b865085b3ae82f9b6f519abd4a6ece176d3d77bfd1aece0cbae57650997f208028 SHA512 c2a8402cac1778b07f5e508b6aa82f568e29746c38d4abcd1062c24ae2a6d598b0b057766e5aef6fc43c0180f6b6f072a0db6261ad93d892ed41397eedbaedd0
+EBUILD pgpool2-9999.ebuild 2723 BLAKE2B 4c593cebf5c8f46ffe83697d500b3bb0151c27a58c1aff005f4668d88ddb35d41ce2b18078cff1bd90b6ea4b2b1010ef40ea313f20595d5e1def107b2bae9cf7 SHA512 5a90ab19128765d850037360b7595338364875a4b17e18d91fff167371a3cf8b0439706388fcbc9a89f54909b5dc4d46129e326acabb1e8dbea488b9b452b5ef
 MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/files/pgpool_run_paths-3.7.10.patch b/dev-db/pgpool2/files/pgpool_run_paths-3.7.10.patch
new file mode 100644
index 000000000000..2374054b0f5c
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool_run_paths-3.7.10.patch
@@ -0,0 +1,322 @@
+diff -Naruw a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
+--- a/src/include/parser/pg_config_manual.h	2019-05-15 03:04:59.000000000 -0400
++++ b/src/include/parser/pg_config_manual.h	2019-05-22 17:33:26.657307088 -0400
+@@ -208,7 +208,7 @@
+  * here's where to twiddle it.  You can also override this at runtime
+  * with the postmaster's -k switch.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
+ 
+ /*
+  * This is the default event source for Windows event log.
+diff -Naruw a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
+--- a/src/include/pcp/pcp_stream.h	2019-05-22 17:34:22.377167537 -0400
++++ b/src/include/pcp/pcp_stream.h	2019-05-22 17:34:45.263776883 -0400
+@@ -48,6 +48,6 @@
+ extern int pcp_write(PCP_CONNECTION *pc, void *buf, int len);
+ extern int pcp_flush(PCP_CONNECTION *pc);
+ 
+-#define UNIX_DOMAIN_PATH "/tmp"
++#define UNIX_DOMAIN_PATH "/run/pgpool"
+ 
+ #endif /* PCP_STREAM_H */
+diff -Naruw a/src/include/pool.h b/src/include/pool.h
+--- a/src/include/pool.h	2019-05-15 03:04:59.000000000 -0400
++++ b/src/include/pool.h	2019-05-22 17:37:07.220088017 -0400
+@@ -72,16 +72,16 @@
+ #define HBA_CONF_FILE_NAME "pool_hba.conf"
+ 
+ /* pid file directory */
+-#define DEFAULT_LOGDIR "/tmp"
++#define DEFAULT_LOGDIR "/run/pgpool"
+ 
+ /* Unix domain socket directory */
+-#define DEFAULT_SOCKET_DIR "/tmp"
++#define DEFAULT_SOCKET_DIR "/run/postgresql"
+ 
+ /* Unix domain socket directory for watchdog IPC */
+-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
++#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
+ 
+ /* pid file name */
+-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
++#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
+ 
+ /* status file name */
+ #define STATUS_FILE_NAME "pgpool_status"
+diff -Naruw a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
+--- a/src/sample/pgpool.conf.sample	2019-05-15 03:04:59.000000000 -0400
++++ b/src/sample/pgpool.conf.sample	2019-05-23 06:17:33.641244614 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -53,10 +51,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ # - Backend Connection Settings -
+@@ -217,13 +213,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/var/log/pgpool'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -512,10 +508,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ 
+diff -Naruw a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical
+--- a/src/sample/pgpool.conf.sample-logical	2019-05-15 03:04:59.000000000 -0400
++++ b/src/sample/pgpool.conf.sample-logical	2019-05-23 06:24:39.766884345 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ 
+@@ -47,10 +45,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -218,13 +214,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -511,10 +507,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ 
+diff -Naruw a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
+--- a/src/sample/pgpool.conf.sample-master-slave	2019-05-15 03:04:59.000000000 -0400
++++ b/src/sample/pgpool.conf.sample-master-slave	2019-05-23 06:27:27.259814032 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -53,10 +51,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ # - Backend Connection Settings -
+@@ -217,13 +213,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -511,10 +507,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ # - Virtual IP control Setting -
+diff -Naruw a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
+--- a/src/sample/pgpool.conf.sample-replication	2019-05-15 03:04:59.000000000 -0400
++++ b/src/sample/pgpool.conf.sample-replication	2019-05-23 06:28:29.479664086 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -53,10 +51,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ # - Backend Connection Settings -
+@@ -216,13 +212,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -510,10 +506,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ 
+diff -Naruw a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
+--- a/src/sample/pgpool.conf.sample-stream	2019-05-15 03:04:59.000000000 -0400
++++ b/src/sample/pgpool.conf.sample-stream	2019-05-23 06:29:16.582883904 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ 
+@@ -47,10 +45,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -218,13 +214,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -511,10 +507,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ 
diff --git a/dev-db/pgpool2/pgpool2-3.7.10.ebuild b/dev-db/pgpool2/pgpool2-3.7.10.ebuild
new file mode 100644
index 000000000000..8c538b170823
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-3.7.10.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.{4..6} 10 )
+
+inherit autotools postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://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.7.10.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-3.7.8.ebuild b/dev-db/pgpool2/pgpool2-3.7.8.ebuild
index f4f989f9a38f..770c9d221c60 100644
--- a/dev-db/pgpool2/pgpool2-3.7.8.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.7.8.ebuild
@@ -10,8 +10,8 @@ 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"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-db/pgpool2/pgpool2-4.0.3.ebuild b/dev-db/pgpool2/pgpool2-4.0.3.ebuild
index caa0de63f44b..e2f26a68101a 100644
--- a/dev-db/pgpool2/pgpool2-4.0.3.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.0.3.ebuild
@@ -10,8 +10,8 @@ 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"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-db/pgpool2/pgpool2-4.0.5.ebuild b/dev-db/pgpool2/pgpool2-4.0.5.ebuild
new file mode 100644
index 000000000000..a217a62435c1
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-4.0.5.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.{4..6} {10..11} )
+
+inherit autotools postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://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.7.10.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-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index 839ce8a519a1..1e3475f6c7e6 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -5,12 +5,12 @@ EAPI=6
 
 EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
 
-POSTGRES_COMPAT=( 9.{3..6} {10..11} )
+POSTGRES_COMPAT=( 9.{4..6} {10..11} )
 
 inherit autotools git-r3 postgres-multi
 
 DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
+HOMEPAGE="https://www.pgpool.net/"
 SRC_URI=""
 LICENSE="BSD"
 SLOT="0"
@@ -51,7 +51,7 @@ src_prepare() {
 		"${FILESDIR}/pgpool-configure-memcached.patch" \
 		"${FILESDIR}/pgpool-configure-pam.patch" \
 		"${FILESDIR}/pgpool-configure-pthread.patch" \
-		"${FILESDIR}/pgpool_run_paths-9999.patch"
+		"${FILESDIR}/pgpool_run_paths-3.7.10.patch"
 
 	eautoreconf
 
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index f4af5a5a9b1d..851aac982aa8 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -16,6 +16,7 @@ DIST postgresql-10.8.tar.bz2 18958913 BLAKE2B d2e1664a53c5b2f24b412f497769ffd33e
 DIST postgresql-11.1.tar.bz2 21263173 BLAKE2B d762b6e8b0e7b08b16ed252687118a0a4516172e38e8940879fd050f72d19ff045af949e72977a62c2ce0a788af7d42c9bde7748347566bec3694e337bba6f73 SHA512 35d00984e9f5f063a5b96e97aa1b40381ab76d07b2336bda5981fd80bef1324f56eefca5069ae78770ecd6ece5df85264e599fdb3478ecb71d4fdd0d7b6becca
 DIST postgresql-11.2.tar.bz2 19714229 BLAKE2B 459674c08a0435363da29428bef7ec49a012b534b390ce6addafac000ce58ad0ad7ba4e1522f5279da29535399836971c61536827d481af766322935d7c6d01b SHA512 dae00a543fdeed36bc338abd4ccfd9fe9a8b6b2b7eaa00b1078e4f27802de75a461c27da2800bc9dd64e658681e5787bd03764bde79940656cae1e8c8716f011
 DIST postgresql-11.3.tar.bz2 19718775 BLAKE2B f56686bff4e70c2b6333554a620a5c2d5c226654a1d61de43b4493c44a14e2bcd9c102dba420994878d328af52d933885e4948cd002f14b693aef1416697a0ea SHA512 03269bb88f44f3a81d5e3a8ca2fe59f63f784436840f08870b2e539755629cbde8ac288e0bb4472ee93294a88b37b814ddff48444254c1a3f7a10b4bb64f7133
+DIST postgresql-12beta1.tar.bz2 20589423 BLAKE2B 622f936524bca74c20e27967b4cfcec31ba4ffc3132af516fc6dbb89843d688df41b72b7febe7060d2eb6716d64228124b4bc9831e9b11601be0fd95b7727710 SHA512 f46017659aa88141b056fc1852280c92ffbc3ba52d1cda2e3e302d3ec6ba478cc2a8ab04c87f10774b0401e8284fc46bb387a3e0e594a26a30ef7a4cf79b1de3
 DIST postgresql-9.3.25.tar.bz2 17067593 BLAKE2B fd9ca5685e5511dcaa72da882b674846dcd5a16227e5b33ae06701fe7881df71847666c37925033c6cb01c916111a8f76df134491645f4d1e1dd48a008bd2831 SHA512 319e12b73853b74f5ef2c520d64795bb586ffd495ceab6518f7844de6e0a054aea821976c470108d346f8090c7d3949920d9c435432e33004b7caa7a77a5cdca
 DIST postgresql-9.4.20.tar.bz2 17905682 BLAKE2B cb65228f8e78dc8b6303a06480a68de58ecac1fefa1342e4563f2c4051c9f5506b366b36c2dbd54207d25ae497625f8fc5e3e771174a6b3ec33c3c19d2c9ea08 SHA512 664c6e97979f38d263d1dc75a7db442f193a230435cad43ddfa2afcd42ac0d73b2aef0e846fddcc9008cd6d89cba2d5c0a4db93b111665646d3ff4d8f6fbe1e8
 DIST postgresql-9.4.21.tar.bz2 16871522 BLAKE2B e6b8957f52a95d5fa56bc39756f1de83459882e40eee07c3ddf9e33eab39a0d61ee492864a920e7714ca1914a772dcc9048bc34072349197597cfb116aa94422 SHA512 850d1f59369457d9a8a42de8f0e4811f60e9164d2e7d7605fdabc04cc5ba2e3794d51e155d709419d06b8e070f214f7d3ef2328c6d37f125264ea008ca18ff5a
@@ -28,19 +29,20 @@ DIST postgresql-9.6.12.tar.bz2 18759442 BLAKE2B 067b307318f65616651ee4502f420a84
 DIST postgresql-9.6.13.tar.bz2 18767279 BLAKE2B c1ec780a7f938f878425cbd6556145e60a613135129daaacc52e9a699cc448a22481b01fac20d0c09373ea6a026f39bc58234aae4f1126333b94f621981a8135 SHA512 65cc70410ad4a1a738b92855b92eecdbb9efbbca0eb9a45a138d47b696c8f9c9cd19073fbfdf5c80eea7633d0be29b4ed8acbadd38724acf8f18c90bb30f9b26
 EBUILD postgresql-10.6.ebuild 13809 BLAKE2B 8d423f5493ffd745207a96fc9e2c39dfd875c87711b89efc500700986afee687fce8df9612493f3d1c665d5eb819b438e89c225889d354bb3b5b04b57d97320f SHA512 b63ecae0488fc4527c525dd7134af9dea2862128829a9f0670c5924582b8820b9d2f2a9262de56e28f0f996191dcc898ee692f629b40f4988b41982441294dde
 EBUILD postgresql-10.7.ebuild 13811 BLAKE2B fe7a6df33550d3212db168c3e194a122e54e2f46c76f2cb77b52cf91865d2bea6631172c5f7579fd700986925ef9bbc31ef65fdb29ff0361b638577c068cadc1 SHA512 bb742bd0323ea763a9b213ea5331882969554949ab386b9cc8c5a70b8a94261d8c792027e779a9d1306c632b240d20261c5c363a66f3fb511b089319145e3736
-EBUILD postgresql-10.8.ebuild 13815 BLAKE2B 1c2c0c250c92d2c651cbc4c9fa6d59bf35e1aaf00aae3d3b7ed6cfb9a0a5084e4376acbc583bf2db98122dd503727af619a43f7fe72beab5b982a7e092f5030e SHA512 9cbbb56587d5e5e185a0c862fce9e7d0742ca996c85f6fc4214357cef6569ab115366cc8adc683d9286ced1f2a85f75f4cd949bb6170383c116ae4c3cfc87f70
+EBUILD postgresql-10.8.ebuild 13812 BLAKE2B 7ef2622f933b20f3b31bb87768ca5dd52dd5b3574399c660a68bca5f89573e9c13ada65a1328733895a84f9413d71660a3bc1d1b4155c5edc23026ec66ce3304 SHA512 ad7639e57f7bdc75d11d879c05351c5dccb9c008ea271cfa067d699487ba82a3499f42ab3bb1b1b9be670e23d248723b56b75cffb6e9df7abceb2f06e5e559da
 EBUILD postgresql-11.1.ebuild 13830 BLAKE2B eda10e9ae1ce6404cf75b1c1cdff44638fcfd2e73f0584012e7c3b62d467f3149645fd9c561d6b584cbb826f1f982378acb3a1903bec07334d80d291ee91af56 SHA512 703b35c39a4c0421bddd625ab83ee032174b5cc0944dc709fb22a591ccc4d1d8bb8e1acbe6ed288e0f0448c0529201b6f5061fa62d42bf0b25147c901a4029c6
 EBUILD postgresql-11.2.ebuild 13831 BLAKE2B e56079a7e2f0492e5c3889a4b7c5f21b70c33f4b20329ecf84bae8e5a7cb2b2d0defb962b2802de881604291da7f7ab0c1517773e64f5c2fc948f1ec23986e8f SHA512 c585f3dbcba20b1fc20cad583e9a763cc6f8170c91825e10eb23ee568a25db62d8c0d20363383c6ff8c21abb8ec95e188daed5907c1d36489d253cb71c863fd5
-EBUILD postgresql-11.3.ebuild 13836 BLAKE2B 5988a299a63ad2a5ce3bca5d5bc89eb860b36a42b850bacfcfc1987e67a8f78f6035ea53dc291dad02247718b1e5099fe77ee043fa2d0567591295570ae7bf84 SHA512 c29f6492c13c2dba9467ef8362c8e43fd19fcd2ebe347cd07c0af10049c4174a9054104cbe5ceca67b9770942ccd8533a2ccb0f95bcb688178aaea3f899eaf3c
+EBUILD postgresql-11.3.ebuild 13833 BLAKE2B 586239f6b3cdb4bd37ca6984e6736ec78717d936a276d8921a25ab3e9af0722871332f34cbcc114fd46db05ed0a2ec35b8e303ba5fac6f8149d375d97197283f SHA512 e3fbedd37960ee810e93cea7221c2f9dd08c794030657fac313488931a894dc22d28590f9afb3c9e32c482fb5970dafb26334cb24dcf4870d76f03266588cb62
+EBUILD postgresql-12_beta1.ebuild 13816 BLAKE2B 3d9ad621a0c4423334268b5d11f3959ad0d89e030bd164582ca784a9ec0c762acd36e500d7debaa82e232bbbc4fa3aae9a55499c8434111420ab089679f3abaf SHA512 ee7cc2f53f650b4679e95b9a112253589f3cd05bad47f8a3d4a9bfdcd29ff0d72614a7b645f617e60db827a9eafe0bc2e070454e7641948470ed9833863524e5
 EBUILD postgresql-9.3.25.ebuild 13558 BLAKE2B 336b83681269f6c8254a5cbf9177451ff3681d76316b63a365d91f4f03c37aa9b34f1043161a1ea389c74b745012744d2df16ad5285b501552c896033461dbcc SHA512 9998f7d66b38f3b8e060d089757790cb5bb5f479cf4997238324322c1d23bf48584d2ff4dfff8b3c6c3a709a4c12def05fff3584eadcd028f91eeeb4eed72e91
 EBUILD postgresql-9.4.20.ebuild 14368 BLAKE2B 2c6b46d98d0cb9f9b4e2063d86b7b1b353c3edffc5386c3f1225dde7430633e539714d98b8ec179b13a612dbbd2cb8a32b2aa321a4cf60e74e64c6b793a1a711 SHA512 6de69907fce6835510de53a961d54cc2dc7e0464d48115c29195d3384ba7447ba472d6b89946545c02b4f42cc2e778f4dbdee75728d212ffc651f75076f59ceb
 EBUILD postgresql-9.4.21.ebuild 14369 BLAKE2B 32c03b7b3e2b71cc4e347a451d2ab814ed01a51ac7d7324b023123b045847e51a54a3190d5d54903b573516e18031ab9ea119979b785269a2ddf8d694ab76433 SHA512 c8fa0a053847fbd78e928be1d8789cf336ca5c2b067bb01d5cb245560ff5dbbf44e01b5dd34e11d878150d64a76bb1d58aae5e99dc5aca1f7c00d7dc87dd5df3
-EBUILD postgresql-9.4.22.ebuild 14373 BLAKE2B 4b74f6cad1f44a69da49097018ca3a42e7cc348c7cfd6ef5869987c3e701dce7acd6578bf6780ab0eedc9cf66f49ce9a01271c88f47672c38abecf4bb440ef12 SHA512 dbd5b2a8ac59d6e8acafa5913a7542db6a56fcfc99a99657c026a5ca2926202bb605bf95af9086dc382243041f04efe790ab4495164e5a631093d665a0c682c2
+EBUILD postgresql-9.4.22.ebuild 14370 BLAKE2B fb8188dd31061cf24b8e5408acf34f3158e8ef2ac5591173a3ea4ca709b78e5ab7c287a21a162d06cea38939dacea718fa1cae7b1fbae5ad184aa75451457215 SHA512 b5cf47eb16022ec78584ecf19883de572939994edef56098a77eae08a371a7afee8c3c7809d706d67e4dfc31b9fca1ee603396fbf8df883a64131693d08bb6c5
 EBUILD postgresql-9.5.15.ebuild 14596 BLAKE2B f12b4c612d4360b93f363fdd0a7eda9285db0122a7e663bd7bec8222289e2a2da0bfdaaff9ed2398a154976cf1f13cd9e2e717b23accc7e528f76565942a5976 SHA512 9e9a7aa496a65e036d1fd4528cbfb06f5014059dd96b581ebee38f3a3e65faefad222cb5f2e54dc95b640a89f362275ce0f3d942a092ceeef50973f2937686fa
 EBUILD postgresql-9.5.16.ebuild 14597 BLAKE2B 6767d2163fa8dc5435c2271e3b8efbea3b57cc1d2d2d3c0884fef6fc3d750758cc045f4f423699de8fa89ea4570e0ca445b3da7285ad3669faea7f799e31a72b SHA512 8ec5f2768290b43119e472fccc5951832772a137eebb056c57bbd9c25565ef004095aa2a0ed9c03df90f3ea1faf9d26a5ec9ffd6d5c82d31826fd1052a90605f
-EBUILD postgresql-9.5.17.ebuild 14601 BLAKE2B a36025f69cb256f140de1fe878c9c4949e7058314c492a9f10449abd219ebe55757a77d0f9f7ac59f58218787d083afb21209c3fd9653ea99d89ef6382aa055d SHA512 cf3e07fa1699561ef7ef890ffabcad04f081702e0f697e608e78ec23ab053941d0d9d55cc7e260c7ea458fa223fbf953df2889ce4d99c104580492a27763fdda
+EBUILD postgresql-9.5.17.ebuild 14598 BLAKE2B 639a31ad1d730abc71b06a692e3d6071944306217ffaeed4c232113f47b0517f4605ef19a241e0b6fda03b24f453268b618a58101bfb3c4d5eead56b3d4097e5 SHA512 5b3c4c2d46464029eb2fe4f5d5ff41186ff77f0e5047f9e40a1dc72457e2d23da1c42e9153afa828126a9771f9dd0caa51ee398a68ddd70c50d5ef77f4c14e17
 EBUILD postgresql-9.6.11.ebuild 14829 BLAKE2B fffb2f1e956b93a561d289f657cf678f4e414e21787c73d1ebddf7182aba7b8374307e878841edb25de82feb866f88d79b89ed115bb4d916b8ed929c1a30b5d1 SHA512 c8c70732f1390285906e45cbce8afa3e3435814210c53e092bc0c2fa9f0ebe8d86b3f782e6eaed989a4c2a9a766a158232623e203e2d4917cfa95a05ab88d213
 EBUILD postgresql-9.6.12.ebuild 14830 BLAKE2B 700d0b13f1ff5f35185a9413a1a030c6e3b8c8822ab4c465c3d212a6aaef34f0bc9dd62d4bd6d7d63e410a1927c3c5ccd08c39e3e27abf5ecf0b79fe7a9951f4 SHA512 7e2e661e9981443317704f38227476da0860904234104e5cc1f126acb93acd07cac655fce2d9eb2f7756699874e6afe037fce93ba2d57fda0ec2180bc8362d29
-EBUILD postgresql-9.6.13.ebuild 14834 BLAKE2B 1aac68311e60f262c64e8091fc28f56d21b4f08e5e96cbda7f2a2dcc3a07fc1fdb185390b442d98bff1b8cc88491d46155f7d214ba398035493e7adde12e67d4 SHA512 1aa7ea2979b7542781b9e4cb749d9c46bfa845c37f083bef417fc4f29a050c34beeef87e4fa569241ffabb95d1466a99a5bf5c3b88f81c19d7d235d164e74c24
-EBUILD postgresql-9999.ebuild 14257 BLAKE2B 778b681890ef644afbc1406fec240d9ce61df01e878f50a2b68242e0c3b04104c5bb82967f1f63ca02d30aa7774f252fe7c64362a8184747c4229afc85879bd8 SHA512 67cab8401cbb88b4aeeab0eb03fda9ea3c68c5f3ea567a100a17732757143d2f4e54ab86645fbf2a9786906b138fa8cbe6a3d5957f7f75e218ab6a0a0a99c62c
+EBUILD postgresql-9.6.13.ebuild 14831 BLAKE2B ab7f08b9207114faa35201c90ae1767108de19907a0c6163cf278f7ee89d24b008e25b63e3fae4fca58a50a3f5d059b8edd960fe6ab641c8d65d6ae81e927904 SHA512 273bd355784f2e1fa7474e74a85414f2fd5bd73bf4f58a82f60f00b15eacb5bb421073196359dbae9035061b327e91eb9c8fc796212a0a4cfa8dea72a87e1716
+EBUILD postgresql-9999.ebuild 14257 BLAKE2B da2d4497d150a674c6134eb73e607e428e223e3a49cec79910ce0165b532a76ed540693708297ca7cd8196ddfbad1d82612665361af9de1022ed4fd9587275c4 SHA512 4b299249169603e125704e1675370d2d1cf4f5b5109ca7be1eac73da914519e7bd0e49f94e0e4d891f637aaa797a4529480f1772d1c539d8e7cd80b13de4169b
 MISC metadata.xml 715 BLAKE2B 59ad51ae06a697fe649054d9fe13040423f425b95abdcf3797e1d0d5abba8c62d54cc8c1afb0be0d0a29d1a39d379912bd931925b5df480fb0bb9b238c36e598 SHA512 03027757eaf95313a6825710b1054a9671aa8396381789397006dfe2f66cd41e85cde418e792bf7d71d7db2413905816ff39685774219c1ea5e8b8d35c5cffd0
diff --git a/dev-db/postgresql/postgresql-10.8.ebuild b/dev-db/postgresql/postgresql-10.8.ebuild
index d219d79ffa53..260642e26385 100644
--- a/dev-db/postgresql/postgresql-10.8.ebuild
+++ b/dev-db/postgresql/postgresql-10.8.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.3.ebuild b/dev-db/postgresql/postgresql-11.3.ebuild
index 7d4f91a7a66c..7f38e0a3f32a 100644
--- a/dev-db/postgresql/postgresql-11.3.ebuild
+++ b/dev-db/postgresql/postgresql-11.3.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-12_beta1.ebuild b/dev-db/postgresql/postgresql-12_beta1.ebuild
new file mode 100644
index 000000000000..bea7f351ec92
--- /dev/null
+++ b/dev-db/postgresql/postgresql-12_beta1.ebuild
@@ -0,0 +1,460 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
+		 zh_TW"
+
+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"
+
+SLOT=$(get_major_version)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+IUSE="doc kerberos kernel_linux ldap libressl llvm nls pam perl python +readline
+	  selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+llvm? ( sys-devel/llvm:=
+	sys-devel/clang:= )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-11_beta1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls nls "'$(l10n_get_locales)'")
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		# Temporarily tack on tmp to workaround a file collision
+		# issue. This is only necessary for 9.7 and earlier. 10 never
+		# had this issue.
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.4.22.ebuild b/dev-db/postgresql/postgresql-9.4.22.ebuild
index fccef3a3d6d4..c3aa3d92ac10 100644
--- a/dev-db/postgresql/postgresql-9.4.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22.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 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.5.17.ebuild b/dev-db/postgresql/postgresql-9.5.17.ebuild
index c87954d1ae59..6d619e7de510 100644
--- a/dev-db/postgresql/postgresql-9.5.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17.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_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.6.13.ebuild b/dev-db/postgresql/postgresql-9.6.13.ebuild
index d40e99651710..b7dd8fbf3d44 100644
--- a/dev-db/postgresql/postgresql-9.6.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13.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_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 2342910ef474..e90d6a96bf13 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -15,7 +15,7 @@ inherit flag-o-matic git-r3 linux-info multilib pam prefix python-single-r1 \
 KEYWORDS=""
 
 # Bump when rc released.
-SLOT="12"
+SLOT="13"
 
 EGIT_REPO_URI="https://git.postgresql.org/git/postgresql.git"
 
diff --git a/dev-db/rethinkdb/Manifest b/dev-db/rethinkdb/Manifest
deleted file mode 100644
index fa392a74b12e..000000000000
--- a/dev-db/rethinkdb/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX rethinkdb-2.3.5-gcc6.patch 1588 BLAKE2B 01770dbba244a9f8b914ca25d97aec97c733988c563b1e6438d42a901bfd35e9df7c9713d3f9d8dab23acc832d15a1954c7d1dbe69fbcaabf49a13954cf2cbed SHA512 ac902b1eea3dd5d5c2c76bf9aa1b513553624cccfbda282e9be50589f9f74f01cf4b9968f08b22c139af80e92f4e5a4930364c4af2977359ee95b7587c8f292c
-AUX rethinkdb-2.3.5-libressl.patch 4365 BLAKE2B 83487fb920acc136e37d0823a52de943f629560f37b2b8434ea4599fd4d02e4c548841da3d892da168bf50b640a5562b335252f532cf65e5ac359d9228e87bf2 SHA512 ec18f3916def1f76ef58fcb1f077c8f405e86b3bc0ab660d547d5c4b4e7132495d35b4003d21ff019d660d03a14b205b74d1defb7e69f359903b4a9004f558f8
-AUX rethinkdb.confd 606 BLAKE2B 5fae810572fb4edcc55e0f20fb2c2c8e933fbcb6221ad6a398f74e24f099787f924f489c0185bb899b10e365f8e7d1384f00ceaf61921e88138dbaec5d1b0efe SHA512 3a07f9c78ef96b2ca37fca508ee14a644d3c08612f662ba5260182fbfcceba064d20253f1261f56dc0a2c28d1a4d5e2320872c3c4e7595cb7ab4e202eb28ad42
-AUX rethinkdb.initd 1645 BLAKE2B 762589fe4c4b4a73b88f0777f092c5e4b6746c4da3ac9bb738c114f2dde1bb6457d7d29e3ab7c1097faea72a18e379684d862da8d4cac537a0983caad9353203 SHA512 4449b8a4d25232a1d8f375f161d3801d67d93756bd9b3e2f33b58a87e8a257e2e94e47f8aa4a74b69df3da528ffc349f15198a939552c3b5b9ffaacc18a096a9
-AUX rethinkdb.service 261 BLAKE2B ac1f760843ebe249a5066031b5637c1375f84ee63ee23076dfcd68c3baafcf89e468bae3632e38a07fa49831f48b4751e9190e510ce9f649415edc4a332e5bf2 SHA512 70389797ae79481b7d47b45f1676bd0531bc830a2f2daf7baec87533a7a6a0e67177572bab7d42324fe719f8a056899babc5ab2358a679c6a59899ed1272374b
-AUX rethinkdb.tmpfilesd 43 BLAKE2B a294bf834c883ebca33fb289328007e144d14f0fd9c685f3f10bb209af01100347334d21e49243e83f0cf6d5ac1bcc07f49071dc2017f2606f06c9304f67e296 SHA512 5996f72b8e08aac80285373e8e1b5a664177e9d0e8d13e5638c6b821fe5b7a0368001fbfa9ef3f6709dabf0616abcabea40adc4808d176572f8f99b7a3255bae
-DIST rethinkdb-2.3.6.tgz 76787356 BLAKE2B 291f5ff7f2574329e3c96a838a2b4a5f801fae5221612f97d9c6ac250f07e8b8495ce55e9b59fa6085328ef9b9061f63c90db088175458102d2ab319b08c3be1 SHA512 653177750f7439fa1d61a121e488d578be1eab90f87c7d17ad52b9793d8543f22bbe98f8d501c2ab2d7048c65118096430fe7bde945d87c7a3228905af801af2
-EBUILD rethinkdb-2.3.6.ebuild 3887 BLAKE2B dbc1ed84b0c50ac172d9b8e2e36f2f75ce831f1c9043de5e654908a4a2789442e4c25dede7cf07c94bf4b29002c369e750834edce8596c2605e29898085fce57 SHA512 593edaccf511e503382a40cfd2e637a49706b3cb9f5235fdcb93abed619987042e785fdae795eae97d06b8ca9c630a15b3b79de2b58d3020b26b76660953e5d9
-MISC metadata.xml 479 BLAKE2B da42cd39b5a97d717bbba5d640794b8620783464226a641bdbcc3f9f89861051a88ad0789bd43ed606d4955d8265a148dc038e3f2d2851042e6f9080885cf845 SHA512 927c6fb7c435c6ebd562dd581a392cf36f48ac20fec63dd0c090efdadaa68fcbbd28d6aa8c5c2f24822d0453ac74847576dcb45fd93a3c6ece648c17b6abba7c
diff --git a/dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch b/dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch
deleted file mode 100644
index e3d5eac88a45..000000000000
--- a/dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Bug: https://bugs.gentoo.org/594220
-Commit: https://github.com/rethinkdb/rethinkdb/commit/871bd3705a1f29c4ab07a096d562a4b06231a97c
-
-From 871bd3705a1f29c4ab07a096d562a4b06231a97c Mon Sep 17 00:00:00 2001
-From: Etienne Laurin <etienne@atnnn.com>
-Date: Wed, 16 Nov 2016 04:17:41 +0000
-Subject: [PATCH] Workaround for building V8 with GCC 6.2
-
----
- mk/support/pkg/v8.sh | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/mk/support/pkg/v8.sh b/mk/support/pkg/v8.sh
-index dc339ad0715..97f4d336c03 100644
---- a/mk/support/pkg/v8.sh
-+++ b/mk/support/pkg/v8.sh
-@@ -44,8 +44,10 @@ pkg_install () {
-         arm*)   arch=arm; arch_gypflags=$raspberry_pi_gypflags ;;
-         *)      arch=native ;;
-     esac
-+
-     mode=release
--    pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= $arch_gypflags" V=1
-+    pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= -Dv8_use_snapshot=false $arch_gypflags" V=1 
-+
-     for lib in `find "$build_dir/out/$arch.$mode" -maxdepth 1 -name \*.a` `find "$build_dir/out/$arch.$mode/obj.target" -name \*.a`; do
-         name=`basename $lib`
-         cp $lib "$install_dir/lib/${name/.$arch/}"
-@@ -56,7 +58,7 @@ pkg_install () {
- pkg_link-flags () {
-     # These are the necessary libraries recommended by the docs:
-     # https://developers.google.com/v8/get_started#hello
--    for lib in libv8_{base,libbase,snapshot,libplatform}; do
-+    for lib in libv8_{base,nosnapshot,libbase,libplatform}; do
-         echo "$install_dir/lib/$lib.a"
-     done
-     for lib in libicu{i18n,uc,data}; do
diff --git a/dev-db/rethinkdb/files/rethinkdb-2.3.5-libressl.patch b/dev-db/rethinkdb/files/rethinkdb-2.3.5-libressl.patch
deleted file mode 100644
index b79850b0b6b3..000000000000
--- a/dev-db/rethinkdb/files/rethinkdb-2.3.5-libressl.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-Bug: https://bugs.gentoo.org/594998
-Issue: https://github.com/rethinkdb/rethinkdb/issues/6336
-Patch: https://git.alpinelinux.org/cgit/aports/tree/community/rethinkdb/libressl.patch?id=146fb0d67a1b861d5c776d97f533efe0bb26af7a
-
-From d52a694a806c1a8b6dd4d7d17d0671a96240449a Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 4 Jan 2017 15:31:40 +0100
-Subject: [PATCH] Improve OpenSSL compatibility
-
-Refactor the conditionals for openssl 1.1 support so we avoid multiple
-if/else and add a check for LibreSSL as well.
----
- src/crypto/hash.cc                 | 13 +++++--------
- src/crypto/hmac.cc                 | 34 ++++++++++++++++++----------------
- src/crypto/initialization_guard.cc | 15 ++++++---------
- 3 files changed, 29 insertions(+), 33 deletions(-)
-
-diff --git a/src/crypto/hash.cc b/src/crypto/hash.cc
-index 4427dfddeb..e035f695fc 100644
---- a/src/crypto/hash.cc
-+++ b/src/crypto/hash.cc
-@@ -8,27 +8,24 @@
- 
- #include "crypto/error.hpp"
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#define EVP_MD_CTX_new     EVP_MD_CTX_create
-+#define EVP_MD_CTX_free    EVP_MD_CTX_destroy
-+#endif
-+
- namespace crypto {
- 
- class evp_md_ctx_wrapper_t {
- public:
-     evp_md_ctx_wrapper_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--        m_evp_md_ctx = EVP_MD_CTX_create();
--#else
-         m_evp_md_ctx = EVP_MD_CTX_new();
--#endif
-         if (m_evp_md_ctx == nullptr) {
-             throw openssl_error_t(ERR_get_error());
-         }
-     }
- 
-     ~evp_md_ctx_wrapper_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--        EVP_MD_CTX_destroy(m_evp_md_ctx);
--#else
-         EVP_MD_CTX_free(m_evp_md_ctx);
--#endif
-     }
- 
-     EVP_MD_CTX *get() {
-diff --git a/src/crypto/hmac.cc b/src/crypto/hmac.cc
-index 2ac4314e24..0e3f91a0c1 100644
---- a/src/crypto/hmac.cc
-+++ b/src/crypto/hmac.cc
-@@ -7,43 +7,45 @@
- 
- #include "crypto/error.hpp"
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+
-+inline HMAC_CTX *HMAC_CTX_new() {
-+    HMAC_CTX *tmp = (HMAC_CTX *)OPENSSL_malloc(sizeof(HMAC_CTX));
-+    if (tmp)
-+        HMAC_CTX_init(tmp);
-+    return tmp;
-+}
-+
-+inline void HMAC_CTX_free(HMAC_CTX *ctx) {
-+    if (ctx) {
-+        HMAC_CTX_cleanup(ctx);
-+        OPENSSL_free(ctx);
-+    }
-+}
-+
-+#endif
-+
- namespace crypto {
- 
- class hmac_ctx_wrapper_t {
- public:
-     hmac_ctx_wrapper_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--        HMAC_CTX_init(&m_hmac_ctx);
--#else
-         m_hmac_ctx = HMAC_CTX_new();
-         if (m_hmac_ctx == nullptr) {
-             throw openssl_error_t(ERR_get_error());
-         }
--#endif
-     }
- 
-     ~hmac_ctx_wrapper_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--        HMAC_CTX_cleanup(&m_hmac_ctx);
--#else
-         HMAC_CTX_free(m_hmac_ctx);
--#endif
-     }
- 
-     HMAC_CTX *get() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--        return &m_hmac_ctx;
--#else
-         return m_hmac_ctx;
--#endif
-     }
- 
- private:
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--    HMAC_CTX m_hmac_ctx;
--#else
-     HMAC_CTX *m_hmac_ctx;
--#endif
- };
- 
- std::array<unsigned char, SHA256_DIGEST_LENGTH> detail::hmac_sha256(
-diff --git a/src/crypto/initialization_guard.cc b/src/crypto/initialization_guard.cc
-index ba0503efc6..f76ffd96da 100644
---- a/src/crypto/initialization_guard.cc
-+++ b/src/crypto/initialization_guard.cc
-@@ -14,16 +14,17 @@
- #include "arch/io/concurrency.hpp"
- #include "arch/runtime/runtime.hpp"
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#define OPENSSL_init_ssl(x, y)     SSL_library_init()
-+#define OPENSSL_init_crypto(x, y)  SSL_load_error_strings()
-+#define OPENSSL_cleanup            ERR_free_strings
-+#endif
-+
- namespace crypto {
- 
- initialization_guard_t::initialization_guard_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--    SSL_library_init();
--    SSL_load_error_strings();
--#else
-     OPENSSL_init_ssl(0, nullptr);
-     OPENSSL_init_crypto(0, nullptr);
--#endif
- 
-     // Make OpenSSL thread-safe by registering the required callbacks
-     CRYPTO_THREADID_set_callback([](CRYPTO_THREADID *thread_out) {
-@@ -49,11 +50,7 @@ initialization_guard_t::initialization_guard_t() {
- }
- 
- initialization_guard_t::~initialization_guard_t() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--    ERR_free_strings();
--#else
-     OPENSSL_cleanup();
--#endif
- }
- 
- }  // namespace crypto
--- 
-2.11.0
-
diff --git a/dev-db/rethinkdb/files/rethinkdb.confd b/dev-db/rethinkdb/files/rethinkdb.confd
deleted file mode 100644
index af65794a44bd..000000000000
--- a/dev-db/rethinkdb/files/rethinkdb.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# !! IMPORTANT !!
-#
-# This file is ONLY used to override some of the init script configuration.
-#
-# You should NOT use this file to configure your rethinkdb instance,
-# see the /etc/rethinkdb/default.conf.sample file instead.
-#
-# Available init script modifiers :
-# - config_file : the configuration file to use (default : /etc/rethinkdb/instance.d/<instance-name>.conf)
-# - user : the user used to run your rethinkdb instance (default : rethinkdb)
-# - group : the group used to run your rethinkdb instance (default : rethinkdb)
-# - run_dir : the run directory for your PID files (default : /run/rethinkdb)
-\ No newline at end of file
diff --git a/dev-db/rethinkdb/files/rethinkdb.initd b/dev-db/rethinkdb/files/rethinkdb.initd
deleted file mode 100644
index 9f55aa49c8e6..000000000000
--- a/dev-db/rethinkdb/files/rethinkdb.initd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-instance_name=${SVCNAME/*.}
-config_file=${config_file:-/etc/rethinkdb/instances.d/${instance_name}.conf}
-run_dir=${run_dir:-/run/rethinkdb}
-
-command="/usr/bin/rethinkdb"
-command_args="--config-file ${config_file}"
-command_background="true"
-pidfile=${run_dir}/${instance_name}.pid
-user=${user:-rethinkdb}
-group=${group:-rethinkdb}
-start_stop_daemon_args="--user ${user} --group ${group} --wait 2000"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
-	if [ "${instance_name}" == "rethinkdb" ]; then
-		eerror "You should not run this default init script directly"
-		eerror "Create a symlink to an instance name"
-		eerror "and create a configuration file in /etc/rethinkdb/instances.d/"
-		eerror "then run this instance init script instead."
-		return 1
-	fi
-	if [ ! -f ${config_file} ]; then
-		eerror "Missing configuration file ${config_file}"
-		return 1
-	else
-		# respect configured directory or set a default
-		directory=$(egrep -e '^directory=' "${config_file}" | cut -d'=' -f2)
-		if [ -z "${directory}" ]; then
-			directory=/var/lib/rethinkdb/instances.d/"${instance_name}"
-		fi
-		checkpath -d -m 0750 -o "${user}":"${group}" "${directory}"
-		command_args="${command_args} --directory ${directory}"
-
-		# respect configured log-file or set a default
-		log_file=$(egrep -e '^log_file=' "${config_file}" | cut -d'=' -f2)
-		if [ -z "${log_file}" ]; then
-			log_file=/var/log/rethinkdb/"${instance_name}".log
-		fi
-		command_args="${command_args} --log-file ${log_file}"
-	fi
-}
diff --git a/dev-db/rethinkdb/files/rethinkdb.service b/dev-db/rethinkdb/files/rethinkdb.service
deleted file mode 100644
index 09645c2ae6ab..000000000000
--- a/dev-db/rethinkdb/files/rethinkdb.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=RethinkDB database server for instance '%i'
-
-[Service]
-User=rethinkdb
-Group=rethinkdb
-ExecStart=/usr/bin/rethinkdb serve --config-file /etc/rethinkdb/instances.d/%i.conf
-KillMode=process
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/dev-db/rethinkdb/files/rethinkdb.tmpfilesd b/dev-db/rethinkdb/files/rethinkdb.tmpfilesd
deleted file mode 100644
index 694501e8ab55..000000000000
--- a/dev-db/rethinkdb/files/rethinkdb.tmpfilesd
+++ /dev/null
@@ -1 +0,0 @@
-d /run/rethinkdb 0755 rethinkdb rethinkdb -
-\ No newline at end of file
diff --git a/dev-db/rethinkdb/metadata.xml b/dev-db/rethinkdb/metadata.xml
deleted file mode 100644
index 48fd46f66002..000000000000
--- a/dev-db/rethinkdb/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>ultrabug@gentoo.org</email>
-    <name>Ultrabug</name>
-  </maintainer>
-  <use>
-    <flag name="tcmalloc">
-      Use tcmalloc from <pkg>dev-util/google-perftools</pkg> for allocations.
-    </flag>
-  </use>
-  <upstream>
-    <bugs-to>https://github.com/rethinkdb/rethinkdb/issues</bugs-to>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-db/rethinkdb/rethinkdb-2.3.6.ebuild b/dev-db/rethinkdb/rethinkdb-2.3.6.ebuild
deleted file mode 100644
index 3c1b8ac0ee83..000000000000
--- a/dev-db/rethinkdb/rethinkdb-2.3.6.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit python-utils-r1 systemd user
-
-DESCRIPTION="The open-source database for the realtime web."
-HOMEPAGE="https://www.rethinkdb.com"
-LICENSE="AGPL-3"
-SLOT="0"
-SRC_URI="https://download.rethinkdb.com/dist/${P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +jemalloc tcmalloc"
-
-# TODO: rly need some webui libs ?
-DEPEND=">=dev-libs/re2-0.2016.05.01
-		dev-cpp/gtest
-		dev-libs/boost
-		dev-libs/protobuf-c
-		net-misc/curl
-		sys-libs/libunwind
-		sys-libs/ncurses:=
-		jemalloc? ( >=dev-libs/jemalloc-4.0 )
-		tcmalloc? ( dev-util/google-perftools )"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="?? ( tcmalloc jemalloc )"
-
-pkg_setup() {
-	enewgroup rethinkdb
-	enewuser rethinkdb -1 -1 /var/lib/${PN} rethinkdb
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.5-gcc6.patch
-	"${FILESDIR}"/${PN}-2.3.5-libressl.patch
-)
-
-src_prepare() {
-	default
-
-	# don't use predefined configuration
-	rm configure.default
-
-	# fix doc and init script auto installation
-	sed -e 's/ install-docs / /g' -e 's/ install-init / /g' -i mk/install.mk || die
-
-	# default config for Gentoo
-	# fix default pid-file path
-	# fix default directory path
-	# fix default log-file path
-	sed -e 's@/var/run/@/run/@g' \
-		-e 's@/var/lib/rethinkdb/@/var/lib/rethinkdb/instances.d/@g' \
-		-e 's@/var/log/rethinkdb@/var/log/rethinkdb/default.log@g' \
-		-i packaging/assets/config/default.conf.sample || die
-
-	# proper CXX declaration
-	sed -e "s/CXX=\$(.*/CXX=$(tc-getCXX)/g" -i configure || die
-
-	# respect user CXXFLAGS optimizations
-	sed -e 's/-O3//g' -i src/build.mk || die
-}
-
-src_configure() {
-	local conf_opts=(
-		--prefix="/usr"
-		--sysconfdir="/etc"
-		--localstatedir="/var"
-		--static=none
-		--dynamic=gtest
-		--dynamic=re2
-	)
-	if use jemalloc; then
-		conf_opts+=(--with-jemalloc)
-	elif use tcmalloc; then
-		conf_opts+=(--with-tcmalloc)
-	else
-		conf_opts+=(--with-system-malloc)
-	fi
-	./configure "${conf_opts[@]}"
-}
-
-src_compile() {
-	python_export python2.7 EPYTHON
-	emake VERBOSE=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" VERBOSE=1 install
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners rethinkdb:rethinkdb "${x}"
-	done
-
-	newconfd "${FILESDIR}/rethinkdb.confd" rethinkdb
-	newinitd "${FILESDIR}/rethinkdb.initd" rethinkdb
-
-	systemd_newunit "${FILESDIR}/"${PN}.service "rethinkdb@.service"
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd "rethinkdb.conf"
-
-	use doc && dodoc COPYRIGHT NOTES.md README.md
-}
-
-pkg_config() {
-	einfo "This will prepare a new RethinkDB instance. Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_data="/var/lib/rethinkdb/instances.d/${instance_name}"
-	local instance_config="/etc/rethinkdb/instances.d/${instance_name}.conf"
-	if [[ -e "${instance_data}" || -e "${instance_config}" ]]; then
-		eerror "An instance with the same name already exists:"
-		eerror "Check ${instance_data} or ${instance_config}."
-		die "Instance already exists"
-	fi
-
-	/usr/bin/rethinkdb create -d "${instance_data}" &>/dev/null \
-		|| die "Creating instance failed"
-	chown -R rethinkdb:rethinkdb "${instance_data}" \
-		|| die "Correcting permissions for instance failed"
-	cp /etc/rethinkdb/default.conf.sample "${instance_config}" \
-		|| die "Creating configuration file failed"
-	sed -e "s:^# \(directory=\).*$:\1${instance_data}:" \
-		-i "${instance_config}" \
-		|| die "Modifying configuration file failed"
-	ln -s /etc/init.d/rethinkdb "/etc/init.d/rethinkdb.${instance_name}" \
-		|| die "Creating init script symlink failed"
-
-	einfo "Successfully created the instance at ${instance_data}."
-	einfo "To change the default settings edit the configuration file:"
-	einfo "${instance_config}"
-	einfo " "
-	einfo "To start your instance, run:"
-	einfo "/etc/init.d/rethinkdb.${instance_name} start"
-}
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index b8b74e513cf1..1e93daa170d0 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -12,5 +12,5 @@ DIST sqlite-doc-3280000.zip 9421770 BLAKE2B 695eab96f718307a7aff8a171d9e416ddb4b
 DIST sqlite-src-3270200.zip 12248529 BLAKE2B b3c79b85bbfa376b31ebb4ad33aea3f0b60c1f6d1e6505e02758cffff41e44ea0c5b8c24892f0757502ed6213c0f97f00957632ddf0e5ffe25e9f8b7f62c6e9a SHA512 52f61e2fa54558b953dba62b27961eef8563f40e6b4a62638087cb22c7d1fdf2c915ea1071939e2e98f3ce6041da2c9bfb1bdbc1e8b8b4a049b8148e878a4e5e
 DIST sqlite-src-3280000.zip 12477204 BLAKE2B e62e0f36f0bebf89990f8ec91cb1e508a5ebc92bb212eaf9c80eb0febecb5623f5938ecd31c210837314f1f9aab19a18189824f82a106799384d8184ca5f65ab SHA512 49c35c65fa686a2326e13218db583c54fa5fe8f48f0caddd11a942601803b3023f7d32ffbab16641e0d72dc9ed288ad26eaa7226c865ac54e1f181859125651f
 EBUILD sqlite-3.27.2.ebuild 9949 BLAKE2B 2f377a97be15eabca01ba031906aea8a05ad8c19c3b88aa00fa18b3fd8ae875478210471e83b8e670d7ff3da0f8cafd5419810f8e178d49fd79d514b9da3af2f SHA512 8b6bf4e9b9120b7bac35382f6bb4058be193e8295a1d21f18c2d1c6ebbdcbc123f02a398cba01e0100091c760ca0a4137110b66a94993cdbad78c555428654be
-EBUILD sqlite-3.28.0.ebuild 10127 BLAKE2B e1bd35f25a1899e7ce64d3fab52bb6e8f1bde759d41e82bf702889b0ef91d89a3f0cf9bc67922312fb52b58a3cfd432d71cb82b3dd71db64ca44dc498c66a220 SHA512 7c7feda96ef31589c733179a84c0c6b78ee45f2e4270e7d63317417f805d673009ebb84453a83f92ebfb7b5af2e41ab41c4dc101be508cb2905ffa942f3d841c
+EBUILD sqlite-3.28.0.ebuild 10125 BLAKE2B 995abd8fccdb417572ed57027a4e4eed7d4c9ee0014d54b5dd0fd8180f61d9104b8c2134f0d3b9d5003be0d102500ad0efc22502a954fa4c66303887209fdbc3 SHA512 106a158606d090f03418bd0cc8cba68a61dff9d8adc2fb528e70d29ce59f76598c54f945ab48056fb9d8c0f3ace2c6b5a55bdd0ce247bcac8e0f7105af2517e1
 MISC metadata.xml 723 BLAKE2B 8866fbde770e7b8582de27303c72df047db80e0d70b1a1ceca0951a05b51bb704452071ceb6c29ecf3704d523888351615d1798aaab092e6b7505d4c6e3698ad SHA512 40616710b1d4edd3e24b5ac0797c1c9b606aeacac9f9543722bc9529e7c2c704a0c10b0ca68a5ba6e0a0ee8bc605212e8a49a050c8687afbdd7dbf28d6d4506a
diff --git a/dev-db/sqlite/sqlite-3.28.0.ebuild b/dev-db/sqlite/sqlite-3.28.0.ebuild
index 268cf2bb10c8..db4716a06b48 100644
--- a/dev-db/sqlite/sqlite-3.28.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.28.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2019/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
commit	2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree	c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /dev-db
parent	6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)