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 5E3B0138350 for ; Sun, 9 Feb 2020 16:36:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0371BE088C; Sun, 9 Feb 2020 16:36:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 D24FFE088C for ; Sun, 9 Feb 2020 16:36:36 +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 4349C34E893 for ; Sun, 9 Feb 2020 16:36:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 751AA133 for ; Sun, 9 Feb 2020 16:36:32 +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: <1581266123.a1b617de69c4c48480f336dd450665e01e12e4d7.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/kicad/kicad-4.0.7-r1.ebuild sci-electronics/kicad/kicad-4.0.7.ebuild sci-electronics/kicad/kicad-5.0.1.ebuild sci-electronics/kicad/kicad-5.1.0-r1.ebuild sci-electronics/kicad/kicad-5.1.2-r1.ebuild sci-electronics/kicad/kicad-5.1.4.ebuild sci-electronics/kicad/kicad-5.1.5-r1.ebuild sci-electronics/kicad/kicad-5.1.5.ebuild X-VCS-Directories: sci-electronics/kicad/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a1b617de69c4c48480f336dd450665e01e12e4d7 X-VCS-Branch: master Date: Sun, 9 Feb 2020 16:36:32 +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: 8fee4eb8-fe67-4ba1-b59c-cd04ced115ec X-Archives-Hash: b88b507bb3619db6feb30a1f5ebb87be commit: a1b617de69c4c48480f336dd450665e01e12e4d7 Author: Michał Górny gentoo org> AuthorDate: Fri Feb 7 18:59:18 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 16:35:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b617de sci-electronics/kicad: Switch to PYTHON_MULTI_USEDEP API Signed-off-by: Michał Górny gentoo.org> .../kicad/{kicad-4.0.7.ebuild => kicad-4.0.7-r1.ebuild} | 14 ++++++++------ sci-electronics/kicad/kicad-5.0.1.ebuild | 14 ++++++++------ sci-electronics/kicad/kicad-5.1.0-r1.ebuild | 14 ++++++++------ sci-electronics/kicad/kicad-5.1.2-r1.ebuild | 12 +++++++----- sci-electronics/kicad/kicad-5.1.4.ebuild | 12 +++++++----- .../kicad/{kicad-5.1.5.ebuild => kicad-5.1.5-r1.ebuild} | 7 +++++-- 6 files changed, 43 insertions(+), 30 deletions(-) diff --git a/sci-electronics/kicad/kicad-4.0.7.ebuild b/sci-electronics/kicad/kicad-4.0.7-r1.ebuild similarity index 96% rename from sci-electronics/kicad/kicad-4.0.7.ebuild rename to sci-electronics/kicad/kicad-4.0.7-r1.ebuild index 624172e8994..a85b949bc42 100644 --- a/sci-electronics/kicad/kicad-4.0.7.ebuild +++ b/sci-electronics/kicad/kicad-4.0.7-r1.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=6 @@ -33,11 +33,13 @@ REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} )" COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl] - python? ( - dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - >=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}] + $(python_gen_cond_dep " + python? ( + dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}] + ${PYTHON_DEPS} + ) + >=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}] + ") github? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) diff --git a/sci-electronics/kicad/kicad-5.0.1.ebuild b/sci-electronics/kicad/kicad-5.0.1.ebuild index a9f2e30229b..cb1d50631ac 100644 --- a/sci-electronics/kicad/kicad-5.0.1.ebuild +++ b/sci-electronics/kicad/kicad-5.0.1.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=6 @@ -23,11 +23,13 @@ REQUIRED_USE=" " COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl] - python? ( - dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - >=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}] + $(python_gen_cond_dep " + python? ( + dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}] + ${PYTHON_DEPS} + ) + >=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}] + ") github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm diff --git a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild index 6646e63fac8..8c93a13852a 100644 --- a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild +++ b/sci-electronics/kicad/kicad-5.1.0-r1.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 # Can switch to EAPI=7 when wxwidgets eclass also supports it @@ -24,11 +24,13 @@ REQUIRED_USE=" " COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl] - python? ( - dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - >=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}] + $(python_gen_cond_dep " + python? ( + dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}] + ${PYTHON_DEPS} + ) + >=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}] + ") github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm diff --git a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild index eaf36e9596e..377f42f962a 100644 --- a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild +++ b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild @@ -24,11 +24,13 @@ REQUIRED_USE=" " COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - python? ( - dev-python/wxpython:4.0[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - >=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}] + $(python_gen_cond_dep " + python? ( + dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}] + ${PYTHON_DEPS} + ) + >=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}] + ") github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm diff --git a/sci-electronics/kicad/kicad-5.1.4.ebuild b/sci-electronics/kicad/kicad-5.1.4.ebuild index b442e402be3..68c690312a8 100644 --- a/sci-electronics/kicad/kicad-5.1.4.ebuild +++ b/sci-electronics/kicad/kicad-5.1.4.ebuild @@ -24,11 +24,13 @@ REQUIRED_USE=" " COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - python? ( - dev-python/wxpython:4.0[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - >=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}] + $(python_gen_cond_dep " + python? ( + dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}] + ${PYTHON_DEPS} + ) + >=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}] + ") github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= >=media-libs/glm-0.9.9.1 diff --git a/sci-electronics/kicad/kicad-5.1.5.ebuild b/sci-electronics/kicad/kicad-5.1.5-r1.ebuild similarity index 94% rename from sci-electronics/kicad/kicad-5.1.5.ebuild rename to sci-electronics/kicad/kicad-5.1.5-r1.ebuild index 46baaff613c..af08ef9e488 100644 --- a/sci-electronics/kicad/kicad-5.1.5.ebuild +++ b/sci-electronics/kicad/kicad-5.1.5-r1.ebuild @@ -24,7 +24,7 @@ REQUIRED_USE=" " COMMON_DEPEND=" - >=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}] + >=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 @@ -39,7 +39,10 @@ COMMON_DEPEND=" occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( - dev-python/wxpython:4.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-libs/boost-1.61:=[context,nls,threads,python,${PYTHON_MULTI_USEDEP}] + dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}] + ') ${PYTHON_DEPS} ) "