commit:     a85491ad3449184e642b36a99941c865e1007c2f
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat May 11 06:18:27 2024 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat May 11 06:21:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a85491ad

www-servers/apache: inline rustls dependency

The rustls dependency can't be set generically in the eclass because it
varies from ebuild to ebuild.

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 www-servers/apache/apache-2.4.58-r2.ebuild | 5 +++++
 www-servers/apache/apache-2.4.59-r1.ebuild | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/www-servers/apache/apache-2.4.58-r2.ebuild 
b/www-servers/apache/apache-2.4.58-r2.ebuild
index 6e013b4009da..d41733f53db2 100644
--- a/www-servers/apache/apache-2.4.58-r2.ebuild
+++ b/www-servers/apache/apache-2.4.58-r2.ebuild
@@ -148,6 +148,11 @@ LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
 
+RDEPEND="
+       apache2_modules_tls? ( >=net-libs/rustls-ffi-0.9.2:= 
<net-libs/rustls-ffi-11 )
+"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
        "${FILESDIR}"/libxmlv212.patch
 )

diff --git a/www-servers/apache/apache-2.4.59-r1.ebuild 
b/www-servers/apache/apache-2.4.59-r1.ebuild
index 48a82e0ad1c9..42b0b4f76baf 100644
--- a/www-servers/apache/apache-2.4.59-r1.ebuild
+++ b/www-servers/apache/apache-2.4.59-r1.ebuild
@@ -148,6 +148,11 @@ LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
 
+RDEPEND="
+       apache2_modules_tls? ( >=net-libs/rustls-ffi-0.9.2:= 
<net-libs/rustls-ffi-11 )
+"
+DEPEND="${RDEPEND}"
+
 PATCHES=( "${FILESDIR}/${P}-dh-regression.patch" )
 
 pkg_setup() {

Reply via email to