aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gmail.com>2012-07-22 02:42:33 +0400
committerAndrew Savchenko <bircoph@gmail.com>2012-07-22 02:42:33 +0400
commite3882560b983ba280fb3a43a7ece6e67ff97150a (patch)
treea6849b9923693e51cd303728fa08064b24cc52fc /app-doc/root-docs/files
parentsci-physics/root: update live ebuild (diff)
downloadsci-e3882560b983ba280fb3a43a7ece6e67ff97150a.tar.gz
sci-e3882560b983ba280fb3a43a7ece6e67ff97150a.tar.bz2
sci-e3882560b983ba280fb3a43a7ece6e67ff97150a.zip
app-doc/root-docs: update live ebuild
Diffstat (limited to 'app-doc/root-docs/files')
-rw-r--r--app-doc/root-docs/files/root-docs-5.32-makehtml.patch44
-rw-r--r--app-doc/root-docs/files/root-docs-9999-makehtml.patch (renamed from app-doc/root-docs/files/root-docs-5.34-makehtml.patch)33
2 files changed, 16 insertions, 61 deletions
diff --git a/app-doc/root-docs/files/root-docs-5.32-makehtml.patch b/app-doc/root-docs/files/root-docs-5.32-makehtml.patch
deleted file mode 100644
index 5cad0102a..000000000
--- a/app-doc/root-docs/files/root-docs-5.32-makehtml.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- root/Makefile.orig 2012-05-23 21:07:07.000000000 +0400
-+++ root/Makefile 2012-05-23 22:47:48.935680301 +0400
-@@ -1039,8 +1039,7 @@
- releasenotes:
- @$(MAKERELNOTES)
-
--html: $(ROOTEXE) changelog releasenotes
-- @$(MAKELOGHTML)
-+html: compiledata releasenotes
- @$(MAKEHTML)
-
- # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
---- root/build/unix/makehtml.sh.orig 2012-06-18 06:44:59.000000000 +0400
-+++ root/build/unix/makehtml.sh 2012-06-18 19:39:41.262064654 +0400
-@@ -1,17 +1,17 @@
- #! /bin/sh
-
--ROOT=bin/root.exe
-+ROOT=root.exe
-
- dir=`pwd`
- 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
-
-@@ -19,7 +19,7 @@
- echo "Generating doc in directory htmldoc/..."
- echo ""
-
--$ROOT -l <<makedoc
-+$ROOT -l <<makedoc || exit 1
- THtml h;
- h.LoadAllLibs();
- h.MakeAll();
diff --git a/app-doc/root-docs/files/root-docs-5.34-makehtml.patch b/app-doc/root-docs/files/root-docs-9999-makehtml.patch
index 57fb69b37..b339226c8 100644
--- a/app-doc/root-docs/files/root-docs-5.34-makehtml.patch
+++ b/app-doc/root-docs/files/root-docs-9999-makehtml.patch
@@ -1,10 +1,10 @@
---- 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)
+--- 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 @@
--html: $(ROOTEXE) changelog releasenotes
+ 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 \
@@ -16,17 +16,16 @@
- @$(MAKELOGHTML)
+html: compiledata releasenotes
@$(MAKEHTML)
-
- # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
---- root/build/unix/makehtml.sh.orig 2012-06-18 06:44:59.000000000 +0400
-+++ root/build/unix/makehtml.sh 2012-06-18 19:39:41.262064654 +0400
-@@ -1,17 +1,17 @@
+ 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
--ROOT=bin/root.exe
-+ROOT=root.exe
-
dir=`pwd`
+-ROOT=$dir/bin/root
++ROOT=root
cd tutorials
# we need tutorials/hsimple.root
if [ ! -f hsimple.root ]; then
@@ -41,10 +40,10 @@
fi
cd $dir
-@@ -19,7 +19,7 @@
- echo "Generating doc in directory htmldoc/..."
- echo ""
+@@ -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;