Skip to content

Commit

Permalink
dev-lang/php: Convert apache dependency to work on all versions
Browse files Browse the repository at this point in the history 
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 <[email protected]>
  • Loading branch information
Brian Evans committed Oct 4, 2019
1 parent c000558 commit 6df2501
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 18 deletions.
3 changes: 1 addition & 2 deletions dev-lang/php/php-5.6.40-r6.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions dev-lang/php/php-7.1.31.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions dev-lang/php/php-7.1.32.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions dev-lang/php/php-7.2.21.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions dev-lang/php/php-7.2.22.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions dev-lang/php/php-7.2.23.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions dev-lang/php/php-7.3.10.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions dev-lang/php/php-7.3.8.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions dev-lang/php/php-7.3.9.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6df2501

Please sign in to comment.