[gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/

2018-07-06 Thread Justin Bronder 
commit: 854e59ed4c4d28e6e165da84022274fb7675d401
Author: Justin Bronder  gentoo  org>
AuthorDate: Fri Jul  6 14:06:24 2018 +
Commit: Justin Bronder  gentoo  org>
CommitDate: Fri Jul  6 14:06:24 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=854e59ed

sci-physics/root: in main tree

Removal per https://bugs.gentoo.org/573264

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --force

 sci-physics/root/files/proofd.confd|  12 -
 sci-physics/root/files/proofd.initd|  25 --
 .../root/files/root-5.28.00b-glibc212.patch|  11 -
 sci-physics/root/files/root-5.32.00-afs.patch  |  33 --
 sci-physics/root/files/root-5.32.00-cfitsio.patch  |  13 -
 sci-physics/root/files/root-5.32.00-chklib64.patch |  24 --
 sci-physics/root/files/root-5.34.13-unuran.patch   |  40 --
 sci-physics/root/files/root-6.00.01-dotfont.patch  |  58 ---
 sci-physics/root/files/root-6.00.01-llvm.patch |  13 -
 .../root/files/root-6.06.00-nobyte-compile.patch   |  39 --
 sci-physics/root/files/rootd.confd |   8 -
 sci-physics/root/files/rootd.initd |  27 --
 sci-physics/root/metadata.xml  |  29 --
 sci-physics/root/root-.ebuild  | 444 -
 14 files changed, 776 deletions(-)

diff --git a/sci-physics/root/files/proofd.confd 
b/sci-physics/root/files/proofd.confd
deleted file mode 100644
index 81720a7eb..0
--- a/sci-physics/root/files/proofd.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# conf.d file for proof daemon
-#
-# Please refer to the proofd(1) man(1) page for more information on 
-# command line parameters. 
-#
-PROOFD_OPTS=
-
-# Specify your base of your PROOF directory here.  If left blank, it
-# will use the system default (e.g., /usr/share/root/proof). 
-# Note, however, that ROOT recommends that this directory is shared (via
-# NFS or similar) among all the nodes of the cluster.
-PROOF_DIR=

diff --git a/sci-physics/root/files/proofd.initd 
b/sci-physics/root/files/proofd.initd
deleted file mode 100644
index b0839466b..0
--- a/sci-physics/root/files/proofd.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-need root-file-server
-use logger
-}
-
-start() {
-ebegin "Starting parallel ROOT facility server"
-start-stop-daemon --start --quiet \
-   --pidfile /var/run/proofd.pid \
-   --exec /usr/bin/proofd -- ${PROOFD_OPTS} ${PROOF_DIR}
-pidof /usr/bin/proofd > /var/run/proofd.pid
-eend $?
-}
-
-stop() {
-ebegin "Stopping parallel ROOT facility server"
-start-stop-daemon --stop --quiet \
-   --pidfile /var/run/proofd.pid \
-   --exec /usr/bin/proofd
-eend $?
-}

diff --git a/sci-physics/root/files/root-5.28.00b-glibc212.patch 
b/sci-physics/root/files/root-5.28.00b-glibc212.patch
deleted file mode 100644
index a36543139..0
--- a/sci-physics/root/files/root-5.28.00b-glibc212.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 root.orig/net/auth/src/TAFS.cxx2010-09-14 03:22:22.647915854 +0400
-+++ root/net/auth/src/TAFS.cxx 2010-09-14 03:22:39.034599899 +0400
-@@ -11,6 +11,7 @@
- 
- #ifndef WIN32
- #   include 
-+#   include 
- #else
- #   define ssize_t int
- #   include 
-

diff --git a/sci-physics/root/files/root-5.32.00-afs.patch 
b/sci-physics/root/files/root-5.32.00-afs.patch
deleted file mode 100644
index 2bf31798e..0
--- a/sci-physics/root/files/root-5.32.00-afs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
 root/net/auth/src/TAFS.cxx.orig2011-12-04 00:56:29.405007770 +0400
