gentoo resync : 25.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
commit: 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree: 6208a7f4fc744684fce0f55acbb47511acace498 /dev-db
parent: 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)
39 files changed, 1349 insertions, 1030 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 0bce49426700..ceea4093e199 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/clickhouse/Manifest b/dev-db/clickhouse/Manifest
index 438d0120484d..ffd6cf8dd1f4 100644
--- a/dev-db/clickhouse/Manifest
+++ b/dev-db/clickhouse/Manifest
@@ -1,6 +1,8 @@
-AUX clickhouse-server.initd 452 BLAKE2B d083713e917c2e436316a42adccf8698159c268b4deeca8ce04548e0fb71de2db43a4f4ad3a0ca9b74c3e677cc006386b07a5099d8ae6247da246912ec009545 SHA512 553c4f59c5210c30b219507320debc5b1f9e33b777bc04a37a8598d433a34642e4e653dc74bdd11573e99f20ae9d869c8772d3f36a8e962eb76775695bee2ff7
+AUX clickhouse-server.initd 445 BLAKE2B 166b867de3ad86f814cfbbdfa86a9328a3a54a88438e628f790cc6be1e0eee272effa06db37bdb0d31a41ac1551321b5a756bbfe3a9a8381e327e12515253da1 SHA512 98d396709899a428012fb8f01fbd861359913e12d765924a6a20e5f5cf0da73a2c8b0561a061d4c581443259605841f55fa33ee881f8eb764d6d2446dd4bf849
 AUX clickhouse-server.service 307 BLAKE2B 1f443f68db97408cb2b0a8e9007195cdc5d6e29f54e55b3bd2b023cfbcb9d3ee4c1083503f83a42cfd18bca3320dfa86571434fe89612fb0a1f5a9e178eb706b SHA512 185db8aed69b178540225fa41f623a78af09e30d2dd1e033baf4d7c80451e702f5d6b9ce5240f7f6fb6d63a4ebed5af4d483515c7e6fe019e7fd44334df4ab37
 DIST cctz-4f9776a.tar.gz 290009 BLAKE2B 532eb7d590f9814c05cc7fdd3c75efe0a6b3f81d85201b14163a9600dd858c4fbac592270d0afccd7d5eef0080d7e70e9d716023bdb60d55479585e2cd3d3f59 SHA512 ba0dfc404cc70f03ef2be29fa3b0c70ea881c92a92525ea4ba1b5bcfc9e45df1b62a5eec180f498293e64bdd5cb9b41f97361cbb7e8baf299dcfdcd1557ca205
+DIST clickhouse-18.10.3.tar.gz 6136661 BLAKE2B 5564bbe85f4ca43f18df702148af0e4e5b5a8826994d90f29beb3a37cdbeb36f9d3ec77d9c7bc6f843e7586e5441aeb0937548eb5eb61d27cecc5790d8c21a5b SHA512 c78386922388cf910a995b569724eb22fc41ab60e765a4d3644c4a48d8b9a67ef28b7e375186b2eb00c43b4f06e90783084f4ac4d3789f1b6e4251ee30e8833c
 DIST clickhouse-18.6.0.tar.gz 5852534 BLAKE2B 5634fd26907b21d4a35cff3ed816696205be4aff1cdd1acfe222e24214b1842eb18a4e499e888b0d92b78f5c3023c2962a385af2c0ea889055e473dfa0198bf5 SHA512 e8ea2d4457122513cad47b1cdb2a58dd2ffaec77a7a08bf82179aca12a369d39970520a995bb5db2e5ea4b0939da827b7d4b1f3929cf71c149c965438ebb3633
+EBUILD clickhouse-18.10.3.ebuild 4915 BLAKE2B 3f6f0f1cea60a283b325b80100fc56ffcb548e6af01240a12a5f6a6aad521977c63e8918d3742c52c0fef2d5c79144f6a1f9cb95749a6c140cb16548af432f4a SHA512 0ecc73385521a4d916e8834d22e05a8be07fb0b2d6a4bcc3350dfab100717839835e4a47a17d87f50f98acbf420b077dc7f9db800e3456915dc2ed81fc0197ba
 EBUILD clickhouse-18.6.0.ebuild 4903 BLAKE2B d363915e46bfe1489e07f9ae9b07a39c146603af9496ab98371b053241566e02c7b85cf64a985ef8958e83a8741ac20583917e8268cec80702e4d37e69d8e110 SHA512 443eb0cd7f343eaff895dfbcb6a98abc4b2734495e2abd9c9f51e613fc2ac8698797bb5f780178c86bc0d8621cfe0b976470c7c4b9ec0bd337fa0599f0d01848
 MISC metadata.xml 738 BLAKE2B 861f40f506964d64cf646f043406945dc54950f48e27d4eb28b6fc0f96bf0ceb093520a0b60d813460fbe8b99ba4858f0a49d30abcb25567f44411c78a02f6e7 SHA512 6d87cc967c081b5a5e60136f5928d7b17c65c3a1c26aa1e45a50e74d5383bb665682a8b0cb5cce0496bebcac1f5e27aace8a8373253c031acc3c166c382e0056
