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 D6F37138350 for ; Sun, 9 Feb 2020 16:34:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4E8AE089E; Sun, 9 Feb 2020 16:34:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 C10E1E089E for ; Sun, 9 Feb 2020 16:34:43 +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 9E35A34E47E for ; Sun, 9 Feb 2020 16:34:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18ADE14B for ; Sun, 9 Feb 2020 16:34:39 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1581266070.9d34496cb2ed2d805f5a7ec75b1cac17fbf92d75.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/kismet/kismet-2019.09.1-r1.ebuild net-wireless/kismet/kismet-2019.09.1-r2.ebuild net-wireless/kismet/kismet-2019.12.2-r1.ebuild net-wireless/kismet/kismet-2019.12.2.ebuild net-wireless/kismet/kismet-9999.ebuild X-VCS-Directories: net-wireless/kismet/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 9d34496cb2ed2d805f5a7ec75b1cac17fbf92d75 X-VCS-Branch: master Date: Sun, 9 Feb 2020 16:34:39 +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: 45931093-cb15-4543-a1ba-9d3493e904bb X-Archives-Hash: 2166ab9051e02648780ae7e6685dedda commit: 9d34496cb2ed2d805f5a7ec75b1cac17fbf92d75 Author: Michał Górny gentoo org> AuthorDate: Fri Feb 7 17:47:22 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 16:34:30 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d34496c net-wireless/kismet: Switch to PYTHON_MULTI_USEDEP API Signed-off-by: Michał Górny gentoo.org> ...t-2019.09.1-r1.ebuild => kismet-2019.09.1-r2.ebuild} | 10 +++++++--- ...smet-2019.12.2.ebuild => kismet-2019.12.2-r1.ebuild} | 17 +++++++++++++---- net-wireless/kismet/kismet-9999.ebuild | 17 +++++++++++++---- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/net-wireless/kismet/kismet-2019.09.1-r1.ebuild b/net-wireless/kismet/kismet-2019.09.1-r2.ebuild similarity index 95% rename from net-wireless/kismet/kismet-2019.09.1-r1.ebuild rename to net-wireless/kismet/kismet-2019.09.1-r2.ebuild index 01ac8b25a82..178c532ebfb 100644 --- a/net-wireless/kismet/kismet-2019.09.1-r1.ebuild +++ b/net-wireless/kismet/kismet-2019.09.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -51,7 +51,9 @@ CDEPEND=" mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= - dev-python/protobuf-python[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] + ') sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) @@ -63,7 +65,9 @@ DEPEND="${CDEPEND} " RDEPEND="${CDEPEND} - dev-python/pyserial[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pyserial[${PYTHON_MULTI_USEDEP}] + ') selinux? ( sec-policy/selinux-kismet ) " diff --git a/net-wireless/kismet/kismet-2019.12.2.ebuild b/net-wireless/kismet/kismet-2019.12.2-r1.ebuild similarity index 94% rename from net-wireless/kismet/kismet-2019.12.2.ebuild rename to net-wireless/kismet/kismet-2019.12.2-r1.ebuild index 2a02da5e424..73b8a86810b 100644 --- a/net-wireless/kismet/kismet-2019.12.2.ebuild +++ b/net-wireless/kismet/kismet-2019.12.2-r1.ebuild @@ -51,7 +51,9 @@ CDEPEND=" libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= - dev-python/protobuf-python[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] + ') sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) @@ -64,11 +66,18 @@ DEPEND="${CDEPEND} " RDEPEND="${CDEPEND} - dev-python/pyserial[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pyserial[${PYTHON_MULTI_USEDEP}] + ') selinux? ( sec-policy/selinux-kismet ) " -PDEPEND="rtlsdr? ( dev-python/numpy[${PYTHON_USEDEP}] - net-wireless/rtl-sdr )" +PDEPEND=" + rtlsdr? ( + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ') + net-wireless/rtl-sdr + )" src_prepare() { sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \ diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild index 2a02da5e424..73b8a86810b 100644 --- a/net-wireless/kismet/kismet-9999.ebuild +++ b/net-wireless/kismet/kismet-9999.ebuild @@ -51,7 +51,9 @@ CDEPEND=" libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= - dev-python/protobuf-python[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] + ') sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) @@ -64,11 +66,18 @@ DEPEND="${CDEPEND} " RDEPEND="${CDEPEND} - dev-python/pyserial[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pyserial[${PYTHON_MULTI_USEDEP}] + ') selinux? ( sec-policy/selinux-kismet ) " -PDEPEND="rtlsdr? ( dev-python/numpy[${PYTHON_USEDEP}] - net-wireless/rtl-sdr )" +PDEPEND=" + rtlsdr? ( + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ') + net-wireless/rtl-sdr + )" src_prepare() { sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \