gentoo resync : 15.06.2021

17 files changed, 229 insertions, 86 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 31a52eee4fbb..f1eed3776992 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/cantera-docs/Manifest b/app-doc/cantera-docs/Manifest
index 3fdd1d9aea5d..36c2274ca2a4 100644
--- a/app-doc/cantera-docs/Manifest
+++ b/app-doc/cantera-docs/Manifest
@@ -1,5 +1,3 @@
-DIST cantera-docs-2.4.0.tar.xz 4915944 BLAKE2B c7c40651ec8b4c6f6488c49cc991a115f08d6053b3383e28660028e72a55b2c231bfcfde976bec5e2be85828e642668d71730bdc803198bdcdee0631c09208ec SHA512 182475b180e65bb8bd7d5259a3b2a385b2b7c7db61a258a460c3e5fa91ae101306702ea3f00c6996a65ae8ebd1985dcc84b6d8291434578938efbb584db94c40
 DIST cantera-docs-2.5.1.tar.xz 4916296 BLAKE2B eb3da9f1258f6ee71d8a886c916b7c53c886078a0cf92bb407b6ddde28da659e9bb9195809a65ffdf20a49cee107e1a6503a381b52cc58a36fe750bd7edc6d72 SHA512 3e7cac6bc5ef8c8721f4fa4aa34ba9a3291a8bb9919801df22d080a4a45158e9388d2e4b19f0b133fbf9e9a1810d3ef53d12aae032caed5bfe593bc3054de939
-EBUILD cantera-docs-2.4.0.ebuild 831 BLAKE2B d9a095ee817e46ea3c6d150d602d693971d519edb07936802c4253668393658cf76ba49eeb983442829cbcce3e69e28187814ce031caab581033a8ab74fe238e SHA512 5028e20ed26a2620895ec0ab97aaf3fc26f4998254b7714c0eed259fd1b41d10d3a50114f56d0af8de7973bb8a56e9b6159da8b85e3181736f0f411ec238d74f
 EBUILD cantera-docs-2.5.1.ebuild 799 BLAKE2B fd5848748292bb69b0d239104ee5c09ca6a562acef23de5679b540da4533d8cd4e844d41a103b0d26668322dba0044a6dc814ff24bdf5a0c43f1e91b28d93a4b SHA512 f5e8939cedb4ef879d4ce7c925270d41b6bbe0148cda57a03343381d6f35dc83f245f2ebd611762e172320e3347e65cce7e4d7a631385be5062b3b5e51d1d42a
 MISC metadata.xml 613 BLAKE2B 0f39e26b066271d192f226d50ce5ce19f1937662581dce8e0f9582615e14af5a62b46737a56be375adca579c4d79b069311d61f9d9ff7a2703ba04c94b5f53a5 SHA512 a185ec9416cf25bcd960988157266d9feecaf2bff97fd39765b1d4fef6d362a591cc434072acb03a03b15a0e5722c8185a63cfcb30cdddb617d7fbcf37a8b52c
diff --git a/app-doc/cantera-docs/cantera-docs-2.4.0.ebuild b/app-doc/cantera-docs/cantera-docs-2.4.0.ebuild
deleted file mode 100644
index 9a9bf2122f29..000000000000
--- a/app-doc/cantera-docs/cantera-docs-2.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop
-
-DESCRIPTION="Documentation API reference for Cantera package libraries"
-HOMEPAGE="https://cantera.org"
-SRC_URI="https://github.com/band-a-prend/gentoo-overlay/releases/download/ct-docs-${PV}/${P}_modified_menu.tar.xz -> ${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-misc/xdg-utils
-"
-
-S="${WORKDIR}/"
-
-src_install() {
-	insinto /usr/share/cantera/doc/
-	doins -r "${S}/."
-
-	make_desktop_entry "/usr/bin/xdg-open /usr/share/cantera/doc/doxygen/html/index.html" "Cantera Doxygen Documentation" "text-html" "Development"
-	make_desktop_entry "/usr/bin/xdg-open /usr/share/cantera/doc/sphinx/html/index.html" "Cantera Sphinx Documentation" "text-html" "Development"
-}
diff --git a/app-doc/csound-manual/Manifest b/app-doc/csound-manual/Manifest
index 7d04b7e22bf8..01a77ea213ec 100644
--- a/app-doc/csound-manual/Manifest
+++ b/app-doc/csound-manual/Manifest
@@ -2,5 +2,10 @@ DIST Csound6.15.0_manual-fr_html.zip 20968371 BLAKE2B aed67cf5dc09032839fd3c56c0
 DIST Csound6.15.0_manual-fr_pdf.zip 9761787 BLAKE2B 671d94bebbabbead16ff251c88a99f3cf278cd0b0f746ce8239fbfe481db1a2c3b747c48026b82b8a54b72d5f7ac83b8c095aedc19088c3f070e773c46981bf6 SHA512 3db587fb5f15febbd39c8d090df46b71ed590c8eaaaeda8c53b9218283cc7375673f1711755e47cd80048934252bfe97e92ff699e3bae0e86942ffd99597f8c6
 DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1 SHA512 cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946
 DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e SHA512 0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
