gentoo resync : 04.05.2019

3 files changed, 36 insertions, 2 deletions

diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 918a6bda0e2f..b39e18306b12 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,7 +1,8 @@
+AUX librdkafka-1.0.0-remove-automagic-on-zstd.patch 967 BLAKE2B 1df3c82dab189ab781ef848966561e87564e8878b7c69873792b2b6eaff963a132da8b248eb2796def6e78d8f7246136d3845374af6ad9d3ab3bb9c68ae876cc SHA512 0e01db881e7bd458837de5b4e1fb7ee97ac2dfdc0b163594ca4bc50b82e803acb18c5b768b359288c30fd2cd0a06b830858386c7175bd9028a23a9f959c1c77d
 DIST librdkafka-0.11.5.tar.gz 1984510 BLAKE2B 55a27482275726233b5c9b39dfac1b9f34235c68600b5720c1a9dec782de6a4d7d084ad71e50857c32a93b39beacc891933e02f45162d0de144ecaadb3640c41 SHA512 4a8dc46ad66f23cff4d4ef2fc8daa7207bfa3e77fd3580b3f141a73b449e60ea5381e97263235b4d0d762df027a8a2cad08637d88162d9605c82d74a1e64b67c
 DIST librdkafka-0.11.6.tar.gz 1994337 BLAKE2B 7b61e6ba02c5ed58c20e604d6765f6a57ff63ab0c61f2a4c64eff55bfb6c854ef089ac9eea9acc6d44b6abdb6d1425ff23e9d4e6037c733bc5719d6b69c74ae0 SHA512 9657dc53220bbff3eb44941cff2f50ab7f71a82f7486d64ea14f67eabd4abe8c67f225a752cc1f0339439a1cc512e99ade6536d087857979cd198c0102015718
 DIST librdkafka-1.0.0.tar.gz 2465603 BLAKE2B 7006dc421ae5c2c991853f4ede9d99e7dd308b49372a7c2c859ecc0e6ee7aa3b6cda9af7a71a5813610630b564bd65c6cf18ecaefd1a1880545838d7758aea88 SHA512 15ac1e4c9042debf8d4df602ccdc5eccae3a37b305be24d724fcaffc3d1d0aafa708fc8e29d6af51f51ed6c7daf74b3041b8b9b0444e6702cd73479c8078859a
 EBUILD librdkafka-0.11.5.ebuild 1249 BLAKE2B e10b7391be22a1b2fa32af02872ffa2e813ae0a387e7a31005900b63c9d2d3ada9cd47ca2e7a155f6178267b3a2b258f7eb9f8c7a2470be8ad61256d7d207a38 SHA512 41f0086bfe66d0a12f2ab448d842119bb3afe4e3008662b0fb0ca5bc99ef36fe81c4c4d0c8de46ff4eeb6594cd4253ef5f0895beb45235f99b195d3b13476953
 EBUILD librdkafka-0.11.6.ebuild 1249 BLAKE2B 038b73de2adf38cf66b95a470c1bf4e82b4d30c50410ba8ddbad3d59cb6ec323dd28da6c9deaa162049cb26c4d38f1456459fb309f01ee7d2b7f7d826825ca99 SHA512 e3d82210e7d6caee61bece6eadf2098144bb7dc7f1fe3c19e6e0ef154e0f36acc2b60017d8fc044f3a63ab7c83a7e1f5c8c732c39817904d31fec3b47d1f20cb
-EBUILD librdkafka-1.0.0.ebuild 1253 BLAKE2B a50b3eb6357710f87257ae6b183cc6e9eb55803712f22ffaacdf75ebb2eefff252df13498e3510dd0acad8b378feaea9aaca57d6c111f427d93000c8e4da6aad SHA512 a81ea699cc281d726a5236273e2aa045693cc02e4251f6647ab56f21ea08a87be0995eb2a99cd2c40de473e1e0d48da62997f43297a9c087aef3e2d463a4e740
+EBUILD librdkafka-1.0.0-r1.ebuild 1369 BLAKE2B 0217f4996dd3904f871ccd0fbb300f681c1f2cdb9c4d08bcfb494ea99b15828c35712cd635c371daa776ec8f8dfa07dd70f4f678827393e9c45d3731e321ed70 SHA512 af7fd02a7f5c56b903c57f2f986a417ed9b31c956afb201b2c0523a452c1fced34359722e88d34e06203c1941101c0fdf56c4768397cd37432edfb309a13ba8b
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/files/librdkafka-1.0.0-remove-automagic-on-zstd.patch b/dev-libs/librdkafka/files/librdkafka-1.0.0-remove-automagic-on-zstd.patch
new file mode 100644
index 000000000000..ed4dbda6b8ab
--- /dev/null
+++ b/dev-libs/librdkafka/files/librdkafka-1.0.0-remove-automagic-on-zstd.patch
@@ -0,0 +1,29 @@
+commit ff67402dcfb2f4913a3ff1d84449a5e1620ee4ae
+Author:     Thomas Deutschmann <whissi@gentoo.org>
+AuthorDate: Mon Apr 29 18:57:10 2019 +0200
+Commit:     Thomas Deutschmann <whissi@gentoo.org>
+CommitDate: Mon Apr 29 18:57:10 2019 +0200
+
+    configure: Add option to disable automagic dependency on zstd
+    
+    This commit will add an option which will allow you to explicit disable
+    zstd usage.
+
+diff --git a/mklove/modules/configure.zstd b/mklove/modules/configure.zstd
+index 6dd621ad..3ea36ccf 100644
+--- a/mklove/modules/configure.zstd
++++ b/mklove/modules/configure.zstd
+@@ -9,8 +9,12 @@
+ #   mkl_check zstd [<action>]
+ #
+ 
++mkl_toggle_option "Feature" ENABLE_ZSTD "--enable-zstd" "Enable support for ZSTD compression" "y"
++
+ function manual_checks {
+-    local action=$1
++    local action=${1:-disable}
++
++    [[ $ENABLE_ZSTD == y ]] || return 0
+ 
+     if [[ $WITH_STATIC_LINKING != y ]]; then
+         # Homebrew does not provide a static library for zstd
diff --git a/dev-libs/librdkafka/librdkafka-1.0.0.ebuild b/dev-libs/librdkafka/librdkafka-1.0.0-r1.ebuild
index 1ba0f2d7c09a..fa9a0fd5d556 100644
--- a/dev-libs/librdkafka/librdkafka-1.0.0.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.0.0-r1.ebuild
@@ -22,12 +22,13 @@ LICENSE="BSD-2"
 # subslot = soname version
 SLOT="0/1"
 
-IUSE="lz4 sasl ssl static-libs"
+IUSE="lz4 sasl ssl static-libs zstd"
 
 RDEPEND="
 	lz4? ( app-arch/lz4:=[static-libs(-)?] )
 	sasl? ( dev-libs/cyrus-sasl:= )
 	ssl? ( dev-libs/openssl:0= )
+	zstd? ( app-arch/zstd:= )
 	sys-libs/zlib
 "
 
@@ -36,6 +37,8 @@ DEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${P}-remove-automagic-on-zstd.patch )
+
 src_configure() {
 	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
 
@@ -47,6 +50,7 @@ src_configure() {
 		$(use_enable sasl)
 		$(usex static-libs '--enable-static' '')
 		$(use_enable ssl)
+		$(use_enable zstd)
 	)
 
 	econf ${myeconf[@]}