gentoo auto-resync : 17:02:2023 - 08:06:58

4 files changed, 18 insertions, 208 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index d5e4b071740c..cff2812e8364 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,11 +1,9 @@
 AUX kicad-6.0.6-unitialized-variable-fix.patch 592 BLAKE2B b26757a1e9d4115616a721fdba7527cb72d489ae75976f9967f24cd12735b6f090a71bdb0c7d632d33ada0b3dc77f0d7f9370d02c34d83bd0afebb608621b85d SHA512 2f1e81132e87858f789833bd05fdda2309fc344c1535295c6308e3058bed85edbfd9900a0529e1489eb6f87bb27146a7dec2893a10d311c43b7117c00beba948
 AUX kicad-6.0.9-gcc-13.patch 1094 BLAKE2B 6b09be7cfcc6895fd6d744c8755959c501ce7dfab1a4759cd1999d2dd172273f36c4091554743109a1a52c8ea98896ee04795070eda943a24669e73e94319177 SHA512 fd2924c8f8faea50da3defaedd3d4b6f89654d18a108c07e5e38277d70397856e493e33601bc632ceca5a62981501f136bbbba0462a68b421db72d0aa9dd55e2
 AUX kicad-scripts-install-fix.patch 442 BLAKE2B 321ca8c5e846023696576daea00aa827ad88a4c3e82d120bd07392892b61d0e63892732f5469b1fe1472eac9584175acbc7aa611171f6fb9285017826156b30c SHA512 5abb158ec7e8a5ef8049797886e26febc018499dd7f5c8defdf9104b59371efa05cbec8e19e8fe22295e8e54c30095d347cccfa4c43db62b6ac4eb07bb8a080e
-DIST kicad-6.0.6.tar.gz 45086249 BLAKE2B fbf1f11cbf4838186e1ecb42127f7b182d3cd13b4af147211c85244d361cbf83387f5d102efdc80a63cfff36e343e6c4e07fef7f95dac4c6666844c5bc9d0ec2 SHA512 c472a6b81e3065e0499cad8467527d3531dc4d5861f50079ecb2ae6fccaf2c4d24fbeae8e9fe0cdde5ef548458fcef9615d6539426abe391a629dd539406065a
-DIST kicad-6.0.7.tar.gz 45143677 BLAKE2B 4ab9132be84cb6c6c566a826e5966f4fe64922dcd66f78c558126b37a276e075af80440da35071c864457298f6f964ba15511d0038424f473c3fb079d5f042e6 SHA512 0466650d166becbde23f1202e8bbe73ac7c743b5baad9608252fe4e960f0d15aad363664b69d840ef4568bf6d1c042b94252afce8657594a5f8193c979613e0e
 DIST kicad-6.0.9.tar.gz 45166663 BLAKE2B e4d45c589a8e76d7c121ac4ab7adefc5fd44d4ccbff7140196caec56c309f6e83d47a3ea9cf79f59de57c3bda43b3d32a2bea82c5850c2a7a58a6e1db27a06a7 SHA512 49e6bd3c9f6e0c9839c4fac18dc12dc7ef16183f6fbe8091992e2223c7fb085b3119d46797c0b0cf86fd2813e3c4def9eb1f2adbff1bf072a363f1a501da9354
