[gentoo-commits] repo/gentoo:master commit in: dev-db/clickhouse/

["Vladimir Smirnov" <civil@gentoo.org>]

commit:     3378ded246399adec757e1d5693291322e91f695
Author:     Vladimir Smirnov <civil <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 21:44:14 2018 +0000
Commit:     Vladimir Smirnov <civil <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 21:44:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3378ded2

dev-db/clickhouse: unbundle librdkafka, lz4 and zstd

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-db/clickhouse/Manifest                               |  3 ---
 ...e-1.1.54385.ebuild => clickhouse-1.1.54385-r1.ebuild} | 16 +++++++---------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/dev-db/clickhouse/Manifest b/dev-db/clickhouse/Manifest
index a964c44a4cb..1247154568d 100644
--- a/dev-db/clickhouse/Manifest
+++ b/dev-db/clickhouse/Manifest
@@ -1,5 +1,2 @@
 DIST cctz-4f9776a.tar.gz 290009 BLAKE2B 532eb7d590f9814c05cc7fdd3c75efe0a6b3f81d85201b14163a9600dd858c4fbac592270d0afccd7d5eef0080d7e70e9d716023bdb60d55479585e2cd3d3f59 SHA512 ba0dfc404cc70f03ef2be29fa3b0c70ea881c92a92525ea4ba1b5bcfc9e45df1b62a5eec180f498293e64bdd5cb9b41f97361cbb7e8baf299dcfdcd1557ca205
 DIST clickhouse-1.1.54385.tar.gz 5833821 BLAKE2B 48441aa28dd03c0b3282fe577849902ba29eded5dc90fe83159fdce3be1f93a6e48e48049e62febc2272f9b7ca1c143c1021900daaae9e5b43eab229418becff SHA512 eb3c02e6a094221374eca70b6cf6020414f31cbb196a521214d3c31b4266f5f251d431460025d9e644c83d61a3aa7ac2c266c9fa14db312ce42aa0cc8fc20d7c
-DIST librdkafka-c3d50eb.tar.gz 1869491 BLAKE2B 6b4a1695226d9328033c9cb7db8cd4f80db92b38abce2639db2ebac4511146d0343967d4d6342ed13f13eab07d4b32bc72acd02d5bdec1a5e1da3e2be02e2b2d SHA512 47fd12a2a9c14c986f331abf0df12c782e5f803c2bce86a9eab17977d444230ce4c5e8921e112127b1c51b40fc914e14e20269d65058ecf53991d09997ae172b
-DIST lz4-c10863b.tar.gz 223026 BLAKE2B c5cccac2f9e86f8bc7986cc283bfb969445e0edf35f78dbd880f56c191c172c6c314353e66a056acb461cfb657441662e23daa755c6e3071ff4ac328f79ab7a8 SHA512 97c460ceb48ebbf8832459f2315e08e62832a861d055c5fc78848091feb5c25f175d91e364d14633ca66353d9bd64de5161dfbe6bc1aeb526c5cb62ceab9c63c
-DIST zstd-2555975.tar.gz 2062067 BLAKE2B cfd4eb221a94b1c6bd4f8950ee6e1511f9b773f61a68ada33781c5fed3f3f664820135b074810721cbdfad524aff6d54c2f017aa6b3ec9efcdf09c29aec90219 SHA512 7320149560095a348f0c98f22ed4a8247c32a2e66ef3098039a4d5520b4cb8893ff799e51fb45716594c5ed609752eee6454faa3ddfbb4cab3a46330544eaa19

diff --git a/dev-db/clickhouse/clickhouse-1.1.54385.ebuild b/dev-db/clickhouse/clickhouse-1.1.54385-r1.ebuild
similarity index 85%
rename from dev-db/clickhouse/clickhouse-1.1.54385.ebuild
rename to dev-db/clickhouse/clickhouse-1.1.54385-r1.ebuild
index e6a7d377a71..dbab7e9ea07 100644
--- a/dev-db/clickhouse/clickhouse-1.1.54385.ebuild
+++ b/dev-db/clickhouse/clickhouse-1.1.54385-r1.ebuild
@@ -15,14 +15,9 @@ MY_PN="ClickHouse"
 TYPE="stable"
 
 CCTZ_COMMIT="4f9776a"
-LIBRDKAFKA_COMMIT="c3d50eb"
-LZ4_COMMIT="c10863b"
 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
-	https://github.com/edenhill/librdkafka/archive/${LIBRDKAFKA_COMMIT}.tar.gz -> librdkafka-${LIBRDKAFKA_COMMIT}.tar.gz
-	https://github.com/lz4/lz4/archive/${LZ4_COMMIT}.tar.gz -> lz4-${LZ4_COMMIT}.tar.gz
-	https://github.com/facebook/zstd/archive/${ZSTD_COMMIT}.tar.gz -> zstd-${ZSTD_COMMIT}.tar.gz
 "
 
 SLOT="0/${TYPE}"
@@ -37,6 +32,8 @@ REQUIRED_USE="
 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=
@@ -56,6 +53,7 @@ RDEPEND="
 		dev-libs/boost:=
 		dev-libs/openssl:0=
 		dev-libs/zookeeper-c
+		kafka? ( dev-libs/librdkafka:= )
 		mysql? ( virtual/libmysqlclient )
 	)
 
@@ -66,6 +64,8 @@ RDEPEND="
 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]
@@ -85,6 +85,7 @@ DEPEND="${RDEPEND}
 		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
@@ -141,11 +142,8 @@ src_unpack() {
 	default_src_unpack
 	[[ ${PV} == 9999 ]] && return 0
 	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz librdkafka lz4 zookeeper zstd || die "failed to create directories"
+	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"
-	tar --strip-components=1 -C librdkafka -xf "${DISTDIR}/librdkafka-${LIBRDKAFKA_COMMIT}.tar.gz" || die "failed to unpack librdkafka"
-	tar --strip-components=1 -C lz4 -xf "${DISTDIR}/lz4-${LZ4_COMMIT}.tar.gz" || die "failed to unpack lz4"
-	tar --strip-components=1 -C zstd -xf "${DISTDIR}/zstd-${ZSTD_COMMIT}.tar.gz" || die "failed to unpack zstd"
 }
 
 src_configure() {