commit:     2193e147a34d269adc8b70d46cd77f83836aaea7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 21:55:48 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 21:57:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2193e147

dev-libs/librdkafka: bump to v1.1.0

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-libs/librdkafka/Manifest                       |  1 +
 ...librdkafka-1.1.0-remove-automagic-on-zstd.patch | 29 ++++++++
 dev-libs/librdkafka/librdkafka-1.1.0.ebuild        | 78 ++++++++++++++++++++++
 3 files changed, 108 insertions(+)

diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 17d47e8af2b..d367b203cfd 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -2,3 +2,4 @@ DIST librdkafka-0.11.5.tar.gz 1984510 BLAKE2B 
55a27482275726233b5c9b39dfac1b9f34
 DIST librdkafka-0.11.6.tar.gz 1994337 BLAKE2B 
7b61e6ba02c5ed58c20e604d6765f6a57ff63ab0c61f2a4c64eff55bfb6c854ef089ac9eea9acc6d44b6abdb6d1425ff23e9d4e6037c733bc5719d6b69c74ae0
 SHA512 
9657dc53220bbff3eb44941cff2f50ab7f71a82f7486d64ea14f67eabd4abe8c67f225a752cc1f0339439a1cc512e99ade6536d087857979cd198c0102015718
 DIST librdkafka-1.0.0.tar.gz 2465603 BLAKE2B 
7006dc421ae5c2c991853f4ede9d99e7dd308b49372a7c2c859ecc0e6ee7aa3b6cda9af7a71a5813610630b564bd65c6cf18ecaefd1a1880545838d7758aea88
 SHA512 
15ac1e4c9042debf8d4df602ccdc5eccae3a37b305be24d724fcaffc3d1d0aafa708fc8e29d6af51f51ed6c7daf74b3041b8b9b0444e6702cd73479c8078859a
 DIST librdkafka-1.0.1.tar.gz 2466259 BLAKE2B 
a391d57b21711853ce7df338070512f715f3a49ead2b4f7eb1fe5500699c1891821e6bbd4b87d3debea6852eb85094aba161cb3ca95aee3c592a38be4933ecff
 SHA512 
094599e974236814c03e688eaa5e39d817cca110ff691501826268c45653fcd6b21b60e741140a1f7ffccd49902247f08fcec82475be2e9f85feaa4340b32d4c
+DIST librdkafka-1.1.0.tar.gz 2511445 BLAKE2B 
00c20361058d537d045da6961afc45e40e0ac641918df9eb457937dc3ca566639b81d8aa10cc6ed2f57988eded180f3d2eaea72ca4b910a652b93b54b9388253
 SHA512 
35561399b07278a09a51245c5503c86eb0cc8971692b4e65a332144bfb71e2e86d4ceaf1804534b6a416bcace74cef493b6465c20b32c14de97f45f2854359c6

diff --git 
a/dev-libs/librdkafka/files/librdkafka-1.1.0-remove-automagic-on-zstd.patch 
b/dev-libs/librdkafka/files/librdkafka-1.1.0-remove-automagic-on-zstd.patch
new file mode 100644
index 00000000000..792bb453570
--- /dev/null
+++ b/dev-libs/librdkafka/files/librdkafka-1.1.0-remove-automagic-on-zstd.patch
@@ -0,0 +1,29 @@
+commit 828e10cb9331fc5bd48fb1d6fdb8e08cd5fb27ea
+Author:     Thomas Deutschmann <whi...@gentoo.org>
+AuthorDate: Mon Apr 29 18:57:10 2019 +0200
+Commit:     Thomas Deutschmann <whi...@gentoo.org>
+CommitDate: Mon Jun 24 23:52:25 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.libzstd 
b/mklove/modules/configure.libzstd
+index d9599d82..cb82c128 100644
+--- a/mklove/modules/configure.libzstd
++++ b/mklove/modules/configure.libzstd
+@@ -9,8 +9,12 @@
+ #   mkl_check libzstd [<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
+ 
+     mkl_meta_set "libzstd" "brew" "zstd"
+     mkl_meta_set "libzstd" "apk" "zstd-dev zstd-static"

diff --git a/dev-libs/librdkafka/librdkafka-1.1.0.ebuild 
b/dev-libs/librdkafka/librdkafka-1.1.0.ebuild
new file mode 100644
index 00000000000..d47d633d548
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.1.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka";
+
+if [[ ${PV} == "9999" ]]; then
+       EGIT_REPO_URI="https://github.com/edenhill/${PN}.git";
+
+       inherit git-r3
+else
+       SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs zstd"
+
+LIB_DEPEND="
+       lz4? ( app-arch/lz4:=[static-libs(+)] )
+       sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
+       ssl? ( dev-libs/openssl:0=[static-libs(+)] )
+       zstd? ( app-arch/zstd:=[static-libs(+)] )
+       sys-libs/zlib:=[static-libs(+)]
+"
+
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+
+DEPEND="
+       ${RDEPEND}
+       virtual/pkgconfig
+       static-libs? ( ${LIB_DEPEND} )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1.0-remove-automagic-on-zstd.patch )
+
+src_configure() {
+       tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+       local myeconf=(
+               --no-cache
+               --no-download
+               --disable-debug-symbols
+               $(use_enable lz4)
+               $(use_enable sasl)
+               $(usex static-libs '--enable-static' '')
+               $(use_enable ssl)
+               $(use_enable zstd)
+       )
+
+       econf ${myeconf[@]}
+}
+
+src_test() {
+       emake -C tests run_local
+}
+
+src_install() {
+       local DOCS=(
+               README.md
+               CONFIGURATION.md
+               INTRODUCTION.md
+       )
+
+       default
+
+       if ! use static-libs; then
+               find "${ED}"/usr/lib* -name '*.la' -o -name '*.a' -delete || die
+       fi
+}

Reply via email to