gentoo resync : 10.02.2020

10 files changed, 35 insertions, 51 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 8b356e6d136c..6f78ac5e92d8 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/cppman/Manifest b/app-doc/cppman/Manifest
index f8127db6b72e..49a0070f0170 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 673 BLAKE2B ea55b94f9d23a1876b1983687900b291d9545daf9469b4e5e6959a88bd867efae32ffb20a79f5b089ca976d8c01db578e977670a8fcf5fdedc619514bb9e97a1 SHA512 5d5b73425ac186d34fcc0eeae2db9b4d8901246b1cdd314a4cdeb12c81cdf3a21090c5dbb172e3989b6f9429a2a6b287f9568dfeb4dd1cc15e5bdf0bcf0b0d85
+EBUILD cppman-0.4.8-r1.ebuild 716 BLAKE2B 75e8f02f0e7588859660263f5964db0631640381452afca349a597413fcd5fa7f9ac48540c56aec9325932b45bb20f782d8739d8a1d3e24caded76af511b2313 SHA512 2e5ff03f14a255ed0a77bb34fade6916e05add25fe494be9854b57e8c938d18dc5be4cab06b5250a5aafad1aa7d754532da35df3f960f326c1635e0a2704c519
 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-r1.ebuild
index 283e6ca77af5..931aff72c2bd 100644
--- a/app-doc/cppman/cppman-0.4.8.ebuild
+++ b/app-doc/cppman/cppman-0.4.8-r1.ebuild
@@ -21,8 +21,10 @@ KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
 
 RDEPEND="
 	sys-apps/groff
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+	')
 "
 
 # `./setup install` already installs docs
diff --git a/app-doc/devmanual/Manifest b/app-doc/devmanual/Manifest
index 0f112262bfd3..af64c902f8ea 100644
--- a/app-doc/devmanual/Manifest
+++ b/app-doc/devmanual/Manifest
@@ -1,7 +1,7 @@
 AUX devmanual-eclasses.patch 486 BLAKE2B 7e772ed7386c199c697808137ecf6f999e60ff32f05a89eb0ceeb41b34576d667996fe9b7f7279b87a40bd8c1efbef5415d69be1b0b9f9f0954e813ab890ffa5 SHA512 1f34bf4e0ed105122eb45ad498ddc737774103720cef9a3a30346a16e85173bc8fb38dc9cc1e9bb2d9b902feb167e5df0ff4cb39f62640f4314fe750533f7cf3
 DIST devmanual-0_pre20141116.tar.gz 169936 BLAKE2B 9b01004750b9fce226fa6a965292d3ffaff0923f877da611743e39ee19077ea7fe0d21ff138853d3f79e4d4941026c30fcabf63c8903572ed7ba5d50d32c8dd5 SHA512 6af3f9a262bdb2ceb61ab195691dff4a850b22e8d1226e20ae3257c566b6cc913f756c8b90a40e8aa78b1242e78d24c4209a1d9cdb0706ae9b64c653544a028f
-DIST devmanual-0_pre20200203.tar.xz 163740 BLAKE2B 39d8173bc524213e7a6e81def4f1631ea0d2503540551982d07ef58f414b8a052e8a3a0d2426b5864e06fb24f1745af4dea57e418fcc5e52c558dc1da9ff4530 SHA512 f3fce9ba557515b89c5a875dc1e4e968eb3097776842026403e41ebe972c2e4e764303c729c5835466faaa2675fa361fe7e0512d7a8222d7d8b1202a9049f98e
+DIST devmanual-0_pre20200207.tar.xz 163940 BLAKE2B c6cf856a8f6c80b500466e27cc4106c070cff2dcf8c89d58c9ca90d03cb34a1e6a2048cb99364993f224f3497309fc24207dc44f9c14ece37c49aa602480dac0 SHA512 f6a88312e2030bf4d9fcf64bf1f38397087cb151aa41cd0c254cfc6251e4d5b291e3b361094a7c1d5fdb16e40c1702c0f0b7460ba230bfb217ad733f400c9089
 EBUILD devmanual-0_pre20141116.ebuild 1762 BLAKE2B 83186e74a1172f7cef733e972bda7c3c88c91d094c9b260e004b16d4e60ca366dc257fc7e108388ef4d6c558e02d669ccdc424737fe03d7e4906c40488695522 SHA512 9420d56918fa471001ab39ffe0e99f8beee07d669e486d1691398c29266898cb5a2426c9d864680529d9a4cb9f13b3829c52827fc6f04f6e3dc4f1c0f26c08a6
