gentoo resync : 10.02.2020

3 files changed, 24 insertions, 42 deletions

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
 }