gentoo auto-resync : 17:02:2023 - 08:06:58

4 files changed, 24 insertions, 73 deletions

diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index efea3fb48b51..27ae064c97fa 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,7 +1,6 @@
-DIST kicad-doc-6.0.6.tar.gz 80517799 BLAKE2B 58d1bab65637e65b8ce79f6e8e9e913a1fb0d5d22a1241c7d10f0440c12a6f8ac2b758d6852a1138fe0587bc695905c0f2b2d017e79e7e5283ecb4e49ab1d5ff SHA512 90f809ea5923b59169884e090263ccb2c0a9705ddc4ce3817e78736dbebb820a6189eeca4058919b6a53164d8f75746b49bc7667e5e0e534e0c9d3fa8af1f44a
-DIST kicad-doc-6.0.7.tar.gz 80519836 BLAKE2B 228f33e23aff2f7229e33c24410c1b604c1edad42ba26a42862d924526967724761d4fb82bc32cfd45c7999317330d411e25d2c46f0ac3faeaf5333f1415d9ab SHA512 4619b8394e7aca7f880ace7dbf46bdc8bf2f794719587db3f550c2f3d7731fdebb4afd5028f59477cf8e0563a9099502f41649f136828a424ebe29fc67e2259d
+AUX kicad-doc-7.0.0-eeschema_advanced.patch 597 BLAKE2B aa62c9ca99ea9202931797f0eb9e074ff86576efb355efac865e0e2f4edb096f9fe06f47cf173dada98ad87e91cfde9530a82263c319df246d92dcf0af661708 SHA512 73fabf9289a0276ba754d3769e70cd10975ee3b9a96c2ea802401dd11cf3c3e6f42a9c1fdb034fac7fc664c2f28a694f8713cef629dabb0885a147cf87ec46de
 DIST kicad-doc-6.0.9.tar.gz 81321926 BLAKE2B 0885d0210afcc83c2ccaad3a0caac912e8f756e69c4569e543a81440e14b6e3ead68ccc427f4dcd9026ebf86a8e3c45487955479bf8c43ce9bb6680de9da777c SHA512 be8ae3bbebce334d7d7ab0e24bf3712aaa83b078f1a4495b755cdd9a5ff8e55951dbd82c5ac17c5aeba66008a9e6ef1b9f104f51ad340cb7cb88abdd86e5853d
-EBUILD kicad-doc-6.0.6.ebuild 1951 BLAKE2B 9509f70dc7e6fc065583b2a0b917367378d789e3eb4c08afc28457296e73891d547524b27ea4c80919386cbd772cd79a24174985d751f75b50b286d1a2cdf7b6 SHA512 7224b385730f1b4a2998e490e9e740e89560b669ca15cedc418ae4312c88ef6cc08383b4f51c0594aa5804f453ca215adbcfaaca257669b9fc675cfe80e65328
-EBUILD kicad-doc-6.0.7.ebuild 1952 BLAKE2B 969b242a5958ebf769bfa97af3efade6f75b836d6ae0865e33b5ec374efea582bac93f99e2f3251dee62688d0d97f1054919c3a7b08e32431829cd8c2a54ad94 SHA512 b45d9c3400cfddfeae471750e9d2cfd2b2ceb6ea1595277ec8f76e9e806f927714e9bbae079cfbc222eb3a5806283159b07ac4331e31b2ae1683316a00119b55
+DIST kicad-doc-7.0.0.tar.bz2 104561946 BLAKE2B 1f19b489a3b40e15f9f4a775582caf192180b345bf559d8e2b1954b2c72301ad25264e7bf27df46ba9b2a52848478441df383f5766c7111340b04aa45720f40a SHA512 b3cd797751b3183eabadd71e02031ff0b3e5d4744e1c55c16ae5b22bdc45f7cb874defde407d6d819b7c00b06daad84260b980f9afca1f5805c17ebf177300b8
 EBUILD kicad-doc-6.0.9.ebuild 1951 BLAKE2B ddc5726a9b11c2aaccacb932c44a0bbf5478c673118314e831a7182f67f0075bfb4d485d89cc351b11bee1f0ee46e2bb70d0b7bead64a529300f388c9cd70ee7 SHA512 09f93b3466705ee7c70d4c55099031ac6bd919c8550c832e266c7627bc2f7376071e4bdfca1e63c23030bb9812c0487106df6a82ba59e33ddbc0113d348fb737
+EBUILD kicad-doc-7.0.0.ebuild 1868 BLAKE2B 690fb1e0cbdad798da47cb5785e6e38892c774767cf3ceac1f94184c1eff773dd2940b2774592254f6910f706e3d3d988b4418f54dc85af82276d26a8ad83849 SHA512 72478bb677432d5c51020a718df6eac38901d7490de834112acb944ff58bfa469aadffd8462c6418d2450c6ca18e77be44c4c9d8557d7975f151eee7f633d554
 MISC metadata.xml 861 BLAKE2B d1cfbf0b3a558b876cc446ffb27ac09d0bac29328d370b064f950117692a0582adc48cac4c8d887ac4151aae72c8cbeef20b521da166a77c7a787951da812f8c SHA512 3d12ebc29679fc7b7d2a75d5d33a053dfb21c96213aa98dd8350f4eb364a4149e35b0f18ca6d9e59f86e57df0abb59e182c7f8fdfda38e4bce8a5308009c85fa
diff --git a/app-doc/kicad-doc/files/kicad-doc-7.0.0-eeschema_advanced.patch b/app-doc/kicad-doc/files/kicad-doc-7.0.0-eeschema_advanced.patch
new file mode 100644
index 000000000000..d862bfceccdf
--- /dev/null
+++ b/app-doc/kicad-doc/files/kicad-doc-7.0.0-eeschema_advanced.patch
@@ -0,0 +1,13 @@
+diff --git a/src/eeschema/eeschema_advanced.adoc b/src/eeschema/eeschema_advanced.adoc
+index d51209da642753d6cbbf862195d61b3c5317b9a3..be417983c5065164a6500e49b5b0e380c3fd9412 100644
+--- a/src/eeschema/eeschema_advanced.adoc
++++ b/src/eeschema/eeschema_advanced.adoc
+@@ -280,7 +280,7 @@ information for KiCad to connect to your database and retrieve data from tables.
+ below into a new file and save it with a `kicad_dbl` extension.  You can then add this file to your
+ global symbol library table using the Configure Symbol Libraries dialog.
+ 
+-[code,json]
++[source,json]
+ ----
+ {
+     "meta": {
diff --git a/app-doc/kicad-doc/kicad-doc-6.0.6.ebuild b/app-doc/kicad-doc/kicad-doc-6.0.6.ebuild
deleted file mode 100644
index 7bf365023628..000000000000
--- a/app-doc/kicad-doc/kicad-doc-6.0.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 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
-	SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
-SLOT="0"
-# 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"
-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/${P}/help
-	)
-	cmake_src_configure
-}
diff --git a/app-doc/kicad-doc/kicad-doc-6.0.7.ebuild b/app-doc/kicad-doc/kicad-doc-7.0.0.ebuild
index 51164ea1dde5..c12d7542d2ea 100644
--- a/app-doc/kicad-doc/kicad-doc-6.0.7.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-7.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	# x11-misc-util/macros only required on live ebuilds
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
-	SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.gz"
+	SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 fi
 
@@ -28,10 +28,14 @@ IUSE+=${LANG_USE}
 REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
 unset LANG_USE
 
+PATCHES=(
+	"${FILESDIR}/${P}-eeschema_advanced.patch"
+)
+
 # 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
@@ -50,10 +54,7 @@ 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/${P}/help