gentoo resync : 25.08.2020

6 files changed, 16 insertions, 239 deletions

diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 2f2397f3f01e..3e1b163e864f 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,9 +1,5 @@
-DIST librdkafka-1.4.0.tar.gz 2722992 BLAKE2B 590fa90805bc2dc728dd32be333eaf9b2a4e6a840403838406684794ca68f2bcf9fc831e252a637622f9e6cd209d779ed20d503e49dac20bdb28f5d3fbd676bd SHA512 cd343597707d22490dfcd513a6b24ca5487dca5230a5a6775e7d6f10be2dc5481deb3a76968bb244d5f7514db92aceca541823c5841a7b54d8e00aeb9088731c
-DIST librdkafka-1.4.2.tar.gz 2732806 BLAKE2B 140160fef4f228d877bcfa9d892fd053d2b74547abdbeb7dc661bd4b2b7d576f1ebeecaccd1ac3c3669e059746f0c63be6468cd4f066a9862b8c60d8f2d014a4 SHA512 3d8e496466c103829f5fe11f1a6e68d1299c847b637c6fad55adbe1ad28bd5c463508f3f3fb8b3316b15a104f74e551cd5e520950d76c0e4f8c876083397ced5
 DIST librdkafka-1.4.4.tar.gz 2734332 BLAKE2B 47c22f00d88d58eb6366e17a8f0ddaee4984bc65f01a627c5d3b8eee019519a2de9a7ae6e2ab2053354a5d72337107b7f515ad65ff205b6838e154b95d9f2331 SHA512 478d17f56efd39b312ea774695bc31d22a83aae3a94913fb0dd07e7f04f3f2a6e3f3610dc7501864dbacbcf4a3207603c6e1d5eebac4e5246ee868cde398021d
