summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-06-30 11:20:32 +0100
committerSam James <sam@gentoo.org>2023-06-30 11:21:00 +0100
commit6b60ac19065505109e36a468c4a72cdff0381eb3 (patch)
tree9bcd2522b118683c01fde3d3d2c87893970fc27c /dev-lang/php
parentsys-apps/baselayout-java: p11-kit now always has trust enabled (diff)
downloadgentoo-6b60ac19065505109e36a468c4a72cdff0381eb3.tar.gz
gentoo-6b60ac19065505109e36a468c4a72cdff0381eb3.tar.bz2
gentoo-6b60ac19065505109e36a468c4a72cdff0381eb3.zip
dev-lang/php: simplify <openssl-3 dep for php7.4
The old version caused some confusion as it appears twice in the Portage conflict output, see https://forums.gentoo.org/viewtopic-p-8794032.html. Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-lang/php')
-rw-r--r--dev-lang/php/php-7.4.33-r4.ebuild (renamed from dev-lang/php/php-7.4.33.ebuild)4
-rw-r--r--dev-lang/php/php-7.4.33-r5.ebuild (renamed from dev-lang/php/php-7.4.33-r2.ebuild)2
-rw-r--r--dev-lang/php/php-7.4.33-r6.ebuild (renamed from dev-lang/php/php-7.4.33-r3.ebuild)2
3 files changed, 4 insertions, 4 deletions
diff --git a/dev-lang/php/php-7.4.33.ebuild b/dev-lang/php/php-7.4.33-r4.ebuild
index 44eb6d5b3366..7fbca4442887 100644
--- a/dev-lang/php/php-7.4.33.ebuild
+++ b/dev-lang/php/php-7.4.33-r4.ebuild
@@ -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
EAPI="7"
@@ -114,7 +114,7 @@ COMMON_DEPEND="
sodium? ( dev-libs/libsodium:=[-minimal] )
spell? ( >=app-text/aspell-0.50 )
sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 )
+ ssl? ( <dev-libs/openssl-3.0:= )
tidy? ( app-text/htmltidy )
tokyocabinet? ( dev-db/tokyocabinet )
truetype? ( =media-libs/freetype-2* )
diff --git a/dev-lang/php/php-7.4.33-r2.ebuild b/dev-lang/php/php-7.4.33-r5.ebuild
index 389def55dd62..f59fb3340890 100644
--- a/dev-lang/php/php-7.4.33-r2.ebuild
+++ b/dev-lang/php/php-7.4.33-r5.ebuild
@@ -114,7 +114,7 @@ COMMON_DEPEND="
sodium? ( dev-libs/libsodium:=[-minimal] )
spell? ( >=app-text/aspell-0.50 )
sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 )
+ ssl? ( <dev-libs/openssl-3.0:= )
tidy? ( app-text/htmltidy )
tokyocabinet? ( dev-db/tokyocabinet )
truetype? ( =media-libs/freetype-2* )
diff --git a/dev-lang/php/php-7.4.33-r3.ebuild b/dev-lang/php/php-7.4.33-r6.ebuild
index 6c9786ea4e3b..6986b0537557 100644
--- a/dev-lang/php/php-7.4.33-r3.ebuild
+++ b/dev-lang/php/php-7.4.33-r6.ebuild
@@ -112,7 +112,7 @@ COMMON_DEPEND="
sodium? ( dev-libs/libsodium:=[-minimal] )
spell? ( >=app-text/aspell-0.50 )
sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 )
+ ssl? ( <dev-libs/openssl-3.0:= )
tidy? ( app-text/htmltidy )
tokyocabinet? ( dev-db/tokyocabinet )
truetype? ( =media-libs/freetype-2* )