gentoo resync : 28.04.2019

19 files changed, 155 insertions, 561 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 36fd4b0cae20..f75e75f6810a 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/cppman/Manifest b/app-doc/cppman/Manifest
index 39930cd1ac30..a6ffcd431be4 100644
--- a/app-doc/cppman/Manifest
+++ b/app-doc/cppman/Manifest
@@ -1,3 +1,3 @@
 DIST cppman-0.4.8.tar.gz 3185978 BLAKE2B 9f662874eb6b6540e02a2b371fa47e53e0893239fbfcc65421fa5c7c4bc5f88c4cfd2facf08deb13606f5cf7c895a1a07e119e1c15bbc98b95af5f8056c6a5e8 SHA512 f5b93774988dad592b31670d6c21718bd034e4e94858982e1756e8db89779d12001fd786ba629211b038b173b7b507382277a3db7fb35363dba28cd029e69a7d
-EBUILD cppman-0.4.8.ebuild 682 BLAKE2B 33256eb62816da41ba68f0966dab033a47381a36c14a3905c25dc1f9ad04287eaaff559f11efe7dd6251ae6ac0f22b3c15bb7fbc73c286af8a82b963ed7ae202 SHA512 98290555c2161d4a6a4f5cd81b03cfe666bbf1265f109597dafb74643554c8f4cf2f6064acf449293e5a10f68472c4863e4b3432e9f60f4305f677087c82291f
+EBUILD cppman-0.4.8.ebuild 677 BLAKE2B 02ece1c739d0022c10c8540ce357cf48b5ba0c43010a5edce3b267daca22e25c117dae1a6f913487f35baf36550f51d6fb2e062e46c2587bb6753500d53457c5 SHA512 a0fd6abe90f07b5451c4f7b50476b022b2dfc8d1b55682c38e4813309f43e43c845bb8c0a8fe729ebd36f1cdb3a4036536cabd7f2596e0c0ee1c5429a2c6b7b8
 MISC metadata.xml 247 BLAKE2B 8da6363de18a0eb4c29efee8c35de35970668cf0107b011b7e885c8d151b7cbd90709f000548025593f2ed5b4bc2d512de53c0285805fec978b363536ccf1ec4 SHA512 a788f5e022a740fafc174856c3fcda9b4c43908303427ecb48deb2198b5c01f1103bcf4965d950e3f981be4036173f9e968e431c49d3df96061f24cdc202edbc
diff --git a/app-doc/cppman/cppman-0.4.8.ebuild b/app-doc/cppman/cppman-0.4.8.ebuild
index ed07e1b95c54..d4ba39fc324a 100644
--- a/app-doc/cppman/cppman-0.4.8.ebuild
+++ b/app-doc/cppman/cppman-0.4.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite,threads"
 
 DISTUTILS_SINGLE_IMPL=true
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 0d0cdb9feebd..cf9adf1bfbc3 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -3,7 +3,7 @@ AUX doxygen-1.8.14-llvm7.patch 858 BLAKE2B aec2e43c92460e4ff90f3ef9c275a40861b56
 AUX doxygen-1.8.14-xml-c++.patch 1064 BLAKE2B f75ead2f58b1dee3854061cb2554a5e9387b6f2d205bd2f8b231124281dd3b91b0f79cfb3059a02a56a579ebc68e4b8194755187c4a4ff7a582b2d11d72cadb7 SHA512 08f2e27a689fed08221ff3c4897be1054f5cf9be50cd131e48d6c05d4b3e87d1ffe2233193dba0667108977bb50ccd76694e6e66b92c625c286f1e34e5d3322a
 AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
 DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
-EBUILD doxygen-1.8.14-r1.ebuild 3157 BLAKE2B db825942d875eed09a34a5fa72f82cf206361f47c4825419c11ff969f88cc56b8a1a3df7074dcb40a9eec86665539174d1560e85f0b87f0f417efe12b89b6a8a SHA512 bc6cbde8c78c47da2dfa5bd41628ceb5aa7e0eb5350b4a36fa945c950ec5bcf31306c73fbfaae15848675c702590c6e21539e8138cd268b51781d693ce76833f
-EBUILD doxygen-1.8.14-r2.ebuild 3232 BLAKE2B 985622bdd74f74b5ddbe658c0516480c0d4a779e23e3919d188a27bce7bebc00eb2cad32277fbe05a60e68861551a26bdf83640ef491600a066780ee71853ec1 SHA512 c9af3b3ed63254c49169777fc8d439caf6799820594c022839672f85113048af2e681b7602dc6a60d92405729a90921f9db7d55cecaa49cc65cf793bf30811ae
-EBUILD doxygen-9999.ebuild 3094 BLAKE2B 38b34c1cdcd21317af407421b426fd35cccbcd5239c32651acbad713d94e92e2e16abaf7b8b2651158f24121a67f882a631dd81db010fe859e6faaf619711b2f SHA512 13e1d112c6fdab0fc7a6b7fed37d6f174da2c4001315d19f57b647f67ebb014fc513f0b580c23afa2cf5eb7fc3f12adee9e76b3b72a5d718a47e03c1dcf0d127
+EBUILD doxygen-1.8.14-r1.ebuild 3153 BLAKE2B 140bc6d056fbab86a10381c7998889f9f7d71bd086b469c5652f6193d97cd7c3c6ded17647fad380fe9cf4c011b9831f251ee1c45d57b4c0f9eedf5bb8755839 SHA512 43d215ca8e0a4b22abd797729a75fac864e34b6e76fcd17d0a806dc7c8f259d44210c2259d02c4498245905ca81c6a3e9b00b9d0ece2f5b2d593fbb51de4f606
+EBUILD doxygen-1.8.14-r2.ebuild 3228 BLAKE2B 43ac8586d52bc32d96507b6d9863d5383505a324f685a85926a6abc52cd069f55603502ed4bc678427c1a33d4c77ca652602d45d77d0ea22ecd17f016676470f SHA512 9bd5f2fda9e5dd0ec924448eb36c2df39e3ab675e5911a49b39a524005295fa70cdbcf03206592c273332e1d0cc21e0b48f5bf31b99035ae051fe9ae606140fd
+EBUILD doxygen-9999.ebuild 3090 BLAKE2B 7c975b66d9f655d5df7e6fc9a8c7622b5550a497e8f7206d611de43350e8d8aefb7f8556879bff5fd137cf7107c7ddd8d61e3f71e14185e22cf3b27440e64942 SHA512 6e631c350a76cc7cbfe4dafd7d1d8ddfd74195e7b62eb1cf1bc6523c76294d8daaaa16fc3d7ea542fbe486f162e1c5689f0121aeb967859eed26b83598254e98
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
index d9d9f1007f9a..3eb0362631e4 100644
--- a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-utils eutils python-any-r1
 if [[ ${PV} = *9999* ]]; then
