gentoo auto-resync : 28:02:2024 - 17:40:54

4 files changed, 183 insertions, 8 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 319850d43516..56292eff9896 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -3,9 +3,11 @@ DIST kicad-7.0.10.tar.bz2 43991960 BLAKE2B 3e21f575e41a6036ff2a9c3ab17472e51c736
 DIST kicad-7.0.7.tar.bz2 44055973 BLAKE2B 4169e111b8d2086572aa2979f09a8119dbc9caf34790ec5e5f3e0972d0a2e93dab6a1c814dc35ae40d5962e7ba93bad83d5930e9dba9b9f2e52f307378519714 SHA512 82eff4a16847c657ae3102af7914539bf7404e8856ca8c94557533a3ddd7b40ff4571b351dab48349d503d413cf293880245a97238516add83e79890325f1067
 DIST kicad-7.0.8.tar.bz2 43996328 BLAKE2B 929781f06c7ef9eac16fc1f7c89c07e481f04f3da68a6d54607f8671f0daf271c8b21e8eff9efbb5adfdc8a4e1b5b1cc60fc5f9fc4aed9557f15eb6cccc5e21e SHA512 e88793a4b1e1b52bf5cfb8650f8b6004020cfb61dfaa6cbf64747d9db56a74754ea281a78f58106dbdf78f28b27e6bf944ef46ab0f3d63171a0147793d776bc2
 DIST kicad-7.0.9.tar.bz2 43964032 BLAKE2B 78f7ad1409a60e9d577c97b57745e5aaa4c104ff8b7beeee6bcd4bedac2aa05b1fb4362ccb8a9ec01a322d420214a44bda30b0695a4bf02ea001f733c8671c7d SHA512 373f744d1295a04862cb9997541c3180ef3f11cd313b4bf8ff31024fe2dca1cbb5b0b15bc72f645a50fd78a0f9c4c840c8ed826e3df8b107d0d172c4c9020f2d
+DIST kicad-8.0.0.tar.bz2 72430414 BLAKE2B 52bad016249563d9668f08da2103e47c7db706e6749e23ff5c59fd423673db614a1c8681cd0e7927571fe157644e142929891647964c48f45b219e72166c3ebc SHA512 52e605c10fbac0a3c6208f92ab9e567de9074e41495db9619631765a0f20e2da23a2d45610bd367d943e8b4a2d72edf33456007aabcc1f7672b0bb1a93101ce0
 EBUILD kicad-7.0.10.ebuild 4253 BLAKE2B ee45406cafd17fe16d2f3e32db998fa28ab895a9a9f6994ec0d80ce2c364ad0e0457982ffad8e3b8ea799c89c6c3acfd8021e3c7e30590024bb399ef6f8293ae SHA512 130f102623903092358da033b349c4feb9fa8cf380f100cc42ab53dc346bd2235f3de08a62da171b656c15f91e1ad22e4b78a01d84fcef6af09033339efa7e47
 EBUILD kicad-7.0.7.ebuild 4177 BLAKE2B 340bbc5088779baa826c671ad2fbb32d3180fa8a722081ebce75f2cae94447062d219680aada3b1a8d22bca9639573aed39ce6870a7bee578755b795d3b2ee31 SHA512 c8634befaca04db035b24e83191023690f783a18a7785fb87ce4877417a15beeba58d887e93f862e00a608e41ab38a87dc05fcd4946d212696a25bc43188c4c1
 EBUILD kicad-7.0.8-r1.ebuild 4253 BLAKE2B ee45406cafd17fe16d2f3e32db998fa28ab895a9a9f6994ec0d80ce2c364ad0e0457982ffad8e3b8ea799c89c6c3acfd8021e3c7e30590024bb399ef6f8293ae SHA512 130f102623903092358da033b349c4feb9fa8cf380f100cc42ab53dc346bd2235f3de08a62da171b656c15f91e1ad22e4b78a01d84fcef6af09033339efa7e47
 EBUILD kicad-7.0.9.ebuild 4253 BLAKE2B ee45406cafd17fe16d2f3e32db998fa28ab895a9a9f6994ec0d80ce2c364ad0e0457982ffad8e3b8ea799c89c6c3acfd8021e3c7e30590024bb399ef6f8293ae SHA512 130f102623903092358da033b349c4feb9fa8cf380f100cc42ab53dc346bd2235f3de08a62da171b656c15f91e1ad22e4b78a01d84fcef6af09033339efa7e47
