Various updates / KiCad 6.0.1

2022-01-13 17:39:35 +01:00 · 2022-01-13 17:39:35 +01:00 · 264fe0de87
commit 264fe0de87
parent 245fe61c38
27 changed files with 583 additions and 8 deletions
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@ -0,0 +1,3 @@
+DIST kicad-doc-6.0.1.tar.gz 78035248 BLAKE2B 25ff6eb1318d2c55ace2df3b1d553ce9220b035f8de034e583a98eb601c1032856b0efc8b81e0a142483722015878d64e25b05df5a53e5d53df56967dfc23021 SHA512 1027a4f46a855ab34c9e4fb53df1a495d8cb1d27f98263fb574ef25135b0d20ba3a875e2711fcb73836c27f5c0e193aea2dec3e9fa313434785eb0553ca214b8
+EBUILD kicad-doc-6.0.1.ebuild 2043 BLAKE2B 40b1af5d17b368497a74c83b55834e97783d7caa1bfc7702795bbf531afb8914b57ebdec5b27d086419df29b2a9fcc28bf7d3143031907b54360baf3b9915664 SHA512 3773c5a2a2cd3b1d1654c3ce018be0f5a12c06821352c4c5d06c26d3268ae2c802f86ce22791084907d3cf83180f062a18d3c5cfb9fd097c89628f89d20f7901
+MISC metadata.xml 852 BLAKE2B 9b21d1f5ae47786e87fdf3703b2e65645cbc4746b861f023f8ca94a9d32dd8c50594eec0e316538943abe7f93a261b3fb2e96f1ac56bccbc316e2f9ef06cfb77 SHA512 aed642bd4c57be8cdae2dc31c81db0915b30032b72dbce3ea157163e2713bd3fe6812aa96c3ee3894f84cfa9126577fb69c2da35525eee2124728c004b436fad
--- a/app-doc/kicad-doc/kicad-doc-6.0.1.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-6.0.1.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools manuals"
+HOMEPAGE="https://docs.kicad.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/services/kicad-doc.git"
+	inherit git-r3
+	# x11-misc-util/macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
+SLOT="0"
+# TODO: Change default back to +df once asciidoctor-pdf is packaged?
+IUSE="+html pdf"
+
+LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
+IUSE+=${LANG_USE}
+REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
+unset LANG_USE
+
+# TODO: need asciidoctor-pdf for pdf
+# bug #697450
+BDEPEND="
+	>=app-text/asciidoc-8.6.9
+	>=app-text/dblatex-0.3.10
+	>=app-text/po4a-0.45
+	>=sys-devel/gettext-0.18
+	dev-perl/Unicode-LineBreak
+	dev-util/source-highlight
+	l10n_ca? ( dev-texlive/texlive-langspanish )
+	l10n_de? ( dev-texlive/texlive-langgerman )
+	l10n_en? ( dev-texlive/texlive-langenglish )
+	l10n_es? ( dev-texlive/texlive-langspanish )
+	l10n_fr? ( dev-texlive/texlive-langfrench )
+	l10n_it? ( dev-texlive/texlive-langitalian )
+	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
+	l10n_pl? ( dev-texlive/texlive-langpolish )
+	l10n_ru? ( dev-texlive/texlive-langcyrillic )
+	l10n_zh? ( dev-texlive/texlive-langchinese )"
+
+src_configure() {
+	local mycmakeargs=(
+		# May not always work?
+		# https://gitlab.com/kicad/services/kicad-doc/-/issues/808
+		-DADOC_TOOLCHAIN="ASCIIDOC"
+		# Note: need EAPI 8 usev here, not pre-EAPI 8 behaviour
+		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
+		-DSINGLE_LANGUAGE="${L10N}"
+		-DKICAD_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}/help
+	)
+	cmake_src_configure
+}
--- a/app-doc/kicad-doc/metadata.xml
+++ b/app-doc/kicad-doc/metadata.xml
@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="html">Generate documentation in HTML format</flag>
+		<flag name="pdf">Generate documentation in PDF format</flag>
+	</use>
+	<longdescription>
+		Kicad-doc is the extended manuals and documenation for Kicad. Kicad is
+		an open source (GPL) software for the creation of electronic schematic
+		diagrams and printed circuit board artwork.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">KiCad/kicad-doc</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@ -1,3 +1,3 @@
 AUX openscad-9999-0001-fix-to-find-lib3mf-2.patch 766 BLAKE2B 00f9dd15b1245631e38510c225bccdafa33dc76825b0f329b4c6697daf6e4d6c0934f19ecc4c003a0174d16bf7102a8b0f45c768d502353a2ca6521a3f247d3e SHA512 362732d790ba887e3ccd9f46993e592d5bb46f236ac27b437d789c32958ffce7b96086d4aa0c5c7187e2f2e672c0906f03a57ffc248a7460d21a1bec17ffaa9d
