From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3147B158086 for ; Mon, 27 Dec 2021 01:19:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B4642BC007; Mon, 27 Dec 2021 01:19:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F8402BC007 for ; Mon, 27 Dec 2021 01:19:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF84D342DB6 for ; Mon, 27 Dec 2021 01:19:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6755A1FB for ; Mon, 27 Dec 2021 01:19:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1640567946.469197fae79659e03789e6c58e57597a9ecda82c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/kicad-doc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/kicad-doc/kicad-doc-6.0.0-r1.ebuild app-doc/kicad-doc/kicad-doc-6.0.0.ebuild X-VCS-Directories: app-doc/kicad-doc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 469197fae79659e03789e6c58e57597a9ecda82c X-VCS-Branch: master Date: Mon, 27 Dec 2021 01:19:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 991414eb-cdfa-4eb6-8fa2-156e95b1d15b X-Archives-Hash: 9753423e07e7bf55a908ce80b19a36c3 commit: 469197fae79659e03789e6c58e57597a9ecda82c Author: Sam James gentoo org> AuthorDate: Mon Dec 27 01:16:09 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Dec 27 01:19:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=469197fa app-doc/kicad-doc: use asciidoc, use ${PF} for docs - Use asciidoc for now (not clear if upstream will continue to allow it though) - ${PF} should work now with a corresponding change in kicad (https://gitlab.com/kicad/code/kicad/-/commit/c5e77e9739424837540469780cef3ffb66eadbf3) Bug: https://bugs.gentoo.org/827290 Bug: https://bugs.gentoo.org/830024 Signed-off-by: Sam James gentoo.org> .../{kicad-doc-6.0.0.ebuild => kicad-doc-6.0.0-r1.ebuild} | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app-doc/kicad-doc/kicad-doc-6.0.0.ebuild b/app-doc/kicad-doc/kicad-doc-6.0.0-r1.ebuild similarity index 90% rename from app-doc/kicad-doc/kicad-doc-6.0.0.ebuild rename to app-doc/kicad-doc/kicad-doc-6.0.0-r1.ebuild index 9bf5e27bb2a0..c77cb606301d 100644 --- a/app-doc/kicad-doc/kicad-doc-6.0.0.ebuild +++ b/app-doc/kicad-doc/kicad-doc-6.0.0-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -23,7 +23,7 @@ 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 +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" @@ -53,9 +53,12 @@ BDEPEND=" src_configure() { local mycmakeargs=( + # May not always work? + # https://gitlab.com/kicad/services/kicad-doc/-/issues/808 + -DADOC_TOOLCHAIN="ASCIIDOC" -DBUILD_FORMATS="$(usev html);$(usev pdf)" -DSINGLE_LANGUAGE="${L10N}" - -DKICAD_DOC_PATH="${EPREFIX}/usr/share/doc/${P}/help" + -DKICAD_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}/help ) cmake_src_configure }