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 E8072138359 for ; Wed, 14 Oct 2020 16:30:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34F3EE0824; Wed, 14 Oct 2020 16:30:51 +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 F3A41E0824 for ; Wed, 14 Oct 2020 16:30:50 +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 1B3D0340D31 for ; Wed, 14 Oct 2020 16:30:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8346C26 for ; Wed, 14 Oct 2020 16:30:47 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1602692986.275b68b10c5ea92d4f6550e58db829b252c5766d.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/phpmyadmin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/phpmyadmin/phpmyadmin-4.9.5.ebuild dev-db/phpmyadmin/phpmyadmin-4.9.6.ebuild dev-db/phpmyadmin/phpmyadmin-5.0.3.ebuild X-VCS-Directories: dev-db/phpmyadmin/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 275b68b10c5ea92d4f6550e58db829b252c5766d X-VCS-Branch: master Date: Wed, 14 Oct 2020 16:30:47 +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: e017a8fc-bac2-465f-af04-9d988cd9932e X-Archives-Hash: dfcae3976373a23c01898f7f8e338485 commit: 275b68b10c5ea92d4f6550e58db829b252c5766d Author: Brian Evans gentoo org> AuthorDate: Wed Oct 14 16:29:46 2020 +0000 Commit: Brian Evans gentoo org> CommitDate: Wed Oct 14 16:29:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=275b68b1 dev-db/phpmyadmin: Set json USE on if missing for dev-lang/php The USE is going away with 8.0 Signed-off-by: Brian Evans gentoo.org> dev-db/phpmyadmin/phpmyadmin-4.9.5.ebuild | 2 +- dev-db/phpmyadmin/phpmyadmin-4.9.6.ebuild | 2 +- dev-db/phpmyadmin/phpmyadmin-5.0.3.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-db/phpmyadmin/phpmyadmin-4.9.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.9.5.ebuild index c8b5d687674..4f82904cb1f 100644 --- a/dev-db/phpmyadmin/phpmyadmin-4.9.5.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-4.9.5.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-maco IUSE="setup" RDEPEND=" - dev-lang/php[ctype,filter,json,session,unicode] + dev-lang/php[ctype,filter,json(+),session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] diff --git a/dev-db/phpmyadmin/phpmyadmin-4.9.6.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.9.6.ebuild index b44663d5751..6f76083ee36 100644 --- a/dev-db/phpmyadmin/phpmyadmin-4.9.6.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-4.9.6.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64 IUSE="setup" RDEPEND=" - dev-lang/php[ctype,filter,json,session,unicode] + dev-lang/php[ctype,filter,json(+),session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] diff --git a/dev-db/phpmyadmin/phpmyadmin-5.0.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-5.0.3.ebuild index bcfb741fefe..89a5402f59f 100644 --- a/dev-db/phpmyadmin/phpmyadmin-5.0.3.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-5.0.3.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64 IUSE="setup" RDEPEND=" - >=dev-lang/php-7.1[ctype,filter,json,session,unicode] + >=dev-lang/php-7.1[ctype,filter,json(+),session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql]