gentoo auto-resync : 04:05:2024 - 00:00:19

3 files changed, 193 insertions, 7 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 98bdccdcf39b..b0b1aee156af 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -5,10 +5,12 @@ DIST kicad-7.0.11.tar.bz2 44083805 BLAKE2B d923581f49b3cf48776de56ba12ddc99e9422
 DIST kicad-7.0.7.tar.bz2 44055973 BLAKE2B 4169e111b8d2086572aa2979f09a8119dbc9caf34790ec5e5f3e0972d0a2e93dab6a1c814dc35ae40d5962e7ba93bad83d5930e9dba9b9f2e52f307378519714 SHA512 82eff4a16847c657ae3102af7914539bf7404e8856ca8c94557533a3ddd7b40ff4571b351dab48349d503d413cf293880245a97238516add83e79890325f1067
 DIST kicad-8.0.0.tar.bz2 72430414 BLAKE2B 52bad016249563d9668f08da2103e47c7db706e6749e23ff5c59fd423673db614a1c8681cd0e7927571fe157644e142929891647964c48f45b219e72166c3ebc SHA512 52e605c10fbac0a3c6208f92ab9e567de9074e41495db9619631765a0f20e2da23a2d45610bd367d943e8b4a2d72edf33456007aabcc1f7672b0bb1a93101ce0
 DIST kicad-8.0.1.tar.bz2 72453098 BLAKE2B 67c6b69256566a176ae10affa7ac65879db71f5017dc24312eba904724b2b28caa56f6c82c697d27b34d94f9a8f5448307948e17f17c9750693b192afa3ffab9 SHA512 b6509bb4bfd1cbe87a2f409b70a8ba037a44fb039aaacd9d62868b43925382c0d3aab4c4f7e4bbd646b6ea7cf35fd7318f620a1c8c250c09251349357f2caf11
+DIST kicad-8.0.2.tar.bz2 72713030 BLAKE2B ba47a16b5c435970a45aef9988a5f6d218df043a5ce3547a191991ef63620125989e6218e97266a62c76ece604248bdf0652a10d423346fe3648c8ba240651c4 SHA512 192bcd494f00eccc430ddf9e9034f252bae177f06da81e730fb82f000a58bac9201d49ecba93c3bd17608b6df6a944beea85849050e306e11c1abfbd0028ff4a
 EBUILD kicad-7.0.10.ebuild 4362 BLAKE2B 28406e5f84731d8570940026cc91e8e347ad7a694dbb3538f4ff1822302c0132894a7208db807793bcc0986c58224a79f3cf6bb05c206a699f9a102ecdf3a5bc SHA512 5ab394782cb40651fc112f3b4b20b19d7fa8900af5596e76b5bcfd3876732497800a9f4a2adf477700da26fb1e2c84da47b6f7ebe3883f6d0736d2112df36603
 EBUILD kicad-7.0.11.ebuild 4363 BLAKE2B 337e3e5bdb66b3735777b1362d0a0cee45fe8b73dc159cb28e918956e7057746c45adc61a1935a88cdc8aa233657984399380bdf63c6cf18fe88dab24fc3a451 SHA512 2ee86ef232c2b42142f5991ad3e84713a3a1ba591d39844cbe8f964fd6cfe8f5864f135fc451b28c8341cf01f6f5584f83fd4d86458e8cb4ac0b6fee7a9517ca
 EBUILD kicad-7.0.7.ebuild 4320 BLAKE2B 05b44e10a0a360a061fe7c1a5c44d72a39b6a158d4c3e013c47dcff8c545cb3741ecc847aad53fc4b9745089763ff4408d270112473f8aeb701fa2bf9c5c886a SHA512 bef889e4e25aa3285ee3d3df6c04d45446b6fbcecf076a391a8021d0e97d53efb11385abe889fb83db16f6cd2cb0b3c0eb466e8e9453a154c03c52ca29685a11
 EBUILD kicad-8.0.0.ebuild 4491 BLAKE2B 22f7bc921702b5fe31476490f2f54429267a216cc0225a84194b3833ba214fc33661670976abfe5fef8a7ee7bcbc0b22064e3f655ca2c60bee6c49d86a7a8bf0 SHA512 5f02334b65afebc68beb8417d8640ed5df8640687007d50041220a5ece62c997f7ec8f007f35ec7f98fc169a00fda947e8b641ce3c6c1a2d9deadeaf716e622b
 EBUILD kicad-8.0.1.ebuild 4491 BLAKE2B 22f7bc921702b5fe31476490f2f54429267a216cc0225a84194b3833ba214fc33661670976abfe5fef8a7ee7bcbc0b22064e3f655ca2c60bee6c49d86a7a8bf0 SHA512 5f02334b65afebc68beb8417d8640ed5df8640687007d50041220a5ece62c997f7ec8f007f35ec7f98fc169a00fda947e8b641ce3c6c1a2d9deadeaf716e622b
