aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-doc/root-docs/ChangeLog12
-rw-r--r--app-doc/root-docs/files/root-docs-6.00.01-cernbuild.patch16
-rw-r--r--app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch4
-rw-r--r--app-doc/root-docs/root-docs-6.00.01-r1.ebuild (renamed from app-doc/root-docs/root-docs-6.00.01.ebuild)3
l---------app-doc/root-docs/root-docs-9999.ebuild2
5 files changed, 15 insertions, 22 deletions
diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 0589d994c..2ccae6d13 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,18 @@
# 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-6.00.01-r1 (02 Jul 2014)
+
+ 02 Jul 2014; Andrew Savchenko <bircoph@gmail.com> -root-docs-6.00.01.ebuild,
+ +root-docs-6.00.01-r1.ebuild, root-docs-9999.ebuild,
+ -files/root-docs-6.00.01-cernbuild.patch,
+ files/root-docs-6.00.01-makehtml.patch:
+ Remove unneeded cernbuild patch since
+ https://sft.its.cern.ch/jira/browse/ROOT-6421
+ is fixed in sci-physics/root now.
+ Also remove unneeded #include for library load from makehtml.sh
+ patch. Now docs seems to be equivalent to those on root.cern.ch
+
*root-docs-6.00.01 (29 Jun 2014)
29 Jun 2014; Andrew Savchenko <bircoph@gmail.com> +root-docs-6.00.01.ebuild,
diff --git a/app-doc/root-docs/files/root-docs-6.00.01-cernbuild.patch b/app-doc/root-docs/files/root-docs-6.00.01-cernbuild.patch
deleted file mode 100644
index b155795c9..000000000
--- a/app-doc/root-docs/files/root-docs-6.00.01-cernbuild.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/tutorials/tree/cernbuild.C b/tutorials/tree/cernbuild.C
-index ba516b6..793ecb5 100644
---- a/tutorials/tree/cernbuild.C
-+++ b/tutorials/tree/cernbuild.C
-@@ -2,6 +2,11 @@
- // see also a variant in staff.C
- // Author: Rene Brun
-
-+#include "TFile.h"
-+#include "TSystem.h"
-+#include "TString.h"
-+#include "TTree.h"
-+
- TFile *cernbuild(Int_t get=0, Int_t print=1) {
-
- Int_t Category;
diff --git a/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch b/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch
index 8ad9b888f..613468629 100644
--- a/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch
+++ b/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch
@@ -44,14 +44,12 @@ index a94e790..8b4589d 100755
fi
cd $dir
-@@ -20,7 +20,9 @@ echo ""
+@@ -20,7 +20,7 @@ echo ""
# To generate the full documentation, we do need to
# use the graphics engine, so do not use '-b'.
-$ROOT -n -l <<makedoc
+$ROOT -n -l <<makedoc || exit 1
-+ #include "THtml.h"
-+ gSystem->Load("libHtml");
THtml h;
h.LoadAllLibs();
h.MakeAll();
diff --git a/app-doc/root-docs/root-docs-6.00.01.ebuild b/app-doc/root-docs/root-docs-6.00.01-r1.ebuild
index bb17e86a4..a0cb7b29e 100644
--- a/app-doc/root-docs/root-docs-6.00.01.ebuild
+++ b/app-doc/root-docs/root-docs-6.00.01-r1.ebuild
@@ -61,8 +61,7 @@ src_unpack() {
src_prepare() {
use api && epatch \
- "${FILESDIR}/${PN}-6.00.01-makehtml.patch" \
- "${FILESDIR}/${PN}-6.00.01-cernbuild.patch"
+ "${FILESDIR}/${PN}-6.00.01-makehtml.patch"
# prefixify the configure script
sed -i \
-e "s:/usr:${EPREFIX}/usr:g" \
diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
index 32ba358c8..0ee27bf30 120000
--- a/app-doc/root-docs/root-docs-9999.ebuild
+++ b/app-doc/root-docs/root-docs-9999.ebuild
@@ -1 +1 @@
-root-docs-6.00.01.ebuild \ No newline at end of file
+root-docs-6.00.01-r1.ebuild \ No newline at end of file