gentoo resync : 25.11.2020

5 files changed, 24 insertions, 73 deletions

diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index d8c038c63302..6e23ac744596 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,8 +1,7 @@
-DIST kicad-doc-4.0.7.tar.gz 54384893 BLAKE2B c38342ebb9b5a14f3bc2a6cffb870bf4238fe1010b611525992a4e109a215b5db15d60637aecea14c090d9fe23fd7928fedff587e34a088f3843002a0433a58e SHA512 c1f58ca04dff2afb7c8c23a81a4b54f91e310342e741cc92fe6168417252b76ee009651a6845924302651d4183ca3e58620b0655aea1ee8afa40581f62e5272a
-DIST kicad-doc-5.1.5.tar.gz 75372826 BLAKE2B 89e9f57009446ee7e6560f97c8e4de61250faa337ff9777d6d73f879bf3fb4575d7df878a2fe78cde48fe3884fdb5be69f9b807731232480550e6b214191cfa5 SHA512 52d06d67df25cf67fb2507a788f414bf3f83569d9cefe0763b9f65e014c1f863bdc3cc6a0d1fb843bd89129118bab117a8c9f83eef4e475bfb4fa853822b2fe5
 DIST kicad-doc-5.1.6.tar.bz2 74202367 BLAKE2B b4d4ff704bf59c7663469f5c4a314a44f1762f8ae5a9fb3abb1a2e8eb54c5dd843f3d095d7e60d0ae541d9e51241fa35ae28c56a495cd0c7e0874d5b1a473296 SHA512 6fae707154aa662689c5da03696d30ebc7442a6d2706cb14d470e91675d0f77c3eb9dd716d29b1eccde5cb0ff39a582a497be2d65d5e34e40defe2fdf97093e0
-EBUILD kicad-doc-4.0.7-r1.ebuild 1288 BLAKE2B d559b2035c7827010881bcc814581a10837739e0c9b4d2245730038d3f22940da893758d9c46af30ae4a77fd6f837d1a50e8b723737e0b1072b43b3203e9c744 SHA512 c5795696a764d9236e0175642580e318e27644a067cdd4a1ad3dcf8194f356b1a5b87665b16f90304aaa1083b82af0c4b925a581b81042689948480c90bab6bd
-EBUILD kicad-doc-4.0.7.ebuild 1187 BLAKE2B 44eb1d3012c24f431f255b4203109398c3cbb4de0e068c81bad2034c866b9f00b8bf91e9941e8dbe23857359d72e9948d561cbc66dcfb1d8162da23f08950ff4 SHA512 9d36ba68ac9dcc0be7ea28832a424288e46b2226bda91d2b13318323789b8479eee913f5a793fda3ef47bec6877cbabccac607c1c5d648a4621df82faab39405
-EBUILD kicad-doc-5.1.5.ebuild 1436 BLAKE2B 2ad02a03a17f1b524e44d8a56e40274fcc6addb51c2af39fdd945bf4a5926d7ed26fd6d4db5f34e33621d44f3efd8e0c14aca15f2c28b6a0525ec29247b103d1 SHA512 58550533ff06de493ba5a0eb3b627784fcc8cdabe4e9cb77192e89b697bd9684cea29dff163be107b19d2360b33093c450694e8e1743bec5a73cee33593eb4c3
-EBUILD kicad-doc-5.1.6.ebuild 1516 BLAKE2B 162ddd8371768af6f2ad7169bbe9b4e876825491815c2e64eacca9b8a779bdee162f683b8194599ead145e563f87b109b88103a7823a8f98663d69c77bdf70d6 SHA512 ee8142eed747aa610dea3388af7c2ea0b3cb51578373379079c596a9e84bebeb980779b62a2a6fe0d9bb3cf44f6889504d64dd981961226dd5faa93ee7022d62
+DIST kicad-doc-5.1.7.tar.bz2 74202031 BLAKE2B caa6f6403fe984230cbb1d0b0a75355621f9e371976774e66aac2216994249397082ef8699f0adced0696344a256edd5d47c42ce8d789ebf624d702008f0600a SHA512 72dcfdf3d943dc73bb4f30c9dc9f0cfe7a0c3f8749a04b04624c47e2b69f6be29627e2768d008980ae9ac691aa56c97529edc15741c72e261e4c2c6f3e7b32b4
+DIST kicad-doc-5.1.8.tar.bz2 74199662 BLAKE2B f1077202a5a5c263f5cb8bf00f4f33ab0515e5abe15ab18bc21de742d6c4e0eafa5e3b1eb9cd12d45446b7a47654c44a67ec980af8ce0ed5d7f3261628c91f24 SHA512 763951f91b3a86d940fc508fc20846752bd2c7a4520e820e37708feb0054993d84a365df5abe10b5c26799479754ca19366456f3eba2ff3ee6acee34908dd699
+EBUILD kicad-doc-5.1.6.ebuild 1440 BLAKE2B 829d304d8aaddd7b910f40c3b0c9df18b31e1dc2e746f0407d88e6e97c296294fe99c949fac5b0d8f55541c535d0f54c20e6c2e7bb2f5abaaf6a7de939c8524c SHA512 08149aba541030e95dc8275c28bf94cbbb129952d29b1214dc05e1b2f8a34bdb8648330bbeea7decd9970c206be6cf0a5750f1dda914b781bbb321d36364dfdf
+EBUILD kicad-doc-5.1.7.ebuild 1440 BLAKE2B 829d304d8aaddd7b910f40c3b0c9df18b31e1dc2e746f0407d88e6e97c296294fe99c949fac5b0d8f55541c535d0f54c20e6c2e7bb2f5abaaf6a7de939c8524c SHA512 08149aba541030e95dc8275c28bf94cbbb129952d29b1214dc05e1b2f8a34bdb8648330bbeea7decd9970c206be6cf0a5750f1dda914b781bbb321d36364dfdf
+EBUILD kicad-doc-5.1.8.ebuild 1426 BLAKE2B b0f8b7f6fd8b6bea2d4abd1d3e78e5dc42ee84dfeacedb930b72e8414e39da9ec1f4944af15b04cad590dbca7a75054097fa4bd3190dbecaa19b67e11a9370ee SHA512 74f3d5a215dd2e718316261803fdb574c9766e2239e9bb55a7199e6c2b2847245c094a995c3f73164a9d51cd689ae591fb25de0f8661e9d6b42ec1e51565524e
 MISC metadata.xml 821 BLAKE2B 631ca1c015a9e76858685a08e77512ad495bd6a95c41e307363bceee3fa48cb627eea89d004f2ddf293785452535f468f6fd9a717440e0ff022673a8fbbc3929 SHA512 07b69d4deccfa4edcc50e6652ff5f8af8fe265dd8887996c1c1d3d02691d578a139c3ba7b81e63eedc257664d32e1d74e4d24175e5d73ac2ac4f62fdee9531bb
