gentoo auto-resync : 26:01:2023 - 07:55:33

1 files changed, 33 insertions, 66 deletions

diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index 50df33f0b074..da08a416f62c 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: apache-2.eclass
@@ -37,12 +37,6 @@ esac
 # INTERNAL VARIABLES
 # ==============================================================================
 
-# @ECLASS_VARIABLE: GENTOO_USE_PCRE1
-# @DESCRIPTION:
-# Temporary variable to allow older Apache versions to force using legacy
-# dev-libs/libpcre.  This will be removed once ebuilds using dev-libs/libpcre2
-# ar stable.
-
 # @ECLASS_VARIABLE: GENTOO_PATCHNAME
 # @DESCRIPTION:
 # This internal variable contains the prefix for the patch tarball.
@@ -138,6 +132,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
@@ -145,39 +144,33 @@ RDEPEND="
 	dev-lang/perl
 	>=dev-libs/apr-1.5.1:=
 	=dev-libs/apr-util-1*:=[gdbm=,ldap?]
+	dev-libs/libpcre2
 	virtual/libcrypt:=
 	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_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? (
 		dev-libs/apr-util[openssl]
 	)
 	gdbm? ( sys-libs/gdbm:= )
-	ldap? ( =net-nds/openldap-2* )
+	ldap? ( net-nds/openldap:= )
 	selinux? ( sec-policy/selinux-apache )
 	ssl? (
-		>=dev-libs/openssl-1.0.2:0=
+		>=dev-libs/openssl-1.0.2:=
 		kernel_linux? ( sys-apps/util-linux )
 	)
 	systemd? ( sys-apps/systemd )
 "
-
-if [[ -n ${GENTOO_USE_PCRE1} ]] ; then
-	RDEPEND+=" dev-libs/libpcre"
-else
-	RDEPEND+=" dev-libs/libpcre2"
-fi
-
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
@@ -529,37 +522,20 @@ apache-2_src_prepare() {
 	# ${T} must be not group-writable, else grsec TPE will block it
 	chmod g-w "${T}" || die
 
-	if [[ -n ${GENTOO_USE_PCRE1} ]] ; then
-		# This package really should upgrade to using pcre's .pc file.
-		cat <<-\EOF > "${T}"/pcre-config
-		#!/usr/bin/env bash
-		flags=()
-		for flag; do
-			if [[ ${flag} == "--version" ]]; then
-				flags+=( --modversion )
-			else
-				flags+=( "${flag}" )
-			fi
-		done
-		exec ${PKG_CONFIG} libpcre "${flags[@]}"
-		EOF
-		chmod a+x "${T}"/pcre-config || die
-	else
-			# This package really should upgrade to using pcre's .pc file.
-		cat <<-\EOF > "${T}"/pcre2-config
-		#!/usr/bin/env bash
-		flags=()
-		for flag; do
-			if [[ ${flag} == "--version" ]]; then
-				flags+=( --modversion )
-			else
-				flags+=( "${flag}" )
-			fi
-		done
-		exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
-		EOF
-		chmod a+x "${T}"/pcre2-config || die
-	fi
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF > "${T}"/pcre2-config
+	#!/usr/bin/env bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre2-config || die
 }
 
 # @FUNCTION: apache-2_src_configure
@@ -571,8 +547,8 @@ apache-2_src_configure() {
 	export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
 
 	# Sanity check in case people have bad mounts/TPE settings. #500928
-	if ! "${T}"/pcre-config --help >/dev/null && ! "${T}"/pcre2-config --help >/dev/null ; then
-		eerror "Could not execute ${T}/pcre-config (or pcre2-config); do you have bad mount"
+	if ! "${T}"/pcre2-config --help &>/dev/null ; then
+		eerror "Could not execute ${T}/pcre2-config; do you have bad mount"
 		eerror "permissions in ${T} or have TPE turned on in your kernel?"
 		die "check your runtime settings #500928"
 	fi
@@ -603,21 +579,12 @@ apache-2_src_configure() {
 		--enable-layout=Gentoo
 	)
 
-	if [[ -n ${GENTOO_USE_PCRE1} ]] ; then
-		export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre-config
-
-		MY_CONF+=(
-			--without-pcre2
-			--with-pcre="${T}"/pcre-config
-		)
-	else
-		export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
+	export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
 
-		MY_CONF+=(
-			--without-pcre
-			--with-pcre2="${T}"/pcre2-config
-		)
-	fi
+	MY_CONF+=(
+		--without-pcre
+		--with-pcre2="${T}"/pcre2-config
+	)
 
 	econf "${MY_CONF[@]}"