Optionally install html docs, bug 426738 by Chris Mayo.

Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64

4 files changed, 43 insertions, 11 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 3fce2341c746..85b929dc9ce6 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.228 2012/07/13 18:05:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.229 2012/07/18 16:34:36 floppym Exp $
+
+  18 Jul 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
+  grub-9999.ebuild:
+  Optionally install html docs, bug 426738 by Chris Mayo.
 
   13 Jul 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
   grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 55b60403aafd..ef78db945e65 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -51,15 +51,15 @@ EBUILD grub-0.97-r8.ebuild 8948 SHA256 3eb9b11beeae64c986c9d27233f79525f271d0362
 EBUILD grub-0.97-r9.ebuild 9053 SHA256 b6411eb5c379cc6b9120f1f727733d9724c4257405c3a7a1935b2aa573085726 SHA512 ddcf78c3d72f1bd854ed44753f4870fc9efd0cf69a28efb24423863c6ad740657affa74eff403484b4f30046e338d4a506a71e5d6b1818022377a1a77880b004 WHIRLPOOL 13d3adafd3814259081dd783067c077fbaebfa2974214d5b0249c818aa3cc004cb2bd526b18f1c1a46dfc0641325a92b87c8f73608972061c52c7ded99e95fe0
 EBUILD grub-0.97.ebuild 4238 SHA256 d93dd5dca80c822e0659007b827966fb69c7f702b13ba672b4c3f486af54cee1 SHA512 46d72cfaa5735d0b3d2d89a8e6ce83745e4645370cdbbfcffc37d1413ffeb2b1caafac8c7cc712925ffc09411870b06467eb50bc475997508e7beea8fa5172d7 WHIRLPOOL 4b6fe9a7300baf6364555858a49ae2775ea0da27291d5d48fa634097531ae3b6da445ee2f959ef584bf4c913aad5e689b77e7326af257549ef107704dc0d202e
 EBUILD grub-1.99-r2.ebuild 8413 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c59e739015dc949a51011f585 SHA512 520bd623cfaf70451b4331f2dc464982f4de1b0c070ee8c0b336c9d16589aaa96924ea923f4c47ccb07d3c8f6da987a89ed285f1f4fa8f922465ab912e8940bd WHIRLPOOL 5abb91bf54a5024b225e7c3891b884827b31e6e8e380db9aa37fd520c55cd2e94ce1e7545271d52a58baab63446906cb69440177a4678000ac519088b9ae6966
-EBUILD grub-2.00.ebuild 7829 SHA256 af7ccbe8700c272745deb3f408bdb92e6781699ba5e91fb3c8dea41a6093168a SHA512 98789ce349d676fd4b727dea675e277e042f30c04f22c038f210b1d4ce0a4cfbfba808bebe89447283369c2914c9c8b8c96fc52a497dcd6c3d987327eeab4f23 WHIRLPOOL 482251b2a1406a1d5b3eea4f8306dc9e4d8c2ec1f6875784c711b75a614d1fa64aab7d498fa7949c30c729b528ff5422d53689644d0b3e2998a1d1d1311eaf54
+EBUILD grub-2.00.ebuild 8110 SHA256 129b9614c584d82f1a7825daa0e9c76c8e8ff43ba6667e7e81cfa418d5d0f271 SHA512 34ad2a377239b5901bdbe8c1670a47e367f959765822e9c7e1cd045d5c991bc3c4b7360bed7412439dd76263df5f55bdea1244137537a20b9d673fdb987e7c73 WHIRLPOOL 58d7caa6cbed482a6a2fb380bd72c62e76044e836d165e7607bbc03efeca0491324604ff00f0a998b36ec40a496ae9a533fc0327838a611f29f57a514de508d8
 EBUILD grub-2.00_beta6.ebuild 7140 SHA256 8026d9d32d21863e5427cac5b641fbc5f799662437bd9a40daa3f9a377a0de68 SHA512 35b5a7aa5224ba1f0d3dabaeb03d915b86a3c16419f6ef012c8092b198e8bbc054f22e4658930f704402066622b98c67c869f0c9cf5d74637c34ae786b0861fa WHIRLPOOL 54839cae4be956d12f8c62524923e9087f76c5e2c3c7db7cca074084deba71cd870238e514227a73a1131748fac501566afe29866231b68e4bbddbf2b465a71b
