[gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/

["Andrew Savchenko" <bircoph@gmail.com>]

commit:     e3882560b983ba280fb3a43a7ece6e67ff97150a
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Jul 21 22:42:33 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sat Jul 21 22:42:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e3882560

app-doc/root-docs: update live ebuild

---
 app-doc/root-docs/ChangeLog                        |    5 ++
 .../root-docs/files/root-docs-5.32-makehtml.patch  |   44 --------------------
 ...akehtml.patch => root-docs-9999-makehtml.patch} |   33 +++++++--------
 app-doc/root-docs/root-docs-9999.ebuild            |    2 +-
 4 files changed, 22 insertions(+), 62 deletions(-)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 36085b8..2f4b658 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jul 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-docs-5.32-makehtml.patch, -files/root-docs-5.34-makehtml.patch,
+  root-docs-9999.ebuild, +files/root-docs-9999-makehtml.patch:
+  Update patching for live ebuild. Remove old.
+
   06 Jul 2012; Justin Lecher <jlec@gentoo.org> -root-docs-5.32.03.ebuild,
   metadata.xml:
   Dropped in tree version

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 5cad010..0000000
--- 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
similarity index 60%
rename from app-doc/root-docs/files/root-docs-5.34-makehtml.patch
rename to app-doc/root-docs/files/root-docs-9999-makehtml.patch
index 57fb69b..b339226 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;

diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
index ca27548..463a23b 100644
--- a/app-doc/root-docs/root-docs-9999.ebuild
+++ b/app-doc/root-docs/root-docs-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 ROOT_PN="root"
-PATCH_PV="5.34"
+PATCH_PV="9999"
 
 if [[ ${PV} == "9999" ]] ; then
 	_SVN_DEP="dev-vcs/subversion"