diff --git a/app-doc/doxygen/doxygen-1.8.14-r2.ebuild b/app-doc/doxygen/doxygen-1.8.14-r2.ebuild
index d963510d4e41..4a5c877ce56e 100644
--- a/app-doc/doxygen/doxygen-1.8.14-r2.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.14-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-utils eutils python-any-r1
 if [[ ${PV} = *9999* ]]; then
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 34ade676fbae..c02d0e50f82a 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-utils eutils python-any-r1
 if [[ ${PV} = *9999* ]]; then
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index 87ee32246000..c18fc20ed39e 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,8 +1,4 @@
-AUX eclass-to-manpage.awk 11006 BLAKE2B 85303c11796b743fbffdc34004984c1f2278a106730d76400fc333d7fec7c57a676eda2ff4684edfd324ccc2b6b4d759df896c88a3a095fb678f5dd24bba5da1 SHA512 a17ce9bd1233363e5d7899bcc627bdc680a149663d7fc014f5ea989bf1e5da3997d01c55ba42dfaa84e0905e07038168660075b7f5d79973edfc4e964dc2fe9a
-AUX eclass-to-manpage.sh 738 BLAKE2B 719f9ac6a4283e6795f0463073a460f35b65b6d5c020eeb3823527cb559774c2273c374ea1fbf196e4528b55de9feedce6d024c4495e76cc7c4b7cd4079da202 SHA512 9d50ca11215fc69cc6b4ed67891039f24a93d9843103ab0bb8b13f0596fbca7541da0feaa31ab236279a7047cd9fcdd4a8f9d8a249de725d69e45e6c276d49d1
-DIST eclass-manpages-20190314.tar.xz 419576 BLAKE2B baad0d5f9c67b7e4b9646e69e90583a8238590a02bb6bcc200b08f17f56b2ae50a56080526d3398623949ffc91857d944a1035d6b44fba07b17024c2c224b802 SHA512 22f4b32654f459afa8e5057f02c92628cc529f236e48a69f9b346e7bdcf60d12a4cdd71debf96e8d4b3e69b0e497feb9143b385a11d835b43d13c32fa1751d51
 DIST eclass-manpages-20190329.tar.xz 428068 BLAKE2B 630f6ba06bef6e4aed7713776b8a0ce737dcba4441309ed326b6eb87a5515f5fbd2f95db4a12385788a1dbf1ff6bc3c09620f4564c0bba201f48f6aa31520b41 SHA512 8088078334c2b7f35301bd75dc2505a366d030cb1d28bf47c387ba0c727cf5a58e1f279708d4a32ecf47ceec543c287ea5ad8c76ce4bbd9c45f039be2924d7ee
-EBUILD eclass-manpages-20190314.ebuild 1084 BLAKE2B c5ba9cd688ec3c21f734e36feb32e5651a06f09f42e7886627dd92d122ff99a797f55a734a00d79c7ca3464f61f473cd003ad5961a37d50e23cc2908cf623362 SHA512 93fae7b743267e0c32b1bc3317d1f2cda10e2b64d22d01986730ccc2d648c848be970c57f319dcd58265a450a68b120a58943e18c01201a9b866a76911b56982
 EBUILD eclass-manpages-20190329.ebuild 605 BLAKE2B ceef27f3e43fa279fa6e380ecc4254257f2a64cd643eb3f0da5f0985bc9aa98caa2939e8bd37247c65a01d959439667f9b931f6e1c845bcd9173df1980c06949 SHA512 95e1e5b5c09bc281dc0bdc09bdbd1facc548e4a7c5062ce9ff18725ecc489946e486c883235d570011bf69d792a33a3a45175e15f94a56317f167d2817c69236
 EBUILD eclass-manpages-99999999.ebuild 729 BLAKE2B 79cbaab27b22289c66c053232bf900a7ce8afacf48f0d5e750d324732e5c74918403cc271286da0eb005d15deb6f5579e04f6ff2eb5e9dd7372ef842d6ec31ce SHA512 64d4c7078873ac0814c68a02596ef6890949dbca960a452c867d2c7cc16b098b8922e5a915360fec4fee47c922e9bab81f84a04b3a71c92a96e47b6b02cc25e7
 MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-doc/eclass-manpages/eclass-manpages-20190314.ebuild b/app-doc/eclass-manpages/eclass-manpages-20190314.ebuild
