gentoo resync 08.09.2018

9 files changed, 105 insertions, 80 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index c971a18e801d..c57efff962be 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
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
+}
diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index ed5836a4f008..5d535391d680 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -4,8 +4,8 @@ DIST pms-6_p20170429-prebuilt.tar.xz 514544 BLAKE2B 34f5dc9a65c9a0bcc8b6ea7c9c1e
 DIST pms-6_p20170429.tar.xz 53584 BLAKE2B 3c9b7445fdd7c0a0ed2b5b6f29dd645090f0fda63f864b536e88ed5d2e0cf27bfd621da1480a576d999b1ad0b80b19ac011a5a984e8b6d24c8f7db7f68aeaa75 SHA512 b4d5eb85d1823d2c80348aa82686fcbf0ba06b19de046b722d0318e846ba6d9bbd0c810b6fe06e7d4eafd8933a1b1d2d04b041fcc35fd2496feca9c987323a5b
 DIST pms-7_p20180430-prebuilt.tar.xz 593500 BLAKE2B e59882b215492424b351242f31b90cc3aa457f7e4630c5b15fe8bc18fd8722764371868f3a44bd7226f4d00c5a8d9c12829d934cda715e575b4c949631c4ad02 SHA512 e27527e4ea1fa16f7c069267bec136521e7be621bd49701920d11e79e4a5645ca8da06aa41c4adaa1813c0f4abce8248e4274d7ec0ae04f6a8479107b0578c4f
 DIST pms-7_p20180430.tar.xz 60072 BLAKE2B 58afb1759c84ae86a1dd69aa04a6e8b799fd0cc1e1877cf1f6224f5b1bdbdfcdeaadcabbd9c37c263d62cb24b4164056a88d3524031d1704b059c376d5572101 SHA512 9bb64de842e0aa8f1a6488d12fffba76bfd190e53523e9261161467b30f001f20cddf593cd32e75ace4af309476eb7eb6966665d7ae9b54a5915237094110a47
-EBUILD pms-5_p20120920.ebuild 1420 BLAKE2B 7e6bb11748ef75c54b4f00758033aa9a4d601927d2930ea2bc910cecce920e20c37b6700f2017179a2ad0d16ef0693faf5e85c358d47fb37b6b99b57e374dff9 SHA512 cee19f88ac744d246ccc2b5d02412e3815bf5e3895d37466b22619f1a610093617cfe97c0e21127d33f6efc4925beb7a1825167172ceb7694069e13277e0b55d
-EBUILD pms-6_p20170429.ebuild 1551 BLAKE2B 13c478dbced5e0d27132d1ef6775157eb3f228d89686a3299392d1932d6b4abc6398913d3c233555189b7e43464ab9a3d37f52d592c51ac0ff11e63f9e4cff26 SHA512 88d1a04e8c2983c36b5808fe9cf39bc3435e1a070d1a8ffaad284dac3eabfae672832816ac022de7f525c86fb9279fa5ba6e7d569c92320fba292c6e8da780cf
-EBUILD pms-7_p20180430-r1.ebuild 1676 BLAKE2B 302b66c7b7ebce8300007999978e680088bda1c7bc8ba94a42f38d4e9ad0d41b95a10bc6dc18f8ac0fe9a514983a3cf3e77cb54e6c6756f5c096f23debc24d7c SHA512 86571cd44535f00128a03a5d56d6fcccf594a3d3e7b3853c43ce8ed4ab9189180712027db0bffe0a73ba3153818aa38652cdb4f8189f9fc60fb99b1187d2b27a
+EBUILD pms-5_p20120920.ebuild 1409 BLAKE2B dc81ed4b9dadb4b65b9b0bfc8d1d8b1cdfce7e2ca0b940819eb4d496fb6d7c6bbdf9689d33c4c23236c263738c668006fc2ccddc5b0c76649a75c16d1c4330c5 SHA512 a2c63b7c6569d545c2ff589e16438338bcf4ab59322290c44f987922993c17454ed6cc7d406aa00b18c6f54a7413b37419a9abe1a5948962410a4525ee870ddd
+EBUILD pms-6_p20170429.ebuild 1540 BLAKE2B 6687bd086717f160fe8d93127077103be65e1a848e7fd41b78c913c14d69a89f13c076e42122997dcb61f4f03d62c5f5a5068744b1dd1ae3a9846b0dc661bfe3 SHA512 eab9166b850ce33b48395537d53831659b3b79b9099e83af3d97475dc5ea0929174d8cc0d28002c3b2f2ff72d6e57dd5e9b7f51a244c59d962fcd656c737d8f1
+EBUILD pms-7_p20180430-r1.ebuild 1665 BLAKE2B 4096ed74bfb79901479736fc55f7649c95628f7692f8b5d825a82a38e816e1c103bd7980b41dd0778a3ed9afc13ddf2368b7e4111ecd1d6638fc32a1bd040c3e SHA512 4ae46097bd19328695eb8b51a923723de0c53767e06ea1f6dd194ef59c2aa3a21b5c0f37b3e529c4db4b7bd5164fd33c7d858d54c5b368b36566801f957de569
 EBUILD pms-9999.ebuild 1234 BLAKE2B 46f77394bb3e6c94600e3c37a45f95838cd7dd088eff9c4ded2918a742338d2f221a073f22142488612b53d6ce64de12b903ff4e39f7d8c340801fd5b4d348b3 SHA512 b832a1f3fbbcea3116fa8670fc5e932033bcfa30c7b2c0f7fd209cfb4d519becc79ee3cbf9ea9c6ea6677c13224a9bcb7d67c225bcc24f8b24311695d2c35e60
 MISC metadata.xml 518 BLAKE2B 370ddfa79e44e10c0234d0aafb89624181bf64ae7e90b89b678a8dcb518214f310bc9afc261d5069a8f07299b2194c3a831e1d2a9bcba8d97dd6ef0dc1369346 SHA512 e1079583ec59594d9c89dbbf68199aff7edb35112375e96a2f6ca28627f679ee46570f649a0723c296bd41d003dd91226e6b2805bc780baded00dc1ae72d24a2
diff --git a/app-doc/pms/pms-5_p20120920.ebuild b/app-doc/pms/pms-5_p20120920.ebuild
index 62b517947fb0..8ff35630e3ca 100644
--- a/app-doc/pms/pms-5_p20120920.ebuild
+++ b/app-doc/pms/pms-5_p20120920.ebuild
@@ -11,7 +11,7 @@ SRC_URI="!binary? ( https://dev.gentoo.org/~ulm/distfiles/${MY_P}.tar.xz )
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="${PV#*_p}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="binary html"
 
 DEPEND="!binary? (
diff --git a/app-doc/pms/pms-6_p20170429.ebuild b/app-doc/pms/pms-6_p20170429.ebuild
index a766e3c27e99..50e7d0f0f10d 100644
--- a/app-doc/pms/pms-6_p20170429.ebuild
+++ b/app-doc/pms/pms-6_p20170429.ebuild
@@ -10,7 +10,7 @@ SRC_URI="!binary? ( https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz )
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="binary html"
 
 # texlive-bibtexextra: plainurl.bst
diff --git a/app-doc/pms/pms-7_p20180430-r1.ebuild b/app-doc/pms/pms-7_p20180430-r1.ebuild
index 6808b7f4d4d1..d2ebe0ed3b19 100644
--- a/app-doc/pms/pms-7_p20180430-r1.ebuild
+++ b/app-doc/pms/pms-7_p20180430-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="!binary? ( https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz )
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="binary html twoside"
 
 # texlive-bibtexextra: plainurl.bst