From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 6 Sep 2019 10:28:05 +0100
Subject: gentoo resync : 06.08.2019

---
 dev-db/clickhouse/Manifest                        |  14 +-
 dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild    | 200 +++++++++++++++++++++
 dev-db/clickhouse/clickhouse-18.10.3.ebuild       | 200 ---------------------
 dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild   | 200 +++++++++++++++++++++
 dev-db/clickhouse/clickhouse-18.12.17.ebuild      | 200 ---------------------
 dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild     | 200 +++++++++++++++++++++
 dev-db/clickhouse/clickhouse-18.6.0.ebuild        | 200 ---------------------
 dev-db/clickhouse/clickhouse-19.13.1.11-r1.ebuild | 205 ----------------------
 dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild | 204 +++++++++++++++++++++
 dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild | 205 ++++++++++++++++++++++
 dev-db/clickhouse/clickhouse-19.13.1.11.ebuild    | 204 ---------------------
 dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild   | 203 +++++++++++++++++++++
 dev-db/clickhouse/clickhouse-19.5.3.8.ebuild      | 203 ---------------------
 dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild  | 203 +++++++++++++++++++++
 dev-db/clickhouse/clickhouse-19.9.5.36.ebuild     | 203 ---------------------
 15 files changed, 1422 insertions(+), 1422 deletions(-)
 create mode 100644 dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
 delete mode 100644 dev-db/clickhouse/clickhouse-18.10.3.ebuild
 create mode 100644 dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
 delete mode 100644 dev-db/clickhouse/clickhouse-18.12.17.ebuild
 create mode 100644 dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
 delete mode 100644 dev-db/clickhouse/clickhouse-18.6.0.ebuild
 delete mode 100644 dev-db/clickhouse/clickhouse-19.13.1.11-r1.ebuild
 create mode 100644 dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
 create mode 100644 dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
 delete mode 100644 dev-db/clickhouse/clickhouse-19.13.1.11.ebuild
 create mode 100644 dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
 delete mode 100644 dev-db/clickhouse/clickhouse-19.5.3.8.ebuild
 create mode 100644 dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
 delete mode 100644 dev-db/clickhouse/clickhouse-19.9.5.36.ebuild

(limited to 'dev-db/clickhouse')

diff --git a/dev-db/clickhouse/Manifest b/dev-db/clickhouse/Manifest
index 02eff11f0324..468b95de347d 100644
--- a/dev-db/clickhouse/Manifest
+++ b/dev-db/clickhouse/Manifest
@@ -9,11 +9,11 @@ DIST clickhouse-18.6.0.tar.gz 5852534 BLAKE2B 5634fd26907b21d4a35cff3ed816696205
 DIST clickhouse-19.13.1.11.zip 11502726 BLAKE2B c2788702a2c27c995abc072a94f3945ed6f9039fe0c7840312a86987faf52d2f7801d531e89a02848fa8ee1319247c41de0f3ad0c0cb51c1df1dbcfca3bd3b0a SHA512 095a0e63eff6989ea1f70fac593069e1cdb6ea207a99d8cfd610c4eb8f3f7411a784d9f100c9fc899898e68dd88dd54bec3c136764793c8cae986d920a651f8c
 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.ebuild 4915 BLAKE2B 3f6f0f1cea60a283b325b80100fc56ffcb548e6af01240a12a5f6a6aad521977c63e8918d3742c52c0fef2d5c79144f6a1f9cb95749a6c140cb16548af432f4a SHA512 0ecc73385521a4d916e8834d22e05a8be07fb0b2d6a4bcc3350dfab100717839835e4a47a17d87f50f98acbf420b077dc7f9db800e3456915dc2ed81fc0197ba