-EBUILD kicad-6.0.6.ebuild 4366 BLAKE2B fa9ccb2ba0a81a5de7c112ae73ef4813b1e33d075f90c1c9347d1f09cdd7b816679da5faa4df8d2cbbbfb17a5595e3adc1cfda2dae62f780b4c6413629305307 SHA512 9ee659dc6d8eb0f2df19193dde25378c678d72124d5fd5953b44c8770a43b20474090ea0a4bbbfeccb2668484826cdb08f7da5f6fc4247bc159f6b4b074d25e9
-EBUILD kicad-6.0.7.ebuild 4374 BLAKE2B 8cdf7dcb17bcc2bc5d6ae231dfea4dc6b663a25e934d774e4946b52af4441ac4edbffcaed8477344cddc56b3171c8a1b35f5d8d27a711423136aaa767741abe7 SHA512 68fa214b4196598359e0457985c8dc5b0181aa7fc71f0a8b26ca8ab0e4da5b114a6bc55cd67b53d8f243fb4d215351ef21c651d593b7c7be471fbded24b50d61
+DIST kicad-7.0.0.tar.bz2 42583715 BLAKE2B 24fefe73bce6254bb47fdf21e8a82b7752e3f58cb3ea61220f0cf008c6570a4378f15bad54b81cc9257ec223bdb6128ccfd33f356e738b112c7b0e9481257255 SHA512 cb6f4cf6eee9a583d3a622bf8e48e5b604b047df0d742081cff1e5e387cf97cc1cd3f03fb58a17b44c47085634b95eea642bd1a6805e80807dbe0473c8d19d96
 EBUILD kicad-6.0.9.ebuild 4413 BLAKE2B 2662255dad5503f8ec38f76b748ed0427a831520873de5fa7add55c3e58a21bf84eddb6a7b8d57ff3fefd11279cb648d05f75545706542e39e27671be0e44c15 SHA512 716655029680428508e69c67b3edf8904c8a915ea595c91afda1054a51f0d8cbfa173d9b71384ab5518060bc54e51e5fa3f5427adf79b51ecfb63d0cb6c8a0df
-EBUILD kicad-9999.ebuild 4326 BLAKE2B 4d51f9b3335b6c467da37674f3ce1f210638ebd36622e75ee91b5fd68064cde1b01865cbe4eee3c675bf75b33fef9f85f8d08bb83d61161b6c69ee6c7558b3cd SHA512 dcc45f008991468763672db95c93e1e3068664cdb715eb7125cae78858410c4a9487892a0c9890395cca6be39e7030bd54d77f5c69d0a4746ecbbe9150e16628
+EBUILD kicad-7.0.0.ebuild 4182 BLAKE2B 68b66b2bd5be9dd790bf79c4ac43885d17dc7b9c8c29062700c249f65b77ba05c6b467d8d44d7812335180e91c1435797e5d17f043505e79340b9dbfd0d6d829 SHA512 7e85b31556b2a83b8f6642bbb78169f5494aeff2f316083aa01375d5507443fe1e432585d44728d1087b39c00673ffd273f9ca62b0ef9e720ad48fed5b6400e2
+EBUILD kicad-9999.ebuild 4182 BLAKE2B 68b66b2bd5be9dd790bf79c4ac43885d17dc7b9c8c29062700c249f65b77ba05c6b467d8d44d7812335180e91c1435797e5d17f043505e79340b9dbfd0d6d829 SHA512 7e85b31556b2a83b8f6642bbb78169f5494aeff2f316083aa01375d5507443fe1e432585d44728d1087b39c00673ffd273f9ca62b0ef9e720ad48fed5b6400e2
 MISC metadata.xml 922 BLAKE2B bfdb3ce1ee74c7b6f2da1a5fbe7835e2114af83b594edabab7b7674000462ee6963acee3bb1f384bed0b4a36b0529aebdab801fe3a482b23e742d9186e7684b2 SHA512 575659f3c5d0fc74469ff14f8abaf58776f1d0ffdd16b85e9f617d3e956d2d0c1c7f70aeebf02aa5c7afadcea0e0a589e6fb16f160b398482524fa7ce592ba4e
