From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-962389-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 1CB12139695
for <garchives@archives.gentoo.org>; Tue, 18 Jul 2017 14:28:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3A622E0ED2;
Tue, 18 Jul 2017 14:28:14 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0C7C7E0ED2
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Jul 2017 14:28:13 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D90F1341878
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Jul 2017 14:28:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E63474A5
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Jul 2017 14:28:11 +0000 (UTC)
From: "Brian Evans" <grknight@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, "Brian Evans" <grknight@gentoo.org>
Message-ID: <1500388013.9d968e14aeb899589d696343170a32045f79c76a.grknight@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/php/php-5.6.30.ebuild dev-lang/php/php-5.6.31.ebuild dev-lang/php/php-7.0.15.ebuild dev-lang/php/php-7.0.19.ebuild dev-lang/php/php-7.0.21.ebuild
X-VCS-Directories: dev-lang/php/
X-VCS-Committer: grknight
X-VCS-Committer-Name: Brian Evans
X-VCS-Revision: 9d968e14aeb899589d696343170a32045f79c76a
X-VCS-Branch: master
Date: Tue, 18 Jul 2017 14:28:11 +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-Archives-Salt: 18eee418-df78-4471-a7f8-08f37cd883fb
X-Archives-Hash: 5b5da8803af9e335e96e7ec6cf7edaba
commit: 9d968e14aeb899589d696343170a32045f79c76a
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 14:26:53 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 14:26:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d968e14
dev-lang/php: Final REQUIRED_USE tweaks for usability
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-lang/php/php-5.6.30.ebuild | 7 +++----
dev-lang/php/php-5.6.31.ebuild | 2 +-
dev-lang/php/php-7.0.15.ebuild | 5 +++--
dev-lang/php/php-7.0.19.ebuild | 5 +++--
dev-lang/php/php-7.0.21.ebuild | 2 +-
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/dev-lang/php/php-5.6.30.ebuild b/dev-lang/php/php-5.6.30.ebuild
index 802119c18f7..0dd5527d5e9 100644
--- a/dev-lang/php/php-5.6.30.ebuild
+++ b/dev-lang/php/php-5.6.30.ebuild
@@ -145,12 +145,12 @@ DEPEND="${COMMON_DEPEND}
# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed )
cli? ( ^^ ( readline libedit ) )
truetype? ( gd )
vpx? ( gd )
cjk? ( gd )
exif? ( gd )
-
xpm? ( gd )
gd? ( zlib )
simplexml? ( xml )
@@ -162,6 +162,7 @@ REQUIRED_USE="
ldap-sasl? ( ldap )
mhash? ( hash )
phar? ( hash )
+ recode? ( !imap !mysql !mysqli !libmysqlclient )
libmysqlclient? ( || (
mysql
mysqli
@@ -170,10 +171,8 @@ REQUIRED_USE="
qdbm? ( !gdbm )
readline? ( !libedit )
- recode? ( !imap !mysql !mysqli )
sharedmem? ( !threads )
-
- !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+"
PHP_MV="$(get_major_version)"
diff --git a/dev-lang/php/php-5.6.31.ebuild b/dev-lang/php/php-5.6.31.ebuild
index 7310a78821e..0548b46abbe 100644
--- a/dev-lang/php/php-5.6.31.ebuild
+++ b/dev-lang/php/php-5.6.31.ebuild
@@ -147,12 +147,12 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="
|| ( cli cgi fpm apache2 embed )
cli? ( ^^ ( readline libedit ) )
- gd? ( zlib )
truetype? ( gd )
vpx? ( gd )
cjk? ( gd )
exif? ( gd )
xpm? ( gd )
+ gd? ( zlib )
simplexml? ( xml )
soap? ( xml )
wddx? ( xml )
diff --git a/dev-lang/php/php-7.0.15.ebuild b/dev-lang/php/php-7.0.15.ebuild
index 0d130a0e292..9d14cd817c2 100644
--- a/dev-lang/php/php-7.0.15.ebuild
+++ b/dev-lang/php/php-7.0.15.ebuild
@@ -139,6 +139,7 @@ DEPEND="${COMMON_DEPEND}
# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
cli? ( ^^ ( readline libedit ) )
truetype? ( gd )
webp? ( gd )
@@ -157,10 +158,10 @@ REQUIRED_USE="
phar? ( hash )
qdbm? ( !gdbm )
readline? ( !libedit )
- recode? ( !imap !mysqli )
+ recode? ( !imap !mysqli !mysql )
sharedmem? ( !threads )
mysql? ( || ( mysqli pdo ) )
- || ( cli cgi fpm apache2 embed phpdbg )"
+"
PHP_MV="$(get_major_version)"
diff --git a/dev-lang/php/php-7.0.19.ebuild b/dev-lang/php/php-7.0.19.ebuild
index c0316ea8509..6d0d49263b1 100644
--- a/dev-lang/php/php-7.0.19.ebuild
+++ b/dev-lang/php/php-7.0.19.ebuild
@@ -139,6 +139,7 @@ DEPEND="${COMMON_DEPEND}
# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
cli? ( ^^ ( readline libedit ) )
truetype? ( gd )
webp? ( gd )
@@ -157,10 +158,10 @@ REQUIRED_USE="
phar? ( hash )
qdbm? ( !gdbm )
readline? ( !libedit )
- recode? ( !imap !mysqli )
+ recode? ( !imap !mysqli !mysql )
sharedmem? ( !threads )
mysql? ( || ( mysqli pdo ) )
- || ( cli cgi fpm apache2 embed phpdbg )"
+"
PHP_MV="$(get_major_version)"
diff --git a/dev-lang/php/php-7.0.21.ebuild b/dev-lang/php/php-7.0.21.ebuild
index 90e9c59f5df..04e4ebd73e4 100644
--- a/dev-lang/php/php-7.0.21.ebuild
+++ b/dev-lang/php/php-7.0.21.ebuild
@@ -141,12 +141,12 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="
|| ( cli cgi fpm apache2 embed phpdbg )
cli? ( ^^ ( readline libedit ) )
- gd? ( zlib )
truetype? ( gd )
webp? ( gd )
cjk? ( gd )
exif? ( gd )
xpm? ( gd )
+ gd? ( zlib )
simplexml? ( xml )
soap? ( xml )
wddx? ( xml )