-EBUILD clickhouse-18.12.17.ebuild 4912 BLAKE2B 71e1d446bc95be176c6946d18162b78f0ae0e936be2caedd9ee7b0df958daf8423ffce528c27c90607568f5bf3b391092ef264c7d1439506ab89f6fded52bb6b SHA512 6ac5f2e640ad5e6536a38a9693df2b31706f9d777f53213971ef848160886d16b6cc0a7f900ce587e53b1cdba3edcdd37541b4e639aa65662f9e0a26f9501fc5
-EBUILD clickhouse-18.6.0.ebuild 4903 BLAKE2B d363915e46bfe1489e07f9ae9b07a39c146603af9496ab98371b053241566e02c7b85cf64a985ef8958e83a8741ac20583917e8268cec80702e4d37e69d8e110 SHA512 443eb0cd7f343eaff895dfbcb6a98abc4b2734495e2abd9c9f51e613fc2ac8698797bb5f780178c86bc0d8621cfe0b976470c7c4b9ec0bd337fa0599f0d01848
-EBUILD clickhouse-19.13.1.11-r1.ebuild 5144 BLAKE2B 77f5416736145c44a1968ebb74968fe59b807c46dfb4104e73544a554f49a3d4ae34b494290c5beca798c32096014e63fac9940790f9ed3b9c4a4d7b59b09489 SHA512 9aff8448125ad6b1dad555289f1a345b9fbbcb2e7c1594ac680bcfb4274030149c52786cd1b58c620329ec587a683258d9dfd3aca111d1d04c7bdd3a36b309c9
-EBUILD clickhouse-19.13.1.11.ebuild 5054 BLAKE2B 43ae8340ed6038c6ea92c44d4dbd27183feaea2f96ce0c563a2163ce2a3c8e0a851dab3f3a813fa83404fbc008bc84a8c905581756529e4f269b155c6d4d2e76 SHA512 092c727a4dd9a7a9ce0cac0032988e01d29d641674a5f47a0dc77eb4d99090c45925dca4aa304646cc89ceb0017463bbf93d4711683030ced0a18d3e4f04246e
-EBUILD clickhouse-19.5.3.8.ebuild 5035 BLAKE2B 5af2ff21963b567b2f1f1600a046e90c885a17aeb2b4244a3d60b15b96d25fb268330de602db576ea3809785be984e2f511d63b17776e369f1798549398148ce SHA512 5642771484458e8fc390a259af958598972207706ed3f78247fbd91e242bcf79052be58fc49b50f6d44765fc1932f6731ff45b17244b6919daa69a44ea83023c
-EBUILD clickhouse-19.9.5.36.ebuild 5035 BLAKE2B 5af2ff21963b567b2f1f1600a046e90c885a17aeb2b4244a3d60b15b96d25fb268330de602db576ea3809785be984e2f511d63b17776e369f1798549398148ce SHA512 5642771484458e8fc390a259af958598972207706ed3f78247fbd91e242bcf79052be58fc49b50f6d44765fc1932f6731ff45b17244b6919daa69a44ea83023c
+EBUILD clickhouse-18.10.3-r1.ebuild 4918 BLAKE2B 2b7db7cd6213ec5965692c231d567f29345515edd639e054ad2f4dd9ca5ccc11560126c9361fb93412395810947c1b6b19859c0b5274a90eda502851a45c44f0 SHA512 97f4328dc9b0ad5cb50c223b00d127aee0da3f3349067674cd124b6a4842547376b674d031d72274313bc1df22099570cdac6211f294be97b5b08ed91155cedc
+EBUILD clickhouse-18.12.17-r1.ebuild 4915 BLAKE2B 6912e12f85c382c0a2822c924055583d1152311f1a7480900573f7dba1002821821912c75420551aebf32ee7dea70f54f8d8c00512f155fa66f3926146e21721 SHA512 af177e7339dcc6b0a8a8d3527b2c15a663f8bab2cdf2879d1ba7ff217697bd7db369f1a3f54630ebf00bc36e455b6f9b4390752cd910d3e434d42aab962ed0e8
+EBUILD clickhouse-18.6.0-r1.ebuild 4906 BLAKE2B ab34699e3a363109e51559ed941bc47ee422335ec0a198191f8aee9673cabb2d14156210855bb46bcf0ac1cbd7b744541641b3e0e796085a0c2cd9d2e3a59435 SHA512 3671f1837b50806528893c8f1291ec60f2ef42230ae8f5b7c07ee9da34706a0ba489e90950a03fa0f3c8b9bc3b144a06e7f3f0bc35b30fbb179da7715ebefc14
+EBUILD clickhouse-19.13.1.11-r2.ebuild 5060 BLAKE2B 9dd106fcbf56f676668613defe986cc39b8b489e67a15f96bc89101e7490bccebfffdbd85dbe5ea890e635f7f87dd7f06555caaaafdd76f06ee0ae5ea7cd1db6 SHA512 8e0eb0472dbe9bca99181b644489b331a292f41ede0d6ef35c6c8862f427f883255d890f0fd973728a9c6538d679c7aa6916e481bb55f3ac1b662c402215efa1
+EBUILD clickhouse-19.13.1.11-r3.ebuild 5150 BLAKE2B 3224340a5229b176f033481560373c62ba3493e4f75d2d946379db1c1da8ff17180c382478572803d638e67614a4c4385a8bf1e13fb46293f0ea4a07fb9ae812 SHA512 ce24527a8c9c5802d6fb1cdc9a6c6fafa49a71d20199ae77e45da1190cd720719591009a0f2ecaad867f4f9952432d3af7ad5a39a9618f2467b2aee817d31f3b
+EBUILD clickhouse-19.5.3.8-r1.ebuild 5041 BLAKE2B aad165d484fd9a978057e57f57a12146ae97f82455ff47909a9476f04c28c95e719a7867cb2b2fe6acde25fa2e43c12de4c7c19c2c8e6f0810f4ddcf08b311ad SHA512 253de2e46d5eaba79d5d79a149e0fcc582dd08dd30a0b04fe39e2900ebf5ca68cfd7619f4c9af5d662d7baa795649a37a4db48efc6067c92fb79956a2ca9e847
+EBUILD clickhouse-19.9.5.36-r1.ebuild 5041 BLAKE2B aad165d484fd9a978057e57f57a12146ae97f82455ff47909a9476f04c28c95e719a7867cb2b2fe6acde25fa2e43c12de4c7c19c2c8e6f0810f4ddcf08b311ad SHA512 253de2e46d5eaba79d5d79a149e0fcc582dd08dd30a0b04fe39e2900ebf5ca68cfd7619f4c9af5d662d7baa795649a37a4db48efc6067c92fb79956a2ca9e847
 MISC metadata.xml 738 BLAKE2B 861f40f506964d64cf646f043406945dc54950f48e27d4eb28b6fc0f96bf0ceb093520a0b60d813460fbe8b99ba4858f0a49d30abcb25567f44411c78a02f6e7 SHA512 6d87cc967c081b5a5e60136f5928d7b17c65c3a1c26aa1e45a50e74d5383bb665682a8b0cb5cce0496bebcac1f5e27aace8a8373253c031acc3c166c382e0056
