gentoo resync : 22.05.2021

15 files changed, 107 insertions, 101 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index d3e81097c894..1cb70fae5f7f 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/abs-guide/Manifest b/app-doc/abs-guide/Manifest
index ee23df606141..2887e94c96c5 100644
--- a/app-doc/abs-guide/Manifest
+++ b/app-doc/abs-guide/Manifest
@@ -1,4 +1,4 @@
 DIST abs-guide-final.tar.bz2 1141871 BLAKE2B cd17182f5693a9e20d0549267ab86851da070b2100dd807f8b3c5fee2a0d674c001f36aa8e5e7ce8cd0358400152586c84c3fe5b99bb3eb806372eb5f39aad4b SHA512 76c445da6faa47418e50458bf2bfc0b4c34c9efcc93308c39ec880b894d019bf9a1d2f4a8687d14bd9832872b666769f6f7f74c313520e9770f16724eb3adfdd
 DIST abs-guide.pdf 3358210 BLAKE2B 0d222f7f50d7044e46d7384870c5399468e7ed5e7819edbcfa7aeb5dd30e5d8749068d31ebdb9e707c168e45f027bdac4f7a9ed294f155f26cdc066884e1463e SHA512 8691ddab583e816ca9f0e42d37d45d8c27e74b5b62a5a951c7fe5830679e9288d4d5f98e7ff0746e2ac71e26322c7dc8250e33128b3e77591a1e48e8d415777c
-EBUILD abs-guide-10.ebuild 866 BLAKE2B 01883a2a266d0a0bb8985cea7cb652ba6562f8e4fba85eff2fff593c361b01bb8c60574dd59dfc05f5614066626a740f70196e4a9919864d95ae952fa40667d6 SHA512 932965eaec3fe0af2f1b30684279fa02f7e06b4d769132352055ac7709009ba3e444f22282c66e595ab09e204d0e004a7a112cba1dec8b347105d0767397548f
+EBUILD abs-guide-10.ebuild 868 BLAKE2B f6f32b96cd2d26b5bf9f7af63ea5691197aa2d65f1da48d4fbf4b176f264938b8f763096a7582fb3ceb0494aa04ff189853798b4def77099ac8468e69ba375f1 SHA512 734317a3ea7f1f70eb7dd336ad7a6523cdbe5baa3b3f041d5654f8088e3be2584476857cd9cc021c7924b1dc182e39aaed95b6df9525d6dce0e4353fbaf21af5
 MISC metadata.xml 281 BLAKE2B 2aae5ea5778d806017d2b9a5ec265d4f50db5cab57712dc18e1441cd7a1a91d595d478926fc465437e1e729ef541d8fbcc8a9a9c09765270f093d4e16ac0072c SHA512 e9c907d7513327937e8a9f400bd097524d23001932d4416f533d43a94b07ba4eaf3f95d28df4193a2a7c8c1a8ce7b512c66a86386cc1bb82325b6bfeea9bc65e
