gentoo auto-resync : 23:09:2023 - 17:20:26

3 files changed, 4 insertions, 181 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 28a8e6acadf5..158be3380af4 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,9 +1,7 @@
 AUX kicad-7.0.0-werror.patch 682 BLAKE2B 268cf848679ffb5b5aa2389a6392986f908c64861fb6908a864ae41d788f8ac10a21d30b7a20b98409cad7f57191958f9d95d448be7c8070806c585c03d7ce8a SHA512 c30b9a080cc74687b44fb5e547d746c4e3298096e9ffa1bf5a7a2b477efb8d05db8adad7255d6b92eb2c00f739e4fcd79b9c198b3122265d26edc1db5cb4ee5e
 DIST kicad-7.0.1.tar.bz2 42744121 BLAKE2B cb6005be531027e02c5c3fa03be54dff00720aa9c36d12d1e619e041da05e5b4efd048be4e01021cf225a35cd638a162f4b620b65ec117027092a5bf650cb1ec SHA512 6b3f32073a0667c745be54fccf1660cc81b560ad7613eb2355956b48567d7e82ce6926ab04d374fe88dcaa1220357997f5f4621e6d635effcd3d698e45a37516
-DIST kicad-7.0.2.tar.bz2 42844186 BLAKE2B 136d68b3174cde74db96b1197c62da1fb4e54f628f73a6e0ea092c713b529863d9e443b6631a0ecbb55e2d299a7b78b8218d05e605f8ae8f5972915147ec140f SHA512 04d7e39815f9e87b8646f25fb7e1b82bcf2bc63e26e078f3175c37a2c2e0a2bb7771e70e4698dbfc496f112a733668bdc746eefd1a9c4c76d0b36696738026a4
-DIST kicad-7.0.6.tar.bz2 43548452 BLAKE2B 90fa15d67f5629266755c469208baa486f41003a9b6ff32c7b7a0707967d54dbc3410d332f0ab1fde91c6045c345b34d1e27585feb265386e58447aea464a93f SHA512 492e6f4997eefda03eb371ec92c1a971cc37e16cb18f4ead08db22370048f6e2fce332c58d5eac64554808bf15738ebd18cf8f3664eacd6d3066a35268f3ec6a
+DIST kicad-7.0.7.tar.bz2 44055973 BLAKE2B 4169e111b8d2086572aa2979f09a8119dbc9caf34790ec5e5f3e0972d0a2e93dab6a1c814dc35ae40d5962e7ba93bad83d5930e9dba9b9f2e52f307378519714 SHA512 82eff4a16847c657ae3102af7914539bf7404e8856ca8c94557533a3ddd7b40ff4571b351dab48349d503d413cf293880245a97238516add83e79890325f1067
 EBUILD kicad-7.0.1.ebuild 4233 BLAKE2B c95b3aa60006a6e7d8f5c007efeb69f348edcf4b34e5c11029604dca80463172712a82fa109a303bd42bd831010d765fa1245f1fc40d503de4b50d5f4f58c7c1 SHA512 5f3a9cb2f4e9d0a48f42d6bcc1050f10776c05c09ee2c8cdc983a756659beb7551a3d71a1adc51beff533c237c5b74fe7af4cfee6e93033db0f95c5c590c2a6a
-EBUILD kicad-7.0.2-r1.ebuild 4308 BLAKE2B 4646daac7c099362cff9c1f61973653c320bacc393dea1a18356f307acbea5fb3c2fe4d0245bafb31d5a0ce92ab72679798a492bf269271d8c8ac78351503848 SHA512 63c123c42a7c04d78b089387a66681880a14865e1498b0019180852905aef91a5331dc625be2fa53d875272d167a84c588a7745c62636fe1186a1d54fcd6e243
-EBUILD kicad-7.0.6-r2.ebuild 4249 BLAKE2B 4d4d76cbd5bc6d99812bf3ecf908d429f33574f62d170b973f32f2f822157b62fb26dcab3de0e1d9266c62ebf921c39f6f48febd3953aed22bf7f06400a80640 SHA512 7c7a85bd4dbfc6859018f4a00ea2a6bfe8b3c373470cdd3e5109077bfc8dca2c5c7a9a22081f7de599d6477e335d4c71b3e537ece0ca8896a3b87073ba3c2211
+EBUILD kicad-7.0.7.ebuild 4176 BLAKE2B d0fb5c9a2c445fe056dd46ca9c11de274c44a6169cca3b0bb115c218b122b6bf43b49f9c05ad7565a1058b7a47b64bf23c9150f7caef7c724a6b6be3873874bf SHA512 12526591febb7c328252ab32b2b3520540db0fa0fc7bd1bd42d2476eb2c0e12d9fe2420fdca9d350c464deaded48c8798f926b882cc862068ac2a774b6b4e6c6
 EBUILD kicad-9999.ebuild 4249 BLAKE2B 4d4d76cbd5bc6d99812bf3ecf908d429f33574f62d170b973f32f2f822157b62fb26dcab3de0e1d9266c62ebf921c39f6f48febd3953aed22bf7f06400a80640 SHA512 7c7a85bd4dbfc6859018f4a00ea2a6bfe8b3c373470cdd3e5109077bfc8dca2c5c7a9a22081f7de599d6477e335d4c71b3e537ece0ca8896a3b87073ba3c2211
 MISC metadata.xml 765 BLAKE2B ca4295c6a975ed0161e0e19d6faffa585001c65bb1b6c53659d63c22e10aa1856840752182e3f9108b11b582105691f6d03f3a63ee52fd5ea875b6ba3049e379 SHA512 4af8f8ba855e6c5dfc6e4f34ba1efb0705fb92dffb9fcc6196457a43ebca11da4b1fa752a6bba02ce3bbb7bfbbeeb5a5f8cedfb055378d67f622014ba3240768
diff --git a/sci-electronics/kicad/kicad-7.0.2-r1.ebuild b/sci-electronics/kicad/kicad-7.0.2-r1.ebuild
deleted file mode 100644
index 899d0d74f13b..000000000000
--- a/sci-electronics/kicad/kicad-7.0.2-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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 +ngspice nls openmp"
-
-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="
-	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.2.0:*[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	ngspice? (
-		>sci-electronics/ngspice-27[shared]
-	)
-	nls? (
-		sys-devel/gettext
-	)
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-BDEPEND=">=dev-lang/swig-4.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}-7.0.0-werror.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
-		# wxWidgets does not support runtime selection of backends (GLX vs EGL),
-		# if enabled it can break KiCad depending on what wxGTK was compiled
-		# with, see bug #911120
-		-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_SPICE="$(usex ngspice)"
-
-		-DKICAD_INSTALL_DEMOS="$(usex examples)"
-		-DCMAKE_SKIP_RPATH="ON"
-
-		-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
-
-	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-7.0.6-r2.ebuild b/sci-electronics/kicad/kicad-7.0.7.ebuild
index a8534692f833..7af71d049c15 100644
--- a/sci-electronics/kicad/kicad-7.0.6-r2.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.7.ebuild
@@ -35,6 +35,7 @@ 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
+# 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]
@@ -46,9 +47,9 @@ COMMON_DEPEND="
 	>=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]
 	>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}]
@@ -99,9 +100,6 @@ src_configure() {
 		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
 
 		-DKICAD_SCRIPTING_WXPYTHON=ON
-		# wxWidgets does not support runtime selection of backends (GLX vs EGL),
-		# if enabled it can break KiCad depending on what wxGTK was compiled
-		# with, see bug #911120
 		-DKICAD_USE_EGL=OFF
 
 		-DKICAD_BUILD_I18N="$(usex nls)"