commit: 867f9e2a3b843ce41678f8dc0cbadf7a0f2a4207 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jan 3 01:48:22 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 3 01:48:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=867f9e2a
net-libs/nghttp2: drop 1.61.0, 1.62.0, 1.63.0 Signed-off-by: Sam James <sam <AT> gentoo.org> net-libs/nghttp2/Manifest | 3 -- net-libs/nghttp2/files/nghttp2-1.63.0-cares.patch | 38 ------------- net-libs/nghttp2/nghttp2-1.61.0.ebuild | 61 --------------------- net-libs/nghttp2/nghttp2-1.62.0.ebuild | 61 --------------------- net-libs/nghttp2/nghttp2-1.63.0.ebuild | 65 ----------------------- 5 files changed, 228 deletions(-) diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest index 5e463bc86bd7..b3a44115c6e1 100644 --- a/net-libs/nghttp2/Manifest +++ b/net-libs/nghttp2/Manifest @@ -1,5 +1,2 @@ -DIST nghttp2-1.61.0.tar.xz 1645808 BLAKE2B e78fb94cc9234260447f0d3610e58e22f9eadc2dd8b79eec3c1bb10d5c03ad3a87f83d54e560e5bbdef5d60086c00b465caabca145485ecd636aa35a2cda616f SHA512 01e930d7caf464699505f92b76e2bc8192d168612dc564d2546812c42afea2fb81d552d70e8a5fed35e2bf5deadbec8eda095af94a2484bca41542988afce52a -DIST nghttp2-1.62.0.tar.xz 1646596 BLAKE2B 156fe3cd401e89cb9416c3281318f955abe86909d249108781f8eaeb0ff3df791f083ae6fc7bfe04350b91ffeaf8d8799d138d9d7cc9f5121a344f69f7473915 SHA512 1674e269dcf1067312056e5ea0e7108a48a177888fbaae5a194bddcc9640babc996d86e74e3160cd0dc4a360f0440441116259f3b44a3ca5fea081cdff7e7c88 DIST nghttp2-1.62.1.tar.xz 1606084 BLAKE2B 460152f08b4ebd98453b95b737e0729648b95e808e845114a47a23e39fb3c68bf5d165d71467fbca8069fd5e64a63eeedd025919af4e2186da083caa21b93130 SHA512 d5d6b068712e9b467547b0e5380465b8540317134f3f26c2b0c60eb9c604be2f37b4517a98b371d5f5fb668ce2ee35603ddd944224f11e96382aa541a6a17b4c -DIST nghttp2-1.63.0.tar.xz 1606480 BLAKE2B 8c4158b8855b3b4b0a576f5cc894f77f88bab35bbb995809c7494bd73030d50d0189153ef5434a3071267bc6f198ea3ff5d7e3bd8bac4299fb8fbf3be91e11c7 SHA512 ac5005f33664981e194730223881f4207c9570cb8d9bba51b5592a3e7eb59455ebe25bf190211811513c64497a1b42ec7a82cc7f810059f46c99a83dd2d6cef9 DIST nghttp2-1.64.0.tar.xz 1676124 BLAKE2B e2cad95fbe8447e99728af3ad7656d4dd2d1f51f31294bd38b6c69ee07e6e8e6302c124d47e6274a9a1531257a90bcc5833de390ac704b4b3adf435b9ce38fc9 SHA512 b544196c3b7a55faacd11700d11e2fe4f16a7418282c9abb24a668544a15293580fd1a2cc5f93367c8a17c7ee45335c6d2f5c68a72dd176d516fd033f203eeec diff --git a/net-libs/nghttp2/files/nghttp2-1.63.0-cares.patch b/net-libs/nghttp2/files/nghttp2-1.63.0-cares.patch deleted file mode 100644 index ed5286673211..000000000000 --- a/net-libs/nghttp2/files/nghttp2-1.63.0-cares.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugs.gentoo.org/941453 -https://github.com/nghttp2/nghttp2/issues/2253 -https://github.com/nghttp2/nghttp2/pull/2256 -https://github.com/nghttp2/nghttp2/commit/1ee4636528b1a8ea6769496750dda05f12104fa8 - -From 1ee4636528b1a8ea6769496750dda05f12104fa8 Mon Sep 17 00:00:00 2001 -From: Tatsuhiro Tsujikawa <tatsuhir...@gmail.com> -Date: Tue, 15 Oct 2024 19:25:12 +0900 -Subject: [PATCH] cmake: Fix c-ares v1.34.0 version detection failure - ---- a/cmake/FindLibcares.cmake -+++ b/cmake/FindLibcares.cmake -@@ -17,12 +17,18 @@ find_library(LIBCARES_LIBRARY - ) - - if(LIBCARES_INCLUDE_DIR) -- set(_version_regex "^#define[ \t]+ARES_VERSION_STR[ \t]+\"([^\"]+)\".*") -- file(STRINGS "${LIBCARES_INCLUDE_DIR}/ares_version.h" -- LIBCARES_VERSION REGEX "${_version_regex}") -- string(REGEX REPLACE "${_version_regex}" "\\1" -- LIBCARES_VERSION "${LIBCARES_VERSION}") -- unset(_version_regex) -+ file(READ "${LIBCARES_INCLUDE_DIR}/ares_version.h" _ares_version_h) -+ string(REGEX REPLACE ".*#define[ \t]+ARES_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1" -+ _ares_version_major ${_ares_version_h}) -+ string(REGEX REPLACE ".*#define[ \t]+ARES_VERSION_MINOR[ \t]+([0-9]+).*" "\\1" -+ _ares_version_minor ${_ares_version_h}) -+ string(REGEX REPLACE ".*#define[ \t]+ARES_VERSION_PATCH[ \t]+([0-9]+).*" "\\1" -+ _ares_version_patch ${_ares_version_h}) -+ set(LIBCARES_VERSION "${_ares_version_major}.${_ares_version_minor}.${_ares_version_patch}") -+ unset(_ares_version_patch) -+ unset(_ares_version_minor) -+ unset(_ares_version_major) -+ unset(_ares_version_h) - endif() - - include(FindPackageHandleStandardArgs) - diff --git a/net-libs/nghttp2/nghttp2-1.61.0.ebuild b/net-libs/nghttp2/nghttp2-1.61.0.ebuild deleted file mode 100644 index ea8616811ed6..000000000000 --- a/net-libs/nghttp2/nghttp2-1.61.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -DESCRIPTION="HTTP/2 C Library" -HOMEPAGE="https://nghttp2.org/"; -SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"; - -LICENSE="MIT" -SLOT="0/1.14" # 1.<SONAME> -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml" - -REQUIRED_USE="test? ( static-libs )" -RESTRICT="!test? ( test )" - -SSL_DEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}] -" -RDEPEND=" - 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}] - ) - systemd? ( >=sys-apps/systemd-209 ) - xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -multilib_src_configure() { - #TODO: enable HTTP3 - #requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3 - local mycmakeargs=( - -DENABLE_EXAMPLES=OFF - -DENABLE_FAILMALLOC=OFF - -DENABLE_HTTP3=OFF - -DENABLE_WERROR=OFF - -DENABLE_THREADS=ON - -DENABLE_DEBUG=$(usex debug) - -DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools) - $(cmake_use_find_package hpack-tools Jansson) - -DWITH_JEMALLOC=$(multilib_native_usex jemalloc) - -DBUILD_STATIC_LIBS=$(usex static-libs) - -DBUILD_TESTING=$(usex test) - $(cmake_use_find_package systemd Systemd) - -DENABLE_APP=$(multilib_native_usex utils) - -DWITH_LIBXML2=$(multilib_native_usex xml) - ) - cmake_src_configure -} - -multilib_src_test() { - eninja check -} diff --git a/net-libs/nghttp2/nghttp2-1.62.0.ebuild b/net-libs/nghttp2/nghttp2-1.62.0.ebuild deleted file mode 100644 index 040b77645d76..000000000000 --- a/net-libs/nghttp2/nghttp2-1.62.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -DESCRIPTION="HTTP/2 C Library" -HOMEPAGE="https://nghttp2.org/"; -SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"; - -LICENSE="MIT" -SLOT="0/1.14" # 1.<SONAME> -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml" - -REQUIRED_USE="test? ( static-libs )" -RESTRICT="!test? ( test )" - -SSL_DEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}] -" -RDEPEND=" - 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}] - ) - systemd? ( >=sys-apps/systemd-209 ) - xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -multilib_src_configure() { - #TODO: enable HTTP3 - #requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3 - local mycmakeargs=( - -DENABLE_EXAMPLES=OFF - -DENABLE_FAILMALLOC=OFF - -DENABLE_HTTP3=OFF - -DENABLE_WERROR=OFF - -DENABLE_THREADS=ON - -DENABLE_DEBUG=$(usex debug) - -DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools) - $(cmake_use_find_package hpack-tools Jansson) - -DWITH_JEMALLOC=$(multilib_native_usex jemalloc) - -DBUILD_STATIC_LIBS=$(usex static-libs) - -DBUILD_TESTING=$(usex test) - $(cmake_use_find_package systemd Systemd) - -DENABLE_APP=$(multilib_native_usex utils) - -DWITH_LIBXML2=$(multilib_native_usex xml) - ) - cmake_src_configure -} - -multilib_src_test() { - eninja check -} diff --git a/net-libs/nghttp2/nghttp2-1.63.0.ebuild b/net-libs/nghttp2/nghttp2-1.63.0.ebuild deleted file mode 100644 index 54c2599e4f59..000000000000 --- a/net-libs/nghttp2/nghttp2-1.63.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -DESCRIPTION="HTTP/2 C Library" -HOMEPAGE="https://nghttp2.org/"; -SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"; - -LICENSE="MIT" -SLOT="0/1.14" # 1.<SONAME> -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml" - -REQUIRED_USE="test? ( static-libs )" -RESTRICT="!test? ( test )" - -SSL_DEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}] -" -RDEPEND=" - 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}] - ) - systemd? ( >=sys-apps/systemd-209 ) - xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-cares.patch -) - -multilib_src_configure() { - #TODO: enable HTTP3 - #requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3 - local mycmakeargs=( - -DENABLE_EXAMPLES=OFF - -DENABLE_FAILMALLOC=OFF - -DENABLE_HTTP3=OFF - -DENABLE_WERROR=OFF - -DENABLE_THREADS=ON - -DENABLE_DEBUG=$(usex debug) - -DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools) - $(cmake_use_find_package hpack-tools Jansson) - -DWITH_JEMALLOC=$(multilib_native_usex jemalloc) - -DBUILD_STATIC_LIBS=$(usex static-libs) - -DBUILD_TESTING=$(usex test) - $(cmake_use_find_package systemd Systemd) - -DENABLE_APP=$(multilib_native_usex utils) - -DWITH_LIBXML2=$(multilib_native_usex xml) - ) - cmake_src_configure -} - -multilib_src_test() { - eninja check -}
