From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1533515-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 069A5158009
for <garchives@archives.gentoo.org>; Fri, 30 Jun 2023 10:21:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 464AAE093D;
Fri, 30 Jun 2023 10:21:29 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2395FE093D
for <gentoo-commits@lists.gentoo.org>; Fri, 30 Jun 2023 10:21:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1FF91340C33
for <gentoo-commits@lists.gentoo.org>; Fri, 30 Jun 2023 10:21:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E44E135
for <gentoo-commits@lists.gentoo.org>; Fri, 30 Jun 2023 10:21:26 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1688120460.6b60ac19065505109e36a468c4a72cdff0381eb3.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/php/php-7.4.33-r2.ebuild dev-lang/php/php-7.4.33-r3.ebuild dev-lang/php/php-7.4.33-r4.ebuild dev-lang/php/php-7.4.33-r5.ebuild dev-lang/php/php-7.4.33-r6.ebuild dev-lang/php/php-7.4.33.ebuild
X-VCS-Directories: dev-lang/php/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 6b60ac19065505109e36a468c4a72cdff0381eb3
X-VCS-Branch: master
Date: Fri, 30 Jun 2023 10:21:26 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 3ec7ccdd-b2fa-462c-994e-f67509f15f88
X-Archives-Hash: cdf5e73cf98d022c8cd80f0ce930d73e
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* )