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
