gentoo resync 08.09.2018

4 files changed, 99 insertions, 74 deletions

diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index d5d0aba12258..d449d7a78426 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,5 +1,6 @@
-DIST kicad-doc-4.0.4.tar.gz 33705865 BLAKE2B 191865f4a1956424bdf661bfb968bd6fb392af48318dd097d71e04495688ff2aa38476195fac07a6b8bbea92807fd2e51c056bdc88fadb907c0656175405f6ea SHA512 97a45ebbd11ab7f92eff1409bc03512b7685fb4a85dd1d87675e92742cc6672a1332c5fe8d63577eba93ed976af1bb4acaa461dbada5e4695a161cefa82c9ff4
 DIST kicad-doc-4.0.7.tar.gz 54384893 BLAKE2B c38342ebb9b5a14f3bc2a6cffb870bf4238fe1010b611525992a4e109a215b5db15d60637aecea14c090d9fe23fd7928fedff587e34a088f3843002a0433a58e SHA512 c1f58ca04dff2afb7c8c23a81a4b54f91e310342e741cc92fe6168417252b76ee009651a6845924302651d4183ca3e58620b0655aea1ee8afa40581f62e5272a
-EBUILD kicad-doc-4.0.4.ebuild 1713 BLAKE2B 22c4ccbcc9a1bbe3f85fda803ca5d5ea965c774056a6cc7ea181a1800a7f534dce6b9629f3876f75fffc63babd9b5b7dccfadcf657d7b683fae9d61640e9ef11 SHA512 9c90258b230aae7fe88df026f71597a9361065fdc6b11a1691d373719d7cc7e0b3cd416e03ef62a422273d7d8ae68b0783e9445cbbf4c24c148e27f312a1b098
+DIST kicad-doc-5.0.0.tar.gz 68834628 BLAKE2B af6cf42fbabbf3dcd1a00b1bf94633d1cc09a5c6457bd20631f4049a0c7051b74e33cb62911e3df7cc8cfa6c50738276c17ba834923295538d88d9898cf24f73 SHA512 0fb266ada47303af41f3f5438894d66800644252bee898467522a7e6e86c372c7701768c34ac2260f0e6d76af669bf4bab33c41598037d6005ecc4ed6d31b419
+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.0.0.ebuild 1288 BLAKE2B d559b2035c7827010881bcc814581a10837739e0c9b4d2245730038d3f22940da893758d9c46af30ae4a77fd6f837d1a50e8b723737e0b1072b43b3203e9c744 SHA512 c5795696a764d9236e0175642580e318e27644a067cdd4a1ad3dcf8194f356b1a5b87665b16f90304aaa1083b82af0c4b925a581b81042689948480c90bab6bd
 MISC metadata.xml 821 BLAKE2B 631ca1c015a9e76858685a08e77512ad495bd6a95c41e307363bceee3fa48cb627eea89d004f2ddf293785452535f468f6fd9a717440e0ff022673a8fbbc3929 SHA512 07b69d4deccfa4edcc50e6652ff5f8af8fe265dd8887996c1c1d3d02691d578a139c3ba7b81e63eedc257664d32e1d74e4d24175e5d73ac2ac4f62fdee9531bb
diff --git a/app-doc/kicad-doc/kicad-doc-4.0.4.ebuild b/app-doc/kicad-doc/kicad-doc-4.0.4.ebuild
deleted file mode 100644
index b4189b6d1514..000000000000
--- a/app-doc/kicad-doc/kicad-doc-4.0.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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
-	IUSE+=" l10n_${lang}"
-done
-unset lang
-
-DEPEND=">=app-text/asciidoc-8.6.9
-	app-text/dblatex
-	app-text/texlive:=[l10n_en?,l10n_fr?,l10n_it?,l10n_ja?,l10n_nl?,l10n_pl?]
-	>=app-text/po4a-0.45
-	>=sys-devel/gettext-0.18
-	dev-util/source-highlight
-	dev-perl/Unicode-LineBreak
-	l10n_ja? ( media-fonts/vlgothic )"
-RDEPEND=""
-
-src_prepare() {
-	DOCPATH="KICAD_DOC_INSTALL_PATH share/doc/kicad"
-	sed "s|${DOCPATH}|${DOCPATH}-${PV}|g" -i CMakeLists.txt || die "sed failed"
-}
-
-src_configure() {
-	local formats=""
-	local doclang=""
-	local format lang
-
-	# construct format string
-	for format in html pdf; do
-		use ${format} && formats+="${format};"
-	done
-	if [[ -z ${formats} ]]; then
-		formats="html;"
-		ewarn "Neither \"html\" nor \"pdf\" USE flag set, using html."
-	fi
-
-	# find out which language is requested
-	for lang in ${LANGS}; do
-		if use l10n_${lang}; then
-			if [[ -z ${doclang} ]]; then
-				doclang="${lang}"
-			else
-				ewarn "Only one single language can be enabled." \
-					"Using \"${doclang}\", ignoring \"${lang}\"."
-			fi
-		fi
-	done
-	if [[ -z ${doclang} ]]; then
-		doclang="en"
-		ewarn "No language flag set, falling back to \"en\"."
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_FORMATS="${formats}"
-		-DSINGLE_LANGUAGE="${doclang}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-doc/kicad-doc/kicad-doc-4.0.7-r1.ebuild b/app-doc/kicad-doc/kicad-doc-4.0.7-r1.ebuild
new file mode 100644
index 000000000000..5d54fc34345d
--- /dev/null
+++ b/app-doc/kicad-doc/kicad-doc-4.0.7-r1.ebuild
@@ -0,0 +1,48 @@
+# 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="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="
+	>=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 )"
+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.0.0.ebuild b/app-doc/kicad-doc/kicad-doc-5.0.0.ebuild
new file mode 100644
index 000000000000..5d54fc34345d
--- /dev/null
+++ b/app-doc/kicad-doc/kicad-doc-5.0.0.ebuild
@@ -0,0 +1,48 @@
+# 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="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="
+	>=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 )"
+RDEPEND=""
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
+		-DSINGLE_LANGUAGE="${L10N}"
+	)
+	cmake-utils_src_configure
+}