+DIST Csound6.16.0_manual-fr_html.zip 25060442 BLAKE2B a08a5b22a9c5797ce98e523392f0023a9a15c7bae8166285b0dde93f3f1b557a10e6668b90e47f888189a49ba49860bb4405a87179c3b63b82339b21b4477e5f SHA512 a552e4cbc997ca59fd809e5200edf9ae219eed1e16d25d33ba7804a7e9ed82b689391fbae4d6d8f7c449f4a178a1fa17062fd9d9b0bae2504c2a29ec9f713004
+DIST Csound6.16.0_manual-fr_pdf.zip 10042266 BLAKE2B 9bab455552487a476aebb26de07f88d31fb3526fc880635a831e553812ad68696480aca0b7feca4c4fcec0c1d79058bd73d796c409d845ecf2c00eb36446ce68 SHA512 61d0d19d5eab8fe9c9ff3880cdcd03fe8f4a06875f7ea03bb9957c88222485a561469c810e3edc8edefe14a0fdfb18c802525bfaaed970fe017e99d4c13651c6
+DIST Csound6.16.0_manual_html.zip 24765630 BLAKE2B 3bf6e2202a42dfa826d39ef41282e1942f26cc3f6a3358e0de3a006f102b686342b4e1824a1c3a48ac37ffed31d9353e6946d948751dcc059819da649d63d9cb SHA512 e550a832e365ab186533045d110259699039d08a85ec2f53d4fe36aa31004725b1dc6732f71d9895fa19b3df5f4ec720af1b4f80856a14b0ffbd844c4ab2dbe3
+DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754 SHA512 18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490
 EBUILD csound-manual-6.15-r1.ebuild 1620 BLAKE2B 18bb3ea7398c88a0efe2dbffc56a9c805efb742324e6a3e6c72e5d2248f63a8aa6c056774f7e989be691853ae2a825b2ead4b391e1e86abc56ddbeaae8af27f9 SHA512 7a80bc861002c97fd64611f5faaac62a97f6469014326c6b45d0cfe0ee4333b986e132f8eb12f67101c37b1eb175886aad63bbc46254552bebe697519a0684c0
+EBUILD csound-manual-6.16.ebuild 1622 BLAKE2B 45ad300bd8a0a21fe7d8a1e6081a5e06576a599f8bd0f49a6574299b674554dafa938f495031d7890b6c476f39d890da94c296eb24fb27486f5ad3c8d6da291d SHA512 6941c23359c7eb383af6625a0c35d794ecc733ac964b3e49b2a469f6849365eb42d7469cc9154b46a69288117779dc9c30d98eabfc7a9a5e37233558f7a2dae3
 MISC metadata.xml 457 BLAKE2B e435f21c93a42188d38ceedb4ed2dda795021393c4a03c5d5ef020f31b853a45117e5ae2e9080013cff833b3648f8992fbf44b162d84856286a5d057a91fd334 SHA512 d6cb43f4d0d9485ca457ea2463adfe1ab6f480e3065b986e0c6959c9d29d4fb57122116532118a9e98b4189f1fbd3fef5df5b035e1f7050b3992d98613027908
