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 1Sh4um-0005qr-QB for garchives@archives.gentoo.org; Tue, 19 Jun 2012 20:20:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC1A0E06B0; Tue, 19 Jun 2012 20:20:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9B063E0693 for ; Tue, 19 Jun 2012 20:20:23 +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 BF70C1B4042 for ; Tue, 19 Jun 2012 20:20:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1CD01E543A for ; Tue, 19 Jun 2012 20:20:21 +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: <1340136274.057f0255ad19162bd9b7b90fa5db478025aff657.bircoph@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/root/ChangeLog sci-physics/root/files/root-5.34-dotfont.patch sci-physics/root/files/root-5.34-htmldoc.patch sci-physics/root/files/root-9999-dotfont.patch sci-physics/root/root-9999.ebuild X-VCS-Directories: sci-physics/root/files/ sci-physics/root/ X-VCS-Committer: bircoph X-VCS-Committer-Name: Andrew Savchenko X-VCS-Revision: 057f0255ad19162bd9b7b90fa5db478025aff657 X-VCS-Branch: master Date: Tue, 19 Jun 2012 20:20:21 +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: d7a5ae8c-a68d-401b-b248-a468dce76ff4 X-Archives-Hash: 7b630adba3cfd49a5a847ed6381845d2 commit: 057f0255ad19162bd9b7b90fa5db478025aff657 Author: Andrew Savchenko gmail com> AuthorDate: Tue Jun 19 20:04:34 2012 +0000 Commit: Andrew Savchenko gmail com> CommitDate: Tue Jun 19 20:04:34 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D057f0255 sci-physics/root: separate htmldoc package --- sci-physics/root/ChangeLog | 6 +++ sci-physics/root/files/root-5.34-htmldoc.patch | 46 --------------= ------ ...-5.34-dotfont.patch =3D> root-9999-dotfont.patch} | 0 sci-physics/root/root-9999.ebuild | 28 +++--------- 4 files changed, 12 insertions(+), 68 deletions(-) diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index dad708f..281ea31 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 + 19 Jun 2012; Andrew Savchenko + -files/root-5.34-dotfont.patch, files/root-5.34-htmldoc.patch, + root-9999.ebuild, +files/root-9999-dotfont.patch: + Split htmldoc to a separate ebuild: docs are supposed to be + generated after root was installed onto the live filesystem. + 14 Jun 2012; Andrew Savchenko +files/root-5.34-dotfont.patch, root-9999.ebuild, metadata.xml: Update live ebuild to account 5.34 barnch changes. diff --git a/sci-physics/root/files/root-5.34-htmldoc.patch b/sci-physics= /root/files/root-5.34-htmldoc.patch index a999d0c..3b80b39 100644 --- a/sci-physics/root/files/root-5.34-htmldoc.patch +++ b/sci-physics/root/files/root-5.34-htmldoc.patch @@ -1,49 +1,3 @@ ---- root/Makefile.orig 2012-05-30 00:50:46.000000000 +0400 -+++ root/Makefile 2012-05-30 00:51:05.839679686 +0400 -@@ -1088,16 +1088,7 @@ - releasenotes: - @$(MAKERELNOTES) -=20 --html: $(ROOTEXE) changelog releasenotes --ifneq ($(USECONFIG),FALSE) -- @if [ "x`which root.exe`" !=3D "x$(DESTDIR)$(BINDIR)/root.exe" ] \ -- || [ "`which root.exe`" -ot "bin/root.exe" ]; then \ -- echo 'ERROR: root.exe has not been installed by this build.'; \ -- echo ' Run "make install" before running "make html".'; \ -- exit 1; \ -- fi --endif -- @$(MAKELOGHTML) -+html: $(ROOTEXE) releasenotes - @$(MAKEHTML) -=20 - # Use DESTDIR to set a sandbox prior to calling "make install", e.g.: ---- root/build/unix/makehtml.sh.orig 2012-05-23 23:25:45.000000000 +0400 -+++ root/build/unix/makehtml.sh 2012-05-24 13:04:43.919062126 +0400 -@@ -6,12 +6,12 @@ - cd tutorials - # we need tutorials/hsimple.root - if [ ! -f hsimple.root ]; then -- $ROOT -l -b -q hsimple.C -+ ../$ROOT -l -b -q hsimple.C && exit 1 - fi - cd tree - # we need tutorials/tree/cernstaff.root - if [ ! -f cernstaff.root ]; then -- $ROOT -l -b -q cernbuild.C -+ ../../$ROOT -l -b -q cernbuild.C || exit 1 - fi - cd $dir -=20 -@@ -19,7 +19,7 @@ - echo "Generating doc in directory htmldoc/..." - echo "" -=20 --$ROOT -l <=3Ddev-lang/cfortran-4.4-r2 dev-libs/libpcre media-fonts/dejavu @@ -110,14 +108,13 @@ 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 ) mpi? ( math !openmp ) openmp? ( math !mpi )" =20 -VIRTUALX_REQUIRED=3D"htmldoc" - S=3D"${WORKDIR}/${PN}" =20 pkg_setup() { @@ -157,7 +154,7 @@ src_prepare() { "${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \ "${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \ "${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV3}-dotfont.patch + "${FILESDIR}"/${PN}-9999-dotfont.patch =20 # make sure we use system libs and headers rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die @@ -204,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 @@ -283,18 +277,10 @@ src_configure() { } =20 src_compile() { - emake OPT=3D"${CXXFLAGS}" F77OPT=3D"${FFLAGS}" ROOTSYS=3D${S} LD_LIBRAR= Y_PATH=3D${S}/lib + emake OPT=3D"${CXXFLAGS}" F77OPT=3D"${FFLAGS}" ROOTSYS=3D"${S}" LD_LIBR= ARY_PATH=3D"${S}/lib" if use emacs; then elisp-compile build/misc/*.el || die "elisp-compile failed" fi - if use htmldoc; then - ROOTSYS=3D${S} LD_LIBRARY_PATH=3D${S}/lib 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() { @@ -305,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