-EBUILD librdkafka-1.4.0.ebuild 1471 BLAKE2B 1fd23cd2970dd73085d1a2a584fb6f391568996946e87452e6fd283bfc78119d2c52ecd571a24892c843274744e5aab62266a3a5cba51279109efee4d691e311 SHA512 7e168e876ff25bb9fb83b4ac7401742ce9dbe437939e3c10dbd96c0bffe66270e5816413f7ab7a441897066658c4cd9a7319f6a5b38aaa13a0867f13ee3b4662
-EBUILD librdkafka-1.4.2-r1.ebuild 1648 BLAKE2B 46030bbfd9a9edaf4dc6d0ac8dc35277f6fd8fe294c1d3c6ddc00e54eeda34eafa56834d369e205113317e758e194538fb575271259b03ae31dd0c0bba2e35d4 SHA512 9433138c12b04947e44575e28c35f23c96e5e3406acf1bb6ee3ca9e2730c1892661b2ec59c9cb1409d53d5802fb402916dbc0e1a0dc3810b7a042d174fd02160
-EBUILD librdkafka-1.4.2-r2.ebuild 1657 BLAKE2B 3c168be95035f152fb212e5f45198398b8b14d869f8dc899530b10e0bccbebad0b4bb57437b1c88c58e7f4684388392f21108453cb5ea89486c9710b0f2e2fcb SHA512 60557ddff24f340cef825a30ee3a96cd928c6a5a3568932f6ae99323a2d6f09f292cb8203e7fc3cec22c0157b16da25154db53c0ad37a05f7f06609e1cf84d8e
-EBUILD librdkafka-1.4.2.ebuild 1483 BLAKE2B 4c0400891f9a7f903aa0e118d3bfd1c24570179cd7448240048013f15e5131c18ded63d6f3ac39d9cb4c81a1a7aa52b8a3a3740064fd6c24b40e58b13b1cff6e SHA512 66e5eeb55879174c24ded6b55ebae60db37838fefefdef4b7c7dfa24aca94c2d6048a38830dee7033090e9f72d542d0c72a605b07f2ec20090d9fef7854da989
-EBUILD librdkafka-1.4.4.ebuild 1657 BLAKE2B 3c168be95035f152fb212e5f45198398b8b14d869f8dc899530b10e0bccbebad0b4bb57437b1c88c58e7f4684388392f21108453cb5ea89486c9710b0f2e2fcb SHA512 60557ddff24f340cef825a30ee3a96cd928c6a5a3568932f6ae99323a2d6f09f292cb8203e7fc3cec22c0157b16da25154db53c0ad37a05f7f06609e1cf84d8e
+DIST librdkafka-1.5.0.tar.gz 2757553 BLAKE2B a9bbcdaa011944e43f9c70e2062199c5f12d1b92e40ba55707520002ed3a909ff13308336703924388625570d88a94d58b24cd19b5d6e9f79acd31dd92d0d7ed SHA512 ccd8dd3e90c9315833610745c28e0ffa60786324c938c7cbbb2ff847d7493d1b72d97adf5e5210bbc87970047cfd7e58a85141534d227187f2f17c492bef4262
+EBUILD librdkafka-1.4.4.ebuild 1652 BLAKE2B d6b1f200c1beb20fafd794334ec4412dd962c818cc4d1ff340324ee804ab4edcf6654aecb95849555221d1795ac273ec90d3b10e9a48b37bda19f050a5f1c2f8 SHA512 5bdec28dbb294c2f5ea1f1b44de3ada493d3a1ef688362f9c0de377bfbae1db7b34e0357baf416f6585e2e50cd6c29b2efdaf39c3d400ec9d93cd5b9d5c38559
+EBUILD librdkafka-1.5.0.ebuild 1776 BLAKE2B c4188c4cd760471cabfaa70b3a5366738429517fbce05e9932b7e2addfc9ec82f474514a396659bf71a82e6759543606ba3d65e5f11bc6422488774b6fa99481 SHA512 e677b13c10904c70a261efe4f189b4b244ef6c3ac6a18dac760638be29a3ee932bb8a90fd77c7bf6b8fb0183354d78d3eeec7636e2165f19ccc94b8a123ac870
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.4.0.ebuild b/dev-libs/librdkafka/librdkafka-1.4.0.ebuild
deleted file mode 100644
index ebc30a9d77d4..000000000000
--- a/dev-libs/librdkafka/librdkafka-1.4.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 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 ~sparc 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} )
-"
-
-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() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		install
-
-	if ! use static-libs; then
-		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
-}
diff --git a/dev-libs/librdkafka/librdkafka-1.4.2-r1.ebuild b/dev-libs/librdkafka/librdkafka-1.4.2-r1.ebuild
deleted file mode 100644
index 70a131cef92a..000000000000
--- a/dev-libs/librdkafka/librdkafka-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 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 ~ppc64 ~sparc 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} )
-"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} != "9999" ]]; then
-		sed -i \
-			-e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \
-			tests/run-test.sh || die
-	fi
-}
-
-src_configure() {
-	tc-export AR 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() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		install
-
-	if ! use static-libs; then
-		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
-}
diff --git a/dev-libs/librdkafka/librdkafka-1.4.2.ebuild b/dev-libs/librdkafka/librdkafka-1.4.2.ebuild
deleted file mode 100644
index 296fa0afea2a..000000000000
--- a/dev-libs/librdkafka/librdkafka-1.4.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 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 ~ppc64 ~sparc ~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} )
-"
-
-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() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		install
-
-	if ! use static-libs; then
-		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
-}
diff --git a/dev-libs/librdkafka/librdkafka-1.4.4.ebuild b/dev-libs/librdkafka/librdkafka-1.4.4.ebuild
index b87a68933f65..719b22ab5511 100644
--- a/dev-libs/librdkafka/librdkafka-1.4.4.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.4.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 ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librdkafka/librdkafka-1.4.2-r2.ebuild b/dev-libs/librdkafka/librdkafka-1.5.0.ebuild
index b87a68933f65..86b1ca559964 100644
--- a/dev-libs/librdkafka/librdkafka-1.4.2-r2.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.5.0.ebuild
@@ -3,7 +3,9 @@
 
 EAPI="7"
 
-inherit toolchain-funcs
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-any-r1 toolchain-funcs
 
 DESCRIPTION="Apache Kafka C/C++ client library"
 HOMEPAGE="https://github.com/edenhill/librdkafka"
@@ -32,14 +34,22 @@ LIB_DEPEND="
 	sys-libs/zlib:=[static-libs(+)]
 "
 
+BDEPEND="
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+
 RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	static-libs? ( ${LIB_DEPEND} )
 "
 
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	default