From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1114480-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 AD47B138334 for <garchives@archives.gentoo.org>; Fri, 4 Oct 2019 16:24:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 728AEE0849; Fri, 4 Oct 2019 16:24:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 409ACE0849 for <gentoo-commits@lists.gentoo.org>; Fri, 4 Oct 2019 16:24:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 CBF8F34B90A for <gentoo-commits@lists.gentoo.org>; Fri, 4 Oct 2019 16:24:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 664C9804 for <gentoo-commits@lists.gentoo.org>; Fri, 4 Oct 2019 16:24:08 +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: <1570206237.6df250126b847ab873cbe0e7fa8ce0de794d2697.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.40-r6.ebuild dev-lang/php/php-7.1.31.ebuild dev-lang/php/php-7.1.32.ebuild dev-lang/php/php-7.2.21.ebuild dev-lang/php/php-7.2.22.ebuild dev-lang/php/php-7.2.23.ebuild dev-lang/php/php-7.3.10.ebuild dev-lang/php/php-7.3.8.ebuild dev-lang/php/php-7.3.9.ebuild X-VCS-Directories: dev-lang/php/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 6df250126b847ab873cbe0e7fa8ce0de794d2697 X-VCS-Branch: master Date: Fri, 4 Oct 2019 16:24:08 +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: 289a79d4-17ba-4d35-b480-b617e214b3d2 X-Archives-Hash: de096d650479f5aa4194ea121d46eedc commit: 6df250126b847ab873cbe0e7fa8ce0de794d2697 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Fri Oct 4 16:23:30 2019 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Fri Oct 4 16:23:57 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df25012 dev-lang/php: Convert apache dependency to work on all versions The conditional dependency on www-servers/apache can be simplifed so that it works on all versions and still be equal in existing installed VDB Modify all current ebuilds to close the bug Closes: https://bugs.gentoo.org/692090 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Brian Evans <grknight <AT> gentoo.org> dev-lang/php/php-5.6.40-r6.ebuild | 3 +-- dev-lang/php/php-7.1.31.ebuild | 3 +-- dev-lang/php/php-7.1.32.ebuild | 3 +-- dev-lang/php/php-7.2.21.ebuild | 3 +-- dev-lang/php/php-7.2.22.ebuild | 3 +-- dev-lang/php/php-7.2.23.ebuild | 3 +-- dev-lang/php/php-7.3.10.ebuild | 3 +-- dev-lang/php/php-7.3.8.ebuild | 3 +-- dev-lang/php/php-7.3.9.ebuild | 3 +-- 9 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dev-lang/php/php-5.6.40-r6.ebuild b/dev-lang/php/php-5.6.40-r6.ebuild index 9a3ebaa2a5f..8f5ff1a11f2 100644 --- a/dev-lang/php/php-5.6.40-r6.ebuild +++ b/dev-lang/php/php-5.6.40-r6.ebuild @@ -50,8 +50,7 @@ COMMON_DEPEND=" >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - <www-servers/apache-2.4[threads=] ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 diff --git a/dev-lang/php/php-7.1.31.ebuild b/dev-lang/php/php-7.1.31.ebuild index 139472d572c..896a587ccae 100644 --- a/dev-lang/php/php-7.1.31.ebuild +++ b/dev-lang/php/php-7.1.31.ebuild @@ -47,8 +47,7 @@ COMMON_DEPEND=" >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - <www-servers/apache-2.4[threads=] ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 diff --git a/dev-lang/php/php-7.1.32.ebuild b/dev-lang/php/php-7.1.32.ebuild index 592ae19fd67..915a7b43320 100644 --- a/dev-lang/php/php-7.1.32.ebuild +++ b/dev-lang/php/php-7.1.32.ebuild @@ -47,8 +47,7 @@ COMMON_DEPEND=" >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - <www-servers/apache-2.4[threads=] ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 diff --git a/dev-lang/php/php-7.2.21.ebuild b/dev-lang/php/php-7.2.21.ebuild index f659c39ce48..bb2a85f0ab1 100644 --- a/dev-lang/php/php-7.2.21.ebuild +++ b/dev-lang/php/php-7.2.21.ebuild @@ -47,8 +47,7 @@ COMMON_DEPEND=" >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - <www-servers/apache-2.4[threads=] ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 diff --git a/dev-lang/php/php-7.2.22.ebuild b/dev-lang/php/php-7.2.22.ebuild index 7a2281bfaf8..89901d2eae4 100644 --- a/dev-lang/php/php-7.2.22.ebuild +++ b/dev-lang/php/php-7.2.22.ebuild @@ -47,8 +47,7 @@ COMMON_DEPEND=" >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - <www-servers/apache-2.4[threads=] ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 diff --git a/dev-lang/php/php-7.2.23.ebuild b/dev-lang/php/php-7.2.23.ebuild index 4156c8c952e..e2ba43e8033 100644 --- a/dev-lang/php/php-7.2.23.ebuild +++ b/dev-lang/php/php-7.2.23.ebuild @@ -47,8 +47,7 @@ COMMON_DEPEND=" >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - <www-servers/apache-2.4[threads=] ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 diff --git a/dev-lang/php/php-7.3.10.ebuild b/dev-lang/php/php-7.3.10.ebuild index eb9e3727c51..78a431dfe12 100644 --- a/dev-lang/php/php-7.3.10.ebuild +++ b/dev-lang/php/php-7.3.10.ebuild @@ -50,8 +50,7 @@ COMMON_DEPEND=" >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - <www-servers/apache-2.4[threads=] ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 diff --git a/dev-lang/php/php-7.3.8.ebuild b/dev-lang/php/php-7.3.8.ebuild index 315d2b5d013..9281a98c7f0 100644 --- a/dev-lang/php/php-7.3.8.ebuild +++ b/dev-lang/php/php-7.3.8.ebuild @@ -50,8 +50,7 @@ COMMON_DEPEND=" >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - <www-servers/apache-2.4[threads=] ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 diff --git a/dev-lang/php/php-7.3.9.ebuild b/dev-lang/php/php-7.3.9.ebuild index b382e3aec78..e9097d23973 100644 --- a/dev-lang/php/php-7.3.9.ebuild +++ b/dev-lang/php/php-7.3.9.ebuild @@ -50,8 +50,7 @@ COMMON_DEPEND=" >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - <www-servers/apache-2.4[threads=] ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1