Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/librdkafka/files/, dev-libs/librdkafka/
Date: Sat, 28 Jul 2018 12:47:46
Message-Id: 1532782045.76e4883019fe92c545739f7d52cb1af3dc8ea7a5.whissi@gentoo
1 commit: 76e4883019fe92c545739f7d52cb1af3dc8ea7a5
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 28 12:34:25 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 28 12:47:25 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76e48830
7
8 dev-libs/librdkafka: drop old
9
10 Package-Manager: Portage-2.3.43, Repoman-2.3.10
11
12 dev-libs/librdkafka/Manifest | 1 -
13 ...brdkafka-0.11.3-fix-memory-leak-issue1534.patch | 19 ------
14 dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild | 73 ----------------------
15 3 files changed, 93 deletions(-)
16
17 diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
18 index a12de3cdbeb..003a93a0a18 100644
19 --- a/dev-libs/librdkafka/Manifest
20 +++ b/dev-libs/librdkafka/Manifest
21 @@ -1,2 +1 @@
22 -DIST librdkafka-0.11.3.tar.gz 1849838 BLAKE2B 570713642b5ec9c2487a37b9146edda5f844427dbf55d6cb654ca9a8690cd6f77bcc9325800ac2a34da21f1cca33187f390c00132f9e5c28503f816ee256c4f9 SHA512 e9bb97ea1597019a841dd4ba3666ad72dcbc0539054155ce0caee92f1324f1a490515b0310405f822b829c05ed2688b48e2ca205a91cf88bf9ad6411f7c12b26
23 DIST librdkafka-0.11.4.tar.gz 1900117 BLAKE2B 3e755c91d6a2e12829ba841749977f8c05c9f243d79db64247547e4a49790e67d07f7d82633f45689dcc5f88caaef200027e6af3866de283c1de6120d7f98467 SHA512 6b34e7c476d328a2f8e8321f6ddcaeaf43730284bb3aaddac81c3cd9a1fa5d7f7ef7481f1093b36d89edde7b766da6cd27a9eb9a635b12b640e8a46a269bafc8
24
25 diff --git a/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch b/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch
26 deleted file mode 100644
27 index ae4c3e5bc81..00000000000
28 --- a/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch
29 +++ /dev/null
30 @@ -1,19 +0,0 @@
31 -https://github.com/edenhill/librdkafka/commit/8fed971043e642c195860cd77006622d23616c22
32 -
33 ---- a/src/rdkafka_msgset_writer.c
34 -+++ b/src/rdkafka_msgset_writer.c
35 -@@ -436,10 +436,12 @@ rd_kafka_msgset_writer_write_msg_payload (rd_kafka_msgset_writer_t *msetw,
36 - * room in the buffer we'll copy the payload to the buffer,
37 - * otherwise we push a reference to the memory. */
38 - if (rkm->rkm_len <= (size_t)rk->rk_conf.msg_copy_max_size &&
39 -- rd_buf_write_remains(&rkbuf->rkbuf_buf) > rkm->rkm_len)
40 -+ rd_buf_write_remains(&rkbuf->rkbuf_buf) > rkm->rkm_len) {
41 - rd_kafka_buf_write(rkbuf,
42 - rkm->rkm_payload, rkm->rkm_len);
43 -- else
44 -+ if (free_cb)
45 -+ free_cb(rkm->rkm_payload);
46 -+ } else
47 - rd_kafka_buf_push(rkbuf, rkm->rkm_payload, rkm->rkm_len,
48 - free_cb);
49 - }
50
51 diff --git a/dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild b/dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild
52 deleted file mode 100644
53 index ef4921fdc0a..00000000000
54 --- a/dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild
55 +++ /dev/null
56 @@ -1,73 +0,0 @@
57 -# Copyright 1999-2018 Gentoo Foundation
58 -# Distributed under the terms of the GNU General Public License v2
59 -
60 -EAPI="6"
61 -
62 -inherit toolchain-funcs
63 -
64 -DESCRIPTION="Apache Kafka C/C++ client library"
65 -HOMEPAGE="https://github.com/edenhill/librdkafka"
66 -
67 -if [[ ${PV} == "9999" ]]; then
68 - EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
69 -
70 - inherit git-r3
71 -else
72 - SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
73 - KEYWORDS="amd64 arm ~arm64 hppa ~ppc x86"
74 -
75 - PATCHES=( "${FILESDIR}"/${P}-fix-memory-leak-issue1534.patch )
76 -fi
77 -
78 -LICENSE="BSD-2"
79 -
80 -# subslot = soname version
81 -SLOT="0/1"
82 -
83 -IUSE="lz4 sasl ssl static-libs"
84 -
85 -RDEPEND="
86 - lz4? ( app-arch/lz4:= )
87 - sasl? ( dev-libs/cyrus-sasl:= )
88 - ssl? ( dev-libs/openssl:0= )
89 - sys-libs/zlib
90 -"
91 -
92 -DEPEND="
93 - ${RDEPEND}
94 - virtual/pkgconfig
95 -"
96 -
97 -src_configure() {
98 - tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
99 -
100 - local myeconf=(
101 - --no-cache
102 - --no-download
103 - --disable-debug-symbols
104 - $(use_enable lz4)
105 - $(use_enable sasl)
106 - $(usex static-libs '--enable-static' '')
107 - $(use_enable ssl)
108 - )
109 -
110 - econf ${myeconf[@]}
111 -}
112 -
113 -src_test() {
114 - emake -C tests run_local
115 -}
116 -
117 -src_install() {
118 - local DOCS=(
119 - README.md
120 - CONFIGURATION.md
121 - INTRODUCTION.md
122 - )
123 -
124 - default
125 -
126 - if ! use static-libs; then
127 - find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die
128 - fi
129 -}