sci-physics/root: backport htmldoc fixes to 5.32 branch

This fixes bootstrap and some downgrade conditions, where no valid
root is available for documentation build.
Revbump is required to maintain dependecy consistency.

3 files changed, 13 insertions, 21 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index c827619f8..53f441313 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-5.32.03-r3 (20 Jun 2012)
+
+  20 Jun 2012; Andrew Savchenko <bircoph@gmail.com> -root-5.32.03-r2.ebuild,
+  +root-5.32.03-r3.ebuild:
+  Backport htmldoc fixes for 5.32 branch.
+
 *root-5.34.00 (19 Jun 2012)
 
   19 Jun 2012; Andrew Savchenko <bircoph@gmail.com> +root-5.34.00.ebuild:
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 694287a1a..30117cc27 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -26,8 +26,8 @@ DIST root-banner.png 132555 RMD160 d4cf5f8a60ee1df686e47a696e76c1ecdda4f1e7 SHA1
 DIST root_v5.32.03.source.tar.gz 55529362 RMD160 90ee828638f322c169875135b51231810dada383 SHA1 cc1125660073918d0f47e209a069be2b9e849dc3 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6
 DIST root_v5.34.00.source.tar.gz 56214534 RMD160 6089493c70f94a1c4edd87ebe79adb9f3570f903 SHA1 e7c8352d92be8510b36001efb020f3eb0bf22ed1 SHA256 808e04876dbc9cfbfea54ee11ba35e90382e8ff4219dbdbe2d2236a9dadf7df1
 DIST rootdrawing-logo.png 15051 RMD160 a10172fa5e9a9737b6b5e678af3f8426d804e275 SHA1 dd4c0e3e2ef5ebc59440677a78605b4b54fff48a SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc7d155944a8e27284af83a6b
-EBUILD root-5.32.03-r2.ebuild 12026 RMD160 d369920ab317b6fab5ca5322bf3e7415f68a3ccb SHA1 897b2bf879a4807ef696d73bf89e20fb66be6fe5 SHA256 fe8132ed6ec3fcf4fa99af12964b1bec20ecb6e1244e270a1f26c2b0c87e760a
+EBUILD root-5.32.03-r3.ebuild 11393 RMD160 35b5a8a28943a4c211cd9ea8469f46ae58e7678d SHA1 cff1657585594d9d82ca39f618432d26bde4cd0a SHA256 4bffda3f13772d6272ff58d0a5f8563d4a64f3d359cbd5332db7b4a0f14e05c1
 EBUILD root-5.34.00.ebuild 11289 RMD160 f1a2c96533e9eaefcfd850a2e584d4ff02b74f65 SHA1 8c3c1c81979965c355b79ba80e0b0dfc154d5ceb SHA256 507988e86cf4494227d5ca952bd2aecaec506a61286dfc47e7fa29254a7c0803
 EBUILD root-9999.ebuild 11405 RMD160 da73f2f7e9e07cabe09c2b23dd781a945f8af7b2 SHA1 b46e3b6119de9df3c3afe5741cc47e6f0abcaffd SHA256 02f7bd243e846ecbf40776a9fa6b6f7f7df5445b0ea085c25c88c83d2ab9b8cc
-MISC ChangeLog 31096 RMD160 d0ea3b4e0177b56bd532ecbe812e97b1486589d3 SHA1 a2ebddd914fdfe0fbae66773ce73fd135f58ad06 SHA256 3cdb1f3de681bfbb620c42ee2644c2e2041b277ce87d8b38a762843cbec0af8f
+MISC ChangeLog 31275 RMD160 be5c5873f19ebc0e99e956b4242a49c6d04cb842 SHA1 b0321a086b85043e3330d275ecaa2ba65ee722a9 SHA256 861825d9ffaba1f8f8e0221af90caafe6d4fe17647e707e8e54c69ac99ddfb3a
 MISC metadata.xml 1794 RMD160 701c0b741ceed4d5cebdf346d5861f4c084d8f02 SHA1 62af471cd7970a4095adbe3a7d01ae8ec50cbdc4 SHA256 3076ff6ff6170f7ca4ae57d2ba226948fa93120c61216c7bc716f6c80b05d681
diff --git a/sci-physics/root/root-5.32.03-r2.ebuild b/sci-physics/root/root-5.32.03-r3.ebuild
index b20bb5d86..9d87c1c66 100644
--- a/sci-physics/root/root-5.32.03-r2.ebuild
+++ b/sci-physics/root/root-5.32.03-r3.ebuild
@@ -17,7 +17,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user virtualx ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -44,7 +44,6 @@ IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerbero
 
 CDEPEND="
 	app-arch/xz-utils
-	!app-doc/root-docs
 	>=dev-lang/cfortran-4.4-r2
 	dev-libs/libpcre
 	media-fonts/dejavu
@@ -107,11 +106,12 @@ RDEPEND="
 	reflex? ( dev-cpp/gccxml )
 	xinetd? ( sys-apps/xinetd )"
 
+PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
+
 REQUIRED_USE="
 	!X? ( !opengl !qt4 !xft )
-	htmldoc? ( X doc graphviz )"
-
-VIRTUALX_REQUIRED="htmldoc"
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )"
 
 S="${WORKDIR}/${PN}"
 
@@ -201,9 +201,6 @@ src_prepare() {
 
 		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
 			die "htmldoc preparation failed"
-
-		# set build etc directory
-		sed "s%@PWD@%${S}%" -i build/unix/makehtml.sh || die "htmldoc sed failed"
 	fi
 }
 
@@ -284,15 +281,6 @@ src_compile() {
 	if use emacs; then
 		elisp-compile build/misc/*.el || die "elisp-compile failed"
 	fi
-	if use htmldoc; then
-		LD_LIBRARY_PATH=${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \
-		ROOTSYS=${S} DISPLAY=":50" \
-		Xemake html || die "html doc generation failed"
-		# if root.exe crashes, return code will be 0 due to gdb attach,
-		# so we need to check if last html file was generated;
-		# this check is volatile and can't catch crash on the last file.
-		[[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
-	fi
 }
 
 doc_install() {
@@ -303,8 +291,6 @@ doc_install() {
 		use math && dodoc \
 			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
 			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-		# too large data to copy
-		use htmldoc && mv htmldoc "${ED}usr/share/doc/${PF}/html"
 	fi
 
 	if use examples; then