gentoo resync : 29.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-29 11:38:31 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-29 11:38:31 +0100
commit: 90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch)
tree: 83fc5facb6b12be510a37bc3d241cc63e965b13a /dev-db
parent: feb0daf81d888e9160f9f94502de09b66f2a63fd (diff)
37 files changed, 619 insertions, 1806 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index a6e5e2019b69..c08251395660 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/clickhouse/Manifest b/dev-db/clickhouse/Manifest
deleted file mode 100644
index 9732363848b4..000000000000
--- a/dev-db/clickhouse/Manifest
+++ /dev/null
@@ -1,21 +0,0 @@
-AUX clickhouse-server.confd 74 BLAKE2B ccb1d957ce0ec20a65968bb1fe24d756d3f0d73bb0b2bec5b1de7913fdac71fcc04eef0e7d0ca7708b87cccb4ef08b4d5ec2ab514c24c1f39862dc1aced77725 SHA512 3f89e1d592d46c8173df42835c5c9ee541e6fc01eb4448f3351517110650fac3144a6da066f2ebf01bda9a004a972e47dc6c48967f914e541dfe26fb0637cd5c
-AUX clickhouse-server.initd 445 BLAKE2B 166b867de3ad86f814cfbbdfa86a9328a3a54a88438e628f790cc6be1e0eee272effa06db37bdb0d31a41ac1551321b5a756bbfe3a9a8381e327e12515253da1 SHA512 98d396709899a428012fb8f01fbd861359913e12d765924a6a20e5f5cf0da73a2c8b0561a061d4c581443259605841f55fa33ee881f8eb764d6d2446dd4bf849
-AUX clickhouse-server.initd-r1 552 BLAKE2B 39a75038f2cce6c09623b0c90b87a7536995da05fdedbc261e4a92e4add8bfdfb46c59856f9d0df8b49d115b3ea52e684827037c3da40a8fc02948ff47edcde6 SHA512 40324e870c8d0d2bb62acc78bf2c08be9cc0e64e94d00538d41961fb53d2df45f3d811b75c81a0b3e12ee17d99d2b9c0cbca623f7e1ffe5eadf3674bafb97832
-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.12.17.tar.gz 6495521 BLAKE2B 00dfb823b9e36923beb50a88bee88af3918bedc7b20079785699a42e36e52f32739f786bd78c5b350f58ae59251e3846da6202d04e24e9a750c92e16065cc395 SHA512 876c5fb6011c65b8ec201126678dad6f5de3430b7d320316ced5c6d22e8086ce337d20b73badbd053bf141097b8fe6cd94910ed607b4bbedb681cfa7921d1fb6
-DIST clickhouse-18.6.0.tar.gz 5852534 BLAKE2B 5634fd26907b21d4a35cff3ed816696205be4aff1cdd1acfe222e24214b1842eb18a4e499e888b0d92b78f5c3023c2962a385af2c0ea889055e473dfa0198bf5 SHA512 e8ea2d4457122513cad47b1cdb2a58dd2ffaec77a7a08bf82179aca12a369d39970520a995bb5db2e5ea4b0939da827b7d4b1f3929cf71c149c965438ebb3633
-DIST clickhouse-19.13.1.11.zip 11502726 BLAKE2B c2788702a2c27c995abc072a94f3945ed6f9039fe0c7840312a86987faf52d2f7801d531e89a02848fa8ee1319247c41de0f3ad0c0cb51c1df1dbcfca3bd3b0a SHA512 095a0e63eff6989ea1f70fac593069e1cdb6ea207a99d8cfd610c4eb8f3f7411a784d9f100c9fc899898e68dd88dd54bec3c136764793c8cae986d920a651f8c
-DIST clickhouse-19.15.2.2.zip 11425217 BLAKE2B 3a2288d771cd92dc283713a44df84df8c3c946ef92efd781d7619c8ffc0d7a3884f1a988c81f1703a7d373e78e413bdaea0fd100cebf7090be9bba16779209ff SHA512 029376b9d540c592d30a32457deb9e605d512fc448eb3dc6896b0ca48a5e92f390ef2dc3a4ea63ce19c264a8b2810ff952e95a6c7a8d4506f733ac6253c079d3
-DIST clickhouse-19.5.3.8.zip 11247905 BLAKE2B f72289f55bddf9b3ad2e16a4d1fc6e4f7681477e742eda3694c3c16975820c93affc01c70b194c5992226d79bee714f706c04402c62bd0ed3d1701a16fb22192 SHA512 f578abbd43c3ccf721e079ce2bafac22be0c5d619388be192c59a2053ae1cf1e7f0a025e0323f0f8f004f879990a88c0ca0cd4d135606de51c576619fe0172b8
-DIST clickhouse-19.9.5.36.zip 11708002 BLAKE2B 075f9b1556c5ee207a608047fa559cec7a0b1f044236e412189ae6dabe25aa04abf881726e4ffa17d4aad6937250c704f050935e61470994b57eaa1ac9ea07e4 SHA512 b0aa04a1c0f7c15316c83a2711f9b64f8235e664956f933530a9f2dc26fcb8b817adb8ca43c96db1cad498e06f4291ce13c0bb259726039c5caa52ae523fa4ab
-EBUILD clickhouse-18.10.3-r1.ebuild 4903 BLAKE2B 9cb7ccd5890de60558174b1bbde464674bf37bff3ee6e8c40dd2d8c2f72053fca4ea5bde568178b847c1dedcd3c21c31d57bce688e4e5ee2e3d1e6174a2a0b00 SHA512 6ac6da034c8673a6957c6a57377a963b045ee7a9d25f5d69ec37f34c500d5a5cee66606b1e5964fd5f3131d2d85e33ac0bf5f889a299bb9a1b4ca6eb2cf6fbb5
-EBUILD clickhouse-18.12.17-r1.ebuild 4900 BLAKE2B 0ce87b58051aeef81c62e41246290cda4680a647ead0761cd58723cd1e269953a18e8f8ca66368c13860fe3b31aae308e79c4be3d6ab6440ed5cabb5a42f40cf SHA512 9602f6bf0092a5661ebd903dc1033d76cefdfe8b286f4363cc5d1de65252cf2b6b262d3a8aa6f33f79b345570593569e282c5e4101814799559de30f7d823968
-EBUILD clickhouse-18.6.0-r1.ebuild 4891 BLAKE2B 12f3ad5a0633b0ea65af7939083ed150460efacc420ac33605273b18e9ac9ae93a2930ae5b70cf98b06bbc32ba9a4e3d69f57885bca2bde5b21c8957efe5021c SHA512 753764286274f3403863fe9947fc60253f05d876b7278a7fee625c262ad1d2a5dcbc3ce7fb58fd44074eab6654528c4e93c74d4a931a027d52b62494058c8e07
-EBUILD clickhouse-19.13.1.11-r2.ebuild 5045 BLAKE2B 35b733010bb514bc27d74200ca86f72a275016ba8928b76066a09b1498c18e48af5cb6a901ad91fe0b74d3f32557d74b5264669d19af5de206227c63e7e7739a SHA512 c0d441c5abebb86339211d4cf56009bbebcb03d46d2d16034e21de6321a97270b80a567190f020e21348c937ce6fa8b1b80a799494956a720056480ae0c1d33c
-EBUILD clickhouse-19.13.1.11-r3.ebuild 5135 BLAKE2B 03e1a841aa058202ac43186b90d1f1fb63fb28c4f281c1458d624dc37d6fbcd13a81eca3c4fff3db326a7a02654b7d1871e190cf76908d114160f4ad44bb8d8f SHA512 edb341c9ac550e058088d90774f427f382eb09c72d4aca3528faf2d27ab3259ba6693136c0970e3cb6e96a9cf425cc64cc6eb2347e86205ab54c1da3040f65ab
-EBUILD clickhouse-19.15.2.2.ebuild 5265 BLAKE2B 11f57fba5525c51e0c41a08ab21a03dbaa2aa767efd5ae36c21b8cbbcec9228992c47fe45512acae7d013752ebed935a4b8c089f6cb25d99eca9723a0596aa33 SHA512 01a0f276651d18278ae1f8c993e94388876519d812ce9f8dbab995bed70a859cbd1c57aea15509b0380b61effa94effd787e837d57db9c9a5d2c35767bc1dd6d
-EBUILD clickhouse-19.5.3.8-r1.ebuild 5026 BLAKE2B 2bd7e6c85e282d9ba768b596539f2460783fec539be1f10b58ad139cef85e2b8fd8f85e8e0cea981997edd47c588381d446f343f4be7fd15c594daf97b32f40c SHA512 4f6e69e5b3cdb9de4b53f17887c8958e3286f2436a35c3c337a12ec884d439b08d0dbf732c750de21d3738836c8ae948b73edc2abb1e413ac6edf2e9e9a8eb19
-EBUILD clickhouse-19.9.5.36-r1.ebuild 5026 BLAKE2B 2bd7e6c85e282d9ba768b596539f2460783fec539be1f10b58ad139cef85e2b8fd8f85e8e0cea981997edd47c588381d446f343f4be7fd15c594daf97b32f40c SHA512 4f6e69e5b3cdb9de4b53f17887c8958e3286f2436a35c3c337a12ec884d439b08d0dbf732c750de21d3738836c8ae948b73edc2abb1e413ac6edf2e9e9a8eb19
-MISC metadata.xml 657 BLAKE2B ea02627178df53a81cf2cb46f47e51ebf0437d5e70ec745a7d5d92d430e2055f3112280d3cbed5d7d7eccd1ce892ff1b184f042b850de1f9071716bda5176e82 SHA512 1a3810659c43b9191a8a37aac652c070fb05e663090575c4908e5dc248dfb1e20d9dd3d832a71b95c36b17a6f3a802dacbea2866f33c530c3d5d6c93f8a58690
diff --git a/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild b/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
deleted file mode 100644
index 351b11c198be..000000000000
--- a/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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"
-RESTRICT="!test? ( test )"
-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:0
-		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? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=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/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[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]
-		dev-db/mysql-connector-c[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/clickhouse-18.12.17-r1.ebuild b/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
deleted file mode 100644
index fa18cc2e59f7..000000000000
--- a/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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"
-RESTRICT="!test? ( test )"
-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:0
-		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=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=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/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[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-db/mysql-connector-c[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 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)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-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/clickhouse-18.6.0-r1.ebuild b/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
deleted file mode 100644
index f5c30296ab3d..000000000000
--- a/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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"
-ZSTD_COMMIT="2555975"
-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"
-RESTRICT="!test? ( test )"
-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:0
-		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? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-0.17.3 )
-	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/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[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]
-		dev-db/mysql-connector-c[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_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/clickhouse-19.13.1.11-r2.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
deleted file mode 100644
index 0184d7fe5a7c..000000000000
--- a/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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}.zip -> ${P}.zip
-	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"
-RESTRICT="!test? ( test )"
-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:0
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-	dev-libs/jemalloc
-	dev-libs/protobuf
-"
-
-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/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[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-db/mysql-connector-c[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 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_prepare() {
-	eapply_user
-	cmake-utils_src_prepare
-}
-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)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-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
-
-	keepdir /var/log/clickhouse-server
-	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
deleted file mode 100644
index aafc89dc7813..000000000000
--- a/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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}.zip -> ${P}.zip
-	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"
-RESTRICT="!test? ( test )"
-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:0
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-	dev-libs/jemalloc
-	dev-libs/protobuf
-"
-
-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/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[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-db/mysql-connector-c[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-	=dev-cpp/gtest-1.8*
-	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 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_prepare() {
-	eapply_user
-	cmake-utils_src_prepare
-}
-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)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-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-r1 clickhouse-server
-		newconfd "${FILESDIR}"/clickhouse-server.confd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-
-	keepdir /var/log/clickhouse-server
-	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild b/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild
deleted file mode 100644
index 22b038f2ebdd..000000000000
--- a/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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}.zip -> ${P}.zip
-	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"
-RESTRICT="!test? ( test )"
-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:0
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-	dev-libs/jemalloc
-	dev-libs/protobuf
-	dev-cpp/sparsehash
-"
-
-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/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[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-db/mysql-connector-c[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-	=dev-cpp/gtest-1.8*
-	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 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_prepare() {
-	sed -i -e 's~add_subdirectory(contrib/libunwind-cmake)~~' cmake/find/unwind.cmake || die "Failed to succeed"
-	eapply_user
-	cmake-utils_src_prepare
-}
-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)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-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-r1 clickhouse-server
-		newconfd "${FILESDIR}"/clickhouse-server.confd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-
-	keepdir /var/log/clickhouse-server
-	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild b/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
deleted file mode 100644
index 80e66a29108b..000000000000
--- a/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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}.zip -> ${P}.zip
-	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"
-RESTRICT="!test? ( test )"
-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:0
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-	dev-libs/jemalloc
-"
-
-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/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[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-db/mysql-connector-c[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 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_prepare() {
-	eapply_user
-	cmake-utils_src_prepare
-}
-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)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-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
-
-	keepdir /var/log/clickhouse-server
-	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild b/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
deleted file mode 100644
index 80e66a29108b..000000000000
--- a/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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}.zip -> ${P}.zip
-	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"
-RESTRICT="!test? ( test )"
-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:0
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( dev-db/mysql-connector-c:= )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-	dev-libs/jemalloc
-"
-
-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/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:0[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-db/mysql-connector-c[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 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_prepare() {
-	eapply_user
-	cmake-utils_src_prepare
-}
-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)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-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
-
-	keepdir /var/log/clickhouse-server
-	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-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.confd b/dev-db/clickhouse/files/clickhouse-server.confd
deleted file mode 100644
index 0e7344672b4b..000000000000
--- a/dev-db/clickhouse/files/clickhouse-server.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-user="clickhouse"
-group="clickhouse"
-logdir="/var/log/clickhouse-server"
-
diff --git a/dev-db/clickhouse/files/clickhouse-server.initd b/dev-db/clickhouse/files/clickhouse-server.initd
deleted file mode 100644
index 5e787c0c1fa6..000000000000
--- a/dev-db/clickhouse/files/clickhouse-server.initd
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/run/clickhouse-server.pid"
-command_background=1
-command="/usr/bin/clickhouse-server"
-start_stop_daemon_args="--user clickhouse --group clickhouse \
-	--chdir /etc/clickhouse-server \
-	-1 /var/log/clickhouse-server/stdout.log \
-	-2 /var/log/clickhouse-server/stderr.log"
-
-depend() {
-	need net
-	after mongodb
-}
diff --git a/dev-db/clickhouse/files/clickhouse-server.initd-r1 b/dev-db/clickhouse/files/clickhouse-server.initd-r1
deleted file mode 100644
index efc11f5e54c0..000000000000
--- a/dev-db/clickhouse/files/clickhouse-server.initd-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-user="clickhouse"
-group="clickhouse"
-logdir="/var/log/clickhouse-server"
-pidfile="/run/clickhouse-server.pid"
-command_background=1
-command="/usr/bin/clickhouse-server"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--chdir /etc/clickhouse-server \
-	-1 ${logdir}/stdout.log \
-	-2 ${logdir}/stderr.log"
-
-depend() {
-	need net
-	after mongodb
-}
-
-start_pre() {
-    checkpath -m 0755 -o "${user}:${group}" -d "${logdir}"
-}
diff --git a/dev-db/clickhouse/files/clickhouse-server.service b/dev-db/clickhouse/files/clickhouse-server.service
deleted file mode 100644
index 64d2cbacf6ec..000000000000
--- a/dev-db/clickhouse/files/clickhouse-server.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=ClickHouse Server (analytic DBMS for big data)
-
-[Service]
-Type=simple
-User=clickhouse
-Group=clickhouse
-Restart=always
-RestartSec=30
-ExecStart=/usr/bin/clickhouse-server --config=/etc/clickhouse-server/config.xml
-LimitCORE=infinity
-LimitNOFILE=500000
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-db/clickhouse/metadata.xml b/dev-db/clickhouse/metadata.xml
deleted file mode 100644
index bb224e97f7c5..000000000000
--- a/dev-db/clickhouse/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">yandex/Clickhouse</remote-id>
-	</upstream>
-	<use>
-		<flag name="client">Build CLI client.</flag>
-		<flag name="server">Build server.</flag>
-		<flag name="kafka">Enables support for kafka consumer.</flag>
-		<flag name="mongodb">Enabled support for MongoDB-based dictionaries</flag>
-		<flag name="tools">Build various tools, like benchmark, copier, etc.</flag>
-		<flag name="zookeeper">Enable support for clustering (based on Zookeeper).</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 62631932df9b..81389003a26b 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -3,8 +3,10 @@ AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3
 DIST mariadb-connector-c-3.1.6-src.tar.gz 742858 BLAKE2B 416cc33cf7a01fee9649f6c35e0a7e16b889a1fad10f2b204e259a2672535d1ad7f9ade9723989a4ce00cf8a2c4660f40357516bfdc4547118a54637911f9b60 SHA512 44309e706cb49451a0d1a91f907ab7cfa1fb1bf95d26cf3bbce1caa367c2fa8ad377a691361e297dd2fcbc444c10115f18aec66dd6d69c458f282ace3025a3e8
 DIST mariadb-connector-c-3.1.7-src.tar.gz 742923 BLAKE2B 641c3c49cf83af918e5dab06f9b8afecd59bd7b6486cc55b33749cd0ef317ab6cff86da9b85829b0309305a190e16f4ecc369210c54070e265387a5818c48ca1 SHA512 0b7f6497b6b88b2bbcb870b7c3a8f3fe0bf547c6b5d9b95cc99423aa8ea02ac510c5fb71079e7cd79a49741c7f26f3e68c39e245b18fab46754e8640f79ff670
 DIST mariadb-connector-c-3.1.8-src.tar.gz 744745 BLAKE2B 24f4f6a8bb3a1fcbdf2c5a7434303e6a2295cb4aed0c59ee4cb776399516a9895eb51d6ef18dde429d7246750cad797f4f89c3838dfd54e835683021d712041b SHA512 005fdacd7e7b353b97b5c1305f973a90744e495d7bf5d407fc6c75d49323e13a743e6c3877c00ada2b3fc49a0f33e5c2dcd70b1f8fe8eb8f579af1bce3b3e6b9
+DIST mariadb-connector-c-3.1.9-src.tar.gz 745374 BLAKE2B 47c1bf1ffe888f6c2aefdb4661ad8bfe41c527d6ddc2b2aaf8da8003eebce90da420a52143265510ac47f07286d6dbfa27c4d82ce193c23aa928d0b22f83b87a SHA512 cf7cd3a7592a15e2a4800c6a899e6b515ef899f4525c9f5f7d09faafbd72ac5b70a85e1c60119f58d1b5caa0f0f3657a544555bb47cdc22eabe74308c0c4bf42
 EBUILD mariadb-connector-c-3.1.6.ebuild 2336 BLAKE2B f17769bbdc21d9a16c77f50699931b6b154f19a816a302700ef35c6668aa9145dcb68092a8fbdfc8c726655c391e905fa6836d3711171fac83a5ff7e6e21ac7c SHA512 51c996013e51d496d2225d3299977120ba297e58c48769c9ae644bb889ad4b9647c85584603949a0b05555420ea960c92d6b9f9136dd1c223c2af87733ca22b9
 EBUILD mariadb-connector-c-3.1.7.ebuild 2351 BLAKE2B 1c1a5117a6615079960b336fe290a2623a31fe16e14c2407370c9f3c945d23b72eacdd193aa79035d7e3220d02a00c9a035727ec65df78e498ed40c999b7f465 SHA512 a66f34d61aa78d017e078abc060ab589aec28afcc318785439c430b73ebb8b8c47140c3c1fb3fa39f4ee0794d76c751a8ccab31b12360ad24d51a51dd83f1e0f
 EBUILD mariadb-connector-c-3.1.8.ebuild 2351 BLAKE2B 1c1a5117a6615079960b336fe290a2623a31fe16e14c2407370c9f3c945d23b72eacdd193aa79035d7e3220d02a00c9a035727ec65df78e498ed40c999b7f465 SHA512 a66f34d61aa78d017e078abc060ab589aec28afcc318785439c430b73ebb8b8c47140c3c1fb3fa39f4ee0794d76c751a8ccab31b12360ad24d51a51dd83f1e0f
+EBUILD mariadb-connector-c-3.1.9.ebuild 2344 BLAKE2B 77752558e7dfd75b65013b5f1830a0a021ddc6b848b5716df95561ea0012e02257237c17869eba99c999879307ba69a9e700a55edadde4e41a4008d98c2e9f6c SHA512 6203dda2e0af3ffe974701d61c68138fd1a0b28c76426ddf39a04ea7783fdbd3ad5cd7e974edc59f38d12e380143f1bbf9caa3b5808cd33fa2df73d9aa85450b
 EBUILD mariadb-connector-c-9999.ebuild 2351 BLAKE2B 1c1a5117a6615079960b336fe290a2623a31fe16e14c2407370c9f3c945d23b72eacdd193aa79035d7e3220d02a00c9a035727ec65df78e498ed40c999b7f465 SHA512 a66f34d61aa78d017e078abc060ab589aec28afcc318785439c430b73ebb8b8c47140c3c1fb3fa39f4ee0794d76c751a8ccab31b12360ad24d51a51dd83f1e0f
 MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
new file mode 100644
index 000000000000..f06e270fdc2c
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VCS_INHERIT=""
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="git-r3"
+	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
+else
+	MY_PN=${PN#mariadb-}
+	MY_PV=${PV/_b/-b}
+	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
+	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+fi
+
+inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mariadb/mariadb_version.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/3"
+IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/libiconv:=[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		)
+	)
+	"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/gentoo-layout-3.0.patch
+	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_EXTERNAL_ZLIB=ON
+		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+		-DWITH_CURL=$(usex curl ON OFF)
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
+		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_LIBDIR="$(get_libdir)"
+		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+		-DINSTALL_BINDIR=bin
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+}
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 805d67ac398b..de0fdc7e5174 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -15,12 +15,16 @@ DIST mongodb-src-r3.6.13.tar.gz 40853787 BLAKE2B de9621de4f570d569df5cfe026ea5da
 DIST mongodb-src-r3.6.17.tar.gz 40932592 BLAKE2B 94bbb943fd929318a2b32344cb4574243ad234d1cd14ffef864d7fd2d60841866fd5a1966eae8f14266a9648deb62b7b55386d41338b515d5e6849e980143d42 SHA512 b4d9e9bfc7ff886532641058c99da29420d1aa472cb4cf2b254e0fd0af5ecc72ac8bf28dcd55ab738b799b00132ffacddd154dea37ccfbf459c7cc603c2582e0
 DIST mongodb-src-r4.0.12.tar.gz 49937644 BLAKE2B 81044a6d68be6420d30fb2d7386ff29871a696cad94ce5977c1aba60c2ce80e18ccb86492c1947a359ef124332ea82ac3cb0fb73a68f51904a008fdf911aa055 SHA512 802eaf57d56c5e8e217344f10104a201acb6f5abef0065fc1bb8e6ceef13fe489b7ae46ed0d55b5bad50fe3579860b1c1471d224b51b0f15f968278cb5f6a47a
 DIST mongodb-src-r4.0.16.tar.gz 50091501 BLAKE2B a383f9fef8e5b2ceda9646dfc4f4f46bc3bee66be45e94a846b1a7ce859826273812d4ce11aa96d1766071bf5fb422771bf2176350145deae99e64e59c164e38 SHA512 90458dea29a4c9a3078e1f13ffd2163911bf5a5f42884553ad9b3c2a2fafea2f73e506640c78f55f27bc16551582ad22244437356b89786fef383ce4b24bb617
+DIST mongodb-src-r4.0.19.tar.gz 50126414 BLAKE2B 2691e2a9c8833ff9a086b28fd137bc8e8f10d58570117657c7cc01edbf61568ae62f58440d72e8711de98b9fc6868c1095b4ee88eb7b0eb63ea45ce19e842edd SHA512 57032a009ea7e79de4cac496a2d1266b83b99cc45eb9f1169be2fcdca1ed2003a659ceedf9eafbd4aa7fc5b3b0513066a5d712af7666cee5a897b2a2d7dd30cb
 DIST mongodb-src-r4.2.3.tar.gz 61565615 BLAKE2B 695310a497e57f1c735f175f5b321c93cda376ec734bb08d4cabbd562a865b327f529560220be9c22f571cc70af333a77f0116f04c7f7e3a40f275ab53ab1bf9 SHA512 60e9091cfab4a189a937dfa7ce232eb6ead2ca192c916579f4fb5da2040aa340ae9de0ea8c7a4ccb0edcfdbdf6e666144657f171c3f23c0a62bccf27cd351c69
 DIST mongodb-src-r4.2.6.tar.gz 61671088 BLAKE2B 7f2b6240b05639d2bbe37ea148cbb225b30813879f71a5fc3c135ef7debd58edf75abe925d00f9ff96dc6a75a525b4504e25254b0046326069c05bb1dfd60827 SHA512 117c910807a8363aab6b899b436a4b06564b6e53abfa7f0fe6e01c1e242401ab5a3634d9edc5e0a5e2d548a480c90b70ac492eb199b3f2476d9045a78e376af8
+DIST mongodb-src-r4.2.8.tar.gz 61730247 BLAKE2B f1d98b8ac8f62c0c7aff100ef663bb20345de0e77e0ff420817db0843fe735b58af8075578a7f8d83cc9dc4e597c95ae09f89ce7a21cf8146ff15bcb11eba924 SHA512 163fce480762bd377d6c78b661bfe51fc883223a5309a68f9556e1bafb99e26e476d81dbe6de825d90469e835442be097be630ca9678e54b9d09091e0b5d67c4
 EBUILD mongodb-3.6.13.ebuild 4253 BLAKE2B 9c549c4a4f86d0642845b704af18c2f6e813ac71c188b1cc770b188e634dc388368607f92bc164afb24f0e4de09ee77d52a126450a89fa0af3f0254f6d8258d7 SHA512 aeacc08eb48dbd86141d694b1a71579b79da29cfc9f1f2e7727c25ccbb47bdc3f9b4d0091fd269ef04aff7bfce27059ac4059e7f7c14f8258ccc194996999c3b
 EBUILD mongodb-3.6.17.ebuild 4239 BLAKE2B 2e88b7f99c60bdc724aba683ac6397634e005ebd0ede16d40620f84de196d77b616defcb2faa1fd84434a922826ebcd53c2902f4cb9fdf052a4b4a4d767b638d SHA512 10425c5c499a7182a22bf80479ddd61bcea5f51c4b99fd64aaf4c8fe29fec9db7dfeca211ead81431faf98f800d5dd3f381be32737acde01d4608d14a9d4f77c
 EBUILD mongodb-4.0.12.ebuild 4314 BLAKE2B 6e1d33a0d5e3948e2c6d7258379050b8b090a2debd04623f7f51a1e35a54fdf6fe3407eb6ff7afea121f8274f329564f192e26104d2173a08b5ad31ca52f669d SHA512 4509e201ec92554b3b5cc7c2f1d2daba1195357e8e064ad2f639667136194f2c683a420b95a69d086f8abc00da32daab64e33b921a5278eb4ea095022d2048e9
 EBUILD mongodb-4.0.16-r1.ebuild 4593 BLAKE2B 25a75906f5b037572499b8f5a51bc5df9be6e4e413055c85c340a653809587b9467bb51a6b6bd69d5e9609a062727540b7ca90a71e738958b6d50ae21fb46683 SHA512 661332d0421a768ac8b22d9e5f8bc44c5e7ef986dc2180d3c2163e72190fab3557c378d162a63029c897fa1dc1e1a2e5ed2dde5b22d33e7a84de61fa02a52a08
+EBUILD mongodb-4.0.19.ebuild 4593 BLAKE2B 25a75906f5b037572499b8f5a51bc5df9be6e4e413055c85c340a653809587b9467bb51a6b6bd69d5e9609a062727540b7ca90a71e738958b6d50ae21fb46683 SHA512 661332d0421a768ac8b22d9e5f8bc44c5e7ef986dc2180d3c2163e72190fab3557c378d162a63029c897fa1dc1e1a2e5ed2dde5b22d33e7a84de61fa02a52a08
 EBUILD mongodb-4.2.3-r1.ebuild 4716 BLAKE2B a58003ae719b3726ef7ae083c03f753bbec1ad98f9a211c2274f81fa01a7dd96f46d505bf555b19eaa5ea12cb733d5437fd0bacf145fe35379048ac4e69d87a2 SHA512 a2b478e4a8d9f20aed3a653325ed6c47dc141421cec1e2782996443eefc5b7059931f21fb21781d1ccbe62d5809d127dc5658b39eeb98742317fc2ec0a42d3e5
 EBUILD mongodb-4.2.6.ebuild 4716 BLAKE2B a58003ae719b3726ef7ae083c03f753bbec1ad98f9a211c2274f81fa01a7dd96f46d505bf555b19eaa5ea12cb733d5437fd0bacf145fe35379048ac4e69d87a2 SHA512 a2b478e4a8d9f20aed3a653325ed6c47dc141421cec1e2782996443eefc5b7059931f21fb21781d1ccbe62d5809d127dc5658b39eeb98742317fc2ec0a42d3e5
+EBUILD mongodb-4.2.8.ebuild 4716 BLAKE2B a58003ae719b3726ef7ae083c03f753bbec1ad98f9a211c2274f81fa01a7dd96f46d505bf555b19eaa5ea12cb733d5437fd0bacf145fe35379048ac4e69d87a2 SHA512 a2b478e4a8d9f20aed3a653325ed6c47dc141421cec1e2782996443eefc5b7059931f21fb21781d1ccbe62d5809d127dc5658b39eeb98742317fc2ec0a42d3e5
 MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36
diff --git a/dev-db/mongodb/mongodb-4.0.19.ebuild b/dev-db/mongodb/mongodb-4.0.19.ebuild
new file mode 100644
index 000000000000..651219492475
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.0.19.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3:=
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		test? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+		>=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
+		dev-python/cheetah[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+	"${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
+			ewarn "To upgrade from a version earlier than the 3.6-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 3.6-series. Then upgrade to 4.0 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
+		fi
+	fi
+}
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pymongo[${PYTHON_USEDEP}]" ||
+			return 1
+	fi
+
+	has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/cheetah[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/typing[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.2.8.ebuild b/dev-db/mongodb/mongodb-4.2.8.ebuild
new file mode 100644
index 000000000000..b88bcf9c846f
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.2.8.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="debug kerberos libressl lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.6.2:=
+	>=dev-libs/boost-1.70:=[threads(+)]
+	>=dev-libs/libpcre-8.42[cxx]
+	app-arch/zstd
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
+		>=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
+		has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
+	fi
+
+	has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
+			ewarn "To upgrade from a version earlier than the 4.0-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 4.0-series. Then upgrade to 4.2 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+		--use-system-zstd
+	)
+
+	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index 39d3848ef73d..d0095dcf4f93 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -1,9 +1,13 @@
 AUX percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch 4034 BLAKE2B 0ce65196d4679481d3197e95d9efc3783c1e4f37dcd602588fc3e8da5957f63cf68b9222a7ab12fe2e8fd19d69e8a24e9f86cc7dd2ba776d473a95b9279a1f24 SHA512 4dd9352b8d8ae46782925daae27cd5ad1765c5f4ab26f1f5f07fbac68f0cb83e4979009dddacd8a55ba818c93014b46dee997b43f6951820337e0cb79733f60e
+AUX percona-xtrabackup-2.4.20-fix-gcc10.patch 931 BLAKE2B 77c433ab006f2fc5c36c5cee17fd37d98136779884ad0075b4547671690307a253dec9ac7aa80998bb1ee02b5568d053d7b41b5df348b5338c83497c744d421f SHA512 2a6f4f745a57df0f8df4f684e8ab194de0b00c1578e91823c7cafce1338bbfea873d1fb7d34f94233e40fb7a0b9d7edd869a482e7cb46f3706caf3d297983397
 AUX percona-xtrabackup-2.4.6-remove-boost-version-check.patch 485 BLAKE2B c9330c5b0a163a0d95682a81cee9e3c99cebdb2a6ed124cb5f424ade92728b11b29685e2c1eee0fbf9df613f5a1b08cc4021daec8b60a6c66ab51b08a397b33d SHA512 31277d6bef14a6b642ce425ce9f2c92fe49f905c42c720a583cb45406c1ee18ccbf2bef224b9b89bb02de18aecc1ec48576f5ca0c9bfef0cc683d78218506906
+AUX percona-xtrabackup-8.0.13-remove-rpm.patch 1139 BLAKE2B c2ada7337f6596ac5c37b1ebe7f2324fb4ee43e14ec41cfeb8d861bc2df0614ca1957c9d44cf81530b1f4bac9d6143edc906721aeebfe4551fe37dec9a41ed7b SHA512 99d4e92c5f979b4d3e9edb6ebae73e88f81d5696826d4f477f8cd885d8c54d955c879eed45779aca092facfef7aa29f818cf467c3302a7e8db6ca89fa5e38e28
 DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
-DIST boost_1_69_0.tar.gz 111710205 BLAKE2B 4a6d151ba10553641045a08bf4658c165862e05903b48bc700437104be468070785c67eed6dfcf1ed0923d5cf583a684b448e2a985e201bda298a3b839e62407 SHA512 89da45aca0774f68f897434882e8ec58f0673807c3a862315b90e893be90184722c098ad5822b89602b98ac3cc5a9f89c807079fd0f7e9c3f97be0d415414014
+DIST boost_1_70_0.tar.gz 116000903 BLAKE2B aefeddf5671295ae46fcfed033cef37cca1c70f88d7d3305636e0add98c277fc8170c7e3e0de58ff83a64389b5b430b81077b6852da5941aa4867845a7b08554 SHA512 3d8800d0aa864fb5484a5339ab75dee9bceca063122108e92d971f1d1295a9f09399b2dd88b117da7f0c4558b4f9fb1494eda1e3035498557bbe90e8f058668f
 DIST percona-xtrabackup-2.4.15.tar.gz 57357749 BLAKE2B fcc64736230636a3a5584a300229e0507f00bcd64a3d0b8e00f834b15ec757347a55a85521dd0aea939761c3a26b1ef99466ff7e633133b8088cd290bd835444 SHA512 789b6870d3ad06861126f67190717ffb31224628d1b9631ec5f39d0a41b3c66aaf2127e3ec4b38d3e8f7858a1438a74f0e89b07b9f4248b637b2ed39143ab599
-DIST percona-xtrabackup-8.0.7.tar.gz 149143566 BLAKE2B 0a6c832f44725230023c01b50ed3d188358e7d2ba073422652a258cdf416b9d3c2a18bda4730bc5d9eb77aab17612bf93204fc2838c521e90b8571706a31d3c6 SHA512 9947b4a943f52e4d07fbde4d3b590146da19b94ce40305fc0230fc67c39e93fa4f3a30a55029cdcdb582cce7efe93831164a96f985d19d1f7b64a75aea552f47
+DIST percona-xtrabackup-2.4.20.tar.gz 59782001 BLAKE2B 25deaa3044d89d6f884734bbaee20004d792f4b0bf86bd0d456177cd2b149c29af13900b32e29f92c04cf810b34584ec2d9a74b443be27b8c7dca54b330ced99 SHA512 bac5d276bb78209eacc34ea9950dc128a636c549795b6b071597ac3c8a43fefe9db085a42827b8176647affc2fcfc6caa51462dbc0ae7a1a716ba6fdc9092478
+DIST percona-xtrabackup-8.0.13.tar.gz 272887474 BLAKE2B d0ac4c602c7c3197ca0a7c361f9658bd2da00bdac5c6dc0a4d56b92e04e4e6c86f22b70e7cf2b375f121983ea7f134edae93116c91945b2c3314a51565033ae5 SHA512 b1fdb0dea1c8b6e39b5451153f01c8ce0dcf411fd88fe8f9f686e562e0950ff9270a39574230ada928b734cc8bb4517da0f01310e75d5c9beba0e35cfeaa11ff
 EBUILD percona-xtrabackup-2.4.15.ebuild 1778 BLAKE2B 74e30f27b5dc192c2fe8050cb881b1c5450a0f0d39c630580bf93b8bb95312602b30fa827a06df1794410b2d655f8adc2be9fef596ea26bdf00d071800f99f72 SHA512 fa47544c2b83c281d04a3b9f2e435a36a47d94bce872b3b0fce45071cdffc196c0bd03ca41837a2d2132a09880c1a443216f9b7d98ffe856a3323f8de9067bed
-EBUILD percona-xtrabackup-8.0.7.ebuild 1429 BLAKE2B bf48714752ff3c18035b8ff456820d64048a1e99d0c07b3c18efbe60edb122465a3e18124085657cadca2863e36d92c367a9d8316e8c1219d6a589863a796fa2 SHA512 6e154f9e6168da154c4869ddd56c951a521456fd7f745ac2c97cd24b20335952796d42022525d31746746f717c9488fa1bcfb25161bdab575a45438ca200f416
+EBUILD percona-xtrabackup-2.4.20.ebuild 1535 BLAKE2B 41170fcaab472910dde609fb7b12aa6918a708018a7fde9cc182276b8383fd041c322141aea8dcf599752a88e2ed5872f4087ac11cc27387495f7574af1be594 SHA512 592dacff26ec640eec56853e8a9bbe63ba8ecae859463e55aac9478c393d05409e3b0bd9a7aefbd4795f37ef213e183c9e24f9929ea05f470c33a6034e5a1fd3
+EBUILD percona-xtrabackup-8.0.13.ebuild 1572 BLAKE2B 04e9412cf2c65c49aeb71762c6e9ffc4438593a2cdcf2b9d5015d37960d9d040613da48f5c3d9e041077595228a062acab7b6a0113fec20500604ddaf5fe6b44 SHA512 1e1c4b232a72bbe58e7e17c991ca2cce8b59b231066808b5cac69484a913322f9ceab280f824d4da73519697c99c568089a96fd595d7a97ea9d9cb4366a1926d
 MISC metadata.xml 564 BLAKE2B 428ee8f4bba052e58061a5eb643feee71e5f02728b17d63a228436d0988babdb60b1d8acc887e7f142fc715994d1c4fef26cfb4644b5afac65869cdc3f02e887 SHA512 5eead923c1daed6ed5663b9d9d9b6995e5f8fc248064d48da2e2c89cbe1957ac3aee07781df37979cbdb41c37351f25bb6530f2aa0531008437899f82459ba31
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch
new file mode 100644
index 000000000000..8987082d1f9c
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch
@@ -0,0 +1,26 @@
+diff --git a/sql/mysqld.cc b/sql/mysqld.cc
+index 3801448b..83098498 100644
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
+@@ -625,7 +625,7 @@ struct system_variables global_system_variables;
+ struct system_variables max_system_variables;
+ struct system_status_var global_status_var;
+ 
+-MY_TMPDIR mysql_tmpdir_list;
++extern MY_TMPDIR mysql_tmpdir_list;
+ MY_BITMAP temp_pool;
+ 
+ CHARSET_INFO *system_charset_info, *files_charset_info ;
+diff --git a/storage/innobase/xtrabackup/src/xbstream.c b/storage/innobase/xtrabackup/src/xbstream.c
+index 611f8c04..f0c57588 100644
+--- a/storage/innobase/xtrabackup/src/xbstream.c
++++ b/storage/innobase/xtrabackup/src/xbstream.c
+@@ -55,7 +55,7 @@ datasink_t datasink_xbstream;
+ datasink_t datasink_compress;
+ datasink_t datasink_tmpfile;
+ datasink_t datasink_encrypt;
+-datasink_t datasink_buffer;
++extern datasink_t datasink_buffer;
+ 
+ static run_mode_t	opt_mode;
+ static char *		opt_directory = NULL;
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch
new file mode 100644
index 000000000000..759598637a82
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b9865e2..e3c82cdd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,27 +181,6 @@ ENDIF()
+ OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
+ MARK_AS_ADVANCED(WITHOUT_SERVER FORCE_UNSUPPORTED_COMPILER)
+ 
+-# Use 'uname -r' and 'rpm -qf /' to figure out host system.
+-# For Docker images we cannot trust uname, so use rpm instead.
+-IF(UNIX)
+-  FIND_PROGRAM(MY_UNAME uname /bin /usr/bin /usr/local/bin /sbin)
+-  IF(MY_UNAME)
+-    EXECUTE_PROCESS(COMMAND ${MY_UNAME} -s
+-      OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME
+-      OUTPUT_STRIP_TRAILING_WHITESPACE
+-      RESULT_VARIABLE MY_UNAME_RESULT
+-      )
+-  ENDIF()
+-  FIND_PROGRAM(MY_RPM rpm /bin /usr/bin)
+-  IF(MY_RPM)
+-    EXECUTE_PROCESS(COMMAND ${MY_RPM} -qf /
+-      OUTPUT_VARIABLE MY_HOST_FILESYSTEM_NAME
+-      OUTPUT_STRIP_TRAILING_WHITESPACE
+-      RESULT_VARIABLE MY_RPM_RESULT
+-      )
+-  ENDIF()
+-ENDIF()
+-
+ IF(CMAKE_HOST_UNIX AND NOT FORCE_UNSUPPORTED_COMPILER
+     AND NOT CMAKE_C_COMPILER AND NOT CMAKE_CXX_COMPILER)
+   # Cannot INCLUDE(CMakeDetermineSystem) prior to PROJECT initialization below.
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild
new file mode 100644
index 000000000000..f15f04741bfc
--- /dev/null
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Hot backup utility for MySQL based servers"
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
+SRC_URI="https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-${PV}/source/tarball/${P}.tar.gz
+	mirror://sourceforge/boost/boost_1_59_0.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-arch/lz4:0=
+	app-editors/vim-core
+	dev-libs/libaio
+	dev-libs/libedit
+	dev-libs/libev
+	dev-libs/libevent:0=
+	dev-libs/libgcrypt:0=
+	dev-libs/libgpg-error
+	dev-python/sphinx
+	net-misc/curl
+	sys-libs/zlib:="
+
+RDEPEND="
+	${DEPEND}
+	!dev-db/percona-xtrabackup-bin
+	dev-perl/DBD-mysql"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch
+	"${FILESDIR}"/${PN}-2.4.20-fix-gcc10.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CONFIG=xtrabackup_release
+		-DBUILD_SHARED_LIBS=OFF
+		-DWITH_BOOST="${WORKDIR}/boost_1_59_0"
+		-DWITH_EDITLINE=system
+		-DWITH_LIBEVENT=system
+		-DWITH_LZ4=system
+		-DWITH_SSL=bundled # uses yassl, which isn't packaged
+		-DWITH_ZLIB=system
+		-DWITH_PIC=ON
+	)
+
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
+
+src_install() {
+	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
+
+	dobin "${p}"/src/{xbcloud/xbcloud,xbcrypt,xbstream,xtrabackup}
+	dosym xtrabackup /usr/bin/innobackupex
+
+	einstalldocs
+	doman "${p}"/doc/source/build/man/*
+}
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.ebuild
index 3776aa32ffd3..edbb5af4c04a 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ CMAKE_MAKEFILE_GENERATOR="emake"
 
 inherit cmake flag-o-matic
 
-BOOST_VER="1_69_0"
+BOOST_VER="1_70_0"
 MY_PV="$(ver_rs 2 '-')"
 
 DESCRIPTION="Hot backup utility for MySQL based servers"
@@ -42,6 +42,10 @@ RDEPEND="
 	!dev-db/percona-xtrabackup-bin
 	dev-perl/DBD-mysql"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-8.0.13-remove-rpm.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_CONFIG=xtrabackup_release
@@ -59,5 +63,7 @@ src_install() {
 	dobin "${p}"/xbcloud_osenv
 	dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup}
 
+	dolib.so "${BUILD_DIR}"/plugin_output_directory/{keyring_file.so,keyring_vault.so}
+
 	doman "${p}"/doc/source/build/man/*
 }
diff --git a/dev-db/pgmodeler/Manifest b/dev-db/pgmodeler/Manifest
index 5b50f8bef9d4..85dace2dc2fb 100644
--- a/dev-db/pgmodeler/Manifest
+++ b/dev-db/pgmodeler/Manifest
@@ -1,5 +1,3 @@
-DIST pgmodeler-0.9.1.tar.gz 3569027 BLAKE2B 4d91d430554f739b585ed155aa2d87dc648ea5d2d6a1c22ddd9ae829afb63654fe052091de5dea51b0fee20ef2ccaf5b77587f036c4072bbc623bffba9a67b27 SHA512 bb6f093e00f0e41a9dd2a9b7e3723459af759e79835b73ab67b01c23ae6b29f1453b5cf61e987c6f1a2a3908e700d048f0a7dcbed3ac1636493d6b6e657917ba
 DIST pgmodeler-0.9.2.tar.gz 3930988 BLAKE2B 36d89c3bb400cd82199492208acf40fb872cb832a4911f818581672478d80e43bf56246a4485dd9b3a65a378bc261ad1c4b40243f1007aa2e67e75b62233ded4 SHA512 1bc48998623e39139e930c028095aace808084bb05d837273386a96aaeccd292890bbee58059b27710331f87d6e89a79005f2b0cdf901d229be6f777958fe051
-EBUILD pgmodeler-0.9.1.ebuild 1241 BLAKE2B 440d707fda8d0e7c052660d57ef4d56518576a9f9dd8d698d759c87e23f8a07d8a0e785f60edc0415197c374f3b6fd9587101f8d70506e79593200c350b2228d SHA512 ed0d7576a98c1a736778447cc6507fb5bfbf58c00319f94c767116fe0c7ed18dc6528bc541aaed93cefa3a689582a65a773a770bc162f1951533f589784b1544
 EBUILD pgmodeler-0.9.2.ebuild 1247 BLAKE2B 7bfbe91ee4e4dfd60cea2bbe863ce20dc153587da485fd24e445f4a9664cf3b99f2638f05b46af0de09e41e415711fe839d4de6fedd25c023a09c22924cb0cda SHA512 2e93e90361d7ef10c22c6a26e021987dadbc43696d4b3ff81a79b5e840468642168b1e1e456fd9f68d603a203e7ca266cc0af536f28698aa5025d6e07bed0845
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild b/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild
deleted file mode 100644
index 931497289212..000000000000
--- a/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{4..6} 10 )
-
-inherit desktop postgres qmake-utils
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="PostgreSQL Database Modeler"
-HOMEPAGE="https://pgmodeler.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="${POSTGRES_DEP}
-	dev-libs/icu:=
-	dev-libs/libxml2:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md RELEASENOTES.md )
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_configure() {
-	eqmake5 \
-		PREFIX="${EPREFIX}/usr" \
-		PLUGINSDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins" \
-		PRIVATEBINDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/bin" \
-		PRIVATELIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \
-		NO_UPDATE_CHECK=1 \
-		-r ${PN}.pro
-}
-
-src_test() {
-	cd "${S}/tests" || die
-	eqmake5 tests.pro
-	emake
-	emake check
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	rm "${D}"/usr/share/${PN}/{CHANGELOG.md,LICENSE,README.md,RELEASENOTES.md}
-
-	einstalldocs
-
-	doicon conf/${PN}_logo.png
-	make_desktop_entry ${PN} ${PN} ${PN}_logo Development
-}
diff --git a/dev-db/pgxnclient/Manifest b/dev-db/pgxnclient/Manifest
index 26d4af64f433..69ac61303ff4 100644
--- a/dev-db/pgxnclient/Manifest
+++ b/dev-db/pgxnclient/Manifest
@@ -1,3 +1,3 @@
 DIST pgxnclient-1.3.tar.gz 51976 BLAKE2B 84ae5573588e6da0b01d5b05e296adc09f28a0b21ff81e5f2f14f3035a98ad5eb834d6793acf0a48a8b19190b989562e75094341f7c01b371028a0dd6a87b0f4 SHA512 fd9326107334d473db3466f776021186a5add389a93266b000c143131a0214b9773dd4cdd4688575cd720c8357afce1473838dea4aa5ff2564dcbc2c359de2dd
-EBUILD pgxnclient-1.3-r1.ebuild 975 BLAKE2B a3fe17330a8488386d3c0b658db12ecbc7c3abfb388db490909540a67311484df405aeb14327e7c6ff5d8c56b1f7d2cf793bea14f1daed319a85d116a4adfe9f SHA512 9a431ba0a95cbb8abb96bb1cda59958f4588cfb2767c7c5ecc483f6ccd2659c56e985efd2150083a47f5474cae6c2bfc5a051238a21e81f92c7a46f1cab9e734
+EBUILD pgxnclient-1.3-r2.ebuild 802 BLAKE2B f4845b035cfaaf7d9dfbb986561adbf1498bff3d3b4369c81b8b92e875cd0ad35dc49c43b546b1850c6e6d2aff349eac949141f25c55e8a69638913792ec091a SHA512 497d87ee6c7fb68212294a0b293ae68f364b1798eac23ecdff1369568aa2e72e881d727887e163be812909cbc241011101d84a62b678201ca7dc4c3e92a71223
 MISC metadata.xml 477 BLAKE2B 69bcece85da5b9490a5aec5f94264a420d5babb983d602188b4bcad58f35da663216bb52e694009562e518b716a12b05734a2ee81a1219d93641268630a68e3b SHA512 63a1019650d2bfec1f0dab904cabd0de847f5d7cb5ad62dd04ca93a6cf7c25ef2a727a8dc0700a00958b841f7ffaa2c99f608b4cb1872a31a1dc920d0834d22d
diff --git a/dev-db/pgxnclient/pgxnclient-1.3-r1.ebuild b/dev-db/pgxnclient/pgxnclient-1.3-r2.ebuild
index 7b785a380af5..4af1585476da 100644
--- a/dev-db/pgxnclient/pgxnclient-1.3-r1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.3-r2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..8} )
+RESTRICT="test"
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
@@ -16,25 +17,19 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 LICENSE="BSD"
 SLOT="0"
 
-IUSE="test"
-
-# Test data isn't included in releases. So, the tests fail.
-# https://github.com/pgxn/pgxnclient/issues/36
-RESTRICT="test
-	!test? ( test )"
+IUSE=""
 
 distutils_enable_tests pytest
 
 RDEPEND="dev-db/postgresql:*[server]
 	dev-python/six[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )
+DEPEND+="${RDEPEND}
 "
 
 src_prepare() {
+	sed "s/setup_requires/#/" -i setup.py || die
+
 	sed "s/find_packages()/find_packages(exclude=['tests'])/" -i setup.py || die
 
 	default
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index 11f5b87d1aec..033be45a704d 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -3,9 +3,11 @@ DIST pspg-1.6.8.tar.gz 1017316 BLAKE2B 0150b4577365000b2fdd9de93307acbb513391591
 DIST pspg-2.5.4.tar.gz 1346559 BLAKE2B 01c0a35a6372ccb7ad007595d01eb0c8380428722418a4f4b6040a549757d2eab601371ded51a762d81677adc259abf5f8af4311fca6427fb24244e0c33035d2 SHA512 2a9c677bbff4eb032403b90f44dbe9f62a46775c1cf180e90fc3df2853973c4b584b674fa11e2b3be844402f5c00777388ff05782fdecee3b27d92280fc288ff
 DIST pspg-2.5.5.tar.gz 1346896 BLAKE2B 7b5b64affcc6ec52ae9712fab06089db3a8ae208d94190fa6695d2285d29a13ac2c5ca3854a1a13ec6907eed04dd6bb188b31cc6440963a069a2715ecf109eba SHA512 74e8c8c5a156d9115a2bc6c9957d302b5e48182181c9560100c09dea765f9a382d78b5fe74ca11fdccd40bdd2f8a165218edf89ffd7713e479f0443a49766c4d
 DIST pspg-2.6.6.tar.gz 1355951 BLAKE2B 134f6af029f070bac66e9f514fee985b7ce77f788b44280cc4df969801d2776a60aa9dd679ae848c4fe68ce58d593c10fd1e2305734d0f76e08f1d2e51ad17bd SHA512 963a4bb3e93880c5dd8538b2ba777977585b2e9766a29001f1e5dd8d4692ccc333cf8bdcf0d7ae3f0cf02568e5645d4534cc58dc540d22df5debc5b4e034114c
+DIST pspg-3.1.2.tar.gz 1368987 BLAKE2B 7eff4134ee97db4df4dfada08ede5e88ea0c37a681c95ba9529f30be98f05cb3a7805e5dcb165b34f5afc2d4d7ca6de0e705334967ade0fdb813636c73df658d SHA512 1446200bdfe88787083da32629acaedab6eaee68b3dccbff3f52c82165029cb0f558790951d5103876c84562fcd6b5578042bca134f4ed37b9c5de96fdc5602f
 EBUILD pspg-1.6.5.ebuild 375 BLAKE2B 1eb56e1d31c91e2766faf5f196d3c7498cc7006b0715f57af5e879f2a65a93bd7061330bb278c193792ead58752fea4de8bc39523b35da546e6896373bd374af SHA512 bce1d5b5642d92cc5aae26905b48e940699f42fcad58b4df3988effa9f14a51bfee55cee95eb72f65a810c99ab59576728e5b63377770f149a2dbf470cd20f86
 EBUILD pspg-1.6.8.ebuild 377 BLAKE2B 59e6f8cefb4a9347304231161958a8915a8cf375dd2096b4d1fdc19b00d3fa4093780ac7b33a78814673191514fbb5d965f5d7c5904b63a9abeab6a9f82819a2 SHA512 589f39286408970b9118c3cad7a343278adbd1c539d42e92bd293cf549c8ba5064a77a23649e55d60559e5a1380e77a92647ebb7a25716cbf7cb28a5389bc26c
 EBUILD pspg-2.5.4.ebuild 417 BLAKE2B e546c8ac11ad8abeb004a3471ef1aa09c8c75c14d84e8598d1743227183c9bba787280aad2c168e8db72ff5b0fdf6517e9941179de55b47bbb0756338bc16d34 SHA512 59a6ae7ac90bc01e5628133110a63f00ab5bdde45c8b21d886efc1a9e7209dee24ebc2f1e30a63fdabb06ab04242c4bc16df2b7fa34086de52d1d3fac3171f6f
 EBUILD pspg-2.5.5.ebuild 417 BLAKE2B e546c8ac11ad8abeb004a3471ef1aa09c8c75c14d84e8598d1743227183c9bba787280aad2c168e8db72ff5b0fdf6517e9941179de55b47bbb0756338bc16d34 SHA512 59a6ae7ac90bc01e5628133110a63f00ab5bdde45c8b21d886efc1a9e7209dee24ebc2f1e30a63fdabb06ab04242c4bc16df2b7fa34086de52d1d3fac3171f6f
 EBUILD pspg-2.6.6.ebuild 415 BLAKE2B b60c5abaf49da08566e205a33fa33030a041b3df0882348dc5eb0ea3a0b90fcb885c4ac2f41ffb054ee80bd105c9f707f4f576bff71c2e4dca3e80a4ad0ed594 SHA512 243e3124bd436d36081aa7a7b0250329a2c772b94d55438faefcb6d4c4e923a9e5c102c37ab5011cd2e057c3b24535d11822a862956a8d0e59f92ea929e9a6ec
+EBUILD pspg-3.1.2.ebuild 417 BLAKE2B 0ec9f20546abc9e992a1f02b26fdfc2a84f506a285528f4a83c360512362a5440e3843aaf8bc9391ea9ffe8cf409b35aa484cb8526087c9e5ef5573905dbb6a1 SHA512 0622265d4550b2fe99cb42f3204bf8338d1399a9eaf8a16f93e948c7933fbcc742f315ee942dc74a04b6ca96267d53949d0a435af0d36b671da347506fed7600
 MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pspg/pspg-3.1.2.ebuild b/dev-db/pspg/pspg-3.1.2.ebuild
new file mode 100644
index 000000000000..67b53cc4d812
--- /dev/null
+++ b/dev-db/pspg/pspg-3.1.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A better pager for psql and mysql"
+HOMEPAGE="https://github.com/okbob/pspg"
+SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:*
+dev-db/postgresql:=
+sys-libs/readline:="
+RDEPEND="${DEPEND}"
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 40df5947f0f2..bf70ab727ac4 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -21,7 +21,7 @@ DIST redis-5.0.8.tar.gz 1985757 BLAKE2B e46af2133e066ccb91a8eb2c2fbfefe3747e1cfa
 DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38659001421f96040e8a64a4a304e9dc1f06d82802ce1c92515d166cfd37c2f347df4c4cda0c2c4c2bb10d27c5 SHA512 d2c7bc1f769bc5d179bfe6e71954962813b50597eafc752a9b1edf2fd87e84707b7daf0910db56dd0e89cb3bdb3e551da7f111ae4899f505bac5f77f99744c13
 DIST redis-6.0.5.tar.gz 2217666 BLAKE2B 6c85b344ada4a8b9981bf0403e883d7584b391b5275f14b4335f51924c2e9dc2eb7886694cd62eec2ac2c4e747468161b75cde3a4b373e496453787cbc994c43 SHA512 62ce42bb5ac9443e0736f5dfeffa7609542cef5b3c6c7d689ad8427cf788f3daf321531fdaa0329942e746e2eee47461be9d8771b89ae25adcc5badc225ebf26
 EBUILD redis-4.0.14.ebuild 4641 BLAKE2B 970a3440789c6bc964339b0de7df7c7882a492e259e503a65f0182aa77c7e54b2d477903f623dda0f1526de8e9985075a658a2050952484a3070a04ddfa49c60 SHA512 0ec94984ce74d537d13028d64d1a503f7de7cd5514f25a57d89872e6389a69d8cc747e1e9448f13e8395faed6e7d733c5183174029cb10af8d7b27320c659670
-EBUILD redis-5.0.8.ebuild 4670 BLAKE2B 50c9fa61224453be6a8196121f82feb8c1a5896f66d57e2400235061bcf5767a8f89cef89020975b060af2ecebaf69a880dfb8e21ad6e4b3aedbe2d1771ae445 SHA512 d82e7f2408c47d5966d400c56846e07ea8b75e604b13afd7afcbec76e6d77d764945f9e3ab9d9a0569fb1fc4e59d34250733b9627e1dc0f4681e500606df4e13
+EBUILD redis-5.0.8.ebuild 4669 BLAKE2B 79265c316a1ecb3a7ce5bf5b0af70c68ba9cf4f0439f67a190cdd19dc16158ee40b7379e088de990b122d21157a6aaa415f4f70e1e237861fb5c268dc8e60175 SHA512 340ec29034e795225dc54a2ccb120046bbd8ea3d241988b6ef10d249f3070e17857098d2d3c742e6737205b3adf5b0fbafd79ec53d0fe0ec8caf6abfcd2e7f78
 EBUILD redis-5.0.9-r1.ebuild 4744 BLAKE2B 911a324ae75ab43090425efbb15fec52b2568e09944656450d13eb82d730466466b638adab70bf71378726d08da982a05d1a7b0bf0db7e8d7fc65606ded549de SHA512 270f9e9b8037799c2e59037c968796155d9c5dcbb29a69e72e1544cd310f0921a9e26101e37b6d4d6701b40ad6114bd1f931d36d8be2d96994ad861ce6cc39ac
 EBUILD redis-5.0.9.ebuild 4676 BLAKE2B 2de30fcbfb59d8b8fb75fe956d493f1ea7af8b6e5c9345a063722f5b85a31865d8acfad4cfd2b97dbe96e13f9734dc772a5b3c67eabf68239035721e6c0391b9 SHA512 ad8055de14691a842f160f0dfdd9530ed290417cca01f7e668fccece5433c18da26c153d20fd9df15ec58deaf56c6f7cc6aca83540fc6bd3e12c9bc2be27e43c
 EBUILD redis-6.0.5.ebuild 4705 BLAKE2B f7082975e525a81280bbbfef7ca72e662cdcde23391f033cd7851c8ec780d3239cba21b71a0808a721d28356233590ec41eb6160f7e9c4b82664ceb7ae33e9bc SHA512 47cf629bf66800b00a545fff07aecc6889bd28c526e666763254d8598e9ad8dd567c08c73f3c006843f161f369278bca27e3b62a3927ac1af1ba18177545d6c9
diff --git a/dev-db/redis/redis-5.0.8.ebuild b/dev-db/redis/redis-5.0.8.ebuild
index 61a50565cc94..17942c1e4f61 100644
--- a/dev-db/redis/redis-5.0.8.ebuild
+++ b/dev-db/redis/redis-5.0.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://redis.io"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 RESTRICT="!test? ( test )"
 SLOT="0"
diff --git a/dev-db/rqlite/Manifest b/dev-db/rqlite/Manifest
index e299f6e4331f..d18f124719a8 100644
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@@ -77,5 +77,5 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c99852
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST rqlite-5.2.0.tar.gz 304914 BLAKE2B eb455a1f30c5f431c657fa04a09fdadbd471c34788b3a86e0440c1fb0301c51318e0d9e96e9d948d3093665e1aff612f8429acbf9c572f7497f691d3ee49665f SHA512 80f0af92c9f3af158094d728a032c87e2cd3fc7631207e5aa300ef1866a8bfd5915ad652de09874b75bf9ef155a8795d736aba275414a9d6ae912b01082a0aa2
-EBUILD rqlite-5.2.0.ebuild 5047 BLAKE2B 40d7bbf44cf38f436bdddddac496ae6e73ab510e57d85934720f2f9bfd7c6dc7cb51f92df40a33c2b5d3a9c97e23cdb7d9664a4f499ddebafb0833f8e1e31cf5 SHA512 7e21c2795676da8434ebe592ef7d46ac9a4ab4a9c786749694168ce59dd2da3120c76dc6d6ed2676eefd0a34a88efa1d792dbe822cbfd28ff8a1af3433638c59
+EBUILD rqlite-5.2.0.ebuild 5048 BLAKE2B b0c3407cd790070136cf7b35deaf3fd5bc4bf04696092f94ac72607596b85879cb7e26634174cdf82d0b9054febe44c737180f9caa6675dfbfe22d2f5bfd7ad2 SHA512 f2b880e179a4c037cd48e08506091ab8f2da9e6a1c2aa320d83f6f8cff5983f9ccf693cb130bb31fe3917db14ae3dec1f4b559858b45e0669ac4e1829854a803
 MISC metadata.xml 304 BLAKE2B aa848abaaeaf54cb85ddb9600c6044a9ed2f3e446f3131f3725431b3a3eefa0058a8c962c708f1735dd97caee1c25a461da3f6fd622b521ad36234157580f6f4 SHA512 3e536da8ed6a50cbffad3574074029e67b25627d80050f388742e7b086ffa73e6fd93fa307cc267bc23b4eca080ddefa7845a3ac90ad3736862362f9c0e29c92
diff --git a/dev-db/rqlite/rqlite-5.2.0.ebuild b/dev-db/rqlite/rqlite-5.2.0.ebuild
index b0f87c9c7b35..46bff9b3335f 100644
--- a/dev-db/rqlite/rqlite-5.2.0.ebuild
+++ b/dev-db/rqlite/rqlite-5.2.0.ebuild
@@ -6,7 +6,7 @@ inherit go-module
 EGIT_COMMIT=77863e5a13110f1fca87b6fce84a7169c3aa58f5
 
 DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
-HOMEPAGE="https://github.com/rqlite/rqlite http://www.philipotoole.com/tag/rqlite/"
+HOMEPAGE="https://github.com/rqlite/rqlite https://www.philipotoole.com/tag/rqlite/"
 
 EGO_SUM=(
 	"github.com/Bowery/prompt v0.0.0-20190916142128-fa8279994f75"
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest
index 34174b75a6de..01e113613431 100644
--- a/dev-db/sqlitestudio/Manifest
+++ b/dev-db/sqlitestudio/Manifest
@@ -1,4 +1,4 @@
 AUX sqlitestudio-3.2.1-libressl.patch 1248 BLAKE2B 7500c5231d03a2c1e2006631b77076a0cb6af49609446544f7e3901b748e87a2be03b232ef8f93714220542fff56f48e92c2de39d8a54889d7472b142071c71f SHA512 6fafceed80e8d072d06060f15787d855bfcfb55a502a73655beca043a73c45101bf5d3168781a2579c9e6aee5d924318240c886fe982cb0c833779d57be97405
 DIST sqlitestudio-3.2.1.tar.gz 9405867 BLAKE2B 53cd8465a6140cf17c602094cceef2fdf74f513f33257b22e1a3d7adcb9c78d8eb2cdaff047920836a9d98429ba0025924ce608f2eab97319feabf063de4c9ee SHA512 9c07f0dc50bf35ad04d0cb06cfc1a306d3f0aa9446e7d737c8187c63cb7dd2c44fb4b960693f2c30a15ece3aac0878701874a9ce3cebfe0c6bf48df10814a574
-EBUILD sqlitestudio-3.2.1-r1.ebuild 3775 BLAKE2B 434145097a1175605418515b53506f536e7c97981119040c579c20d8aae4abc20ecf649578d5a94bb475d27001d449be6cfe57706e987c6219644d4556d18937 SHA512 01087e85a42c66ddce282fe74e21314298a25ed7e73e6f02c21ec10f7e5169b8c7e9a5d47503d26d7ee6ef312f9b4f89b3c5db8c9511ad36d009ccd7b034480a
+EBUILD sqlitestudio-3.2.1-r1.ebuild 3812 BLAKE2B 6f9ea8c4bfde3e9c323edb9cac312a1e03731b8e2d9d389e4fb99509107c156115d24023b58c0b62b30afbefd4c6918b8c3a871ecb831dc43ba6dc39bf38b1f1 SHA512 abedf192358de6e4dc06b1852431557a6082940127f0a9f0399573b9364766a5071ca0eeac0c9adf349c62d1df8c7237fca57f82b7c05a31c4a0582ee9a43aa8
 MISC metadata.xml 427 BLAKE2B 937831b3acf561038a945599a81766c4fd1712d889b8bb0ba2c7b8c0d2414c547e270363b6ece7fd7956b66f1eec2e12bb4b83a2adf2718c14d0271d3c0f0155 SHA512 a6948ce576abceb4df085f103e097a720ef5f959c6f4bb79cc1f1d858e43cea625d5af3c5edf47f5e61c0a537368e60abd77ed3fcf39a9526543de315ef125b2
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
index eed8e84a6d17..af6ff97a5db8 100644
--- a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
+++ b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="de es fr it pl pt_BR ro_RO ru sk zh_CN"
-
 inherit desktop l10n qmake-utils xdg
 
 DESCRIPTION="Powerful cross-platform SQLite database manager"
@@ -15,9 +14,9 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="cli cups tcl test"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( cli )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-db/sqlite:3
@@ -37,6 +36,10 @@ DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
 	test? ( dev-qt/qttest:5 )
 "
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+
 PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
 
 S="${WORKDIR}"
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-29 11:38:31 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-29 11:38:31 +0100
commit	90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch)
tree	83fc5facb6b12be510a37bc3d241cc63e965b13a /dev-db
parent	feb0daf81d888e9160f9f94502de09b66f2a63fd (diff)