-+++ root/net/auth/src/TAFS.cxx 2011-12-04 00:56:35.534709259 +0400
-@@ -138,7 +138,7 @@
-   } else {
-  if (isatty(0) != 0 && isatty(1) != 0) {
- Gl_config("noecho", 1);
--pw = Getline((char *) prompt.Data());
-+pw = const_cast( Getline((char *) prompt.Data()) );
- Gl_config("noecho", 0);
-  } else {
- Warning("TAFS", "not tty: cannot prompt for passwd: failure");
 root/core/clib/src/strlcat.c.orig  2011-12-04 01:49:26.495179487 +0400
-+++ root/core/clib/src/strlcat.c   2011-12-04 01:50:41.407524763 +0400
-@@ -38,7 +38,7 @@
-  * Returns strlen(src) + MIN(siz, strlen(initial dst)).
-  * If retval >= siz, truncation occurred.
-  */
--size_t
-+size_t __attribute__((weak))
- strlcat(char *dst, const char *src, size_t siz)
- {
- register char *d = dst;
 root/core/clib/src/strlcpy.c.orig  2011-12-04 01:49:34.329797251 +0400
-+++ root/core/clib/src/strlcpy.c   2011-12-04 01:50:49.051151843 +0400
-@@ -36,7 +36,7 @@
-  * will be copied.  Always NUL terminates (unless siz == 0).
-  * Returns strlen(src); if retval >= siz, truncation occurred.
-  */
--size_t
-+size_t __attribute__((weak))
- strlcpy(char *dst, const char *src, size_t siz)
- {
- register char *d = dst;

diff

[gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/

2015-10-01 Thread Justin Lecher 
commit: bc44947211bd480f0d44e86a2a77761ee8b6ae83
Author: Oliver Freyermuth  googlemail  com>
AuthorDate: Sun Sep 27 19:36:35 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Sep 27 19:36:35 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=bc449472

sci-physics/root:
Remove geocad-patch, is now upstream.

Package-Manager: portage-2.2.22

 sci-physics/root/ChangeLog   |  4 
 sci-physics/root/files/root-6.00.01-geocad.patch | 15 ---
 sci-physics/root/root-.ebuild|  3 +--
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 77f4c1f..accb1de 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  27 Sep 2015; Oliver Freyermuth 
+  -files/root-6.00.01-geocad.patch, root-.ebuild:
+  sci-physics/root:  Remove geocad-patch, is now upstream.
+
   27 Sep 2015; Oliver Freyermuth  
root-.ebuild:
   sci-physics/root: Drop desktop-patch (upstreamed), 
   add http-useflag enabling THttpServer.

diff --git a/sci-physics/root/files/root-6.00.01-geocad.patch 
b/sci-physics/root/files/root-6.00.01-geocad.patch
deleted file mode 100644
index 2742a74..000
--- a/sci-physics/root/files/root-6.00.01-geocad.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/geom/geocad/inc/TGeoToOCC.h b/geom/geocad/inc/TGeoToOCC.h
-index 892f225..86eb9e1 100644
 a/geom/geocad/inc/TGeoToOCC.h
-+++ b/geom/geocad/inc/TGeoToOCC.h
-@@ -13,8 +13,10 @@
- #define ROOT_TGeoToOCC
- 
- //Cascade
-+#define Printf Printf_opencascade
- #include 
- #include 
-+#undef Printf
- 
- //Root
- #ifndef ROOT_TGeoXtru

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index 3ff5618..1b3ed72 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -197,8 +197,7 @@ src_prepare() {
"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
-   "${FILESDIR}"/${PN}-6.00.01-llvm.patch \
-   "${FILESDIR}"/${PN}-6.00.01-geocad.patch
+   "${FILESDIR}"/${PN}-6.00.01-llvm.patch
 
# make sure we use system libs and headers
rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die

[gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/

2015-07-18 Thread Andrew Savchenko 
commit: b8acd551791321d70d92b21eabf4a28a2ed6dd3d
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Sat Jul 18 13:49:10 2015 +
Commit: Andrew Savchenko bircoph AT gentoo DOT org
CommitDate: Sat Jul 18 13:49:10 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b8acd551

sci-physics/root-5.34.32 is moved to the main tree now

 sci-physics/root/ChangeLog |   4 +
 sci-physics/root/files/root-5.32.00-dotfont.patch  |  58 ---
 .../root/files/root-5.34.05-nobyte-compile.patch   | 137 ---
 sci-physics/root/files/root-5.34.26-ldflags.patch  |  19 -
 sci-physics/root/metadata.xml  |   7 -
 sci-physics/root/root-5.34.32.ebuild   | 437 -
 6 files changed, 4 insertions(+), 658 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 61a91bd..f217c40 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 
2012/03/29 18:21:49 bicatali Exp $
 
+  18 Jul 2015; Andrew Savchenko birc...@gentoo.org -root-5.34.32.ebuild,
+  -files/root-5.32.00-dotfont.patch, -files/root-5.34.05-nobyte-compile.patch,
+  -files/root-5.34.26-ldflags.patch, metadata.xml:
+
   18 Jul 2015; Andrew Savchenko birc...@gentoo.org root-5.34.32.ebuild:
   Do not use usex for postgres to avoid pg_config unconditional sourcing. See
   bug 555246.

diff --git a/sci-physics/root/files/root-5.32.00-dotfont.patch 
b/sci-physics/root/files/root-5.32.00-dotfont.patch
deleted file mode 100644
index 85d6dea..000
--- a/sci-physics/root/files/root-5.32.00-dotfont.patch
+++ /dev/null
@@ -1,58 +0,0 @@
 root/html/src/TClassDocOutput.cxx.orig 2012-05-25 16:18:10.0 
+0400
-+++ root/html/src/TClassDocOutput.cxx  2012-05-29 21:36:53.813593012 +0400
-@@ -625,7 +625,7 @@
-size=\8,10\;  endl
-ratio=auto;  endl
-margin=0;  endl
--   node [shape=plaintext,fontsize=40,width=4,height=0.75];  endl
-+   node 
[shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\DejaVu Serif\]; 
 endl
-\  fCurrentClass-GetName()  \ [shape=ellipse];  endl;
- 
-std::stringstream ssDep;
-@@ -704,7 +704,7 @@
- outdot  ;  endl;
-  } else if (writeAndMoreFor) {
-outdot\...andmore  writeAndMoreFor-GetName()
--   \ [label=\...and 
more\,fontname=\Times-Italic\,fillcolor=lightgrey,style=filled];  endl;
-+   \ [label=\...and more\,fontname=\DejaVu Serif 
Italic\,fillcolor=lightgrey,style=filled];  endl;
-  }
-   }
-   if (!levelExists) break;
-@@ -733,7 +733,7 @@
-ranksep=0.1;  endl
-nodesep=0;  endl
-margin=0;  endl;
--   outdotnode 
[style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];
  endl;
-+   outdotnode 
[style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\DejaVu
 Serif\];  endl;
- 
-std::stringstream ssDep;
-const int numColumns = 3;
-@@ -939,7 +939,7 @@
-ranksep=0;  endl
-nodesep=0;  endl
-size=\8,10\;  endl
--   node [fontsize=20,shape=plaintext];  endl;
-+   node [fontsize=20,shape=plaintext,fontname=\DejaVu Serif\];  
endl;
- 
-for (std::liststd::string::iterator iFile = listFilesToParse.begin();
-   iFile != listFilesToParse.end(); ++iFile) {
-@@ -999,7 +999,8 @@
-ranksep=0.7;  endl
-nodesep=0.3;  endl
-size=\8,8\;  endl
--   ratio=compress;  endl;
-+   ratio=compress;  endl
-+   node [fontname=\DejaVu Serif\];  endl;
- 
-TString libs(fCurrentClass-GetSharedLibs());
-outdot  \All Libraries\ 
[URL=\LibraryDependencies.html\,shape=box,rank=max,fillcolor=lightgray,style=filled];
  endl;
-@@ -1109,7 +1110,8 @@
- 
-dotout  digraph G {  endl
-ratio=auto;  endl
--   rankdir=RL;  endl;
-+   rankdir=RL;  endl
-+   node [fontname=\DejaVu Serif\];  endl;
- 
-// loop on all classes
-TClassDocInfo* cdi = 0;

diff --git a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch 
b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
deleted file mode 100644
index ec67a15..000
--- a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Naur root.as-needed/Makefile root/Makefile
 a/Makefile.orig2013-02-15 02:27:56.0 +0400
-+++ b/Makefile 2013-02-23 02:22:14.556465852 +0400
-@@ -1258,10 +1258,7 @@
-  for lib in $(RFLX_GRFLXPY); do \
- rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \
-  done; \
-- for lib in $(RFLX_GRFLXPYC); do \
--rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \
-- done; \
-- if test x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC) != x; then \
-+ if test

[gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/

2015-04-12 Thread Andrew Savchenko 
commit: a10464578b87f8847a60df6c1aced2690de9fa0b
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Sun Apr 12 13:54:53 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Sun Apr 12 13:54:53 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a1046457

fix issue #238

Regenerate PCH headers for Gentoo include files layout and remove
extra $PORTAGE_TMPDIR from /etc.

 sci-physics/root/ChangeLog |  7 +
 sci-physics/root/files/root-6.02.05-dictpch.patch  | 31 ++
 ...ot-6.02.05-r1.ebuild = root-6.02.05-r2.ebuild} | 18 +
 3 files changed, 56 insertions(+)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index b1b0b0a..4fc73e8 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 
2012/03/29 18:21:49 bicatali Exp $
 
+*root-6.02.05-r2 (12 Apr 2015)
+
+  12 Apr 2015; Andrew Savchenko birc...@gentoo.org -root-6.02.05-r1.ebuild,
+  +root-6.02.05-r2.ebuild, +files/root-6.02.05-dictpch.patch:
+  Regenerate PCH headers for Gentoo include files layout and remove
+  extra $PORTAGE_TMPDIR from /etc (github issue #238).
+
 *root-6.02.05-r1 (11 Apr 2015)
 
   11 Apr 2015; Andrew Savchenko birc...@gentoo.org -root-6.02.05.ebuild,

diff --git a/sci-physics/root/files/root-6.02.05-dictpch.patch 
b/sci-physics/root/files/root-6.02.05-dictpch.patch
new file mode 100644
index 000..80a416e
--- /dev/null
+++ b/sci-physics/root/files/root-6.02.05-dictpch.patch
@@ -0,0 +1,31 @@
+--- etc/dictpch/makepch-gentoo.sh.orig 2015-04-08 14:27:07.781026830 +0300
 etc/dictpch/makepch-gentoo.sh  2015-04-12 13:40:48.226060739 +0300
+@@ -13,8 +13,8 @@
+ # Copyright (c) 2014 Rene Brun and Fons Rademakers
+ # Author: Axel Naumann a...@cern.ch, 2014-10-16
+ 
+-rootdir=.
+-cfgdir=etc/dictpch
++rootdir=ROOTDIR_TEMPLATE
++cfgdir=etc/root/dictpch
+ allheaders=$cfgdir/allHeaders.h
+ alllinkdefs=$cfgdir/allLinkDefs.h
+ cppflags=$cfgdir/allCppflags.txt
+@@ -36,7 +36,7 @@
+ rootbuild=-rootbuild
+ fi
+ 
+-cxxflags=-D__CLING__ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS 
-DROOT_PCH -I$rootdir/include -I$rootdir/etc -I$rootdir/$cfgdir 
-I$rootdir/etc/cling `cat $rootdir/$cppflags`
++cxxflags=-D__CLING__ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS 
-DROOT_PCH -I$rootdir/usr/include/root -I$rootdir/etc/root -I$rootdir/$cfgdir 
-I$rootdir/etc/root/cling `cat $rootdir/$cppflags`
+ 
+ if ! [ x$1 = x ]; then
+ cxxflags=$cxxflags $1
+@@ -44,7 +44,7 @@
+ 
+ # generate pch
+ touch allDict.cxx.h
+-$rootdir/bin/rootcling $rootbuild -1 -f allDict.cxx -noDictSelection -c 
$cxxflags $allheaders $@ $alllinkdefs
++$rootdir/usr/bin/rootcling -1 -f allDict.cxx -noDictSelection -c $cxxflags 
$allheaders $@ $alllinkdefs
+ res=$?
+ if [ $res -eq 0 ] ; then
+   mv allDict_rdict.pch $pch

diff --git a/sci-physics/root/root-6.02.05-r1.ebuild 
b/sci-physics/root/root-6.02.05-r2.ebuild
similarity index 93%
rename from sci-physics/root/root-6.02.05-r1.ebuild
rename to sci-physics/root/root-6.02.05-r2.ebuild
index 2d7388b..9069f3a 100644
--- a/sci-physics/root/root-6.02.05-r1.ebuild
+++ b/sci-physics/root/root-6.02.05-r2.ebuild
@@ -207,6 +207,13 @@ pkg_setup() {
 }
 
 src_prepare() {
+   # Second version of makepch is required in order to generate
+   # PCH file appropriate for Gentoo include headers layout.
+   # This can be done only at install stage, when files are placed
+   # as appropriate. Premature modification of makepch.sh will
+   # broke build process, however.
+   cp etc/dictpch/makepch.sh etc/dictpch/makepch-gentoo.sh || die
+
epatch \
${FILESDIR}/${PN}-5.28.00b-glibc212.patch \
${FILESDIR}/${PN}-5.32.00-afs.patch \
@@ -219,6 +226,7 @@ src_prepare() {
${FILESDIR}/${PN}-6.00.01-llvm.patch \
${FILESDIR}/${PN}-6.00.01-nobyte-compile.patch \
${FILESDIR}/${PN}-6.00.01-prop-flags.patch \
+   ${FILESDIR}/${PN}-6.02.05-dictpch.patch \
${FILESDIR}/${PN}-6.02.05-xrootd4.patch
 
# make sure we use system libs and headers
@@ -410,6 +418,16 @@ cleanup_install() {
mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
rm ${DOC_DIR#/}/{INSTALL,LICENSE} || die
use examples || rm -r ${DOC_DIR#/}/examples || die
+
+   # clean hardcoded sandbox paths
+   rm etc/root/dictpch/allCppflags.txt.tmp || die
+   sed -i s|${S}/|| etc/root/cling/llvm/Config/llvm-config.h || die
+   # regenerate pch for Gentoo headers layout
+   rm etc/root/allDict.cxx.pch || die
+   sed -i 's|etc/dictpch|etc/root/dictpch|' etc/root/dictpch/allLinkDefs.h 
|| die
+   sed -i 's|etc/cling|etc/root/cling|' etc/root/dictpch/allHeaders.h || 
die
+   sed -i s|ROOTDIR_TEMPLATE|${ED}|

[gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/

2015-04-07 Thread Andrew Savchenko 
commit: 12927c96d1a128d55ac21a00cb3595945a17b65b
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Wed Apr  8 02:24:03 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Wed Apr  8 02:24:03 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=12927c96

sci-physics/root: version bump

 sci-physics/root/ChangeLog |   9 ++
 .../root/files/root-6.00.01-tutorials-path.patch   |  39 -
 sci-physics/root/files/root-6.00.02-tm_zone.patch  |  22 ---
 sci-physics/root/files/root-6.02.05-xrootd4.patch  |  11 ++
 sci-physics/root/metadata.xml  |   4 +
 .../{root-6.00.02.ebuild = root-6.02.05.ebuild}   | 171 -
 6 files changed, 126 insertions(+), 130 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index d1fdd9d..a4087b4 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 
2012/03/29 18:21:49 bicatali Exp $
 
+*root-6.02.05 (08 Apr 2015)
+
+  08 Apr 2015; Andrew Savchenko birc...@gentoo.org -root-6.00.02.ebuild,
+  +root-6.02.05.ebuild, -files/root-6.00.01-tutorials-path.patch,
+  -files/root-6.00.02-tm_zone.patch, +files/root-6.02.05-xrootd4.patch,
+  metadata.xml:
+  Version bump for testing and evaluation, add new flags.
+  Remove old.
+
   03 Mar 2015; Andrew Savchenko birc...@gentoo.org -root-5.34.26.ebuild,
   -files/root-5.32.00-dotfont.patch, -files/root-5.34.05-nobyte-compile.patch,
   metadata.xml:

diff --git a/sci-physics/root/files/root-6.00.01-tutorials-path.patch 
b/sci-physics/root/files/root-6.00.01-tutorials-path.patch
deleted file mode 100644
index cb68615..000
--- a/sci-physics/root/files/root-6.00.01-tutorials-path.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/config/RConfigure.in b/config/RConfigure.in
-index 5950401..e4fbfbf 100644
 a/config/RConfigure.in
-+++ b/config/RConfigure.in
-@@ -11,6 +11,7 @@
- #define ROOTDATADIR   @datadir@
- #define ROOTDOCDIR@docdir@
- #define ROOTMACRODIR  @macrodir@
-+#define ROOTTUTDIR@tutdir@
- #define ROOTSRCDIR@srcdir@
- #define ROOTICONPATH  @iconpath@
- #define EXTRAICONPATH @extraiconpath@
-diff --git a/configure b/configure
-index 131df92..2c8ea95 100755
 a/configure
-+++ b/configure
-@@ -7537,6 +7537,7 @@ sed \
- -e s|@prefix@|$prefix|   \
- -e s|@srcdir@|$srcdir|   \
- -e s|@ttffontdir@|$fontdir|  \
-+-e s|@tutdir@|$tutdir|   \
- -e s|@setresuid@|$setresuid| \
- -e s|@hasmathmore@|$hasmathmore| \
- -e s|@haspthread@|$haspthread|   \
-diff --git a/core/base/src/TApplication.cxx b/core/base/src/TApplication.cxx
-index 1c1809a..7d7ed37 100644
 a/core/base/src/TApplication.cxx
-+++ b/core/base/src/TApplication.cxx
-@@ -866,8 +866,8 @@ Long_t TApplication::ProcessLine(const char *line, Bool_t 
sync, Int_t *err)
-  Error(ProcessLine, Cannot show demos in batch mode!);
-  return 1;
-   }
--#ifdef ROOTDOCDIR
--  ProcessLine(.x  ROOTDOCDIR /tutorials/demos.C);
-+#ifdef ROOTTUTDIR
-+  ProcessLine(.x  ROOTTUTDIR /demos.C);
- #else
-   ProcessLine(.x $(ROOTSYS)/tutorials/demos.C);
- #endif

diff --git a/sci-physics/root/files/root-6.00.02-tm_zone.patch 
b/sci-physics/root/files/root-6.00.02-tm_zone.patch
deleted file mode 100644
index cdd1b13..000
--- a/sci-physics/root/files/root-6.00.02-tm_zone.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 08b08412bafc24fa635b0fdb832097a3aa2fa1d2 Mon Sep 17 00:00:00 2001
-From: Pere Mato pere.m...@cern.ch
-Date: Sun, 21 Sep 2014 19:27:30 +0200
-Subject: [PATCH] Fix for ROOT-6728 - Compilation error in TTimeStamp
-

- core/base/src/TTimeStamp.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/base/src/TTimeStamp.cxx b/core/base/src/TTimeStamp.cxx
-index 8709220..f0ff12d 100644
 a/core/base/src/TTimeStamp.cxx
-+++ b/core/base/src/TTimeStamp.cxx
-@@ -813,7 +813,7 @@ void TTimeStamp::DumpTMStruct(const tm_t tmstruct)
-   tmstruct.tm_isdst);
- #if (defined(linux)  !defined(R__WINGCC)) || defined(R__MACOSX)
-printf(,\n  tm_gmtoff %6ld, tm_zone \%s\,
--#if defined(__USE_BSD) || defined(R__MACOSX)
-+#if defined(__USE_BSD) || defined(R__MACOSX) || defined(__USE_MISC)
-tmstruct.tm_gmtoff, tmstruct.tm_zone);
- #else
-tmstruct.__tm_gmtoff, tmstruct.__tm_zone);

diff --git a/sci-physics/root/files/root-6.02.05-xrootd4.patch 
b/sci-physics/root/files/root-6.02.05-xrootd4.patch
new file mode 100644
index 000..0b4a4be
--- /dev/null
+++ b/sci-physics/root/files/root-6.02.05-xrootd4.patch
@@ -0,0 +1,11 @@
+https://sft.its.cern.ch/jira/browse/ROOT-6998
+--- root-6.02.05/net/netxng/src/TNetXNGFile.cxx.orig   2015-02-09 
11:59:47.0 +0300
 root-6.02.05/net/netxng/src/TNetXNGFile.cxx

[gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/

2015-03-01 Thread Andrew Savchenko 
commit: b9d3bbace219538f5b0c8d6e65743d05f3012b54
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Mon Mar  2 07:12:48 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Mon Mar  2 07:12:48 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b9d3bbac

sci-physics/root: upstream-like ldflags patch

Package-Manager: portage-2.2.17
Signed-off-by: Andrew Savchenko bircoph AT gentoo.org

---
 sci-physics/root/ChangeLog   |  5 +
 sci-physics/root/files/root-5.32.00-chklib64.patch   |  1 +
 sci-physics/root/files/root-5.34.26-prop-flags.patch | 19 ---
 sci-physics/root/root-5.34.26.ebuild | 18 +++---
 4 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index b8503a4..6f4801a 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 
2012/03/29 18:21:49 bicatali Exp $
 
+  02 Mar 2015; Andrew Savchenko birc...@gentoo.org root-5.34.26.ebuild,
+  files/root-5.32.00-chklib64.patch, -files/root-5.34.26-prop-flags.patch:
+  Add configurable LDFLAGS the same way as upstream did for
+  configurable CFLAGS/CXXFLAGS. Optimize configure variables.
+
   24 Feb 2015; Andrew Savchenko birc...@gentoo.org root-5.34.26.ebuild:
   Remove full path from local images, otherwise html header
   background is missing.

diff --git a/sci-physics/root/files/root-5.32.00-chklib64.patch 
b/sci-physics/root/files/root-5.32.00-chklib64.patch
index a5c052c..979220f 100644
--- a/sci-physics/root/files/root-5.32.00-chklib64.patch
+++ b/sci-physics/root/files/root-5.32.00-chklib64.patch
@@ -1,3 +1,4 @@
+bug fix for #406817
 --- configure.orig 2012-02-29 19:46:41.0 +0400
 +++ configure  2012-03-22 03:28:43.458968696 +0400
 @@ -441,14 +441,13 @@

diff --git a/sci-physics/root/files/root-5.34.26-prop-flags.patch 
b/sci-physics/root/files/root-5.34.26-prop-flags.patch
deleted file mode 100644
index b81dbb5..000
--- a/sci-physics/root/files/root-5.34.26-prop-flags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 3c8bc686abf57e7e2037c4c191cb63a1a5172b5b
-Author: Andrew Savchenko birc...@gmail.com
-Date:   Sun Feb 22 03:45:21 2015 +0300
-
-root-5.32.00-prop-flags.patch - root-5.34.26-prop-flags.patch
-
-diff --git a/config/Makefile.in b/config/Makefile.in
-index 89674e7..91d25b9 100644
 a/config/Makefile.in
-+++ b/config/Makefile.in
-@@ -29,7 +29,7 @@ EXTRA_CFLAGS   := -Iinclude @cflags@
- USERCONF_CFLAGS:= @usercflags@
- EXTRA_CXXFLAGS := -Iinclude @cflags@
- USERCONF_CXXFLAGS:= @usercxxflags@
--EXTRA_LDFLAGS  := @ldflags@
-+EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
- WERROR := @werror@
- WINRTDEBUG := @winrtdebug@
- 

diff --git a/sci-physics/root/root-5.34.26.ebuild 
b/sci-physics/root/root-5.34.26.ebuild
index fdd6943..15ec664 100644
--- a/sci-physics/root/root-5.34.26.ebuild
+++ b/sci-physics/root/root-5.34.26.ebuild
@@ -7,12 +7,11 @@ EAPI=5
 if [[ ${PV} ==  ]] ; then
inherit git-r3
EGIT_REPO_URI=http://root.cern.ch/git/root.git;
-   SRC_URI=
-   KEYWORDS=
 else
SRC_URI=ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz;
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 fi
+SRC_URI+= 
http://dev.gentoo.org/~bircoph/patches/${PN}-5.34.26-ldflags.patch.xz;
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -196,7 +195,7 @@ src_prepare() {
${FILESDIR}/${PN}-5.34.05-nobyte-compile.patch \
${FILESDIR}/${PN}-5.34.13-unuran.patch \
${FILESDIR}/${PN}-5.34.13-desktop.patch \
-   ${FILESDIR}/${PN}-5.34.26-prop-flags.patch
+   ${WORKDIR}/${PN}-5.34.26-ldflags.patch
 
# make sure we use system libs and headers
rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -264,7 +263,7 @@ src_configure() {
esac
 
# the configure script is not the standard autotools
-   local myconf+=(
+   myconf+=(
--prefix=${EPREFIX}/usr
--etcdir=${EPREFIX}/etc/root
--libdir=${EPREFIX}/usr/$(get_libdir)/${PN}
@@ -273,14 +272,13 @@ src_configure() {
--testdir=${EPREFIX}${DOC_DIR}/examples/tests
--disable-werror
--nohowto
+   --cflags='${CFLAGS}'
+   --cxxflags='${CXXFLAGS}'
+   --ldflags='${LDFLAGS}'
)
 
if use minimal; then
-   myconf+=(
-   $(usex X --gminimal --minimal)
-   --cflags='${CFLAGS}'
-   --cxxflags='${CXXFLAGS}'
-   )
+   myconf+=( $(usex X --gminimal --minimal) )
else
myconf+=(
--with-afs-shared=yes
@@ -302,8 +300,6 @@

[gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/

2014-07-06 Thread Andrew Savchenko 
commit: 6a228c11ec908ae30e7224667d08729527e6a3c8
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Sun Jul  6 12:49:15 2014 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Sun Jul  6 12:49:15 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6a228c11

sci-physics/root: Backport fixes from ROOT-6 branch

Backport fixes for .credits, .demos, .license from ROOT-6 branch.
A patch was backported by upstream too.

---
 sci-physics/root/ChangeLog |   8 +
 sci-physics/root/files/root-5.32.00-dotfont.patch  |  58 +++
 .../root/files/root-5.32.00-prop-flags.patch   |  15 +
 .../root/files/root-5.34.05-nobyte-compile.patch   | 137 
 .../root/files/root-5.34.18-tutorials-path.patch   |  94 +
 sci-physics/root/metadata.xml  |   2 +
 sci-physics/root/root-5.34.18-r2.ebuild| 387 +
 7 files changed, 701 insertions(+)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 0af159b..e2b9be7 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 
2012/03/29 18:21:49 bicatali Exp $
 
+*root-5.34.18-r2 (06 Jul 2014)
+
+  06 Jul 2014; Andrew Savchenko birc...@gmail.com +root-5.34.18-r2.ebuild,
+  +files/root-5.32.00-dotfont.patch, +files/root-5.32.00-prop-flags.patch,
+  +files/root-5.34.05-nobyte-compile.patch,
+  +files/root-5.34.18-tutorials-path.patch, metadata.xml:
+  Backport fixes for .credits, .demos, .license from ROOT-6 branch.
+
   06 Jul 2014; Andrew Savchenko birc...@gmail.com root-6.00.01-r1.ebuild,
   root-6.00.02.ebuild, root-.ebuild:
   Update LICENSE: GPL-2 code is not used during compilation.

diff --git a/sci-physics/root/files/root-5.32.00-dotfont.patch 
b/sci-physics/root/files/root-5.32.00-dotfont.patch
new file mode 100644
index 000..85d6dea
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-dotfont.patch
@@ -0,0 +1,58 @@
+--- root/html/src/TClassDocOutput.cxx.orig 2012-05-25 16:18:10.0 
+0400
 root/html/src/TClassDocOutput.cxx  2012-05-29 21:36:53.813593012 +0400
+@@ -625,7 +625,7 @@
+size=\8,10\;  endl
+ratio=auto;  endl
+margin=0;  endl
+-   node [shape=plaintext,fontsize=40,width=4,height=0.75];  endl
++   node 
[shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\DejaVu Serif\]; 
 endl
+\  fCurrentClass-GetName()  \ [shape=ellipse];  endl;
+ 
+std::stringstream ssDep;
+@@ -704,7 +704,7 @@
+ outdot  ;  endl;
+  } else if (writeAndMoreFor) {
+outdot\...andmore  writeAndMoreFor-GetName()
+-   \ [label=\...and 
more\,fontname=\Times-Italic\,fillcolor=lightgrey,style=filled];  endl;
++   \ [label=\...and more\,fontname=\DejaVu Serif 
Italic\,fillcolor=lightgrey,style=filled];  endl;
+  }
+   }
+   if (!levelExists) break;
+@@ -733,7 +733,7 @@
+ranksep=0.1;  endl
+nodesep=0;  endl
+margin=0;  endl;
+-   outdotnode 
[style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];
  endl;
++   outdotnode 
[style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\DejaVu
 Serif\];  endl;
+ 
+std::stringstream ssDep;
+const int numColumns = 3;
+@@ -939,7 +939,7 @@
+ranksep=0;  endl
+nodesep=0;  endl
+size=\8,10\;  endl
+-   node [fontsize=20,shape=plaintext];  endl;
++   node [fontsize=20,shape=plaintext,fontname=\DejaVu Serif\];  
endl;
+ 
+for (std::liststd::string::iterator iFile = listFilesToParse.begin();
+   iFile != listFilesToParse.end(); ++iFile) {
+@@ -999,7 +999,8 @@
+ranksep=0.7;  endl
+nodesep=0.3;  endl
+size=\8,8\;  endl
+-   ratio=compress;  endl;
++   ratio=compress;  endl
++   node [fontname=\DejaVu Serif\];  endl;
+ 
+TString libs(fCurrentClass-GetSharedLibs());
+outdot  \All Libraries\ 
[URL=\LibraryDependencies.html\,shape=box,rank=max,fillcolor=lightgray,style=filled];
  endl;
+@@ -1109,7 +1110,8 @@
+ 
+dotout  digraph G {  endl
+ratio=auto;  endl
+-   rankdir=RL;  endl;
++   rankdir=RL;  endl
++   node [fontname=\DejaVu Serif\];  endl;
+ 
+// loop on all classes
+TClassDocInfo* cdi = 0;

diff --git a/sci-physics/root/files/root-5.32.00-prop-flags.patch 
b/sci-physics/root/files/root-5.32.00-prop-flags.patch
new file mode 100644
index 000..7dfeb1c
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-prop-flags.patch
@@ -0,0 +1,15 @@
+--- root/config/Makefile.in.orig   2013-01-21 22:04:43.011452938 +0400
 root/config/Makefile.in2013-01-21 22:04:18.027352209 +0400
+@@ -25,9 +25,9 @@
+ USECONFIG  := @useconfig@
+

[gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/

2014-07-02 Thread Andrew Savchenko 
commit: a1c3b313be5be9716a761a762ea3651070ed9e43
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Wed Jul  2 13:29:12 2014 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Wed Jul  2 13:29:12 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a1c3b313

sci-physics/root: fix Cling library load

It was broken for prefix builds (that's how ROOT is installed in
Gentoo. See bug https://sft.its.cern.ch/jira/browse/ROOT-6410.

---
 sci-physics/root/ChangeLog |   7 +
 sci-physics/root/files/root-6.00.01-cling.patch|  19 +
 ...{root-6.00.01.ebuild = root-6.00.01-r1.ebuild} |  10 +-
 sci-physics/root/root-.ebuild  | 434 -
 4 files changed, 461 insertions(+), 9 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 678d621..98e1940 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 
2012/03/29 18:21:49 bicatali Exp $
 
+*root-6.00.01-r1 (02 Jul 2014)
+
+  02 Jul 2014; Andrew Savchenko birc...@gmail.com -root-6.00.01.ebuild,
+  +root-6.00.01-r1.ebuild, +files/root-6.00.01-cling.patch:
+  Fix Cling when prefix setup is used (see bug ROOT-6410).
+  Remove warning message because with bug fixed it is meaningless.
+
 *root-6.00.01 (29 Jun 2014)
 
   29 Jun 2014; Andrew Savchenko birc...@gmail.com +root-6.00.01.ebuild,

diff --git a/sci-physics/root/files/root-6.00.01-cling.patch 
b/sci-physics/root/files/root-6.00.01-cling.patch
new file mode 100644
index 000..146e89f
--- /dev/null
+++ b/sci-physics/root/files/root-6.00.01-cling.patch
@@ -0,0 +1,19 @@
+commit eea9517c17bd86beda895a5a8b3ffe59af18596f
+Author: Axel Naumann axel.naum...@cern.ch
+Date:   Tue Jul 1 17:45:20 2014 +0200
+
+From Pere: go via TSystem to use prefix if defined (ROOT-6410).
+
+diff --git a/core/meta/src/TCling.cxx b/core/meta/src/TCling.cxx
+index baec571..4976d4e 100644
+--- a/core/meta/src/TCling.cxx
 b/core/meta/src/TCling.cxx
+@@ -4703,7 +4703,7 @@ void* TCling::LazyFunctionCreatorAutoload(const 
std::string mangled_name) {
+TString lib;
+Ssiz_t posLib = 0;
+while (libs.Tokenize(lib, posLib)) {
+-  if (Load(lib, kFALSE /*system*/)  0) {
++  if (gSystem-Load(lib, , kFALSE /*system*/)  0) {
+  // The library load failed, all done.
+  //fprintf(stderr, load failed: %s\n, errmsg.c_str());
+  return 0;

diff --git a/sci-physics/root/root-6.00.01.ebuild 
b/sci-physics/root/root-6.00.01-r1.ebuild
similarity index 96%
rename from sci-physics/root/root-6.00.01.ebuild
rename to sci-physics/root/root-6.00.01-r1.ebuild
index 440bd32..bfb8e40 100644
--- a/sci-physics/root/root-6.00.01.ebuild
+++ b/sci-physics/root/root-6.00.01-r1.ebuild
@@ -200,7 +200,8 @@ src_prepare() {
${FILESDIR}/${PN}-6.00.01-nobyte-compile.patch \
${FILESDIR}/${PN}-6.00.01-prop-flags.patch \
${FILESDIR}/${PN}-6.00.01-llvm.patch \
-   ${FILESDIR}/${PN}-6.00.01-geocad.patch
+   ${FILESDIR}/${PN}-6.00.01-geocad.patch \
+   ${FILESDIR}/${PN}-6.00.01-cling.patch
 
# make sure we use system libs and headers
rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -426,13 +427,6 @@ src_install() {
 
 pkg_postinst() {
fdo-mime_desktop_database_update
-   if [[ -z ${REPLACING_VERSIONS} ||
-   $(get_major_version ${REPLACING_VERSIONS}) -lt 6 ]]; then
-   ewarn ROOT-6 uses Cling instead of CINT. Cling follows the C++ 
standard much more
-   ewarn strictly than CINT, in particular in requires headers to 
be included and
-   ewarn libraries to be properly loaded. Please carefully follow 
a migration guide:
-   ewarn 
http://root.cern.ch/root/htmldoc/notes/release-notes.html#cling-vs-cint;
-   fi
 }
 
 pkg_postrm() {

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
deleted file mode 12
index b46789a..000
--- a/sci-physics/root/root-.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-root-6.00.01.ebuild
\ No newline at end of file

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
new file mode 100644
index 000..26f1dd1
--- /dev/null
+++ b/sci-physics/root/root-.ebuild
@@ -0,0 +1,433 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.18-r1.ebuild,v 
1.3 2014/03/27 18:51:54 bicatali Exp $
+
+EAPI=5
+
+if [[ ${PV} ==  ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI=http://root.cern.ch/git/root.git;
+   KEYWORDS=
+else
+   SRC_URI=ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz;
+

[gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/

2014-07-02 Thread Andrew Savchenko 
commit: eb497cec6903e1d22b1f7ac6285217ba6ace468e
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Wed Jul  2 16:30:40 2014 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Wed Jul  2 16:30:40 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=eb497cec

sci-physics/root: fix ROOT's CLI commands

Arrange changes required for .credits, .demos and .license to work
properly.

---
 sci-physics/root/ChangeLog |  6 +
 .../root/files/root-6.00.01-tutorials-path.patch   | 27 ++
 sci-physics/root/root-6.00.01-r1.ebuild|  8 ++-
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 98e1940..9b12ba5 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 
2012/03/29 18:21:49 bicatali Exp $
 
+  02 Jul 2014; Andrew Savchenko birc...@gmail.com root-6.00.01-r1.ebuild,
+  +files/root-6.00.01-tutorials-path.patch:
+  Honor --tutdir from .demos CLI command.
+  Install files for .license and .credits commands to work.
+  Disable compression for files needed by commands above.
+
 *root-6.00.01-r1 (02 Jul 2014)
 
   02 Jul 2014; Andrew Savchenko birc...@gmail.com -root-6.00.01.ebuild,

diff --git a/sci-physics/root/files/root-6.00.01-tutorials-path.patch 
b/sci-physics/root/files/root-6.00.01-tutorials-path.patch
new file mode 100644
index 000..2e496a4
--- /dev/null
+++ b/sci-physics/root/files/root-6.00.01-tutorials-path.patch
@@ -0,0 +1,27 @@
+diff --git a/config/RConfigure.in b/config/RConfigure.in
+index 5950401..e4fbfbf 100644
+--- a/config/RConfigure.in
 b/config/RConfigure.in
+@@ -11,6 +11,7 @@
+ #define ROOTDATADIR   @datadir@
+ #define ROOTDOCDIR@docdir@
+ #define ROOTMACRODIR  @macrodir@
++#define ROOTTUTDIR@tutdir@
+ #define ROOTSRCDIR@srcdir@
+ #define ROOTICONPATH  @iconpath@
+ #define EXTRAICONPATH @extraiconpath@
+diff --git a/core/base/src/TApplication.cxx b/core/base/src/TApplication.cxx
+index 1c1809a..7d7ed37 100644
+--- a/core/base/src/TApplication.cxx
 b/core/base/src/TApplication.cxx
+@@ -866,8 +866,8 @@ Long_t TApplication::ProcessLine(const char *line, Bool_t 
sync, Int_t *err)
+  Error(ProcessLine, Cannot show demos in batch mode!);
+  return 1;
+   }
+-#ifdef ROOTDOCDIR
+-  ProcessLine(.x  ROOTDOCDIR /tutorials/demos.C);
++#ifdef ROOTTUTDIR
++  ProcessLine(.x  ROOTTUTDIR /demos.C);
+ #else
+   ProcessLine(.x $(ROOTSYS)/tutorials/demos.C);
+ #endif

diff --git a/sci-physics/root/root-6.00.01-r1.ebuild 
b/sci-physics/root/root-6.00.01-r1.ebuild
index bfb8e40..74c7af8 100644
--- a/sci-physics/root/root-6.00.01-r1.ebuild
+++ b/sci-physics/root/root-6.00.01-r1.ebuild
@@ -201,7 +201,8 @@ src_prepare() {
${FILESDIR}/${PN}-6.00.01-prop-flags.patch \
${FILESDIR}/${PN}-6.00.01-llvm.patch \
${FILESDIR}/${PN}-6.00.01-geocad.patch \
-   ${FILESDIR}/${PN}-6.00.01-cling.patch
+   ${FILESDIR}/${PN}-6.00.01-cling.patch \
+   ${FILESDIR}/${PN}-6.00.01-tutorials-path.patch
 
# make sure we use system libs and headers
rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -423,6 +424,11 @@ src_install() {
daemon_install
desktop_install
cleanup_install
+
+   # do not copress files used by ROOT's CLI (.credit, .demo, .license)
+   docompress -x ${DOC_DIR}/{CREDITS,LICENSE,examples/tutorials}
+   # needed for .license command to work
+   dosym ${ED}/usr/portage/licenses/LGPL-2.1 ${DOC_DIR}/LICENSE
 }
 
 pkg_postinst() {

[gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/

2014-07-02 Thread Andrew Savchenko 
commit: 61b06f12bb0b5809ced355582dcf5dd39677f9d5
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Wed Jul  2 22:36:31 2014 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Wed Jul  2 22:36:31 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=61b06f12

sci-physics/root: fix aux docs installation

Do not compress files required for .credits, .demo, .license
commands. Fix tutorials patch.

---
 sci-physics/root/ChangeLog   |  5 +
 sci-physics/root/files/root-6.00.01-tutorials-path.patch | 12 
 sci-physics/root/root-6.00.01-r1.ebuild  |  4 ++--
 sci-physics/root/root-.ebuild|  8 +++-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 9b12ba5..4770753 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -3,6 +3,11 @@
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 
2012/03/29 18:21:49 bicatali Exp $
 
   02 Jul 2014; Andrew Savchenko birc...@gmail.com root-6.00.01-r1.ebuild,
+  root-.ebuild, files/root-6.00.01-tutorials-path.patch:
+  Do not compress files required for .credits, .demo, .license
+  commands. Fix tutorials patch.
+
+  02 Jul 2014; Andrew Savchenko birc...@gmail.com root-6.00.01-r1.ebuild,
   +files/root-6.00.01-tutorials-path.patch:
   Honor --tutdir from .demos CLI command.
   Install files for .license and .credits commands to work.

diff --git a/sci-physics/root/files/root-6.00.01-tutorials-path.patch 
b/sci-physics/root/files/root-6.00.01-tutorials-path.patch
index 2e496a4..cb68615 100644
--- a/sci-physics/root/files/root-6.00.01-tutorials-path.patch
+++ b/sci-physics/root/files/root-6.00.01-tutorials-path.patch
@@ -10,6 +10,18 @@ index 5950401..e4fbfbf 100644
  #define ROOTSRCDIR@srcdir@
  #define ROOTICONPATH  @iconpath@
  #define EXTRAICONPATH @extraiconpath@
+diff --git a/configure b/configure
+index 131df92..2c8ea95 100755
+--- a/configure
 b/configure
+@@ -7537,6 +7537,7 @@ sed \
+ -e s|@prefix@|$prefix|   \
+ -e s|@srcdir@|$srcdir|   \
+ -e s|@ttffontdir@|$fontdir|  \
++-e s|@tutdir@|$tutdir|   \
+ -e s|@setresuid@|$setresuid| \
+ -e s|@hasmathmore@|$hasmathmore| \
+ -e s|@haspthread@|$haspthread|   \
 diff --git a/core/base/src/TApplication.cxx b/core/base/src/TApplication.cxx
 index 1c1809a..7d7ed37 100644
 --- a/core/base/src/TApplication.cxx

diff --git a/sci-physics/root/root-6.00.01-r1.ebuild 
b/sci-physics/root/root-6.00.01-r1.ebuild
index 74c7af8..d5993c0 100644
--- a/sci-physics/root/root-6.00.01-r1.ebuild
+++ b/sci-physics/root/root-6.00.01-r1.ebuild
@@ -426,9 +426,9 @@ src_install() {
cleanup_install
 
# do not copress files used by ROOT's CLI (.credit, .demo, .license)
-   docompress -x ${DOC_DIR}/{CREDITS,LICENSE,examples/tutorials}
+   docompress -x ${DOC_DIR}/{CREDITS,LICENSE,examples/tutorials}
# needed for .license command to work
-   dosym ${ED}/usr/portage/licenses/LGPL-2.1 ${DOC_DIR}/LICENSE
+   dosym ${ED}usr/portage/licenses/LGPL-2.1 ${DOC_DIR}/LICENSE
 }
 
 pkg_postinst() {

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index 26f1dd1..9c76fed 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -200,7 +200,8 @@ src_prepare() {
${FILESDIR}/${PN}-6.00.01-nobyte-compile.patch \
${FILESDIR}/${PN}-6.00.01-prop-flags.patch \
${FILESDIR}/${PN}-6.00.01-llvm.patch \
-   ${FILESDIR}/${PN}-6.00.01-geocad.patch
+   ${FILESDIR}/${PN}-6.00.01-geocad.patch \
+   ${FILESDIR}/${PN}-6.00.01-tutorials-path.patch
 
# make sure we use system libs and headers
rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -422,6 +423,11 @@ src_install() {
daemon_install
desktop_install
cleanup_install
+
+   # do not copress files used by ROOT's CLI (.credit, .demo, .license)
+   docompress -x ${DOC_DIR}/{CREDITS,LICENSE,examples/tutorials}
+   # needed for .license command to work
+   dosym ${ED}usr/portage/licenses/LGPL-2.1 ${DOC_DIR}/LICENSE
 }
 
 pkg_postinst() {