diff options
author | Mike Frysinger <vapier@google.com> | 2016-02-04 18:18:55 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@google.com> | 2016-02-04 18:18:55 -0500 |
commit | 3467b8748761018bef84f8470ef4d0070136e6f1 (patch) | |
tree | 6437102b0b4e57e2640c27f438004dd68ec62ef3 /net-libs/nghttp2 | |
parent | 5b84cb95073a8c276866a99d515c05a35ff23195 (diff) | |
parent | 3b0feca7d4f522e85991656da2cbed9cdf4d3056 (diff) | |
download | gentoo-master.tar.gz |
Merge https://github.com/gentoo/gentoo.gitHEADmastermainbrillo-m10-releasebrillo-m10-dev
Diffstat (limited to 'net-libs/nghttp2')
-rw-r--r-- | net-libs/nghttp2/Manifest | 3 | ||||
-rw-r--r-- | net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch | 34 | ||||
-rw-r--r-- | net-libs/nghttp2/nghttp2-1.0.5.ebuild | 61 | ||||
-rw-r--r-- | net-libs/nghttp2/nghttp2-1.6.0.ebuild | 2 | ||||
-rw-r--r-- | net-libs/nghttp2/nghttp2-1.7.0.ebuild (renamed from net-libs/nghttp2/nghttp2-1.5.0.ebuild) | 0 |
5 files changed, 2 insertions, 98 deletions
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest index c69b64bb01..b806676457 100644 --- a/net-libs/nghttp2/Manifest +++ b/net-libs/nghttp2/Manifest @@ -1,3 +1,2 @@ -DIST nghttp2-1.0.5.tar.gz 1356748 SHA256 64e066816606178188bfaf0aa7298e1f44cef943dd9ae936497dab38b3b2569e SHA512 f8b7a79e6174ff501d93333b25954822098d936720a8f4de8a15c83f16c009006aefd05e24977c219661fd63b9fead70eaf5703211bfd9e2bba6a61facbba9c4 WHIRLPOOL 608b1a4494e2aff0c941545c1f49c3c585846d27f5e509ff16c9217309689c47fd7f8fc398b23c83d8aa0ba3f9c2c52af039cd875e47f38630acc50e7c17f717 -DIST nghttp2-1.5.0.tar.gz 1980230 SHA256 ccde0e43cadcef2b81dad4d2ae05559290a2c174e4d2e3e882bd74679895be5c SHA512 6f5c67269277a0fbbe55c2dd18b49abcbc14614495100f715d7b0c61c1947b56cbc20f1f8dd51de5e921363c582c1d867c366b53869a73ad408c072c424a0f63 WHIRLPOOL 74d40e3d77d80d7fb5f7d24559e65dc8d60e60de0f772034beee0fcd6d7e7fab427fb16b69eab85daecbbfb861f77a49e70697338b021982d72d5caf2723b10b DIST nghttp2-1.6.0.tar.gz 1983953 SHA256 c88012e87b80c055ddd2412efd7e96b9e8cfe0652c4b21083f2cb89b2f0d3a26 SHA512 32d5227a5ff037d50d93d43b1fdb0be51d9cca1e09dcc85320b8e09f82fdc658397ca58ca400595f138ca7b77f389d945e3562ab4074afd05e1c74eca4de2744 WHIRLPOOL 31102e596a9e93ca993cd9b8b04da6f51acb247803de16958501bdb6fe06e5bbc951430d2c2be1bd7fd1d9216d087d711de83bad6bb93eb70f4e4b8b0f864efb +DIST nghttp2-1.7.0.tar.gz 2001726 SHA256 f0be9560baa30fc56bcce0151d88126d71b91815bb47076a8dd9ad2b9023ff49 SHA512 556a81ef9bad8a75a23b13532e6066af4412d79fa8dbde508ea893780bc9b19e0525674dc1cfb04b25cc48d62ae704737d6c4b1aa2b442a2be514b72490f6c1b WHIRLPOOL 138bb50c85ef7838be919989c032157ecedbfe1d5bf28633d5ee0c3d6f18dc7fa7525e185d476d146788466b58db0a2104054a1a28cb5152a8c4e9652fcb22ba diff --git a/net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch b/net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch deleted file mode 100644 index 9e5323bc81..0000000000 --- a/net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 19309823aa5e4e9a65436bbc32430c9092e5d233 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Wed, 17 Jun 2015 13:29:37 -0400 -Subject: [PATCH] enable third-party for asio_lib too - -Since this library uses the third-party subdir, make sure we auto-enable -it when that lib is turned on. ---- - configure.ac | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index be51a24..8e81741 100644 ---- a/configure -+++ b/configure -@@ -464,11 +464,12 @@ fi - - AM_CONDITIONAL([ENABLE_EXAMPLES], [ test "x${enable_examples}" = "xyes" ]) - --# third-party only be built if either enable_examples or enable_app is --# yes -+# third-party only be built when needed - - enable_third_party=no --if test "x${enable_examples}" = "xyes" || test "x${enable_app}" = "xyes"; then -+if test "x${enable_examples}" = "xyes" || -+ test "x${enable_app}" = "xyes" || -+ test "x${enable_asio_lib}" = "xyes"; then - enable_third_party=yes - fi - --- -2.4.1 - diff --git a/net-libs/nghttp2/nghttp2-1.0.5.ebuild b/net-libs/nghttp2/nghttp2-1.0.5.ebuild deleted file mode 100644 index 3bacabf613..0000000000 --- a/net-libs/nghttp2/nghttp2-1.0.5.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# TODO: Add python support. - -EAPI="5" - -inherit multilib-minimal - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git" - inherit git-2 -else - SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -fi - -DESCRIPTION="HTTP/2 C Library" -HOMEPAGE="https://nghttp2.org/" - -LICENSE="MIT" -SLOT="0/1.14" # <C++>.<C> SONAMEs -IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml" - -RDEPEND=" - cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] ) - hpack-tools? ( >=dev-libs/jansson-2.5 ) - jemalloc? ( dev-libs/jemalloc ) - utils? ( - >=dev-libs/libev-4.15 - >=dev-libs/openssl-1.0.2[-bindist] - >=sys-libs/zlib-1.2.3 - ) - xml? ( >=dev-libs/libxml2-2.7.7:2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf \ - --disable-examples \ - --disable-failmalloc \ - --disable-werror \ - --without-cython \ - --disable-python-bindings \ - --without-spdylay \ - $(use_enable cxx asio-lib) \ - $(use_enable debug) \ - $(multilib_native_use_enable hpack-tools) \ - $(use_enable static-libs static) \ - $(use_enable threads) \ - $(multilib_native_use_enable utils app) \ - $(multilib_native_use_with jemalloc) \ - $(multilib_native_use_with xml libxml2) -} - -multilib_src_install_all() { - use static-libs || find "${ED}" -name '*.la' -delete -} diff --git a/net-libs/nghttp2/nghttp2-1.6.0.ebuild b/net-libs/nghttp2/nghttp2-1.6.0.ebuild index 118731fe2b..f65b7c1284 100644 --- a/net-libs/nghttp2/nghttp2-1.6.0.ebuild +++ b/net-libs/nghttp2/nghttp2-1.6.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-2 else SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" fi DESCRIPTION="HTTP/2 C Library" diff --git a/net-libs/nghttp2/nghttp2-1.5.0.ebuild b/net-libs/nghttp2/nghttp2-1.7.0.ebuild index 776f0f6311..776f0f6311 100644 --- a/net-libs/nghttp2/nghttp2-1.5.0.ebuild +++ b/net-libs/nghttp2/nghttp2-1.7.0.ebuild |