From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- dev-libs/librdkafka/Manifest | 13 +--- ...librdkafka-1.1.0-remove-automagic-on-zstd.patch | 29 -------- dev-libs/librdkafka/librdkafka-1.1.0.ebuild | 78 ---------------------- dev-libs/librdkafka/librdkafka-1.2.1.ebuild | 76 --------------------- dev-libs/librdkafka/librdkafka-1.2.2.ebuild | 76 --------------------- dev-libs/librdkafka/librdkafka-1.3.0.ebuild | 76 --------------------- dev-libs/librdkafka/librdkafka-1.4.0.ebuild | 4 +- dev-libs/librdkafka/librdkafka-1.4.2.ebuild | 73 ++++++++++++++++++++ 8 files changed, 78 insertions(+), 347 deletions(-) delete mode 100644 dev-libs/librdkafka/files/librdkafka-1.1.0-remove-automagic-on-zstd.patch delete mode 100644 dev-libs/librdkafka/librdkafka-1.1.0.ebuild delete mode 100644 dev-libs/librdkafka/librdkafka-1.2.1.ebuild delete mode 100644 dev-libs/librdkafka/librdkafka-1.2.2.ebuild delete mode 100644 dev-libs/librdkafka/librdkafka-1.3.0.ebuild create mode 100644 dev-libs/librdkafka/librdkafka-1.4.2.ebuild (limited to 'dev-libs/librdkafka') diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest index b210e87564af..8c4889755ac9 100644 --- a/dev-libs/librdkafka/Manifest +++ b/dev-libs/librdkafka/Manifest @@ -1,12 +1,5 @@ -AUX librdkafka-1.1.0-remove-automagic-on-zstd.patch 972 BLAKE2B 3ebe1a2895f5e06070e89c1b4aa23a771dcdb1e45b145ffcdeabb44dd061450eb98d160d4aa0ba297b909e6964d4d0f270346bf825a93a5883aef825d79011c6 SHA512 5a6318c9ba33da6c9c1fbaf08f3c9ff43a9f4b532ae4f220f0b2cbde6769358d0bfaf8de68102f9e3d6bb4b2e3005462036e024796a1fa81be65ea3ca914691a -DIST librdkafka-1.1.0.tar.gz 2511445 BLAKE2B 00c20361058d537d045da6961afc45e40e0ac641918df9eb457937dc3ca566639b81d8aa10cc6ed2f57988eded180f3d2eaea72ca4b910a652b93b54b9388253 SHA512 35561399b07278a09a51245c5503c86eb0cc8971692b4e65a332144bfb71e2e86d4ceaf1804534b6a416bcace74cef493b6465c20b32c14de97f45f2854359c6 -DIST librdkafka-1.2.1.tar.gz 2547009 BLAKE2B f55c2f23339294d54c1a3cbe064b0ddb6a638adfd192351a69bba91c81f7d33dfad13b45d50a8ea008e397400c89e90fe267549566a8dff07ca701ae59934126 SHA512 57341a0e4dbe98b9da912f5a63cc82490222bd91aef7c3cda3acaa4807e1d13ac047fbff8898f7459e7a1cb46f02dfc665e8c5bddffd8153d67a2c0546000a62 -DIST librdkafka-1.2.2.tar.gz 2588441 BLAKE2B 27cf73c61a56cd899926a2022f3751f66a2569d3065d5c3d8d542df8c0c92db08095188a08c91e347d2c1439f244d417eacbfb218e49c08fe4b5b2ef76f2bd6d SHA512 ef6fc34989e5e484cb0b9f6a6f8a5c4816d89239c18d65becc2004cdfeedbfb541e18affbb8662b05831003249630cb2119ee496b5b844c963b01eb6d4ebac5a -DIST librdkafka-1.3.0.tar.gz 2627028 BLAKE2B bee04707047142833c6c27ec25b81678be929ec08995c0cbf79a744b9c211691a2b4dd086782900a4cead73c6885886a26ab4052a7b9d0f6e6057bbee5a11c1d SHA512 94b6202a83d54dfa181466a7ea4e0b492cd695e2bc08e7e46e60efb9c1dacc912fc891cb2bb50d189dc6d0fd6c7553266196dded460957ba0f569d3e08090669 DIST librdkafka-1.4.0.tar.gz 2722992 BLAKE2B 590fa90805bc2dc728dd32be333eaf9b2a4e6a840403838406684794ca68f2bcf9fc831e252a637622f9e6cd209d779ed20d503e49dac20bdb28f5d3fbd676bd SHA512 cd343597707d22490dfcd513a6b24ca5487dca5230a5a6775e7d6f10be2dc5481deb3a76968bb244d5f7514db92aceca541823c5841a7b54d8e00aeb9088731c -EBUILD librdkafka-1.1.0.ebuild 1540 BLAKE2B 9060364fe3e3927f991161e72a5d4fbcd1f9386538ab47f9c2640a93ae174a019ebede893281c52e65ac8ae306cfaa78e130ffd14437200cb92d958c91515ade SHA512 5025fd3a0bcfc99d7a771855e2304ae10990c0d4b62532fb7704ccf1e8127fb4ff2667440eb46ca15321294c7cc64773e233d80a07e0524677b0ee092c05982d -EBUILD librdkafka-1.2.1.ebuild 1475 BLAKE2B c8b5a4d4f4d946e7a1d78b0a92b737686c1dd8f975122923de2994076a13fb7826f889ec893928c82dd206e2a3c9e777723a5ab1e7ff26f8a7f863f0e82f049c SHA512 a5e794ae2bce3f2aae32642986edc962e5861a745656440fd765a557e695a7d8570c0f90ba5bad57e18a399c1d294c2cd696284d598a074ab742ef49e241c46b -EBUILD librdkafka-1.2.2.ebuild 1475 BLAKE2B c8b5a4d4f4d946e7a1d78b0a92b737686c1dd8f975122923de2994076a13fb7826f889ec893928c82dd206e2a3c9e777723a5ab1e7ff26f8a7f863f0e82f049c SHA512 a5e794ae2bce3f2aae32642986edc962e5861a745656440fd765a557e695a7d8570c0f90ba5bad57e18a399c1d294c2cd696284d598a074ab742ef49e241c46b -EBUILD librdkafka-1.3.0.ebuild 1470 BLAKE2B e535184622dd91d7b4a652657a8cff72338253f51cc7c8129cf619dc9d74e2f9b74d02febf29bc8027d12500357e3ab58ff7bcde3506831385cf5d2f3371502b SHA512 4de59ee2c4094259678ef54025e0f9bc2740dc956ade0d1824fe1c71f14c35a595bd61c02535af05a55095bc126b2220d7046df6c5ff5fa4fb22869bcc06da41 -EBUILD librdkafka-1.4.0.ebuild 1467 BLAKE2B 624773f2b3236ed4ded12694d598536f6f440705211085a0cded3959b60ee9ee39fca469b55e603db3482ea637ccbc4154a52736fef4567357115770639ea436 SHA512 bd304614d8c2ef02a8caa3ac5980134b5ce79e2d48c8457b4378111a6c3b1701570cbde886e74a090f2dcd4a533fa3447250ff56a7d3b5b654420d258cd0b25e +DIST librdkafka-1.4.2.tar.gz 2732806 BLAKE2B 140160fef4f228d877bcfa9d892fd053d2b74547abdbeb7dc661bd4b2b7d576f1ebeecaccd1ac3c3669e059746f0c63be6468cd4f066a9862b8c60d8f2d014a4 SHA512 3d8e496466c103829f5fe11f1a6e68d1299c847b637c6fad55adbe1ad28bd5c463508f3f3fb8b3316b15a104f74e551cd5e520950d76c0e4f8c876083397ced5 +EBUILD librdkafka-1.4.0.ebuild 1471 BLAKE2B 1fd23cd2970dd73085d1a2a584fb6f391568996946e87452e6fd283bfc78119d2c52ecd571a24892c843274744e5aab62266a3a5cba51279109efee4d691e311 SHA512 7e168e876ff25bb9fb83b4ac7401742ce9dbe437939e3c10dbd96c0bffe66270e5816413f7ab7a441897066658c4cd9a7319f6a5b38aaa13a0867f13ee3b4662 +EBUILD librdkafka-1.4.2.ebuild 1476 BLAKE2B b94112c7661b3cd7275f78182943fbbc1c55aec7c89f2270a70e3ed217c28733d3d97479cec6acba0807f9c3ad97873315c9b1eac6eed8592a1c7cb94f977565 SHA512 1f21d6659bbf36fc84cd201865ab2010ee0f2aabef295d0f12982c247d04ff43e58cb08dde85cb34e2a2b084e1c7bd7d08e5efbf1e6c9a6c1f2e4b55321b021b MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308 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 deleted file mode 100644 index 792bb4535703..000000000000 --- a/dev-libs/librdkafka/files/librdkafka-1.1.0-remove-automagic-on-zstd.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit 828e10cb9331fc5bd48fb1d6fdb8e08cd5fb27ea -Author: Thomas Deutschmann -AuthorDate: Mon Apr 29 18:57:10 2019 +0200 -Commit: Thomas Deutschmann -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 [] - # - -+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 deleted file mode 100644 index b3f9787c0202..000000000000 --- a/dev-libs/librdkafka/librdkafka-1.1.0.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# 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 ~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} ) -" - -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 -} diff --git a/dev-libs/librdkafka/librdkafka-1.2.1.ebuild b/dev-libs/librdkafka/librdkafka-1.2.1.ebuild deleted file mode 100644 index 6d51d76e53fb..000000000000 --- a/dev-libs/librdkafka/librdkafka-1.2.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# 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 ~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() { - 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 -} diff --git a/dev-libs/librdkafka/librdkafka-1.2.2.ebuild b/dev-libs/librdkafka/librdkafka-1.2.2.ebuild deleted file mode 100644 index 6d51d76e53fb..000000000000 --- a/dev-libs/librdkafka/librdkafka-1.2.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# 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 ~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() { - 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 -} diff --git a/dev-libs/librdkafka/librdkafka-1.3.0.ebuild b/dev-libs/librdkafka/librdkafka-1.3.0.ebuild deleted file mode 100644 index e446aa6623f8..000000000000 --- a/dev-libs/librdkafka/librdkafka-1.3.0.ebuild +++ /dev/null @@ -1,76 +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() { - 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 -} diff --git a/dev-libs/librdkafka/librdkafka-1.4.0.ebuild b/dev-libs/librdkafka/librdkafka-1.4.0.ebuild index a9b61adfcaff..ebc30a9d77d4 100644 --- a/dev-libs/librdkafka/librdkafka-1.4.0.ebuild +++ b/dev-libs/librdkafka/librdkafka-1.4.0.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 ~sparc x86" + KEYWORDS="amd64 arm arm64 hppa ~ppc ~sparc x86" fi LICENSE="BSD-2" @@ -68,6 +68,6 @@ src_install() { install if ! use static-libs; then - find "${ED}"/usr/lib* -name '*.la' -o -name '*.a' -delete || die + 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 new file mode 100644 index 000000000000..c6121981cc13 --- /dev/null +++ b/dev-libs/librdkafka/librdkafka-1.4.2.ebuild @@ -0,0 +1,73 @@ +# 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 +} -- cgit v1.2.3