From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1ShH48-00032m-UG for garchives@archives.gentoo.org; Wed, 20 Jun 2012 09:19:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F221E0812; Wed, 20 Jun 2012 09:18:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C48FFE080C for ; Wed, 20 Jun 2012 09:18:56 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E58591B405C for ; Wed, 20 Jun 2012 09:18:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 98B01E5439 for ; Wed, 20 Jun 2012 09:18:53 +0000 (UTC) From: "Andrew Savchenko" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Savchenko" Message-ID: <1340183636.184170cbd76b7a5be2e33f2615a8d245554e3b82.bircoph@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/root/ChangeLog sci-physics/root/root-5.32.03-r2.ebuild sci-physics/root/root-5.32.03-r3.ebuild X-VCS-Directories: sci-physics/root/ X-VCS-Committer: bircoph X-VCS-Committer-Name: Andrew Savchenko X-VCS-Revision: 184170cbd76b7a5be2e33f2615a8d245554e3b82 X-VCS-Branch: master Date: Wed, 20 Jun 2012 09:18:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 94a46aec-b408-483c-8e90-fefce26fa709 X-Archives-Hash: 8a9bce95fe71ae4a4da5ae4cf0ec6408 commit: 184170cbd76b7a5be2e33f2615a8d245554e3b82 Author: Andrew Savchenko gmail com> AuthorDate: Wed Jun 20 09:13:56 2012 +0000 Commit: Andrew Savchenko gmail com> CommitDate: Wed Jun 20 09:13:56 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D184170cb 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. --- sci-physics/root/ChangeLog | 6 +++++ ...ot-5.32.03-r2.ebuild =3D> root-5.32.03-r3.ebuild} | 24 ++++--------= ------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index c827619..53f4413 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 201= 2/03/29 18:21:49 bicatali Exp $ =20 +*root-5.32.03-r3 (20 Jun 2012) + + 20 Jun 2012; Andrew Savchenko -root-5.32.03-r2.ebu= ild, + +root-5.32.03-r3.ebuild: + Backport htmldoc fixes for 5.32 branch. + *root-5.34.00 (19 Jun 2012) =20 19 Jun 2012; Andrew Savchenko +root-5.34.00.ebuild= : diff --git a/sci-physics/root/root-5.32.03-r2.ebuild b/sci-physics/root/r= oot-5.32.03-r3.ebuild similarity index 93% rename from sci-physics/root/root-5.32.03-r2.ebuild rename to sci-physics/root/root-5.32.03-r3.ebuild index b20bb5d..9d87c1c 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=3D"~amd64 ~x86 ~amd64-linux ~x86-linux" fi =20 -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} =20 ROOFIT_DOC_PV=3D2.91-33 TMVA_DOC_PV=3D4.03 @@ -44,7 +44,6 @@ IUSE=3D"+X afs avahi clarens doc emacs examples fits ff= tw graphviz htmldoc kerbero =20 CDEPEND=3D" app-arch/xz-utils - !app-doc/root-docs >=3Ddev-lang/cfortran-4.4-r2 dev-libs/libpcre media-fonts/dejavu @@ -107,11 +106,12 @@ RDEPEND=3D" reflex? ( dev-cpp/gccxml ) xinetd? ( sys-apps/xinetd )" =20 +PDEPEND=3D"htmldoc? ( ~app-doc/root-docs-${PV} )" + REQUIRED_USE=3D" !X? ( !opengl !qt4 !xft ) - htmldoc? ( X doc graphviz )" - -VIRTUALX_REQUIRED=3D"htmldoc" + mpi? ( math !openmp ) + openmp? ( math !mpi )" =20 S=3D"${WORKDIR}/${PN}" =20 @@ -201,9 +201,6 @@ src_prepare() { =20 cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/ht= ml || die "htmldoc preparation failed" - - # set build etc directory - sed "s%@PWD@%${S}%" -i build/unix/makehtml.sh || die "htmldoc sed fail= ed" fi } =20 @@ -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=3D${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \ - ROOTSYS=3D${S} DISPLAY=3D":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 } =20 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 =20 if use examples; then