From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1544415-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 9F50215800A
for <garchives@archives.gentoo.org>; Wed, 9 Aug 2023 05:11:27 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DC21D2BC019;
Wed, 9 Aug 2023 05:11:26 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C37BE2BC019
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Aug 2023 05:11:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 05CBF33BF36
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Aug 2023 05:11:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C95AEF9
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Aug 2023 05:11:24 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1691557870.690c2ea6683607554f187b8c8841b2c67a03b4ab.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-electronics/kicad/kicad-7.0.6-r1.ebuild sci-electronics/kicad/kicad-7.0.6.ebuild sci-electronics/kicad/kicad-9999.ebuild
X-VCS-Directories: sci-electronics/kicad/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 690c2ea6683607554f187b8c8841b2c67a03b4ab
X-VCS-Branch: master
Date: Wed, 9 Aug 2023 05:11:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: bf865603-ed3f-449b-89cf-fb37dddd7151
X-Archives-Hash: 7496e42f082fe3e1f5ff520be8948dec
commit: 690c2ea6683607554f187b8c8841b2c67a03b4ab
Author: Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Wed Jul 26 15:05:18 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 9 05:11:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=690c2ea6
sci-electronics/kicad: Make spice simulator mandatory
Upstream has dropped conditional build of ngspice since apparently KiCad
does not function well without it anyway. While 7.0.6 still has the flag
let's not allow turning it off to prevent issues for the users.
Closes: https://bugs.gentoo.org/910550
Signed-off-by: Zoltan Puskas <zoltan <AT> sinustrom.info>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../kicad/{kicad-7.0.6.ebuild => kicad-7.0.6-r1.ebuild} | 8 ++------
sci-electronics/kicad/kicad-9999.ebuild | 8 ++------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/sci-electronics/kicad/kicad-7.0.6.ebuild b/sci-electronics/kicad/kicad-7.0.6-r1.ebuild
similarity index 96%
rename from sci-electronics/kicad/kicad-7.0.6.ebuild
rename to sci-electronics/kicad/kicad-7.0.6-r1.ebuild
index c63f7a8ec2cf..7cfafda8dab1 100644
--- a/sci-electronics/kicad/kicad-7.0.6.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.6-r1.ebuild
@@ -28,7 +28,7 @@ fi
# BSD for bundled pybind
LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
SLOT="0"
-IUSE="doc examples +ngspice nls openmp"
+IUSE="doc examples nls openmp"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -47,15 +47,13 @@ COMMON_DEPEND="
>=x11-libs/cairo-1.8.8:=
>=x11-libs/pixman-0.30
x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+ >sci-electronics/ngspice-27[shared]
sys-libs/zlib
$(python_gen_cond_dep '
dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
~dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
')
${PYTHON_DEPS}
- ngspice? (
- >sci-electronics/ngspice-27[shared]
- )
nls? (
sys-devel/gettext
)
@@ -111,8 +109,6 @@ src_configure() {
-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-DPYTHON_LIBRARY="$(python_get_library_path)"
- -DKICAD_SPICE="$(usex ngspice)"
-
-DKICAD_INSTALL_DEMOS="$(usex examples)"
-DCMAKE_SKIP_RPATH="ON"
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index c63f7a8ec2cf..7cfafda8dab1 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -28,7 +28,7 @@ fi
# BSD for bundled pybind
LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
SLOT="0"
-IUSE="doc examples +ngspice nls openmp"
+IUSE="doc examples nls openmp"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -47,15 +47,13 @@ COMMON_DEPEND="
>=x11-libs/cairo-1.8.8:=
>=x11-libs/pixman-0.30
x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+ >sci-electronics/ngspice-27[shared]
sys-libs/zlib
$(python_gen_cond_dep '
dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
~dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
')
${PYTHON_DEPS}
- ngspice? (
- >sci-electronics/ngspice-27[shared]
- )
nls? (
sys-devel/gettext
)
@@ -111,8 +109,6 @@ src_configure() {
-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-DPYTHON_LIBRARY="$(python_get_library_path)"
- -DKICAD_SPICE="$(usex ngspice)"
-
-DKICAD_INSTALL_DEMOS="$(usex examples)"
-DCMAKE_SKIP_RPATH="ON"