From 125a5a8b0e76ce095a7af9e5e8a594ee9d1b2b59 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 28 Feb 2023 11:02:00 +0100 Subject: [PATCH] net-libs/nghttp2: Sync with Gentoo It's from Gentoo commit 9c0432bbae303f86f8142cf42b17334aff77140e. --- .../portage-stable/net-libs/nghttp2/Manifest | 7 +- .../net-libs/nghttp2/metadata.xml | 5 +- .../net-libs/nghttp2/nghttp2-1.47.0.ebuild | 4 +- ...p2-1.46.0.ebuild => nghttp2-1.48.0.ebuild} | 28 +++---- .../net-libs/nghttp2/nghttp2-1.49.0.ebuild | 76 +++++++++++++++++++ .../net-libs/nghttp2/nghttp2-1.50.0.ebuild | 76 +++++++++++++++++++ ...1.45.1-r1.ebuild => nghttp2-1.51.0.ebuild} | 32 ++++---- .../net-libs/nghttp2/nghttp2-9999.ebuild | 23 +++--- 8 files changed, 201 insertions(+), 50 deletions(-) rename sdk_container/src/third_party/portage-stable/net-libs/nghttp2/{nghttp2-1.46.0.ebuild => nghttp2-1.48.0.ebuild} (68%) create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.49.0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.50.0.ebuild rename sdk_container/src/third_party/portage-stable/net-libs/nghttp2/{nghttp2-1.45.1-r1.ebuild => nghttp2-1.51.0.ebuild} (65%) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest index 575ac2674b..159aa3bf9d 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest @@ -1,3 +1,6 @@ -DIST nghttp2-1.45.1.tar.xz 4017852 BLAKE2B 17bc5e0a6270494a0296da7f1394d0b89666ca42ad04bcce097740da2b30cdc575f17e681a8320dc2a2161eeebb753f22f228a340fc7cd690fa883d29149bcd8 SHA512 320a8c9f29b58c55df98be4312d415bc406edbdfb0765aa37570cdb472a84f40c4f95a51c44c5488363c16ad6815c75b5503b32e43d94724c54117ff583c7150 -DIST nghttp2-1.46.0.tar.xz 4024972 BLAKE2B 85fe1259b791ff7cda163265f553e0aac8a10ef6674cf6152d5bc7747c7f4f3bc6e9d9c0472534dd7185f093936efed1b4632da64d426b6a7ac432657e8579a1 SHA512 fcf3573bcc421705190c7cf0e3230f6f3028b669cb2976d29cfeb73e706deaae91ce60d0a615472e3f296454049ea5798f1e8defdd260a98895e94fea6a7a16b DIST nghttp2-1.47.0.tar.xz 4028580 BLAKE2B 4f5302701c8d8a89c3ae72cbb8acb4cbcbe32cd0e2995643e0b669cf802ae28e8f6e52b2d59f69f87e0d12fc64a73c251edbe01c2b0eca2676626a9e456df93f SHA512 ad6266a15789fec966db6be8ac0b9ee6cca257a3bb91fdd34a58acf0e472643a571941b5974d16c98f6ac5bfa6a03c4b70a6dff222fb0cd50909178b7e94ce48 +DIST nghttp2-1.48.0-pthread.patch 24917 BLAKE2B 22013d89685be603094aa82f69da8741d4c0d76aea8a01de1322c19cef053964fdf0bec937650382f85607ac74466d4d052e6d40217101bc1e40326ad0ddc003 SHA512 bdebc50f13584826d6693aae201db9be63fcadcb8a68af188e94f008e005a2fd6aa6b91b31de2f07f84b93d981a003c8752c5fb4d47502f768bd94e21635627f +DIST nghttp2-1.48.0.tar.xz 4112072 BLAKE2B a52dc1ef4c9658298acef5ad703bec1708e538ebe19584dd5fcfe39089777e105594a998c7db696ee54bc8f17d3086828c09e921d8714b7ad3efbf33d04aaca0 SHA512 77c22371290f77e8a538b9efea225d23567cc27cb60b71703cbcb057839b5f117cf50796aa82bf4518f22b38a5773e90a1c273eafff4b17c435ac5858bdf7c6f +DIST nghttp2-1.49.0.tar.xz 4112260 BLAKE2B 47e892917e52b820d13a6721213550587f6e6652d94701de3d69d923e16d1cd44d9ddf7eb2733f51ec73c0055a432e9b2f636ff4dcfa22cde637e0c421b0c073 SHA512 599bc8e52bbe7f5bdfbf493ea2199c4c4bdeb9eac174d4c56b11fb321b11b86e82674bd3c7f60d7ea975ef60eec3f258b5438d1157491cfa23a1b9adccd7948a +DIST nghttp2-1.50.0.tar.xz 4110336 BLAKE2B ae5d89a1f7287a3f2f2b9380ff5e9efb7f0646950d15ed281f268dafc65eb34ad7e34610333b4c98db8a657034ea462e7f1eda80ff2e94a918751dbb112c9a2a SHA512 c2f7f14972cb268a85966f2bd26ac515fa61d9cf6b6bcaa5cffc04f02a18abf116b15537eb4dfbdfa79e7b1472de7034dfdbce7a082cc5b23627d87e2939e529 +DIST nghttp2-1.51.0.tar.xz 4115988 BLAKE2B ca3c5fb439b60f67ce5447c957397c16c7659432d3a3b25076b88142318675eb2af9f039a86ce88df8af3bd0167d98f14cdeb8dad2d01eda1378015acefa354e SHA512 0212680e57a15f9afca3b5226429edebd2fe8a52117480007d4472cd0c1bd3aa4d9f21269c637a11efd0f2146a3ee16c3c07ab35d9fb3d4566235d3a14268eeb diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/metadata.xml b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/metadata.xml index e79248991e..8cfb42e029 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/metadata.xml @@ -2,14 +2,15 @@ - polynomial-c@gentoo.org - Lars Wendler + voyageur@gentoo.org + Bernard Cafarelli Install HPACK (header compression) helper tools Install nghttp, nghttpd and nghttpx + cpe:/a:nghttp2:nghttp2 nghttp2/nghttp2 diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.47.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.47.0.ebuild index 13938062e1..273f983789 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.47.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.47.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then inherit autotools git-r3 else SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="HTTP/2 C Library" @@ -30,7 +30,7 @@ SSL_DEPEND=" RDEPEND=" cxx? ( ${SSL_DEPEND} - dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)] + dev-libs/boost:=[${MULTILIB_USEDEP}] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] ) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.46.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.48.0.ebuild similarity index 68% rename from sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.46.0.ebuild rename to sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.48.0.ebuild index 6d92e5272f..f3153add27 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.46.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.48.0.ebuild @@ -1,26 +1,21 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # TODO: Add python support. EAPI=8 -inherit multilib-minimal - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git" - inherit autotools git-r3 -else - SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi +inherit autotools multilib-minimal DESCRIPTION="HTTP/2 C Library" HOMEPAGE="https://nghttp2.org/" +SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~voyageur/distfiles/${P}-pthread.patch" LICENSE="MIT" SLOT="0/1.14" # . SONAMEs -IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="cxx debug hpack-tools jemalloc static-libs test utils xml" RESTRICT="!test? ( test )" @@ -30,7 +25,7 @@ SSL_DEPEND=" RDEPEND=" cxx? ( ${SSL_DEPEND} - dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)] + dev-libs/boost:=[${MULTILIB_USEDEP}] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] ) @@ -45,9 +40,13 @@ DEPEND="${RDEPEND} test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${DISTDIR}"/${P}-pthread.patch + ) + src_prepare() { default - [[ ${PV} == 9999 ]] && eautoreconf + eautoreconf } multilib_src_configure() { @@ -56,12 +55,13 @@ multilib_src_configure() { --disable-failmalloc --disable-python-bindings --disable-werror + --enable-threads --without-cython $(use_enable cxx asio-lib) $(use_enable debug) $(multilib_native_use_enable hpack-tools) $(use_enable static-libs static) - $(use_enable threads) + $(use_with test cunit) $(multilib_native_use_enable utils app) $(multilib_native_use_with jemalloc) $(multilib_native_use_with xml libxml2) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.49.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.49.0.ebuild new file mode 100644 index 0000000000..6defddb77d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.49.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# TODO: Add python support. + +EAPI=8 + +inherit autotools multilib-minimal + +DESCRIPTION="HTTP/2 C Library" +HOMEPAGE="https://nghttp2.org/" +SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~voyageur/distfiles/${PN}-1.48.0-pthread.patch" + +LICENSE="MIT" +SLOT="0/1.14" # . SONAMEs +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="cxx debug hpack-tools jemalloc static-libs test utils xml" + +RESTRICT="!test? ( test )" + +SSL_DEPEND=" + >=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}] +" +RDEPEND=" + cxx? ( + ${SSL_DEPEND} + dev-libs/boost:=[${MULTILIB_USEDEP}] + ) + hpack-tools? ( >=dev-libs/jansson-2.5:= ) + jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] ) + utils? ( + ${SSL_DEPEND} + >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}] + net-dns/c-ares:=[${MULTILIB_USEDEP}] + ) + xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${DISTDIR}"/${PN}-1.48.0-pthread.patch + ) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --disable-examples + --disable-failmalloc + --disable-python-bindings + --disable-werror + --enable-threads + --without-cython + $(use_enable cxx asio-lib) + $(use_enable debug) + $(multilib_native_use_enable hpack-tools) + $(use_enable static-libs static) + $(use_with test cunit) + $(multilib_native_use_enable utils app) + $(multilib_native_use_with jemalloc) + $(multilib_native_use_with xml libxml2) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + if ! use static-libs ; then + find "${ED}"/usr -type f -name '*.la' -delete || die + fi +} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.50.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.50.0.ebuild new file mode 100644 index 0000000000..6defddb77d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.50.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# TODO: Add python support. + +EAPI=8 + +inherit autotools multilib-minimal + +DESCRIPTION="HTTP/2 C Library" +HOMEPAGE="https://nghttp2.org/" +SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~voyageur/distfiles/${PN}-1.48.0-pthread.patch" + +LICENSE="MIT" +SLOT="0/1.14" # . SONAMEs +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="cxx debug hpack-tools jemalloc static-libs test utils xml" + +RESTRICT="!test? ( test )" + +SSL_DEPEND=" + >=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}] +" +RDEPEND=" + cxx? ( + ${SSL_DEPEND} + dev-libs/boost:=[${MULTILIB_USEDEP}] + ) + hpack-tools? ( >=dev-libs/jansson-2.5:= ) + jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] ) + utils? ( + ${SSL_DEPEND} + >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}] + net-dns/c-ares:=[${MULTILIB_USEDEP}] + ) + xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${DISTDIR}"/${PN}-1.48.0-pthread.patch + ) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --disable-examples + --disable-failmalloc + --disable-python-bindings + --disable-werror + --enable-threads + --without-cython + $(use_enable cxx asio-lib) + $(use_enable debug) + $(multilib_native_use_enable hpack-tools) + $(use_enable static-libs static) + $(use_with test cunit) + $(multilib_native_use_enable utils app) + $(multilib_native_use_with jemalloc) + $(multilib_native_use_with xml libxml2) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + if ! use static-libs ; then + find "${ED}"/usr -type f -name '*.la' -delete || die + fi +} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.51.0.ebuild similarity index 65% rename from sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild rename to sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.51.0.ebuild index f79b1b5a91..42b69e1538 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.51.0.ebuild @@ -1,26 +1,21 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # TODO: Add python support. -EAPI=7 +EAPI=8 -inherit multilib-minimal - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git" - inherit autotools git-r3 -else - SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi +inherit autotools multilib-minimal DESCRIPTION="HTTP/2 C Library" HOMEPAGE="https://nghttp2.org/" +SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~voyageur/distfiles/${PN}-1.48.0-pthread.patch" LICENSE="MIT" SLOT="0/1.14" # . SONAMEs -IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="cxx debug hpack-tools jemalloc static-libs test utils xml" RESTRICT="!test? ( test )" @@ -30,7 +25,7 @@ SSL_DEPEND=" RDEPEND=" cxx? ( ${SSL_DEPEND} - dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)] + dev-libs/boost:=[${MULTILIB_USEDEP}] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] ) @@ -45,9 +40,13 @@ DEPEND="${RDEPEND} test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${DISTDIR}"/${PN}-1.48.0-pthread.patch + ) + src_prepare() { default - [[ ${PV} == 9999 ]] && eautoreconf + eautoreconf } multilib_src_configure() { @@ -56,12 +55,13 @@ multilib_src_configure() { --disable-failmalloc --disable-python-bindings --disable-werror + --enable-threads --without-cython $(use_enable cxx asio-lib) $(use_enable debug) $(multilib_native_use_enable hpack-tools) $(use_enable static-libs static) - $(use_enable threads) + $(use_with test cunit) $(multilib_native_use_enable utils app) $(multilib_native_use_with jemalloc) $(multilib_native_use_with xml libxml2) @@ -71,6 +71,6 @@ multilib_src_configure() { multilib_src_install_all() { if ! use static-libs ; then - find "${ED}"/usr -name '*.la' -delete || die + find "${ED}"/usr -type f -name '*.la' -delete || die fi } diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-9999.ebuild index 6d92e5272f..67529daca4 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-9999.ebuild @@ -1,26 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # TODO: Add python support. EAPI=8 -inherit multilib-minimal - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git" - inherit autotools git-r3 -else - SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi +inherit autotools git-r3 multilib-minimal DESCRIPTION="HTTP/2 C Library" HOMEPAGE="https://nghttp2.org/" +EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git" LICENSE="MIT" SLOT="0/1.14" # . SONAMEs -IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml" +KEYWORDS="" +IUSE="cxx debug hpack-tools jemalloc static-libs test utils xml" RESTRICT="!test? ( test )" @@ -30,7 +24,7 @@ SSL_DEPEND=" RDEPEND=" cxx? ( ${SSL_DEPEND} - dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)] + dev-libs/boost:=[${MULTILIB_USEDEP}] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] ) @@ -47,7 +41,7 @@ BDEPEND="virtual/pkgconfig" src_prepare() { default - [[ ${PV} == 9999 ]] && eautoreconf + eautoreconf } multilib_src_configure() { @@ -56,12 +50,13 @@ multilib_src_configure() { --disable-failmalloc --disable-python-bindings --disable-werror + --enable-threads --without-cython $(use_enable cxx asio-lib) $(use_enable debug) $(multilib_native_use_enable hpack-tools) $(use_enable static-libs static) - $(use_enable threads) + $(use_with test cunit) $(multilib_native_use_enable utils app) $(multilib_native_use_with jemalloc) $(multilib_native_use_with xml libxml2)