gentoo auto-resync : 22:08:2024 - 14:52:55

5 files changed, 196 insertions, 6 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 87d21c3dcccd..ff2ee11d422f 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -4,8 +4,10 @@ AUX kicad-8.0.3-gcc15-cstdint.patch 787 BLAKE2B c32894daeff59211f893acf9e6c54e27
 DIST kicad-7.0.10.tar.bz2 43991960 BLAKE2B 3e21f575e41a6036ff2a9c3ab17472e51c73612ddadbf88631717b43024e604a8607fff013828823ff4db4d4263ac8e3bcc3b069e3efdfdc66fdb627f60f192a SHA512 f8005e6cb685c4cdc3982eec644f6d4a115138eaa19ca0bd2e6ae07613eac9c98fd7cdc181dd83e6c6d3c4b73ff6a54261ac5448a2a9c53298bc611c1bf408e1
 DIST kicad-7.0.11.tar.bz2 44083805 BLAKE2B d923581f49b3cf48776de56ba12ddc99e942269c0c14950bb6b3413fb616af74a1b4e7095fc746e20125096f7d2e4c7a9f271dd58918b22fa53e8ce7b78fa6f6 SHA512 28d5560ead989dcfb6d3b07e37443de3bf1883bd56604ae20f70c0a068504fd8745f7011507d417f487b86071cec130ac8eb7bda7513d096e78dcc3dc98585aa
 DIST kicad-8.0.3.tar.bz2 72936035 BLAKE2B 667d6bc2e3a3f7ccc7a22a63d22702e6886404a86bca6ca2acdd5181c7046995332bb70f1fca9d25b20d9a7e1a9545488d00fb8d2ca70fd479a989ccea6c856f SHA512 14921827120381e749d094d2a76c850d2bee394c496859df3f4550a32b678a9523199a745e199f7c874ef85b2e8279129578e666c16932fbbcb1ba98c4e62b34
-EBUILD kicad-7.0.10.ebuild 4362 BLAKE2B 28406e5f84731d8570940026cc91e8e347ad7a694dbb3538f4ff1822302c0132894a7208db807793bcc0986c58224a79f3cf6bb05c206a699f9a102ecdf3a5bc SHA512 5ab394782cb40651fc112f3b4b20b19d7fa8900af5596e76b5bcfd3876732497800a9f4a2adf477700da26fb1e2c84da47b6f7ebe3883f6d0736d2112df36603
-EBUILD kicad-7.0.11.ebuild 4363 BLAKE2B 337e3e5bdb66b3735777b1362d0a0cee45fe8b73dc159cb28e918956e7057746c45adc61a1935a88cdc8aa233657984399380bdf63c6cf18fe88dab24fc3a451 SHA512 2ee86ef232c2b42142f5991ad3e84713a3a1ba591d39844cbe8f964fd6cfe8f5864f135fc451b28c8341cf01f6f5584f83fd4d86458e8cb4ac0b6fee7a9517ca
-EBUILD kicad-8.0.3.ebuild 4591 BLAKE2B 2dc880ddfe3e1eef9a588d653f942cbc754899c2ac6265c0a75fedd1f9c756d2363fd1654055839cc9cb01495a161d235a4774a6715438f99ca4780cd8a145e4 SHA512 0d915f33d512895f8f2814e9e195b8e4fad9eb0185b611bda76e5229eccd836a8011da037ff908ba8937dac6aa92a0ac1c458b72736cfb88d9970dd3dac6b3ee
+DIST kicad-8.0.4.tar.bz2 72958676 BLAKE2B 756970ea920e8951d76a53596b46ca83b904e50f50474f03b2efa1aad815092c819b5ad144717bfeba7c778cd3fd18fc2f082beaf47e88a51f9acc575e8aaac2 SHA512 b490cd201b79388ca9ba771363043373034f036cc73e520cf1c4cf9c011dfd25a5e9c3eee8a7bfe23521193cd44f6c28aaf3e270e8444e7ba75dff62e6a74f1e
+EBUILD kicad-7.0.10-r1.ebuild 4362 BLAKE2B da5f53b0e9c03b1972e40ae7405f725a88521e3840c40babf1e8872a90d5b53e05d269fbcec900031b871aae975de28a97807107b2e1fe9e0d0078e9bc05d653 SHA512 6dcb15a0da568aa76cc35601e326a51f4bb19b80c12cd12384e28fcb5271579e706c82967c7140f2a44f278b320cb6d4510a437d6f6433df32332703fd27edab
+EBUILD kicad-7.0.11-r1.ebuild 4363 BLAKE2B 8e949fe586c381f077636fc3a248e04203dfc0d7a0b4a3446870bc1ca8a39eb4d8d59673ef13a7f45a5f07ae86bdaf67ecb0390d8530f53035ce1e679e55954b SHA512 7a3b11b1c7eacbd76e6ae761a8978ef38233c3a0ad2c453259bbad24a38087fd53186a7f50a72e5188e5d1a9583a2c48f2771f5680d12756f87e31e4f395f5a3
+EBUILD kicad-8.0.3-r1.ebuild 4591 BLAKE2B 2cfe1404693bf91d201b3ed235680ed2d68bd664bfe2e3318ac9d6ac06a969a1d19865e71fe5c5b204586af7546d7b04110e202a54e52ef9ce0b7ed85d697d79 SHA512 a6702d335e7584632f91ae5641964ca640216480530e64f2d250fee8f2156d345f2949baf7b162e82d6a86462b81723ed70ec50a1adc7feb4198e6e8b3e2380f
+EBUILD kicad-8.0.4.ebuild 4579 BLAKE2B fa1b3602cbf89f4845866ffc4aed199afae4f292322aadde168c6e4b9c6c3a329881cc3c1645c7dc2c5ed554f31580af6f7fd2e27bfd2e54050d296c4bfe36c6 SHA512 13e95f1b3532ebb98a8393c4e2f746f77306f3149e10cb5e6b83e98769debfaa457c023033030d9c4343a06c22aa7466c3c3170957b35468b58da56ebeb2601d
 EBUILD kicad-9999.ebuild 4531 BLAKE2B 8c1820ce7d33635c577c792c04c3fd2286061dd3e5cb77a2e97729d13b57deb47d03c63c308620c3619089a6fae002b662a9471ddd9f248c5787be02c12e4646 SHA512 448bb66474cfdf7eaed377b93588bcffcebb77d88d8650c75176bc1bbe40d65f3375af4c730d1963b9a6e65bbd35b6e575c77a0b7ea389b8b644e7faef14fdd7
 MISC metadata.xml 811 BLAKE2B 4f2150b49b1bebf73aa3440ae1ace1624ce02e022d361051e895a18d28f2ab802fed04c94552b36fc0265335a1eacd5d3a7c407fc88f0c4f7de9e4fa6afa6c5f SHA512 c09c2143516f361a8553ab5c44ffa47c77c7a8dbf53596dfe9ba81378c1a7e3aee8378353950cd8805b675d0a29444848fddd4acfe107a54e3f56e87183a1c6c
