[gentoo-commits] repo/gentoo:master commit in: dev-libs/libp11/

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     fc967d99bab80dad3fd013b2184954fba9597293
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  2 18:50:35 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jan  2 18:52:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc967d99

dev-libs/libp11: fixup openssl version restrictions

it breaks with 4 and up of the 3.1 series and
with version 12 and up of the 3.0 series

the recent removal of 3.1.3 broke things again on my system when openssl
was downgraded to 3.0.12, downgrading again to 3.0.11 fixes the problem again.

Bug: https://bugs.gentoo.org/916328
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../{libp11-0.4.12-r4.ebuild => libp11-0.4.12-r5.ebuild}   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libp11/libp11-0.4.12-r4.ebuild b/dev-libs/libp11/libp11-0.4.12-r5.ebuild
similarity index 81%
rename from dev-libs/libp11/libp11-0.4.12-r4.ebuild
rename to dev-libs/libp11/libp11-0.4.12-r5.ebuild
index 309c9ed49b57..af97865f45e3 100644
--- a/dev-libs/libp11/libp11-0.4.12-r4.ebuild
+++ b/dev-libs/libp11/libp11-0.4.12-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,17 @@ IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	<dev-libs/openssl-3.1.4:=[bindist(+)]
+	dev-libs/openssl:=[bindist(+)]
+	|| (
+		(
+			>=dev-libs/openssl-3.1.0
+			<dev-libs/openssl-3.1.4
+		)
+		(
+			>=dev-libs/openssl-3.0.0
+			<dev-libs/openssl-3.0.12
+		)
+	)
 "
 DEPEND="${RDEPEND}
 	test? ( dev-libs/softhsm )