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@gentoo.org>

diff --git a/dev-lang/php/php-5.6.40-r6.ebuild b/dev-lang/php/php-5.6.40-r6.ebuild
index 9a3ebaa2a5f10901e225ee6527bc28daab83e3c0..8f5ff1a11f22d5729b77519cfcb617acca42dc75 100644 (file)
--- 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 139472d572c74dfc1c3e8b811a2351ddd1ca48d5..896a587ccae2c5368361ac9dbefca3ec445ec792 100644 (file)
--- 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 592ae19fd67b054fac4946357ed04e19599190c4..915a7b433209eafe4d92ae8b6ce7504cef88f36e 100644 (file)
--- 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 f659c39ce48ce9363649aabce4a0177356ed8eaa..bb2a85f0ab1a5fd28a47c760f256b95a83c9bb40 100644 (file)
--- 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 7a2281bfaf82d260754bafdd5c2012734b2cdefd..89901d2eae4a0244a9a972c1bc633958493dd407 100644 (file)
--- 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 4156c8c952e9738e17fe0169468b7946ac2f7a22..e2ba43e80334c66be3693b6a00def578e9d59d14 100644 (file)
--- 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 eb9e3727c510833f0d3fbe01cb839640e3e05f33..78a431dfe122bcc726f53588407e2196b9414f55 100644 (file)
--- 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 315d2b5d013ce4623d1ae9a220fd74c056428824..9281a98c7f043958a8f79701dd24486337d482bc 100644 (file)
--- 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 b382e3aec78ed8a87fc0066933e70469e64e1cc3..e9097d23973189923ef2955c5925948da09dc230 100644 (file)
--- 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