diff --git a/sci-electronics/kicad/kicad-7.0.10.ebuild b/sci-electronics/kicad/kicad-7.0.10-r1.ebuild
index 01d0cff6c0d7..b73e214f39f2 100644
--- a/sci-electronics/kicad/kicad-7.0.10.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.10-r1.ebuild
@@ -87,7 +87,6 @@ pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
 	python-single-r1_pkg_setup
-	setup-wxwidgets
 	check-reqs_pkg_setup
 }
 
@@ -125,6 +124,7 @@ src_configure() {
 		-DKICAD_BUILD_QA_TESTS="$(usex test)"
 	)
 
+	setup-wxwidgets
 	cmake_src_configure
 }
 
diff --git a/sci-electronics/kicad/kicad-7.0.11.ebuild b/sci-electronics/kicad/kicad-7.0.11-r1.ebuild
index 6048013c238d..009383220d05 100644
--- a/sci-electronics/kicad/kicad-7.0.11.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.11-r1.ebuild
@@ -87,7 +87,6 @@ pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
 	python-single-r1_pkg_setup
-	setup-wxwidgets
 	check-reqs_pkg_setup
 }
 
@@ -125,6 +124,7 @@ src_configure() {
 		-DKICAD_BUILD_QA_TESTS="$(usex test)"
 	)
 
+	setup-wxwidgets
 	cmake_src_configure
 }
 
diff --git a/sci-electronics/kicad/kicad-8.0.3.ebuild b/sci-electronics/kicad/kicad-8.0.3-r1.ebuild
index 44f6f4cffb87..e5ac37837120 100644
--- a/sci-electronics/kicad/kicad-8.0.3.ebuild
+++ b/sci-electronics/kicad/kicad-8.0.3-r1.ebuild
@@ -88,7 +88,6 @@ pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
 	python-single-r1_pkg_setup
-	setup-wxwidgets
 	check-reqs_pkg_setup
 }
 
@@ -132,6 +131,7 @@ src_configure() {
 		-DKICAD_BUILD_QA_TESTS="$(usex test)"
 	)
 
+	setup-wxwidgets
 	cmake_src_configure
 }
 
diff --git a/sci-electronics/kicad/kicad-8.0.4.ebuild b/sci-electronics/kicad/kicad-8.0.4.ebuild
new file mode 100644
index 000000000000..4cbb09a09b4b
--- /dev/null
+++ b/sci-electronics/kicad/kicad-8.0.4.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+WX_GTK_VER="3.2-gtk3"
+
+inherit check-reqs cmake flag-o-matic 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 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="
+	app-crypt/libsecret
+	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.5.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
+	)
+	test? (
+		media-gfx/cairosvg
+	)
+"
+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"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.3-gcc15-cstdint.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	python-single-r1_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+	fi
+}
+
+src_prepare() {
+	filter-lto # Bug 927482
+	cmake_src_prepare
+}
+
+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_SPICE_QA="$(usex test)"
+		-DKICAD_BUILD_QA_TESTS="$(usex test)"
+	)
+
+	setup-wxwidgets
+	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.
+	mkdir -p "${BUILD_DIR}/qa/eeschema/" || die
+	ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
+
+	export CMAKE_SKIP_TESTS=(
+		qa_cli
+	)
+
+	# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
+	LD_LIBRARY_PATH="${BUILD_DIR}/common:${BUILD_DIR}/common/gal:${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
+}