commit: 6b60ac19065505109e36a468c4a72cdff0381eb3 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jun 30 10:20:32 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jun 30 10:21:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b60ac19
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 <AT> gentoo.org> dev-lang/php/{php-7.4.33.ebuild => php-7.4.33-r4.ebuild} | 4 ++-- dev-lang/php/{php-7.4.33-r2.ebuild => php-7.4.33-r5.ebuild} | 2 +- dev-lang/php/{php-7.4.33-r3.ebuild => php-7.4.33-r6.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 similarity index 99% rename from dev-lang/php/php-7.4.33.ebuild rename to 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 similarity index 99% rename from dev-lang/php/php-7.4.33-r2.ebuild rename to 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 similarity index 99% rename from dev-lang/php/php-7.4.33-r3.ebuild rename to 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* )