-EBUILD grub-9999.ebuild 7829 SHA256 6577b3ca03b583a3c1b929d6771601241f7460be7bb786646f40b20ed635f45b SHA512 84d5816ae3ad1267eb355fede2fafc4195c82e40643d3fd5598b4c1a9a0b28f3b925dc09978aad43d599a6dce62e8c03d266a7d7659f04072aa319c62bbe18b7 WHIRLPOOL d721c114a6f20622846b1b10dca83e495d7f7f70ee9f0a2a45fe4d87c79955622edaf92b565c7ab3dfd31f61c9fc40428f542bac5b34cfd41bbec4e0d7ea0ca1
-MISC ChangeLog 44915 SHA256 27481a5fc0d6b562b597586dedc6258002e9fffe6123d7eb47b0eaf1a5be3896 SHA512 2293cd9591c43d6f057e018edb6eea1ed1401910acf7a5bb212448ad0205aee9ec48c9ec6ecbddb6831e5b9fa4142da4e3f3c31554d958518e8e63f73f904d3c WHIRLPOOL a187dab7aa392e72609d662a97f7c647a9ffbddb489bc0e778e5793fd9b460ab947f1df8ca244405b0bedeaa6a06fb9d880f1f9c1ff7e2e6b83004ed61b67596
+EBUILD grub-9999.ebuild 8110 SHA256 54ed224ef90896bb7fb25b318e465687a60d6304aa180047c9377429f380d08f SHA512 153a52559b1a2a9432167f9711568274dfef99fa3218bd6765982372a1d4825932e71ca1c213dbd21a1d5e9e4f71f9df3f44a94f73119f8601117714bd2e9620 WHIRLPOOL ee4c4640e1dd0989d9977c36e1de1b6277b69f835ef32d3eeb3e058d105edc8566dc0f23b0ef3bacaf56e68cc0c2ca2110018b5f75eb11c5501067530a3d72b1
+MISC ChangeLog 45061 SHA256 b97d9578dfa2403e02bf31dead97d7b575709c220c9e8f68763489bb4eaf5a57 SHA512 7fbeb895b7e07b883f91c3818b56ccf78ebe874b5d0ccd819f023f0e3509c7813ba452ba512bdcb73a9fdbe78415a6824c2e1e90e25224c7a65be607e8f43e66 WHIRLPOOL 1c815dc75324ea788f1578a0ae47215c896c0cd1433a25bd23aa0480af1f4b51c44979f191d0a0e16632240871b2deb090e3e5955fbcb8eb41411bb73300f3c4
 MISC metadata.xml 607 SHA256 5deec975010a509f536573e173aa1918e0c5b8993191064d1fd7914edc0c13e8 SHA512 5aee5daf3e1b9a32ed3e09046bcc131145d9d24ad0ac46f2df9d4ff7e5245bdcbf37bb694080b6d206115c2c4a542eb6a954755b3a049fba8267981852d9ea72 WHIRLPOOL 173e6be80665e0605e174f61553677baff64fa4306ed5f1448fce9d9741cb36224e5db5fff33f9a58788232a977f9779d0f95c0039c552049394e87b8582477a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAAY2UACgkQC77qH+pIQ6TxsAEAwW1uUZ7xns/DGzXUICL8tEJU