diff --git a/app-doc/csound-manual/csound-manual-6.16.ebuild b/app-doc/csound-manual/csound-manual-6.16.ebuild
new file mode 100644
index 000000000000..987fffe48dd0
--- /dev/null
+++ b/app-doc/csound-manual/csound-manual-6.16.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=Csound${PV}.0
+
+DESCRIPTION="The Csound reference manual"
+HOMEPAGE="http://csounds.com/"
+SRC_URI="
+	https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual_pdf.zip
+	l10n_fr? ( https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual-fr_pdf.zip )
+
+	html? (
+		https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual_html.zip
+		l10n_fr? ( https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual-fr_html.zip )
+	)"
+
+LICENSE="FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="html"
+
+LANGS=" fr"
+IUSE+="${LANGS// / l10n_}"
+
+BDEPEND="
+	app-arch/unzip
+	media-libs/libpng:0
+"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${MY_P}_manual_pdf.zip
+
+	if use html ; then
+		unpack ${MY_P}_manual_html.zip
+		mv html html-en
+	fi
+
+	local lang
+	for lang in ${LANGS} ; do
+		use l10n_${lang} || continue
+		unpack ${MY_P}_manual-${lang}_pdf.zip
+		if use html ; then
+			unpack ${MY_P}_manual-${lang}_html.zip
+			mv html html-${lang}
+		fi
+	done
+}
+
+src_prepare() {
+	default
+
+	# Fix broken png file, bug 737130
+	if use html; then
+		local png=html-en/images/delayk.png
+		pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
+		[[ $? -gt 15 ]] && die "Failed to fix ${png}"
+		mv -f ${png/.png/fixed.png} ${png} || die
+	fi
+}
+
+src_install() {
+	dodoc *.pdf
+
+	if use html ; then
+		docinto html
+		dodoc -r html-en/*
+
+		local lang
+		for lang in ${LANGS} ; do
+			use l10n_${lang} || continue
+			docinto html-${lang}
+			dodoc -r html-${lang}/*
+		done
+	fi
+}
diff --git a/app-doc/geant-docs/Manifest b/app-doc/geant-docs/Manifest
index 7fb9556e8677..76d86843934a 100644
--- a/app-doc/geant-docs/Manifest
+++ b/app-doc/geant-docs/Manifest
@@ -1,17 +1,9 @@
-DIST BookFAQ-4.10.6c.pdf 183227 BLAKE2B 50065fea13a2f5fed0e0de52b316968da05ebaf7fc8704fd9860b07ac83af9423ff2937a5b134a987b32dfec108b86548e4b0e0bcaddb1608850f336dc38ba7b SHA512 99a80740dd996d0a5f6ad198d82b9cbf991dac13096f4220530a9e87103791b65a43c887797efb261e2e461a0a89e652f18665095a661e68d1bbd763d8385d6d
 DIST BookFAQ-4.10.7.pdf 182327 BLAKE2B 5a625b1d455a7313ccd9a36296b11390c7497ba7cab4fe952933c29b9e706cac370332057a79d444100130dc5d4097258f71c6d51e36cc7b74cd62d8685f5479 SHA512 79a10f6b0d318ef19b05fc28b499d7d60a358a7a15cf8194a4a935721e35fe34c50b05b50032eb7134183b4ef8f4fc8f43f742007e2ffa0db0bf9c6ddd8ec917
-DIST BookForApplicationDevelopers-4.10.6c.pdf 3731281 BLAKE2B 40a7ba97dbde79bbdfcf800922bad6e8678818fcb49d175a1f8514dff1c893036fddc9f5a04710961a9612fa7d5ce9e422e5bf12d025f665cc60c29af4094b23 SHA512 1b78eb945bd8819daa0d218d069e9a799736ce8e8added481038e4c61619f533491b5d1119791e0adefb5c5bf0eedcc36435b23120ea3276977c459d20e1ee3c
 DIST BookForApplicationDevelopers-4.10.7.pdf 3796649 BLAKE2B 75acd17cfd29245604fb95ffd606b72ef59943d3916e34e0c33ed271d92f2091994c99ebbae0b95fc09bc42092e1983a320142bc62a7156d702584dd276273ec SHA512 273c0b0ca94dc9d26b44955ea13150417e766b08762b5b2c94d743fbf6ea7b47dada9009cc8765b62e3e7e6a2ad37b95168c45f206e20cbb23cea9c577da3f64
-DIST BookForToolkitDevelopers-4.10.6c.pdf 7331646 BLAKE2B f5ef48bf09284e1207dbfd9513c096dba0595dd357caf45f52aa164206fb0c24935844b3b45f95d606339756c0a9bd558965b78de7cb62abc5bfd74a2b01bfbd SHA512 e108577c2d3dba45422fd5523b2a6fc222457e0cae76e34ebb2d1f4692b4ff9714a8a9f1ae95307aaae528b86373a844821a4a073733185ee56a3df94ce6e24a
 DIST BookForToolkitDevelopers-4.10.7.pdf 7336024 BLAKE2B f217c2bd01b73138f5b6b7f4211f5277fe2ea0f48e9849fedc4d5c56b766b69705fac2cf3d7523c8d008d6a546e4753ce485d852c4b8886a2403c6ba7212704e SHA512 62a68b3c02dc301f3c627da3b029620606e975316f90637b76e06e5e766647608d69eb29a14fdbe3264401d664eecd5d128b9990cef0c5f6f69d244dc804cfb8
-DIST Geant4InstallationGuide-4.10.6c.pdf 327501 BLAKE2B 9379ce8243dcdc08f764f7217b86d1dd414c649cfc163702a16e883774be9ea2242b8f326672be0088dd180de727c95539227d8d17002f0bf79e74ecf5a5955c SHA512 3c480f493d093d22c6cf4378ddcebd7d192684a4202597fe04640e695cecc7ec36fb403311eae8a59fd88a5136d5734fadf03174b3391cdc06744a7b91834caa
 DIST Geant4InstallationGuide-4.10.7.pdf 282056 BLAKE2B 36e3ce01c836796973a63f1f48248024d55e6cb4c2383aa245baaf85b57fbc722d2ff518c11078434571160d2ccfe8d8b7770c58e31a24b264100cdf792b7508 SHA512 13372a61629c6ccadbec4416da06db1c8f53be5f69d8918997643de16f8547d74eb604cbf1b6fba55001093ce3cfbf74f0ebf249cc6f7dae877c9397d67d153b
-DIST IntroductionToGeant4-4.10.6c.pdf 142963 BLAKE2B 69b3594fbe888c4d00cf41f27a20a4127df970d4b58da68ab921245b7a888f3d3e439c6bc2fd2b32b7720aef6e867159ea1dcc22a66f4fb91c78c7a8c60ff255 SHA512 ef04dfc8ef49f05d3eaeb625fa61d74c6b59dd1b3504d63ddf6a0c80dd547ca03f5ce0cd28fdd7e9f1638bb91ce7dbea059cc5ae26ed776d78767cddf8b237be
 DIST IntroductionToGeant4-4.10.7.pdf 142118 BLAKE2B 975906d4cc1dd2a54bd283c228cc4ff577f842eac853b491899dbce243732231843ee9296c4511f171fdb089f98a4bf8dc14fbed85b3e3fd908f77d7e4395a6c SHA512 940cfe00e9ffac83ceedde03438a2b05b80ce6f7d763811924ec07e2eb8f69516c3a2ba18bf7bfab37c1026a00481d483129835830ecfd75e4277ef063dbd464
-DIST PhysicsListGuide-4.10.6c.pdf 343740 BLAKE2B f53d7e06692af87aeee32a43406ff8388bc491e3cdfb37c41106e6d0848433ab3ab8c12da2160dc4a89593998f40d3447a026e1b294e989c902352f01e941d68 SHA512 58ffc1ed365f14cd03dce76ce98a6ef54d52bb4b4fa5d6906e64cbb8e81045e2ed980815760d5a25b95883c01ec081bfc8a21def2b43f9b61964cb50a79b5bfd
 DIST PhysicsListGuide-4.10.7.pdf 347016 BLAKE2B eaf1ba5fadf80180478715e69074e88377a036f4e69d42dbff50b8c8112ecfe32f6265b7397965432b077c34b4e81d8740f008e03f1445b697702d521b1e6944 SHA512 ca90ccfecd9f1c8a3cc34589359d3d1e5ccd8499a2d747fe8735a776b3dd7815e6090d01e42beca2c61c330bc21e34ea0948e8e62cea7ed1e59f61fbad102799
-DIST PhysicsReferenceManual-4.10.6c.pdf 19489188 BLAKE2B 4323a460a62a9cb7a1bf575489ab02f15bb96dfe017a19d71e15f6d3a06ed8355246c2d5f362601ca5dff9cfad1e0032a85cc8aac88e150dca36308925016efe SHA512 7e42749e578809e89ed589498e18e15fa2a62cac61668e628c77af093a85454d79a5738f4ca034c73a2fb7c67afb9a563e9ffc16a20d85fdbab9f57b6bda4d55
 DIST PhysicsReferenceManual-4.10.7.pdf 19522499 BLAKE2B 9d386c81910ac695c172c2c692ce5b8d6c4b9e7213f07851ddbbad43b299da5788d1027238a25d00fbcae47091c5194d43fd6b8abe0d6385376c4cd98c6f73a2 SHA512 269ddc752a11c8257e9fe042dcc0a115a1bdeb5f312dd16378df6db751477f36758189894a0f07a6303f8fef9a26cff05e99aa691fb83e17c8db3a1de674a8ae
-EBUILD geant-docs-4.10.6c.ebuild 1368 BLAKE2B cc6f9aa96165ee160ffe5cfb2f1d79c0cdbc6f5f9ef85b20cd62c1c454c5c00c3e4384919e6e804f5b6258c32b966b2905e4169049090dfbf13b2e351c3875b3 SHA512 e7bcf2cc9e4d6ee0f3be7027ecfb4518525ad3e2bc3fad1662beaff339b4f1898982d5476998143b23426b05e78ab9dbb05b15545e649a1b42020be7253d97ed
-EBUILD geant-docs-4.10.7.ebuild 1370 BLAKE2B b35de42675b442c06ec2b9fdd6d77310eefdabf89d2455fc6186712bd93c4800406f8f9ed05d1fa875457224fc221c15429ac1f6c7331c5c002e225e28adacdb SHA512 63e7ab681b8637971a72cb208b471eb27ffe50f9ae15ef63bcd4048e5abdaea20f8b2b0e225f4326f3778f38c15f02e398f5f07bf053f98afe9195b7a0de978c
+EBUILD geant-docs-4.10.7.ebuild 1368 BLAKE2B 47030f5c02b263d9f87952a89f2a869e7099c13b1f1107c0f77985ade5d313d443df41e18c7b1b02bf3f722719682f26e386cb70ada5480ba5124c1cb3e090b1 SHA512 56d3985208a0803375da8aae1c77dea09f0c43c3b259f7c18f7476a5665e47cf4eb7113dd86c0e6f7c874614fac5f87708ab89bb10831cd6147dc07a93ee6d2d
 MISC metadata.xml 280 BLAKE2B 7184e9c44aa5869cdaed77878aa589dc155003b3647959600d8dfc84ba5de44010dc42fa9cabf4bc80e68407007a7d5b220b43afcdeb3a1cb702a2b23180e19d SHA512 de744ec4e40c3aee047e5ef30ffadc9542e8ba2e88d6cd41f56b5b587cd70527c80560d4b0c6dbccc7641da12ee0d863e5dd6492a02bc56e5a12227fbeb5ecbd
diff --git a/app-doc/geant-docs/geant-docs-4.10.6c.ebuild b/app-doc/geant-docs/geant-docs-4.10.6c.ebuild
deleted file mode 100644
index b215540487bf..000000000000
--- a/app-doc/geant-docs/geant-docs-4.10.6c.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=V$(ver_cut 2-3)
-
-DESCRIPTION="User documentation for Geant4 physics simulation toolkit"
-HOMEPAGE="https://geant4.web.cern.ch/support/user_documentation"
-SRC_DOC="https://geant4-userdoc.web.cern.ch/geant4-userdoc/UsersGuides"
-SRC_URI="
-	${SRC_DOC}/FAQ/BackupVersions/${MY_PV}/fo/BookFAQ.pdf
-		-> BookFAQ-${PV}.pdf
-	${SRC_DOC}/ForApplicationDeveloper/BackupVersions/${MY_PV}/fo/BookForApplicationDevelopers.pdf
-		-> BookForApplicationDevelopers-${PV}.pdf
-	${SRC_DOC}/ForToolkitDeveloper/BackupVersions/${MY_PV}/fo/BookForToolkitDevelopers.pdf
-		-> BookForToolkitDevelopers-${PV}.pdf
-	${SRC_DOC}/InstallationGuide/BackupVersions/${MY_PV}/fo/Geant4InstallationGuide.pdf
-		-> Geant4InstallationGuide-${PV}.pdf
-	${SRC_DOC}/IntroductionToGeant4/BackupVersions/${MY_PV}/fo/IntroductionToGeant4.pdf
-		-> IntroductionToGeant4-${PV}.pdf
-	${SRC_DOC}/PhysicsListGuide/BackupVersions/${MY_PV}/fo/PhysicsListGuide.pdf
-		-> PhysicsListGuide-${PV}.pdf
-	${SRC_DOC}/PhysicsReferenceManual/BackupVersions/${MY_PV}/fo/PhysicsReferenceManual.pdf
-		-> PhysicsReferenceManual-${PV}.pdf
-"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${DISTDIR}"
-
-src_install() {
-	local doc
-	for doc in *.pdf; do
-		newdoc ${doc} ${doc/-${PV}};
-	done
-}
diff --git a/app-doc/geant-docs/geant-docs-4.10.7.ebuild b/app-doc/geant-docs/geant-docs-4.10.7.ebuild
index 56ae17a3ab7e..7d93512c4e54 100644
--- a/app-doc/geant-docs/geant-docs-4.10.7.ebuild
+++ b/app-doc/geant-docs/geant-docs-4.10.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="geant4"
 SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${DISTDIR}"
diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index 1fb94957feb4..8b127c79ff3b 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,3 +1,3 @@
-DIST kicad-doc-5.1.9.tar.bz2 74200779 BLAKE2B 9bca24edd9b73a2a532740538dd253a445e8acd1fa56179173be5f231be9781dfd63451e5ad1b4ebe8f676101f0db838f7acc032a5e0b0b21a073332e4978f6b SHA512 5c587fa7fe9611e76537efd8e6a1fc38ce299d1d5a974f27986925c5b6867287b5cd8350d53978e03ea5cff7c2782c1a0c12a5bc64c230973234cf2481a93f71
-EBUILD kicad-doc-5.1.9.ebuild 1433 BLAKE2B 61ab869971082533455fdaed043c899d3e06057c646587ad1913f81f50827e1cbaf10cf7ee7554b01dc26c5af2e0039b55515b9f4c69ad0801ac9ac820a1651d SHA512 ee92e2d045ce6174617369bd37b3390c6292b0688f779bc01b37ccc5f368ff9dfb2780695c700a054e80f5ab401f174b601371fbd0048de597863845d85e5f3f
+DIST kicad-doc-5.1.10.tar.bz2 74201837 BLAKE2B 6e9810c1efc46c52c4d7f4818c8a5cf438bdde82971074cd8d59a1cf81431d77d3d09877666dba8d9c3af8a2b0bcb643352db0b9f95ec60b1c3325f0f2adc667 SHA512 2795bafe835c94ea169484e997cb57a0e8b419e6e7b28324f96602940e5d66762cdf594ec6503cb8718707d6dfddde2070aadc8e97888c0bf455ea56f625dd43
+EBUILD kicad-doc-5.1.10.ebuild 1433 BLAKE2B 61ab869971082533455fdaed043c899d3e06057c646587ad1913f81f50827e1cbaf10cf7ee7554b01dc26c5af2e0039b55515b9f4c69ad0801ac9ac820a1651d SHA512 ee92e2d045ce6174617369bd37b3390c6292b0688f779bc01b37ccc5f368ff9dfb2780695c700a054e80f5ab401f174b601371fbd0048de597863845d85e5f3f
 MISC metadata.xml 851 BLAKE2B ccb27060634024b293cbbd1ee34d774b158d3d21e32f7b36d69c25422181d29d1d5a2de3e9b88f898314290e48bc381fd20d4c042a100d2047ce3d5e7cb36901 SHA512 f48e3e651a0810eddf6c990e4510e86fdca9ff2bc1d58b2df2169449259e8f57f54870d0f3461e8dc66b1ad38dc55c9e7d1493c2b4a73813c21c7b80972d16bb
diff --git a/app-doc/kicad-doc/kicad-doc-5.1.9.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.10.ebuild
index 86c28051d6d2..86c28051d6d2 100644
--- a/app-doc/kicad-doc/kicad-doc-5.1.9.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-5.1.10.ebuild
diff --git a/app-doc/pms-bin/Manifest b/app-doc/pms-bin/Manifest
index d7c93ac10dd7..c40a74f1810e 100644
--- a/app-doc/pms-bin/Manifest
+++ b/app-doc/pms-bin/Manifest
@@ -1,5 +1,8 @@
 DIST pms-5-prebuilt.tar.xz 540244 BLAKE2B 06fbfd4cbf9968fbe19d1960687f226c87b2a16df8b9c3c80328c9436d886b1888484b0cd636f3d5ce492578e8a3e7c1a42be5cf7f8072c71fa401f817125d33 SHA512 64baadd65f1751783032065832d2a18242967f1853d9b6ce0565a5477c021cfad3c06d9c3cfeb83ca9a64bbb052ec67c174bfd27036945ff762fe4bbf8c28451
 DIST pms-7_p20180430-prebuilt.tar.xz 593500 BLAKE2B e59882b215492424b351242f31b90cc3aa457f7e4630c5b15fe8bc18fd8722764371868f3a44bd7226f4d00c5a8d9c12829d934cda715e575b4c949631c4ad02 SHA512 e27527e4ea1fa16f7c069267bec136521e7be621bd49701920d11e79e4a5645ca8da06aa41c4adaa1813c0f4abce8248e4274d7ec0ae04f6a8479107b0578c4f
+DIST pms-8_p20210613-prebuilt.tar.xz 603304 BLAKE2B 89b5aba786ab3c190265066d73b1009f380081a408037e123a790effb021d562f3f82b4c8c10f9c263c24d4ef4c6ac13ea9c88459ca82237da8548cad8927c86 SHA512 ecb60d76ff5ed694ea197d88fd13841165adc45c951e933f50334e22db45a26eee30c332479d5fa9da02ff30c70fd52c67174bd2443d0c2d4dee38ba979eabb8
 EBUILD pms-bin-5_p20120920.ebuild 815 BLAKE2B 28b2da3304a537dd6056e1904d17d99f52fb8884a8c214cc51db80733eb831bcdecde8bdda8ab47591d5c0998150f7ef0fa5df27157c2590012b39d9f09f20a8 SHA512 aa345bc44e28c1a246594c3766e889ddf8451f1a68a0da22554b0b07d8b4e8b45070a48591e8d64dedda8b5bd4e340df186dad74338cb71119dfff6bafbf4241
 EBUILD pms-bin-7_p20180430.ebuild 790 BLAKE2B d1fc921f5486b336d95bedb81608b9fc3292f0f41324dda1a4a9a50e4e3ca63d8f36f7ebd5040c45037ceb7b9f4e58f3eb64fda34ed0519f7b7aab464768be0b SHA512 fe9434f741e921e2e1da98061600a2f227dfa808f8dcb8083e1a976c509cfd37deee60b465602bb090583da169099f89cc269fa21b0dd883f195640dc86cb643
+EBUILD pms-bin-8_p20210613-r1.ebuild 798 BLAKE2B bbd41e7e18aba45b79ee59dcdec271d8d84335ce0c32c33e56103181ec794f78f719d3fee6bcc4c616e8467e29bd80a3a6fa4de311a1a644ef024fe1a8dc4bb6 SHA512 6e30448879319c30ee34869d702ecc25b2e6d2a31a9ac359a530a89d04e9f7c8f8c1b9b26a858b374195d5badce3ab4a01b04872d126b784981d8f749bea079b
+EBUILD pms-bin-8_p20210613.ebuild 790 BLAKE2B 708b188a19662b5780da492a2cbbccea78124b134e7852aedaed79a799e5ef38f432cd7b9207e028461d6978773d6d39d28ef2f8de4cacd16e48f7f5397c3bbb SHA512 72d02f118c1073224ff01fff857c6830d142e78c7ef6076743e1cd15f9cb17382b92081985d1faa09e2df239f030a9a90198a32520655ece475a42a081ee45c1
 MISC metadata.xml 350 BLAKE2B 553458dec69cbe0a67c6294fb07520ab808057dd1ffa50ba3efb80fd552f8e85e3e8ada9873ae1db9d22a02854e1f6c532846d2fb9ad979e2359bab73c9a57d4 SHA512 7a5908f87c1875f3a70332a3c3b607c1baa94eb68fe8dd10dfe46cceed9ddff3bbf17057f0b5837cbab5ce474b89a2d30c890553016983ef742b771ffd746010
diff --git a/app-doc/pms-bin/pms-bin-8_p20210613-r1.ebuild b/app-doc/pms-bin/pms-bin-8_p20210613-r1.ebuild
new file mode 100644
index 000000000000..9016ca7a545b
--- /dev/null
+++ b/app-doc/pms-bin/pms-bin-8_p20210613-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Gentoo Package Manager Specification"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/pms-${PV}-prebuilt.tar.xz"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="html"
+
+RDEPEND="!app-doc/pms"
+
+S="${WORKDIR}/pms-${PV}"
+
+src_install() {
+	dodoc pms.pdf eapi-cheatsheet.pdf
+	if use html; then
+		docinto html
+		dodoc *.html pms.css
+		dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
+	fi
+}
diff --git a/app-doc/pms-bin/pms-bin-8_p20210613.ebuild b/app-doc/pms-bin/pms-bin-8_p20210613.ebuild
new file mode 100644
index 000000000000..fd1ff165ab13
--- /dev/null
+++ b/app-doc/pms-bin/pms-bin-8_p20210613.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Gentoo Package Manager Specification"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/pms-${PV}-prebuilt.tar.xz"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="html"
+
+RDEPEND="!app-doc/pms"
+
+S="${WORKDIR}/pms-${PV}"
+
+src_install() {
+	dodoc pms.pdf eapi-cheatsheet.pdf
+	if use html; then
+		docinto html
+		dodoc *.html pms.css
+		dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
+	fi
+}
diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index 3c9f39245576..e03c6336bdb2 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -4,7 +4,10 @@ AUX pms-7-Makefile.patch 564 BLAKE2B 048273a5f5a49d4df06277a22abd3ef37c9726c9c11
 AUX pms-7-parskip.patch 959 BLAKE2B d2ec3931a9d0e415ca2e90aa788a967e37648abf427611f6ac3258afc9794e12ec397485b80371a6b64ac95c602931d08e4e3eb41a46552b086325af7b37acf7 SHA512 a5a4cbb81c6c9846592b642807d2eee0605255caf5cd15a59fc3395b671012f7a8a2a419757f22850ae37cf205c68ad32bc1f52ca91fb3b1ca7acbda123df347
 DIST pms-5.tar.xz 50284 BLAKE2B ecf3c34d79aa1439e0f0f4bca540b673440db04a7f533f103f5956f6a27e994ee42836ae2871c11fadf9230e2b5973d3d1db9e17167f886a6c929e533ece4d45 SHA512 560bdda40d4d1628e97b65bb354c349e3ac52edd1e337427adb0db61e99b40d214459a5046f4b505edfabc3914e2d585ef0453b13057a25fe138b8a5ebd6292e
 DIST pms-7_p20180430.tar.xz 60072 BLAKE2B 58afb1759c84ae86a1dd69aa04a6e8b799fd0cc1e1877cf1f6224f5b1bdbdfcdeaadcabbd9c37c263d62cb24b4164056a88d3524031d1704b059c376d5572101 SHA512 9bb64de842e0aa8f1a6488d12fffba76bfd190e53523e9261161467b30f001f20cddf593cd32e75ace4af309476eb7eb6966665d7ae9b54a5915237094110a47
+DIST pms-8_p20210613.tar.xz 61820 BLAKE2B 1e7e53cb8ea76c4b6f7e571b495bdc41956bee9d90fa1828b8875c262c0a500f8df25a3a53deb9fa9843250e8f3b914514a87019e57f0ecf329e8a62581c842f SHA512 07ef44b0be9b5d5c73e76f78aba2535eb57a8c555ec19bc4ba0a18a6b3b796cb44d6d9e67be49b704f43fa7ad6a8d111f7128d42caa43278dd269863dd59dc15
 EBUILD pms-5_p20120920-r1.ebuild 1230 BLAKE2B 9e6288f7c96d821303cb7ee464c2364c86cb80000b9250d445bb059dc5c60d4752d6a467de867e4974e63af0333ed80f163e81cacb8fca6e6d63c8e2f8cc88b2 SHA512 b5ad50670cfda0c038644158ccdd6b1deb53b31534b83d10e377caf4b16240d0a8f77a793416b559f3cca2aee9d9b68e4deeb2a6913b8bc3b4ede1bee1f88ec3
 EBUILD pms-7_p20180430-r2.ebuild 1395 BLAKE2B 80741ae49f08962cd632d8f3bf81a1a6db73b36c12c036a22745c8937586e64352562e69a12e1307600061c6456dae771993d051d1c616f768280397bb8ce57b SHA512 a982477aff5e1f8dcc9e1cd6b3f8487ec487a0f11f6fe106d1435242a923947302c557cb080a98ed51c36d91f5093935854f336cebbb4a64177f10347db0b075
-EBUILD pms-9999.ebuild 1146 BLAKE2B 90582ff0379454653b8f47e3f0502bb6b6dc4b94c0edaeb253fdbe530a668dc46bc61955e0978d5526771edb44f177e9fdbc1e01465f21438f8acc4edf92ee1e SHA512 864f5b76c2c6eb16542533f449d18a4e95bc7a465157f1707a572b69f129627e127379fd24b1a3d249c47da123a24d672d6df2e6943c1ffc74425e4955c7561b
+EBUILD pms-8_p20210613-r1.ebuild 1299 BLAKE2B 7eaf1c71b587beec29147304e556d5b8af2f65194bfe8b4976b4c2250429c26835b2361425b52b7945e5de1181693072b5ee1e024b19ec909386a9ed9c6d8ca1 SHA512 ef220478b4f81019eb2b1a56de4b5f78e84748ece0b4f6ddb58080f074ae367295ff1dcaf9716dc1dcab7ccef7cd4f1717d157df25fff1912d80f18f847f448b
+EBUILD pms-8_p20210613.ebuild 1296 BLAKE2B 1819ca415a72a2612d8c6bf8eb748359ca5d4dca76b2c3c062bee7a98e201e30781a3b312d02f00ea85f1fa8b5d6eb9be3623b55684641a3bbbd7f3b239284a2 SHA512 3c7d47dda9292c31224c722d8642191aeda3e48516448cfdde8d46a04f6a4f946f93965f9e6d9cf96ca19f501a2173679f77d0d0cb058cd78ef74610e2534f18
+EBUILD pms-9999.ebuild 1146 BLAKE2B 29fc155e3c89a55ec0d46563d3f89f22268705234ed83760a74663d16aacb50526810e17750677f6e256db6d4d838dc64dd6e189c7a2e2a9fa750dd4778aea8c SHA512 419500368821a9d6f597aba3fc1e316c8659adc694df05ac4b5f7ee334076f9d241a3617cf84e64a908f67c40484093c5bcfafcf7006aad9d8a2afa0e5f85921
 MISC metadata.xml 439 BLAKE2B 3d5b7ec10330bc77a6234beb03de1400af3a295b88e9f2382c76232e2519c944b8b518923d93d2a474e1b96cbd6801458814704b12f0b993165e802bc1fb9b7c SHA512 aa8e7627fb52d1a5357b7758f4cbdb74cef129b3cc45f48a8c58973141e5cea65c0007333fb8e388fd99de8606d8ca137e03f906f5c6e75df68f6eb96099949d
diff --git a/app-doc/pms/pms-8_p20210613-r1.ebuild b/app-doc/pms/pms-8_p20210613-r1.ebuild
new file mode 100644
index 000000000000..cc71b23becc6
--- /dev/null
+++ b/app-doc/pms/pms-8_p20210613-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Gentoo Package Manager Specification"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="html twoside"
+
+# texlive-bibtexextra for unsrturl.bst
+# texlive-latexextra for chngcntr, gitinfo2, isodate, leaflet, marginnote,
+#   paralist, tocbibind
+# texlive-mathscience for algorithm, algorithmic
+BDEPEND="dev-texlive/texlive-bibtexextra
+	>=dev-texlive/texlive-latexextra-2020-r2
+	dev-texlive/texlive-mathscience
+	virtual/latex-base
+	html? ( >=dev-tex/tex4ht-20090611_p1038-r11 )"
+RDEPEND="!app-doc/pms-bin"
+
+src_compile() {
+	# just in case; we shouldn't be generating any fonts
+	export VARTEXFONTS="${T}/fonts"
+	emake $(usev twoside TWOSIDE=yes)
+	use html && emake html
+}
+
+src_install() {
+	dodoc pms.pdf eapi-cheatsheet.pdf
+	if use html; then
+		docinto html
+		dodoc *.html pms.css
+		dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
+	fi
+}
diff --git a/app-doc/pms/pms-8_p20210613.ebuild b/app-doc/pms/pms-8_p20210613.ebuild
new file mode 100644
index 000000000000..4961cf18779d
--- /dev/null
+++ b/app-doc/pms/pms-8_p20210613.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Gentoo Package Manager Specification"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="html twoside"
+
+# texlive-bibtexextra for unsrturl.bst
+# texlive-latexextra for chngcntr, gitinfo2, isodate, leaflet, marginnote,
+#   paralist, tocbibind
+# texlive-mathscience for algorithm, algorithmic
+BDEPEND="dev-texlive/texlive-bibtexextra
+	>=dev-texlive/texlive-latexextra-2020-r2
+	dev-texlive/texlive-mathscience
+	virtual/latex-base
+	html? ( >=dev-tex/tex4ht-20090611_p1038-r11 )"
+RDEPEND="!app-doc/pms-bin"
+
+src_compile() {
+	# just in case; we shouldn't be generating any fonts
+	export VARTEXFONTS="${T}/fonts"
+	emake $(usex twoside TWOSIDE=yes "")
+	use html && emake html
+}
+
+src_install() {
+	dodoc pms.pdf eapi-cheatsheet.pdf
+	if use html; then
+		docinto html
+		dodoc *.html pms.css
+		dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
+	fi
+}
diff --git a/app-doc/pms/pms-9999.ebuild b/app-doc/pms/pms-9999.ebuild
index 3f10d491b8d2..b37a3c1f7af5 100644
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-9999.ebuild
@@ -10,7 +10,7 @@ EGIT_BRANCH="master"
 DESCRIPTION="Gentoo Package Manager Specification (draft)"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
 
-LICENSE="CC-BY-SA-3.0"
+LICENSE="CC-BY-SA-4.0"
 SLOT="live"
 IUSE="html twoside"