app-doc/root-docs: update live ebuild

5 files changed, 26 insertions, 70 deletions

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 36085b829..2f4b65830 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/Manifest b/app-doc/root-docs/Manifest
index c73051d39..54ac66faf 100644
--- a/app-doc/root-docs/Manifest
+++ b/app-doc/root-docs/Manifest
@@ -1,8 +1,4 @@
-AUX root-docs-5.32-makehtml.patch 1074 RMD160 66a5184f36aec74b3f04f93ec3d7790eb221f25a SHA1 c4c760be51f90995b5a859b582fd62ab5fa7cee3 SHA256 cc5fc9fb780357c50137bbf1adb1630688abd288f3d337c06b154709e581a8de
-AUX root-docs-5.34-makehtml.patch 1389 RMD160 ab7affbe7b525bdfa7822784e6aa8619604417c8 SHA1 3cd6f5fd9495c75e0b24dc008d94072943f68e2c SHA256 dc0395adc808432506d4c18fdd56bf20e2e51a414c6cf4345d45e657889763e1
-DIST root_v5.32.03.source.tar.gz 55529362 RMD160 90ee828638f322c169875135b51231810dada383 SHA1 cc1125660073918d0f47e209a069be2b9e849dc3 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6
-DIST root_v5.34.00.source.tar.gz 56214534 RMD160 6089493c70f94a1c4edd87ebe79adb9f3570f903 SHA1 e7c8352d92be8510b36001efb020f3eb0bf22ed1 SHA256 808e04876dbc9cfbfea54ee11ba35e90382e8ff4219dbdbe2d2236a9dadf7df1
-EBUILD root-docs-5.32.03.ebuild 2680 RMD160 7afaac5cc162f05c2172438d8740ce1a1c5ad4c7 SHA1 a0ca1ee250512870547aa4d4a0421d5c803c2ed0 SHA256 b4ee9fc8e465171bafd90ef6aa6fe333a669b029d6695f299c28ed4191ea1614
-EBUILD root-docs-9999.ebuild 2680 RMD160 49fa4a3adf1c2a54ed349e43acdee84cbac5e6c8 SHA1 c14c03e379c99fc99b74e8351d57441c120036aa SHA256 8b2ccf034b1bfa42ba4ed96e0931245582e62849599362eab933df36710600e5
-MISC ChangeLog 1334 RMD160 82a11846c16c1e6d796b9edbc1d8668a1a9f0927 SHA1 982e2da4714fe70292f6c14a29c7af4e284a44e9 SHA256 04935384ea3738bc649adc33b1472bf18c2da5000f886846c0fc05c8bb6d25af
-MISC metadata.xml 445 RMD160 7c03cc156077e890bc7051bb37a7bda72c4425b0 SHA1 85cd2df4d36e312634491d536aefc51d629d64a8 SHA256 00cd4d82a3a02cc4a2ac6dc347b57713f3772635f9be6987d05bb024ad9f3b72
+AUX root-docs-9999-makehtml.patch 1393 SHA256 6fd2edf1956e3929a063f9e7add1893d873eed21b56bb4d872f4c7beb60ebce5 SHA512 6ed68056585e12295d06c0d7e77fe90403214f15b889628a32fa27b9a845a7ccdabe027d962e381f786d5ad0210173b0227a8756487d809b0e60772cd6b74820 WHIRLPOOL d27abe4585b9772f4c5f3b03f1c04a7a1ac49e09ea59df85e5dbd47622a831503d18615d80f947bef6923e420027e4db5073b1f34cd1d239fd5adfa92ebd193f
+EBUILD root-docs-9999.ebuild 2680 SHA256 3bb4ba10c5b10d2a062e45c20c45b401079b5d97c3a399662045e95e06b8a61a SHA512 8e0ded1c21992f14803d6e4ab1586ad8524ae5d78920919f34f64f82c28eb45e40de11a9c9851fcad0d8bd0b8587f8ff498cf34f11f2a744ad94ba33a0ed129e WHIRLPOOL c534cefec21c4737a29e5a840b77c18df2b2af65c4ed5c39953abd20846588164503b784d3a5d0fbefb4ef82a0aaaa46bd04968b6c61be8e71f6fa9bb9310b64
+MISC ChangeLog 1451 SHA256 a50160030ad05694a71812006c3fa4016295c75ac8b876acf4c8bd75a9109a67 SHA512 78468b6622fa550eff5f4865df755b85fc83524936a92678555cd42271d7e0961a52ef6b56818465793f8b57fd768c82c4622649476c9fc6edd89eba4415bf98 WHIRLPOOL 2a2b8d61c848184377612627282738b9d63fe3a8046b8dff61fe8c3888f48dd550a80e993a137bf161b777935d05c9d4a9e89ec82cf9e4ec2c07e79418317396
+MISC metadata.xml 445 SHA256 00cd4d82a3a02cc4a2ac6dc347b57713f3772635f9be6987d05bb024ad9f3b72 SHA512 2793492437598485f4fc5542e3bc22e38ed5c9d598c1964cb952ce3ca89b796d126d482210b35f7d1d4e52d8c0cbf639df3652343d0f57036656ee70ceba29e1 WHIRLPOOL a072d60953083f1c24dca44c988104a86664b8380810ea63990494dd1decb2dd993ffadbc28159c2194c8e84841082946c0c593ea0e67ec823790bfdcf6a208c
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;
diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
index ca2754851..463a23b1e 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"