[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/

["Sam James" <sam@gentoo.org>]

commit:     a5f3816845e8b29538dae8d4aee7e2e20a04a34d
Author:     Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Tue Jan 18 04:01:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 19:10:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f38168

sci-electronics/kicad: Bump to 6.0.1

Also move to EAPI8, add "nls" USE flag to allow for toggling
translations, change -DKICAD_DOCS to point to Gentoo's versioned
documentation path to fix documentation menu, and clean up some left
over variables

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Zoltan Puskas <zoltan <AT> sinustrom.info>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-electronics/kicad/Manifest                           |  1 +
 .../kicad/{kicad-9999.ebuild => kicad-6.0.1.ebuild}      | 16 +++++++++-------
 sci-electronics/kicad/kicad-9999.ebuild                  | 14 ++++++++------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index d38b7350d368..62fda8577ed1 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,2 +1,3 @@
 DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
 DIST kicad-6.0.0.tar.gz 45037889 BLAKE2B 4ea4075cd8e860ed19ee051be3567400c57f8c1b51550d2da80525ef65cc0b6c0951bac8c306c4fc19bddd824e2b727f416817ea4006a67f949dbf70df673a37 SHA512 1cadf59cfa85c5bbeb86f968ced896eff16c330e498497bf58826a58a59dfb83989422d660f7230d7921eeeda709d1ff10b50d4f842a36e50d44bf9017360b50
+DIST kicad-6.0.1.tar.gz 44971453 BLAKE2B e9fcaf367efb544197fb2ce448b0d808bb79f166e73e5c6f4c7c0ef303ee1bed5697101883ad4945aea8a1a1cd3b868832ea1ebfb727dfc8bdf56ce4d177838e SHA512 a257c69e0515c6d0c709bb59f632daff6e1e2108e1b1d4553d0cde397d551c3bfd969471dc63efdb12d57202842e1f645026650e2a7ca2c8af8b7150ceaebb3d

diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-6.0.1.ebuild
similarity index 93%
copy from sci-electronics/kicad/kicad-9999.ebuild
copy to sci-electronics/kicad/kicad-6.0.1.ebuild
index ff3a92646a7e..4efd1ddc6a91 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9} )
 WX_GTK_VER="3.0-gtk3"
@@ -28,7 +28,7 @@ fi
 # BSD for bundled pybind
 LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
 SLOT="0"
-IUSE="doc examples +ngspice openmp +occ +pcm"
+IUSE="doc examples +ngspice nls openmp +occ +pcm"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -52,6 +52,9 @@ COMMON_DEPEND="
 	ngspice? (
 		>sci-electronics/ngspice-27[shared]
 	)
+	nls? (
+		sys-devel/gettext
+	)
 	occ? (
 		>=sci-libs/opencascade-7.3.0:=
 	)
@@ -68,8 +71,7 @@ if [[ ${PV} == 9999 ]] ; then
 	BDEPEND+=" >=x11-misc/util-macros-1.18"
 fi
 
-CHECKREQS_DISK_BUILD="800M"
-CAS_VERSION=7.5.3
+CHECKREQS_DISK_BUILD="900M"
 
 pkg_setup() {
 	use openmp && tc-check-openmp
@@ -91,13 +93,13 @@ src_configure() {
 	xdg_environment_reset
 
 	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
 
 		-DKICAD_SCRIPTING_WXPYTHON=ON
 
 		# Merged from separate -i18n package, bug #830274
-		-DKICAD_BUILD_I18N=ON
-		-DKICAD_I18N_UNIX_STRICT_PATH=ON
+		-DKICAD_BUILD_I18N="$(usex nls)"
+		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
 
 		-DPYTHON_DEST="$(python_get_sitedir)"
 		-DPYTHON_EXECUTABLE="${PYTHON}"

diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index ff3a92646a7e..129d19372060 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9} )
 WX_GTK_VER="3.0-gtk3"
@@ -28,7 +28,7 @@ fi
 # BSD for bundled pybind
 LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
 SLOT="0"
-IUSE="doc examples +ngspice openmp +occ +pcm"
+IUSE="doc examples +ngspice nls openmp +occ +pcm"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -52,6 +52,9 @@ COMMON_DEPEND="
 	ngspice? (
 		>sci-electronics/ngspice-27[shared]
 	)
+	nls? (
+		sys-devel/gettext
+	)
 	occ? (
 		>=sci-libs/opencascade-7.3.0:=
 	)
@@ -68,8 +71,7 @@ if [[ ${PV} == 9999 ]] ; then
 	BDEPEND+=" >=x11-misc/util-macros-1.18"
 fi
 
-CHECKREQS_DISK_BUILD="800M"
-CAS_VERSION=7.5.3
+CHECKREQS_DISK_BUILD="900M"
 
 pkg_setup() {
 	use openmp && tc-check-openmp
@@ -96,8 +98,8 @@ src_configure() {
 		-DKICAD_SCRIPTING_WXPYTHON=ON
 
 		# Merged from separate -i18n package, bug #830274
-		-DKICAD_BUILD_I18N=ON
-		-DKICAD_I18N_UNIX_STRICT_PATH=ON
+		-DKICAD_BUILD_I18N="$(usex nls)"
+		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
 
 		-DPYTHON_DEST="$(python_get_sitedir)"
 		-DPYTHON_EXECUTABLE="${PYTHON}"