diff --git a/app-doc/kicad-doc/kicad-doc-4.0.7.ebuild b/app-doc/kicad-doc/kicad-doc-4.0.7.ebuild
deleted file mode 100644
index 13732e326c4a..000000000000
--- a/app-doc/kicad-doc/kicad-doc-4.0.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools manuals"
-HOMEPAGE="http://www.kicad-pcb.org/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="html +pdf"
-LANGS="en fr it ja nl pl"
-for lang in ${LANGS}; do
-	LUSE+=" l10n_${lang}"
-done
-IUSE+=${LUSE}
-REQUIRED_USE="|| ( html pdf ) ^^ ( ${LUSE} )"
-unset lang
-unset LUSE
-
-DEPEND="
-	>=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_en? ( dev-texlive/texlive-langenglish )
-	l10n_fr? ( dev-texlive/texlive-langfrench )
-	l10n_it? ( dev-texlive/texlive-langitalian )
-	l10n_nl? ( dev-texlive/texlive-langeuropean )
-	l10n_pl? ( dev-texlive/texlive-langpolish )
-	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
-		-DSINGLE_LANGUAGE="${L10N}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-doc/kicad-doc/kicad-doc-5.1.6.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.6.ebuild
index 6f1823b17c90..1578ee1b2ef6 100644
--- a/app-doc/kicad-doc/kicad-doc-5.1.6.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-5.1.6.ebuild
@@ -6,8 +6,7 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="Electronic Schematic and PCB design tools manuals"
-HOMEPAGE="http://docs.kicad-pcb.org/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.kicad-pcb.org/"
 SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
diff --git a/app-doc/kicad-doc/kicad-doc-5.1.5.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.7.ebuild
index edf35c290db3..1578ee1b2ef6 100644
--- a/app-doc/kicad-doc/kicad-doc-5.1.5.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-5.1.7.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="Electronic Schematic and PCB design tools manuals"
-HOMEPAGE="http://www.kicad-pcb.org/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.kicad-pcb.org/"
+SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
 SLOT="0"
diff --git a/app-doc/kicad-doc/kicad-doc-4.0.7-r1.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.8.ebuild
index 5d54fc34345d..973e10fb41bc 100644
--- a/app-doc/kicad-doc/kicad-doc-4.0.7-r1.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-5.1.8.ebuild
@@ -1,28 +1,25 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Electronic Schematic and PCB design tools manuals"
-HOMEPAGE="http://www.kicad-pcb.org/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.kicad.org/"
+SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="html +pdf"
-LANGS="ca de en es fr id it ja pl"
-for lang in ${LANGS}; do
-	LUSE+=" l10n_${lang}"
-done
-IUSE+=${LUSE}
-REQUIRED_USE="|| ( html pdf ) ^^ ( ${LUSE} )"
-unset lang
-unset LUSE
 
-DEPEND="
+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
+
+BDEPEND="
 	>=app-text/asciidoc-8.6.9
 	>=app-text/dblatex-0.3.10
 	>=app-text/po4a-0.45
@@ -36,13 +33,15 @@ DEPEND="
 	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 )"
-RDEPEND=""
+	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-utils_src_configure
+	cmake_src_configure
 }