-EBUILD kicad-9999.ebuild 4405 BLAKE2B e16ee62d53b77248e33112b0f5364aab7df608c0d2981c2517dc5d7e432d8de790f7ce88fbb5701866e9b602bdbe6922e59cd44bf4329a4218f15058474874d8 SHA512 5ff2fb91d530a65e6b0adbf5e794fb98ca70cf9573aa54718bb0d8f10e6b2c2c445d53cc96951830c1c2aab70bb02b890eda1761eba27bbda8415adab396bcc7
+EBUILD kicad-8.0.2.ebuild 4485 BLAKE2B 6d13cc670ce4a9c491a84f29cc9316d8ea3a910e939b0e6f360c4cc92d5a54cf29e60806c0e13bbb55e45d7d2e194c45ebe9f4bc85a1e4e4585eff84da75fc5f SHA512 ee58d0b60b167b990a7069b52b62a493fcdc092b50ede1b5ad51f4241f3dff9798455c9b3f98360ab3f57e5302053b52f2f952273711b2bfa6cf54fb327ea2e3
+EBUILD kicad-9999.ebuild 4485 BLAKE2B 6d13cc670ce4a9c491a84f29cc9316d8ea3a910e939b0e6f360c4cc92d5a54cf29e60806c0e13bbb55e45d7d2e194c45ebe9f4bc85a1e4e4585eff84da75fc5f SHA512 ee58d0b60b167b990a7069b52b62a493fcdc092b50ede1b5ad51f4241f3dff9798455c9b3f98360ab3f57e5302053b52f2f952273711b2bfa6cf54fb327ea2e3
 MISC metadata.xml 811 BLAKE2B 4f2150b49b1bebf73aa3440ae1ace1624ce02e022d361051e895a18d28f2ab802fed04c94552b36fc0265335a1eacd5d3a7c407fc88f0c4f7de9e4fa6afa6c5f SHA512 c09c2143516f361a8553ab5c44ffa47c77c7a8dbf53596dfe9ba81378c1a7e3aee8378353950cd8805b675d0a29444848fddd4acfe107a54e3f56e87183a1c6c
diff --git a/sci-electronics/kicad/kicad-8.0.2.ebuild b/sci-electronics/kicad/kicad-8.0.2.ebuild
new file mode 100644
index 000000000000..296f53277dd1
--- /dev/null
+++ b/sci-electronics/kicad/kicad-8.0.2.ebuild
@@ -0,0 +1,180 @@
+# 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 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,wayland]
+	$(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"
+
+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_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)"
+	)
+
+	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
+	dosym "${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}/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
+}
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index b006c9bf1a8d..296f53277dd1 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -6,7 +6,7 @@ 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
+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"
@@ -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 telemetry test"
+IUSE="doc examples nls openmp test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -53,7 +53,7 @@ COMMON_DEPEND="
 	>=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]
+	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl,wayland]
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
 		>=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
@@ -96,6 +96,11 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	filter-lto # Bug 927482
+	cmake_src_prepare
+}
+
 src_configure() {
 	xdg_environment_reset
 
@@ -119,8 +124,6 @@ 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)"
 	)
@@ -141,7 +144,8 @@ src_test() {
 	dosym "${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
+	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() {