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 57867138351 for ; Fri, 21 Feb 2020 15:08:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86351E0935; Fri, 21 Feb 2020 15:08:29 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 60820E0935 for ; Fri, 21 Feb 2020 15:08:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 E8AD134EEF8 for ; Fri, 21 Feb 2020 15:08:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FD36132 for ; Fri, 21 Feb 2020 15:08:25 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1582297698.44b41f4bb8ef2afe864b4ea19e2d0433b4050ae2.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/netdata/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/netdata/netdata-1.20.0.ebuild net-analyzer/netdata/netdata-9999.ebuild X-VCS-Directories: net-analyzer/netdata/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: 44b41f4bb8ef2afe864b4ea19e2d0433b4050ae2 X-VCS-Branch: master Date: Fri, 21 Feb 2020 15:08:25 +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: b378955a-a5a6-43aa-98eb-1f5ed4047237 X-Archives-Hash: 1b3b307cd2dde05b405a027939fe831f commit: 44b41f4bb8ef2afe864b4ea19e2d0433b4050ae2 Author: Craig Andrews gentoo org> AuthorDate: Fri Feb 21 15:07:27 2020 +0000 Commit: Craig Andrews gentoo org> CommitDate: Fri Feb 21 15:08:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b41f4b net-analyzer/netdata: Use python-single-r1 instead of python-r1 Closes: https://bugs.gentoo.org/710242 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Craig Andrews gentoo.org> net-analyzer/netdata/netdata-1.20.0.ebuild | 13 +++++++------ net-analyzer/netdata/netdata-9999.ebuild | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/net-analyzer/netdata/netdata-1.20.0.ebuild b/net-analyzer/netdata/netdata-1.20.0.ebuild index 2e1eb0f4a27..38d285c386e 100644 --- a/net-analyzer/netdata/netdata-1.20.0.ebuild +++ b/net-analyzer/netdata/netdata-1.20.0.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python{3_6,3_7} ) -inherit autotools fcaps linux-info python-r1 systemd +inherit autotools fcaps linux-info python-single-r1 systemd if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/netdata/${PN}.git" @@ -63,15 +63,15 @@ RDEPEND=" ) python? ( ${PYTHON_DEPS} - dev-python/pyyaml[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]') mysql? ( || ( - dev-python/mysqlclient[${PYTHON_USEDEP}] - dev-python/mysql-python[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') + $(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]') ) ) - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - tor? ( net-libs/stem[${PYTHON_USEDEP}] ) + postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') ) + tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') ) ) xen? ( app-emulation/xen-tools @@ -85,6 +85,7 @@ FILECAPS=( ) pkg_setup() { + use python && python-single-r1_pkg_setup linux-info_pkg_setup } diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild index 2e1eb0f4a27..38d285c386e 100644 --- a/net-analyzer/netdata/netdata-9999.ebuild +++ b/net-analyzer/netdata/netdata-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python{3_6,3_7} ) -inherit autotools fcaps linux-info python-r1 systemd +inherit autotools fcaps linux-info python-single-r1 systemd if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/netdata/${PN}.git" @@ -63,15 +63,15 @@ RDEPEND=" ) python? ( ${PYTHON_DEPS} - dev-python/pyyaml[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]') mysql? ( || ( - dev-python/mysqlclient[${PYTHON_USEDEP}] - dev-python/mysql-python[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') + $(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]') ) ) - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - tor? ( net-libs/stem[${PYTHON_USEDEP}] ) + postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') ) + tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') ) ) xen? ( app-emulation/xen-tools @@ -85,6 +85,7 @@ FILECAPS=( ) pkg_setup() { + use python && python-single-r1_pkg_setup linux-info_pkg_setup }