From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 D24591382C5 for ; Sat, 13 Feb 2021 13:02:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 168F8E08A8; Sat, 13 Feb 2021 13:02:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 F4171E08A8 for ; Sat, 13 Feb 2021 13:02:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 97388340EFF for ; Sat, 13 Feb 2021 13:02:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E1F3546B for ; Sat, 13 Feb 2021 13:02:19 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1613221300.ab44f9d8955887d4504d7bc8d437929135368ed8.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/tt-rss/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apps/tt-rss/tt-rss-20200922.ebuild www-apps/tt-rss/tt-rss-99999999.ebuild X-VCS-Directories: www-apps/tt-rss/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: ab44f9d8955887d4504d7bc8d437929135368ed8 X-VCS-Branch: master Date: Sat, 13 Feb 2021 13:02:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 62508d1d-6e29-41a4-a88a-9f18586d0a8f X-Archives-Hash: 9f95f374b5793ad7141636ee8f099352 commit: ab44f9d8955887d4504d7bc8d437929135368ed8 Author: James Le Cuirot gentoo org> AuthorDate: Sat Feb 13 13:01:40 2021 +0000 Commit: James Le Cuirot gentoo 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 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="