gentoo resync : 04.08.2018

4 files changed, 9 insertions, 31 deletions

diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 1f79a577af73..eb5ab69a5a1c 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,6 +1,5 @@
-AUX librdkafka-0.11.3-fix-memory-leak-issue1534.patch 938 BLAKE2B acc607465285b2d5860f74a313a70bd153e0e850d1949cd345a920de69d466a8e75c89983b85056c6d8e40fbe93d40e4a5dac26b6a617705fd376cfe6c1baa75 SHA512 6f6406589ddf76e4168a6df50b00d8f499d3a6c22404696a4160eac3a10de7f8c8e03d01d6fd1aff831eb5cab962aec0eb164031e5aee3751e15a12c75e9f15f
-DIST librdkafka-0.11.3.tar.gz 1849838 BLAKE2B 570713642b5ec9c2487a37b9146edda5f844427dbf55d6cb654ca9a8690cd6f77bcc9325800ac2a34da21f1cca33187f390c00132f9e5c28503f816ee256c4f9 SHA512 e9bb97ea1597019a841dd4ba3666ad72dcbc0539054155ce0caee92f1324f1a490515b0310405f822b829c05ed2688b48e2ca205a91cf88bf9ad6411f7c12b26
 DIST librdkafka-0.11.4.tar.gz 1900117 BLAKE2B 3e755c91d6a2e12829ba841749977f8c05c9f243d79db64247547e4a49790e67d07f7d82633f45689dcc5f88caaef200027e6af3866de283c1de6120d7f98467 SHA512 6b34e7c476d328a2f8e8321f6ddcaeaf43730284bb3aaddac81c3cd9a1fa5d7f7ef7481f1093b36d89edde7b766da6cd27a9eb9a635b12b640e8a46a269bafc8
