diff options
Diffstat (limited to 'app-doc/root-docs')
| -rw-r--r-- | app-doc/root-docs/ChangeLog | 9 | ||||
| -rw-r--r-- | app-doc/root-docs/Manifest | 2 | ||||
| -rw-r--r-- | app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch | 30 | ||||
| -rw-r--r-- | app-doc/root-docs/files/root-docs-6.02.05-jsroot.patch | 11 | ||||
| -rw-r--r-- | app-doc/root-docs/root-docs-6.02.05.ebuild (renamed from app-doc/root-docs/root-docs-6.00.02.ebuild) | 20 | ||||
| l--------- | app-doc/root-docs/root-docs-9999.ebuild | 2 |
6 files changed, 33 insertions, 41 deletions
diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog index 355d05234..09e550636 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/Manifest b/app-doc/root-docs/Manifest index 6eeee264c..d6492f909 100644 --- a/app-doc/root-docs/Manifest +++ b/app-doc/root-docs/Manifest @@ -3,4 +3,4 @@ DIST TMVAUsersGuide-v4.2.0.pdf 4099493 SHA256 b61614d14289a20f5fa429f79e474e596c DIST info.png 2060 SHA256 51de6661250f3fb71c6c8250cbc4bdc4dc4283cc90240b4dc1ee6168e8d40279 SHA512 81a730eefbe7a7e15d5840491402c7644bf7ed5d5f8f3830ed9457b343cc7882480e993ea84aef93500742cd0fe8469859cd2c925e5582b91ef56406804ae276 WHIRLPOOL 02ea6daf9e3d21947ebf5dd01c455a13f2fcbf9981be34a150056a3510122ca49e3d137d4f242c7218d4d06ace09566d513a04f09071723ac244f5a38e982bac DIST roofit_quickstart_3.00.pdf 501576 SHA256 65aaf9e0c88352e265fd55b97a2503a9ee4a51d3219daff69c6f7f6427fe22cf SHA512 e8e1bd3bb3ead0ae3883512d7ff297651b99937fd5df0b61cf559ea5dd6cfbda35dfd8ebc953ed11a12f471849f6e95e05869b58a1e433ea6e5d1d1aa08bbb93 WHIRLPOOL a58b221272e3b2775639bf934f63cd06919105871ad736a84e18e6f3949a579301d1c6d69df39576dcc11867aa27274f5c78f36146a929698437b1a0c310aebe DIST root6-banner.jpg 32319 SHA256 9d6d226bbe61db257a1796a3ad04dfe97b3bb500a29349ff76bf6a929ed1e104 SHA512 f01dd253f24d59c374042efd239ce023e5ca82d3d617ca6763daf9720b169c4fb27a0f4573ea95d807f0e12095924606372df4940f65ce7d859164314d22b9af WHIRLPOOL 69976abe240235a4f4eb25d61a0ceb183dc5ad5f9e57e9130ae10615329dd23125848f45608e1ad2d65a286d1f191f95336316f7c8f1cc052d396c31433cbe4c -DIST root_v6.00.02.source.tar.gz 97811067 SHA256 db92818781f842c33b8b583f1f9be02b51cedbf5f2943df986cbbd0c0006a06f SHA512 bd72eb43d2a4ace27738ba2dc509f6d81ec3555e59454426d28c2c5522b4b19d2678ed515b84efaf953146c1f50c65e304532456d76076d03598bda67c69e8a5 WHIRLPOOL 12b87e9b1612ea3625f7ea0970b733887051b5173b728b5f13a032eb103eeda22de8a4c18417e02a92fe02f29b9acd9114fa1420fac42bea31bde07c7a0ce697 +DIST root_v6.02.05.source.tar.gz 99121880 SHA256 7a5d4af171ba3b8a736c462b2041f8f35bd4c1d3b6a22c32a3ebd3ffe144ae60 SHA512 b30bc4aafe294ee069ee4c884ff70c983539a48eda586cd1938d00d4688f10e94a435640965b89c6d100fdd998453a4c1ae2109d5f1427f23865a868c561d684 WHIRLPOOL de363835fa00ffa0ff6e596b3c92b59ed59378bac3a344c066f7603d6104058203f76181d4c15478fd9066aedbe6a514257d5796feedb2d5d0d789b263e92955 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 e48a4f775..000000000 --- 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 000000000..1ea170e84 --- /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 index 096e0fe96..fbc5aa207 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 3c9965814..d60311158 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 |