diff --git a/app-doc/abs-guide/abs-guide-10.ebuild b/app-doc/abs-guide/abs-guide-10.ebuild
index 7d403012ca56..0eba92d03470 100644
--- a/app-doc/abs-guide/abs-guide-10.ebuild
+++ b/app-doc/abs-guide/abs-guide-10.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 DESCRIPTION="An in-depth exploration of the art of shell scripting"
 HOMEPAGE="https://www.tldp.org/LDP/abs/html"
 
 SRC_URI="http://bash.deta.in/abs-guide-final.tar.bz2
 	pdf? ( http://bash.deta.in/abs-guide.pdf )"
+S="${WORKDIR}"/abs
 
 LICENSE="public-domain"
-IUSE="pdf"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/abs"
+IUSE="pdf"
 
 src_unpack() {
 	unpack abs-guide-final.tar.bz2
-	use pdf && cp "${DISTDIR}"/abs-guide.pdf "${S}"
+
+	if use pdf ; then
+		cp "${DISTDIR}"/abs-guide.pdf "${S}" || die
+	fi
 }
 
 src_install() {
@@ -30,9 +29,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
-	elog "The HTML docs can be accessed through /usr/share/doc/${P}/HTML/index.html"
-	elog "Example scripts from the book are installed in /usr/share/doc/${P}/"
+	elog "The HTML docs can be accessed through ${EROOT}/usr/share/doc/${PF}/HTML/index.html"
+	elog "Example scripts from the book are installed in ${EROOT}/usr/share/doc/${PF}/"
 	use pdf && elog "along with the pdf version."
-	echo
 }
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 00b7973bc977..a76d03035b62 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -9,6 +9,6 @@ DIST doxygen-1.8.20.src.tar.gz 5132703 BLAKE2B 2a9e6df833c64d7052331b52647943f7e
 DIST doxygen-1.9.1.src.tar.gz 5117435 BLAKE2B 28c1a1cb8390e17e2b399cea765f837782ee268a999606eef4031a5f65943c793c97bdbd2e2a25a39358ecac5df2c7a62aa4cca72753a924e4e718c512b8a9c7 SHA512 637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed
 EBUILD doxygen-1.8.17-r1.ebuild 3251 BLAKE2B 5150b5cecd1eabc5c771d9004285cf6b98908e2db4883444058f4cdeacad6b4cd99c26a1a2aa14c8725cd49bcdde7bec7a04efe45c001a9742bd254d3cf8a0dd SHA512 23cf468712f22035743c0cd485c113b880a1e3882aa399805d08c7133c42a01267f881b04c5964f014d093d4eb96b697bd164a04fd67ae833c92231ba9bdc1df
 EBUILD doxygen-1.8.20.ebuild 3162 BLAKE2B bacab3a64f0117ca35d768fe7206ef8abf79653b40a012a49d0ad63a415246820d750515c445ce9e74735760c890a8784fbea73291e46223777cab9cde2671ac SHA512 796eb3462c38aa0cf8069597eaddcf734f83d2eb3abadd31911de9834b1450d7ad43e2b808e188094bced55050a0d7cba6403e9a1baeb1ab9c33e1dc1e2f14f2
-EBUILD doxygen-1.9.1.ebuild 3139 BLAKE2B 48ee2df70bebd50418a8f8b733a60ba9757a261e627637930a8622f46d6a4085ed17a8d1ad8fa48c7e49089b7a17304cfe294f605d14bab3ad4578780a182d8f SHA512 9871d6a3268ceb2c58fbf9f77822192aec74f4f40142b7c3929e3671c854d206e27737a1ecbd2c7259de3d1250421e4f764f2e229a6d33a0591c3bbe005ba624
+EBUILD doxygen-1.9.1.ebuild 3137 BLAKE2B 45555614828de90c5ea0bed84a3d49389484f6056624d70dc6a4366ced0b840206bc9777b31b6a730882e9ab4e99199306a5068f0a30369f822227d9058c8cb2 SHA512 3908a9285ffada12ad853cc42b7bb4660b5a38dafcb90f1289b079a9976e91105bf7df4790bb28238e1b9a03576a1c2bccb82e1a9c9a0879b09b3257e7be212b
 EBUILD doxygen-9999.ebuild 3116 BLAKE2B 85aa5e9740327dd2ae2fb9cdc0eecbd6f8ac9978d160edc3c6c061a566085895f35db6c2263b5849ab377533c722a874f010cbb95b1f327854579f03d1ae7f85 SHA512 a149f8e09f2e29f8b1aa9762f3932043bd7f850a33ce0552c418ba4335165b3cccce449351397dcf220430b8359972374b824423c411e73474358d4458fee9fc
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.9.1.ebuild b/app-doc/doxygen/doxygen-1.9.1.ebuild
index a7dd1e476d33..b39f2b495b8a 100644
--- a/app-doc/doxygen/doxygen-1.9.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-doc/linuxfromscratch/Manifest b/app-doc/linuxfromscratch/Manifest
index 3c252839f39f..9f2f68bf3392 100644
--- a/app-doc/linuxfromscratch/Manifest
+++ b/app-doc/linuxfromscratch/Manifest
@@ -1,9 +1,3 @@
-DIST LFS-BOOK-8.0-NOCHUNKS.html 2103963 BLAKE2B 99203909e29dd83f6d7431c74b732072668a6955b53fd7f61f9286832cf7a1e5869550a44ce568b0fdaef9d5f222a5597332d963f5e7eb4fe5c8987cf1645dc4 SHA512 c190ad6ad20945a1c6ec477d085805e0a2d048ba6ad1e820a1ed5084fafdfa3edc9cffbf8d6af6468d2d5304bf2c7e4d3bc4f1ed830db48c2e07997d5d837179
-DIST LFS-BOOK-8.0-systemd-NOCHUNKS.html 1976336 BLAKE2B 16f9eeb5eac95c22fb1d00129e08da08fa82f5433542d4a6fb2da73fbdf0e4571936c5f3bd799d80cd7daf240005d230bb753ede80208aea2bb56c84dbd9baaf SHA512 d34dcf999a2ca1c467a5d4c082e926c48b265f01f856b619a877d423babebe71adbfa4d7d46cee58b60e3f9a9112d1bb967e542746c35aa6c66d1fa40077461a
-DIST LFS-BOOK-8.0-systemd.pdf 1607946 BLAKE2B ed0f135dc4cef005ad868e54c2012d2bf41fd78a2bc3606b6312b3ad03c049934ead97bd972e82458c33d008751034e9f9e26b083ca73fc41f175d45b4df1369 SHA512 2a89f85d2a4ab90102b28fb4926384312e2e34880a20a837213c34d20084cd6095c909515b52ec7e766d66b69eaa6aa02ac20c391cfda9f0a36a4ac216b2678d
-DIST LFS-BOOK-8.0-systemd.tar.bz2 191320 BLAKE2B eb5128da135817661f51abd25f27ef6dae69a47cfdd90975064b5cc84cebdc4f6268a01d4b82250df22ce8b07ec3f170868969ea6a4afd8388b316b10e82bf08 SHA512 c1af69d352e9fda05dad001d9d33db4775d06a3845789432f137349358548c5474aab4a743ff53fd61d0a74b308abbfc5bd4fd0787c40e5d784848874563305c
-DIST LFS-BOOK-8.0.pdf 1754957 BLAKE2B f51bc01a4c4f2b7f8f54bf5c3d080793246253c74ea0758b3bc9b5eb9b9c5d9bfdc72f1ef9e90f2948ff02e3fe54dd6a14366e36891e662dbfb09eccc7b0797f SHA512 0dc930f87d41b4fe1af812f1a9f1eb7f746aa9b796eb8850b478de7829e3a6b9afb2753c6abaa75d24a7a38e4a7bf1a593ff541e6a01d2cd764828f3e9f96994
-DIST LFS-BOOK-8.0.tar.bz2 217569 BLAKE2B a187945ed752239214d0bfaf0bd6ca885f0fa04fc4a0f06e20498c9e081d9d3565b61ea457ce265d8c4fc39f97bba9fd6a745f120e83e4a6d0e9349511e69967 SHA512 f4cbe7ebb05350238b188a71f6be700bf21cb7f428c7feb4f38eb84e536b9b419e9e3699e268f307b1a9fcbb8e951a2e48cff898e2db3ebf96ec1ad28131f932
 DIST LFS-BOOK-8.2-NOCHUNKS.html 2170878 BLAKE2B 6979866b91c1145f464e70680bc9b70dc36ccd255dffb11121435ee7aadb63c695cc504498434bc233a58130a52f5fb81b5ac9f46f63e4e5c80cb773b1018efe SHA512 e71e604ec64fb89661731cab556fff1cc3a56678222429663cb7b30f1785af15de025f2c6dcf9edbea68f272c82aa0140e7caea191f8e6e6a33c18fd5ffd6918
 DIST LFS-BOOK-8.2-systemd-NOCHUNKS.html 2050914 BLAKE2B 8e3b34dfcc0281cead5b3a34a3553e6cec516ab75fd45a044b0583a2770546712a5f6e72b7a853ba1d594bb0a1732c7f6cdbf1d8c4d26327d379fcfe2566840d SHA512 885658900dac346d01a871e7ec6a540b94789a3ac3897002bd092aef9eea364d2611ea92d7ab473975d694b237b3b6ae449926db691bb6c595e838d9288087b0
 DIST LFS-BOOK-8.2-systemd.pdf 1670861 BLAKE2B d2f9ffcaecc1a6ecd1ca38d7ed0d643d858d4ff6fe778d0de4021fd93052ed663c287890f14a8a2e271007903f1ab2643cdbc3644428a27bec7eeeecd11c1736 SHA512 6b1936eda3e0d107e1afc8216198264b2fb8dc1ef422255a269bf5e75e52cdd397036a1bd428cac37bceeb28e36915beb218c799911a4a309e70d23cafb6535a
@@ -11,6 +5,5 @@ DIST LFS-BOOK-8.2-systemd.tar.bz2 201088 BLAKE2B 807639ca7a8f7ec287996de7d331986
 DIST LFS-BOOK-8.2.pdf 1811466 BLAKE2B 3107ac22d67fafe10b053585e1b1401d31511e77572d5ec2e4441a2ac3be577be9b6df5a0e7cd400f30cafb354d1e0a99f491f87b706fb41f9b9b7172145cb06 SHA512 13f41ec1568e4d84015614a3d492a046d7dcfc2f6616983e6a15500b9e0ec1519ac3d77bd1e74eb942beb225dcaf53168c63f4599a8b5c4bb8cbb518a0cb909d
 DIST LFS-BOOK-8.2.tar.bz2 224525 BLAKE2B 7453bc4b6cf6b86a6adda0c95d7ce1cdc91df8b2230e313e530a731f6d5fe6b4ca6ab1d9aaff092dd66d44bd3b97f3e27e23c9eeed67abf790c8abedc6ee48a8 SHA512 3c6f4db9b4c48af9a74c28628c38fe6ab912093ec2641e37a9f2270fee97cd7469a3d10291ac2a002515d9b81bed2586594666a9c97746d3a9ecc7b004e213fd
 DIST lfs-bootscripts-20150222.tar.bz2 31584 BLAKE2B 662b8ab8f9e2cce47cb1d69bb43bb9a31935f8f4e146df218a92c741c5e694312ee0553648bf7c55d29fc157741ad8a2b17cdef3d3405ceeb1245be36352a5f1 SHA512 983da1da3ee1c3456c195b887c2bfab0ff0b338ee7f6cacba9faf6f416f8d92129ee92a0bc4402f64fea8fa647a386c439a81725fe0a30a68e337c0f0aea0916
-EBUILD linuxfromscratch-8.0.ebuild 1182 BLAKE2B 158d24d5b0c236eea5bad255ad8ac71ceb326f0e9b8ac00ba3fc4e7e3c448a88d0547f898b1fde0f73328d4124d09f9ddd13ec7eeb2a7a45733555d9d76a8d7b SHA512 b63be71628346f1f053e59ca4f90b48fc6129cd157393ce55cb50f1d2fb0a061df94c1db73a0446f7b40c343e3ef99ea0129aca55fae176244d5961b12123481
 EBUILD linuxfromscratch-8.2.ebuild 1214 BLAKE2B d6f63ae7a106b012123b8425bbc4d3df6043f943a275925eeec6c69f64b3c18eb1e7541c7ed15758890df68e433f0606fbaff1ccc4f229521727951bd834a5d5 SHA512 fc480ff4c0b14870b3b999b7c1080096e2a7942f141b82b50d0efb99adffd40b3031c85f921f98a96e74d3818d4945afc1c458af53c910f2d234d3df6228d7db
 MISC metadata.xml 367 BLAKE2B 323d9f49fd0a09a710be4d78bc4645c5bb6bb225d45d05bc96c8b98e47636b2f0d3b4bb7b710b84146d55f550c90f206e524b319e78a2293a54666acde13a34f SHA512 c3de5d602dd7581a29eb17e65ba9f6c41be92ae67fbf2fd098dbbe93603e6e55bf6fe9a4c77738708dbcff13e3d0c54bf30719dfae090abba15ffcfa273b2995
diff --git a/app-doc/linuxfromscratch/linuxfromscratch-8.0.ebuild b/app-doc/linuxfromscratch/linuxfromscratch-8.0.ebuild
deleted file mode 100644
index 3e096b8e4e6e..000000000000
--- a/app-doc/linuxfromscratch/linuxfromscratch-8.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_SRC="http://www.linuxfromscratch.org/lfs/downloads/${PV}"
-BOOTSCRIPT_PV="20150222"
-
-DESCRIPTION="LFS documents building a Linux system entirely from source"
-HOMEPAGE="http://www.linuxfromscratch.org/lfs"
-SRC_URI="
-	${MY_SRC}/LFS-BOOK-${PV}.tar.bz2
-	${MY_SRC}/lfs-bootscripts-${BOOTSCRIPT_PV}.tar.bz2
-	${MY_SRC}-systemd/LFS-BOOK-${PV}-systemd.tar.bz2
-	htmlsingle? (
-		${MY_SRC}/LFS-BOOK-${PV}-NOCHUNKS.html
-		${MY_SRC}-systemd/LFS-BOOK-${PV}-systemd-NOCHUNKS.html
-	)
-	pdf? (
-		${MY_SRC}/LFS-BOOK-${PV}.pdf
-		${MY_SRC}-systemd/LFS-BOOK-${PV}-systemd.pdf
-	)
-"
-
-LICENSE="CC-BY-NC-SA-2.5 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="htmlsingle pdf"
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack LFS-BOOK-${PV}{,-systemd}.tar.bz2 \
-		lfs-bootscripts-${BOOTSCRIPT_PV}.tar.bz2
-
-	use htmlsingle && cp "${DISTDIR}"/LFS-BOOK-${PV}{,-systemd}-NOCHUNKS.html "${S}"
-	use pdf && cp "${DISTDIR}"/LFS-BOOK-${PV}{,-systemd}.pdf "${S}"
-}
-
-src_install() {
-	dodoc -r *
-	docompress -x /usr/share/doc/${PF}
-}
diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index 0e3a566a47e9..3c9f39245576 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -1,8 +1,10 @@
 AUX pms-5-Makefile.patch 1200 BLAKE2B d493382c48e9ee6eab2369ab32e04cc3eec48250c9a66254c778f714e16a00a9e0d58ca77b0db4a973348d4a86fc14828d765d2d225c6c90cc15e9ae24f2109f SHA512 aa8bd061754d82018824ca5750539bd1d88a16e56281f9190a519c16e126fa68ddeecc9da2543a1ca16eb9259beca05d464847bf7d597f42cbfeca5ba539b0ce
