Kicad update

2023-11-21 23:08:59 +01:00
parent 16aaeb7b5e
commit f5ee2c36dd
22 changed files with 479 additions and 17 deletions
@@ -1,3 +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
+DIST kicad-doc-7.0.9.tar.bz2 107422748 BLAKE2B 735a0789c610e710bfebbb13477f32074a3e75a68a361c2907d09242ba0d28a4cd8c43173b462ff2d364080f26147cedba52b2b476aab56410038f3636e55a1e SHA512 7056cba04b71423d30d8b3592d26d2dc325c82dcdd55cd406151ee0b5c5e62921cc2bcd44ece75a0b764b4e3965b38f077f9f7e656c5e39bccc97a883075cd8d
+EBUILD kicad-doc-7.0.9.ebuild 1811 BLAKE2B dd463832069201a6775846383f74bc0f3e04426307267153960e6d6248e862d53c0d87c93fc70672c1aefa3030f20997009fb8c5cd7d076a31960e75c1ed5e3f SHA512 b800a6f5befc4d0f293767ac85e56c11b136023f45186a13285d3629b100df55232d4d83188d02dc5af5fac55c9265b68bfad75d68ba94b1621dfb6d952321ba
+MISC metadata.xml 861 BLAKE2B d1cfbf0b3a558b876cc446ffb27ac09d0bac29328d370b064f950117692a0582adc48cac4c8d887ac4151aae72c8cbeef20b521da166a77c7a787951da812f8c SHA512 3d12ebc29679fc7b7d2a75d5d33a053dfb21c96213aa98dd8350f4eb364a4149e35b0f18ca6d9e59f86e57df0abb59e182c7f8fdfda38e4bce8a5308009c85fa
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -14,16 +14,13 @@ if [[ ${PV} == 9999 ]]; then
 	# 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"
+	SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 fi

 LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
 SLOT="0"
-# TODO: Change default back to +df once asciidoctor-pdf is packaged?
+# TODO: Change default back to +pdf 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"
@@ -34,7 +31,7 @@ unset LANG_USE
 # TODO: need asciidoctor-pdf for pdf
 # bug #697450
 BDEPEND="
-	>=app-text/asciidoc-8.6.9
+	>=dev-ruby/asciidoctor-2.0.12
 	>=app-text/dblatex-0.3.10
 	>=app-text/po4a-0.45
 	>=sys-devel/gettext-0.18
@@ -53,13 +50,10 @@ BDEPEND="

 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
+		-DPDF_GENERATOR="DBLATEX"
 		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
 		-DSINGLE_LANGUAGE="${L10N}"
-		-DKICAD_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}/help
+		-DKICAD_DOC_PATH="${EPREFIX}"/usr/share/doc/${P}/help
 	)
 	cmake_src_configure
 }
@@ -19,6 +19,6 @@
 		diagrams and printed circuit board artwork.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">KiCad/kicad-doc</remote-id>
+		<remote-id type="gitlab">kicad/services/kicad-doc</remote-id>
 	</upstream>
 </pkgmetadata>