-EBUILD openscad-9999.ebuild 2637 BLAKE2B cb11bb884071eda0a6ab6106562bc5b5f8f5fe497cf6aa8f0bae6b78ebdee4c0f1ead216f8bdb0b6808f937cac7a4eedc0af3db427e44d9200d06570494416aa SHA512 4e03ffe8b4bc5e6a7ca57e3f373494852fceb62397bbb5bbdf3ad7aea8feda08345ec2f2b3735e730952da5e15d660035b006b82d5dda22f50aad8d88f14f31e
+EBUILD openscad-9999.ebuild 2640 BLAKE2B 942028762b2519d0a70d2c4a8feb1495da864a8c04e9574efc85c5240878b48eadb0e3baaa30a9ecfde39257eb28bb113270d1b73d9a50640305e584ff6ee3d0 SHA512 d707c6fc2446279b747d816fa24254805c579d262c01c1666e39ebe24beaa058f2f74b8e2059a4040da77b53ccbae6c69e7e187122bf983fc2d92429f0643636
 MISC metadata.xml 1348 BLAKE2B b15a74a20ef94a6a47de57826c5279a4e8c388a52bf9d1058a1ba0b347fcd77e0c8b79a42515f5411d0991fb8fb71c604f792dd2a2addaaca78bc85dbfc7a611 SHA512 fea109a00324f0bdcaae855e18fba456a449bb8192e633cfd5806fa1040fe3bba24f75493e0012d54afe8828073fc4d02ae01533b45648e05c575777b23572d1
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@ -72,9 +72,9 @@ DOCS=(
 )

 src_prepare() {
-	if has_version ">=media-libs/lib3mf-2"; then
-		eapply "${FILESDIR}/${P}-0001-fix-to-find-lib3mf-2.patch"
-	fi
+#	if has_version ">=media-libs/lib3mf-2"; then
+#		eapply "${FILESDIR}/${P}-0001-fix-to-find-lib3mf-2.patch"
+#	fi
 	cmake_src_prepare
 }