+AUX pms-5-parskip.patch 804 BLAKE2B 55333fa508aa7670e31e7de871012716df0d2c003baa2f471d191b2b0a90770b8bed95ee7038b8851b76775f950bae64ecd287f922d87221b6d37956785faeba SHA512 ce534b4178469d7a7335963246c94f48e695d9c9c7a3b7a38e20378284f45abf59ff048b41e4a829ad3412289f86ceb89148ff9773c29cf5dab9ff80547a4140
 AUX pms-7-Makefile.patch 564 BLAKE2B 048273a5f5a49d4df06277a22abd3ef37c9726c9c111e3fbcbe2f27726511d449c652c3883cac993defd934ffdffb364602c7738547875b77c2662126702e0fe SHA512 ecdd4f5e416ce547ec78dab8002292cdd7ce8be3f7910a7f241e8cd6e6ad1e38603832a4cea419dff2e84279edf25bcd5a9a0ded2ad9349be9c9682bf2932b64
+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
-EBUILD pms-5_p20120920.ebuild 1273 BLAKE2B 96be83c12cea9a786d66c940bf1abf98e5e59119086f77462a790d6e0739a469e5182a7d6a1734372674f1cf3dfa6b921b744179aae6f9d90901859e66591bb0 SHA512 4b781d71bd8854e5d1d446ef2fa0f84c93daccf88e8925b377f89df4ab672ef1a59d86b318163e5e5cf78052c8f68770392b7864756bb221fd5015516595edd1
-EBUILD pms-7_p20180430-r1.ebuild 1438 BLAKE2B 828a7982ba235e72d5dd3e281db4dd8e6fa6cf7bc014b41c70757b0d5aabe45ebc30a197920549bb200f709ed8b681fde1035f3ee0d0de676dab98506451acd1 SHA512 86d20f47a8cee1aab7838e8ddb34fa69aa8516b28af067a0710577e5215ff0804710c17a5bede90f8142f4a693bbf90f4a6e628dcd64172cbacef107afba2f0c
-EBUILD pms-9999.ebuild 1229 BLAKE2B 7d16f6843da477d46999b48cc9ca95817e21d4c42b83cb0c472b0b576868fefd8350bef34da7602134f00fae1b7ed63935d46021a7ba67185342ea213b48689f SHA512 e941c2fa8bc66fb645743dea397aa75bc40ae9531bb7d8d452bdcbca90d68a8bcedfb61530edcdcc3aa0604861ca5fce29a7211c28960a0d98585fcc167b101d
+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
 MISC metadata.xml 439 BLAKE2B 3d5b7ec10330bc77a6234beb03de1400af3a295b88e9f2382c76232e2519c944b8b518923d93d2a474e1b96cbd6801458814704b12f0b993165e802bc1fb9b7c SHA512 aa8e7627fb52d1a5357b7758f4cbdb74cef129b3cc45f48a8c58973141e5cea65c0007333fb8e388fd99de8606d8ca137e03f906f5c6e75df68f6eb96099949d
