gentoo resync : 25.12.2017

4 files changed, 48 insertions, 24 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 8482a15d08d9..ba8dec407544 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/devmanual/Manifest b/app-doc/devmanual/Manifest
index cb011fe517ff..d4e1123ae1a7 100644
--- a/app-doc/devmanual/Manifest
+++ b/app-doc/devmanual/Manifest
@@ -1,4 +1,4 @@
 DIST devmanual-0_pre20141116.tar.gz 169936 BLAKE2B 9b01004750b9fce226fa6a965292d3ffaff0923f877da611743e39ee19077ea7fe0d21ff138853d3f79e4d4941026c30fcabf63c8903572ed7ba5d50d32c8dd5 SHA512 6af3f9a262bdb2ceb61ab195691dff4a850b22e8d1226e20ae3257c566b6cc913f756c8b90a40e8aa78b1242e78d24c4209a1d9cdb0706ae9b64c653544a028f
-EBUILD devmanual-0_pre20141116.ebuild 1584 BLAKE2B 94564396020ec60c8cf3c5dc25bf0e00dd049d61e181098d7448272fb5193142effec841be1e1038fe98aa403c8526755634f4211d44002caa87305c68909217 SHA512 31c237b529f976771cb79cb010cc4cf6e43f95f89135387b7b88f336f30d4c928d68f5f59c698acb686bf47516de351d9f2e7578412552677e9608fee4a1f8c6
-EBUILD devmanual-9999.ebuild 1345 BLAKE2B d0726e87ab6192c3ad8866a4e7197198b663ad7f8b6eeda0dbf1c95ddcbfe88cf3855e46376312a6bc2a107a5babb24e5a940c5078d3cfcdfe3c464ff9b5688f SHA512 9e028f0f5c1bf798c14a831f70f339b6a311b5f50f5a1c0e13af3d14e1c68e3b8f139c7b53a4bc126fc46241b67ee1d029798ec62d69a9c7bd55be70598a4bfe
+EBUILD devmanual-0_pre20141116.ebuild 1773 BLAKE2B ca879efa95086f57a5b648b0e8c093cbef4e3f6aa74c41492ba4559c1f2180157006a1212f911087f4a31cf0159e3bf26a638ec963030a1bee2f04c3eaa46995 SHA512 8ff92699f5e975df3890363334286b023ce3d7d552ab001b47513cbe7615c3d4e0fd54050ca4b405e7e4689fda96782e56eea80a7d5cc0545fff3fcc7c18afd2
+EBUILD devmanual-9999.ebuild 1773 BLAKE2B ca879efa95086f57a5b648b0e8c093cbef4e3f6aa74c41492ba4559c1f2180157006a1212f911087f4a31cf0159e3bf26a638ec963030a1bee2f04c3eaa46995 SHA512 8ff92699f5e975df3890363334286b023ce3d7d552ab001b47513cbe7615c3d4e0fd54050ca4b405e7e4689fda96782e56eea80a7d5cc0545fff3fcc7c18afd2
 MISC metadata.xml 350 BLAKE2B 67b9c910e7db016681e9ef93572a28c154793c672735ae3212c0b103a1fa4c92f738e2286cf970510b2d034e6de433bf315cb36205a734e2515492d89ae05ffd SHA512 0999bf9619d15f407c0744e266704fbbb2e07ee1f7e23f1b422e7f918720efeb977081fbdfbbc623795f3d08b566f94414c9585fbc5c6e2a45c435ffc632d5c4
diff --git a/app-doc/devmanual/devmanual-0_pre20141116.ebuild b/app-doc/devmanual/devmanual-0_pre20141116.ebuild
index 28cc59a11004..e891efa24f23 100644
--- a/app-doc/devmanual/devmanual-0_pre20141116.ebuild
+++ b/app-doc/devmanual/devmanual-0_pre20141116.ebuild
@@ -1,32 +1,28 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit readme.gentoo
-
-[[ "${PV}" == "9999" ]] && inherit git-2
+inherit readme.gentoo-r1
 
 DESCRIPTION="The Gentoo Development Guide"
 HOMEPAGE="https://devmanual.gentoo.org/"
-if [[ "${PV}" == "9999" ]]; then
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/devmanual.git"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/devmanual.git"
 else
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="CC-BY-SA-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
 IUSE=""
 
 DEPEND="dev-libs/libxslt
 	media-gfx/imagemagick[truetype,svg,png]"
 
-DOC_CONTENTS="In order to browse the Gentoo Development Guide in
-	offline mode, point your browser to the following url:
-	${EPREFIX}/usr/share/doc/devmanual/html/index.html"
-
 src_compile() {
 	# Imagemagick uses inkscape (if present) to delegate
 	# svg conversions.
@@ -38,9 +34,22 @@ src_compile() {
 }
 
 src_install() {
-	dohtml -r *
+	# clean out XML/XSL before installing
+	find . \( \
+		-iname '*.xml' -o \
+		-iname '*.xsl' -o \
+		-iname '*.svg' \) -delete || die
+	rm -r README.md xsl LICENSE Makefile || die
+
+	local HTML_DOCS=( . )
+	einstalldocs
+
 	einfo "Creating symlink from ${PF} to ${PN} for preserving bookmarks"
 	dosym ${PF} /usr/share/doc/${PN}
+
+	local DOC_CONTENTS="In order to browse the Gentoo Development Guide in
+		offline mode, point your browser to the following url:
+		${EPREFIX}/usr/share/doc/devmanual/html/index.html"
 	readme.gentoo_create_doc
 }
 
diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild
index 27453deb6185..e891efa24f23 100644
--- a/app-doc/devmanual/devmanual-9999.ebuild
+++ b/app-doc/devmanual/devmanual-9999.ebuild
@@ -1,26 +1,28 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit git-2 readme.gentoo
+inherit readme.gentoo-r1
 
 DESCRIPTION="The Gentoo Development Guide"
 HOMEPAGE="https://devmanual.gentoo.org/"
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/devmanual.git"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/devmanual.git"
+else
+	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
+fi
 
 LICENSE="CC-BY-SA-2.0"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
 
 DEPEND="dev-libs/libxslt
 	media-gfx/imagemagick[truetype,svg,png]"
 
-DOC_CONTENTS="In order to browse the Gentoo Development Guide in
-	offline mode, point your browser to the following url:
-	/usr/share/doc/devmanual/html/index.html"
-
 src_compile() {
 	# Imagemagick uses inkscape (if present) to delegate
 	# svg conversions.
@@ -32,9 +34,22 @@ src_compile() {
 }
 
 src_install() {
-	dohtml -r *
+	# clean out XML/XSL before installing
+	find . \( \
+		-iname '*.xml' -o \
+		-iname '*.xsl' -o \
+		-iname '*.svg' \) -delete || die
+	rm -r README.md xsl LICENSE Makefile || die
+
+	local HTML_DOCS=( . )
+	einstalldocs
+
 	einfo "Creating symlink from ${PF} to ${PN} for preserving bookmarks"
 	dosym ${PF} /usr/share/doc/${PN}
+
+	local DOC_CONTENTS="In order to browse the Gentoo Development Guide in
+		offline mode, point your browser to the following url:
+		${EPREFIX}/usr/share/doc/devmanual/html/index.html"
 	readme.gentoo_create_doc
 }