diff --git a/sci-electronics/kicad/kicad-6.0.6.ebuild b/sci-electronics/kicad/kicad-6.0.6.ebuild
deleted file mode 100644
index 1ae1e4138e06..000000000000
--- a/sci-electronics/kicad/kicad-6.0.6.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-WX_GTK_VER="3.0-gtk3"
-
-inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="https://www.kicad.org"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-	fi
-fi
-
-# BSD for bundled pybind
-LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
-SLOT="0"
-IUSE="doc examples ngspice nls openmp +occ +pcm"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Contains bundled pybind but it's patched for wx
-# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
-# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
-COMMON_DEPEND="
-	!sci-electronics/kicad-i18n
-	dev-libs/boost:=[context,nls]
-	media-libs/freeglut
-	media-libs/glew:0=
-	>=media-libs/glm-0.9.9.1
-	media-libs/mesa[X(+)]
-	>=x11-libs/cairo-1.8.8:=
-	>=x11-libs/pixman-0.30
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
-		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	ngspice? (
-		>sci-electronics/ngspice-27[shared]
-	)
-	nls? (
-		sys-devel/gettext
-	)
-	occ? (
-		>=sci-libs/opencascade-7.3.0:0=
-	)
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-BDEPEND=">=dev-lang/swig-3.0
-	doc? ( app-doc/doxygen )"
-
-if [[ ${PV} == 9999 ]] ; then
-	# x11-misc-util/macros only required on live ebuilds
-	BDEPEND+=" >=x11-misc/util-macros-1.18"
-fi
-
-CHECKREQS_DISK_BUILD="900M"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-scripts-install-fix.patch"
-	"${FILESDIR}/${P}-unitialized-variable-fix.patch"
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	python-single-r1_pkg_setup
-	setup-wxwidgets
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
-
-		-DKICAD_SCRIPTING_WXPYTHON=ON
-
-		# Merged from separate -i18n package, bug #830274
-		-DKICAD_BUILD_I18N="$(usex nls)"
-		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
-
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-
-		-DKICAD_SPICE="$(usex ngspice)"
-		-DKICAD_PCM="$(usex pcm)"
-
-		-DKICAD_USE_OCC="$(usex occ)"
-		-DKICAD_INSTALL_DEMOS="$(usex examples)"
-		-DCMAKE_SKIP_RPATH="ON"
-	)
-
-	use occ && mycmakeargs+=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile doxygen-docs
-	fi
-}
-
-src_test() {
-	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
-	ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
-
-	# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
-	LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-
-	if use doc ; then
-		dodoc uncrustify.cfg
-		cd Documentation || die
-		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/.
-	fi
-}
-
-pkg_postinst() {
-	optfeature "Component symbols library" sci-electronics/kicad-symbols
-	optfeature "Component footprints library" sci-electronics/kicad-footprints
-	optfeature "3D models of components " sci-electronics/kicad-packages3d
-	optfeature "Project templates" sci-electronics/kicad-templates
-	optfeature "Extended documentation" app-doc/kicad-doc
-	optfeature "Creating 3D models of components" media-gfx/wings
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/sci-electronics/kicad/kicad-6.0.7.ebuild b/sci-electronics/kicad/kicad-7.0.0.ebuild
index 482f0ade6d2d..96825330a19f 100644
--- a/sci-electronics/kicad/kicad-6.0.7.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_PV="${PV/_rc/-rc}"
 	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 
 	if [[ ${PV} != *_rc* ]] ; then
@@ -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 +occ +pcm"
+IUSE="doc examples +ngspice nls openmp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -36,15 +36,18 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
 # Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
 COMMON_DEPEND="
-	!sci-electronics/kicad-i18n
+	dev-db/unixODBC
 	dev-libs/boost:=[context,nls]
 	media-libs/freeglut
 	media-libs/glew:0=
 	>=media-libs/glm-0.9.9.1
 	media-libs/mesa[X(+)]
+	net-misc/curl
+	>=sci-libs/opencascade-7.3.0:0=
 	>=x11-libs/cairo-1.8.8:=
 	>=x11-libs/pixman-0.30
 	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	sys-libs/zlib
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
 		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
@@ -56,15 +59,12 @@ COMMON_DEPEND="
 	nls? (
 		sys-devel/gettext
 	)
-	occ? (
-		>=sci-libs/opencascade-7.3.0:0=
-	)
 "
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	sci-electronics/electronics-menu
 "
-BDEPEND=">=dev-lang/swig-3.0
+BDEPEND=">=dev-lang/swig-4.0
 	doc? ( app-doc/doxygen )"
 
 if [[ ${PV} == 9999 ]] ; then
@@ -74,11 +74,6 @@ fi
 
 CHECKREQS_DISK_BUILD="900M"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-scripts-install-fix.patch"
-	"${FILESDIR}/${PN}-6.0.6-unitialized-variable-fix.patch"
-)
-
 pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