-EBUILD devmanual-0_pre20200203.ebuild 1568 BLAKE2B 39ccd01eee00a829cb5ec9ed86f4b26ed64633c8f16ddb03deaf8adbb4ebf0e8734d3892031215f4acfc00e951bfef1e7b4ebb5e8e8467695a59e8d22caa00ac SHA512 aeb630dc70ff4593ca04e12353a8e813536891abb8a8b590e59a80972529de15bf36969c2ade7106a338cddb212dc04eab6a8b1f79352ff44e67e7606e917766
-EBUILD devmanual-9999.ebuild 1593 BLAKE2B b3e9af4451eae139bb0da29b651d07ac955f73497ed7c22fb6c9ba1528d2add506969b1188e484303a14421c53ddb5afcf4e7e2cc056faf82ea80d7ce5950ca8 SHA512 3205886614331a76e3d88f6e03f6afe849d966c0cc28cd3f19e42988b03a3f18d950f271d558e1678acddba1a9cba6ecaf83d86a763b2f056922504e7476b7af
+EBUILD devmanual-0_pre20200207.ebuild 1380 BLAKE2B bb6eb98bfc635611831b34e7a1ce4eeca02cbf375abf8257ac5142ff5cc4b23f738d71babafd7e4591c0f1c171abdf7d60a393a60cd26696a653d5488fdfb224 SHA512 e2547ca92058211f4f0107b42c3e3401b0866f8bc3ffcf1dc323fdcb6d083f1c192edb65b120d15703252c3eed9ce76bc6eff4b34650d16948e95714044f0dc6
+EBUILD devmanual-9999.ebuild 1387 BLAKE2B 99bf5d4a22ad52389f2f03f35a95adef61efe42b99056ebd8e0ab04007c2fb58801de4f05d5e795d0d19ba70cae4ba42fd947af35367456ca504c7f370bb9c7a SHA512 9d03a16a1c97a509ba6eb53917f6015324e795f67ed048c917fb840898563ab1c10d5b9cdce7da3d0831f963e701276e310a189642225bfdc8ca436908491963
 MISC metadata.xml 556 BLAKE2B 48629cbf7feab0623f0ffbe1c7f36163a5d72f591bd90cfb23ccef3058699639365d3184e4decac51a1b6b39ce0647350f6aaf2244e9044a17482f93f5181282 SHA512 e409f579c8c7c65a55cfd2c64e7ec307f58318af102b5717a8208c96775bbca488dde34d61b04963e9a3c86b793ba5b7b9b04edd763e46db391cc63d24bab102
