commit:     96c22f3e99772247a35c0fd725729d9fad733f57
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 05:10:54 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 05:10:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96c22f3e

apache-2.eclass: adjust NGHTTP2_VERSION for newer versions

2.4.55 needs >=net-libs/nghttp2-1.50.0.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/apache-2.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index 17ffac663a39..e68642bf2e7c 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -138,6 +138,11 @@ _apache2_set_mpms() {
 _apache2_set_mpms
 unset -f _apache2_set_mpms
 
+NGHTTP2_VERSION=1.2.1
+if ver_test ${PV} -ge 2.4.55 ; then
+       NGHTTP2_VERSION=1.50.0
+fi
+
 # Dependencies
 RDEPEND="
        acct-group/apache
@@ -149,14 +154,14 @@ RDEPEND="
        apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
        apache2_modules_deflate? ( sys-libs/zlib )
        apache2_modules_http2? (
-               >=net-libs/nghttp2-1.2.1:=
+               >=net-libs/nghttp2-${NGHTTP2_VERSION}:=
                kernel_linux? ( sys-apps/util-linux )
        )
        apache2_modules_lua? ( ${LUA_DEPS} )
        apache2_modules_md? ( >=dev-libs/jansson-2.10:= )
        apache2_modules_mime? ( app-misc/mime-types )
        apache2_modules_proxy_http2? (
-               >=net-libs/nghttp2-1.2.1:=
+               >=net-libs/nghttp2-${NGHTTP2_VERSION}:=
                kernel_linux? ( sys-apps/util-linux )
        )
        apache2_modules_session_crypto? (

Reply via email to