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

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

commit:     bbc44bbf34362d51d8e9b6626c36c3cf73049ddb
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Apr  8 02:24:39 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Apr  8 02:24:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=bbc44bbf

app-doc/root-docs: version bump

 app-doc/root-docs/ChangeLog                        |  9 +++++++
 .../files/root-docs-6.00.01-fillpatterns.patch     | 30 ----------------------
 .../root-docs/files/root-docs-6.02.05-jsroot.patch | 11 ++++++++
 ...ocs-6.00.02.ebuild => root-docs-6.02.05.ebuild} | 20 ++++++++-------
 app-doc/root-docs/root-docs-9999.ebuild            |  2 +-
 5 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 355d052..09e5506 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2015 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.02.05 (08 Apr 2015)
+
+  08 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -root-docs-6.00.02.ebuild,
+  +root-docs-6.02.05.ebuild, root-docs-9999.ebuild,
+  -files/root-docs-6.00.01-fillpatterns.patch,
+  +files/root-docs-6.02.05-jsroot.patch:
+  Version bump for evaluation and testing.
+  Remove old.
+
   03 Mar 2015; Andrew Savchenko <bircoph@gentoo.org> -root-docs-5.34.26.ebuild:
   5.34.26 is now in the portage tree
 

diff --git a/app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch b/app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch
deleted file mode 100644
index e48a4f7..0000000
--- a/app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/core/base/doc/macros/fillpatterns.C b/core/base/doc/macros/fillpatterns.C
-index b0a5132..fca81c8 100644
---- a/core/base/doc/macros/fillpatterns.C
-+++ b/core/base/doc/macros/fillpatterns.C
-@@ -20,11 +20,11 @@ TCanvas * fillpatterns()
- 
-    // Fixed patterns.
-    for (i=1; i<=5; i++) {
--      box(j++, 0.01, y-bh, 0.19, y);
--      box(j++, 0.21, y-bh, 0.39, y);
--      box(j++, 0.41, y-bh, 0.59, y);
--      box(j++, 0.61, y-bh, 0.79, y);
--      box(j++, 0.81, y-bh, 0.99, y);
-+      box(j, 0.01, y-bh, 0.19, y); j++;
-+      box(j, 0.21, y-bh, 0.39, y); j++;
-+      box(j, 0.41, y-bh, 0.59, y); j++;
-+      box(j, 0.61, y-bh, 0.79, y); j++;
-+      box(j, 0.81, y-bh, 0.99, y); j++;
-       y = y-bh-db;
-    }
- 
-@@ -55,7 +55,7 @@ TCanvas * fillpatterns()
-    return Pat;
- }
- 
--box(Int_t pat, Double_t x1, Double_t y1, Double_t x2, Double_t  y2)
-+void box(Int_t pat, Double_t x1, Double_t y1, Double_t x2, Double_t  y2)
- {
-    // Draw an box using the fill pattern "pat" with the "pat" value
-    // written on top.

diff --git a/app-doc/root-docs/files/root-docs-6.02.05-jsroot.patch b/app-doc/root-docs/files/root-docs-6.02.05-jsroot.patch
new file mode 100644
index 0000000..1ea170e
--- /dev/null
+++ b/app-doc/root-docs/files/root-docs-6.02.05-jsroot.patch
@@ -0,0 +1,11 @@
+--- root-6.02.05/documentation/JSROOT/JSROOT.md.orig	2015-02-09 11:59:47.000000000 +0300
++++ root-6.02.05/documentation/JSROOT/JSROOT.md	2015-04-05 19:13:24.010358387 +0300
+@@ -198,7 +198,7 @@
+        <div id="drawing">loading...</div>
+     </body>
+ 
+-Internally, the JSROOT.loadScript(urllist, callback, debug) method is used. It can be useful when some other scripts should be loaded as well. __urllist__ is a string with scripts names, separated by ';' symbol. If a script name starts with __$$$__ (triple dollar sign), the script will be loaded from a location relative to the main JSROOT directory. 
++Internally, the JSROOT.loadScript(urllist, callback, debug) method is used. It can be useful when some other scripts should be loaded as well. __urllist__ is a string with scripts names, separated by ';' symbol. If a script name starts with __\$\$\$__ (triple dollar sign), the script will be loaded from a location relative to the main JSROOT directory. 
+ This location is automatically detected when JSRootCore.js script is loaded.
+ 
+ 

diff --git a/app-doc/root-docs/root-docs-6.00.02.ebuild b/app-doc/root-docs/root-docs-6.02.05.ebuild
similarity index 90%
rename from app-doc/root-docs/root-docs-6.00.02.ebuild
rename to app-doc/root-docs/root-docs-6.02.05.ebuild
index 096e0fe..fbc5aa2 100644
--- a/app-doc/root-docs/root-docs-6.00.02.ebuild
+++ b/app-doc/root-docs/root-docs-6.02.05.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.28.ebuild,v 1.1 2015/03/25 21:39:33 bircoph Exp $
 
 EAPI=5
 
@@ -13,11 +13,10 @@ 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}"
+	S="${WORKDIR}/${ROOT_PN}-${PV}"
 fi
 
 inherit eutils multilib virtualx
@@ -40,7 +39,7 @@ IUSE="api +math +metric http"
 VIRTUALX_REQUIRED="api"
 
 DEPEND="
-	~sci-physics/root-${PV}[X,graphviz,opengl]
+	~sci-physics/root-${PV}[X,graphviz,opengl,tiff]
 	app-text/pandoc
 	app-text/texlive
 	dev-haskell/pandoc-citeproc[bibutils]
@@ -60,9 +59,10 @@ src_unpack() {
 }
 
 src_prepare() {
-	use api && epatch \
+	epatch \
 		"${FILESDIR}/${PN}-6.00.01-makehtml.patch" \
-		"${FILESDIR}/${PN}-6.00.01-fillpatterns.patch"
+		"${FILESDIR}/${PN}-6.02.05-jsroot.patch"
+
 	# prefixify the configure script
 	sed -i \
 		-e "s:/usr:${EPREFIX}/usr:g" \
@@ -90,8 +90,9 @@ src_compile() {
 	local pdf_size=pdfa4
 	use metric || pdf_size=pdfletter
 	use math && pdf_target+=( minuit2 spectrum )
-	use http && pdf_target+=( HttpServer )
+	use http && pdf_target+=( HttpServer JSROOT )
 
+	local i
 	for (( i=0; i<${#pdf_target[@]}; i++ )); do
 		emake -C documentation/"${pdf_target[i]}" "${pdf_size}"
 	done
@@ -105,13 +106,14 @@ src_compile() {
 		# 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"
+		[[ -f htmldoc/WindowAttributes_t.html ]] || die "html doc generation crashed"
 	fi
 }
 
 src_install() {
 	insinto "${DOC_DIR}"
 
+	local i
 	for (( i=0; i<${#pdf_target[@]}; i++ )); do
 		doins documentation/"${pdf_target[i]}"/*.pdf
 	done

diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
index 3c99658..d603111 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.02.ebuild
\ No newline at end of file
+root-docs-6.02.05.ebuild
\ No newline at end of file