-1PNfVvz2JqQnohFfZ9AA/jL9I7rVe/dAmxN8gg0X3C1JB0rogAJFAEV7KD3z78sp
-=DNXh
+iF4EAREIAAYFAlAG5aUACgkQC77qH+pIQ6SMIgD/XaQcMvqGn/0VEI8nZEqqgups
+3iGGrEPRDORE3iiLAAoBALUkL1ECK6ZHZidi16PG0dUMatmL6siRLFtBaFBo3xKb
+=vuJG
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.00.ebuild b/sys-boot/grub/grub-2.00.ebuild
index 9f571cbda9b6..ac7b745e4c8d 100644
--- a/sys-boot/grub/grub-2.00.ebuild
+++ b/sys-boot/grub/grub-2.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.13 2012/07/13 18:05:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.14 2012/07/18 16:34:36 floppym Exp $
 
 EAPI=4
 
@@ -30,7 +30,7 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
 
 LICENSE="GPL-3"
 SLOT="2"
-IUSE="custom-cflags debug device-mapper efiemu mount nls static sdl truetype libzfs"
+IUSE="custom-cflags debug device-mapper doc efiemu mount nls static sdl truetype libzfs"
 
 GRUB_PLATFORMS=(
 	# everywhere:
@@ -176,6 +176,7 @@ grub_src_configure() {
 
 	ECONF_SOURCE="${S}" \
 	econf \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		--disable-werror \
 		--program-prefix= \
 		--program-transform-name="s,grub,grub2," \
@@ -202,10 +203,18 @@ grub_src_compile() {
 	pax-mark -mpes "${grub_binaries[@]}"
 }
 
+grub_build_docs() {
+	emake -C docs html
+}
+
 grub_src_install() {
 	default_src_install
 }
 
+grub_install_docs() {
+	emake -C docs DESTDIR="${D}" install-html
+}
+
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
@@ -284,6 +293,9 @@ src_compile() {
 	for i in ${GRUB_ENABLED_PLATFORMS}; do
 		grub_run_phase ${FUNCNAME} ${i}
 	done
+
+	# Just build docs once
+	use doc && grub_run_phase build_docs ${i}
 }
 
 src_install() {
@@ -293,6 +305,8 @@ src_install() {
 		grub_run_phase ${FUNCNAME} ${i}
 	done
 
+	use doc && grub_run_phase install_docs ${i}
+
 	mv "${ED}"usr/share/info/grub{,2}.info || die
 
 	# can't be in docs array as we use default_src_install in different builddir
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 23f254c85347..ee5cf6a95f1b 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.78 2012/07/13 18:05:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.79 2012/07/18 16:34:36 floppym Exp $
 
 EAPI=4
 
@@ -30,7 +30,7 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
 
 LICENSE="GPL-3"
 SLOT="2"
-IUSE="custom-cflags debug device-mapper efiemu mount nls static sdl truetype libzfs"
+IUSE="custom-cflags debug device-mapper doc efiemu mount nls static sdl truetype libzfs"
 
 GRUB_PLATFORMS=(
 	# everywhere:
@@ -176,6 +176,7 @@ grub_src_configure() {
 
 	ECONF_SOURCE="${S}" \
 	econf \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		--disable-werror \
 		--program-prefix= \
 		--program-transform-name="s,grub,grub2," \
@@ -202,10 +203,18 @@ grub_src_compile() {
 	pax-mark -mpes "${grub_binaries[@]}"
 }
 
+grub_build_docs() {
+	emake -C docs html
+}
+
 grub_src_install() {
 	default_src_install
 }
 
+grub_install_docs() {
+	emake -C docs DESTDIR="${D}" install-html
+}
+
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
@@ -284,6 +293,9 @@ src_compile() {
 	for i in ${GRUB_ENABLED_PLATFORMS}; do
 		grub_run_phase ${FUNCNAME} ${i}
 	done
+
+	# Just build docs once
+	use doc && grub_run_phase build_docs ${i}
 }
 
 src_install() {
@@ -293,6 +305,8 @@ src_install() {
 		grub_run_phase ${FUNCNAME} ${i}
 	done
 
+	use doc && grub_run_phase install_docs ${i}
+
 	mv "${ED}"usr/share/info/grub{,2}.info || die
 
 	# can't be in docs array as we use default_src_install in different builddir