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

3 files changed, 4 insertions, 71 deletions

diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index 8e9cc7292fb3..19c1b83a2491 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,9 +1,7 @@
-DIST kicad-doc-6.0.11.tar.bz2 79253772 BLAKE2B 904c01cd00b1669620018194e98303c00ba2ba32b44fed2f36966edf40487c26b6a7ed827a0c35908eb74ea04054a0c7cc39d371e5c6013bee484bf2b67f6177 SHA512 1c942a53dfcf071e83d5b7674df446b55818961da69586fe772467e4cf7ea64a13de01af20ec087c8a73f9d101a5a48680d840415e1a278e2ef5b22952980180
-DIST kicad-doc-6.0.9.tar.gz 81321926 BLAKE2B 0885d0210afcc83c2ccaad3a0caac912e8f756e69c4569e543a81440e14b6e3ead68ccc427f4dcd9026ebf86a8e3c45487955479bf8c43ce9bb6680de9da777c SHA512 be8ae3bbebce334d7d7ab0e24bf3712aaa83b078f1a4495b755cdd9a5ff8e55951dbd82c5ac17c5aeba66008a9e6ef1b9f104f51ad340cb7cb88abdd86e5853d
 DIST kicad-doc-7.0.1.tar.bz2 104103280 BLAKE2B dbdcd82e65c9d3a2bff629f8fa4e3cc34c2adbfa3fe9a808e3802addc3d75f3875ad52c4f5e79cb2bfb7563a6288d0c2eb6f119adf4f7fd2f31360cea82d1ea7 SHA512 5274ef673db9e415d5b82522681acdd4ee2b2f615bb52abdd11ebd17b72f36852ee297fdb98f9cf1dee12671a23adc24a6a8a03be720b579bbee7a9ead167e41
 DIST kicad-doc-7.0.2.tar.bz2 104105560 BLAKE2B e6617c5390fd03c7e388a532bd34fbf13baa2fffabac0a63ad84a1e30c398ff5d240cb7ac890945a56fdbdd7300398f37667974797d60afc8a4f6438a6bf324b SHA512 d05a1b9988bbaaa630d036c0b90e81020bd0d51dbccbe6918983bea7894476e0a186fa133fc88aa365c9d26e51b1184f7ce5f375847b828f6b9a85abfe6fd33e
-EBUILD kicad-doc-6.0.11.ebuild 1953 BLAKE2B f332ae1aba1545ef3e829a188a440e69cec94db2c0d8974552c381e0a526c72e6df38c77ab37f5d0de91728338f8e6f1d5544fd764df01b553c40cbb56491b05 SHA512 78d4a0b45b946c53929aaff58f8d0fb9be6c06a7970daa18af88caf5696aef92b6bf718bfcfeb5f404fb2d3a17eacffaa95004b9769de9f55ff29b67cdd5f7c4
-EBUILD kicad-doc-6.0.9.ebuild 1951 BLAKE2B ddc5726a9b11c2aaccacb932c44a0bbf5478c673118314e831a7182f67f0075bfb4d485d89cc351b11bee1f0ee46e2bb70d0b7bead64a529300f388c9cd70ee7 SHA512 09f93b3466705ee7c70d4c55099031ac6bd919c8550c832e266c7627bc2f7376071e4bdfca1e63c23030bb9812c0487106df6a82ba59e33ddbc0113d348fb737
+DIST kicad-doc-7.0.6.tar.bz2 104105032 BLAKE2B d8cf3cdbaf4088793ba0f6b5625c92b83972620a9da2240827b3a38ae18f66e3fa277c7c930195e18604a6b13dd8fa2a8a5d90de70cbe609575f3d9f89d75d01 SHA512 2162119a1e0b3626a65841e6a6e60561512a27c10b79345ee3713f3b046a58448ad9765f6b430ad77d67ca75cb0d9f37018f2540020406cde0b5a35969db20f4
 EBUILD kicad-doc-7.0.1.ebuild 1810 BLAKE2B f37bc6841d8aa2c457341d56643ec14048af7c6c97b671a607f8a069750bb885439ba5d07c0dd677f73e1b5cfafe68062483e439cfee78f9b84ba73d48615892 SHA512 0e3674a86ab2b0bd61cf0505dde1e2910502ce992fac8f276b86738e0082860e1ff577f5d84412d60f085bea9443f9872540908a5e93b7afef47794ca84d8811
 EBUILD kicad-doc-7.0.2.ebuild 1811 BLAKE2B dd463832069201a6775846383f74bc0f3e04426307267153960e6d6248e862d53c0d87c93fc70672c1aefa3030f20997009fb8c5cd7d076a31960e75c1ed5e3f SHA512 b800a6f5befc4d0f293767ac85e56c11b136023f45186a13285d3629b100df55232d4d83188d02dc5af5fac55c9265b68bfad75d68ba94b1621dfb6d952321ba
+EBUILD kicad-doc-7.0.6.ebuild 1811 BLAKE2B dd463832069201a6775846383f74bc0f3e04426307267153960e6d6248e862d53c0d87c93fc70672c1aefa3030f20997009fb8c5cd7d076a31960e75c1ed5e3f SHA512 b800a6f5befc4d0f293767ac85e56c11b136023f45186a13285d3629b100df55232d4d83188d02dc5af5fac55c9265b68bfad75d68ba94b1621dfb6d952321ba
 MISC metadata.xml 861 BLAKE2B d1cfbf0b3a558b876cc446ffb27ac09d0bac29328d370b064f950117692a0582adc48cac4c8d887ac4151aae72c8cbeef20b521da166a77c7a787951da812f8c SHA512 3d12ebc29679fc7b7d2a75d5d33a053dfb21c96213aa98dd8350f4eb364a4149e35b0f18ca6d9e59f86e57df0abb59e182c7f8fdfda38e4bce8a5308009c85fa
diff --git a/app-doc/kicad-doc/kicad-doc-6.0.9.ebuild b/app-doc/kicad-doc/kicad-doc-6.0.9.ebuild
deleted file mode 100644
index 0c112a32d334..000000000000
--- a/app-doc/kicad-doc/kicad-doc-6.0.9.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 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.11.ebuild b/app-doc/kicad-doc/kicad-doc-7.0.6.ebuild
index 2c31830221af..c8d6e1ad547f 100644
--- a/app-doc/kicad-doc/kicad-doc-6.0.11.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-7.0.6.ebuild
@@ -31,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
@@ -50,10 +50,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