gentoo auto-resync : 19:07:2023 - 01:02:32

7 files changed, 20 insertions, 262 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 3d3a66c51f12..25d740742c74 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,14 +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-7.0.0-werror.patch 682 BLAKE2B 268cf848679ffb5b5aa2389a6392986f908c64861fb6908a864ae41d788f8ac10a21d30b7a20b98409cad7f57191958f9d95d448be7c8070806c585c03d7ce8a SHA512 c30b9a080cc74687b44fb5e547d746c4e3298096e9ffa1bf5a7a2b477efb8d05db8adad7255d6b92eb2c00f739e4fcd79b9c198b3122265d26edc1db5cb4ee5e
-AUX kicad-scripts-install-fix.patch 442 BLAKE2B 321ca8c5e846023696576daea00aa827ad88a4c3e82d120bd07392892b61d0e63892732f5469b1fe1472eac9584175acbc7aa611171f6fb9285017826156b30c SHA512 5abb158ec7e8a5ef8049797886e26febc018499dd7f5c8defdf9104b59371efa05cbec8e19e8fe22295e8e54c30095d347cccfa4c43db62b6ac4eb07bb8a080e
-DIST kicad-6.0.11.tar.bz2 34083016 BLAKE2B 85662dd57eb5f28498317b1554e703efdebaa470f749ca239b2caeae4c366005a7c9bb1d1ba6375ed80d277efabf09b56d3e7e1e82bf93462b4ba5405445157e SHA512 9827be9f2c18be1ab3bc5a1a3bd3d6297bc69b561e43b0f9010cb49009c3e87f1d320034411ecc0a2277b5686923a3d4bcc507278590814309d10de14463266d
-DIST kicad-6.0.9.tar.bz2 34045371 BLAKE2B 797f1d10a5405751bc51ec9579c5c50c21b56761c8b59ae99e8a52e50a787f1271053eb4d36e5c2483adee277764ea75300dd50c62a2addeb540e748bf8b93fe SHA512 015335de5d9bbd4acdff8dd7da85847ea0b666d3d4dd0d4c9e7b731cc516cb3575ade231e742a089cc5591ef9e4059f2bedc83677fa85220b9e6cb8ef5776305
 DIST kicad-7.0.1.tar.bz2 42744121 BLAKE2B cb6005be531027e02c5c3fa03be54dff00720aa9c36d12d1e619e041da05e5b4efd048be4e01021cf225a35cd638a162f4b620b65ec117027092a5bf650cb1ec SHA512 6b3f32073a0667c745be54fccf1660cc81b560ad7613eb2355956b48567d7e82ce6926ab04d374fe88dcaa1220357997f5f4621e6d635effcd3d698e45a37516
 DIST kicad-7.0.2.tar.bz2 42844186 BLAKE2B 136d68b3174cde74db96b1197c62da1fb4e54f628f73a6e0ea092c713b529863d9e443b6631a0ecbb55e2d299a7b78b8218d05e605f8ae8f5972915147ec140f SHA512 04d7e39815f9e87b8646f25fb7e1b82bcf2bc63e26e078f3175c37a2c2e0a2bb7771e70e4698dbfc496f112a733668bdc746eefd1a9c4c76d0b36696738026a4
-EBUILD kicad-6.0.11.ebuild 4399 BLAKE2B 1ca4411dd01828e1371ef52167dfcaed6889af78d7df6643945a2a91d70d4180e428fff13dd5caea20f274df175b8abd826e4621eead75be994a21072bfc12ab SHA512 bdb215a6d0f2f9e4e91c463110ef0e83593c70f78d331f2277c655192ca12aa7985c3e2990dacfcddf26034e29521c7d018b4d93abb107272b32b5ed6eeccdb6
-EBUILD kicad-6.0.9-r1.ebuild 4427 BLAKE2B 6645e57532a9635b0e97ba4cc92c676fa0a7ecf8380812552c598f88b5354d30f138dbef8f4aaec084ba21eadc2ee48874554fd55041522205522626e1908a23 SHA512 8e8d77a85e05ea0a759b8d726b533b84cd01fd86b37de3cb57085684e6c59d43d13447e4e8f45a2ac3bed164705f0282d6b5d6c941faaa414f062643913f8d6d
+DIST kicad-7.0.6.tar.bz2 43548452 BLAKE2B 90fa15d67f5629266755c469208baa486f41003a9b6ff32c7b7a0707967d54dbc3410d332f0ab1fde91c6045c345b34d1e27585feb265386e58447aea464a93f SHA512 492e6f4997eefda03eb371ec92c1a971cc37e16cb18f4ead08db22370048f6e2fce332c58d5eac64554808bf15738ebd18cf8f3664eacd6d3066a35268f3ec6a
 EBUILD kicad-7.0.1.ebuild 4134 BLAKE2B 01eb2c3112047409613c67d190d29ea2e2fc8cc0029796c0fe3d7e54b3f450bf947839f0e75088071660f075e1749ac3ef726ad36fc9394ede71dc53da9e8bd5 SHA512 0490fe205737be0e163e75452b83cbaa34d62acb668409c865c222ceaa675d80dbe2670b68fc16282daffcc204ccf0c9074407f9cbe84215c14760218c080469
 EBUILD kicad-7.0.2.ebuild 4135 BLAKE2B 678a4552411ca57ad86405ce811569ad167a074484d2b10210359ffe7555b88aa87564ee0af15526eac86f8691a1c3c59b5b51784dce9067bf283425c10de116 SHA512 9c985c7e63292506433d4e29faffcfe5243bd7405e8d63981f88603933570c7bc1d3e33bb0988331c5283037b9071d568663506de9469fb16a760e4191c0305b