-EBUILD librdkafka-0.11.3-r1.ebuild 1299 BLAKE2B 38941daac5f384ebd687939dec6f91afb15906c8b0d80790fd11df4d61c0bc9043f9bf70d9924269b9d51186fc59f934537b589cc2c5b5a590ad66068ddd4b90 SHA512 fa53f16810c902c7a72e2df7077acf193873bf2a04ca6553233b83709ae3213c54bf350e1ac7b8a431cf076e845d97e1c68a32616eed54eade7404ba3e2e9bd7
-EBUILD librdkafka-0.11.4.ebuild 1236 BLAKE2B cd0ad6ac6ccfebbe37583fd03f3317f835bf7dda598e3b8c71b922b48db3541a28ac0462577ffdc62c9e219be4a6f1852cf6c591e7240626dda12bf5e636f5e6 SHA512 80e38fb2244bf009ea3102a34a10fc2de324576b77965583d04077af7281d00e6c259cef3a260eeb224eabc8fdb929ee9513bec19e6584f9c159022a9c335580
+DIST librdkafka-0.11.5.tar.gz 1984510 BLAKE2B 55a27482275726233b5c9b39dfac1b9f34235c68600b5720c1a9dec782de6a4d7d084ad71e50857c32a93b39beacc891933e02f45162d0de144ecaadb3640c41 SHA512 4a8dc46ad66f23cff4d4ef2fc8daa7207bfa3e77fd3580b3f141a73b449e60ea5381e97263235b4d0d762df027a8a2cad08637d88162d9605c82d74a1e64b67c
+EBUILD librdkafka-0.11.4.ebuild 1251 BLAKE2B 27576a7d2421373ed2d13d9f0ec566d6575c137372f08000271ad0e7f492c22d19a817d803816b2aacd9ceeda28a5f2c4307f56b7302efa8734a52b3b0b2db37 SHA512 9cdeeee1606f1108e4ad3e203ddcb4f99dace5768e4fa37bfade9b4630e60e7fe6899b17d231c8fdbda9d1ef513a2f5f3868fd7153348f386090db3bc3f94e1c
+EBUILD librdkafka-0.11.5.ebuild 1256 BLAKE2B 6b789b387aa1c063bffae6721a597ee16bb0f6679021a0c65e1a2c9b65844ca2e06cacc936553733feff6b3b6ecdb9ffdd4daf1a9e0e4e2be0d09170a63eca44 SHA512 bfe22f31e565a0690af0bf1e8edc4836612235edda04dcbb826e9f24011a2abd9a6924e0891c6ac5eb489fe3a24efff5857cc157845733f5cb77e9a9de10e259
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
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
deleted file mode 100644
index ae4c3e5bc81e..000000000000
--- a/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/edenhill/librdkafka/commit/8fed971043e642c195860cd77006622d23616c22
-
---- a/src/rdkafka_msgset_writer.c
-+++ b/src/rdkafka_msgset_writer.c
-@@ -436,10 +436,12 @@ rd_kafka_msgset_writer_write_msg_payload (rd_kafka_msgset_writer_t *msetw,
-          * room in the buffer we'll copy the payload to the buffer,
-          * otherwise we push a reference to the memory. */
-         if (rkm->rkm_len <= (size_t)rk->rk_conf.msg_copy_max_size &&
--            rd_buf_write_remains(&rkbuf->rkbuf_buf) > rkm->rkm_len)
-+            rd_buf_write_remains(&rkbuf->rkbuf_buf) > rkm->rkm_len) {
-                 rd_kafka_buf_write(rkbuf,
-                                    rkm->rkm_payload, rkm->rkm_len);
--        else
-+                if (free_cb)
-+                        free_cb(rkm->rkm_payload);
-+        } else
-                 rd_kafka_buf_push(rkbuf, rkm->rkm_payload, rkm->rkm_len,
-                                   free_cb);
- }
diff --git a/dev-libs/librdkafka/librdkafka-0.11.4.ebuild b/dev-libs/librdkafka/librdkafka-0.11.4.ebuild
index 00872b0eadc7..4e975e7bdf02 100644
--- a/dev-libs/librdkafka/librdkafka-0.11.4.ebuild
+++ b/dev-libs/librdkafka/librdkafka-0.11.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	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"
+	KEYWORDS="amd64 arm ~arm64 hppa ~ppc x86"
 fi
 
 LICENSE="BSD-2"
@@ -25,7 +25,7 @@ SLOT="0/1"
 IUSE="lz4 sasl ssl static-libs"
 
 RDEPEND="
-	lz4? ( app-arch/lz4:= )
+	lz4? ( app-arch/lz4:=[static-libs(-)?] )
 	sasl? ( dev-libs/cyrus-sasl:= )
 	ssl? ( dev-libs/openssl:0= )
 	sys-libs/zlib
diff --git a/dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild b/dev-libs/librdkafka/librdkafka-0.11.5.ebuild
index ef4921fdc0a1..5e13b2f3eb90 100644
--- a/dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild
+++ b/dev-libs/librdkafka/librdkafka-0.11.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit toolchain-funcs
 
@@ -14,9 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	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"
-
-	PATCHES=( "${FILESDIR}"/${P}-fix-memory-leak-issue1534.patch )
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
 fi
 
 LICENSE="BSD-2"
@@ -27,7 +25,7 @@ SLOT="0/1"
 IUSE="lz4 sasl ssl static-libs"
 
 RDEPEND="
-	lz4? ( app-arch/lz4:= )
+	lz4? ( app-arch/lz4:=[static-libs(-)?] )
 	sasl? ( dev-libs/cyrus-sasl:= )
 	ssl? ( dev-libs/openssl:0= )
 	sys-libs/zlib
@@ -68,6 +66,6 @@ src_install() {
 	default
 
 	if ! use static-libs; then
-		find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die
+		find "${ED}"/usr/lib* -name '*.la' -o -name '*.a' -delete || die
 	fi
 }