diff --git a/app-doc/devmanual/devmanual-0_pre20200203.ebuild b/app-doc/devmanual/devmanual-0_pre20200207.ebuild
index 05f7076fc8ec..5146b9288cc5 100644
--- a/app-doc/devmanual/devmanual-0_pre20200203.ebuild
+++ b/app-doc/devmanual/devmanual-0_pre20200207.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 	S="${WORKDIR}/${PN}"
-	KEYWORDS="~amd64 ~arm ~hppa ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="CC-BY-SA-4.0"
@@ -29,35 +29,26 @@ BDEPEND="dev-libs/libxml2
 PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
 
 src_compile() {
-	emake build OFFLINE=$(usex offline 1 0)
-	use offline || emake documents.js
+	emake OFFLINE=$(usex offline 1 0)
 }
 
 src_install() {
-	# clean out XML/XSL before installing
-	find . \( \
-		-iname '*.xml' -o \
-		-iname '*.dtd' -o \
-		-iname '*.xsl' -o \
-		-iname '*.svg' \) -delete || die
-	rm -r bin xsl .git* LICENSE Makefile README.md || die
-
-	local HTML_DOCS=( . )
-	einstalldocs
+	emake OFFLINE=$(usex offline 1 0) \
+		DESTDIR="${D}" \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
 
 	local DOC_CONTENTS="In order to browse the Gentoo Development Guide in
 		offline mode, point your browser to the following url:
 		file://${EPREFIX}/usr/share/doc/${PF}/html/index.html"
+	if ! has_version app-doc/eclass-manpages; then
+		DOC_CONTENTS+="\\n\\nThe offline version of the devmanual does not
+			include the documentation for the eclasses. If you need it,
+			then emerge app-doc/eclass-manpages."
+	fi
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	readme.gentoo_print_elog
-	if ! has_version app-doc/eclass-manpages; then
-		elog "The offline version of the devmanual does not include the"
-		elog "documentation for the eclasses. If you need it, then emerge"
-		elog "the following package:"
-		elog
-		elog "app-doc/eclass-manpages"
-	fi
 }
diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild
index 1957ff9c99ef..7bea70d1e20b 100644
--- a/app-doc/devmanual/devmanual-9999.ebuild
+++ b/app-doc/devmanual/devmanual-9999.ebuild
@@ -29,35 +29,26 @@ BDEPEND="dev-libs/libxml2
 PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
 
 src_compile() {
-	emake build OFFLINE=$(usex offline 1 0)
-	use offline || emake documents.js
+	emake OFFLINE=$(usex offline 1 0)
 }
 
 src_install() {
-	# clean out XML/XSL before installing
-	find . \( \
-		-iname '*.xml' -o \
-		-iname '*.dtd' -o \
-		-iname '*.xsl' -o \
-		-iname '*.svg' \) -delete || die
-	rm -r bin xsl .git* LICENSE Makefile README.md || die
-
-	local HTML_DOCS=( . )
-	einstalldocs
+	emake OFFLINE=$(usex offline 1 0) \
+		DESTDIR="${D}" \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
 
 	local DOC_CONTENTS="In order to browse the Gentoo Development Guide in
 		offline mode, point your browser to the following url:
 		file://${EPREFIX}/usr/share/doc/${PF}/html/index.html"
+	if ! has_version app-doc/eclass-manpages; then
+		DOC_CONTENTS+="\\n\\nThe offline version of the devmanual does not
+			include the documentation for the eclasses. If you need it,
+			then emerge app-doc/eclass-manpages."
+	fi
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	readme.gentoo_print_elog
-	if ! has_version app-doc/eclass-manpages; then
-		elog "The offline version of the devmanual does not include the"
-		elog "documentation for the eclasses. If you need it, then emerge"
-		elog "the following package:"
-		elog
-		elog "app-doc/eclass-manpages"
-	fi
 }
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index aaccfe6f4aba..a2fc64d2e3f3 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -8,7 +8,7 @@ AUX doxygen-1.8.16-link_with_pthread.patch 691 BLAKE2B c6ced2c6aeb199d7f8ad39f39
 AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
 DIST doxygen-1.8.15.src.tar.gz 5097791 BLAKE2B 08903bf06666911df0810ea0a7b86066e7682833b03ae5660094112c5c6506f072c5818185ce8166d09328e62092461acdb4516b58fe9369119f5f6bdd64331a SHA512 a5512e78be66c1591d8ec7e284d5d25c92a97218c79e6fed3c538c723a8dfef4ff7085970bf271a6b639e907157cd4df9fb55d3c975f8d3302fb1012a4d92079
 DIST doxygen-1.8.16.src.tar.gz 5497317 BLAKE2B ec1ba4242bd3ef669f92101044049f10a6e5c2d69f5a7c8eb47915fdc0846ce4758eb8c1ab28ec61635bf36f83049f603f3b70033f7e22be18685cb1d9826462 SHA512 46a0189aa82d5a687bdd99a904f0c061fccca407d15867d14c8c4d13e8b21a8989e7ccd6af30840803b589ed20dd86084a4db880fba0d3bfa1fdcdd8d23e12de