-EBUILD kicad-9999.ebuild 4305 BLAKE2B f54b0fe6707feae695ebb16a6c6db4a780ee0856ecee993b217a785097d0e52d0c85de431486e235861bd65af6655cd1bcefaa4392cacaa21829cdc527d9a4bd SHA512 71d16f6dcb99869b90fc3f35b67913fa01ef0ed56b3b80e6c094fc34b3cbd78a4c01ec6cc022ea80d7feb0e896f88fc0f25221a4dbef7cf43ca0e16078903769
-MISC metadata.xml 694 BLAKE2B 31ff95364b4929f72279a9334ac0a050d65d47f7ffdaa71d7d5546bd52e855981e68a60bd44db4cd58059463efda1d265af1c74b3a1fbdefc728dfb3d61f4723 SHA512 a67fe2aaab4fb9e612c8375d4d52015c7b852fe53674d016a682df2616dc771d9f7ab179b27e18431c77a614e26120d598eca9da699bacf8c795b0dff67b31d2
+EBUILD kicad-8.0.0.ebuild 4306 BLAKE2B af15866bf5b64f4d1e45cb451979abd33e87c116967ca3a90eef4b23af70d1f62eeb37b535db66e88f55b0170429fd64d52196f4c845519b61c2e09fd9c56f31 SHA512 c0ab65163137733615db1cab8cfa80796958f297a2abbfa86be10e91c5ffd27bb4766d900a7252317aef366a10a6aded3e16967c6dafc74f3e637e45db702778
+EBUILD kicad-9999.ebuild 4306 BLAKE2B af15866bf5b64f4d1e45cb451979abd33e87c116967ca3a90eef4b23af70d1f62eeb37b535db66e88f55b0170429fd64d52196f4c845519b61c2e09fd9c56f31 SHA512 c0ab65163137733615db1cab8cfa80796958f297a2abbfa86be10e91c5ffd27bb4766d900a7252317aef366a10a6aded3e16967c6dafc74f3e637e45db702778
+MISC metadata.xml 811 BLAKE2B 4f2150b49b1bebf73aa3440ae1ace1624ce02e022d361051e895a18d28f2ab802fed04c94552b36fc0265335a1eacd5d3a7c407fc88f0c4f7de9e4fa6afa6c5f SHA512 c09c2143516f361a8553ab5c44ffa47c77c7a8dbf53596dfe9ba81378c1a7e3aee8378353950cd8805b675d0a29444848fddd4acfe107a54e3f56e87183a1c6c
diff --git a/sci-electronics/kicad/kicad-8.0.0.ebuild b/sci-electronics/kicad/kicad-8.0.0.ebuild
new file mode 100644
index 000000000000..779a6ba220c5
--- /dev/null
+++ b/sci-electronics/kicad/kicad-8.0.0.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+WX_GTK_VER="3.2-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.bz2 -> ${P}.tar.bz2"
+	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 nls openmp telemetry test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# 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
+# Depend wxGTK version needs to be limited due to switch from EGL to GLX, bug #911120
+COMMON_DEPEND="
+	dev-db/unixODBC
+	dev-libs/boost:=[context,nls]
+	dev-libs/libgit2:=
+	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
+	>sci-electronics/ngspice-27[shared]
+	sys-libs/zlib
+	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
+		>=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	nls? (
+		sys-devel/gettext
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu
+"
+BDEPEND=">=dev-lang/swig-4.0
+	doc? ( app-text/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="1500M"
+
+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
+		-DKICAD_USE_EGL=OFF
+
+		-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_INSTALL_DEMOS="$(usex examples)"
+		-DCMAKE_SKIP_RPATH="ON"
+
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
+
+		-DKICAD_USE_SENTRY="$(usex telemetry)"
+
+		-DKICAD_SPICE_QA="$(usex test)"
+		-DKICAD_BUILD_QA_TESTS="$(usex test)"
+	)
+
+	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
+
+	dodoc doxygen/eagle-plugin-notes.txt
+
+	if use doc ; then
+		cd doxygen || die
+		dodoc -r out/html/.
+	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-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index e2e4708508d6..779a6ba220c5 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 nls openmp test"
+IUSE="doc examples nls openmp telemetry test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -41,7 +41,7 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="
 	dev-db/unixODBC
 	dev-libs/boost:=[context,nls]
-	dev-libs/libgit2
+	dev-libs/libgit2:=
 	media-libs/freeglut
 	media-libs/glew:0=
 	>=media-libs/glm-0.9.9.1
@@ -76,10 +76,6 @@ fi
 
 CHECKREQS_DISK_BUILD="1500M"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.0-werror.patch
-)
-
 pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
@@ -119,6 +115,8 @@ src_configure() {
 		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
 		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
 
+		-DKICAD_USE_SENTRY="$(usex telemetry)"
+
 		-DKICAD_SPICE_QA="$(usex test)"
 		-DKICAD_BUILD_QA_TESTS="$(usex test)"
 	)
diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
index 20f4db2115bc..07c75b4303e6 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>vowstar@gmail.com</email>
+		<name>Huang Rui</name>
+	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>