From 3517852e3b8a68d1e997770fc0650c5053bafc6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 Jan 2022 01:27:12 +0000 Subject: gentoo resync : 04.01.2022 --- app-doc/kicad-doc/Manifest | 4 +- app-doc/kicad-doc/kicad-doc-6.0.0-r1.ebuild | 65 ++++++++++++++++++++++++++++ app-doc/kicad-doc/kicad-doc-6.0.0_rc1.ebuild | 61 -------------------------- 3 files changed, 67 insertions(+), 63 deletions(-) create mode 100644 app-doc/kicad-doc/kicad-doc-6.0.0-r1.ebuild delete mode 100644 app-doc/kicad-doc/kicad-doc-6.0.0_rc1.ebuild (limited to 'app-doc/kicad-doc') diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest index 737f4f30c7d6..14f294aa4d19 100644 --- a/app-doc/kicad-doc/Manifest +++ b/app-doc/kicad-doc/Manifest @@ -1,5 +1,5 @@ DIST kicad-doc-5.1.12.tar.bz2 74217615 BLAKE2B f0906fdb0cf697348e06b63ef0003630a9035d47732c9a22ed3c4fee2f21c02f85fda51eee5149291b72326adc4899b31198178ee6e6ac0d494361cec6c06208 SHA512 db678d91ea5f564ca3f266829c297362cfd6cf35a5dced2ede5e7c9c38a37ca1037b264ee9314fa5c4a9d8197fcd92484ad4cae3668ea9741947d38c7ac7f910 -DIST kicad-doc-6.0.0_rc1.tar.gz 79671406 BLAKE2B 7ab224ea2ec376c6c073018bc97f932e4097bed205ce8d92ac6b9db5db85fafd6de97a41026d890d3c38073cf410be0490f5e81f97e77c7e63d53a55ddc67527 SHA512 b8dc91daa72f46c2311675a3a4a4317fd2da5c877317e49e4f43ae85f9e1ac859405a3ec35a5fa6fa400825ea5b45350565803efdbf459f5c87844d534cf9bee +DIST kicad-doc-6.0.0.tar.gz 81338236 BLAKE2B 949d07a1b16635ad5be1a4855bc0c530a85c5d674096e8d1ae48e250e56168c2cb203d71a882e64c1816f0eb7c4ad1a0233be70bcbac185b2b8bb1e99b85dc66 SHA512 1f327c407b0ae88d1f13266571d978fd18fded857e63f1a56a10aa518da6ccb72e85a35215a51f4c91382f61445d141d837244699e932f411f6522bcf26290c3 EBUILD kicad-doc-5.1.12.ebuild 1433 BLAKE2B 61ab869971082533455fdaed043c899d3e06057c646587ad1913f81f50827e1cbaf10cf7ee7554b01dc26c5af2e0039b55515b9f4c69ad0801ac9ac820a1651d SHA512 ee92e2d045ce6174617369bd37b3390c6292b0688f779bc01b37ccc5f368ff9dfb2780695c700a054e80f5ab401f174b601371fbd0048de597863845d85e5f3f -EBUILD kicad-doc-6.0.0_rc1.ebuild 1867 BLAKE2B 0dbade7efe07859da30b7b51ddb40114902116bf5e9795422adb09c4aa418a86d1c3c723dc4eb582595a31cdb4bca98223d2df8227f1ce00887b751b7c7bb8a7 SHA512 10584407d37ecde537e2046dd17659560c1eeeeb2c6f9cea3f70e9207fc64fab550a27d92588a8466205a4005fa5ff558be9b6d5948975c6616371e3ad87e637 +EBUILD kicad-doc-6.0.0-r1.ebuild 2043 BLAKE2B 40b1af5d17b368497a74c83b55834e97783d7caa1bfc7702795bbf531afb8914b57ebdec5b27d086419df29b2a9fcc28bf7d3143031907b54360baf3b9915664 SHA512 3773c5a2a2cd3b1d1654c3ce018be0f5a12c06821352c4c5d06c26d3268ae2c802f86ce22791084907d3cf83180f062a18d3c5cfb9fd097c89628f89d20f7901 MISC metadata.xml 852 BLAKE2B 9b21d1f5ae47786e87fdf3703b2e65645cbc4746b861f023f8ca94a9d32dd8c50594eec0e316538943abe7f93a261b3fb2e96f1ac56bccbc316e2f9ef06cfb77 SHA512 aed642bd4c57be8cdae2dc31c81db0915b30032b72dbce3ea157163e2713bd3fe6812aa96c3ee3894f84cfa9126577fb69c2da35525eee2124728c004b436fad diff --git a/app-doc/kicad-doc/kicad-doc-6.0.0-r1.ebuild b/app-doc/kicad-doc/kicad-doc-6.0.0-r1.ebuild new file mode 100644 index 000000000000..a3020d2a2df1 --- /dev/null +++ b/app-doc/kicad-doc/kicad-doc-6.0.0-r1.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 +} diff --git a/app-doc/kicad-doc/kicad-doc-6.0.0_rc1.ebuild b/app-doc/kicad-doc/kicad-doc-6.0.0_rc1.ebuild deleted file mode 100644 index 9bf5e27bb2a0..000000000000 --- a/app-doc/kicad-doc/kicad-doc-6.0.0_rc1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# 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 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=( - -DBUILD_FORMATS="$(usev html);$(usev pdf)" - -DSINGLE_LANGUAGE="${L10N}" - -DKICAD_DOC_PATH="${EPREFIX}/usr/share/doc/${P}/help" - ) - cmake_src_configure -} -- cgit v1.2.3