diff --git a/dev-db/clickhouse/clickhouse-18.10.3.ebuild b/dev-db/clickhouse/clickhouse-18.10.3.ebuild
new file mode 100644
index 000000000000..fa20957d2696
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-18.10.3.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils systemd toolchain-funcs user
+
+DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
+HOMEPAGE="https://clickhouse.yandex"
+LICENSE="Apache-2.0"
+
+MY_PN="ClickHouse"
+TYPE="stable"
+
+CCTZ_COMMIT="4f9776a"
+SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz
+	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
+"
+
+SLOT="0/${TYPE}"
+IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+	static? ( client server tools )
+"
+
+RDEPEND="
+	dev-libs/re2:0=
+	!static? (
+		>=app-arch/lz4-1.8.0:=
+		>=app-arch/zstd-1.3.4:=
+		client? (
+			sys-libs/ncurses:0=
+			sys-libs/readline:0=
+		)
+
+		dev-libs/double-conversion
+		dev-libs/capnproto
+		dev-libs/libltdl:0
+		sys-libs/libunwind:7
+		sys-libs/zlib
+		|| (
+			dev-db/unixODBC
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu:=
+		dev-libs/glib
+		>=dev-libs/boost-1.65.0:=
+		dev-libs/openssl:0=
+		dev-libs/zookeeper-c
+		kafka? ( dev-libs/librdkafka:= )
+		mysql? ( virtual/libmysqlclient )
+	)
+
+	>=dev-libs/poco-1.9.0
+	dev-libs/libpcre
+"
+
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/mkdocs-1.0.1 )
+	static? (
+		>=app-arch/lz4-1.8.0[static-libs]
+		>=app-arch/zstd-1.3.4[static-libs]
+		client? (
+			sys-libs/ncurses:0=[static-libs]
+			sys-libs/readline:0=[static-libs]
+		)
+		dev-libs/double-conversion[static-libs]
+		dev-libs/capnproto[static-libs]
+		dev-libs/libltdl[static-libs]
+		sys-libs/libunwind:7[static-libs]
+		sys-libs/zlib[static-libs]
+		|| (
+			dev-db/unixODBC[static-libs]
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu[static-libs]
+		dev-libs/glib[static-libs]
+		>=dev-libs/boost-1.65.0[static-libs]
+		dev-libs/openssl[static-libs]
+		dev-libs/zookeeper-c[static-libs]
+		virtual/libmysqlclient[static-libs]
+		kafka? ( dev-libs/librdkafka[static-libs] )
+	)
+
+	sys-libs/libtermcap-compat
+	dev-util/patchelf
+	>=sys-devel/lld-6.0.0
+	|| (
+		>=sys-devel/gcc-7.0
+		>=sys-devel/clang-6.0
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
+
+_clang_fullversion() {
+	local ver="$1"; shift
+	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
+	eval echo "$ver"
+}
+
+clang-fullversion() {
+	_clang_fullversion '$1.$2.$3' "$@"
+}
+
+clang-version() {
+	_clang_fullversion '$1.$2' "$@"
+}
+
+clang-major-version() {
+	_clang_fullversion '$1' "$@"
+}
+
+clang-minor-version() {
+	_clang_fullversion '$2' "$@"
+}
+
+clang-micro-version() {
+	_clang_fullversion '$3' "$@"
+}
+
+pkg_pretend() {
+	if [[ $(tc-getCC) == clang ]]; then
+		if [[ $(clang-major-version) -lt 6 ]]; then
+			eerror "Compilation with clang older than 6.0 is not supported"
+			die "Too old clang found"
+		fi
+		:
+	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
+		eerror "Compilation with gcc older than 7.2 is not supported"
+		die "Too old gcc found"
+	fi
+}
+
+src_unpack() {
+	default_src_unpack
+	[[ ${PV} == 9999 ]] && return 0
+	cd "${S}/contrib" || die "failed to cd to contrib"
+	mkdir -p cctz zookeeper zstd || die "failed to create directories"
+	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_POCO_MONGODB="$(usex mongodb)"
+		-DENABLE_RDKAFKA="$(usex kafka)"
+		-DENABLE_TESTS="$(usex test)"
+		-DUSE_STATIC_LIBRARIES="$(usex static)"
+		-DMAKE_STATIC_LIBRARIES="$(usex static)"
+		-DUSE_MYSQL="$(usex mysql)"
+		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
+		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
+		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
+		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
+		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
+		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
+		-DENABLE_CLICKHOUSE_ALL=OFF
+		-DUSE_INTERNAL_SSL_LIBRARY=False
+		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
+		-DUNBUNDLED=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use test; then
+		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
+	fi
+
+	if use doc; then
+		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
+		./build.py || die "Failed to build docs"
+		popd || die "Failed to exit docs build directory"
+
+		dodoc -r "${S}/docs/build"
+	fi
+
+	if use server; then
+		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
+		systemd_dounit "${FILESDIR}"/clickhouse-server.service
+	fi
+}
+
+pkg_preinst() {
+	if use server; then
+		enewgroup clickhouse
+		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
+	fi
+}
diff --git a/dev-db/clickhouse/files/clickhouse-server.initd b/dev-db/clickhouse/files/clickhouse-server.initd
index 57c91cd2389c..5e787c0c1fa6 100644
--- a/dev-db/clickhouse/files/clickhouse-server.initd
+++ b/dev-db/clickhouse/files/clickhouse-server.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 pidfile="/run/clickhouse-server.pid"
 command_background=1
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index f292963781ab..958c5d1f62c4 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -6,5 +6,5 @@ AUX resolve-config-softlinks.patch 846 BLAKE2B 257d552458e7d4b59d45fa6827e081dfc
 AUX server.properties 686 BLAKE2B 6b4482dfe6187adada772cffb1a46e39bacd9fa8ca5501dd58414f9815dc6b118d3f9de909953f88f1055ae1984ef3f9aee479c339920bf182f31f4265cdb6f1 SHA512 c36a1d2e387762f96872d94bdb3a6a2af9edb949be9d33321f9ea4e3fb996baecff6fc3875b6bef8f73a54a6a1cedd71dcdf97c881819cb130b1a2b43ec7e842
 AUX sqltool.rc 560 BLAKE2B 5f5e4bd1e9fe9759c2e2d5b6b5274343caa5028b29cfa4597c3a3348a1b07e4540d608d3dea5b189cf471b85721f15018490a7e4f8c56cc48ce648a07f0b7a45 SHA512 80ce53ad07c2091113787cb41232e5900426b042dcc3f62157569588538ad26d471e5d17aac62052902789065efb01647bfbc3488ff3d0f3c9e3df513895f57c
 DIST hsqldb_1_8_1_3.zip 3170550 BLAKE2B 0664bfa259af5091e3e76ca804e9c9890457ecc982ab07ee37640dc713053fb63d6dd295e9db4adb5e5436fac6275745526d3e830dd84e5daa3a32162627dc76 SHA512 0483ca3299b63b4931b07d49588c729231efca76a317b9620abbd5039127f3f79449eaa1e9d29c52782c58bdb0cc4879b1e3f30f669d2c02c880818f531a8442
-EBUILD hsqldb-1.8.1.3-r2.ebuild 5598 BLAKE2B 9a4d53b5e21ac4064140a94e7f0d53ae5bfab87d7a3dfae7611132f238e41b8daea394a0aee8eb3aa4ed06ec14438ac3ebe36d7d3749a111bd9b1ed94927e75c SHA512 06572f67b9027c4a999df509f0a7a5592c88fb98bd7168df750296543f456c644fcfdba03a6691ffbeda6e47490844cf8e4b7cd0b7a67e65667fd0d1cac6ae5c
+EBUILD hsqldb-1.8.1.3-r2.ebuild 5506 BLAKE2B 181b39daf21f24e9b546a2a455ffa28a574120c65ad57a729a6130c5566899bd7aade19a0a6394df02eb0eacd147eb4fe4269588e1e90783661dd9b6a614fc07 SHA512 77a89accb4b7a34b7c3f4987a32c5ed87249e0df0df51925f6515a777a97d8eb5092e8e8acb690569db057a87ea345c9f41976087a41b4fbb7647426ffbf0420
 MISC metadata.xml 312 BLAKE2B 175d7bb3c54ffcc616117749062b16130ca8cf394ffd780991bd8bd5a21509527e2844cd4f1aaeba70b498274131d786b9a16d48d5ee8dca176e949e334093a6 SHA512 2b9fff35bd58701cd4992ddc02f6bc7a2027d90616a5b886ef352ad6c6781949a68478bb17bbc22382189ec73ddd1798f67c27941323cb0b727dfead38c7f975
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
index 3a136fca2315..4a22787f84f7 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -64,8 +64,8 @@ java_prepare() {
 	cp "${FILESDIR}/sqltool.rc" conf/ || die
 
 	# Missing source file - needed for tests
-	# http://hsqldb.cvs.sourceforge.net/*checkout*/hsqldb/hsqldb-dev/src/org/hsqldb/lib/StringComparator.java?revision=1.1&pathrev=hsqldb_1_8_0_10
-	# https://sourceforge.net/tracker/index.php?func=detail&aid=2008754&group_id=23316&atid=378131
+	# https://sourceforge.net/p/hsqldb/svn/HEAD/tree/base/trunk/src/org/hsqldb/lib/StringComparator.java
+	# https://sourceforge.net/p/hsqldb/bugs/815/
 	cp "${FILESDIR}/StringComparator.java" src/org/hsqldb/lib || die
 	cp "${FILESDIR}/TestBug1191815.java" src/org/hsqldb/test/ || die
 }
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index c638da55a58f..e67d2e7e2ee7 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -13,6 +13,6 @@ DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665 BLAKE2B
 DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057 BLAKE2B e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4 SHA512 b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
 EBUILD myodbc-5.2.7-r1.ebuild 3300 BLAKE2B 9cc0f8a8ddf448c286594d7f27a85c113b98de2ded3eee1cc16661c54f48075fded3a8b0906a542a4a268e1144ab6d9c1b221d850b06faf9553bde8b4ca731bd SHA512 d8ffec3733dd3a811155fe03296081d3d54c17ed2d46b41e48213cf5f996ae7a4955d216355a8c0afa20142ccd243ebbbbfb8d40826fcd3f1a1e681b34126879
 EBUILD myodbc-5.2.7-r3.ebuild 3698 BLAKE2B 150992141e50dad64396392399791f02a8920485dae1d23c776a89cce3f648b9d0fac1c59202409be03c5bc27b7ca582d31ab1ff3480d9beef5847eda0e0380d SHA512 ee50335e1dff98d7b5b2a4248972c8423a4aaa8293a9404f659a789b9bb915f43e2d174482e07a9179af1cf6bf822de6a5a2e746f7410de7b06a350a3d03f9d2
-EBUILD myodbc-5.3.10-r2.ebuild 3591 BLAKE2B d4259c93e928c387bc72d5eeba31c2a574e7fcc4a5a302469959ef790b2ab492fa955ee959be8a709d44202ebcc2f8badca0427a40ce627c66e007c96ca4ceed SHA512 6c96641d40c7927aa9a80719d02eb80673f5b2845c465f3fcf11a10b3cc166124297c040d8ad7242dbc79d1ecba2fb8c4f15cc2944938ff53f795129cc6b1b04
+EBUILD myodbc-5.3.10-r2.ebuild 3588 BLAKE2B db9749af6dd80c60ae359485e3526258e43ea7003b2302076b0ef39a72098663b27f9413d050809328fe4348f5c129135f163da8d895f65d8c9f76bd53415eb4 SHA512 33d3aced0bc4575baa860dc53f1a6b35b6a5dc2e1815d88922d66c5270e570deaa0dc20018d9329c4651cef00f48b902b208671dd0836e7224d11972491b9e66
 EBUILD myodbc-5.3.9.ebuild 3072 BLAKE2B 4922ed231672f11742590007b7b1f5c5dfa27263a6c98893b373793da06088f29c5401917179d479f4c57b24b2a1be9c3507caa752db79f3268fceff4719013d SHA512 4da8b034a745c453a310391a38e5cb1697bfa51838edc6903ee643e7dbe28fa5fb8f7d34264f88bb79b2aba83fa042212c0a2dd251c15150f7f0a2fcf561e052
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
index 1172fce91be0..28dde7ddccb8 100644
--- a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
 
 LICENSE="GPL-2"
 SLOT="${MAJOR}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 # Does not build with libmariadb
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 4196a876e885..ef2b8dd49ab3 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -3,6 +3,8 @@ DIST mysql-extras-20171121-1518Z.tar.bz2 313539 BLAKE2B c397fdf7ffb3fcbcecda2093
 DIST mysql-extras-20180628-0201Z.tar.bz2 322141 BLAKE2B fce35cfea4ffa9860908fcdf440cd0d714c402c42ee2afb22cec9e727971c216310c7db561ca1b37deebb2cea5137fe24f19b491ad500949e3170ccec3de0b13 SHA512 71a3800ec091b41e41d25536199149eb714c0bbfc0f6fc478e8e4dcaf4cf87a7e4d49c513da3c9badc0de810d7d78c05ad91dd898e45005b42136346237de42a
 DIST percona-server-5.6.39-83.1.tar.gz 56307662 BLAKE2B 474e497a83e7a8f7bf628b2622a0bfeead0f5003ed87dd4228e85a8b1c75bfdfc40f75604e9ed621f6d143d69bcada29163bf140b765951cf0b23e5660623e52 SHA512 d014bc0ebf8d8f1842b4a79eb0a868e3c9e0e33d3eb3cbf301b5504dcb341e1f2a0d6c2c4003666f59fbf75eb274356ee6b059ff2cddf2b457143ee5e1aba471
 DIST percona-server-5.6.40-84.0.tar.gz 52684007 BLAKE2B 11658be2319880f7e8815c7b620b7d460dd7a559316ca96905573b0fa2d7180b084ed425f76f6d850f06862e424b5a8d6ced8356f9075826b77e89e86095eb40 SHA512 b1075933bdf1afb726acd799e834cb45a1d2a15d3f37f313da71f8da03a7b9480d7ccfb4cb6a820fb6ccf58851d8c9473bce975203cd6bc007a2b74b36a1127f
+DIST percona-server-5.6.41-84.1.tar.gz 52736448 BLAKE2B 1ec5e17f08274caa3882f829f25bbf74a3b37d2ba208f62376106f0d89e5470f461f7852e365d5da9503d5500702e28f08461e5aa0c5ae6b1a30a0e98dbb426b SHA512 60783154f9ab097083a484c34e584b396eeba4aa53dc8616c467ca9c85cc626be08e3165740703453cc4fb35f3af94ac34260f1e2bb133d60f832661251cbb3c
 EBUILD percona-server-5.6.39.83.1.ebuild 8506 BLAKE2B fe867adcb0963c377b7f06ccba8b4d49fa878390321c5dd77562e27527c9503182cdd853fbcd42c5558d3ff8cb4676ec0e251fc65331bd31419bf92907ba8b2b SHA512 fd146e3f0db22253af87e4c98c34285ff9fd39bb640ab968cd58ee181d8b573c970ec71e7f34aa0999a05e6d4537055f4f588a2434412881431747e5c79c31ea
 EBUILD percona-server-5.6.40.84.0.ebuild 31823 BLAKE2B 4f7f9fd07789c13b8834a8ac80fc95ba0c8ddc6e70c0b6bb4b831bd84981de6b3a32373552dcc3ebfb46638e8878785408e5906567ce5dd10386f7f6fec783d0 SHA512 78a8bee554dc6fd9b3ff22a5696aa341d0687577a4f1b0f9ab5c283ec68488c1a10a1df56a432f9316f5933c4fa4d61f689da39a549b415837ffc79657896966
+EBUILD percona-server-5.6.41.84.1.ebuild 31724 BLAKE2B 6a85999f4cd0fb854c4a5a62bf4be68429f11be858567e26b052d40b1aae3541288769885a7199e2314adb818ca46e3aa8644ac149a198d52ccb3ccc3f5038de SHA512 b11e1bc4e11167e4e3256ec1e59de0bfd8e420967d299ad71ce0b4f10faed47e9f4412cf390fdede1ba9756eed22c1f013e251cd99fea5eb0bc1fc9ec4b75e25
 MISC metadata.xml 1689 BLAKE2B 6dca9970c094409b460efb0a90d7069c76a598d864b057a11ddc0659a6eb11fef2f0a8a4926167cb76601da021b3591818b0be594c1095bab14553bf7e243dbe SHA512 34406d84c5198256694ea7c442ff40d93650359dfafb63eec59a3e24b4a786dde534eb58936b1bff4012ddf964ed9d32c1f1c03a45edd21bb79f49d791398f56
diff --git a/dev-db/percona-server/percona-server-5.6.41.84.1.ebuild b/dev-db/percona-server/percona-server-5.6.41.84.1.ebuild
new file mode 100644
index 000000000000..0f90f84fff87
--- /dev/null
+++ b/dev-db/percona-server/percona-server-5.6.41.84.1.ebuild
@@ -0,0 +1,944 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20180628-0201Z"
+PYTHON_COMPAT=( python2_7 )
+CMAKE_MAKEFILE_GENERATOR=emake
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit linux-info python-any-r1 eutils flag-o-matic prefix toolchain-funcs \
+	versionator user cmake-utils multilib-minimal
+
+MY_PV=$(replace_version_separator 3 '-')
+MY_PN="Percona-Server"
+MY_MAJOR_PV=$(get_version_component_range 1-2)
+MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/5.6/release-notes/release-notes_index.html"
+SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.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://www.percona.com/software/percona-server"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team"
+LICENSE="GPL-2"
+SLOT="0/18"
+IUSE="-client-libs cracklib debug jemalloc latin1 libressl numa pam +perl profiling rocksdb selinux
+	+server static static-libs systemtap tcmalloc test test-suite tokudb tokudb-backup-plugin yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="libressl? ( test )
+	!test? ( test )"
+
+REQUIRED_USE="tokudb-backup-plugin? ( tokudb ) tokudb? ( jemalloc !tcmalloc ) ?? ( tcmalloc jemalloc ) static? ( yassl )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+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}"/01050_all_mysql_config_cleanup-5.6.patch
+	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
+	"${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.6.20.patch
+	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
+	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.6.37.patch
+	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
+	"${MY_PATCH_DIR}"/20018_all_percona-server-5.6.39-without-clientlibs-tools.patch
+)
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+# MULTILIB_USEDEP only set for libraries used by the client library
+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= )
+	!yassl? (
+		client-libs? (
+			!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+		)
+		!client-libs? (
+			!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] )
+	!client-libs? ( >=sys-libs/zlib-1.2.3:0= )
+	sys-libs/ncurses:0=
+	server? (
+		>=dev-libs/boost-1.65.0:=
+		numa? ( sys-process/numactl )
+		pam? ( virtual/pam:0= )
+		tokudb? ( app-arch/snappy )
+		tokudb-backup-plugin? ( dev-util/valgrind )
+	)
+	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
+"
+DEPEND="virtual/yacc
+	static? ( sys-libs/ncurses[static-libs] )
+	test? (
+		$(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]')
+		dev-perl/JSON
+	)
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
+	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster
+	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+	${COMMON_DEPEND}
+"
+# 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 )"
+
+python_check_deps() {
+	has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
+}
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
+	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_pretend() {
+	if use numa; then
+		local CONFIG_CHECK="~NUMA"
+
+		local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
+		WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
+
+		check_extra_config
+	fi
+}
+
+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 "Unsupported GCC version"
+		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 "Unsupported GCC version"
+		fi
+
+		use test && python-any-r1_pkg_setup
+	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"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Grab the patches
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
+
+	mv -f "${WORKDIR}/${PN}-${MY_PV}" "${S}" || die
+}
+
+src_prepare() {
+	if use jemalloc ; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	elif use tcmalloc ; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+
+	# Don't build bundled xz-utils
+	if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then
+		echo > "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
+		sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
+	elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then
+		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
+	fi
+
+	if [[ -d "${S}/plugin/tokudb-backup-plugin" ]] && ! use tokudb-backup-plugin ; then
+		 rm -r "${S}/plugin/tokudb-backup-plugin/Percona-TokuBackup" || die
+	fi
+
+	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
+	if [[ -d "${S}/support-files/SELinux" ]] ; then
+		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+	fi
+
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+
+	cmake-utils_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
+
+	if use client-libs ; then
+		multilib-minimal_src_configure
+	else
+		multilib_src_configure
+	fi
+}
+
+multilib_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if ! multilib_is_native_abi && ! use client-libs ; then
+		return
+	fi
+
+	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/mysql
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_SCRIPTDIR=share/mysql/scripts
+		-DINSTALL_SQLBENCHDIR=NO
+		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		### TODO: make this system but issues with UTF-8 prevent it
+		-DWITH_EDITLINE=bundled
+		-DWITH_ZLIB=system
+		-DWITH_LIBWRAP=0
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		# 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)
+		-DWITH_LIBEVENT=NO
+	)
+	if use test || use test-suite ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	if ! use client-libs ; then
+		mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
+	fi
+
+	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+	# systemtap only works on native ABI  bug 530132
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DENABLE_DTRACE=$(usex systemtap)
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_TOOLS=1
+			-DWITH_READLINE=1
+			-DENABLE_DTRACE=0
+		)
+	fi
+
+	if multilib_is_native_abi && use server ; then
+		mycmakeargs+=(
+			-DWITH_PAM=$(usex pam)
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+
+		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
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DENABLED_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_EXAMPLE_STORAGE_ENGINE=0
+			-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
+			-DWITH_FEDERATED_STORAGE_ENGINE=1
+			-DWITH_INNODB_MEMCACHED=0
+			-DWITH_ROCKSDB=$(usex rocksdb 1 0)
+			$(usex tokudb '' -DWITHOUT_TOKUDB=1)
+		)
+
+		if use tokudb ; then
+			# TokuDB Backup plugin requires valgrind unconditionally
+			mycmakeargs+=(
+				$(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1)
+			)
+		fi
+
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	if use client-libs ; then
+		multilib-minimal_src_compile
+	else
+		multilib_src_compile
+	fi
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+}
+
+# Official test instructions:
+# FEATURES='test userpriv -usersandbox' \
+# ebuild percona-server-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"
+
+	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 "Failed to create \"${T}/var-tests{,/log}\""
+
+	# Run mysql tests
+	pushd "${TESTDIR}" > /dev/null || die "Failed to chdir into \"${TESTDIR}\""
+
+	touch "${T}/disabled.def"
+	# These are failing in MySQL 5.6 for now and are believed to be
+	# false positives:
+
+	local t
+	for t in main.mysql_client_test \
+		binlog.binlog_statement_insert_delayed main.information_schema \
+		main.mysqld--help-notwin binlog.binlog_mysqlbinlog_filter \
+		perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
+		funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \
+		main.variables main.myisam main.merge_recover \
+		engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate \
+		engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \
+		engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \
+		main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
+			_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	if use numa && use kernel_linux ; then
+		# bug 584880
+		if ! linux_config_exists || ! linux_chkconfig_present NUMA ; then
+			for t in sys_vars.innodb_buffer_pool_populate_basic ; do
+				_disable_test "$t" "Test $t requires system with NUMA support"
+			done
+		fi
+	fi
+
+	# Set file limits higher so tests run
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+		--testcase-timeout=30 --reorder --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"
+
+	if [[ -n "$failures" ]] ; then
+		if has usersandbox ${FEATURES}; then
+			ewarn "Some tests may have failed due to FEATURES=usersandbox"
+			ewarn "Please confirm test failure with FEATURES=-usersandbox before reporting a bug."
+		fi
+
+		die "Test failures: $failures"
+	fi
+
+	einfo "Tests successfully completed"
+}
+
+src_install() {
+	local MULTILIB_WRAPPED_HEADERS
+	local MULTILIB_CHOST_TOOLS
+	if use client-libs ; then
+		# headers with ABI specific data
+		MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/mysql/server/my_config.h
+			/usr/include/mysql/server/mysql_version.h )
+
+		# wrap the config scripts
+		MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+		multilib-minimal_src_install
+	else
+		multilib_src_install
+		multilib_src_install_all
+	fi
+}
+
+# Intentionally override eclass function
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
+	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
+}
+
+multilib_src_install_all() {
+	# 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-suite ; then
+		rm -rf "${D%/}/${MY_SHAREDSTATEDIR#/}/mysql-test" || die
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	mycnf_src="my.cnf-5.6"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		"${FILESDIR}/${mycnf_src}" \
+		> "${TMPDIR}/my.cnf.ok" || die
+	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR}/my.cnf.ok"
+	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" my.cnf
+
+	if use server ; then
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		for script in \
+			"${S}"/support-files/my-*.cnf.sh \
+			"${S}"/support-files/magic \
+			"${S}"/support-files/ndb-config-2-node.ini.sh
+		do
+			[[ -f $script ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}"
+		done
+	fi
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED%/}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+}
+
+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 use client-libs && [[ -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 "${EROOT%/}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${EROOT%/}${MY_LOGDIR}"
+
+	if use server ; then
+		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
+			local _replacing_version=
+			for _replacing_version in ${REPLACING_VERSIONS}; do
+				local _new_version_branch=$(get_version_component_range 1-3 "${PV}")
+				local _replacing_version_branch=$(get_version_component_range 1-3 "${_replacing_version}")
+				debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+				if ! version_is_at_least "${_new_version_branch}" "${_replacing_version_branch}"; then
+					debug-print "Upgrading from v${_replacing_version_branch} to v${_new_version_branch} ..."
+					# https://www.percona.com/blog/2014/09/19/mysql-upgrade-best-practices/
+
+					einfo
+					elog "You are upgrading an existing ${PN} installation, you should review"
+					elog "release notes at ${MY_RELEASE_NOTES_URI}"
+					elog "and run the mysql_upgrade tool."
+					einfo
+
+					// Break loop - we only want to show this hint once
+					break
+				fi
+			done
+		fi
+
+		elog "Since ${PN}-5.6.39.83.1-r1 we no longer provide client libs."
+		elog "Applications depending on client libs should migrate to virtual/libmysqlclient"
+		elog "which will pull-in dev-db/mysql-connector-c as their new client lib provider."
+		einfo
+	fi
+}
+
+pkg_config() {
+	_getoptval() {
+		local mypd="${EROOT%/}"/usr/bin/my_print_defaults
+		local section="${1}"
+		local flag="--${2}="
+		local extra_options="${3}"
+		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+	}
+
+	# 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"
+
+	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="${EROOT%/}/${MY_DATADIR#/}"
+		MY_DATADIR_s="${MY_DATADIR_s%%/}"
+		local old_MY_DATADIR_s="${EROOT%/}/${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
+
+	# These are dir+prefix
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ -d "${EROOT%/}/${MY_DATADIR#/}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "(${EROOT%/}/${MY_DATADIR#/}/*)"
+		ewarn "Please rename or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	if [[ ! -d "${EROOT%/}/${MYSQL_TMPDIR#/}" ]] ; then
+		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT%/}/${MYSQL_TMPDIR#/}"
+	fi
+	if [[ ! -d "${EROOT%/}/${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
+
+	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
+
+	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 http://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 "${EROOT%/}/${MY_DATADIR#/}" ]] ; then
+		install -d -m 750 -o mysql -g mysql "${EROOT%/}/${MY_DATADIR#/}" || die "Could not create data directory"
+	fi
+
+	pushd "${TMPDIR}" &>/dev/null || die
+
+	# Filling timezones, see
+	# http://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/mysql/scripts/mysql_install_db" )
+	[[ -f "${cmd}" ]] || cmd=( "${EROOT%/}/usr/bin/mysql_install_db" )
+	cmd+=( "--basedir=${EROOT%/}/usr" ${options} "--datadir=${EROOT%/}/${MY_DATADIR#/}" "--tmpdir=${EROOT%/}/${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 ${EROOT%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+	fi
+	popd &>/dev/null || die
+	[[ -f "${EROOT%/}/${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=${EROOT%/}/${MY_DATADIR#/} \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--socket=${socket} \
+		--pid-file=${pidfile}
+		--tmpdir=${EROOT%/}/${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/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index cb26e6d50791..140b6e1dbed3 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,7 +1,3 @@
-DIST pgadmin4-2.0.tar.gz 24988176 BLAKE2B 96e942d5001b1d590fb1b642933c665a13bca5429d3a3e74eefe4a8090c76515cc08b656ebfea3a170b4fa6077d7086fbffdd5fddfcb517be08fd4ecc20052ab SHA512 463e95a341dec74ac0a08a647af1cbe83b514b0595b8469ab9c7b5335e24604e082b906d530aa735fef7b08c58d8a8a6df3edf5dc65402f6521165f1cbb72f67
-DIST pgadmin4-2.1.tar.gz 27842212 BLAKE2B 26c12dff8e2e5e37dd2911f6eb582a0f706d73490c8d93e83b07b7537fc201547d095d4f34181d2502bbc29b2741614adabf876b7e6ea3ef5f555eab94caa240 SHA512 02bc122ae53db595a1fd395e634fc4d0891f024a2e5e341c81b306a8c1d07bc18e5673cda440c7ba56754be4902ae4441010db0140132352e12b8986c8c0f47c
 DIST pgadmin4-3.0.tar.gz 28915010 BLAKE2B 7e6dccd91f082f7b5514f5d3abdf4653a9961b4efc706e10ce58d817785d514508233e25068762fe0e4bca4c1a3cf10a2515afa38e6f9ba3c99b4af3fa32f3d2 SHA512 5921340176e6748ef13112d906061f195d4bb2f73917d762371bbaeb44ef66cf8e0edcd1cd241eb78dae46ed0b3af014c749468a930fb0c0983b38b2c54dfc3a
-EBUILD pgadmin4-2.0-r1.ebuild 3429 BLAKE2B d252add75134ec26117e9ff39c1c25922d077b47ae48b4c9fe9a447bd7b08d7b6329d92773fc96567b0ff0801427f21ed02262bab80265e9df7f63ca651c6af1 SHA512 81e3244cf422995ef773b916a4e25e0ea492dac0d2c9a19b5e9eb0f2cec89ad820f4488d531eb82bff794fc43d72a27f9ef817db911d73f634404f26d53150e4
-EBUILD pgadmin4-2.1.ebuild 3433 BLAKE2B 21e4f8e594915801087b5f248b5c7f3c2b4f58eb38bbcbfe9702f2edb5afd7527ee048f8175adde257d4782358f3d201808094059fc417e834feaaeb7b8bba14 SHA512 0cabdc6a6d02180e43ea68ba3547272d6974d5de7b1b6f2064840bcdf93cf0046085db634632d8fecfcf47c2aab8f8c912bd3a70684b544cbacff0b7b555de0d
 EBUILD pgadmin4-3.0.ebuild 3481 BLAKE2B 697a5b6250d747aff9b4216603077a977a84c44bd344f935315eb0ca9a41b85527b32df819738d42626759fb8244392c15edd4909c9b8f03cdb82debf24f5172 SHA512 5f14d65bc3dac207fd3ced4105be3115cd0821a6a5054ce9d150d31d19ca5de44c66b3971444e200d79bfc6b11949cd437a0cbec388f26beef94ccdacb1c3b19
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild b/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild
deleted file mode 100644
index f06a6e951ffc..000000000000
--- a/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 qmake-utils
-
-DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="doc"
-
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-qt/qtwidgets:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwebengine:5[widgets]
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/htmlmin-0.1.10[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/click-6.6[${PYTHON_USEDEP}]
-	>=dev-python/extras-0.0.3[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-gravatar-0.4.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-htmlmin-1.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-migrate-2.0.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-paranoid-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-security-1.7.5[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-2.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.12[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-0.9999999[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
-	>=dev-python/mimeparse-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.2[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.9.1[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.11.13[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.1.19[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2014.10[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.6.5[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.14[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-2.0.2[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}"/${P}/runtime
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_compile() {
-	default
-	if use doc; then
-		cd "${WORKDIR}"/${P} || die
-		emake docs
-	fi
-}
-
-src_install() {
-	dobin pgAdmin4
-
-	cd "${WORKDIR}"/${P} || die
-
-	local APP_DIR=/usr/share/${PN}/web
-	insinto "${APP_DIR}"
-	doins -r web/*
-	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
-		SERVER_MODE = False
-		UPGRADE_CHECK_ENABLED = False
-	EOF
-	python_optimize "${D}${APP_DIR}"
-
-	local CONFIG_DIR="/etc/xdg/pgadmin"
-	dodir "${CONFIG_DIR}"
-	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
-		[General]
-		ApplicationPath=${APP_DIR}
-		PythonPath=$(python_get_sitedir)
-	EOF
-
-	if use doc; then
-		rm -r docs/en_US/_build/html/_sources || die
-		insinto /usr/share/${PN}/docs/en_US/_build
-		doins -r docs/en_US/_build/html
-	fi
-}
diff --git a/dev-db/pgadmin4/pgadmin4-2.1.ebuild b/dev-db/pgadmin4/pgadmin4-2.1.ebuild
deleted file mode 100644
index 2170883f8a21..000000000000
--- a/dev-db/pgadmin4/pgadmin4-2.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 qmake-utils
-
-DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="doc"
-
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-qt/qtwidgets:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwebengine:5[widgets]
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/htmlmin-0.1.10[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/click-6.6[${PYTHON_USEDEP}]
-	>=dev-python/extras-0.0.3[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-gravatar-0.4.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-htmlmin-1.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-migrate-2.0.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-paranoid-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-security-1.7.5[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-2.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.12[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-0.9999999[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
-	>=dev-python/mimeparse-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.2[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.9.1[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.11.13[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.1.19[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2014.10[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.6.5[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.14[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-2.0.2[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}"/${P}/runtime
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_compile() {
-	default
-	if use doc; then
-		cd "${WORKDIR}"/${P} || die
-		emake docs
-	fi
-}
-
-src_install() {
-	dobin pgAdmin4
-
-	cd "${WORKDIR}"/${P} || die
-
-	local APP_DIR=/usr/share/${PN}/web
-	insinto "${APP_DIR}"
-	doins -r web/*
-	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
-		SERVER_MODE = False
-		UPGRADE_CHECK_ENABLED = False
-	EOF
-	python_optimize "${D}${APP_DIR}"
-
-	local CONFIG_DIR="/etc/xdg/pgadmin"
-	dodir "${CONFIG_DIR}"
-	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
-		[General]
-		ApplicationPath=${APP_DIR}
-		PythonPath=$(python_get_sitedir)
-	EOF
-
-	if use doc; then
-		rm -r docs/en_US/_build/html/_sources || die
-		insinto /usr/share/${PN}/docs/en_US/_build
-		doins -r docs/en_US/_build/html
-	fi
-}
diff --git a/dev-db/pgtap/Manifest b/dev-db/pgtap/Manifest
index d850f2262d85..a1904b193094 100644
--- a/dev-db/pgtap/Manifest
+++ b/dev-db/pgtap/Manifest
@@ -1,3 +1,3 @@
 DIST pgtap-0.98.0.zip 270583 BLAKE2B 25d409f5fc63bc7059e8a4ffd3cb460885648f8569cd10ca05d4c5fbe09af323ecc719d663f81389d45f4a4910ca77beef968e264a0d3f4fabf63fa30b8b98ac SHA512 478841aa9cf378120713b90f33dc16d40fdd030ee1856edd4bfa288a7803cabad09661cf5219925335d9220e12b6202a1fcd8cc0fc55d1974d1e98dc0f6ddac0
-EBUILD pgtap-0.98.0.ebuild 471 BLAKE2B 9814d061fa70ee6635834202f36698bf99c263ecf39fd5a2c90cc8b4e46f1950905a5d3acf64f11244af0a3b700cb8155d430f60aca9dc266ebeee2741c9c921 SHA512 9de14401971029d2ff8e0ed123eca7f0539aa8d46fd86b90a8c82cff1dbcb21d29baaaf42ee915640b49c3586dd5512e876e0850227630e2760817a4e6bc5aee
+EBUILD pgtap-0.98.0.ebuild 488 BLAKE2B 4c9e215882a272b5cfd2c58c75cc3e589cabf79f1653d1eaf259fb198316dd3fb98b0d7792e742af88e9931039c29a5c459205c9624d15f8cb1e212bb39b46a7 SHA512 ccb8d89695c5ac7d4eaf8cd281bb4f29fdd85e490e7d6aac4a78b62c09c4d1a6f0601f728ed52a83e0cac543e1f862836872ea9717967190f06f169e31353e9b
 MISC metadata.xml 628 BLAKE2B 8a671273bb0de6f11d5ea56a3bf38e9eee05c0a70ff8cefe183f0eb798afbead29e96d5a45f764e2afc437cc97d91590e648c6716a8dd8fa7a6cc9f072332e0c SHA512 1c06c14ea5af9248950e6c10ab877b0725c4885082211db94b8a195fdf0dd115dc584a325655b7155895ec4382008e03511aa238d43179310fbe3dc835f5270a
diff --git a/dev-db/pgtap/pgtap-0.98.0.ebuild b/dev-db/pgtap/pgtap-0.98.0.ebuild
index c741599fa92e..132d08707734 100644
--- a/dev-db/pgtap/pgtap-0.98.0.ebuild
+++ b/dev-db/pgtap/pgtap-0.98.0.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="${POSTGRES_DEP}
+		app-arch/unzip
 		dev-perl/TAP-Parser-SourceHandler-pgTAP
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index d48004e9f2ef..1ee08e05be19 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -30,20 +30,20 @@ DIST postgresql-9.6.8.tar.bz2 19528927 BLAKE2B 6aab5dbe4b13e1624befc33c2fa524180
 DIST postgresql-9.6.9.tar.bz2 19566222 BLAKE2B e92a5ffaa8f4400364a174fc21ab11bb18c96dce9be721e6073ff7ad21b828859c2ac5fe8da81cad6a3d2a63a62d8fcb067d4bb02a9d23903525ad1f78955470 SHA512 3ce2a8f3a017d9c0bd0f1b475a9ee02bcb6a4119b0d436757911f444f49f5024bb1a1be07ce16a79e71af77799de1bf952b32279b4566bae075f23a50b8545c6
 EBUILD postgresql-10.3.ebuild 13694 BLAKE2B cbc3b1250d2b50dd7a9c318a9c610506db4b2593b013b2d89a573276ab8604cff741a1a3ca03a97e3c9a6bd7392762f821caf90d642c9a05cc9ca0b411340bbf SHA512 4b6fb894e8d5196139a56b897d3a06169c35def0d7e472ac8332987445f7c7ce72568b3b7a45bd7e8dac651108731761c413296864b0c9be4a617217d49ef3ec
 EBUILD postgresql-10.4.ebuild 13702 BLAKE2B 3b49b819926f1270075bcfac90497ffec28133761f1bec0d1dbca1e8cb3474567948183bb47d4c17fff93dcb0d12815a288e1b40e0cf8df34455374118748969 SHA512 135b2f0a4e2c5302961d3dba64fb2072568204a0205de91d20b14a6a2fc8ad7a14d90e96bc82708c2d8b63148d6e3220ac6b1971279ec52da40da4bad88969e8
-EBUILD postgresql-10.5.ebuild 13702 BLAKE2B 3b49b819926f1270075bcfac90497ffec28133761f1bec0d1dbca1e8cb3474567948183bb47d4c17fff93dcb0d12815a288e1b40e0cf8df34455374118748969 SHA512 135b2f0a4e2c5302961d3dba64fb2072568204a0205de91d20b14a6a2fc8ad7a14d90e96bc82708c2d8b63148d6e3220ac6b1971279ec52da40da4bad88969e8
+EBUILD postgresql-10.5.ebuild 13699 BLAKE2B 925aca64b8b4c848923fff6d08961d73fb388c507539386b994690cee1edb3b1518628eec59ea8ebe3da0474727d0bcdea615ace99aaab099f58bc70b76de707 SHA512 2fae508f81bd9eeadcd99f96042ff25af63b0a74fd0c41e73b682d23ab387ede44563896ebc10304d51773e6e49589b837c496e8ce6431cfb5fd78b0cf40c11a
 EBUILD postgresql-11_beta1.ebuild 13373 BLAKE2B 96c2d9781eecc682323b5875cda00eaaa1e81729ffacf818c72078f2ba930d33ebcfc6a8dbba770a5857b85ed0633adfdf0a291ea6e34b50147338db99714278 SHA512 5f6d5f8579bed501e654ee6c7d0698f2367cfe855688750759470df96ed9cb1dd9070c66533bc7f771cd857cdba50d2d05c667a7968af1835047df7e29ade173
 EBUILD postgresql-11_beta2.ebuild 13373 BLAKE2B 96c2d9781eecc682323b5875cda00eaaa1e81729ffacf818c72078f2ba930d33ebcfc6a8dbba770a5857b85ed0633adfdf0a291ea6e34b50147338db99714278 SHA512 5f6d5f8579bed501e654ee6c7d0698f2367cfe855688750759470df96ed9cb1dd9070c66533bc7f771cd857cdba50d2d05c667a7968af1835047df7e29ade173
 EBUILD postgresql-11_beta3.ebuild 13440 BLAKE2B 7c2cd1050b4e1bf5041fc551bf7e8c93aa309fd6e8e4ca30664214c2b21cd347b9d4473e1ff7d7f2a7697bfcf648173c30770dbc329aabb3229d2d49b38b4c34 SHA512 49d310d814d6d945c5a55f59e5e2b17935d7c3684295fafb27c4b8326146d49b06341c3844fde80ba80bda9fc81408d08a705293e3f1195bc342d953dcfd5ebf
 EBUILD postgresql-9.3.22.ebuild 13747 BLAKE2B 12e74f2f7bc2b18507b5c4e07d093cebd96406c6d981fbcaa6c2851004183acfac3e3fb882e1eea662e8cf1d35c10a1bcd6ad2820a5770874f04ad9cf508c387 SHA512 c89150f9b09e18b196d267dbec2c6539d3eb1ed6326193681249770c5d1ad42e48cffcad160121497dc8dbdd692994bd2704f581d52d029ba4dff5178a773746
 EBUILD postgresql-9.3.23.ebuild 13755 BLAKE2B 32748b48a489b9a51a19365e1159638e6de06e487db1eda5932c13e469766664bbb4ae924188b4e054a1d00048c18e7944a114bb15a172be55474dd11deb5a62 SHA512 0971a967aee606d52778ed168217c7d28ddffca984fd7821db8b4271add46868ab1f1dab6ffb1d5801c1a661f4f3a1637e9c99afa487383089cee2df90565129
-EBUILD postgresql-9.3.24.ebuild 13755 BLAKE2B 32748b48a489b9a51a19365e1159638e6de06e487db1eda5932c13e469766664bbb4ae924188b4e054a1d00048c18e7944a114bb15a172be55474dd11deb5a62 SHA512 0971a967aee606d52778ed168217c7d28ddffca984fd7821db8b4271add46868ab1f1dab6ffb1d5801c1a661f4f3a1637e9c99afa487383089cee2df90565129
+EBUILD postgresql-9.3.24.ebuild 13752 BLAKE2B a8ae8d045a0ba38420f7696d5121f45d1026ef1ec330286a3a47f93256acfb42061c8d938e1045c19ca05e83944ea9180aea6cc711aa366a3a161e26ff9319ae SHA512 f5bcbf68d4d87b33d92617d09f5eb5ffedf2435776669c2a301226c2b49fc4eda16c90b1b2196072c3dd4bfe888907020cef33b8ce5c456c5745757d8cc3c181
 EBUILD postgresql-9.4.17.ebuild 14557 BLAKE2B 57446276df8b11ebe12ef5a4b3e95dfc2892cdf93cb1a40117f0e7ae5774e0ba1a4a08b2306d971625636d4f0bddb4d0395bc6671397ef291c0251a31bc37256 SHA512 05b6604f17b63442a1eda4673a702eab7bb0ac4af87dce7c9f56085573768aec408aa441873317cf610e379972221f68d49c19f47f7be48b1e6a74809d13c407
 EBUILD postgresql-9.4.18.ebuild 14565 BLAKE2B 954d05aff7332bd53be29cb163b71deae09040a7ce602c28230e5dd4c9a4239e6fbc75245e10c8d4bd842db011e31303e0e924829c71a5cd5bee13ab62b03c47 SHA512 b95abd882026c4d66132d5c0ded7657f8275e22376122410962f70d382d128362480a65d9ae9e2dfa303df94bda884b919b599301395a68fd3b29ae7d71a1efe
-EBUILD postgresql-9.4.19.ebuild 14565 BLAKE2B 954d05aff7332bd53be29cb163b71deae09040a7ce602c28230e5dd4c9a4239e6fbc75245e10c8d4bd842db011e31303e0e924829c71a5cd5bee13ab62b03c47 SHA512 b95abd882026c4d66132d5c0ded7657f8275e22376122410962f70d382d128362480a65d9ae9e2dfa303df94bda884b919b599301395a68fd3b29ae7d71a1efe
+EBUILD postgresql-9.4.19.ebuild 14562 BLAKE2B fc60c46d3e0c5bebb97b14f39e70d31a7affb7a84a43bbca08df2972c59efe1ef4ce78f7b7c0845868dc421ec6ba72e19c49c83acb3bba8eabfe3685d51c36e5 SHA512 e821b7b443bf707bed6385e05dffb30d1bca54bdd3666bb1d88a31a623f96dc9fc75e77681b05d5f43fb739e32617a15654d09c9cdea3afce93797d19978aa9f
 EBUILD postgresql-9.5.12.ebuild 14785 BLAKE2B bbd02c18eb7e6b6c9bb2f3e4b4010bc1aadc0aaabe158accac75b1f692c8905d565647bac95c46b69003f70ce6608017a877e74e37e915a2827f5a6f35a732a5 SHA512 2ae77b20602445192062ab5930cc518c3524aa8c57c4aaa4923ec15b924f3b166dcd51dca32a19618d3055214bfed7977c4630dd40b6967aaf491f1688aaf717
 EBUILD postgresql-9.5.13.ebuild 14793 BLAKE2B 5dac00696cdcdb3801ed7cfaeee54ec0a728938aecfe590ae82a86c70b3a5e476df6fcb247b0ccfd0b1f08409638caa473449b8600a346c089a70b27c24ce46f SHA512 778a3e5b71f06edbb92b9e46591a775136df671be23c8f4404a037e3757e45382202854d74a32223926f88f315f8af8902d8ff00a404858cedb6546649903338
-EBUILD postgresql-9.5.14.ebuild 14793 BLAKE2B 5dac00696cdcdb3801ed7cfaeee54ec0a728938aecfe590ae82a86c70b3a5e476df6fcb247b0ccfd0b1f08409638caa473449b8600a346c089a70b27c24ce46f SHA512 778a3e5b71f06edbb92b9e46591a775136df671be23c8f4404a037e3757e45382202854d74a32223926f88f315f8af8902d8ff00a404858cedb6546649903338
-EBUILD postgresql-9.6.10.ebuild 14935 BLAKE2B 72aae9d0851e921ebc3f4245cb145966db204ec7f2aa1ac6e7a5da64035d2582b5f9fbf25fa48a3de970c52afb16891f05e3ddbc40b7cb6dba1d423197446541 SHA512 336a96594bc5feb9fee37b8bde109013f48c5ac84d5cf0b17565ebe19e5418bf6069df52ceff87e9a586bef56fbfa186b898d9de64bd9d6633a6ecf510265aa0
+EBUILD postgresql-9.5.14.ebuild 14790 BLAKE2B bd5e9cd4b35fef1ac6b9f8acd0aca37c3c326e64cc7472175a720fed79598f325498b38cf9c78e5ded1307218c173fda993165b42d1a50b6e2cbb591502f28d3 SHA512 4c8cd6c377e038aa68ca17f9e8cef22f856ef3be431e7441801d7cacbe784e313a8349b6090f6f31d6944f9c9b7d3d7aeff16039d543ef99350ab20c0f69bdd3
+EBUILD postgresql-9.6.10.ebuild 14932 BLAKE2B 12780b3847d6d536e8f305a0ca14a30ffc110f7b6e5d8f3577995d8eca8e84ab5f35bd56647611574aa7dc4e8778232e95f4ce63c1bb8f812f9a335d81536002 SHA512 335ceeaf9aa46980e03f76679cd115588deb75a622737640deafdcdde95c3565ce363f92d1eff6e2899f25bf9e4ccb51506992d78edf43584a2429e4c2bf16c0
 EBUILD postgresql-9.6.8.ebuild 14927 BLAKE2B 36ba33cfc700526cd716243a838a9b52a3823feabf53fe7045aca86e54c048a0c1e5c7c4950e33d131e29a96e7f00eebe2a366e46912a942c871b799c5df8a29 SHA512 0e547e8a39b0c96ff4d100d42ba1113aa87f537f14ccd242436270a6972db3c09690a9925d869c0256342e89687421b26e18fd210313dce3b23dd4062c1ad1c6
 EBUILD postgresql-9.6.9.ebuild 14935 BLAKE2B 72aae9d0851e921ebc3f4245cb145966db204ec7f2aa1ac6e7a5da64035d2582b5f9fbf25fa48a3de970c52afb16891f05e3ddbc40b7cb6dba1d423197446541 SHA512 336a96594bc5feb9fee37b8bde109013f48c5ac84d5cf0b17565ebe19e5418bf6069df52ceff87e9a586bef56fbfa186b898d9de64bd9d6633a6ecf510265aa0
 EBUILD postgresql-9999.ebuild 14262 BLAKE2B 43b6b2ab7b5137e8a0ca2edf28781d30f7a27afbf01ab718f4742c4ec981071797074f6dcad9995796d30bbd0b1e39d4ee7a63a404e7246a9bafbb5298a12c47 SHA512 29e5bcb9463c6cb8a43e8ba04840aacda074ddbfdcccd1dafcbd66e13d5c20a765c53f637e1c8993fe6647c286f7ef40254f3211f3341054c96bec1f327393fa
diff --git a/dev-db/postgresql/postgresql-10.5.ebuild b/dev-db/postgresql/postgresql-10.5.ebuild
index 50f0472a5668..dca288386bc7 100644
--- a/dev-db/postgresql/postgresql-10.5.ebuild
+++ b/dev-db/postgresql/postgresql-10.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic 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-9.3.24.ebuild b/dev-db/postgresql/postgresql-9.3.24.ebuild
index b102a6c5fabb..22e462e3c08a 100644
--- a/dev-db/postgresql/postgresql-9.3.24.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.24.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic 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.4.19.ebuild b/dev-db/postgresql/postgresql-9.4.19.ebuild
index 7243cdb0dd49..adf234a57964 100644
--- a/dev-db/postgresql/postgresql-9.4.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.19.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic 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.14.ebuild b/dev-db/postgresql/postgresql-9.5.14.ebuild
index fd41b7ff3302..4f68ad7f390b 100644
--- a/dev-db/postgresql/postgresql-9.5.14.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.14.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic 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.10.ebuild b/dev-db/postgresql/postgresql-9.6.10.ebuild
index 1297819d3de9..1688cf430f33 100644
--- a/dev-db/postgresql/postgresql-9.6.10.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic 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/redis/Manifest b/dev-db/redis/Manifest
index c4a424c3dc3b..b461c5bfe4aa 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,46 +1,38 @@
-AUX configure.ac-2.2 1522 BLAKE2B 68489a5ad1db0c1e04438900113c786911a260bd54bb839796b23c78d1fdd80f0443700eef8fc251d93c58ae11931ce53460d47c06200ac056ca1fd3a4bfbda9 SHA512 7a67bbd2f5fcfd7e1bfe18b739438342d40484c3f178ef5e2ddb617480715626e7f5a47d58660761489867ae460a58457a85a14bb2af90fe2e2ab3b8bd940b34
 AUX configure.ac-3.2 1882 BLAKE2B b8bc3e04c3203977218ee1d6d68e9f841b84fe82ab8803027034237275fb548cde282748a2f96bc25532e61f8e25a50cba9e165aac578d5db634a7ffc587ee9e SHA512 13d9f16cde8a95c96bcd726056d670d390dea6e2752ac607bc68eefb6214f0ab18b0e27d3283f2b219febd2da82e6489bd434215c9380c3c85c711aa00cb2be5
-AUX redis-2.8.17-config.patch 1660 BLAKE2B 1ad57de0e164fa06bcee988bfd69663d06a8abe4f0ca829a2d1c4bcfc595970a8e6ec62ce548fcc0e6959645fe2cdd551df0acb8724db8d74060e143b05e27a4 SHA512 4b7f88361ca33fb676d47e6e5e364cd33731031cf83d0cec34d6542e6e832a6b7187b847fde7c65b8c838b309feec7033e0d44f5a5690d6ed0e6694773d4195e
-AUX redis-2.8.3-shared.patch 909 BLAKE2B 674846cc8e596a62d78de2525c7e2ef727f0733f750b1133800c184b183ac14eeb345dfe1e2ff4b860a911fa9d7816a1058187e7c2c8024c0a95e32f716a7135 SHA512 1070d9d22654a0ee00ecb2536dd2644cc59917650aa56af10689302c3ac962c172bc24a0c493c17f78aa2632bfd3d924ceef221340622d46fd6bf7346e69f49d
-AUX redis-3.0.0-sharedlua.patch 1900 BLAKE2B 1f58f977420d94b62a71a14d77be65d6882ec6eddf6679003006a94444045c5368b2fcc04878577bdd0c2ddb602fda915fc9455f56d6dab81aa62ba509d293cf SHA512 817719139b500073ab038286e2457f5ce5978a88ceb910cccf51015d607b4d9b640d1d5ffeeb55f06781cd04a1f7d604bf1cceddd3cab480753c8c119ecda49d
 AUX redis-3.2.3-config.patch 1495 BLAKE2B 9f3c04dfd97845dcd364b75e2e5f543bc40ec0221a5ce19ab3c194e55ceaf24f13c307276f616d9a7742662d9e4fa76152c7036f7728f787bbac55f2b1a00999 SHA512 d71c918ea4952ecb55cc4c87649745ee468587c289d60bd1bee87a2948a6e882d42afe36bb113392b5aaab17d315732cabfc472804204d3a043305a5488a4124
 AUX redis-3.2.3-sharedlua.patch 2535 BLAKE2B 4affacfc27ee228f5050eb9133bee892b91690589a5b5885ad828f8cf408486bf9e2e4830eea8baf66feacd36bde56a565d54aebacb857215b1b76e0ef01ab39 SHA512 4b60271a24a27f69292450575f9316dd009e154980db2b70d7035794bc1f332fe54957558037c75de625d1eaf98cc0f1ec02fcd0ef510c86a3c605c474c1117e
 AUX redis-3.2.5-shared.patch 754 BLAKE2B cb119c20e219ab7c38bceffa9f7b3e59dc4eafe49bf28c652793c24044065a2de1c07e94baa24e9ba7e45840daf7d926667214e6ec468a99ac4637337949d6b5 SHA512 dcb0755a0cc24b4dc21c7a20891df5fa0c643beb8f411779548893ac9681c41510ecba79b0ba031d7eeeccbf5b15ae32be04241b197524de4f8f9aafa02ccaab
 AUX redis-4.0.1-shared.patch 866 BLAKE2B 55531d6437ba89e37674377795ed8f7b4a34982571358d3ac73071951929ba96f101dfc9f9336f04d3851b4d360023c50d7832d9ae5ba9cfa405f317ec70b983 SHA512 f58ae83d3370949187325b1f1f75feb7d85d3112ae65e7cd330d193490c42aa6288f05cd4d2309dbde5d32015a067ec831255a3dab937cd0889970c8eecfb3f1
 AUX redis-4.0.1-sharedlua.patch 2568 BLAKE2B dc943602aba26455b94536571ee6be2969cbdf04da63805db0da0de5c5da3eb5fe16bb3c9e282020cf5a0d2cb9ac02244614fb8929847ce930c2ed25f4c4b8ff SHA512 c7c08b67c09425876da513bbeb52667fe5917b56a43749a914dac356fa37c091b696765eabca100f2506cf461107abdbf22bce075879a8aa82a0e8d54f696fee
+AUX redis-5.0-shared.patch 883 BLAKE2B 71a490d5c40d873db7d363c4f3cab966bf8e92fa84bcb7209344b79b3bfc4c6f8df5224c8ae0e5d9ee8dbd62d9e288e90934809e91fd6f63c7d1dd4a518170a9 SHA512 f1d1e37a4786a84e9543956e21644a1dcfdc52742299119ba1547b9fb56a92fdef3ca518d94a1db8a88222b661ac7849a4db0bf7ba38b1ae65f286e7df90f0c1
+AUX redis-5.0-sharedlua.patch 2624 BLAKE2B d6c392c03e751ba6c4d556b3b10a28fd83d07f04fdc7b27d4d7f26d4380d9e28183a26cc9b36577afd645457a90744b479753c20d2d59343cd8dbd4bac5ed737 SHA512 ef4e8f474d2680c317ca7064dae7ce0bcafa142e18061a29bd8794eeab32efd1846d8ef5e43b059af5bb6b777d8395d091d0fabe31799df8ef7da75de70d2e18
 AUX redis-sentinel-4.0.6-config.patch 285 BLAKE2B 97b8fb6c2af74e6d2736e9dcdd9faa579800fecec53752168fc5e5e43c509fc00a1192215b5fef89af915456e5ab0d7c438df51e2b214399a4482f7683525a8b SHA512 12fd77b38fbcc3bf4b25f519a8f40e43c5d2f32be341155f5e6d08f2a4513043917452d45a20608dc56c0e92e324cef8480d42d670752056c821b4ffca93e2b1
+AUX redis-sentinel-5.0-config.patch 367 BLAKE2B 75281a9b0de0d453cb2948d1641c4f0a7a8b5acdb7ffc35186f29859e1f69835be0f56b0734757a73dbd3239a7e8b9e7db5fe31a82e3ac60bbafe86ca400c35b SHA512 7b882cb1a0d976fc1dfb30b305731cc9239dcf7f30e3a92566325dc1dae5ab94a95c047b3ba1eaa618767e1bbdee31918b552c67eeb0310e74db8cbf64e2c09c
 AUX redis-sentinel.confd 470 BLAKE2B f77fd7e35c753e35aafa6e773dcc00d2779bc29d8579334078bd6124aab436dff671ae790c0b0e3cefdd4082fe212b4b71501b529176cb0a1e5f8c8cdcf1387e SHA512 ea455f8c73c21bc46127ea5c7b99dc5707ad41160e5fd61367555dd2e3fd5c1518026257651e7d371a60a64b682b6839dd37580f75308c73239edeba49d6b372
 AUX redis-sentinel.initd 648 BLAKE2B eaea4a047dfa61a325fa2bfeb30b422220d4fad699a693b9141a74575dc153ad3db2dafa3fa06ef195914a32f2a6aacfb3fc2e3b80ebe6b75316700fbd84221d SHA512 dfd1dadedf9b7376667d1966072c28e5e23e17592bf66753eae4bbc084225714f30c6450001f643c1561ff3a2eb2e50f719d32ff34f5419040ff42a2c4fbd70d
-AUX redis.confd 450 BLAKE2B 99d00c43c6496c66c6abbebf8703ebffd13f688382b3634feed97b5c1af6cc4c4e356b79bf71f39b0bf82596ea1f9dedf36077b2669e1c88d94ef31d4bd9964b SHA512 c6347cc6e17e9ce93fd081608b19c4977c3e1ffd58d2a417804ca3e647967800ac11859bd05d5437c36310dcd7552c11f35965e4521c5266c3414387d4796a6b
 AUX redis.confd-r1 511 BLAKE2B 911e6f7ca70013d4feefb6ec7ee3f98220f303d48c95f27c2558efee00559cf2b9ae8c0303f85d2b081aac8f636de326b52e3493a9be2c027ec7d97114f856da SHA512 f041e6b1da2c579a7dcf40e411ff47bc4675e5931e04f4353888ed5864b7e0c94d53fc98faee982c65a69d0154ee1f624fbadbbcc3a324aec583eefee6fb7133
-AUX redis.initd-4 780 BLAKE2B 3bd1629bc43194d90b5f0af4e2abd4998fed6f9c5c64d410d8e1a6432b7d8d23f64ba90a2db63ab630f67cceb1ebd53deea5fed94109917adb53fdd48aa3f407 SHA512 779a35db0f603956c9ab7827f1d0a0b20d5dcab041aafca2055dfd413056de5e572c9996929ef9bf3c54b5f56e4a3a20f2eaaec306b5790252b46ebae30e74b6
 AUX redis.initd-5 696 BLAKE2B 11b2a50a74c9aea57b01ee7be7d3e1d70ca21db994c35b6d386115eb4f9c329ad6f77b80ce46c17e026a440e532e976c3e1a1f7c550e9f50cc812ef557c5f8d9 SHA512 cd5ae1cb0beded7c70fc7ab0bcbfe378dbac5bf78235877fedb4599c01bfcffc36909e638b032b29c79c5a5c55da11795c58a845b6eadf4cc41174903070183d
 AUX redis.logrotate 105 BLAKE2B 1281fd86d399b40aaaa69d1fe170b2c49523c074e14b12907428b676b03d510b680363dd5041428d5fddecb91a510baf53dfa57df66d697ba4846f1e49ab59fe SHA512 9cbd27732c7f8270bf9b8563df0964af142d1ac4e97417e495fcb02e730e93fdfafac9370188a2fce040d55d6c3704e284a50b6300616a3f13a03a6e25c1ae49
 AUX redis.service-2 253 BLAKE2B 0b78b45eaed3c7adbc68703968e1c843eeff785261cf7f4636df215d742c717d6fe95bb24e0aa947d64962ad20adacd48a4dd59b98eae479e7a33c1a0f2af7e1 SHA512 b42b73bb54ccc0d16adafb91aabe010092f548ec7979d8a0ed1c4563d9fca378eeb74c0c556f7565a32199ed30ca8a13d6b610d9cda39fd23da1428a410f62cc
 AUX redis.tmpfiles 61 BLAKE2B 1c3bf8aa105940c408163f61c63ed16b86de7a979cb5143d15700cac329970f351cb9b9377aa82e6f4dae377b00c1710a1e0f54334f007cfed64551f761034d4 SHA512 741ff5a4df5b04e7af4e81357812bf5b6cf992bc18b6052074aef134401d0a92703a2e41f52966012c05ea80fac5636435c8d3e6ed55e62a5711526ba67ee738
-DIST redis-3.0.7.tar.gz 1375200 BLAKE2B 74088cb128e5d8e32427845b6bb267957b7df7ee091b1110260b26cc61649892bdb3ec79ae09fa4aca302c5708f26e3e05c6fb1e821ff468d982c274fa2792b4 SHA512 6c8f4c88d911e1433fd28efff2f6d62763e08be89814ebf4aa4e68e2c8bd605eba24ca3410548b2f480ae094437ce96c0bafa7a5762b3b405d5d850886297ba3
 DIST redis-3.2.12.tar.gz 1551468 BLAKE2B 85483de2588e4161521fe958225a53ab4357d0db83954c22f755d5d512e6e2126f9e7fdc1032353bd491353af3805c806b89546f886fe78fa5e5d2dc1446420b SHA512 eec64a17e331ac220ba425a495127b3873048dc2597a6508962469c0c99763deffcec97254915e2b1f3867eb556b917e8861baa9609c727d0abb254a90d87cdc
-DIST redis-3.2.5.tar.gz 1544040 BLAKE2B a67b46feacddcc7e4cafd91fb5d295a972f3a09db0a05b8a90bf8c89870f110c6c598ffe945475228caa37ccca7921f4981fe7002edc3689e833ecddc5c2032e SHA512 4ecf6277c8fdf4411223b9f5a5c8308829da9bd756b45de5217d469e9def8faad8c05b6348c06aef99eca9245d45abfd52df056c3c819723da66a2ca20c381dd
 DIST redis-3.2.8.tar.gz 1547237 BLAKE2B fb03e263ad7b135dff38e018d9b830c4992cf331efc7c23c10b087c47e597abedb52f259d4dd9a9ee1d661685157fc29a2022d74bc21d406bb10c9b7dfab8b7e SHA512 7334faf73af3644f7f9dcaddd322955d5df1e88a1640b509ae623f322615a20f6dc143eb57dd89ff3a278557df309ac4215c3fb458235682ce28e16c817068ba
-DIST redis-4.0.1.tar.gz 1711660 BLAKE2B 0b8881baa78908df4adcc1aabfa0ea9554900f8b54d204ffa054752ba4355da2b56408501ede81a69cc1f34ebbb9fc984335738ea9f343ddcd4e9fb9a0d64c8e SHA512 62dec537aebd12340b9642f5f8b07fd98757c9e648dcd539a0411f207db3495923c5a6a9941036c56b2d574ee38b46d08558668111e322345ef549f93fada26f
 DIST redis-4.0.10.tar.gz 1738465 BLAKE2B 572cbb3d2d5d7209f81ebd53ee68f40b404d0e4623bd1864845bf1f47135d4e097a6974d346ffd845d848c39ace6d3fb9f1a347e0c9d16d06d22aed7a8b3ae7b SHA512 0978dabaf637e61889d492fd3629acd58ca8fb0c0088cdd7036ffd1a7ed3f018c107039d4c96bd61d0b7d35757df2366d051f57d77ffb5642aca0e5651b30603
+DIST redis-4.0.11.tar.gz 1739656 BLAKE2B d94f380ad1600e58942cc5b27b512984396cdbb06ea6e947c7d7ce5b8ecdb8a2a56c6356af2caa82a96887a610716c9575b78eb2f46da89efb940febc1c30f22 SHA512 f0054af9ca2143731a397b2b21285387707b7f40d9326ba15225feb1a2ff470fab5194308342f63bbe1081f84c7e9ef19543c5a8e3eae49e17bfc515c64201f0
 DIST redis-4.0.2.tar.gz 1713990 BLAKE2B 307ab76b336f7520e14a23a1577c46e1b63cc5a5a5b6afb725cb87934fbcb62107085671fd1072d1142ce8e92f069e6b6064c9f4468335bc6997897c8f494471 SHA512 1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4
 DIST redis-4.0.6.tar.gz 1723533 BLAKE2B 94c2a9b7eeaa676efaac75cd5c143b0f4b02440b5a21ecc9b2a68cc27ad4abc1fc4d7dbc903dea5d956ce737ca434ea5b5bdde4a35df3a3689da60c5fb0bddf1 SHA512 784aad612664df666c36f969cb6a9ab794f004abcf9aa761bd1f5f0f8fdb248d5b38f48a59b68c2de7d2a344755f1537efc9d5847de0d662302699ed94d40813
 DIST redis-4.0.7.tar.gz 1729488 BLAKE2B 7a5337b868e4da4a7387b31bc9d6bd4c86abd701b9ba999f64296ed5188cbba7208ced466973a500730ca03e70a9a85fbab2fb4700fdc977e58defc0126487d1 SHA512 6f317d9e76224b2a2b047dc8f56b126ea85ee5c6112c4c6238cb5cdfa3a83756bff3a82b106b00d1124a93d210a900d836587b8d9563916f19274de0e84c4c6b
 DIST redis-4.0.8.tar.gz 1729973 BLAKE2B 32d82a07beba9ea8f0b08a8fc69da548a1974e5839f052a9803ffb0f52ef920df9b128092e061b5e693581a50efef4a1212c1f6310dc8492eff5ca841ff3b03a SHA512 11c126ddef3bedbceb02ee7a80a61374e081da8087055d77970b0097066a6f1c5e0c4f0d246c9851f8c3beca22f185c184669a9dc4f1c7c229f8cd2c34196ab6
 DIST redis-4.0.9.tar.gz 1737022 BLAKE2B 35a83d146062f5b14c023d7fd9f28d743ba6bec3e0e4bf9ce8e065a706bbd7508ffbcb8b1b4d18f6b6774589b5456540ba8717b9f449fcbd758c0f57dbd505a3 SHA512 a6cf63cb361f0a87da3955ba628190dc04cad342f7a664d18e44416ee67dd86ed6e3a46b9701e994f1417e56b819b3c6fc595f363c10bb4b83d5033919d29598
-EBUILD redis-3.0.7-r1.ebuild 3312 BLAKE2B f7eb238c4cfb353330436453849d12ef8c1e0d083f7af2a7a7813cf5db478281499dc36757a3f1bad06e65cfc7decd604edeb087b02485e6922ddf30bc13e88f SHA512 de42869cd28e6b9f7ce63ef0baaa64acc0b5465d2bb2a0c23013a42c0a00059a18620ab428eae88b33f4d6a3b37b2e6cc0dc71135af807dbd9d524908d1d80fb
-EBUILD redis-3.0.7.ebuild 3312 BLAKE2B f7eb238c4cfb353330436453849d12ef8c1e0d083f7af2a7a7813cf5db478281499dc36757a3f1bad06e65cfc7decd604edeb087b02485e6922ddf30bc13e88f SHA512 de42869cd28e6b9f7ce63ef0baaa64acc0b5465d2bb2a0c23013a42c0a00059a18620ab428eae88b33f4d6a3b37b2e6cc0dc71135af807dbd9d524908d1d80fb
+DIST redis-5.0_rc4.tar.gz 1937238 BLAKE2B b8f768b83e27476bc038fc554193680f4873eb2405f238e0a6f2053cf68c4a9e6c45546730a263463b805d6811334c1ba056be0230676f19d0562d488a3d4c97 SHA512 75b308bca026fe3b7cff1a92df3990bab5bb7ffe24cdfbc263f4d522ebe7ec8d86a9ed66da1778fe67c08a39b6f0c83cb10c5a332818c6ad04621d01c4aa6add
 EBUILD redis-3.2.12.ebuild 3886 BLAKE2B ea98fec96f660ef6c663d3700d8b90ee6a98c904e6c798e81416d14609e238e395d6096cdea1dafd0d7591b401b68803c44dd4c9d7831c43168643cea458b05c SHA512 ff68d691ee3555a74e6e4305d54d9848137d0887b6c96a97b81f48adfd06129291a51eac1c87cf358b8670dad93dc372d8e70455efa348f5ec296ec0035af6be
-EBUILD redis-3.2.5.ebuild 3578 BLAKE2B 140d00e2acb3c78d6f089689b911e77df1a0b4cac32dfac312040639fc1935a8a08fdf97be95fbbe83862de22ef43d08d137e58716db1523b57ac5d90122a64e SHA512 72d8563a1eee0e62d34a3c04583c210a95c0fdd306512f63714324ac6e1302f5a06debb56bae083f9102eef9cade1674f6d5dd746ca7ab796e70592aef659021
-EBUILD redis-3.2.8-r2.ebuild 3579 BLAKE2B e6813a5e2b7b85c0c2b2628cae28ec894c05f89f82b59dbdd0916bd02d8c94aaf12b01a83374d6651112374144231862f49810ef6dc98eacf9a02b6cd02bca4d SHA512 3acf577e2509cf29ae5274117ec5c512fe390167d88c38b6fd375a5d145e4b94704990b23e3a18d6e8ab6c91e5d5bebb5d6c9330a9975b7ef9aa2d14c0914282
 EBUILD redis-3.2.8-r5.ebuild 3884 BLAKE2B 27c4d67ff9d9f1d23c9ac0c5dcbfdaa7eda60b0957a955f7e66e9ad54c0490052a28cb6f02195dd606d8ff65f2b95c43325af771649048d80e7124e3df8d1907 SHA512 fde594959130b3999c8c31e5711b48f7d29824c189495b6d94124ef7190ce4cfc10b635ec2141fd980cfc709d7a7aa9f9474996742ed1fac8cde509cba22712c
-EBUILD redis-4.0.1-r1.ebuild 3722 BLAKE2B 9f99ed17dbac2e4249e425293b769b87bbce62865e6cbfed53eba91578c14c1e97c636f460b3c2738162f89a771fb833bc3158db1f4ac41440b244ffd855b49c SHA512 d928b9714a9c028fbe14286c975a5ba385384c4ff32311e060252ccf9802e2f58d945d261a9fd5cd512d7142cb82fdb41a44955c046c253ee399e09578b42a0d
-EBUILD redis-4.0.1.ebuild 3507 BLAKE2B 4418b445f34274ae86edd3033552935fd8e740ab0c1029cdf9f43f2fcc7bf0e1fdaf0fa07d6504af4c4975af09fe2ea808ce0e515d8f5a4809cb84b664f6672c SHA512 e0a258e5e2333d9c88d5ebba37f52cb772bb17d77b719edc0ce443a3a2ac09cd064766fcf7541503fe656ca2f77d890ae911f518b2552e2673f650cc8bd4d13d
 EBUILD redis-4.0.10.ebuild 4069 BLAKE2B 33bf7fbd67db2035d3bdc92f01f1252c9a27a1a3c736f555d21c6670920e03057b30bc51594898414dc5a18312c1af5f74f01b86ede936025cb44d6f0e478855 SHA512 52c9a38d8823fa87ddb8aea6db611bf43b0e3543eddb275a991da075095e27758de2f5456685a01eb79e3166a642a38256cd95f75d5cf7b1a432dcb3af29f671
+EBUILD redis-4.0.11.ebuild 4074 BLAKE2B 609631167471b07d3caccad80d601e4d73a594a97979b25f828c171c341f2f8d24c12e2399ad81b8952e5f459f0a340726a4e8ee69a1f51b0626b52d18e7ce3c SHA512 86c003235c630c87a551b31f359a5fe824d7114016f22788cf8dc84dec56d5bea24c3fdbc86efd15734ccb636394bb6fc4f4d757566ac857605fa23c841db4d4
 EBUILD redis-4.0.2-r1.ebuild 3807 BLAKE2B 7dbd27ad7593b53f1f7184321ba33f140072ef946859b33cf8dacf7eb98c9d7398c512ce403132bf3b9fece12e73cc0e4dd5cca1dbc220d50dea105ea87ef774 SHA512 d7744c01cbf4b6f1fec17ce7733a31f4deb3e925afbafb3a9aaa360d9598aff78b44c3bcadc54e82c809ff6ba0211e475d32f96ec4244f6081e3f5cfde1b1daa
 EBUILD redis-4.0.6.ebuild 4074 BLAKE2B 8c650824c8216e360014750cfe64d205dc02d33b6997b31f4e1a282836c670e97c2c4158818b226a98a3b0cb1954def0ac356c5f154e93e6d41356fb68ec6550 SHA512 f864f88c8ce91cfb73448e4427b82d7a76276dfad851004e9b13f96c395e369a101d878cfba65f277aae878885b58202d0b52c0d37a160419aa55904ad8cb7f7
 EBUILD redis-4.0.7.ebuild 4074 BLAKE2B a6190e8b3223f516c48889f5bd455e7c94c1c68e0f142f8370fc74931d7b9fb79621bae4a080956eb8cc9cf00ece885535c2e3a17e717d1c2c069e61bed479ee SHA512 aafbb4f1a85133e3baf0b73f026281c6dba2cd2146c9d3a9e5fa610e5e1ca5a9ea8458b9b031345f7346b74e42fc2a238f3824ddf12ec7d83ba571ebe7d18e3d
 EBUILD redis-4.0.8.ebuild 4074 BLAKE2B a6190e8b3223f516c48889f5bd455e7c94c1c68e0f142f8370fc74931d7b9fb79621bae4a080956eb8cc9cf00ece885535c2e3a17e717d1c2c069e61bed479ee SHA512 aafbb4f1a85133e3baf0b73f026281c6dba2cd2146c9d3a9e5fa610e5e1ca5a9ea8458b9b031345f7346b74e42fc2a238f3824ddf12ec7d83ba571ebe7d18e3d
 EBUILD redis-4.0.9.ebuild 4074 BLAKE2B 609631167471b07d3caccad80d601e4d73a594a97979b25f828c171c341f2f8d24c12e2399ad81b8952e5f459f0a340726a4e8ee69a1f51b0626b52d18e7ce3c SHA512 86c003235c630c87a551b31f359a5fe824d7114016f22788cf8dc84dec56d5bea24c3fdbc86efd15734ccb636394bb6fc4f4d757566ac857605fa23c841db4d4
+EBUILD redis-5.0_rc4.ebuild 4127 BLAKE2B 110d57d99191a4adc8b3da6978320d744b7e83a876c2f0b569187da7e4d26f059368a0021a64ddc17846e3d48390ff9424457278def0df04436ce0b04352b371 SHA512 d8daa2fe2b0640001fdc66ef190801cafb542f61fb73546a2d428a7bb306fad9c6ffdc47336774aa072b8a2cd9a0021bbcf6a86a3124ddcb74037f7a1a7e2fd0
 MISC metadata.xml 535 BLAKE2B 8b38981c28c1a1ac98cbadcc1a7e6ae9b48eff471f56a8ce182b26a331e8fdb92e0d76fa44f0c7f84f6d262fc7b1ad23ddb348d445dfc472f9b8be86d6ca222b SHA512 10302874f9e9818bfa599f4cb1e75bf9dc27f187cf7858855c2d77ddfb282ead944f40027596a80e8e22bdd5bf374613362be0c1779c0e5941e4135ad994c120
diff --git a/dev-db/redis/files/configure.ac-2.2 b/dev-db/redis/files/configure.ac-2.2
deleted file mode 100644
index 3ff6650407ca..000000000000
--- a/dev-db/redis/files/configure.ac-2.2
+++ /dev/null
@@ -1,58 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.63)
-AC_INIT(redis, 2.0.0, antirez@gmail.com)
-AM_CFLAGS="-std=c99 -pedantic -Wall -W -D__EXTENSIONS__ -D_XPG6"
-if test x"$CFLAGS" = x""; then
-    AM_CFLAGS="$AM_CFLAGS -O2"
-else
-    AM_CFLAGS="$AM_CFLAGS $CFLAGS"
-fi
-
-# options
-AC_MSG_CHECKING([whether to build with debug information])
-AC_ARG_ENABLE([debug],
-    [AS_HELP_STRING([--enable-debug],
-        [enable debug data generation (def=no)])],
-    [debugit="$enableval"],
-    [debugit=no])
-AC_MSG_RESULT([$debugit])
-
-if test x"$debugit" = x"yes"; then
-    AC_DEFINE([DEBUG],[],[Debug Mode])
-    AM_CFLAGS="$AM_CFLAGS -g -rdynamic -ggdb"
-else
-    AC_DEFINE([NDEBUG],[],[No-debug Mode])
-fi
-AC_SUBST([AM_CFLAGS])
-
-# Checks for programs.
-AC_PROG_CC
-
-# Checks for libraries.
-
-# Checks for header files.
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_C_INLINE
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-
-# Checks for library functions.
-AC_FUNC_ERROR_AT_LINE
-AC_FUNC_FORK
-AC_FUNC_STRCOLL
-AC_FUNC_STRTOD
-AC_CHECK_FUNCS([dup2 gethostbyname gettimeofday inet_ntoa memchr memmove memset select socket strcasecmp strchr strerror strstr strtol])
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/dev-db/redis/files/redis-2.8.17-config.patch b/dev-db/redis/files/redis-2.8.17-config.patch
deleted file mode 100644
index c9f6b2af172b..000000000000
--- a/dev-db/redis/files/redis-2.8.17-config.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/redis.conf	2014-12-02 16:22:38.722433643 +0100
-+++ b/redis.conf	2014-12-02 16:22:16.252249350 +0100
-@@ -38,7 +38,7 @@
- 
- # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
- # default. You can specify a custom pid file location here.
--pidfile /var/run/redis.pid
-+pidfile /run/redis/redis.pid
- 
- # Accept connections on the specified port, default is 6379.
- # If port 0 is specified Redis will not listen on a TCP socket.
-@@ -61,7 +61,7 @@
- # Examples:
- #
- # bind 192.168.1.100 10.0.0.1
--# bind 127.0.0.1
-+bind 127.0.0.1
- 
- # Specify the path for the Unix socket that will be used to listen for
- # incoming connections. There is no default, so Redis will not listen
-@@ -100,7 +100,7 @@
- # Specify the log file name. Also the empty string can be used to force
- # Redis to log on the standard output. Note that if you use standard
- # output for logging but daemonize, logs will be sent to /dev/null
--logfile ""
-+logfile /var/log/redis/redis.log
- 
- # To enable logging to the system logger, just set 'syslog-enabled' to yes,
- # and optionally update the other syslog parameters to suit your needs.
-@@ -184,7 +184,7 @@
- # The Append Only File will also be created inside this directory.
- # 
- # Note that you must specify a directory here, not a file name.
--dir ./
-+dir /var/lib/redis/
- 
- ################################# REPLICATION #################################
- 
-@@ -403,6 +403,7 @@
- # output buffers (but this is not needed if the policy is 'noeviction').
- #
- # maxmemory <bytes>
-+maxmemory 67108864
- 
- # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
- # is reached. You can select among five behaviors:
diff --git a/dev-db/redis/files/redis-2.8.3-shared.patch b/dev-db/redis/files/redis-2.8.3-shared.patch
deleted file mode 100644
index d32484f0cd18..000000000000
--- a/dev-db/redis/files/redis-2.8.3-shared.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 388a76f24c96767c831ee7682234fd9f2bc5b9ac
-Author: Johan Bergström <bugs@bergstroem.nu>
-Date:   Mon Nov 25 09:17:14 2013 +1100
-
-    Use shared jemalloc
-
-diff --git src/Makefile src/Makefile
-index c37549d..77e6255 100644
---- src/Makefile
-+++ src/Makefile
-@@ -26,12 +26,7 @@ PREFIX?=/usr/local
- INSTALL_BIN=$(PREFIX)/bin
- INSTALL=install
- 
--# Default allocator
--ifeq ($(uname_S),Linux)
--	MALLOC=jemalloc
--else
--	MALLOC=libc
--endif
-+MALLOC?=jemalloc
- 
- # Backwards compatibility for selecting an allocator
- ifeq ($(USE_TCMALLOC),yes)
-@@ -79,9 +74,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
- endif
- 
- ifeq ($(MALLOC),jemalloc)
--	DEPENDENCY_TARGETS+= jemalloc
--	FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
--	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
-+	FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE
-+	FINAL_LIBS+= -ljemalloc -ldl
- endif
- 
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
diff --git a/dev-db/redis/files/redis-3.0.0-sharedlua.patch b/dev-db/redis/files/redis-3.0.0-sharedlua.patch
deleted file mode 100644
index ba983efafc7c..000000000000
--- a/dev-db/redis/files/redis-3.0.0-sharedlua.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-commit fd0fc43f6e0ea45bce0e1a68c1f736e481fc4429
-Author: Johan Bergström <bugs@bergstroem.nu>
-Date:   Thu Apr 2 14:33:51 2015 +1100
-
-    Use shared LUA
-
-diff --git src/Makefile src/Makefile
-index a88f1d2..f71e7b5 100644
---- src/Makefile
-+++ src/Makefile
-@@ -15,7 +15,7 @@
- release_hdr := $(shell sh -c './mkreleasehdr.sh')
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua
-+DEPENDENCY_TARGETS=hiredis linenoise
- 
- # Default settings
- STD=-std=c99 -pedantic
-@@ -47,6 +47,7 @@ endif
- FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
- FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
-+FINAL_LIBS+=$(shell pkg-config --libs lua)
- DEBUG=-g -ggdb
- 
- ifeq ($(uname_S),SunOS)
-@@ -108,6 +109,7 @@ endif
- REDIS_SERVER_NAME=redis-server
- REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o
-+REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o
- REDIS_CLI_NAME=redis-cli
- REDIS_CLI_OBJ=anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
- REDIS_BENCHMARK_NAME=redis-benchmark
-@@ -162,7 +164,7 @@ endif
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/dev-db/redis/files/redis-5.0-shared.patch b/dev-db/redis/files/redis-5.0-shared.patch
new file mode 100644
index 000000000000..32245079ab49
--- /dev/null
+++ b/dev-db/redis/files/redis-5.0-shared.patch
@@ -0,0 +1,32 @@
+diff --git a/src/Makefile b/src/Makefile
+index f5525bd..6f12a20 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -29,14 +29,7 @@ INSTALL_BIN=$(PREFIX)/bin
+ INSTALL=install
+ 
+ # Default allocator defaults to Jemalloc if it's not an ARM
+-MALLOC=libc
+-ifneq ($(uname_M),armv6l)
+-ifneq ($(uname_M),armv7l)
+-ifeq ($(uname_S),Linux)
+-	MALLOC=jemalloc
+-endif
+-endif
+-endif
++MALLOC?=jemalloc
+ 
+ # To get ARM stack traces if Redis crashes we need a special C flag.
+ ifneq (,$(filter aarch64 armv,$(uname_M)))
+@@ -120,9 +113,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
+ endif
+ 
+ ifeq ($(MALLOC),jemalloc)
+-	DEPENDENCY_TARGETS+= jemalloc
+-	FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
+-	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
++	FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE
++	FINAL_LIBS+= -ljemalloc -ldl
+ endif
+ 
+ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
diff --git a/dev-db/redis/files/redis-5.0-sharedlua.patch b/dev-db/redis/files/redis-5.0-sharedlua.patch
new file mode 100644
index 000000000000..3b97f913c604
--- /dev/null
+++ b/dev-db/redis/files/redis-5.0-sharedlua.patch
@@ -0,0 +1,61 @@
+diff --git a/deps/lua/src/lua_cjson.c b/deps/lua/src/lua_cjson.c
+index c26c0d7..fa50c41 100644
+--- a/deps/lua/src/lua_cjson.c
++++ b/deps/lua/src/lua_cjson.c
+@@ -46,7 +46,7 @@
+ #include "strbuf.h"
+ #include "fpconv.h"
+ 
+-#include "../../../src/solarisfixes.h"
++#include "solarisfixes.h"
+ 
+ #ifndef CJSON_MODNAME
+ #define CJSON_MODNAME   "cjson"
+diff --git a/src/Makefile b/src/Makefile
+index 6f12a20..205cd59 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh')
+ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+ uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
+ OPTIMIZATION?=-O2
+-DEPENDENCY_TARGETS=hiredis linenoise lua
++DEPENDENCY_TARGETS=hiredis linenoise
+ NODEPS:=clean distclean
+ 
+ # Default settings
+@@ -58,7 +58,7 @@ endif
+ 
+ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
+ FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
+-FINAL_LIBS=-lm
++FINAL_LIBS=@LUA_LIBS@
+ DEBUG=-g -ggdb
+ 
+ ifeq ($(uname_S),SunOS)
+@@ -100,7 +100,7 @@ endif
+ endif
+ endif
+ # Include paths to dependencies
+-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise @LUA_CFLAGS@
+ 
+ ifeq ($(MALLOC),tcmalloc)
+ 	FINAL_CFLAGS+= -DUSE_TCMALLOC
+@@ -137,6 +137,7 @@ endif
+ REDIS_SERVER_NAME=redis-server
+ REDIS_SENTINEL_NAME=redis-sentinel
+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o
++REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o
+ REDIS_CLI_NAME=redis-cli
+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
+ REDIS_BENCHMARK_NAME=redis-benchmark
+@@ -188,7 +189,7 @@ endif
+ 
+ # redis-server
+ $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
+-	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
++	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
+ 
+ # redis-sentinel
+ $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/dev-db/redis/files/redis-sentinel-5.0-config.patch b/dev-db/redis/files/redis-sentinel-5.0-config.patch
new file mode 100644
index 000000000000..53299f11840f
--- /dev/null
+++ b/dev-db/redis/files/redis-sentinel-5.0-config.patch
@@ -0,0 +1,10 @@
+diff --git a/sentinel.conf b/sentinel.conf
+index 3703c73..964ffa3 100644
+--- a/sentinel.conf
++++ b/sentinel.conf
+@@ -222,3 +222,5 @@ sentinel deny-scripts-reconfig yes
+ # case, so writing "config guessme" is the same in the example above.
+ #
+ # SENTINEL SET can also be used in order to perform this configuration at runtime.
++
++logfile "/var/log/redis/sentinel.log"
diff --git a/dev-db/redis/files/redis.confd b/dev-db/redis/files/redis.confd
deleted file mode 100644
index 07585fa7a116..000000000000
--- a/dev-db/redis/files/redis.confd
+++ /dev/null
@@ -1,20 +0,0 @@
-# Redis user.
-REDIS_USER="redis"
-
-# Redis group.
-REDIS_GROUP="redis"
-
-# Redis configuration file.
-REDIS_CONF="/etc/redis.conf"
-
-# Redis dump directory.
-REDIS_DIR="/var/lib/redis"
-
-# Redis pid file.
-# (Be sure to change the main redis configuration file as well if you change
-# this from the default.)
-REDIS_PID="/var/run/redis/redis.pid"
-
-# Redis options.
-# (Redis expects the first argument to be the configuration file.)
-REDIS_OPTS="${REDIS_CONF}"
diff --git a/dev-db/redis/files/redis.initd-4 b/dev-db/redis/files/redis.initd-4
deleted file mode 100644
index 5c12fdc7c79d..000000000000
--- a/dev-db/redis/files/redis.initd-4
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-
-REDIS_DIR=${REDIS_DIR:-/var/lib/redis}
-REDIS_CONF=${REDIS_CONF:-/etc/redis.conf}
-REDIS_OPTS=${REDIS_OPTS:-"${REDIS_CONF}"}
-REDIS_USER=${REDIS_USER:-redis}
-REDIS_GROUP=${REDIS_GROUP:-redis}
-REDIS_TIMEOUT=${REDIS_TIMEOUT:-30}
-
-command=/usr/sbin/redis-server
-pidfile=${REDIS_PID:-/run/redis/redis.pid}
-start_stop_daemon_args="--background --pidfile ${pidfile} --chdir \"${REDIS_DIR}\" --user ${REDIS_USER} --group ${REDIS_GROUP}"
-command_args="${REDIS_OPTS}"
-
-depend() {
-	use net localmount logger
-	after keepalived
-}
-
-start_pre() {
-	checkpath -d -m 0775 -o ${REDIS_USER}:${REDIS_GROUP} $(dirname ${REDIS_PID})
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop \
-		--exec ${command} \
-		--retry ${REDIS_TIMEOUT} \
-		--pidfile ${pidfile}
-	eend
-}
diff --git a/dev-db/redis/redis-3.0.7-r1.ebuild b/dev-db/redis/redis-3.0.7-r1.ebuild
deleted file mode 100644
index e46c5c221e5a..000000000000
--- a/dev-db/redis/redis-3.0.7-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic systemd toolchain-funcs user
-
-DESCRIPTION="A persistent caching system, key-value and data structures database"
-HOMEPAGE="http://redis.io/"
-SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="+jemalloc tcmalloc test"
-SLOT="0"
-
-RDEPEND=">=dev-lang/lua-5.1:*
-	tcmalloc? ( dev-util/google-perftools )
-	jemalloc? ( >=dev-libs/jemalloc-3.2 )"
-DEPEND="virtual/pkgconfig
-	>=sys-devel/autoconf-2.63
-	test? ( dev-lang/tcl:0= )
-	${RDEPEND}"
-REQUIRED_USE="?? ( tcmalloc jemalloc )"
-
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-pkg_setup() {
-	enewgroup redis 75
-	enewuser redis 75 -1 /var/lib/redis redis
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.8.3-shared.patch
-	epatch "${FILESDIR}"/${PN}-2.8.17-config.patch
-	epatch "${FILESDIR}"/${PN}-3.0.0-sharedlua.patch
-
-	# Copy lua modules into build dir
-	cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
-	cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
-	# Append cflag for lua_cjson
-	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
-	append-cflags "-DENABLE_CJSON_GLOBAL"
-
-	# now we will rewrite present Makefiles
-	local makefiles=""
-	for MKF in $(find -name 'Makefile' | cut -b 3-); do
-		mv "${MKF}" "${MKF}.in"
-		sed -i	-e 's:$(CC):@CC@:g' \
-			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-			-e 's: $(DEBUG)::g' \
-			-e 's:$(OBJARCH)::g' \
-			-e 's:ARCH:TARCH:g' \
-			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
-			"${MKF}.in" \
-		|| die "Sed failed for ${MKF}"
-		makefiles+=" ${MKF}"
-	done
-	# autodetection of compiler and settings; generates the modified Makefiles
-	cp "${FILESDIR}"/configure.ac-2.2 configure.ac
-	sed -i	-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
-		configure.ac || die "Sed failed for configure.ac"
-	eautoconf
-}
-
-src_configure() {
-	econf
-
-	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
-	# also, don't define ANSI/c99 for lua twice
-	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
-}
-
-src_compile() {
-	tc-export CC AR RANLIB
-
-	local myconf=""
-
-	if use tcmalloc ; then
-		myconf="${myconf} USE_TCMALLOC=yes"
-	elif use jemalloc ; then
-		myconf="${myconf} JEMALLOC_SHARED=yes"
-	else
-		myconf="${myconf} MALLOC=yes"
-	fi
-
-	emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
-}
-
-src_install() {
-	insinto /etc/
-	doins redis.conf sentinel.conf
-	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
-	fperms 0644 /etc/{redis,sentinel}.conf
-
-	newconfd "${FILESDIR}/redis.confd" redis
-	newinitd "${FILESDIR}/redis.initd-4" redis
-
-	systemd_newunit "${FILESDIR}/redis.service-2" redis.service
-	systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
-
-	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
-
-	dobin src/redis-cli
-	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump
-	fperms 0750 /usr/sbin/redis-benchmark
-	dosym redis-server /usr/sbin/redis-sentinel
-
-	if use prefix; then
-		diropts -m0750
-	else
-		diropts -m0750 -o redis -g redis
-	fi
-	keepdir /var/{log,lib}/redis
-}
diff --git a/dev-db/redis/redis-3.0.7.ebuild b/dev-db/redis/redis-3.0.7.ebuild
deleted file mode 100644
index e46c5c221e5a..000000000000
--- a/dev-db/redis/redis-3.0.7.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic systemd toolchain-funcs user
-
-DESCRIPTION="A persistent caching system, key-value and data structures database"
-HOMEPAGE="http://redis.io/"
-SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="+jemalloc tcmalloc test"
-SLOT="0"
-
-RDEPEND=">=dev-lang/lua-5.1:*
-	tcmalloc? ( dev-util/google-perftools )
-	jemalloc? ( >=dev-libs/jemalloc-3.2 )"
-DEPEND="virtual/pkgconfig
-	>=sys-devel/autoconf-2.63
-	test? ( dev-lang/tcl:0= )
-	${RDEPEND}"
-REQUIRED_USE="?? ( tcmalloc jemalloc )"
-
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-pkg_setup() {
-	enewgroup redis 75
-	enewuser redis 75 -1 /var/lib/redis redis
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.8.3-shared.patch
-	epatch "${FILESDIR}"/${PN}-2.8.17-config.patch
-	epatch "${FILESDIR}"/${PN}-3.0.0-sharedlua.patch
-
-	# Copy lua modules into build dir
-	cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
-	cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
-	# Append cflag for lua_cjson
-	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
-	append-cflags "-DENABLE_CJSON_GLOBAL"
-
-	# now we will rewrite present Makefiles
-	local makefiles=""
-	for MKF in $(find -name 'Makefile' | cut -b 3-); do
-		mv "${MKF}" "${MKF}.in"
-		sed -i	-e 's:$(CC):@CC@:g' \
-			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-			-e 's: $(DEBUG)::g' \
-			-e 's:$(OBJARCH)::g' \
-			-e 's:ARCH:TARCH:g' \
-			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
-			"${MKF}.in" \
-		|| die "Sed failed for ${MKF}"
-		makefiles+=" ${MKF}"
-	done
-	# autodetection of compiler and settings; generates the modified Makefiles
-	cp "${FILESDIR}"/configure.ac-2.2 configure.ac
-	sed -i	-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
-		configure.ac || die "Sed failed for configure.ac"
-	eautoconf
-}
-
-src_configure() {
-	econf
-
-	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
-	# also, don't define ANSI/c99 for lua twice
-	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
-}
-
-src_compile() {
-	tc-export CC AR RANLIB
-
-	local myconf=""
-
-	if use tcmalloc ; then
-		myconf="${myconf} USE_TCMALLOC=yes"
-	elif use jemalloc ; then
-		myconf="${myconf} JEMALLOC_SHARED=yes"
-	else
-		myconf="${myconf} MALLOC=yes"
-	fi
-
-	emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
-}
-
-src_install() {
-	insinto /etc/
-	doins redis.conf sentinel.conf
-	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
-	fperms 0644 /etc/{redis,sentinel}.conf
-
-	newconfd "${FILESDIR}/redis.confd" redis
-	newinitd "${FILESDIR}/redis.initd-4" redis
-
-	systemd_newunit "${FILESDIR}/redis.service-2" redis.service
-	systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
-
-	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
-
-	dobin src/redis-cli
-	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump
-	fperms 0750 /usr/sbin/redis-benchmark
-	dosym redis-server /usr/sbin/redis-sentinel
-
-	if use prefix; then
-		diropts -m0750
-	else
-		diropts -m0750 -o redis -g redis
-	fi
-	keepdir /var/{log,lib}/redis
-}
diff --git a/dev-db/redis/redis-3.2.5.ebuild b/dev-db/redis/redis-3.2.5.ebuild
deleted file mode 100644
index 125fe7e3d229..000000000000
--- a/dev-db/redis/redis-3.2.5.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic systemd toolchain-funcs user
-
-DESCRIPTION="A persistent caching system, key-value and data structures database"
-HOMEPAGE="http://redis.io/"
-SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="+jemalloc tcmalloc luajit test"
-SLOT="0"
-
-RDEPEND="luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:* )
-	tcmalloc? ( dev-util/google-perftools )
-	jemalloc? ( >=dev-libs/jemalloc-3.2 )"
-DEPEND="virtual/pkgconfig
-	>=sys-devel/autoconf-2.63
-	test? ( dev-lang/tcl:0= )
-	${RDEPEND}"
-REQUIRED_USE="?? ( tcmalloc jemalloc )"
-
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-pkg_setup() {
-	enewgroup redis 75
-	enewuser redis 75 -1 /var/lib/redis redis
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.2.5-shared.patch \
-		"${FILESDIR}"/${PN}-3.2.3-config.patch \
-		"${FILESDIR}"/${PN}-3.2.3-sharedlua.patch
-	eapply_user
-
-	# Copy lua modules into build dir
-	cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
-	cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
-	# Append cflag for lua_cjson
-	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
-	append-cflags "-DENABLE_CJSON_GLOBAL"
-
-	# now we will rewrite present Makefiles
-	local makefiles=""
-	for MKF in $(find -name 'Makefile' | cut -b 3-); do
-		mv "${MKF}" "${MKF}.in"
-		sed -i	-e 's:$(CC):@CC@:g' \
-			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-			-e 's: $(DEBUG)::g' \
-			-e 's:$(OBJARCH)::g' \
-			-e 's:ARCH:TARCH:g' \
-			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
-			"${MKF}.in" \
-		|| die "Sed failed for ${MKF}"
-		makefiles+=" ${MKF}"
-	done
-	# autodetection of compiler and settings; generates the modified Makefiles
-	cp "${FILESDIR}"/configure.ac-3.2 configure.ac
-	sed -i	\
-		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
-		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
-		-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,lua,g" \
-		configure.ac || die "Sed failed for configure.ac"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with luajit)
-
-	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
-	# geohash-int can't be built with -std=c99 either
-	# also, don't define ANSI/c99 for lua twice
-	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/geohash-int/Makefile deps/Makefile || die
-}
-
-src_compile() {
-	tc-export CC AR RANLIB
-
-	local myconf=""
-
-	if use tcmalloc ; then
-		myconf="${myconf} USE_TCMALLOC=yes"
-	elif use jemalloc ; then
-		myconf="${myconf} JEMALLOC_SHARED=yes"
-	else
-		myconf="${myconf} MALLOC=yes"
-	fi
-
-	emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
-}
-
-src_install() {
-	insinto /etc/
-	doins redis.conf sentinel.conf
-	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
-	fperms 0644 /etc/{redis,sentinel}.conf
-
-	newconfd "${FILESDIR}/redis.confd" redis
-	newinitd "${FILESDIR}/redis.initd-4" redis
-
-	systemd_newunit "${FILESDIR}/redis.service-2" redis.service
-	systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
-
-	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
-
-	dobin src/redis-cli
-	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
-	fperms 0750 /usr/sbin/redis-benchmark
-	dosym redis-server /usr/sbin/redis-sentinel
-
-	if use prefix; then
-		diropts -m0750
-	else
-		diropts -m0750 -o redis -g redis
-	fi
-	keepdir /var/{log,lib}/redis
-}
diff --git a/dev-db/redis/redis-3.2.8-r2.ebuild b/dev-db/redis/redis-3.2.8-r2.ebuild
deleted file mode 100644
index 9ad05c87cf7c..000000000000
--- a/dev-db/redis/redis-3.2.8-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic systemd toolchain-funcs user
-
-DESCRIPTION="A persistent caching system, key-value and data structures database"
-HOMEPAGE="http://redis.io/"
-SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="+jemalloc tcmalloc luajit test"
-SLOT="0"
-
-RDEPEND="luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:* )
-	tcmalloc? ( dev-util/google-perftools )
-	jemalloc? ( >=dev-libs/jemalloc-3.2 )"
-DEPEND="virtual/pkgconfig
-	>=sys-devel/autoconf-2.63
-	test? ( dev-lang/tcl:0= )
-	${RDEPEND}"
-REQUIRED_USE="?? ( tcmalloc jemalloc )"
-
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-pkg_setup() {
-	enewgroup redis 75
-	enewuser redis 75 -1 /var/lib/redis redis
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.2.5-shared.patch \
-		"${FILESDIR}"/${PN}-3.2.3-config.patch \
-		"${FILESDIR}"/${PN}-3.2.3-sharedlua.patch
-	eapply_user
-
-	# Copy lua modules into build dir
-	cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
-	cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
-	# Append cflag for lua_cjson
-	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
-	append-cflags "-DENABLE_CJSON_GLOBAL"
-
-	# now we will rewrite present Makefiles
-	local makefiles=""
-	for MKF in $(find -name 'Makefile' | cut -b 3-); do
-		mv "${MKF}" "${MKF}.in"
-		sed -i	-e 's:$(CC):@CC@:g' \
-			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-			-e 's: $(DEBUG)::g' \
-			-e 's:$(OBJARCH)::g' \
-			-e 's:ARCH:TARCH:g' \
-			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
-			"${MKF}.in" \
-		|| die "Sed failed for ${MKF}"
-		makefiles+=" ${MKF}"
-	done
-	# autodetection of compiler and settings; generates the modified Makefiles
-	cp "${FILESDIR}"/configure.ac-3.2 configure.ac
-	sed -i	\
-		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
-		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
-		-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,lua,g" \
-		configure.ac || die "Sed failed for configure.ac"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with luajit)
-
-	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
-	# geohash-int can't be built with -std=c99 either
-	# also, don't define ANSI/c99 for lua twice
-	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/geohash-int/Makefile deps/Makefile || die
-}
-
-src_compile() {
-	tc-export CC AR RANLIB
-
-	local myconf=""
-
-	if use tcmalloc ; then
-		myconf="${myconf} USE_TCMALLOC=yes"
-	elif use jemalloc ; then
-		myconf="${myconf} JEMALLOC_SHARED=yes"
-	else
-		myconf="${myconf} MALLOC=yes"
-	fi
-
-	emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
-}
-
-src_install() {
-	insinto /etc/
-	doins redis.conf sentinel.conf
-	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
-	fperms 0644 /etc/{redis,sentinel}.conf
-
-	newconfd "${FILESDIR}/redis.confd" redis
-	newinitd "${FILESDIR}/redis.initd-4" redis
-
-	systemd_newunit "${FILESDIR}/redis.service-2" redis.service
-	systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
-
-	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
-
-	dobin src/redis-cli
-	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
-	fperms 0750 /usr/sbin/redis-benchmark
-	dosym redis-server /usr/sbin/redis-sentinel
-
-	if use prefix; then
-		diropts -m0750
-	else
-		diropts -m0750 -o redis -g redis
-	fi
-	keepdir /var/{log,lib}/redis
-}
diff --git a/dev-db/redis/redis-4.0.1-r1.ebuild b/dev-db/redis/redis-4.0.11.ebuild
index c93a6b4061fc..a8d59c405e63 100644
--- a/dev-db/redis/redis-4.0.1-r1.ebuild
+++ b/dev-db/redis/redis-4.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools eutils flag-o-matic systemd toolchain-funcs user
 
 DESCRIPTION="A persistent caching system, key-value and data structures database"
-HOMEPAGE="http://redis.io/"
+HOMEPAGE="https://redis.io"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -14,15 +14,21 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86
 IUSE="+jemalloc tcmalloc luajit test"
 SLOT="0"
 
-# Does NOT build with Lua 5.2 or newer at this time.
-RDEPEND="luajit? ( dev-lang/luajit:2 )
+# Redis does NOT build with Lua 5.2 or newer at this time.
+# This should link correctly with both unslotted & slotted Lua, without
+# changes.
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
 	!luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) )
 	tcmalloc? ( dev-util/google-perftools )
 	jemalloc? ( >=dev-libs/jemalloc-3.2 )"
-DEPEND="virtual/pkgconfig
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
 	>=sys-devel/autoconf-2.63
-	test? ( dev-lang/tcl:0= )
-	${RDEPEND}"
+	test? ( dev-lang/tcl:0= )"
+
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
 S="${WORKDIR}/${PN}-${PV/_/-}"
@@ -33,10 +39,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.0.1-shared.patch \
+	eapply \
 		"${FILESDIR}"/${PN}-3.2.3-config.patch \
-		"${FILESDIR}"/${PN}-4.0.1-sharedlua.patch
+		"${FILESDIR}"/${PN}-4.0.1-shared.patch \
+		"${FILESDIR}"/${PN}-4.0.1-sharedlua.patch \
+		"${FILESDIR}"/${PN}-sentinel-4.0.6-config.patch
 	eapply_user
 
 	# Copy lua modules into build dir
@@ -47,7 +54,7 @@ src_prepare() {
 	append-cflags "-DENABLE_CJSON_GLOBAL"
 
 	# now we will rewrite present Makefiles
-	local makefiles=""
+	local makefiles="" MKF
 	for MKF in $(find -name 'Makefile' | cut -b 3-); do
 		mv "${MKF}" "${MKF}.in"
 		sed -i	-e 's:$(CC):@CC@:g' \
@@ -61,7 +68,7 @@ src_prepare() {
 		makefiles+=" ${MKF}"
 	done
 	# autodetection of compiler and settings; generates the modified Makefiles
-	cp "${FILESDIR}"/configure.ac-3.2 configure.ac
+	cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
 
 	# Use the correct pkgconfig name for Lua
 	has_version 'dev-lang/lua:5.1' \
@@ -89,9 +96,9 @@ src_compile() {
 
 	local myconf=""
 
-	if use tcmalloc ; then
+	if use tcmalloc; then
 		myconf="${myconf} USE_TCMALLOC=yes"
-	elif use jemalloc ; then
+	elif use jemalloc; then
 		myconf="${myconf} JEMALLOC_SHARED=yes"
 	else
 		myconf="${myconf} MALLOC=yes"
@@ -106,12 +113,18 @@ src_install() {
 	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
 	fperms 0644 /etc/{redis,sentinel}.conf
 
-	newconfd "${FILESDIR}/redis.confd" redis
-	newinitd "${FILESDIR}/redis.initd-4" redis
+	newconfd "${FILESDIR}/redis.confd-r1" redis
+	newinitd "${FILESDIR}/redis.initd-5" redis
 
 	systemd_newunit "${FILESDIR}/redis.service-2" redis.service
 	systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
 
+	newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
 	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
 
 	dobin src/redis-cli
diff --git a/dev-db/redis/redis-4.0.1.ebuild b/dev-db/redis/redis-5.0_rc4.ebuild
index aece2a0822b3..1b2b1a57ecfa 100644
--- a/dev-db/redis/redis-4.0.1.ebuild
+++ b/dev-db/redis/redis-5.0_rc4.ebuild
@@ -1,30 +1,40 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit autotools eutils flag-o-matic systemd toolchain-funcs user
 
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
 DESCRIPTION="A persistent caching system, key-value and data structures database"
-HOMEPAGE="http://redis.io/"
-SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
+HOMEPAGE="https://redis.io"
+SRC_URI="https://github.com/antirez/redis/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 SLOT="0"
 
-RDEPEND="luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:* )
+# Redis does NOT build with Lua 5.2 or newer at this time.
+# This should link correctly with both unslotted & slotted Lua, without
+# changes.
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) )
 	tcmalloc? ( dev-util/google-perftools )
 	jemalloc? ( >=dev-libs/jemalloc-3.2 )"
-DEPEND="virtual/pkgconfig
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
 	>=sys-devel/autoconf-2.63
-	test? ( dev-lang/tcl:0= )
-	${RDEPEND}"
+	test? ( dev-lang/tcl:0= )"
+
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
-S="${WORKDIR}/${PN}-${PV/_/-}"
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	enewgroup redis 75
@@ -32,10 +42,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.0.1-shared.patch \
+	eapply \
 		"${FILESDIR}"/${PN}-3.2.3-config.patch \
-		"${FILESDIR}"/${PN}-4.0.1-sharedlua.patch
+		"${FILESDIR}"/${PN}-5.0-shared.patch \
+		"${FILESDIR}"/${PN}-5.0-sharedlua.patch \
+		"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
 	eapply_user
 
 	# Copy lua modules into build dir
@@ -46,7 +57,7 @@ src_prepare() {
 	append-cflags "-DENABLE_CJSON_GLOBAL"
 
 	# now we will rewrite present Makefiles
-	local makefiles=""
+	local makefiles="" MKF
 	for MKF in $(find -name 'Makefile' | cut -b 3-); do
 		mv "${MKF}" "${MKF}.in"
 		sed -i	-e 's:$(CC):@CC@:g' \
@@ -60,11 +71,16 @@ src_prepare() {
 		makefiles+=" ${MKF}"
 	done
 	# autodetection of compiler and settings; generates the modified Makefiles
-	cp "${FILESDIR}"/configure.ac-3.2 configure.ac
+	cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
+
+	# Use the correct pkgconfig name for Lua
+	has_version 'dev-lang/lua:5.1' \
+		&& LUAPKGCONFIG=lua5.1 \
+		|| LUAPKGCONFIG=lua
 	sed -i	\
 		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
 		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
-		-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,lua,g" \
+		-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \
 		configure.ac || die "Sed failed for configure.ac"
 	eautoreconf
 }
@@ -83,9 +99,9 @@ src_compile() {
 
 	local myconf=""
 
-	if use tcmalloc ; then
+	if use tcmalloc; then
 		myconf="${myconf} USE_TCMALLOC=yes"
-	elif use jemalloc ; then
+	elif use jemalloc; then
 		myconf="${myconf} JEMALLOC_SHARED=yes"
 	else
 		myconf="${myconf} MALLOC=yes"
@@ -100,12 +116,18 @@ src_install() {
 	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
 	fperms 0644 /etc/{redis,sentinel}.conf
 
-	newconfd "${FILESDIR}/redis.confd" redis
-	newinitd "${FILESDIR}/redis.initd-4" redis
+	newconfd "${FILESDIR}/redis.confd-r1" redis
+	newinitd "${FILESDIR}/redis.initd-5" redis
 
 	systemd_newunit "${FILESDIR}/redis.service-2" redis.service
 	systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
 
+	newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
 	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
 
 	dobin src/redis-cli
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 3f882c78da90..c0f5604eebf8 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -13,5 +13,5 @@ DIST sqlite-doc-3240000.zip 9030826 BLAKE2B 4444e3dd0ce782e19fa01c881e0b54537234
 DIST sqlite-src-3230100.zip 10849436 BLAKE2B 6bed0a45c83ddb51d665835d174f623b30b1c3b81562fdea2317b58d876a0852136fe4f8a3ebc7679676f366e19c84d0ad2f54d3d8c73712145099975f80cf1a SHA512 69a87b76860c3b172d9e68b0fc0b8c157b606375e2b7d793ce4bd4b898ef737cd721189bc6a3342c749e224e60fa96203d449668c49dff2ebdc682b49630a59b
 DIST sqlite-src-3240000.zip 10980065 BLAKE2B 201a59cb34271e5ac79e96e4e2ea64f8b61aa99c44eedf61c0a21752ad4376caaf7980a6923dca66266b1a315d9867871d0d172c17907b4147c15431aa212a70 SHA512 812c2df7179abb1e445b5b3e161c940b120c53366a7b2c1f0bfc3599cd9921e5543ba39ca3f297eeaefec318f10c15f630f00f9cf04133c7cd419a04f3bbdd0e
 EBUILD sqlite-3.23.1.ebuild 9714 BLAKE2B 14ba94c1080849812a14be508a8813ddd9591f841a7104f77e777793cc40359be5e38e40b151f4e39783bc7066424b74ec7168d0351d30a20d5fe4eb86dfbe15 SHA512 ec11bb7517de52b3185e726b4150d3da164a2abf820b75f6a5eb46a79aa3acf724fc63a1f96b57fcd442d8e059c2dcba102fccb7ce13df1be5fad6475a8b5189
-EBUILD sqlite-3.24.0.ebuild 9548 BLAKE2B 7529ee37ee8f5fcf2103db447d74297f57c677cd5dc315c1c6072700c47173b21d24ef116c865341a289fe19d646f7cfab882a7302672df963dbae898903d526 SHA512 816865d8e9e5a5a27ca25f5c09cbc1293801969a67a38b1fc9e7662beddc728779ff464d69a24c21062291566a3c6d322869c8a3ce3f6d03190bf50568f8eb2f
+EBUILD sqlite-3.24.0.ebuild 9544 BLAKE2B 18f65792272eb0ed4eecc03f00846fed32ba2cf24894022353e2a55f8ab8fc5172901acc86096462bb0f06b798bac279439ad13e8380f4b3ab431f92de483d57 SHA512 a3daf13f1acb2c919914805babf38546b2f1dc6eed5fefabeec10fe31bd54368fc0a777bdbbf18455669e1ebea5cfa4b39bebcfa43d1de326cb7143210c52523
 MISC metadata.xml 723 BLAKE2B 8866fbde770e7b8582de27303c72df047db80e0d70b1a1ceca0951a05b51bb704452071ceb6c29ecf3704d523888351615d1798aaab092e6b7505d4c6e3698ad SHA512 40616710b1d4edd3e24b5ac0797c1c9b606aeacac9f9543722bc9529e7c2c704a0c10b0ca68a5ba6e0a0ee8bc605212e8a49a050c8687afbdd7dbf28d6d4506a
diff --git a/dev-db/sqlite/sqlite-3.24.0.ebuild b/dev-db/sqlite/sqlite-3.24.0.ebuild
index bedd681465ff..d9156a001413 100644
--- a/dev-db/sqlite/sqlite-3.24.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.24.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 
 RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
commit	43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree	6208a7f4fc744684fce0f55acbb47511acace498 /dev-db
parent	28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)