[gentoo-commits] repo/gentoo:master commit in: www-apps/tt-rss/

[James Le Cuirot]

commit:     ab44f9d8955887d4504d7bc8d437929135368ed8
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 13:01:40 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 13:01:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab44f9d8

www-apps/tt-rss: PHP 8 is not supported yet

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 www-apps/tt-rss/tt-rss-20200922.ebuild | 23 ++++++++++++++++++-----
 www-apps/tt-rss/tt-rss-99999999.ebuild | 23 ++++++++++++++++++-----
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/www-apps/tt-rss/tt-rss-20200922.ebuild 
b/www-apps/tt-rss/tt-rss-20200922.ebuild
index 1c58510d1d9..09db5c1f148 100644
--- a/www-apps/tt-rss/tt-rss-20200922.ebuild
+++ b/www-apps/tt-rss/tt-rss-20200922.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,21 @@ LICENSE="GPL-3"
 KEYWORDS="~amd64 ~arm ~mips ~x86"
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
-PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json,pdo,unicode,xml"
+
+PHP_SLOTS="7.4 7.3 7.2"
+PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
+
+php_rdepend() {
+       local slot
+       echo "|| ("
+       for slot in ${PHP_SLOTS}; do
+               echo "(
+                       virtual/httpd-php:${slot}
+                       dev-lang/php:${slot}[$1]
+               )"
+       done
+       echo ")"
+}
 
 DEPEND="
        daemon? ( acl? ( sys-apps/acl ) )
@@ -23,12 +37,11 @@ RDEPEND="
        daemon? (
                acct-user/ttrssd
                acct-group/ttrssd
-               dev-lang/php:*[${PHP_USE},cli,pcntl]
+               $(php_rdepend "${PHP_USE},cli,pcntl")
        )
        !daemon? (
-               dev-lang/php:*[${PHP_USE}]
+               $(php_rdepend "${PHP_USE}")
        )
-       virtual/httpd-php:*
 "
 
 DEPEND="

diff --git a/www-apps/tt-rss/tt-rss-99999999.ebuild 
b/www-apps/tt-rss/tt-rss-99999999.ebuild
index 9a62a5c6ac7..c543f510ec9 100644
--- a/www-apps/tt-rss/tt-rss-99999999.ebuild
+++ b/www-apps/tt-rss/tt-rss-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,21 @@ LICENSE="GPL-3"
 SLOT="${PV}" # Single live slot.
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
-PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json,pdo,unicode,xml"
+
+PHP_SLOTS="7.4 7.3 7.2"
+PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
+
+php_rdepend() {
+       local slot
+       echo "|| ("
+       for slot in ${PHP_SLOTS}; do
+               echo "(
+                       virtual/httpd-php:${slot}
+                       dev-lang/php:${slot}[$1]
+               )"
+       done
+       echo ")"
+}
 
 DEPEND="
        daemon? ( acl? ( sys-apps/acl ) )
@@ -23,12 +37,11 @@ RDEPEND="
        daemon? (
                acct-user/ttrssd
                acct-group/ttrssd
-               dev-lang/php:*[${PHP_USE},cli,pcntl]
+               $(php_rdepend "${PHP_USE},cli,pcntl")
        )
        !daemon? (
-               dev-lang/php:*[${PHP_USE}]
+               $(php_rdepend "${PHP_USE}")
        )
-       virtual/httpd-php:*
 "
 
 DEPEND="