gentoo resync : 04.07.2020

5 files changed, 26 insertions, 5 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 65c3cfa65914..d85fed037d21 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index c4b577b15f43..30a796e44ab3 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,4 +1,6 @@
 DIST eclass-manpages-20200213.tar.xz 411328 BLAKE2B 71ecb7fefddfa1e2f865841ca557581e78ba17776be0e678ad21fbe47a2494da0d4a13b11c6b449846b6f05ceebaa78add078e763c3b9c910d5a40c149dca6c5 SHA512 16a67c05beb36ff63b75c065fc92852c959cc4645939f7c5a8894a6eecf3a334abe117417d57e45fb222204f233755c6848f53569ca64f911bf7e05f33a0ab26
+DIST eclass-manpages-20200704.tar.xz 409212 BLAKE2B 0b8115d40520bf045bdce487cae53ee152e84d2d3ac47a7956530801c16be60f0cff72f6d7275c95b9ecb40e170cc279272ce846ea94a75ee25081b7f7e22a78 SHA512 8ad4a24352008072c65f4c9b0978b8dec029f9ed04efc13202742aa922b71521c59113ab80b6219dc65ea63279b3f0f3d4b720e542b524cdb0787879849d7ec7
 EBUILD eclass-manpages-20200213.ebuild 610 BLAKE2B 93e86cf1877613e71322dc5e4a6bc48cf1b507ece9b92040d096955199b02f44c6516a055457a7d772cd13f2b16d66c6a5287082d3d08154904fc88a4bac9921 SHA512 034f75813d0bc6658afb8bac4ab345505880a5c694920df666985b1f62dc2b442e9f65e28a81157f5b2a8a4a097d192fa793b4990e6264631377d7c6aa7bfc21
+EBUILD eclass-manpages-20200704.ebuild 624 BLAKE2B f7132621ff41ffa7f26a58fc357d32a4e0809c1150354786b95c360fce1fd6125bae562639a8713f64cef38e604aae8ba0b71a1e610c3913cc3d7c3dabd00514 SHA512 4de98a0847b461de6aa4bf49dad1906ff81fa7bd4a65774469736d9ad09a1753b7789ee8a749445b70aa762c4586cf20612dcddb15f9f634e700c9b87a8befdc
 EBUILD eclass-manpages-99999999.ebuild 734 BLAKE2B 3a2ad31d9607eb9eca6c26a9bdfc7ef076f03bbd72cd9df1c7affbb834a66fd682986a9596af9c1d4d1f3ba2af090d18915403b9028dba6a4c927a8e8e0ebdd3 SHA512 10d89fd7527b870b9bfe35b70be14de0c1f1a0ba5deb7a0e86e8965bf963d04a41fdfb2907bcb5aef0974ef6508e2717c9de383e28f9679dcb1dc87c60530199
 MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-doc/eclass-manpages/eclass-manpages-20200704.ebuild b/app-doc/eclass-manpages/eclass-manpages-20200704.ebuild
new file mode 100644
index 000000000000..673d3a042117
--- /dev/null
+++ b/app-doc/eclass-manpages/eclass-manpages-20200704.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Collection of Gentoo eclass manpages"
+HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/eclass-manpages/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Keep the keywords stable. No need to change to ~arch.
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+
+BDEPEND="app-arch/xz-utils
+	sys-apps/gawk"
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+}
diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index 1c9d3394a5ca..ef14cb78993b 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -4,5 +4,5 @@ DIST pms-5.tar.xz 50284 BLAKE2B ecf3c34d79aa1439e0f0f4bca540b673440db04a7f533f10
 DIST pms-7_p20180430.tar.xz 60072 BLAKE2B 58afb1759c84ae86a1dd69aa04a6e8b799fd0cc1e1877cf1f6224f5b1bdbdfcdeaadcabbd9c37c263d62cb24b4164056a88d3524031d1704b059c376d5572101 SHA512 9bb64de842e0aa8f1a6488d12fffba76bfd190e53523e9261161467b30f001f20cddf593cd32e75ace4af309476eb7eb6966665d7ae9b54a5915237094110a47
 EBUILD pms-5_p20120920.ebuild 1354 BLAKE2B 984bfb3d8630cb093943533a471928fefbdcccd8b55e8a809f0b5ec36bbfdbe89dab9488456970b193d6625e8eaa3cc7111563fc9d2e60505d82f9231a1957ef SHA512 768365a14cfa63aff8387c60281f4383be3691fb84509046c9d213a4dc63390948caa8b72476355d7c74ebd0f2d6d745ec4a88374410a656939e2d05503df379
 EBUILD pms-7_p20180430-r1.ebuild 1522 BLAKE2B 3e5016bade1e8272007bc81502590e9fff8906e818da2a1648557c61299121369834bf7bc94550f21da594d7a2033d5303c850835756499b269330e80f91a2ce SHA512 7c70ed4b1a3792e54433acc4227d29dc2b9242b1f00a28498563a31cac8141d3e68d503923ea74588631a3268d75e1b0c1fd043ec4b6f26d6add1e0d21b598d8
-EBUILD pms-9999.ebuild 1283 BLAKE2B 002d1e54e2050e6ee188448e352de405ac1a062341022651aa6bae763c7d68be454a31642aaba39913c20a7ab92f13f79255c9855aca7e7414a96edfc592fb5b SHA512 0621e767a7c7f864b188bc63404d17f9d71a948c586c8c4a2cb5a18f421130303f27fd3cbd2670181d53a48f49b5e3c49d2aefee92495ee5bddf5c5d9837c6cd
+EBUILD pms-9999.ebuild 1229 BLAKE2B 7d16f6843da477d46999b48cc9ca95817e21d4c42b83cb0c472b0b576868fefd8350bef34da7602134f00fae1b7ed63935d46021a7ba67185342ea213b48689f SHA512 e941c2fa8bc66fb645743dea397aa75bc40ae9531bb7d8d452bdcbca90d68a8bcedfb61530edcdcc3aa0604861ca5fce29a7211c28960a0d98585fcc167b101d
 MISC metadata.xml 439 BLAKE2B 3d5b7ec10330bc77a6234beb03de1400af3a295b88e9f2382c76232e2519c944b8b518923d93d2a474e1b96cbd6801458814704b12f0b993165e802bc1fb9b7c SHA512 aa8e7627fb52d1a5357b7758f4cbdb74cef129b3cc45f48a8c58973141e5cea65c0007333fb8e388fd99de8606d8ca137e03f906f5c6e75df68f6eb96099949d
diff --git a/app-doc/pms/pms-9999.ebuild b/app-doc/pms/pms-9999.ebuild
index 5967acc1abcb..19a316cc11aa 100644
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-9999.ebuild
@@ -18,14 +18,13 @@ IUSE="html twoside"
 # texlive-latexextra for chngcntr, gitinfo2, isodate, leaflet, marginnote,
 #   paralist, tocbibind
 # texlive-mathscience for algorithm, algorithmic
-BDEPEND="|| ( >=dev-texlive/texlive-latexextra-2020-r1 dev-tex/leaflet )
-	dev-texlive/texlive-bibtexextra
+BDEPEND="dev-texlive/texlive-bibtexextra
 	dev-texlive/texlive-fontsrecommended
 	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
+	>=dev-texlive/texlive-latexextra-2020-r2
 	dev-texlive/texlive-latexrecommended
 	dev-texlive/texlive-mathscience
-	html? ( >=dev-tex/tex4ht-20090611_p1038-r5 )"
+	html? ( >=dev-tex/tex4ht-20090611_p1038-r11 )"
 RDEPEND="!app-doc/pms-bin"
 
 src_compile() {