-EBUILD doxygen-1.8.15.ebuild 3195 BLAKE2B ab3110cb62c5306fab34ecab3e6c45e31c240de4f56e73b24b7d054323c27f947bdbed77c5be89f2888c5f1472339fdf7e884092204be7d9f4459b5044f448ed SHA512 f5b5dfbae031e5a48e675b4a126d9d159b97201b68b4ad8f07f4311e47cfc0d8beb8939ea0bdf08596c02f88ec3bf5ad614f238141b373445c701dda2453a64b
-EBUILD doxygen-1.8.16-r1.ebuild 3368 BLAKE2B 6608427d721b82df2bf6a80308098fc2ad23161a3940d7f01172107f89a34b18bf9ea8bdbebf5aa95f477c8a80f73fc478cfef7ab12478bf5ec1a51df3e71e19 SHA512 4e8bbd230b726366a7f5ed22c552efd03578aa023c200b69df164a181a9c72cc3d0d77cb65e2b3cd092ba7ea512f12ca0d0c6229fdc6760d69f4d256afa35cff
-EBUILD doxygen-9999.ebuild 3069 BLAKE2B 79c8c8c679049f4bc02b8399fd2791df6e21b3346e306fb57589eb0122a56592849971cd60359c6aac61687d65090b706a9c4c94898b83aefcbb8fe59e22875b SHA512 9aa0a4f36ba09ed8518c34289395a5fc3844b418c46f613db708781260c1a936bd584351815ec25340d73a5a58db571ab2b1cc31b9414e6b038694c938fc4d51
+EBUILD doxygen-1.8.15.ebuild 3189 BLAKE2B e1cc31bd9a61ac2b13f33919519ee1411805dfe89de013831ce7194ca88bdf1329f00b9c5716e9f84c91c527b632d9d868f8fc4fb96cdd66eb862d97d8424003 SHA512 3653836afac52091fa525db6061713e5f0d3a1c8aef6785b93a120985f6e0e6db1b5818a9288b219d6ddb52b33321c2eddd3848581bfc9a2fc7f687132dadec8
+EBUILD doxygen-1.8.16-r1.ebuild 3362 BLAKE2B fc150f8a64e316f2748e0f8f273ce6ea123eea3d4e1f399dfb9258640449bbddae5f881f9f137e8c91591fa90b91ad4c8eac2f4b5bbfab2b85932db16d6d2f86 SHA512 3ba6b25e61f3013b246ed8ed47f3375899eb241907f4775869f40b8af78b2e671308569b9d6f1d700b999ec57dabbf51aa403339912f71a6e8a8fb2446e41849
+EBUILD doxygen-9999.ebuild 3063 BLAKE2B e01fc81674107aa6fe15df433a1bb43bf1de8530ba132731a6fe4bc8c57b3a062afbf9cbd9af4c0d143101a9072235058390db7da833c0343f175c0ae08894e2 SHA512 e2d761c8bbee9fe6d612dfe920e2573d0a4afc119345a441965b70dafcba18d624107eadca30bc144e9e59ed109dc15f5951e0a677836b275ff688580fa278a4
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.15.ebuild b/app-doc/doxygen/doxygen-1.8.15.ebuild
index c6a5a78ef9d9..494edad1726e 100644
--- a/app-doc/doxygen/doxygen-1.8.15.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.15.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
diff --git a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
index e7ec247cf121..e3fc34ade516 100644
--- a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.16-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_6} )
+PYTHON_COMPAT=( python3_6 )
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 3c75865cba0e..fbce5ffa6dd3 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_6} )
+PYTHON_COMPAT=( python3_6 )
 
 CMAKE_MAKEFILE_GENERATOR="emake"