diff --git a/app-doc/pms/files/pms-5-parskip.patch b/app-doc/pms/files/pms-5-parskip.patch
new file mode 100644
index 000000000000..767e53a6c25c
--- /dev/null
+++ b/app-doc/pms/files/pms-5-parskip.patch
@@ -0,0 +1,25 @@
+Require version 1 of parskip.sty
+
+Newer versions change the spacing after headings which causes
+different page breaks.
+
+Backported from master, commit 4ebd8cb.
+
+--- a/pms.cls
++++ b/pms.cls
+@@ -17,6 +17,7 @@
+ % Enable UTF-8 input encoding
+ \PassOptionsToPackage{utf8}{inputenc}
+ % algorithmic and algorithm to be loaded last to avoid failures
++\RequirePackage{parskip}[=v1] % Space between paragraphs instead of indentation
+ \RequirePackage{%
+     fontenc,	% Load extended font sets
+     isodate,	% Date formatting and conversions
+@@ -30,7 +31,6 @@
+     lscape,	% Rotating pages
+     marginnote, % Typeset a paragraph in the page margin
+     paralist,	% Additional list environments
+-    parskip,	% Space between paragraphs instead of indentation
+     verbatim	% Extend the print-as-is functionality
+ }
+ 
diff --git a/app-doc/pms/files/pms-7-parskip.patch b/app-doc/pms/files/pms-7-parskip.patch
new file mode 100644
index 000000000000..8e39c234472d
--- /dev/null
+++ b/app-doc/pms/files/pms-7-parskip.patch
@@ -0,0 +1,25 @@
+Require version 1 of parskip.sty
+
+Newer versions change the spacing after headings which causes
+different page breaks.
+
+Backported from master, commit 4ebd8cb.
+
+--- a/pms.cls
++++ b/pms.cls
+@@ -27,6 +27,7 @@
+ \PassOptionsToPackage{hyphens}{url} % url.sty implicitly loaded by hyperref
+ \PassOptionsToPackage{chapter}{algorithm}
+ % algorithmic and algorithm to be loaded last to avoid failures
++\RequirePackage{parskip}[=v1] % Space between paragraphs instead of indentation
+ \RequirePackage{%
+     fontenc,    % Load extended font sets
+     isodate,    % Date formatting and conversions
+@@ -39,7 +40,6 @@
+     lscape,     % Rotating pages
+     marginnote, % Typeset a paragraph in the page margin
+     paralist,   % Additional list environments
+-    parskip,    % Space between paragraphs instead of indentation
+     underscore, % Allow simple _ instead of \_
+     verbatim,   % Extend the print-as-is functionality
+     chngcntr,   % Redefinition of counters
diff --git a/app-doc/pms/pms-5_p20120920.ebuild b/app-doc/pms/pms-5_p20120920-r1.ebuild
index 60afba7a6136..3c3d8e0db6d2 100644
--- a/app-doc/pms/pms-5_p20120920.ebuild
+++ b/app-doc/pms/pms-5_p20120920-r1.ebuild
@@ -14,11 +14,9 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~a
 IUSE="html"
 
 BDEPEND="dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsrecommended
-	dev-texlive/texlive-latex
 	>=dev-texlive/texlive-latexextra-2020-r2
-	dev-texlive/texlive-latexrecommended
 	dev-texlive/texlive-mathscience
+	virtual/latex-base
 	html? (
 		app-text/recode
 		>=dev-tex/tex4ht-20090611_p1038-r11
@@ -26,7 +24,10 @@ BDEPEND="dev-texlive/texlive-bibtexextra
 RDEPEND="!app-doc/pms-bin"
 
 S="${WORKDIR}/${MY_P}"
-PATCHES=("${FILESDIR}/${PN}-5-Makefile.patch")
+PATCHES=(
+	"${FILESDIR}/${PN}-5-Makefile.patch"
+	"${FILESDIR}/${PN}-5-parskip.patch"
+)
 
 src_compile() {
 	# just in case; we shouldn't be generating any fonts
diff --git a/app-doc/pms/pms-7_p20180430-r1.ebuild b/app-doc/pms/pms-7_p20180430-r2.ebuild
index 43942577e488..840c002cf059 100644
--- a/app-doc/pms/pms-7_p20180430-r1.ebuild
+++ b/app-doc/pms/pms-7_p20180430-r2.ebuild
@@ -17,18 +17,19 @@ IUSE="html twoside"
 #   paralist, tocbibind
 # texlive-mathscience for algorithm, algorithmic
 BDEPEND="dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsrecommended
-	dev-texlive/texlive-latex
 	>=dev-texlive/texlive-latexextra-2020-r2
-	dev-texlive/texlive-latexrecommended
 	dev-texlive/texlive-mathscience
+	virtual/latex-base
 	html? (
 		app-text/recode
 		>=dev-tex/tex4ht-20090611_p1038-r11
 	)"
 RDEPEND="!app-doc/pms-bin"
 
-PATCHES=("${FILESDIR}/${PN}-7-Makefile.patch")
+PATCHES=(
+	"${FILESDIR}/${PN}-7-Makefile.patch"
+	"${FILESDIR}/${PN}-7-parskip.patch"
+)
 
 src_compile() {
 	# just in case; we shouldn't be generating any fonts
diff --git a/app-doc/pms/pms-9999.ebuild b/app-doc/pms/pms-9999.ebuild
index 19a316cc11aa..3f10d491b8d2 100644
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-9999.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
@@ -19,11 +19,9 @@ IUSE="html twoside"
 #   paralist, tocbibind
 # texlive-mathscience for algorithm, algorithmic
 BDEPEND="dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsrecommended
-	dev-texlive/texlive-latex
 	>=dev-texlive/texlive-latexextra-2020-r2
-	dev-texlive/texlive-latexrecommended
 	dev-texlive/texlive-mathscience
+	virtual/latex-base
 	html? ( >=dev-tex/tex4ht-20090611_p1038-r11 )"
 RDEPEND="!app-doc/pms-bin"
 
diff --git a/app-doc/tldp-howto/Manifest b/app-doc/tldp-howto/Manifest
index a91867d3ebac..e89b78f3133b 100644
--- a/app-doc/tldp-howto/Manifest
+++ b/app-doc/tldp-howto/Manifest
@@ -2,5 +2,5 @@ DIST Linux-HOWTOs-20120707.tar.bz2 7221427 BLAKE2B 5df0b1d86444024e78c417dc2f49b
 DIST Linux-html-HOWTOs-20120707.tar.bz2 75088235 BLAKE2B 9f74adc6f9bfcc3fdd141afca5dd701fea91e0b612e5180b88c53324b455e44e9306902bad3bac06bed220b51f8b4f26e73af9806d318bce8759084e119aa862 SHA512 291764f596021cc098f13fc2a589a2bceb3a5865c7194db42c2b1e37bd59bceee089d34c9f55487a049a20d5f5296b5d0e67cc3303ed2aac1d2288a41caa2218
 DIST Linux-html-single-HOWTOs-20120707.tar.bz2 7563325 BLAKE2B 331a0396dd66b2dbd90bcb224210f1e888fbd04c9bb74ab3bdbd4c5ad061ffe59c9d20703655a426bbb53c32eb5e5e6ed3b3516c4ed148fc1ec843b8b353dc06 SHA512 edfc2c267c8efc66c220a5458eb514864f8b371031bc10afbfaab668558eaa8c02afd7b58c4cb65d874c5fe9b3e22f6df376e4114d3e8635be525c5d14e8bd20
 DIST Linux-pdf-HOWTOs-20120707.tar.bz2 57436243 BLAKE2B 70bd2c54aefc1af77519ebc0fbb53646ee5d3db62c822ff1cc84fe0837217c851f7c5b498ebfd70e52bde661453c6c71732c030335b3d702edd17e5fb08cb936 SHA512 665387a1e2f9703042f1544ed015e39ba222744795ea676fcefc83fda94b6f9222a98aa4ed37ea5bd9164327837e924613ac41ca78a78ae9a4a4097fb64cff3e
-EBUILD tldp-howto-20120707.ebuild 1667 BLAKE2B 38d04ff9b38bfb485b8e241e6513a85e3db5c907a1bf3767b6b3c9a0dff2a6267b55d3189ff4419bbb27931b3af447434acd72e822511a6f0cc0e6a30154e047 SHA512 47353cf7a62138dc699982ebd14f640e1a58207305c2d91989a2fd8768e74c0e7cc04cc7a8f78e5e0c5735069c64d682afe1a145cbcf393e076db85ba9fadc3c
+EBUILD tldp-howto-20120707.ebuild 1705 BLAKE2B 45aaa830a150e2ff348ea1b28b39625943bdb2c60a18595aaf27efb4d1249754395e9ad3cf1747c6bbdca942a330c5e613d3e4a8aaea863b2b73f0bec496fa56 SHA512 c8e5bc4c527860232a1404f9a280fe464aaf7a8f96bbc47c5a6915c876379ff68c684cb9e2bbede891c0b629c1afe1a22554dac7cde7f5a29239ca62b6407f24
 MISC metadata.xml 516 BLAKE2B ff61d9d4645d43356e2c57d087a8c94e502a098dca1a089a36513ced5bb010606359d7c2b54a0fd815561eb8572557f2a417b5e0f543e8ecc1169e1dbaf71fc2 SHA512 a1a2c230aba2bc83f96637313ccdf22fd61f8bd8134820d14a3afc4ee5443a99a2f1a946c78b3b3a128c112c8c68a2d11e74874a4201cf147c25626b2737856a
diff --git a/app-doc/tldp-howto/tldp-howto-20120707.ebuild b/app-doc/tldp-howto/tldp-howto-20120707.ebuild
index 4fe2b10bbaec..38effcf91210 100644
--- a/app-doc/tldp-howto/tldp-howto-20120707.ebuild
+++ b/app-doc/tldp-howto/tldp-howto-20120707.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="The Linux Documentation Project HOWTOs"
 HOMEPAGE="http://www.tldp.org"
@@ -19,43 +19,53 @@ KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+html htmlsingle pdf text"
 REQUIRED_USE="|| ( html htmlsingle pdf text )"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
 RESTRICT="binchecks strip"
 
 src_unpack() {
 	mkdir -p "${S}" || die
-	cd "${S}"
+	cd "${S}" || die
+
 	if use html; then
 		unpack Linux-html-HOWTOs-${PV}.tar.bz2
+
 		# for some reason this bundles the pdfs - older versions didn't
-		[[ -d ${S}/HOWTO/pdf ]] && rm -r "${S}"/HOWTO/pdf
+		if [[ -d "${S}"/HOWTO/pdf ]] ; then
+			rm -r "${S}"/HOWTO/pdf || die
+		fi
+
 		# stray bin file, doubt anyone will ever need it
-		rm -f "${S}"/HOWTO/RedHat-CD-HOWTO/rhcd-scripts/rvc
-		mv "${S}"/HOWTO "${S}"/html
+		rm -f "${S}"/HOWTO/RedHat-CD-HOWTO/rhcd-scripts/rvc || die
+		mv "${S}"/HOWTO "${S}"/html || die
 	fi
+
 	if use htmlsingle; then
 		mkdir "${S}"/htmlsingle || die
-		pushd "${S}"/htmlsingle > /dev/null
+		pushd "${S}"/htmlsingle > /dev/null || die
+
 		unpack Linux-html-single-HOWTOs-${PV}.tar.bz2
-		popd > /dev/null
+
+		popd > /dev/null || die
 	fi
+
 	if use pdf; then
 		mkdir "${S}"/pdf || die
-		pushd "${S}"/pdf > /dev/null
+		pushd "${S}"/pdf > /dev/null || die
+
 		unpack Linux-pdf-HOWTOs-${PV}.tar.bz2
-		popd > /dev/null
+
+		popd > /dev/null || die
 	fi
+
 	if use text; then
 		mkdir "${S}"/text || die
-		pushd "${S}"/text > /dev/null
+		pushd "${S}"/text > /dev/null || die
+
 		unpack Linux-HOWTOs-${PV}.tar.bz2
-		popd > /dev/null
+
+		popd > /dev/null || die
 	fi
 }
 
 src_install() {
-	insinto /usr/share/doc/${PF}
-	doins -r "${S}"/*
+	dodoc -r "${S}"/*
 }