+EBUILD kicad-7.0.6.ebuild 4135 BLAKE2B cc9d91642254fa327cae20d6a9286ac283993e5f9463be1dd81b41ed1709d99e33eefc61cb23a40dc8eccb90ed331103cb7f0b8f8356a41a9f5367c91b2c9e08 SHA512 7e0c2c0e9738ca877532a241e9b547104480dcac24970cf262ce2d6ed79f086975100d9002ae13c1533b002264aeaa180b47ebd6966feb7cbd3cbeb193caabce
 EBUILD kicad-9999.ebuild 4135 BLAKE2B 678a4552411ca57ad86405ce811569ad167a074484d2b10210359ffe7555b88aa87564ee0af15526eac86f8691a1c3c59b5b51784dce9067bf283425c10de116 SHA512 9c985c7e63292506433d4e29faffcfe5243bd7405e8d63981f88603933570c7bc1d3e33bb0988331c5283037b9071d568663506de9469fb16a760e4191c0305b
-MISC metadata.xml 922 BLAKE2B bfdb3ce1ee74c7b6f2da1a5fbe7835e2114af83b594edabab7b7674000462ee6963acee3bb1f384bed0b4a36b0529aebdab801fe3a482b23e742d9186e7684b2 SHA512 575659f3c5d0fc74469ff14f8abaf58776f1d0ffdd16b85e9f617d3e956d2d0c1c7f70aeebf02aa5c7afadcea0e0a589e6fb16f160b398482524fa7ce592ba4e
+MISC metadata.xml 765 BLAKE2B ca4295c6a975ed0161e0e19d6faffa585001c65bb1b6c53659d63c22e10aa1856840752182e3f9108b11b582105691f6d03f3a63ee52fd5ea875b6ba3049e379 SHA512 4af8f8ba855e6c5dfc6e4f34ba1efb0705fb92dffb9fcc6196457a43ebca11da4b1fa752a6bba02ce3bbb7bfbbeeb5a5f8cedfb055378d67f622014ba3240768
diff --git a/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch b/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch
deleted file mode 100644
index cce508c1e888..000000000000
--- a/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kicad-6.0.6/common/tool/tool_manager.cpp kicad-6.0.6-new/common/tool/tool_manager.cpp
---- kicad-6.0.6/common/tool/tool_manager.cpp	2022-06-17 18:11:16.000000000 -0700
-+++ kicad-6.0.6-new/common/tool/tool_manager.cpp	2022-06-20 00:17:13.548239632 -0700
-@@ -902,7 +902,7 @@
-         m_menuOwner = -1;
- 
-         // Restore cursor settings
--        for( auto cursorSetting : m_cursorSettings )
-+        for( auto const& cursorSetting : m_cursorSettings )
-         {
-             auto it = m_toolIdIndex.find( cursorSetting.first );
-             wxASSERT( it != m_toolIdIndex.end() );
diff --git a/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch b/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch
deleted file mode 100644
index f1047cb9dee5..000000000000
--- a/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/892499
-https://gitlab.com/kicad/code/kicad/-/commit/8c324f1fc8f7fcdb5e8f494da3d45997001fab4a
-
-From 8c324f1fc8f7fcdb5e8f494da3d45997001fab4a Mon Sep 17 00:00:00 2001
-From: jean-pierre charras <jp.charras@wanadoo.fr>
-Date: Tue, 20 Dec 2022 12:46:19 +0100
-Subject: [PATCH] Fix a missing include. Fixes #13216
- https://gitlab.com/kicad/code/kicad/issues/13216
-
---- a/pcb_calculator/eserie.h
-+++ b/pcb_calculator/eserie.h
-@@ -2,7 +2,7 @@
-  * This program source code file is part of KiCad, a free EDA CAD application.
-  *
-  * Copyright (C) 2020 <janvi@veith.net>
-- * Copyright (C) 2020-2021 KiCad Developers, see AUTHORS.txt for contributors.
-+ * Copyright (C) 2020-2022 KiCad Developers, see AUTHORS.txt for contributors.
-  *
-  * This program is free software: you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License as published by the
-@@ -21,6 +21,7 @@
- #include <array>
- #include <vector>
- #include <string>
-+#include <cstdint>
- 
- /**
-  * E-Values derived from a geometric sequence formula by Charles Renard were already
--- 
-GitLab
diff --git a/sci-electronics/kicad/files/kicad-scripts-install-fix.patch b/sci-electronics/kicad/files/kicad-scripts-install-fix.patch
deleted file mode 100644
index d52a05d3bcf5..000000000000
--- a/sci-electronics/kicad/files/kicad-scripts-install-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kicad-6.0.2-orig/CMakeLists.txt kicad-6.0.2/CMakeLists.txt
---- kicad-6.0.2-orig/CMakeLists.txt	2022-02-10 16:29:07.000000000 -0800
-+++ kicad-6.0.2/CMakeLists.txt	2022-02-13 20:09:37.244713966 -0800
-@@ -950,7 +950,7 @@
- ###
- if( UNIX AND NOT APPLE )
-     install( DIRECTORY scripts
--        DESTINATION ${KICAD_DOCS}
-+        DESTINATION ${KICAD_BIN}/scripts
-         COMPONENT resources
-         PATTERN "*.bat" EXCLUDE
-         )
diff --git a/sci-electronics/kicad/kicad-6.0.9-r1.ebuild b/sci-electronics/kicad/kicad-6.0.9-r1.ebuild
deleted file mode 100644
index e9fb8bec1498..000000000000
--- a/sci-electronics/kicad/kicad-6.0.9-r1.ebuild
+++ /dev/null
@@ -1,176 +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.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 +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]
-	<dev-python/wxpython-4.2.0
-	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}/${PN}-6.0.6-unitialized-variable-fix.patch"
-	"${FILESDIR}/${PN}-6.0.9-gcc-13.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.11.ebuild b/sci-electronics/kicad/kicad-7.0.6.ebuild
index 7e4168d52685..355bbb97546c 100644
--- a/sci-electronics/kicad/kicad-6.0.11.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.6.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
-WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{9..11} )
+WX_GTK_VER="3.2-gtk3"
 
 inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
 
@@ -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.bz2"
+	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,18 +36,21 @@ 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="
+	dev-db/unixODBC
 	dev-libs/boost:=[context,nls]
-	<dev-python/wxpython-4.2.0
 	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}]
+		~dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}
 	ngspice? (
@@ -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
@@ -72,12 +72,10 @@ if [[ ${PV} == 9999 ]] ; then
 	BDEPEND+=" >=x11-misc/util-macros-1.18"
 fi
 
-CHECKREQS_DISK_BUILD="900M"
+CHECKREQS_DISK_BUILD="1.2G"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-scripts-install-fix.patch"
-	"${FILESDIR}/${PN}-6.0.6-unitialized-variable-fix.patch"
-	"${FILESDIR}/${PN}-6.0.9-gcc-13.patch"
+	"${FILESDIR}"/${PN}-7.0.0-werror.patch
 )
 
 pkg_setup() {
@@ -103,8 +101,8 @@ src_configure() {
 		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
 
 		-DKICAD_SCRIPTING_WXPYTHON=ON
+		-DKICAD_USE_EGL=ON
 
-		# Merged from separate -i18n package, bug #830274
 		-DKICAD_BUILD_I18N="$(usex nls)"
 		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
 
@@ -114,14 +112,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
 	)
@@ -148,10 +142,11 @@ src_install() {
 	cmake_src_install
 	python_optimize
 
+	dodoc doxygen/eagle-plugin-notes.txt
+
 	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/.
+		cd doxygen || die
+		dodoc -r out/html/.
 	fi
 }
 
diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
index 36c0a94d2d79..693935b54ebc 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -11,8 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="ngspice">Enable circuit simulation</flag>
-		<flag name="occ">Enable viewing 3D rendering of designs via <pkg>sci-libs/opencascade</pkg></flag>
-		<flag name="pcm">Enable plugin content manager</flag>
 	</use>
 	<longdescription>
 		Kicad is an open source (GPL) software for the creation of electronic