--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@ -0,0 +1,3 @@
+DIST kicad-footprints-6.0.1.tar.gz 31372634 BLAKE2B 5cb451a9a69c926af1aa8e0b180a244b8e195a450c83c960d62125d3bfc35d6a8c0a07e1a54c207fe851198b83bbdc7e3a26d06bdd92afbb1637733898661159 SHA512 dbe8689a0f32a9b448c7aa37c673736d97163f8e3f23b1e5119a732926cfd635aaa7927f0bf77327ab824353fe431523ca10f4035a37ca4fa364c8a7e2e2805d
+EBUILD kicad-footprints-6.0.1.ebuild 862 BLAKE2B 2baa7e57061f5c3c0b9a28987d2c2c44a238d2f5a09343b7e3b283149523a264bb4c8f0974455713836ee147ff0083a04ebcfcec92e02c3334964ea294bc0cee SHA512 896c3f6c3df813454e9c01a4876e7561c8989d63a9a0a6eb2771a72ab2538aa0bd977e80ac3a757e17a95fde6fc7aa6111497be89b1a463c64065cea3199e5fd
+MISC metadata.xml 766 BLAKE2B cba91a16d3b205f5f36dff3aba3afad956d98d23ac08ecb26bf3ef5471e5fdb7698c86cc1e245a34069f73a052eebdd37594941194b7f3f5d9c57a88718d7de0 SHA512 8d24ac5ad64aec5939be1244e417c2299353d6d618bea63ef949f6c82a865cee98ab11a3dd8c57e447e13203abc3a40da7070f585379c1ec54b0bd46c214d0ec
--- a/sci-electronics/kicad-footprints/kicad-footprints-6.0.1.ebuild
+++ b/sci-electronics/kicad-footprints/kicad-footprints-6.0.1.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-footprints"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-footprints.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~x86"
+	fi
+
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-5.99"
+
+if [[ ${PV} == 9999 ]] ; then
+#	 x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
--- a/sci-electronics/kicad-footprints/metadata.xml
+++ b/sci-electronics/kicad-footprints/metadata.xml
@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		The KiCad footprint libraries are the individual .pretty directories.
+		Each .pretty directory contains multiple .kicad_mod footprint files.
+		These footprints are best used in combination with the official symbol
+		libs and 3d model libs.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">kicad/kicad-footprints</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@ -0,0 +1,2 @@
+EBUILD kicad-meta-6.0.1.ebuild 610 BLAKE2B 076a001c4e2f7293d3cb459ce663b699404aabbc44ff646e3b65d2c65ee4660e19142fad23bfe7a18d3aef5c84f1834b92a7f421eba07078219ed8bebb4529cf SHA512 4331dc1c86b91e8a2f77d04bca014d88375a88d1c48367892553f3997ec16d357073adf6a5d98296b8e53380e25e5949891852fb7571b12cee9f4b0e48083de8
+MISC metadata.xml 625 BLAKE2B b85af17cbbc843d7d841344c73f0812457bf6ef209c44397bfcf5404175dc20a2525fb4b9501ca61ab686c7afb365bc7165b632ec71b907bcfbe7e651df54e0d SHA512 fdf916963a769a8b0f0d0f3ecf737c3e19a928ac3335d042fe9f57b700a9738f1e834a1f42a97efd9171fd3d218ac9f33337b30583516654efb03bc6902869c6
--- a/sci-electronics/kicad-meta/kicad-meta-6.0.1.ebuild
+++ b/sci-electronics/kicad-meta/kicad-meta-6.0.1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
+HOMEPAGE="http://www.kicad.org"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+IUSE="doc minimal"
+
+RDEPEND="
+	>=sci-electronics/kicad-${PV}
+	>=sci-electronics/kicad-symbols-${PV}
+	>=sci-electronics/kicad-footprints-${PV}
+	doc? (
+		>=app-doc/kicad-doc-${PV}
+	)
+	!minimal? (
+		>=sci-electronics/kicad-packages3d-${PV}
+		>=sci-electronics/kicad-templates-${PV}
+	)
+"
--- a/sci-electronics/kicad-meta/metadata.xml
+++ b/sci-electronics/kicad-meta/metadata.xml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">KiCad/kicad</remote-id>
+		<remote-id type="launchpad">kicad</remote-id>
+	</upstream>
+	<use>
+		<flag name="minimal">Do not install extra data like 3D packages and templates.</flag>
+	</use>
+</pkgmetadata>
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@ -0,0 +1,3 @@
+DIST kicad-packages3d-6.0.1.tar.gz 943455043 BLAKE2B 7d26b3f6eb9fe279343d9c43dfff875ba2f56b56ff1fe868a07fa43f9abe476f7b6c8e3e9122adf2bf5546b571f45573926055452bac9b5dc03618dd8ace245a SHA512 326ad5d3b4fea482921af2f69b21e7f36ad462632804c24c160b824e722d79050a2e7d81b499fad09c7e03381026a9d3d292a85ace79d7a7cc3a976454e8bb83
+EBUILD kicad-packages3d-6.0.1.ebuild 948 BLAKE2B aba3e55e129fad9feb303551a8ef5c04f9a5c78630b8bbc11219e7b55d8cb131f6fa33c3129b4a8f166a49b8f9333135b0e5817b2504b679757c4f976deb62d0 SHA512 b851cb00fd1ce776693027054a9b65f723081836b7bb6b8104fe953624a28ca357232b0d5e115ac3ea30953e4ea4d8a98d4b4a2fe7b23500872369ac3f51842b
+MISC metadata.xml 976 BLAKE2B 70851f4db73dbf597cb669018fe27e4e1507cf4e86fa82488751a27fbdb8e85eb13d81ec42d62685c459a8c56cb1899579430132bc9ae4c0c0c2fdcb756bae1b SHA512 1e6512afe9ff98ee23c33bb339e1b6ad4b9da8d2bdf6ea52f40874ab77e4918aa565a550c384ecdc693a2f7b366cd07d4c5abae52dfc6177cf9262ad1a01d7b4
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.1.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.1.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~x86"
+	fi
+
+	S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-1080b6e565e56bae9be46db2278a1542092d7a2d"
+fi
+
+IUSE="+occ"
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-5.1.0[occ=]"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND=">=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="11G"
--- a/sci-electronics/kicad-packages3d/metadata.xml
+++ b/sci-electronics/kicad-packages3d/metadata.xml
@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		The KiCad 3D model libraries are the individual .3dshapes directories.
+		These 3d models are best used in combination with the official footprint
+		libs. Each directory directory contains multiple 3D model files, with
+		the following supported file formats: WRL, STEP.
+	</longdescription>
+	<use>
+		<flag name="occ">
+			Use <pkg>sci-libs/opencascade</pkg> for data exchange
+		</flag>
+		<flag name="oce">
+			Use <pkg>sci-libs/oce</pkg> for data exchange
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">kicad/kicad-packages3d</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@ -0,0 +1,3 @@
+DIST kicad-symbols-6.0.1.tar.gz 4809762 BLAKE2B 8133932edf7f480ea61c98838e0c7b0ed32c79ef8cc89d385192c7cd137bcfabdb9a4ed28cc10b2006dfc37729b070d286a5b29b94108da487c797fef1605b20 SHA512 0f62118118adff693bb127d229232cfeeb88f48d3d818d44c3d9d8d1db89de903587ed8cc9081914eec8233650dd0bac6dd5d4618b4417bdf06955ebd1b8923c
+EBUILD kicad-symbols-6.0.1.ebuild 853 BLAKE2B 3dc1b33c750bf72c8d4cc4a3b74a343896821b2550c7f62da393780d76bf7cb9c58d2d77329af800e2831cc04219959a3a867e2346ebd21b205292ee3f74a427 SHA512 e2aae5d0b1deba924b15ec05b29c487f7b8afd50f69c33deaa0f5c484feedbda5a12f150e8224cea28cfc2dfcd7ec77c0e95f8b8919ba9af08dbb7d10a1542ef
+MISC metadata.xml 724 BLAKE2B 10eccd33b4ca07e25e2b3ce44d30583671b33836f7fb7a9c68b063bb267529fb0e2988b71bc57d0d92967f583ae3ac4e0cdf0762da687a834f51620f45df5411 SHA512 76569f2955cf1db93bbac820d513aa4d58f4bf27089736a9adc98e1df4d21c0c80be6c894dc2eb024b2cb0271e37a479b15ce68d377bd028df2becf5166958a2
--- a/sci-electronics/kicad-symbols/kicad-symbols-6.0.1.ebuild
+++ b/sci-electronics/kicad-symbols/kicad-symbols-6.0.1.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-symbols"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-symbols.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~x86"
+	fi
+
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-5.99"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
--- a/sci-electronics/kicad-symbols/metadata.xml
+++ b/sci-electronics/kicad-symbols/metadata.xml
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		The KiCad symbol libraries are the individual .lib files, with the
+		corresponding .dcm files containing symbol metadata. These symbols are
+		best used in combination with the official footprint libs.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">kicad/kicad-symbols</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@ -0,0 +1,3 @@
+DIST kicad-templates-6.0.1.tar.gz 2248692 BLAKE2B fa9f1667958f25f965e1f41b50b009724b8b46960b55561048aca74f876196ac896ee72294f32ad815f7d7097dd4caba2a4fe8c5f6731e0e13322c48cf6df1a0 SHA512 ee0423949e63a17634c0abe3eb5184d16650cf702f37fa2f10af8f0e9377d4031b0b213cb8570af63d8ff8d5549f0b6f153287db9d8f64140273134ee2650a60
+EBUILD kicad-templates-6.0.1.ebuild 690 BLAKE2B a91c08077e54223fdf646bb8a28ef168da5d7df0525ebb23a2f527f5d1c94b292679cde75de8476f917e2279eaaf1b21246126ff072e3a08cda4a70c853e1bfe SHA512 9f6be9016a944498a8e8302bbb2e610f14c255f399b58564b68e04faf6f3d758823063d5b4c6400a8aac612768ba006657225b0f27d0abe30a5aebe2ea908e45
+MISC metadata.xml 484 BLAKE2B 3542f585439e05e86fc86e11f524c15f10f835fe5419141b6361ae4503dc6dff5d0c9d7bb24134c3722e4ab11d6cad6d450625f7e5edc822b3d0ee82fd8bde48 SHA512 03468e0fa2d56c7241219eb07b1cddc225b5e18f6800a513005f76cd19110b4ad9d8f9b2895107695b6c62c8f276b38bbf544a7651b61f3e83878c94a40b8886
--- a/sci-electronics/kicad-templates/kicad-templates-6.0.1.ebuild
+++ b/sci-electronics/kicad-templates/kicad-templates-6.0.1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools project templates"
+HOMEPAGE="https://github.com/kicad/kicad-templates"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/${PN}.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~x86"
+	fi
+
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-5.99"
--- a/sci-electronics/kicad-templates/metadata.xml
+++ b/sci-electronics/kicad-templates/metadata.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kicad/kicad-templates</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@ -0,0 +1,3 @@
+DIST kicad-6.0.1.tar.gz 44971453 BLAKE2B e9fcaf367efb544197fb2ce448b0d808bb79f166e73e5c6f4c7c0ef303ee1bed5697101883ad4945aea8a1a1cd3b868832ea1ebfb727dfc8bdf56ce4d177838e SHA512 a257c69e0515c6d0c709bb59f632daff6e1e2108e1b1d4553d0cde397d551c3bfd969471dc63efdb12d57202842e1f645026650e2a7ca2c8af8b7150ceaebb3d
+EBUILD kicad-6.0.1.ebuild 4160 BLAKE2B 9a4ac201beec0b3fad26b0400a02a3df0b51d8cbc91e261a0d2092706576815682cb04be0c81b8ae6c92cc798e73b95089d7cf6e8fa5d862b32fb16a8efca0bc SHA512 2a62ba808de89273879d4311d068db7cc99bb32d521df16a682492596fbad852953174eda04d1f70b1322651560488d502bffe2e411a7ae3bf1ca18f73f43bfb
+MISC metadata.xml 1140 BLAKE2B e7f0b293ca2a8304712fab8165dda2ed527dd93809748e562e56ef0a1a23e3703e56599551eb6a318304e9e0d74a30eb361f497cbc8809c2d82b42ff7f160c1a SHA512 7f4e1ec8886f042ce559d2401b3721b474b2e7c4799610419732aae228fe6583e99ec0b49f12df4ec4bcfd6c5238861c22a200a8f9712d4c5c7d91d0b74a60e5
--- a/sci-electronics/kicad/kicad-6.0.1.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.1.ebuild
@ -0,0 +1,167 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+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.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~x86"
+	fi
+fi
+
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
+SLOT="0"
+IUSE="doc examples +ngspice 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
+COMMON_DEPEND="
+	!sci-electronics/kicad-i18n
+	>=dev-libs/boost-1.61:=[context,nls]
+	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-1.61:=[context,nls,python,${PYTHON_USEDEP}]
+		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	ngspice? (
+		>sci-electronics/ngspice-27[shared]
+	)
+	occ? (
+		>=sci-libs/opencascade-7.3.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="800M"
+CAS_VERSION=7.5.3
+
+pkg_setup() {
+	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/${PF}"
+
+		-DKICAD_SCRIPTING_WXPYTHON=ON
+
+		# Merged from separate -i18n package, bug #830274
+		-DKICAD_BUILD_I18N=ON
+		-DKICAD_I18N_UNIX_STRICT_PATH=ON
+
+		-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 "Different languages for GUI" sci-electronics/kicad-i18n
+	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
+}
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="github">Add github support into PCB editor</flag>
+		<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="oce">Enable viewing 3D rendering of designs via <pkg>sci-libs/oce</pkg></flag>
+		<flag name="python">Enable python scripting support</flag>
+		<flag name="pcm">Enable plugin content manager</flag>
+	</use>
+	<longdescription>
+		Kicad is an open source (GPL) software for the creation of electronic
+		schematic diagrams and printed circuit board artwork.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">KiCad/kicad-i18n</remote-id>
+		<remote-id type="launchpad">kicad</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/sci-electronics/pcb2gcode/Manifest
+++ b/sci-electronics/pcb2gcode/Manifest
@ -1,2 +1,2 @@
 AUX pcb2gcode-9999-gcc-11.patch 16034 BLAKE2B 112322dac10529fb51217d237be144c55800ccc642e8d56212f7e4a2355be1af9ef90bea2e3b14e8c5b5d3074433284d0a8e755cfc809bca3f84e4b8ef36d78b SHA512 3cc777212f45ad0c4d489feb90f5ec2f46d1e67f5f231d034dc695464dfd8adaefd0533431cfaf7828c8071a67261415de992f338aac7b3f25936ad0f25389fa
-EBUILD pcb2gcode-9999.ebuild 1086 BLAKE2B b87dfb99fcef6d23556458e8946dcd0ae9046974f3d396d6a597786ae7f5787991c4638be4f9cfba94e4aa766b2c1c59bfc5a4a04f84bc044d2973452cc9a2d8 SHA512 b020d07d2e8705ab748e22929d2d016e3d5137fa04f74e17631e34c1e308a8e5ee464152d1248868ba54e01aa87221801eb82d1d50757e639b095fe72410756f
+EBUILD pcb2gcode-9999.ebuild 1087 BLAKE2B 6c4e21e5f1331c090141e9fab9a6b7024fa6d994f7f3e93068184ffa7547c69354992bd08442b5fed2d11b00b9367be64bd12fe6e8fa3d243f80bc0eb9bacb3e SHA512 0a4fa97ab1903ee677a38e25ff23933f90b6133654344ebe6ce3c8585464bcdc26e7c47ded8dab9a3486db89d7c24b01ef712e9a268fc1ab5c7dce4fb71c45c2
--- a/sci-electronics/pcb2gcode/pcb2gcode-9999.ebuild
+++ b/sci-electronics/pcb2gcode/pcb2gcode-9999.ebuild
@ -30,7 +30,7 @@ DEPEND="dev-cpp/gtkmm:2.4
 	${RDEPEND}"

 src_prepare() {
-	eapply "${FILESDIR}/${P}-gcc-11.patch"
+	#eapply "${FILESDIR}/${P}-gcc-11.patch"

 	if [[ ${PV} == "9999" ]] ; then
 		eautoreconf
--- a/sci-electronics/smartsim/Manifest
+++ b/sci-electronics/smartsim/Manifest
@ -1,2 +1,2 @@
 DIST smartsim_user_manual.pdf 1625979 BLAKE2B 804f4ca0fd1e4c7101a7701f684d5e77f892b4c2875e6a7069f465d89fad86eb996185e5884a34723198502baf03c761f3200e7fcd243d4078615827e99bac90 SHA512 607fba86bd7a6a57ae29627ba0ead77ebcac0060bf596f26eaef852b0e5d4e3e1a06abf8634fd8a418b504b1e384f72b63a8a12d4a41f98ae538d9a074dcd4c4
-EBUILD smartsim-9999.ebuild 746 BLAKE2B de363718a532e0728a967e5a180a72a0ed99c86120cca9471c7ba9c27ebfe37bc0bbfb5a5c705c00deb6e291fa5596f4d9f876bd33ec176c3652a02609c587d3 SHA512 d463d5f51b6ba1ccd1b712d08a97d8581d7a17211febbf47da4709bcdbb7d01d284b6070e7f12831c3255889bdc2d404dfa84ca341391e70fc28d296be6b5b45
+EBUILD smartsim-9999.ebuild 748 BLAKE2B cf6437d1259d05c4ae1ea7f23f3bf88efc6b09ca48962281ce11e767826a51acc95f04fcb9d60d8bd9f9b01ce5e4a5659d1781653a670687ae44e0ef1297239e SHA512 df1c2b02f0d1faf188b4370ab52bafa2b805027629771e03939ce74640fa29ead1a998d13d8da3d6b9f97d3fb225269dc977411e9a68a2caeef3dc402d4d6c79
--- a/sci-electronics/smartsim/smartsim-9999.ebuild
+++ b/sci-electronics/smartsim/smartsim-9999.ebuild
@ -9,7 +9,7 @@ inherit git-r3 autotools
 DESCRIPTION="Digital logic circuit design and simulation package"
 HOMEPAGE="http://www.smartsim.org.uk/ https://github.com/ashleynewson/SmartSim"
 SRC_URI="doc? ( http://www.smartsim.org.uk/downloads/manual/smartsim_user_manual.pdf )"
-EGIT_REPO_URI="git://github.com/ashleynewson/SmartSim.git"
+EGIT_REPO_URI="https://github.com/ashleynewson/SmartSim.git"

 LICENSE="GPL-3"
 SLOT="0"