commit:     c5804b106c05ee0cd43f3665261c630b17f4ac5a
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Jul  6 12:51:41 2014 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Jul  6 12:51:41 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c5804b10

app-doc/root-docs: backport fixes from ROOT-6 branch

---
 app-doc/root-docs/ChangeLog                        |   6 +
 .../files/root-docs-5.34.01-makehtml.patch         |  51 ++++++++
 app-doc/root-docs/root-docs-5.34.18-r2.ebuild      | 132 +++++++++++++++++++++
 3 files changed, 189 insertions(+)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 56ea0fc..ca2ea86 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/ChangeLog,v 1.42 
2014/03/28 18:48:01 bicatali Exp $
 
+*root-docs-5.34.18-r2 (06 Jul 2014)
+
+  06 Jul 2014; Andrew Savchenko <birc...@gmail.com>
+  +root-docs-5.34.18-r2.ebuild, +files/root-docs-5.34.01-makehtml.patch:
+  Backport PDFs generation and html fixes from ROOT-6 branch.
+
 *root-docs-6.00.02 (05 Jul 2014)
 
   05 Jul 2014; Andrew Savchenko <birc...@gmail.com>

diff --git a/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch 
b/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch
new file mode 100644
index 0000000..b339226
--- /dev/null
+++ b/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch
@@ -0,0 +1,51 @@
+--- root/Makefile.orig 2012-07-13 13:42:46.000000000 +0400
++++ root/Makefile      2012-07-22 00:15:03.282994389 +0400
+@@ -1087,16 +1087,7 @@
+ 
+ ifeq ($(BUILDX11),yes)
+ ifeq ($(BUILDASIMAGE),yes)
+-html: rootexecs postbin changelog releasenotes
+-ifneq ($(USECONFIG),FALSE)
+-      @if [ "x`which root.exe`" != "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: compiledata releasenotes
+       @$(MAKEHTML)
+ else
+ html:
+--- root/build/unix/makehtml.sh.orig   2012-06-28 11:33:36.000000000 +0400
++++ root/build/unix/makehtml.sh        2012-07-22 00:18:58.705804436 +0400
+@@ -1,16 +1,16 @@
+ #! /bin/sh
+ 
+ dir=`pwd`
+-ROOT=$dir/bin/root
++ROOT=root
+ 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,7 +20,7 @@
+ 
+ # To generate the full documentation, we do need to
+ # use the graphics engine, so do not use '-b'.
+-$ROOT -l <<makedoc
++$ROOT -l <<makedoc || exit 1
+     THtml h;
+     h.LoadAllLibs();
+     h.MakeAll();

diff --git a/app-doc/root-docs/root-docs-5.34.18-r2.ebuild 
b/app-doc/root-docs/root-docs-5.34.18-r2.ebuild
new file mode 100644
index 0000000..ac00ef2
--- /dev/null
+++ b/app-doc/root-docs/root-docs-5.34.18-r2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
/var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.18-r1.ebuild,v 1.2 
2014/03/28 18:48:01 bicatali Exp $
+
+EAPI=5
+
+ROOT_PN="root"
+ROOFIT_DOC_PV=2.91-33
+ROOFIT_QS_DOC_PV=3.00
+TMVA_DOC_PV=4.2.0
+
+if [[ ${PV} == "9999" ]] ; then
+       inherit git-r3
+       EVCS_OFFLINE=yes # we need exactly the same checkout as root itself
+       EGIT_REPO_URI="http://root.cern.ch/git/root.git";
+       KEYWORDS=""
+else
+       SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz";
+       KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+       S="${WORKDIR}/${ROOT_PN}"
+fi
+
+inherit eutils multilib virtualx
+
+DESCRIPTION="Documentation for ROOT Data Analysis Framework"
+HOMEPAGE="http://root.cern.ch/drupal";
+SRC_URI="${SRC_URI}
+       math? (
+               http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> 
TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+               
http://root.cern.ch/download/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+               
http://root.cern.ch/drupal/sites/default/files/roofit_quickstart_${ROOFIT_QS_DOC_PV}.pdf
 )
+       api? (
+               ${HOMEPAGE}/sites/default/files/images/root6-banner.jpg
+               ${HOMEPAGE}/sites/all/themes/newsflash/images/info.png )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="api +math +metric"
+
+VIRTUALX_REQUIRED="api"
+
+DEPEND="
+       ~sci-physics/root-${PV}[X,graphviz,opengl]
+       app-text/pandoc
+       app-text/texlive
+       dev-haskell/pandoc-citeproc[bibutils]
+       media-fonts/dejavu
+       virtual/pkgconfig"
+RDEPEND=""
+
+DOC_DIR="/usr/share/doc/${ROOT_PN}-${PV}"
+
+src_unpack() {
+       if [[ ${PV} == "9999" ]] ; then
+               # we need to force sci-physics/root checkout here
+               git-r3_checkout "${EGIT_REPO_URI}" "${WORKDIR}/${P}" 
"sci-physics/root/0"
+       else
+               default
+       fi
+}
+
+src_prepare() {
+       use api && epatch \
+               "${FILESDIR}/${PN}-5.34.01-makehtml.patch" \
+               "${FILESDIR}/${PN}-6.00.01-fillpatterns.patch"
+       # prefixify the configure script
+       sed -i \
+               -e "s:/usr:${EPREFIX}/usr:g" \
+               configure || die "prefixify configure failed"
+}
+
+src_configure() {
+       # we need only to setup paths here, html docs doesn't depend on USE 
flags
+       if use api; then
+               ./configure \
+                       --prefix="${EPREFIX}/usr" \
+                       --etcdir="${EPREFIX}/etc/root" \
+                       --libdir="${EPREFIX}/usr/$(get_libdir)/${PN}" \
+                       --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+                       
--tutdir="${EPREFIX}/usr/share/doc/${PF}/examples/tutorials" \
+                       
--testdir="${EPREFIX}/usr/share/doc/${PF}/examples/tests" \
+                       --with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \
+                       --with-sys-iconpath="${EPREFIX}/usr/share/pixmaps" \
+                       --nohowto
+       fi
+}
+
+src_compile() {
+       pdf_target=( primer users-guide )
+       local pdf_size=pdfa4
+       use metric || pdf_size=pdfletter
+       use math && pdf_target+=( minuit2 spectrum )
+
+       for (( i=0; i<${#pdf_target[@]}; i++ )); do
+               emake -C documentation/"${pdf_target[i]}" "${pdf_size}"
+       done
+
+       if use api; then
+               # video drivers may want to access hardware devices
+               cards=$(echo -n /dev/dri/card* /dev/ati/card* /dev/nvidiactl* | 
sed 's/ /:/g')
+               [[ -n "${cards}" ]] && addpredict "${cards}"
+
+               ROOTSYS="${S}" Xemake html
+               # 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/tableDescriptor_st.html ]] || die "html doc 
generation crashed"
+       fi
+}
+
+src_install() {
+       insinto "${DOC_DIR}"
+
+       for (( i=0; i<${#pdf_target[@]}; i++ )); do
+               doins documentation/"${pdf_target[i]}"/*.pdf
+       done
+       unset pdf_target
+
+       use math && doins \
+               "${DISTDIR}/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf" \
+               "${DISTDIR}/roofit_quickstart_${ROOFIT_QS_DOC_PV}.pdf" \
+               "${DISTDIR}/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf"
+
+       if use api; then
+               # Install offline replacements for online messages
+               cp "${DISTDIR}"/{root6-banner.jpg,info.png} htmldoc/ || die "cp 
failed"
+               # too large data to copy
+               dodir "${DOC_DIR}/html"
+               mv htmldoc/* "${ED}${DOC_DIR}/html/" || die
+               docompress -x ${DOC_DIR}/html
+       fi
+}

Reply via email to