deleted file mode 100644
index d0c5185c96f0..000000000000
--- a/app-doc/eclass-manpages/eclass-manpages-20190314.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Collection of Gentoo eclass manpages"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# Keep the keywords stabled. No need to change to ~arch.
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-
-DEPEND="app-arch/xz-utils"
-
-# How to create a snapshot and upload it to your dev-space:
-#
-# mkdir eclass-manpages-$(date +%Y%m%d)
-# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/
-# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d)
-# xz -e eclass-manpages-$(date +%Y%m%d).tar
-# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/dist/
-#
-# Then copy the ebuild and update your name in SRC_URI ;-).
-
-src_compile() {
-	env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die
-}
-
-src_install() {
-	doman *.5
-}
diff --git a/app-doc/eclass-manpages/files/eclass-to-manpage.awk b/app-doc/eclass-manpages/files/eclass-to-manpage.awk
deleted file mode 100644
index 53e05973e16d..000000000000
--- a/app-doc/eclass-manpages/files/eclass-to-manpage.awk
+++ /dev/null
@@ -1,461 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# This awk converts the comment documentation found in eclasses
-# into man pages for easier/nicer reading.
-#
-# If you wish to have multiple paragraphs in a description, then
-# create empty comment lines.  Paragraph parsing ends when the comment
-# block does.
-
-# The format of the eclass description:
-# @ECLASS: foo.eclass
-# @MAINTAINER:
-# <required; list of contacts, one per line>
-# @AUTHOR:
-# <optional; list of authors, one per line>
-# @BUGREPORTS:
-# <optional; description of how to report bugs;
-#  default: tell people to use bugs.gentoo.org>
-# @VCSURL: <optional; url to vcs for this eclass; default: https://gitweb.gentoo.org/repo/gentoo.git/log/eclass/@ECLASS@>
-# @SUPPORTED_EAPIS: <optional; space-separated list of EAPIs>
-# @BLURB: <required; short description>
-# @DESCRIPTION:
-# <optional; long description>
-# @EXAMPLE:
-# <optional; example usage>
-
-# The format of functions:
-# @FUNCTION: foo
-# @USAGE: <required arguments to foo> [optional arguments to foo]
-# @RETURN: <whatever foo returns>
-# @MAINTAINER:
-# <optional; list of contacts, one per line>
-# [@INTERNAL]
-# @DESCRIPTION:
-# <required if no @RETURN; blurb about this function>
-
-# The format of function-specific variables:
-# @VARIABLE: foo
-# [@USER_VARIABLE] (set in make.conf, not ebuilds)
-# [@INTERNAL] (internal eclass use variable)
-# [@DEFAULT_UNSET]
-# [@REQUIRED]
-# @DESCRIPTION:
-# <required; blurb about this variable>
-# foo="<default value>"
-
-# The format of eclass variables:
-# @ECLASS-VARIABLE: foo
-# [@PRE_INHERIT] (the variable must be set before inheriting the eclass)
-# [@USER_VARIABLE] (set in make.conf, not ebuilds)
-# [@OUTPUT_VARIABLE] (set by eclass, to be read in ebuilds)
-# [@INTERNAL] (internal eclass use variable)
-# [@DEFAULT_UNSET]
-# [@REQUIRED]
-# @DESCRIPTION:
-# <required; blurb about this variable>
-# foo="<default value>"
-
-# Disable manpage generation:
-# @DEAD
-
-# Common features:
-# @CODE
-# In multiline paragraphs, you can create chunks of unformatted
-# code by using this marker at the start and end.
-# @CODE
-#
-# @ROFF <some roff macros>
-# If you want a little more manual control over the formatting, you can
-# insert roff macros directly into the output by using the @ROFF escape.
-
-function _stderr_msg(text, type,   file, cnt) {
-	if (_stderr_header_done != 1) {
-		cnt = split(FILENAME, file, /\//)
-		print "\n" file[cnt] ":" > "/dev/stderr"
-		_stderr_header_done = 1
-	}
-
-	print "   " type ":" NR ": " text > "/dev/stderr"
-}
-function warn(text) {
-	_stderr_msg(text, "warning")
-}
-function fail(text) {
-	_stderr_msg(text, "error")
-	exit(1)
-}
-function xfail(text) {
-	_stderr_msg(text, "error (ignoring)")
-	exit(77)
-}
-
-function eat_line() {
-	ret = $0
-	sub(/^# @[^:]+:[[:space:]]*/,"",ret)
-	getline
-	return ret
-}
-function eat_paragraph() {
-	code = 0
-	ret = ""
-	getline
-	while ($0 ~ /^#/) {
-		# Only allow certain tokens in the middle of paragraphs
-		if ($2 ~ /^@/ && $2 !~ /^@(CODE|ROFF)$/)
-			break
-
-		sub(/^#[[:space:]]?/, "", $0)
-
-		# Escape . at start of line #420153
-		if ($0 ~ /^[.]/)
-			$0 = "\\&" $0
-
-		# Translate @CODE into @ROFF
-		if ($1 == "@CODE" && NF == 1) {
-			if (code)
-				$0 = "@ROFF .fi"
-			else
-				$0 = "@ROFF .nf"
-			code = !code
-		}
-
-		# Allow people to specify *roff commands directly
-		if ($1 == "@ROFF")
-			sub(/^@ROFF[[:space:]]*/, "", $0)
-
-		ret = ret "\n" $0
-
-		# Handle the common case of trailing backslashes in
-		# code blocks to cross multiple lines #335702
-		if (code && $NF == "\\")
-			ret = ret "\\"
-		getline
-	}
-	sub(/^\n/,"",ret)
-	return ret
-}
-
-function pre_text(p) {
-	return ".nf\n" p "\n.fi"
-}
-
-function man_text(p) {
-	return gensub(/-/, "\\-", "g", p)
-}
-
-#
-# Handle an @ECLASS block
-#
-function handle_eclass() {
-	eclass = $3
-	eclass_maintainer = ""
-	eclass_author = ""
-	supported_eapis = ""
-	blurb = ""
-	desc = ""
-	example = ""
-
-	# Sanity check the eclass name. #537392
-	if (eclass !~ /[.]eclass$/)
-		fail(eclass ": @ECLASS name is missing a '.eclass' suffix")
-
-	# first the man page header
-	print ".\\\" -*- coding: utf-8 -*-"
-	print ".\\\" ### DO NOT EDIT THIS FILE"
-	print ".\\\" ### This man page is autogenerated by eclass-to-manpage.awk"
-	print ".\\\" ### based on comments found in " eclass
-	print ".\\\""
-	print ".\\\" See eclass-to-manpage.awk for documentation on how to get"
-	print ".\\\" your eclass nicely documented as well."
-	print ".\\\""
-	print ".TH \"" toupper(eclass) "\" 5 \"" strftime("%b %Y") "\" \"Portage\" \"portage\""
-
-	# now eat the global data
-	getline
-	if ($2 == "@MAINTAINER:")
-		eclass_maintainer = eat_paragraph()
-	if ($2 == "@AUTHOR:")
-		eclass_author = eat_paragraph()
-	if ($2 == "@BUGREPORTS:")
-		reporting_bugs = eat_paragraph()
-	if ($2 == "@VCSURL:")
-		vcs_url = eat_line()
-	if ($2 == "@SUPPORTED_EAPIS:")
-		supported_eapis = eat_line()
-	if ($2 == "@BLURB:")
-		blurb = eat_line()
-	if ($2 == "@DESCRIPTION:")
-		desc = eat_paragraph()
-	if ($2 == "@EXAMPLE:")
-		example = eat_paragraph()
-	# in case they typo-ed the keyword, bail now
-	if ($2 ~ /^@/)
-		fail(eclass ": unknown keyword " $2)
-
-	# finally display it
-	print ".SH \"NAME\""
-	print eclass " \\- " man_text(blurb)
-	if (desc != "") {
-		print ".SH \"DESCRIPTION\""
-		print man_text(desc)
-	}
-	if (supported_eapis != "") {
-		print ".SH \"SUPPORTED EAPIS\""
-		print man_text(supported_eapis)
-	}
-	if (example != "") {
-		print ".SH \"EXAMPLE\""
-		print man_text(example)
-	}
-
-	# sanity checks
-	if (blurb == "")
-		fail(eclass ": no @BLURB found")
-	if (eclass_maintainer == "")
-		warn(eclass ": no @MAINTAINER found")
-}
-
-#
-# Handle a @FUNCTION block
-#
-function show_function_header() {
-	if (_function_header_done != 1) {
-		print ".SH \"FUNCTIONS\""
-		_function_header_done = 1
-	}
-}
-function handle_function() {
-	func_name = $3
-	usage = ""
-	funcret = ""
-	maintainer = ""
-	internal = 0
-	desc = ""
-
-	# make sure people haven't specified this before (copy & paste error)
-	if (all_funcs[func_name])
-		fail(eclass ": duplicate definition found for function: " func_name)
-	all_funcs[func_name] = func_name
-
-	# grab the docs
-	getline
-	if ($2 == "@USAGE:")
-		usage = eat_line()
-	if ($2 == "@RETURN:")
-		funcret = eat_line()
-	if ($2 == "@MAINTAINER:")
-		maintainer = eat_paragraph()
-	if ($2 == "@INTERNAL") {
-		internal = 1
-		getline
-	}
-	if ($2 == "@DESCRIPTION:")
-		desc = eat_paragraph()
-
-	if (internal == 1)
-		return
-
-	show_function_header()
-
-	# now print out the stuff
-	print ".TP"
-	print "\\fB" func_name "\\fR " man_text(usage)
-	if (desc != "")
-		print man_text(desc)
-	if (funcret != "") {
-		if (desc != "")
-			print ""
-		print "Return value: " funcret
-	}
-
-	if (blurb == "")
-		fail(func_name ": no @BLURB found")
-	if (desc == "" && funcret == "")
-		fail(func_name ": no @DESCRIPTION found")
-}
-
-#
-# Handle @VARIABLE and @ECLASS-VARIABLE blocks
-#
-function _handle_variable() {
-	var_name = $3
-	desc = ""
-	val = ""
-	default_unset = 0
-	internal = 0
-	required = 0
-
-	# additional variable classes
-	pre_inherit = 0
-	user_variable = 0
-	output_variable = 0
-
-	# make sure people haven't specified this before (copy & paste error)
-	if (all_vars[var_name])
-		fail(eclass ": duplicate definition found for variable: " var_name)
-	all_vars[var_name] = var_name
-
-	# grab the optional attributes
-	opts = 1
-	while (opts) {
-		getline
-		if ($2 == "@DEFAULT_UNSET")
-			default_unset = 1
-		else if ($2 == "@INTERNAL")
-			internal = 1
-		else if ($2 == "@REQUIRED")
-			required = 1
-		else if ($2 == "@PRE_INHERIT")
-			pre_inherit = 1
-		else if ($2 == "@USER_VARIABLE")
-			user_variable = 1
-		else if ($2 == "@OUTPUT_VARIABLE")
-			output_variable = 1
-		else
-			opts = 0
-	}
-	if ($2 == "@DESCRIPTION:")
-		desc = eat_paragraph()
-
-	# extract the default variable value
-	# first try var="val"
-	op = "="
-	regex = "^.*" var_name "=(.*)$"
-	val = gensub(regex, "\\1", 1, $0)
-	if (val == $0) {
-		# next try : ${var:=val}
-		op = "?="
-		regex = "^[[:space:]]*:[[:space:]]*[$]{" var_name ":?=(.*)}"
-		val = gensub(regex, "\\1", 1, $0)
-		if (val == $0) {
-			if (default_unset + required + internal + output_variable == 0)
-				warn(var_name ": unable to extract default variable content: " $0)
-			val = ""
-		} else if (val !~ /^["']/ && val ~ / /) {
-			if (default_unset == 1)
-				warn(var_name ": marked as unset, but has value: " val)
-			val = "\"" val "\""
-		}
-	}
-	if (length(val))
-		val = " " op " \\fI" val "\\fR"
-	if (required == 1)
-		val = val " (REQUIRED)"
-	# TODO: group variables using those classes
-	if (pre_inherit == 1)
-		val = val " (SET BEFORE INHERIT)"
-	if (user_variable == 1)
-		val = val " (USER VARIABLE)"
-	if (output_variable == 1)
-		val = val " (GENERATED BY ECLASS)"
-
-	# check for invalid combos
-	if (internal + pre_inherit + user_variable + output_variable > 1)
-		fail(var_name ": multiple variable classes specified")
-
-	if (internal == 1)
-		return ""
-
-	# now accumulate the stuff
-	ret = \
-		".TP" "\n" \
-		"\\fB" var_name "\\fR" val "\n" \
-		man_text(desc)
-
-	if (desc == "")
-		fail(var_name ": no @DESCRIPTION found")
-
-	return ret
-}
-function handle_variable() {
-	show_function_header()
-	ret = _handle_variable()
-	if (ret == "")
-		return
-	print ret
-}
-function handle_eclass_variable() {
-	ret = _handle_variable()
-	if (ret == "")
-		return
-	if (eclass_variables != "")
-		eclass_variables = eclass_variables "\n"
-	eclass_variables = eclass_variables ret
-}
-
-#
-# Spit out the common footer of manpage
-#
-function handle_footer() {
-	if (eclass_variables != "") {
-		print ".SH \"ECLASS VARIABLES\""
-		print man_text(eclass_variables)
-	}
-	if (eclass_author != "") {
-		print ".SH \"AUTHORS\""
-		print pre_text(man_text(eclass_author))
-	}
-	if (eclass_maintainer != "") {
-		print ".SH \"MAINTAINERS\""
-		print pre_text(man_text(eclass_maintainer))
-	}
-	print ".SH \"REPORTING BUGS\""
-	print reporting_bugs
-	print ".SH \"FILES\""
-	print ".BR " eclass
-	print ".SH \"SEE ALSO\""
-	print ".BR ebuild (5)"
-	print pre_text(gensub("@ECLASS@", eclass, 1, vcs_url))
-}
-
-#
-# Init parser
-#
-BEGIN {
-	state = "header"
-	reporting_bugs = "Please report bugs via https://bugs.gentoo.org/"
-	vcs_url = "https://gitweb.gentoo.org/repo/gentoo.git/log/eclass/@ECLASS@"
-}
-
-#
-# Main parsing routine
-#
-{
-	if (state == "header") {
-		if ($0 ~ /^# @ECLASS:/) {
-			handle_eclass()
-			state = "funcvar"
-		} else if ($0 == "# @DEAD") {
-			eclass = "dead"
-			exit(77)
-		} else if ($0 == "# @eclass-begin") {
-			# White list old eclasses that haven't been updated so we can block
-			# new ones from being added to the tree.
-			if (eclass == "")
-				xfail("java documentation not supported")
-			fail("java documentation not supported")
-		} else if ($0 ~ /^# @/)
-			warn("Unexpected tag in \"" state "\" state: " $0)
-	} else if (state == "funcvar") {
-		if ($0 ~ /^# @FUNCTION:/)
-			handle_function()
-		else if ($0 ~ /^# @VARIABLE:/)
-			handle_variable()
-		else if ($0 ~ /^# @ECLASS-VARIABLE:/)
-			handle_eclass_variable()
-		else if ($0 ~ /^# @/)
-			warn("Unexpected tag in \"" state "\" state: " $0)
-	}
-}
-
-#
-# Tail end
-#
-END {
-	if (eclass == "")
-		xfail("eclass not documented yet (no @ECLASS found)")
-	else if (eclass != "dead")
-		handle_footer()
-}
diff --git a/app-doc/eclass-manpages/files/eclass-to-manpage.sh b/app-doc/eclass-manpages/files/eclass-to-manpage.sh
deleted file mode 100755
index 55d25aaaf4d3..000000000000
--- a/app-doc/eclass-manpages/files/eclass-to-manpage.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-: ${ECLASSDIR:=${0%/*}/../../../eclass}
-: ${FILESDIR:=${0%/*}}
-
-AWK="gawk"
-while [[ $# -gt 0 ]] ; do
-	case $1 in
-	-e) ECLASSDIR=$2; shift;;
-	-f) FILESDIR=$2; shift;;
-	-d) AWK="dgawk";;
-	*) break;;
-	esac
-	shift
-done
-
-if [[ ! -d ${ECLASSDIR} ]] ; then
-	echo "Usage: ${0##*/} [-e eclassdir] [-f eclass-to-manpage.awk FILESDIR] [eclasses]" 1>&2
-	exit 1
-fi
-
-[[ $# -eq 0 ]] && set -- "${ECLASSDIR}"/*.eclass
-
-ret=0
-for e in "$@" ; do
-	set -- \
-	${AWK} \
-		-f "${FILESDIR}"/eclass-to-manpage.awk \
-		${e}
-	if [[ ${AWK} == "gawk" ]] ; then
-		"$@" > ${e##*/}.5
-		tret=$?
-		if [[ ${tret} -ne 0 ]] ; then
-			rm -f ${e##*/}.5
-			if [[ ${tret} -ne 77 ]] ; then
-				echo "FAIL: ${e}"
-				ret=1
-			fi
-		fi
-	else
-		"$@"
-	fi
-done
-exit ${ret}
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 0724fb0901f5..b96161807a0c 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,7 +1,9 @@
 DIST gnucash-docs-3.2.tar.gz 92387447 BLAKE2B dac502975f885b777c1e91a7ea574789947e1dddfd3239c05973ce57fec41a6d78e605ef37aaf721db4aa4d2bc8f2dda7ed76cc4dc97dd49e30618414e262f15 SHA512 a58a583a457377f529223ced083fb64460b3b0c75a423db08c7f9542711be98fd59bd776bf77309ff91d1c46f22a5ae882d8c0a8ec3fc834d7a8028a95028aad
 DIST gnucash-docs-3.3.tar.gz 92417386 BLAKE2B 200f9b8d3006589eac5f0d66300d658f69f5c55078371c5b416e34784835350de9bd40fc5d85e59116022874294f74e259a034d6ebcaf315b1ea9942b8350c7b SHA512 5887171cbe95f545eb6e647aee2d04a26ab9102643acd8d3e5754000613a7fb08e4470777f7dfbfd0d1ed7609de7a6241cd82f5c7d62f632b2e3751b005bc01e
 DIST gnucash-docs-3.4.tar.gz 92762652 BLAKE2B 1aad3f1e7fe5b6ec11b38dc778e8994544d50f9549450b4632e5fcbd370332f05c7c68f9f6bf0e274b654dee6304924d17089b61318e0e4356bf01133ad47508 SHA512 0a64c8fcc88988a08d5b2f7c472356c580dff17b1a2a37b66a6bed790fba9d7bb437955050656656a0be399b2ce1635902f4548f44b62233c1fcd1d75fbb38ec
+DIST gnucash-docs-3.5.tar.gz 97187415 BLAKE2B f35a3a25a120d3807771d74ee1c97713e21617f7ac7b4fdc1f58b9d12f7c0cc899a9af6abca21bd4f91a0978ebf5b93604deaae29f39c8ab86bd83ec93e32642 SHA512 aa832a1929ae91b9fe2a6a4ada0c7dbd8c1a4cf76086ec3ab0b82c7396d45aabbb6971f2db788bbdde71a68c8faca5f4621429819ef6c0d1156bcefdc5d289b5
 EBUILD gnucash-docs-3.2-r1.ebuild 1665 BLAKE2B 16ad7acf14b9e37dafded93957de6c3246be6902ccea2198832b6dc5409f93ae06bcaf52e091f88d6df6b8327a77198140b67671b0f7a242a0e2bdccfb510222 SHA512 e95eab369275cfac0b5944ae8a0659e5743f44e76c650b78c055246d66c0b953ff8398070b87c3e1f341722b7d51ceaa6896b27b2dc8e424bc9a5e5ae40c3406
 EBUILD gnucash-docs-3.3.ebuild 1666 BLAKE2B 83ab7ebba3c17425df70be4e85f9c26032faf67bd88d16f42dc65cee0486ede8bf50b8bd8eecfbbb5a2d7e2d552cea6ec48370edf8b8c3ed0505abad0cb9e544 SHA512 38f8145072110b0611563ad592113d5f60a96a43986c8ec819ad3a66f6064406f5e929e37090e9bfcd3dae4ffe387ac6fb7dbf2e4610bde6b80a7bc14f6d4e8c
 EBUILD gnucash-docs-3.4.ebuild 1667 BLAKE2B c232b46024f80a9ff86833431ff983722a72d3f9953dff610cc5e86e8a9c22174d168a5d5ae32d5ff942bc2b7c8f1424c04f3012e83765af02446a2fe3266194 SHA512 026d7aae62cb09b435de0c50e4e3b1decf32a863fee0c11791a098e5847795b4467a63cfd80fa2bf52c1659bcf63d3426b1e4f3e160d7e13bdb54c7c4adb7ab0
+EBUILD gnucash-docs-3.5.ebuild 1667 BLAKE2B c232b46024f80a9ff86833431ff983722a72d3f9953dff610cc5e86e8a9c22174d168a5d5ae32d5ff942bc2b7c8f1424c04f3012e83765af02446a2fe3266194 SHA512 026d7aae62cb09b435de0c50e4e3b1decf32a863fee0c11791a098e5847795b4467a63cfd80fa2bf52c1659bcf63d3426b1e4f3e160d7e13bdb54c7c4adb7ab0
 MISC metadata.xml 496 BLAKE2B a668cda0f44d550b086c539edbd5eeb93092fee992621cbd655b5c30e3bfd658fcd0a65d4140f2f9ba4d368438c224bac887e86e6d36b730afd4a24c195fc448 SHA512 19e5631659fe0153e6f2de3bcc8dc5eb1615dc3e6a3493d71ea0d5e18df48fe64fef31819883add93cd1da425ebea0aa82f62b0052bdc328773b8a3c0bfca26a
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.5.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.5.ebuild
new file mode 100644
index 000000000000..2fd86099fbde
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-3.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="C de it ja pt ru"
+PLOCALE_BACKUP="C"
+
+inherit autotools gnome2 l10n
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 FDL-1.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+for my_locale in ${PLOCALES}; do
+	IUSE+=" l10n_${my_locale}"
+done
+
+DEPEND="
+	app-text/docbook-xml-dtd
+	app-text/docbook-xsl-stylesheets
+	app-text/rarian
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+
+my_l10n_get_locales() {
+	local l locales
+	for l in ${PLOCALES[@]}; do
+		use "l10n_${l}" && locales+=( $l )
+	done
+	if [[ ${#locales[@]} -gt 0 ]]; then
+		echo ${locales[@]}
+	else
+		echo $PLOCALE_BACKUP
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local doc_type my_lang
+
+	for doc_type in help guide; do
+		for my_lang in $(my_l10n_get_locales); do
+			case $my_lang in
+				# Both help and guides translated
+				C|de|it|pt) ;;
+				ru|ja) # Only guides translated
+					if [[ ${doc_type} = "help" ]] ; then
+						elog "Help documentation hasn't been translated for $my_lang"
+						elog "Will do English instead."
+						my_lang=C
+					fi
+					;;
+				*)
+					die "Invalid locale: $my_lang"
+					;;
+			esac
+
+			cd "${S}/${doc_type}/${my_lang}" || die
+			emake DESTDIR="${D}" install
+		done
+	done
+
+	cd "${S}" || die
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
+	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
+}
diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index 9ca3a6a845e0..bd49cf83e3b7 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,8 +1,10 @@
 DIST kicad-doc-4.0.7.tar.gz 54384893 BLAKE2B c38342ebb9b5a14f3bc2a6cffb870bf4238fe1010b611525992a4e109a215b5db15d60637aecea14c090d9fe23fd7928fedff587e34a088f3843002a0433a58e SHA512 c1f58ca04dff2afb7c8c23a81a4b54f91e310342e741cc92fe6168417252b76ee009651a6845924302651d4183ca3e58620b0655aea1ee8afa40581f62e5272a
 DIST kicad-doc-5.0.0.tar.gz 68834628 BLAKE2B af6cf42fbabbf3dcd1a00b1bf94633d1cc09a5c6457bd20631f4049a0c7051b74e33cb62911e3df7cc8cfa6c50738276c17ba834923295538d88d9898cf24f73 SHA512 0fb266ada47303af41f3f5438894d66800644252bee898467522a7e6e86c372c7701768c34ac2260f0e6d76af669bf4bab33c41598037d6005ecc4ed6d31b419
 DIST kicad-doc-5.0.1.tar.gz 68998124 BLAKE2B 89c89f76ea17fd95dc8657b415675f5665a4d4bcb8c29eb5bf43f3216c59f38f38904d2d30242ebf3c4bb02197d6e04557af6b7b03b17c13ed9d051c7ed0c134 SHA512 f500be02417bbe3105ece434ca594c7a8cfe3d937a9a835b49b238569f40a8e8cc360d3970d38262b1ae0b702203de942feeae8c48cd2068aec90bf81e3e5a88
+DIST kicad-doc-5.1.0.tar.gz 74965788 BLAKE2B 843d59ec1aa9bb503997e8cb373034fcd6bbd8579e0f683cf631ff1c05b5e25464ccb4be37528d322414b5dcc01858c8b3cd4ae51994258b46263f61f8c26e38 SHA512 1776f5d98661ebabaaf08ebb0af5c4019d5cea89871f7d5e43ebd44945a56baf2de746c5f65854e9047ab82cd087766c6da538b5de8440e72f9ed82f2cd0a073
 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
 EBUILD kicad-doc-5.0.1.ebuild 1328 BLAKE2B e56c2322b73ee6b26061e101c4c2009e5b1dc77b6c5f932d29ffa8ad38640190ef3090c349b9f79b23d9bf3f4eb68c3e4df313ace2a5d6ff80d6e75685f1da7e SHA512 1e2f70d80663fabf9e7129205658d5eb36dc3e928a3dcb23bf07394d9e3003509f64a8af945bcb3b9fe781069c7b7ffca396e9f0799bc00ceca028620b5cc836
+EBUILD kicad-doc-5.1.0.ebuild 1448 BLAKE2B ae6c3ba091b09971924572411fc42c6ee2414987b25a7b6e670e2225b4d1c49375683be0b1ea70bfda47113a5e16a01fcdfc37d0aa6bdfaea925482877653bc4 SHA512 4c56cb6e68d70c458805e4c402b4101b8d917f32c9d46db24bdb48677f1feb449f054a1e88e79e97148c8ca07e331b278e7980c62a56b7b231229cb107e87c10
 MISC metadata.xml 821 BLAKE2B 631ca1c015a9e76858685a08e77512ad495bd6a95c41e307363bceee3fa48cb627eea89d004f2ddf293785452535f468f6fd9a717440e0ff022673a8fbbc3929 SHA512 07b69d4deccfa4edcc50e6652ff5f8af8fe265dd8887996c1c1d3d02691d578a139c3ba7b81e63eedc257664d32e1d74e4d24175e5d73ac2ac4f62fdee9531bb
diff --git a/app-doc/kicad-doc/kicad-doc-5.1.0.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.0.ebuild
new file mode 100644
index 000000000000..c98f840824d1
--- /dev/null
+++ b/app-doc/kicad-doc/kicad-doc-5.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+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
+	>=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 )"
+RDEPEND=""
+
+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
+}
diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index eb36a07787ce..2dc15d8a82ae 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 1409 BLAKE2B dc81ed4b9dadb4b65b9b0bfc8d1d8b1cdfce7e2ca0b940819eb4d496fb6d7c6bbdf9689d33c4c23236c263738c668006fc2ccddc5b0c76649a75c16d1c4330c5 SHA512 a2c63b7c6569d545c2ff589e16438338bcf4ab59322290c44f987922993c17454ed6cc7d406aa00b18c6f54a7413b37419a9abe1a5948962410a4525ee870ddd
+EBUILD pms-5_p20120920.ebuild 1413 BLAKE2B dcdc3568344dfaeef0fb3dbf5e315521aaf5fec20600a8fe01e950b108935b1ed6c85a3c52a6048be36e8bb82828134c3cda4ca307db9af43448f6d882bc4cc2 SHA512 28c3271cc703048af438f060d01f976bcecc7468ddacf91f91cda7325973953761f518d7a8b32f7422e643e4a02fe462fd9e17ad09d7fb31e4a49683b8c04d09
 EBUILD pms-6_p20170429.ebuild 1540 BLAKE2B 6687bd086717f160fe8d93127077103be65e1a848e7fd41b78c913c14d69a89f13c076e42122997dcb61f4f03d62c5f5a5068744b1dd1ae3a9846b0dc661bfe3 SHA512 eab9166b850ce33b48395537d53831659b3b79b9099e83af3d97475dc5ea0929174d8cc0d28002c3b2f2ff72d6e57dd5e9b7f51a244c59d962fcd656c737d8f1
-EBUILD pms-7_p20180430-r1.ebuild 1653 BLAKE2B 420a4b807d521a890c29b97b4a24c47163cf022196e22b82f61f6d48b4017f5b58a3cdf4ccaf1b5bfcd3f081be5f140f80ee7c18af8c4a80621fde73d0a19604 SHA512 f237a1f35c162e9d091dcccbc931c684781b1e58143620314a112e08d1a265cdce9df7bad0abcb8e2822a9963a89dff90c0d74bb3a1bd4638ba6187ab8bd5b89
-EBUILD pms-9999.ebuild 1210 BLAKE2B eb7a4a5fc3f2d1b4b4eeec8d280a9b18b6be2a82e078b946fc47666edcc56fb755c50e3d854faa6425e269cd49cf530465a08d72ffca2012f4d6d9765e9fa054 SHA512 4e228ad6cc1c436f5ad702c1def0ecec61ea1e73923fefbe0b62c1148bba7cc91aced065710f838f2f1bdde6164a4c4bfbd4d0c6326b2ce246374cd82ce43a51
+EBUILD pms-7_p20180430-r1.ebuild 1660 BLAKE2B 036842f297110886c1628b0fdd7d16b1eef9b8f9f03c88fbdf804d1c257582fb85a59c0a940cfd23cb18a5aa53c4521b8f0d112bead3cb87d533586d629a50a1 SHA512 51ef111dfa2296056e76f0d0d727810d3e29c5508f8737846691e8a9c917d36e838a1f7e9163bb349cb9eb87899d04739ab118a8cece2e6fb4813b34190637bd
+EBUILD pms-9999.ebuild 1206 BLAKE2B a9df125c860fe83cf1be1b6332e37f61ef9155073550d18dababd6d001cb265a9cdc2d6752651ec3c4876a8ba2d67b14044c3bc2358610e6f5cfaa6d5b778805 SHA512 7a3f3d205415518f1adc703970b46cf646b7b92d9a3c6e10faeeb63ab343316c18078707526de13e7030c18b77f5964b57a81e33386483449d896e56ab71bc80
 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 8ff35630e3ca..2e0053e3aaa9 100644
--- a/app-doc/pms/pms-5_p20120920.ebuild
+++ b/app-doc/pms/pms-5_p20120920.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 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-7_p20180430-r1.ebuild b/app-doc/pms/pms-7_p20180430-r1.ebuild
index 1765e6fd2273..449dfdf6c228 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 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
diff --git a/app-doc/pms/pms-9999.ebuild b/app-doc/pms/pms-9999.ebuild
index 4a32970eb17e..4de9727baee6 100644
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-9999.ebuild
@@ -14,10 +14,10 @@ LICENSE="CC-BY-SA-3.0"
 SLOT="live"
 IUSE="html twoside"
 
-# texlive-bibtexextra: plainurl.bst
-# texlive-latexextra: chngcntr, isodate, marginnote, paralist, tocbibind
-# texlive-mathscience: algorithm, algorithmic
-# leaflet used by eapi-cheatsheet
+# leaflet: used by eapi-cheatsheet
+# tl-bibtexextra: unsrturl.bst
+# tl-latexextra: chngcntr, gitinfo2, isodate, marginnote, paralist, tocbibind
+# tl-mathscience: algorithm, algorithmic
 BDEPEND="dev-tex/leaflet
 	dev-texlive/texlive-bibtexextra
 	dev-texlive/texlive-fontsrecommended