@@ -103,7 +98,6 @@ src_configure() {
 
 		-DKICAD_SCRIPTING_WXPYTHON=ON
 
-		# Merged from separate -i18n package, bug #830274
 		-DKICAD_BUILD_I18N="$(usex nls)"
 		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
 
@@ -113,14 +107,10 @@ src_configure() {
 		-DPYTHON_LIBRARY="$(python_get_library_path)"
 
 		-DKICAD_SPICE="$(usex ngspice)"
-		-DKICAD_PCM="$(usex pcm)"
 
-		-DKICAD_USE_OCC="$(usex occ)"
 		-DKICAD_INSTALL_DEMOS="$(usex examples)"
 		-DCMAKE_SKIP_RPATH="ON"
-	)
 
-	use occ && mycmakeargs+=(
 		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
 		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
 	)
@@ -159,6 +149,7 @@ pkg_postinst() {
 	optfeature "Component footprints library" sci-electronics/kicad-footprints
 	optfeature "3D models of components " sci-electronics/kicad-packages3d
 	optfeature "Project templates" sci-electronics/kicad-templates
+	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
 	optfeature "Extended documentation" app-doc/kicad-doc
 	optfeature "Creating 3D models of components" media-gfx/wings
 
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index f7c3c3e7254d..96825330a19f 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_PV="${PV/_rc/-rc}"
 	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 
 	if [[ ${PV} != *_rc* ]] ; then
@@ -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 +occ +pcm"
+IUSE="doc examples +ngspice nls openmp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -36,15 +36,18 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
 # Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
 COMMON_DEPEND="
-	!sci-electronics/kicad-i18n
+	dev-db/unixODBC
 	dev-libs/boost:=[context,nls]
 	media-libs/freeglut
 	media-libs/glew:0=
 	>=media-libs/glm-0.9.9.1
 	media-libs/mesa[X(+)]
+	net-misc/curl
+	>=sci-libs/opencascade-7.3.0:0=
 	>=x11-libs/cairo-1.8.8:=
 	>=x11-libs/pixman-0.30
 	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	sys-libs/zlib
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
 		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
@@ -56,15 +59,12 @@ COMMON_DEPEND="
 	nls? (
 		sys-devel/gettext
 	)
-	occ? (
-		>=sci-libs/opencascade-7.3.0:0=
-	)
 "
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	sci-electronics/electronics-menu
 "
-BDEPEND=">=dev-lang/swig-3.0
+BDEPEND=">=dev-lang/swig-4.0
 	doc? ( app-doc/doxygen )"
 
 if [[ ${PV} == 9999 ]] ; then
@@ -98,7 +98,6 @@ src_configure() {
 
 		-DKICAD_SCRIPTING_WXPYTHON=ON
 
-		# Merged from separate -i18n package, bug #830274
 		-DKICAD_BUILD_I18N="$(usex nls)"
 		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
 
@@ -108,14 +107,10 @@ src_configure() {
 		-DPYTHON_LIBRARY="$(python_get_library_path)"
 
 		-DKICAD_SPICE="$(usex ngspice)"
-		-DKICAD_PCM="$(usex pcm)"
 
-		-DKICAD_USE_OCC="$(usex occ)"
 		-DKICAD_INSTALL_DEMOS="$(usex examples)"
 		-DCMAKE_SKIP_RPATH="ON"
-	)
 
-	use occ && mycmakeargs+=(
 		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
 		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
 	)