diff --git a/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild b/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
new file mode 100644
index 000000000000..ff3db2a3a66b
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2019 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"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+	static? ( client server tools )
+"
+
+RDEPEND="
+	dev-libs/re2:0=
+	!static? (
+		>=app-arch/lz4-1.8.0:=
+		>=app-arch/zstd-1.3.4:=
+		client? (
+			sys-libs/ncurses:0=
+			sys-libs/readline:0=
+		)
+
+		dev-libs/double-conversion
+		dev-libs/capnproto
+		dev-libs/libltdl:0
+		sys-libs/libunwind:7
+		sys-libs/zlib
+		|| (
+			dev-db/unixODBC
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu:=
+		dev-libs/glib
+		>=dev-libs/boost-1.65.0:=
+		dev-libs/openssl:0=
+		dev-libs/zookeeper-c
+		kafka? ( dev-libs/librdkafka:= )
+		mysql? ( 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/double-conversion[static-libs]
+		dev-libs/capnproto[static-libs]
+		dev-libs/libltdl[static-libs]
+		sys-libs/libunwind:7[static-libs]
+		sys-libs/zlib[static-libs]
+		|| (
+			dev-db/unixODBC[static-libs]
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu[static-libs]
+		dev-libs/glib[static-libs]
+		>=dev-libs/boost-1.65.0[static-libs]
+		dev-libs/openssl[static-libs]
+		dev-libs/zookeeper-c[static-libs]
+		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.10.3.ebuild b/dev-db/clickhouse/clickhouse-18.10.3.ebuild
deleted file mode 100644
index fa20957d2696..000000000000
--- a/dev-db/clickhouse/clickhouse-18.10.3.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:7
-		sys-libs/zlib
-		|| (
-			dev-db/unixODBC
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		dev-libs/zookeeper-c
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( virtual/libmysqlclient )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-1.0.1 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/double-conversion[static-libs]
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:7[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		dev-libs/zookeeper-c[static-libs]
-		virtual/libmysqlclient[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	|| (
-		>=sys-devel/gcc-7.0
-		>=sys-devel/clang-6.0
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zookeeper zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_SSL_LIBRARY=False
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild b/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
new file mode 100644
index 000000000000..b8a7337618a9
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2019 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"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+	static? ( client server tools )
+"
+
+RDEPEND="
+	dev-libs/re2:0=
+	!static? (
+		>=app-arch/lz4-1.8.0:=
+		>=app-arch/zstd-1.3.4:=
+		client? (
+			sys-libs/ncurses:0=
+			sys-libs/readline:0=
+		)
+
+		dev-libs/double-conversion
+		dev-libs/capnproto
+		dev-libs/libltdl:0
+		sys-libs/libunwind:7
+		sys-libs/zlib
+		|| (
+			dev-db/unixODBC
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu:=
+		dev-libs/glib
+		>=dev-libs/boost-1.65.0:=
+		dev-libs/openssl:0=
+		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/double-conversion[static-libs]
+		dev-libs/capnproto[static-libs]
+		dev-libs/libltdl[static-libs]
+		sys-libs/libunwind:7[static-libs]
+		sys-libs/zlib[static-libs]
+		|| (
+			dev-db/unixODBC[static-libs]
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu[static-libs]
+		dev-libs/glib[static-libs]
+		>=dev-libs/boost-1.65.0[static-libs]
+		dev-libs/openssl[static-libs]
+		dev-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.12.17.ebuild b/dev-db/clickhouse/clickhouse-18.12.17.ebuild
deleted file mode 100644
index 40f986b3e902..000000000000
--- a/dev-db/clickhouse/clickhouse-18.12.17.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:7
-		sys-libs/zlib
-		|| (
-			dev-db/unixODBC
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( virtual/libmysqlclient )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-1.0.1 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/double-conversion[static-libs]
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:7[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		virtual/libmysqlclient[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	|| (
-		>=sys-devel/gcc-7.0
-		>=sys-devel/clang-6.0
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz 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
new file mode 100644
index 000000000000..e419edfa1571
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2019 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"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+	static? ( client server tools )
+"
+
+RDEPEND="
+	dev-libs/re2:0=
+	!static? (
+		>=app-arch/lz4-1.8.0:=
+		>=app-arch/zstd-1.3.4:=
+		client? (
+			sys-libs/ncurses:0=
+			sys-libs/readline:0=
+		)
+
+		dev-libs/double-conversion
+		dev-libs/capnproto
+		dev-libs/libltdl:0
+		sys-libs/libunwind:7
+		sys-libs/zlib
+		|| (
+			dev-db/unixODBC
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu:=
+		dev-libs/glib
+		>=dev-libs/boost-1.65.0:=
+		dev-libs/openssl:0=
+		dev-libs/zookeeper-c
+		kafka? ( dev-libs/librdkafka:= )
+		mysql? ( 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/double-conversion[static-libs]
+		dev-libs/capnproto[static-libs]
+		dev-libs/libltdl[static-libs]
+		sys-libs/libunwind:7[static-libs]
+		sys-libs/zlib[static-libs]
+		|| (
+			dev-db/unixODBC[static-libs]
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu[static-libs]
+		dev-libs/glib[static-libs]
+		>=dev-libs/boost-1.65.0[static-libs]
+		dev-libs/openssl[static-libs]
+		dev-libs/zookeeper-c[static-libs]
+		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-18.6.0.ebuild b/dev-db/clickhouse/clickhouse-18.6.0.ebuild
deleted file mode 100644
index 734544c61dae..000000000000
--- a/dev-db/clickhouse/clickhouse-18.6.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-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"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:7
-		sys-libs/zlib
-		|| (
-			dev-db/unixODBC
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		dev-libs/zookeeper-c
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( virtual/libmysqlclient )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-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/double-conversion[static-libs]
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:7[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		dev-libs/zookeeper-c[static-libs]
-		virtual/libmysqlclient[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	|| (
-		>=sys-devel/gcc-7.0
-		>=sys-devel/clang-6.0
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zookeeper zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_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-r1.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r1.ebuild
deleted file mode 100644
index a2fbc773fa76..000000000000
--- a/dev-db/clickhouse/clickhouse-19.13.1.11-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2019 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"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:7
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( virtual/libmysqlclient )
-	)
-
-	>=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/double-conversion[static-libs]
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:7[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		virtual/libmysqlclient[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.13.1.11-r2.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
new file mode 100644
index 000000000000..799746e089be
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2019 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"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+	static? ( client server tools )
+"
+
+RDEPEND="
+	dev-libs/re2:0=
+	!static? (
+		>=app-arch/lz4-1.8.0:=
+		>=app-arch/zstd-1.3.4:=
+		client? (
+			sys-libs/ncurses:0=
+			sys-libs/readline:0=
+		)
+
+		dev-libs/double-conversion
+		dev-libs/capnproto
+		dev-libs/libltdl:0
+		sys-libs/libunwind:7
+		sys-libs/zlib
+		dev-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/double-conversion[static-libs]
+		dev-libs/capnproto[static-libs]
+		dev-libs/libltdl[static-libs]
+		sys-libs/libunwind:7[static-libs]
+		sys-libs/zlib[static-libs]
+		|| (
+			dev-db/unixODBC[static-libs]
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu[static-libs]
+		dev-libs/glib[static-libs]
+		>=dev-libs/boost-1.65.0[static-libs]
+		dev-libs/openssl[static-libs]
+		dev-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
new file mode 100644
index 000000000000..6525cf8d8cf5
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2019 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"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+	static? ( client server tools )
+"
+
+RDEPEND="
+	dev-libs/re2:0=
+	!static? (
+		>=app-arch/lz4-1.8.0:=
+		>=app-arch/zstd-1.3.4:=
+		client? (
+			sys-libs/ncurses:0=
+			sys-libs/readline:0=
+		)
+
+		dev-libs/double-conversion
+		dev-libs/capnproto
+		dev-libs/libltdl:0
+		sys-libs/libunwind:7
+		sys-libs/zlib
+		dev-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/double-conversion[static-libs]
+		dev-libs/capnproto[static-libs]
+		dev-libs/libltdl[static-libs]
+		sys-libs/libunwind:7[static-libs]
+		sys-libs/zlib[static-libs]
+		|| (
+			dev-db/unixODBC[static-libs]
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu[static-libs]
+		dev-libs/glib[static-libs]
+		>=dev-libs/boost-1.65.0[static-libs]
+		dev-libs/openssl[static-libs]
+		dev-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.13.1.11.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11.ebuild
deleted file mode 100644
index bbf65016a543..000000000000
--- a/dev-db/clickhouse/clickhouse-19.13.1.11.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2019 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"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:7
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( virtual/libmysqlclient )
-	)
-
-	>=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/double-conversion[static-libs]
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:7[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		virtual/libmysqlclient[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	>=sys-devel/gcc-7.0
-	>=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz 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.5.3.8-r1.ebuild b/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
new file mode 100644
index 000000000000..7892e4667f5d
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2019 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"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+	static? ( client server tools )
+"
+
+RDEPEND="
+	dev-libs/re2:0=
+	!static? (
+		>=app-arch/lz4-1.8.0:=
+		>=app-arch/zstd-1.3.4:=
+		client? (
+			sys-libs/ncurses:0=
+			sys-libs/readline:0=
+		)
+
+		dev-libs/double-conversion
+		dev-libs/capnproto
+		dev-libs/libltdl:0
+		sys-libs/libunwind:7
+		sys-libs/zlib
+		dev-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/double-conversion[static-libs]
+		dev-libs/capnproto[static-libs]
+		dev-libs/libltdl[static-libs]
+		sys-libs/libunwind:7[static-libs]
+		sys-libs/zlib[static-libs]
+		|| (
+			dev-db/unixODBC[static-libs]
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu[static-libs]
+		dev-libs/glib[static-libs]
+		>=dev-libs/boost-1.65.0[static-libs]
+		dev-libs/openssl[static-libs]
+		dev-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.5.3.8.ebuild b/dev-db/clickhouse/clickhouse-19.5.3.8.ebuild
deleted file mode 100644
index 8de003457ec7..000000000000
--- a/dev-db/clickhouse/clickhouse-19.5.3.8.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2019 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"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:7
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( virtual/libmysqlclient )
-	)
-
-	>=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/double-conversion[static-libs]
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:7[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		virtual/libmysqlclient[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	>=sys-devel/gcc-7.0
-	>=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz 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
new file mode 100644
index 000000000000..7892e4667f5d
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2019 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"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+	static? ( client server tools )
+"
+
+RDEPEND="
+	dev-libs/re2:0=
+	!static? (
+		>=app-arch/lz4-1.8.0:=
+		>=app-arch/zstd-1.3.4:=
+		client? (
+			sys-libs/ncurses:0=
+			sys-libs/readline:0=
+		)
+
+		dev-libs/double-conversion
+		dev-libs/capnproto
+		dev-libs/libltdl:0
+		sys-libs/libunwind:7
+		sys-libs/zlib
+		dev-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/double-conversion[static-libs]
+		dev-libs/capnproto[static-libs]
+		dev-libs/libltdl[static-libs]
+		sys-libs/libunwind:7[static-libs]
+		sys-libs/zlib[static-libs]
+		|| (
+			dev-db/unixODBC[static-libs]
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu[static-libs]
+		dev-libs/glib[static-libs]
+		>=dev-libs/boost-1.65.0[static-libs]
+		dev-libs/openssl[static-libs]
+		dev-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.ebuild b/dev-db/clickhouse/clickhouse-19.9.5.36.ebuild
deleted file mode 100644
index 8de003457ec7..000000000000
--- a/dev-db/clickhouse/clickhouse-19.9.5.36.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2019 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"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:7
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( virtual/libmysqlclient )
-	)
-
-	>=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/double-conversion[static-libs]
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:7[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		virtual/libmysqlclient[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	>=sys-devel/gcc-7.0
-	>=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz 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
-}
-- 
cgit v1.2.3