[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/

2017-03-26 Thread Justin Lecher 
commit: 563f0e00028cd2a42077bfb7919c420c5c69d5fb
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Mar 26 08:52:20 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Mar 26 08:52:20 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=563f0e00

sci-physics/root: Add missing SLOT operator

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher  gentoo.org>

 sci-physics/root/root-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index 4973e90e0..bb5692c84 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 if [[ ${PV} == "" ]] ; then
inherit git-r3
@@ -50,7 +50,7 @@ CDEPEND="
media-libs/giflib:0=
media-libs/libpng:0=
media-libs/tiff:0=
-   >=sys-devel/clang-3.4
+   >=sys-devel/clang-3.4:=
sys-libs/zlib:0=
virtual/jpeg:0
virtual/shadow

[gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, net-ftp/bbftp-server/files/, ...

2017-02-25 Thread Justin Lecher 
commit: 8b0f0a24aa8bb4e8edb22eeb6eba36f761112ebe
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Feb 25 19:18:21 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Feb 25 19:18:21 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=8b0f0a24

Convert to openrc-run

Signed-off-by: Justin Lecher  gentoo.org>

 net-ftp/bbftp-server/files/bbftpd.init.d | 2 +-
 sci-physics/root/files/proofd.initd  | 2 +-
 sci-physics/root/files/rootd.initd   | 2 +-
 sys-cluster/htcondor/files/condor.initd  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-ftp/bbftp-server/files/bbftpd.init.d 
b/net-ftp/bbftp-server/files/bbftpd.init.d
index cd147fb40..c78ed6642 100644
--- a/net-ftp/bbftp-server/files/bbftpd.init.d
+++ b/net-ftp/bbftp-server/files/bbftpd.init.d
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/sci-physics/root/files/proofd.initd 
b/sci-physics/root/files/proofd.initd
index 13327ae70..b0839466b 100644
--- a/sci-physics/root/files/proofd.initd
+++ b/sci-physics/root/files/proofd.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/sci-physics/root/files/rootd.initd 
b/sci-physics/root/files/rootd.initd
index 1b5ece945..b79d7bbed 100644
--- a/sci-physics/root/files/rootd.initd
+++ b/sci-physics/root/files/rootd.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/sys-cluster/htcondor/files/condor.initd 
b/sys-cluster/htcondor/files/condor.initd
index 11bceea96..a9904536f 100644
--- a/sys-cluster/htcondor/files/condor.initd
+++ b/sys-cluster/htcondor/files/condor.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

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

2016-07-02 Thread Justin Lecher 
commit: 9fb26a348d51c5ccac4fc0cef37f50a38b929416
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Jul  2 09:01:53 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Jul  2 09:01:53 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9fb26a34

sci-physics/root fix := under || clause

Signed-off-by: Justin Lecher  gentoo.org>

 sci-physics/root/root-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index 14d468a..f739680 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -91,7 +91,7 @@ CDEPEND="
mpi? ( virtual/mpi )
)
mysql? ( virtual/mysql )
-   odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
+   odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )
oracle? ( dev-db/oracle-instantclient-basic:0= )
postgres? ( dev-db/postgresql:= )
pythia6? ( sci-physics/pythia:6= )

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

2016-05-07 Thread Justin Lecher 
commit: c3a3d6b0df1099c22461e3e26b632f09f8b45216
Author: Oliver Freyermuth  googlemail  com>
AuthorDate: Tue Apr 26 22:19:44 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Apr 26 22:19:44 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c3a3d6b0

sci-physics/root-: current master needs write access to /dev/random

Needed at runtime of the ROOT interpreter when JITting code,
thus also necessary to build examples (and the hsimple-target).
Further details upstream: https://sft.its.cern.ch/jira/browse/ROOT-8146
Since write-access needs to actually work, addpredict is insufficient.
Writing to /dev/random should not be a security concern
(entroy is unchanged).

 sci-physics/root/root-.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index 8bf3758..14d468a 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -397,6 +397,10 @@ cleanup_install() {
 }
 
 src_install() {
+   # Write access to /dev/random is required to run root.exe
+   # More information at https://sft.its.cern.ch/jira/browse/ROOT-8146
+   addwrite /dev/random
+
DOCS=($(find README/* -maxdepth 1 -type f))
default
dodoc README.md

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

2015-11-17 Thread Justin Lecher 
commit: 7bb9ac34e68c7add57a2a5f9772b5a0897a1085b
Author: Oliver Freyermuth  googlemail  com>
AuthorDate: Sun Nov 15 19:03:49 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Nov 15 19:03:49 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7bb9ac34

sci-physics/root: Update to upstream changes.
New nobyte-compile patch, paths for gl2ps changed,
DOCS files changed.

Package-Manager: portage-2.2.24

 sci-physics/root/ChangeLog |  6 +
 ...ile.patch => root-6.06.00-nobyte-compile.patch} | 28 +-
 sci-physics/root/root-.ebuild  |  5 ++--
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index accb1de..b816975 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  15 Nov 2015; Oliver Freyermuth 
+  +files/root-6.06.00-nobyte-compile.patch,
+  -files/root-6.00.01-nobyte-compile.patch, root-.ebuild:
+  sci-physics/root: Update to upstream changes. New nobyte-compile patch, paths
+  for gl2ps changed,  DOCS files changed.
+
   27 Sep 2015; Oliver Freyermuth 
   -files/root-6.00.01-geocad.patch, root-.ebuild:
   sci-physics/root:  Remove geocad-patch, is now upstream.

diff --git a/sci-physics/root/files/root-6.00.01-nobyte-compile.patch 
b/sci-physics/root/files/root-6.06.00-nobyte-compile.patch
similarity index 57%
rename from sci-physics/root/files/root-6.00.01-nobyte-compile.patch
rename to sci-physics/root/files/root-6.06.00-nobyte-compile.patch
index aa58f20..61ffef7 100644
--- a/sci-physics/root/files/root-6.00.01-nobyte-compile.patch
+++ b/sci-physics/root/files/root-6.06.00-nobyte-compile.patch
@@ -1,33 +1,39 @@
-diff -Naur root.as-needed/bindings/pyroot/Module.mk 
root/bindings/pyroot/Module.mk
 root.as-needed/bindings/pyroot/Module.mk   2011-07-10 10:42:48.991561304 
+0400
-+++ root/bindings/pyroot/Module.mk 2011-07-10 10:43:21.493339703 +0400
-@@ -48,8 +48,6 @@
- ROOTPY   := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
- $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
+diff --git a/bindings/pyroot/Module.mk b/bindings/pyroot/Module.mk
+index 8c2782d..f41e0aa 100644
+--- a/bindings/pyroot/Module.mk
 b/bindings/pyroot/Module.mk
+@@ -65,10 +65,6 @@ $(LPATH)/ROOTaaS/%: $(MODDIR)/ROOTaaS/%
+   @[ -d $(dir $@) ] || mkdir -p $(dir $@)
+   cp -R $< $@
  endif
 -ROOTPYC  := $(ROOTPY:.py=.pyc)
 -ROOTPYO  := $(ROOTPY:.py=.pyo)
+-ROOTAASC := $(ROOTAAS:.py=.pyc)
+-ROOTAASO := $(ROOTAAS:.py=.pyo)
  
  # used in the main Makefile
  ALLHDRS  += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
+@@ -87,12 +83,9 @@ INCLUDEFILES += $(PYROOTDEP)
  include/%.h:$(PYROOTDIRI)/%.h
cp $< $@
  
 -%.pyc: %.py;python -c 'import py_compile; py_compile.compile( "$<" )'
 -%.pyo: %.py;python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
+-
 -$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \
 +$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) \
- $(ROOTLIBSDEP) $(PYTHONLIBDEP)
+ $(ROOTLIBSDEP) $(PYTHONLIBDEP) \
+-$(ROOTAAS) $(ROOTAASC) $(ROOTAASO)
++$(ROOTAAS)
+ 
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
+@@ -138,7 +131,7 @@ clean:: clean-$(MODNAME)
  
  distclean-$(MODNAME): clean-$(MODNAME)
@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
 - $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
 + $(ROOTPY) $(PYROOTMAP) \
   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
+   @rm -rf $(LPATH)/ROOTaaS bin/ROOTaaS
  
- distclean:: distclean-$(MODNAME)

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index 1b3ed72..8bf3758 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -196,7 +196,7 @@ src_prepare() {
"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
"${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.06.00-nobyte-compile.patch \
"${FILESDIR}"/${PN}-6.00.01-llvm.patch
 
# make sure we use system libs and headers
@@ -210,7 +210,7 @@ src_prepare() {
LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \
xargs -0 rm || die
rm -r core/lzma/src/*.tar.gz || die
-   rm graf3d/gl/{inc,src}/gl2ps.* || die
+   rm graf3d/gl/src/gl2ps.* || die
sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \

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

2015-10-01 Thread Justin Lecher 
commit: 6f07c2d62ee51108028aef334392b84ac39a9c81
Author: Oliver Freyermuth  googlemail  com>
AuthorDate: Sun Sep 27 18:27:34 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Sep 27 18:29:12 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6f07c2d6

sci-physics/root: Drop desktop-patch (upstreamed), add http-useflag enabling 
THttpServer.

Package-Manager: portage-2.2.22

 sci-physics/root/ChangeLog|  4 
 sci-physics/root/files/root-5.34.13-desktop.patch | 12 
 sci-physics/root/root-.ebuild |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 566f40c..77f4c1f 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  
root-.ebuild:
+  sci-physics/root: Drop desktop-patch (upstreamed), 
+  add http-useflag enabling THttpServer.
+
   18 Jul 2015; Andrew Savchenko  -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:

diff --git a/sci-physics/root/files/root-5.34.13-desktop.patch 
b/sci-physics/root/files/root-5.34.13-desktop.patch
deleted file mode 100644
index 7d47bcf..000
--- a/sci-physics/root/files/root-5.34.13-desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/etc/root.desktop b/etc/root.desktop
-index ca38211..688ecfa 100644
 a/etc/root.desktop
-+++ b/etc/root.desktop
-@@ -8,5 +8,5 @@ Name[de]=ROOT
- Comment=An object-oriented data analysis framework
- Comment[de]=Ein objektorientiertes Framework zur Datenanalyse
- StartupNotify=true
--MimeType=application/x-root;text/x-c++src
--Categories=Science;Development;Application;
-+MimeType=application/x-root;text/x-c++src;
-+Categories=Science;Development;

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index 91415ff..3ff5618 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -195,7 +195,6 @@ src_prepare() {
"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
-   "${FILESDIR}"/${PN}-5.34.13-desktop.patch \
"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
"${FILESDIR}"/${PN}-6.00.01-llvm.patch \
@@ -309,6 +308,7 @@ src_configure() {
$(use_enable fftw fftw3)
$(use_enable geocad)
$(use_enable graphviz gviz)
+   $(use_enable http)
$(use_enable kerberos krb5)
$(use_enable ldap)
$(use_enable math genvector)

[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/

2015-09-23 Thread Justin Lecher 
commit: 6e62ce55c1f7a78a98a24e25e90e96412b4380a0
Author: Justin Lecher  gentoo  org>
AuthorDate: Wed Sep 23 12:09:15 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Wed Sep 23 12:09:15 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6e62ce55

sci-physics/root: Use default functions

Package-Manager: portage-2.2.21
Signed-off-by: Justin Lecher  gentoo.org>

 sci-physics/root/metadata.xml | 30 +++---
 sci-physics/root/root-.ebuild |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 7e1dbd5..76b4f49 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,12 +1,12 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-  birc...@gentoo.org
-  Andrew Savchenko
-
-sci-physics
-
+  
+birc...@gentoo.org
+Andrew Savchenko
+  
+  sci-physics
+  
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in
   high energy physics, but also in other data analysis applications. It
@@ -14,13 +14,13 @@
   statistics, serialization, optimization, linear algebra, graphics,
   GUI toolkit, and a complete visualization framework.
 
-
-  Support for images and data from FITS files with 
sci-libs/cfitsio
-  Enable ROOT-CAD interface using 
sci-libs/opencascade
-  Enable http server support including but not limited to 
fastcgi support
-  Build all math related libraries plugins, needs 
sci-libs/gsl 
-  Build the interface for sci-physics/pythia 
version 6.x 
-  Build the interface for sci-physics/pythia 
version 8.x 
-  Build the interface for net-libs/xrootd 

-
+  
+Support for images and data from FITS files with 
sci-libs/cfitsio
+Enable ROOT-CAD interface using 
sci-libs/opencascade
+Enable http server support including but not limited to 
fastcgi support
+Build all math related libraries plugins, needs 
sci-libs/gsl 
+Build the interface for sci-physics/pythia 
version 6.x 
+Build the interface for sci-physics/pythia 
version 8.x 
+Build the interface for net-libs/xrootd 

+  
 

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index 45b50df..91415ff 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -398,7 +398,7 @@ cleanup_install() {
 }
 
 src_install() {
-   emake DESTDIR="${D}" install
+   default
dodoc README.md
 
echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root

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

2015-07-18 Thread Andrew Savchenko 
commit: edac8a8350c5bd22f8f73f170439290f9b38a71b
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Sat Jul 18 09:44:37 2015 +
Commit: Andrew Savchenko bircoph AT gentoo DOT org
CommitDate: Sat Jul 18 09:44:37 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=edac8a83

avoid unconditional pg_config sourcing by usex

 sci-physics/root/ChangeLog   | 4 
 sci-physics/root/root-5.34.32.ebuild | 5 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 10c7d9e..61a91bd 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:
+  Do not use usex for postgres to avoid pg_config unconditional sourcing. See
+  bug 555246.
+
 *root-5.34.32 (17 Jul 2015)
 
   17 Jul 2015; Andrew Savchenko birc...@gentoo.org +root-5.34.32.ebuild,

diff --git a/sci-physics/root/root-5.34.32.ebuild 
b/sci-physics/root/root-5.34.32.ebuild
index 283102f..4b02cba 100644
--- a/sci-physics/root/root-5.34.32.ebuild
+++ b/sci-physics/root/root-5.34.32.ebuild
@@ -310,7 +310,6 @@ src_configure() {
$(use_enable opengl)
$(use_enable oracle)
$(use_enable postgres pgsql)
-   $(usex postgres --with-pgsql-incdir=$(pg_config --includedir) 
)
$(use_enable prefix rpath)
$(use_enable pythia6)
$(use_enable pythia8)
@@ -330,6 +329,10 @@ src_configure() {
${EXTRA_ECONF}
)
 
+   # usex can't be used here, because pg_config may be not
+   # installed with USE=-postgres
+   use postgres  myconf+=( --with-pgsql-incdir=$(pg_config --includedir) 
)
+
./configure ${myconf[@]} || die configure failed
 }

[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/, sci-physics/root/files/

2015-07-17 Thread Andrew Savchenko 
commit: e04e00edfd92aa0d05d6a551b6589bdc8d164630
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Fri Jul 17 09:42:00 2015 +
Commit: Andrew Savchenko bircoph AT gentoo DOT org
CommitDate: Fri Jul 17 09:42:00 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e04e00ed

sci-physics/root: version bump

 sci-physics/root/ChangeLog |   7 +
 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   | 434 +
 6 files changed, 662 insertions(+)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 14a233a..10c7d9e 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-5.34.32 (17 Jul 2015)
+
+  17 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:
+  Version bump. Added for testing.
+
   12 Apr 2015; Andrew Savchenko birc...@gentoo.org -root-6.02.05-r2.ebuild,
   -files/root-6.00.01-prop-flags.patch, -files/root-6.02.05-dictpch.patch,
   -files/root-6.02.05-xrootd4.patch:

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.34.05-nobyte-compile.patch 
b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
new file mode 100644
index 000..ec67a15
--- /dev/null
+++ b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
@@ -0,0 +1,137 @@
+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

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

2015-04-13 Thread Justin Lecher 
commit: cd559bc8acd09f8c6d72b28cf098a064f2b1c406
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Sun Apr 12 19:21:32 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Mon Apr 13 06:24:41 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=cd559bc8

sci-physics/root: 6.02.05-r2 moved to the tree

 sci-physics/root/ChangeLog |   5 +
 .../root/files/root-6.00.01-prop-flags.patch   |  17 -
 sci-physics/root/files/root-6.02.05-dictpch.patch  |  31 --
 sci-physics/root/files/root-6.02.05-xrootd4.patch  |  11 -
 sci-physics/root/metadata.xml  |   4 -
 sci-physics/root/root-6.02.05-r2.ebuild| 482 -
 6 files changed, 5 insertions(+), 545 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index ac89d27..14a233a 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 $
 
+  12 Apr 2015; Andrew Savchenko birc...@gentoo.org -root-6.02.05-r2.ebuild,
+  -files/root-6.00.01-prop-flags.patch, -files/root-6.02.05-dictpch.patch,
+  -files/root-6.02.05-xrootd4.patch:
+  root-6.02.05-r2 is in the portage tree now
+
   12 Apr 2015; Andrew Savchenko birc...@gentoo.org root-6.02.05-r2.ebuild:
   Fix pg_config: command not found QA warning if postgres is not
   installed.

diff --git a/sci-physics/root/files/root-6.00.01-prop-flags.patch 
b/sci-physics/root/files/root-6.00.01-prop-flags.patch
deleted file mode 100644
index 3a10024..000
--- a/sci-physics/root/files/root-6.00.01-prop-flags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/config/Makefile.in b/config/Makefile.in
-index dd89044..4fc7de3 100644
 a/config/Makefile.in
-+++ b/config/Makefile.in
-@@ -64,9 +64,9 @@ HOST   := @host@
- USECONFIG  := @useconfig@
- MKLIBOPTIONS   := @mkliboption@
- 
--EXTRA_CFLAGS   := -Iinclude @cflags@
--EXTRA_CXXFLAGS := -Iinclude @cflags@
--EXTRA_LDFLAGS  := @ldflags@
-+EXTRA_CFLAGS   := -Iinclude @cflags@ $(CFLAGS)
-+EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS)
-+EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
- WERROR := @werror@
- WINRTDEBUG := @winrtdebug@
- CTORSINITARRAY := @ctorsinitarray@

diff --git a/sci-physics/root/files/root-6.02.05-dictpch.patch 
b/sci-physics/root/files/root-6.02.05-dictpch.patch
deleted file mode 100644
index 80a416e..000
--- a/sci-physics/root/files/root-6.02.05-dictpch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
 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/files/root-6.02.05-xrootd4.patch 
b/sci-physics/root/files/root-6.02.05-xrootd4.patch
deleted file mode 100644
index 0b4a4be..000
--- a/sci-physics/root/files/root-6.02.05-xrootd4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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.cxx2015-04-05 
11:32:31.893127758 +0300
-@@ -28,6 +28,7 @@
- #include XrdCl/XrdClFile.hh
- #include XrdCl/XrdClXRootDResponses.hh
- #include XrdCl/XrdClDefaultEnv.hh
-+#include XrdVersion.hh
- #include iostream
- 
- 
//--

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index a8f8c1f..7e1dbd5 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -16,15 +16,11 @@
 /longdescription
 use
   flag name=fitsSupport for images and data from FITS files

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

2015-04-13 Thread Justin Lecher 
commit: 4e236412cc2d3f5ba06a78260a477eb3de130d45
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Sun Apr 12 17:58:50 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Mon Apr 13 06:24:41 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4e236412

sci-physics/root: fix pg_config QA

 sci-physics/root/ChangeLog  | 4 
 sci-physics/root/root-6.02.05-r2.ebuild | 5 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 4fc73e8..ac89d27 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 $
 
+  12 Apr 2015; Andrew Savchenko birc...@gentoo.org root-6.02.05-r2.ebuild:
+  Fix pg_config: command not found QA warning if postgres is not
+  installed.
+
 *root-6.02.05-r2 (12 Apr 2015)
 
   12 Apr 2015; Andrew Savchenko birc...@gentoo.org -root-6.02.05-r1.ebuild,

diff --git a/sci-physics/root/root-6.02.05-r2.ebuild 
b/sci-physics/root/root-6.02.05-r2.ebuild
index 9069f3a..b69ac9f 100644
--- a/sci-physics/root/root-6.02.05-r2.ebuild
+++ b/sci-physics/root/root-6.02.05-r2.ebuild
@@ -348,7 +348,6 @@ src_configure() {
$(use_enable opengl)
$(use_enable oracle)
$(use_enable postgres pgsql)
-   $(usex postgres --with-pgsql-incdir=$(pg_config --includedir) 
)
$(use_enable prefix rpath)
$(use_enable pythia6)
$(use_enable pythia8)
@@ -365,6 +364,10 @@ src_configure() {
${EXTRA_ECONF}
)
 
+   # usex can't be used here, because pg_config may be not
+   # installed with USE=-postgres
+   use postgres  myconf+=( --with-pgsql-incdir=$(pg_config --includedir) 
)
+
./configure ${myconf[@]} || die configure failed
 }

[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/

2015-04-12 Thread Andrew Savchenko 
commit: 26e7e22ae62b45403d98c7ca6054561cd7fd28e3
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Sun Apr 12 17:58:50 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Sun Apr 12 17:58:50 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=26e7e22a

sci-physics/root: fix pg_config QA

 sci-physics/root/ChangeLog  | 4 
 sci-physics/root/root-6.02.05-r2.ebuild | 5 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 4fc73e8..ac89d27 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 $
 
+  12 Apr 2015; Andrew Savchenko birc...@gentoo.org root-6.02.05-r2.ebuild:
+  Fix pg_config: command not found QA warning if postgres is not
+  installed.
+
 *root-6.02.05-r2 (12 Apr 2015)
 
   12 Apr 2015; Andrew Savchenko birc...@gentoo.org -root-6.02.05-r1.ebuild,

diff --git a/sci-physics/root/root-6.02.05-r2.ebuild 
b/sci-physics/root/root-6.02.05-r2.ebuild
index 9069f3a..b69ac9f 100644
--- a/sci-physics/root/root-6.02.05-r2.ebuild
+++ b/sci-physics/root/root-6.02.05-r2.ebuild
@@ -348,7 +348,6 @@ src_configure() {
$(use_enable opengl)
$(use_enable oracle)
$(use_enable postgres pgsql)
-   $(usex postgres --with-pgsql-incdir=$(pg_config --includedir) 
)
$(use_enable prefix rpath)
$(use_enable pythia6)
$(use_enable pythia8)
@@ -365,6 +364,10 @@ src_configure() {
${EXTRA_ECONF}
)
 
+   # usex can't be used here, because pg_config may be not
+   # installed with USE=-postgres
+   use postgres  myconf+=( --with-pgsql-incdir=$(pg_config --includedir) 
)
+
./configure ${myconf[@]} || die configure failed
 }

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

2015-04-12 Thread Andrew Savchenko 
commit: 21403a331d44f269a6c4d13b58e849bbf4f9b1a6
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Sun Apr 12 19:21:32 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Sun Apr 12 19:21:32 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=21403a33

sci-physics/root: 6.02.05-r2 moved to the tree

 sci-physics/root/ChangeLog |   5 +
 .../root/files/root-6.00.01-prop-flags.patch   |  17 -
 sci-physics/root/files/root-6.02.05-dictpch.patch  |  31 --
 sci-physics/root/files/root-6.02.05-xrootd4.patch  |  11 -
 sci-physics/root/metadata.xml  |   4 -
 sci-physics/root/root-6.02.05-r2.ebuild| 482 -
 6 files changed, 5 insertions(+), 545 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index ac89d27..14a233a 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 $
 
+  12 Apr 2015; Andrew Savchenko birc...@gentoo.org -root-6.02.05-r2.ebuild,
+  -files/root-6.00.01-prop-flags.patch, -files/root-6.02.05-dictpch.patch,
+  -files/root-6.02.05-xrootd4.patch:
+  root-6.02.05-r2 is in the portage tree now
+
   12 Apr 2015; Andrew Savchenko birc...@gentoo.org root-6.02.05-r2.ebuild:
   Fix pg_config: command not found QA warning if postgres is not
   installed.

diff --git a/sci-physics/root/files/root-6.00.01-prop-flags.patch 
b/sci-physics/root/files/root-6.00.01-prop-flags.patch
deleted file mode 100644
index 3a10024..000
--- a/sci-physics/root/files/root-6.00.01-prop-flags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/config/Makefile.in b/config/Makefile.in
-index dd89044..4fc7de3 100644
 a/config/Makefile.in
-+++ b/config/Makefile.in
-@@ -64,9 +64,9 @@ HOST   := @host@
- USECONFIG  := @useconfig@
- MKLIBOPTIONS   := @mkliboption@
- 
--EXTRA_CFLAGS   := -Iinclude @cflags@
--EXTRA_CXXFLAGS := -Iinclude @cflags@
--EXTRA_LDFLAGS  := @ldflags@
-+EXTRA_CFLAGS   := -Iinclude @cflags@ $(CFLAGS)
-+EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS)
-+EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
- WERROR := @werror@
- WINRTDEBUG := @winrtdebug@
- CTORSINITARRAY := @ctorsinitarray@

diff --git a/sci-physics/root/files/root-6.02.05-dictpch.patch 
b/sci-physics/root/files/root-6.02.05-dictpch.patch
deleted file mode 100644
index 80a416e..000
--- a/sci-physics/root/files/root-6.02.05-dictpch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
 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/files/root-6.02.05-xrootd4.patch 
b/sci-physics/root/files/root-6.02.05-xrootd4.patch
deleted file mode 100644
index 0b4a4be..000
--- a/sci-physics/root/files/root-6.02.05-xrootd4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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.cxx2015-04-05 
11:32:31.893127758 +0300
-@@ -28,6 +28,7 @@
- #include XrdCl/XrdClFile.hh
- #include XrdCl/XrdClXRootDResponses.hh
- #include XrdCl/XrdClDefaultEnv.hh
-+#include XrdVersion.hh
- #include iostream
- 
- 
//--

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index a8f8c1f..7e1dbd5 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -16,15 +16,11 @@
 /longdescription
 use
   flag name=fitsSupport for images and data from FITS

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

2015-04-11 Thread Andrew Savchenko 
commit: 528353b6b98e2c209c1e42316513e103f1afc891
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Sat Apr 11 18:11:19 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Sat Apr 11 18:11:19 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=528353b6

sci-physics/root: fix clang runtime mismatch

 sci-physics/root/ChangeLog   | 6 ++
 sci-physics/root/{root-6.02.05.ebuild = root-6.02.05-r1.ebuild} | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index b62d422..b1b0b0a 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # 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-r1 (11 Apr 2015)
+
+  11 Apr 2015; Andrew Savchenko birc...@gentoo.org -root-6.02.05.ebuild,
+  +root-6.02.05-r1.ebuild:
+  Fix clang buildtime vs runtime mismatch.
+
   11 Apr 2015; Andrew Savchenko birc...@gentoo.org root-6.02.05.ebuild:
   Drop minimal USE flag, as it is useless with current ROOT and
   recently added USE flags.

diff --git a/sci-physics/root/root-6.02.05.ebuild 
b/sci-physics/root/root-6.02.05-r1.ebuild
similarity index 99%
rename from sci-physics/root/root-6.02.05.ebuild
rename to sci-physics/root/root-6.02.05-r1.ebuild
index 0a1f7e0..2d7388b 100644
--- a/sci-physics/root/root-6.02.05.ebuild
+++ b/sci-physics/root/root-6.02.05-r1.ebuild
@@ -46,7 +46,7 @@ CDEPEND=
media-fonts/dejavu
media-libs/freetype:2=
media-libs/libpng:0=
-   =sys-devel/clang-3.4
+   =sys-devel/clang-3.4:=
sys-libs/zlib:0=
virtual/shadow
X? (

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

2015-04-11 Thread Andrew Savchenko 
commit: 2fb06979eefdd4cc62c8890b50f9e6f995b5b7a6
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Sat Apr 11 09:22:07 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Sat Apr 11 09:22:07 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=2fb06979

sci-physics/root: drop minimal USE flag

 sci-physics/root/ChangeLog   |   4 +
 sci-physics/root/root-6.02.05.ebuild | 236 ---
 2 files changed, 115 insertions(+), 125 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index a4087b4..b62d422 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 $
 
+  11 Apr 2015; Andrew Savchenko birc...@gentoo.org root-6.02.05.ebuild:
+  Drop minimal USE flag, as it is useless with current ROOT and
+  recently added USE flags.
+
 *root-6.02.05 (08 Apr 2015)
 
   08 Apr 2015; Andrew Savchenko birc...@gentoo.org -root-6.00.02.ebuild,

diff --git a/sci-physics/root/root-6.02.05.ebuild 
b/sci-physics/root/root-6.02.05.ebuild
index 61882d5..0a1f7e0 100644
--- a/sci-physics/root/root-6.02.05.ebuild
+++ b/sci-physics/root/root-6.02.05.ebuild
@@ -24,7 +24,7 @@ DOC_URI=ftp://root.cern.ch/${PN}/doc;
 SLOT=0/$(get_version_component_range 1-3 ${PV})
 LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
 IUSE=+X afs avahi doc emacs examples fits fftw gdml geocad
-   graphviz http kerberos ldap +math +memstat minimal mpi mysql odbc
+   graphviz http kerberos ldap +math +memstat mpi mysql odbc
+opengl openmp oracle postgres prefix pythia6 pythia8
python qt4 shadow sqlite ssl table +tiff xinetd xml xrootd
 
@@ -33,7 +33,7 @@ IUSE=+X afs avahi doc emacs examples fits fftw gdml geocad
 # TODO: unbundle: cling, vdt
 
 REQUIRED_USE=
-   !X? ( !minimal? ( !opengl !qt4 !tiff ) )
+   !X? ( !opengl !qt4 !tiff )
mpi? ( math !openmp )
openmp? ( math !mpi )
python? ( ${PYTHON_REQUIRED_USE} )
@@ -55,51 +55,48 @@ CDEPEND=
x11-libs/libX11:0=
x11-libs/libXext:0=
x11-libs/libXpm:0=
-   !minimal? (
-   || (
-   media-libs/libafterimage:0=[gif,jpeg,png,tiff?]
-   =x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff?]
-   )
-   opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
-   qt4? (
-   dev-qt/qtgui:4=
-   dev-qt/qtopengl:4=
-   dev-qt/qt3support:4=
-   dev-qt/qtsvg:4=
-   dev-qt/qtwebkit:4=
-   dev-qt/qtxmlpatterns:4=
-   )
-   x11-libs/libXft:0=
+   || (
+   media-libs/libafterimage:0=[gif,jpeg,png,tiff?]
+   =x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff?]
)
-   )
-   !minimal? (
-   afs? ( net-fs/openafs )
-   avahi? ( net-dns/avahi:0= )
-   emacs? ( virtual/emacs )
-   fits? ( sci-libs/cfitsio:0= )
-   fftw? ( sci-libs/fftw:3.0= )
-   geocad? ( sci-libs/opencascade-6.8.0:= )
-   graphviz? ( media-gfx/graphviz:0= )
-   http? ( dev-libs/fcgi:0= )
-   kerberos? ( virtual/krb5 )
-   ldap? ( net-nds/openldap:0= )
-   math? (
-   sci-libs/gsl:0=
-   sci-mathematics/unuran:0=
-   mpi? ( virtual/mpi )
+   opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
+   qt4? (
+   dev-qt/qtgui:4=
+   dev-qt/qtopengl:4=
+   dev-qt/qt3support:4=
+   dev-qt/qtsvg:4=
+   dev-qt/qtwebkit:4=
+   dev-qt/qtxmlpatterns:4=
)
-   mysql? ( virtual/mysql )
-   odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
-   oracle? ( dev-db/oracle-instantclient-basic:0= )
-   postgres? ( dev-db/postgresql:= )
-   pythia6? ( sci-physics/pythia:6= )
-   pythia8? ( =sci-physics/pythia-8.1.80:8= )
-   python? ( ${PYTHON_DEPS} )
-   sqlite? ( dev-db/sqlite:3= )
-   ssl? ( dev-libs/openssl:0= )
-   xml? ( dev-libs/libxml2:2= )
-   xrootd? ( =net-libs/xrootd-3.3.5:0= )
-   )
+   x11-libs/libXft:0=
+   )
+   afs? ( net-fs/openafs )
+   avahi? ( net-dns/avahi:0= )
+   emacs? ( virtual/emacs )
+   fits? (

[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/, sci-physics/root/files/

2015-03-02 Thread git@oystercatcher mirror+tproxy 
commit: fdaad17b655abec00d1f4d5f2963774ad51e0dab
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Tue Mar  3 04:28:38 2015 +
Commit: git@oystercatcher mirror+tproxy git AT oystercatcher DOT 
gentoo DOT org
CommitDate: Tue Mar  3 04:28:38 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fdaad17b

sci-physics/root: 5.34.26 is now in portage

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-dotfont.patch  |  58 ---
 .../root/files/root-5.34.05-nobyte-compile.patch   | 137 ---
 sci-physics/root/metadata.xml  |   3 -
 sci-physics/root/root-5.34.26.ebuild   | 449 -
 5 files changed, 5 insertions(+), 647 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 1553e5c..d1fdd9d 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 $
 
+  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:
+  5.34.26 is moved to the portage tree
+
   02 Mar 2015; Andrew Savchenko birc...@gentoo.org metadata.xml:
   Indentation fixes (in order to conform to portage version)
 

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 \

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

2015-03-02 Thread Andrew Savchenko 
commit: fdaad17b655abec00d1f4d5f2963774ad51e0dab
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Tue Mar  3 04:28:38 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Tue Mar  3 04:28:38 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fdaad17b

sci-physics/root: 5.34.26 is now in portage

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-dotfont.patch  |  58 ---
 .../root/files/root-5.34.05-nobyte-compile.patch   | 137 ---
 sci-physics/root/metadata.xml  |   3 -
 sci-physics/root/root-5.34.26.ebuild   | 449 -
 5 files changed, 5 insertions(+), 647 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 1553e5c..d1fdd9d 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 $
 
+  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:
+  5.34.26 is moved to the portage tree
+
   02 Mar 2015; Andrew Savchenko birc...@gentoo.org metadata.xml:
   Indentation fixes (in order to conform to portage version)
 

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/

2015-03-02 Thread Andrew Savchenko 
commit: dfba2207c866b6fb22b3de71a89e5622205f8922
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Mon Mar  2 08:11:57 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Mon Mar  2 08:11:57 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dfba2207

sci-physics/root: cosmetics

---
 sci-physics/root/ChangeLog|  3 +++
 sci-physics/root/metadata.xml | 36 ++--
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 6f4801a..1553e5c 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,9 @@
 # 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 metadata.xml:
+  Indentation fixes (in order to conform to portage version)
+
   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

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 579f100..0ff221b 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,12 +1,12 @@
 ?xml version=1.0 encoding=UTF-8?
 !DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
 pkgmetadata
-  maintainer
-emailbirc...@gentoo.org/email
-nameAndrew Savchenko/name
-  /maintainer
-  herdsci-physics/herd
-  longdescription lang=en
+maintainer
+  emailbirc...@gentoo.org/email
+  nameAndrew Savchenko/name
+/maintainer
+herdsci-physics/herd
+longdescription lang=en
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in
   high energy physics, but also in other data analysis applications. It
@@ -14,16 +14,16 @@
   statistics, serialization, optimization, linear algebra, graphics,
   GUI toolkit, and a complete visualization framework.
 /longdescription
-  use
-flag name=c++11 Build ROOT using the C++11 standard/flag
-flag name=c++14 Build ROOT using the C++14 standard/flag
-flag name=fitsSupport for images and data from FITS files with 
pkgsci-libs/cfitsio/pkg/flag
-flag name=geocadEnable ROOT-CAD interface using 
pkgsci-libs/opencascade/pkg/flag
-flag name=httpEnable http server support including but not limited to 
fastcgi support/flag
-flag name=mathBuild all math related libraries plugins, needs 
pkgsci-libs/gsl/pkg /flag
-flag name=pythia6Build the interface for pkgsci-physics/pythia/pkg 
version 6.x /flag
-flag name=pythia8Build the interface for pkgsci-physics/pythia/pkg 
version 8.x /flag
-flag name=reflexBuild the reflection database for the C++ 
interpreter/flag
-flag name=xrootdBuild the interface for pkgnet-libs/xrootd/pkg 
/flag
-  /use
+use
+  flag name=c++11 Build ROOT using the C++11 standard/flag
+  flag name=c++14 Build ROOT using the C++14 standard/flag
+  flag name=fitsSupport for images and data from FITS files with 
pkgsci-libs/cfitsio/pkg/flag
+  flag name=geocadEnable ROOT-CAD interface using 
pkgsci-libs/opencascade/pkg/flag
+  flag name=httpEnable http server support including but not limited to 
fastcgi support/flag
+  flag name=mathBuild all math related libraries plugins, needs 
pkgsci-libs/gsl/pkg /flag
+  flag name=pythia6Build the interface for pkgsci-physics/pythia/pkg 
version 6.x /flag
+  flag name=pythia8Build the interface for pkgsci-physics/pythia/pkg 
version 8.x /flag
+  flag name=reflexBuild the reflection database for the C++ 
interpreter/flag
+  flag name=xrootdBuild the interface for pkgnet-libs/xrootd/pkg 
/flag
+/use
 /pkgmetadata

[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/

2015-02-24 Thread Andrew Savchenko 
commit: 8488f45715f6cbc2cf8d789dd20ef61a2b04218f
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Tue Feb 24 23:49:17 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Tue Feb 24 23:49:17 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8488f457

sci-physics/root: fix html header background image path

---
 sci-physics/root/ChangeLog   | 4 
 sci-physics/root/root-5.34.26.ebuild | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index a01cdc1..b8503a4 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 $
 
+  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.
+
   23 Feb 2015; Andrew Savchenko birc...@gentoo.org -root-5.34.18-r2.ebuild,
   -root-6.00.01-r1.ebuild, -files/root-5.32.00-prop-flags.patch,
   -files/root-5.34.18-tutorials-path.patch, -files/root-6.00.01-cling.patch,

diff --git a/sci-physics/root/root-5.34.26.ebuild 
b/sci-physics/root/root-5.34.26.ebuild
index 6eeb274..fdd6943 100644
--- a/sci-physics/root/root-5.34.26.ebuild
+++ b/sci-physics/root/root-5.34.26.ebuild
@@ -228,7 +228,7 @@ src_prepare() {
configure || die prefixify configure failed
 
# CSS should use local images
-   sed -i -e 's,http://.*/images/,,' etc/html/ROOT.css || die html sed 
failed
+   sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die html sed failed
 
# fix reflex path (bug #497280)
sed -i -e 's|${ROOTSYS}/lib|@libdir@|' config/genreflex.in || die

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

2015-02-23 Thread Andrew Savchenko 
commit: 521d91a20708bd163766ca4e9aa1aa686ed91b52
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Mon Feb 23 17:42:02 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Mon Feb 23 17:42:02 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=521d91a2

sci-physics/root: version bump

---
 sci-physics/root/ChangeLog |   7 +
 .../root/files/root-5.34.26-prop-flags.patch   |  19 +
 sci-physics/root/metadata.xml  |   4 +-
 sci-physics/root/root-5.34.26.ebuild   | 453 +
 4 files changed, 482 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 4ef278c..6bf87cf 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-5.34.26 (23 Feb 2015)
+
+  23 Feb 2015; Andrew Savchenko birc...@gentoo.org +root-5.34.26.ebuild,
+  +files/root-5.34.26-prop-flags.patch, metadata.xml:
+  Version bump. Add http support. Add c++14 support. Rework compilers
+  handling.
+
   01 Jan 2015; Andrew Savchenko birc...@gentoo.org root-5.34.18-r2.ebuild,
   root-6.00.01-r1.ebuild, root-6.00.02.ebuild, root-.ebuild:
   Rename virtual/postgresql to dev-db/postgresql

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
new file mode 100644
index 000..b81dbb5
--- /dev/null
+++ b/sci-physics/root/files/root-5.34.26-prop-flags.patch
@@ -0,0 +1,19 @@
+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/metadata.xml b/sci-physics/root/metadata.xml
index 26e546c..25b00d5 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -15,7 +15,9 @@
   GUI toolkit, and a complete visualization framework.
 /longdescription
   use
-flag name=c++0x Build ROOT using the C++11 standard. Not supported, 
requires pkgsys-devel/gcc/pkggt;=4.7.0/flag
+flag name=c++0x Build ROOT using the C++11 standard/flag
+flag name=c++11 Build ROOT using the C++11 standard/flag
+flag name=c++14 Build ROOT using the C++14 standard/flag
 flag name=fitsSupport for images and data from FITS files with 
pkgsci-libs/cfitsio/pkg/flag
 flag name=geocadEnable ROOT-CAD interface using 
pkgsci-libs/opencascade/pkg/flag
 flag name=httpEnable http server support including but not limited to 
fastcgi support/flag

diff --git a/sci-physics/root/root-5.34.26.ebuild 
b/sci-physics/root/root-5.34.26.ebuild
new file mode 100644
index 000..6eeb274
--- /dev/null
+++ b/sci-physics/root/root-5.34.26.ebuild
@@ -0,0 +1,453 @@
+# Copyright 1999-2015 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;
+   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
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \
+   toolchain-funcs user versionator
+
+DESCRIPTION=C++ data analysis framework and interpreter from CERN
+HOMEPAGE=http://root.cern.ch/;
+DOC_URI=ftp://root.cern.ch/${PN}/doc;
+
+SLOT=0/$(get_version_component_range 1-3 ${PV})
+LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
+IUSE=+X afs avahi c++11 c++14 doc emacs examples fits fftw
+   graphviz http kerberos ldap +math minimal mpi mysql odbc
+   +opengl openmp oracle postgres prefix pythia6 pythia8
+   python qt4 +reflex ruby sqlite ssl xinetd xml xrootd
+
+# TODO: add support for: davix
+# TODO: unbundle: vdt
+
+REQUIRED_USE=
+   !X? ( !minimal? ( !opengl !qt4 ) )
+   mpi? ( math !openmp )
+   openmp? ( math !mpi )
+   python? ( ${PYTHON_REQUIRED_USE} )
+
+
+CDEPEND=
+   app-arch/xz-utils:0=
+   =dev-lang/cfortran-4.4-r2
+   dev-libs/libpcre:3=
+   media-fonts/dejavu
+   media-libs/freetype:2=
+

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

2015-02-23 Thread Andrew Savchenko 
commit: 50ecc91f9162478c5fcc3f8595a566da758feaf1
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Mon Feb 23 17:55:43 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Mon Feb 23 17:55:43 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=50ecc91f

sci-physics/root/: remove old

---
 sci-physics/root/ChangeLog |   6 +
 .../root/files/root-5.32.00-prop-flags.patch   |  15 -
 .../root/files/root-5.34.18-tutorials-path.patch   |  94 -
 sci-physics/root/files/root-6.00.01-cling.patch|  19 -
 sci-physics/root/metadata.xml  |   1 -
 sci-physics/root/root-5.34.18-r2.ebuild| 389 --
 sci-physics/root/root-6.00.01-r1.ebuild| 442 -
 7 files changed, 6 insertions(+), 960 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 6bf87cf..a01cdc1 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # 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 $
 
+  23 Feb 2015; Andrew Savchenko birc...@gentoo.org -root-5.34.18-r2.ebuild,
+  -root-6.00.01-r1.ebuild, -files/root-5.32.00-prop-flags.patch,
+  -files/root-5.34.18-tutorials-path.patch, -files/root-6.00.01-cling.patch,
+  metadata.xml:
+  Remove old versions and unused patches.
+
 *root-5.34.26 (23 Feb 2015)
 
   23 Feb 2015; Andrew Savchenko birc...@gentoo.org +root-5.34.26.ebuild,

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
deleted file mode 100644
index 7dfeb1c..000
--- a/sci-physics/root/files/root-5.32.00-prop-flags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
 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@
- MKLIBOPTIONS   := @mkliboption@
- 
--EXTRA_CFLAGS   := -Iinclude @cflags@
--EXTRA_CXXFLAGS := -Iinclude @cflags@
--EXTRA_LDFLAGS  := @ldflags@
-+EXTRA_CFLAGS   := -Iinclude @cflags@ $(CFLAGS)
-+EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS)
-+EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
- WINRTDEBUG := @winrtdebug@
- 
- GLBPATCHFLAGS  := @glbpatchcflags@

diff --git a/sci-physics/root/files/root-5.34.18-tutorials-path.patch 
b/sci-physics/root/files/root-5.34.18-tutorials-path.patch
deleted file mode 100644
index 8bf8859..000
--- a/sci-physics/root/files/root-5.34.18-tutorials-path.patch
+++ /dev/null
@@ -1,94 +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 95fb1e5..3830955 100644
 a/core/base/src/TApplication.cxx
-+++ b/core/base/src/TApplication.cxx
-@@ -794,6 +794,22 @@ Long_t TApplication::ProcessRemote(const char *line, 
Int_t *)
-return 1;
- }
- 
-+namespace {
-+   static int PrintFile(const char* filename) {
-+  TString sFileName(filename);
-+  gSystem-ExpandPathName(sFileName);
-+  if (gSystem-AccessPathName(sFileName)) {
-+ Error(ProcessLine(), Cannot find file %s, filename);
-+ return 1;
-+  }
-+  std::ifstream instr(sFileName);
-+  TString content;
-+  content.ReadFile(instr);
-+  Printf(%s, content.Data());
-+  return 0;
-+   }
-+}
-+
- 
//__
- Long_t TApplication::ProcessLine(const char *line, Bool_t sync, Int_t *err)
- {
-@@ -827,11 +843,41 @@ Long_t TApplication::ProcessLine(const char *line, 
Bool_t sync, Int_t *err)
-   return 0;
-}
- 
--   if (!strncmp(line, ?, 1)) {
-+   if (!strncmp(line, ?, 1) || !strncmp(line, .help, 5)) {
-   Help(line);
-   return 1;
-}
- 
-+   if (!strncmp(line, .demo, 5)) {
-+  if (gROOT-IsBatch()) {
-+ Error(ProcessLine, Cannot show demos in batch mode!);
-+ return 1;
-+  }
-+#ifdef ROOTTUTDIR
-+  ProcessLine(.x  ROOTTUTDIR /demos.C);
-+#else
-+

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

2015-01-01 Thread Andrew Savchenko 
commit: e564ff76a0feebab4ec7da7dde27314f2458f15f
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Thu Jan  1 23:09:10 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Thu Jan  1 23:09:10 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e564ff76

Properly fix bug 534086

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

---
 sci-physics/root/ChangeLog  | 4 
 sci-physics/root/root-5.34.18-r2.ebuild | 2 +-
 sci-physics/root/root-6.00.01-r1.ebuild | 2 +-
 sci-physics/root/root-6.00.02.ebuild| 2 +-
 sci-physics/root/root-.ebuild   | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index c6b232d..4ef278c 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -4,6 +4,10 @@
 
   01 Jan 2015; Andrew Savchenko birc...@gentoo.org root-5.34.18-r2.ebuild,
   root-6.00.01-r1.ebuild, root-6.00.02.ebuild, root-.ebuild:
+  Rename virtual/postgresql to dev-db/postgresql
+
+  01 Jan 2015; Andrew Savchenko birc...@gentoo.org root-5.34.18-r2.ebuild,
+  root-6.00.01-r1.ebuild, root-6.00.02.ebuild, root-.ebuild:
   Use virtual for postgres dependency. This fixes bug 534086,
   reported by Juergen Rose
 

diff --git a/sci-physics/root/root-5.34.18-r2.ebuild 
b/sci-physics/root/root-5.34.18-r2.ebuild
index 34e6a59..7108ae3 100644
--- a/sci-physics/root/root-5.34.18-r2.ebuild
+++ b/sci-physics/root/root-5.34.18-r2.ebuild
@@ -88,7 +88,7 @@ CDEPEND=
mysql? ( virtual/mysql )
odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
oracle? ( dev-db/oracle-instantclient-basic:0= )
-   postgres? ( virtual/postgresql:= )
+   postgres? ( dev-db/postgresql:= )
pythia6? ( sci-physics/pythia:6= )
pythia8? ( =sci-physics/pythia-8.1.80:8= )
python? ( ${PYTHON_DEPS} )

diff --git a/sci-physics/root/root-6.00.01-r1.ebuild 
b/sci-physics/root/root-6.00.01-r1.ebuild
index 47ffb03..fae938e 100644
--- a/sci-physics/root/root-6.00.01-r1.ebuild
+++ b/sci-physics/root/root-6.00.01-r1.ebuild
@@ -93,7 +93,7 @@ CDEPEND=
mysql? ( virtual/mysql )
odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
oracle? ( dev-db/oracle-instantclient-basic:0= )
-   postgres? ( virtual/postgresql:= )
+   postgres? ( dev-db/postgresql:= )
pythia6? ( sci-physics/pythia:6= )
pythia8? ( =sci-physics/pythia-8.1.80:8= )
python? ( ${PYTHON_DEPS} )

diff --git a/sci-physics/root/root-6.00.02.ebuild 
b/sci-physics/root/root-6.00.02.ebuild
index a396ada..2711170 100644
--- a/sci-physics/root/root-6.00.02.ebuild
+++ b/sci-physics/root/root-6.00.02.ebuild
@@ -93,7 +93,7 @@ CDEPEND=
mysql? ( virtual/mysql )
odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
oracle? ( dev-db/oracle-instantclient-basic:0= )
-   postgres? ( virtual/postgresql:= )
+   postgres? ( dev-db/postgresql:= )
pythia6? ( sci-physics/pythia:6= )
pythia8? ( =sci-physics/pythia-8.1.80:8= )
python? ( ${PYTHON_DEPS} )

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index bb8d51b..ac10320 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -93,7 +93,7 @@ CDEPEND=
mysql? ( virtual/mysql )
odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
oracle? ( dev-db/oracle-instantclient-basic:0= )
-   postgres? ( virtual/postgresql:= )
+   postgres? ( dev-db/postgresql:= )
pythia6? ( sci-physics/pythia:6= )
pythia8? ( =sci-physics/pythia-8.1.80:8= )
python? ( ${PYTHON_DEPS} )

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

2015-01-01 Thread Andrew Savchenko 
commit: 83c35df612bc3c704352e1328ac857d5c9addec5
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Thu Jan  1 15:16:27 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Thu Jan  1 15:16:27 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=83c35df6

Fix bug 534086

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

---
 sci-physics/root/ChangeLog  | 5 +
 sci-physics/root/root-5.34.18-r2.ebuild | 4 ++--
 sci-physics/root/root-6.00.01-r1.ebuild | 4 ++--
 sci-physics/root/root-6.00.02.ebuild| 4 ++--
 sci-physics/root/root-.ebuild   | 4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 75d4a97..c6b232d 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 $
 
+  01 Jan 2015; Andrew Savchenko birc...@gentoo.org root-5.34.18-r2.ebuild,
+  root-6.00.01-r1.ebuild, root-6.00.02.ebuild, root-.ebuild:
+  Use virtual for postgres dependency. This fixes bug 534086,
+  reported by Juergen Rose
+
   01 Jan 2015; Andrew Savchenko birc...@gentoo.org metadata.xml:
   Update maintainer information.
 

diff --git a/sci-physics/root/root-5.34.18-r2.ebuild 
b/sci-physics/root/root-5.34.18-r2.ebuild
index 7ce12fd..34e6a59 100644
--- a/sci-physics/root/root-5.34.18-r2.ebuild
+++ b/sci-physics/root/root-5.34.18-r2.ebuild
@@ -1,4 +1,4 @@
-# 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/sci-physics/root/root-5.34.18-r1.ebuild,v 
1.3 2014/03/27 18:51:54 bicatali Exp $
 
@@ -88,7 +88,7 @@ CDEPEND=
mysql? ( virtual/mysql )
odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
oracle? ( dev-db/oracle-instantclient-basic:0= )
-   postgres? ( dev-db/postgresql-base:= )
+   postgres? ( virtual/postgresql:= )
pythia6? ( sci-physics/pythia:6= )
pythia8? ( =sci-physics/pythia-8.1.80:8= )
python? ( ${PYTHON_DEPS} )

diff --git a/sci-physics/root/root-6.00.01-r1.ebuild 
b/sci-physics/root/root-6.00.01-r1.ebuild
index 6fe0c16..47ffb03 100644
--- a/sci-physics/root/root-6.00.01-r1.ebuild
+++ b/sci-physics/root/root-6.00.01-r1.ebuild
@@ -1,4 +1,4 @@
-# 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/sci-physics/root/root-5.34.18-r1.ebuild,v 
1.3 2014/03/27 18:51:54 bicatali Exp $
 
@@ -93,7 +93,7 @@ CDEPEND=
mysql? ( virtual/mysql )
odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
oracle? ( dev-db/oracle-instantclient-basic:0= )
-   postgres? ( dev-db/postgresql-base:= )
+   postgres? ( virtual/postgresql:= )
pythia6? ( sci-physics/pythia:6= )
pythia8? ( =sci-physics/pythia-8.1.80:8= )
python? ( ${PYTHON_DEPS} )

diff --git a/sci-physics/root/root-6.00.02.ebuild 
b/sci-physics/root/root-6.00.02.ebuild
index e53ed3d..a396ada 100644
--- a/sci-physics/root/root-6.00.02.ebuild
+++ b/sci-physics/root/root-6.00.02.ebuild
@@ -1,4 +1,4 @@
-# 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/sci-physics/root/root-5.34.18-r1.ebuild,v 
1.3 2014/03/27 18:51:54 bicatali Exp $
 
@@ -93,7 +93,7 @@ CDEPEND=
mysql? ( virtual/mysql )
odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
oracle? ( dev-db/oracle-instantclient-basic:0= )
-   postgres? ( dev-db/postgresql-base:= )
+   postgres? ( virtual/postgresql:= )
pythia6? ( sci-physics/pythia:6= )
pythia8? ( =sci-physics/pythia-8.1.80:8= )
python? ( ${PYTHON_DEPS} )

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index 361cda0..bb8d51b 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -1,4 +1,4 @@
-# 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/sci-physics/root/root-5.34.18-r1.ebuild,v 
1.3 2014/03/27 18:51:54 bicatali Exp $
 
@@ -93,7 +93,7 @@ CDEPEND=
mysql? ( virtual/mysql )
odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
oracle? (

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

2015-01-01 Thread Andrew Savchenko 
commit: 908be7255801ec31df50c7d92d6c19a6e421bb10
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Thu Jan  1 15:10:56 2015 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Thu Jan  1 15:10:56 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=908be725

Update maintainer info

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

---
 sci-physics/root/ChangeLog| 5 -
 sci-physics/root/metadata.xml | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 9b1b2dd..75d4a97 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-physics/root
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# 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 $
 
+  01 Jan 2015; Andrew Savchenko birc...@gentoo.org metadata.xml:
+  Update maintainer information.
+
   10 Nov 2014; Oliver Freyermuth o.freyerm...@googlemail.com
   root-.ebuild:
   Drop prop-flags patch for root-, patch fails starting from 5.34.23 and

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index abe803e..26e546c 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -2,12 +2,10 @@
 !DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
 pkgmetadata
   maintainer
-emailbirc...@gmail.com/email
+emailbirc...@gentoo.org/email
 nameAndrew Savchenko/name
-descriptionMaintainer. Assign bugs to him/description
   /maintainer
   herdsci-physics/herd
-  herdproxy-maintainers/herd
   longdescription lang=en
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in

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

2014-11-10 Thread Justin Lecher 
commit: 6fa7e817a17a98f9dddb4b9094c7877aab433706
Author: Oliver Freyermuth o.freyermuth AT googlemail DOT com
AuthorDate: Mon Nov 10 00:36:44 2014 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Mon Nov 10 00:36:44 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6fa7e817

Drop prop-flags patch for root-, patch fails starting from 5.34.23 and ROOT 
6 master. Upstream offers configure-flags to set proper flags starting now.

---
 sci-physics/root/ChangeLog| 6 ++
 sci-physics/root/root-.ebuild | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index aff13e1..9b1b2dd 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 $
 
+  10 Nov 2014; Oliver Freyermuth o.freyerm...@googlemail.com
+  root-.ebuild:
+  Drop prop-flags patch for root-, patch fails starting from 5.34.23 and
+  ROOT 6 master. Upstream offers configure-flags to set proper flags starting
+  now. 
+
   25 Oct 2014; Matthias Maier tam...@gentoo.org root-5.34.18-r2.ebuild,
   root-6.00.01-r1.ebuild, root-6.00.02.ebuild, root-.ebuild:
   sci-physics/root: Fix compilation with USE=mysql wrt bug #523996; fix

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index 00f4946..361cda0 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -198,7 +198,6 @@ src_prepare() {
${FILESDIR}/${PN}-5.34.13-desktop.patch \
${FILESDIR}/${PN}-6.00.01-dotfont.patch \
${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
 
@@ -299,6 +298,8 @@ src_configure() {
--enable-soversion
--enable-table
--fail-on-missing
+   --cflags='${CFLAGS}'
+   --cxxflags='${CXXFLAGS}'
$(use_enable X x11)
$(use_enable X asimage)
$(use_enable X xft)

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

2014-10-26 Thread Justin Lecher 
commit: 4c982f626dbae30caa5885b7bf1181baf6cf9592
Author: Matthias Maier tamiko AT gentoo DOT org
AuthorDate: Sat Oct 25 15:50:40 2014 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Sat Oct 25 15:50:40 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4c982f62

sci-physics/root: Fix compilation with USE=mysql wrt bug #523996; fix 
die_compiler message

Package-Manager: portage-2.2.8-r2

---
 sci-physics/root/ChangeLog  |  5 +
 sci-physics/root/root-5.34.18-r2.ebuild |  2 ++
 sci-physics/root/root-6.00.01-r1.ebuild |  2 ++
 sci-physics/root/root-6.00.02.ebuild| 10 ++
 sci-physics/root/root-.ebuild   | 10 ++
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 9b455b6..aff13e1 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # 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 $
 
+  25 Oct 2014; Matthias Maier tam...@gentoo.org root-5.34.18-r2.ebuild,
+  root-6.00.01-r1.ebuild, root-6.00.02.ebuild, root-.ebuild:
+  sci-physics/root: Fix compilation with USE=mysql wrt bug #523996; fix
+  die_compiler message
+
   29 Sep 2014; Justin Lecher j...@gentoo.org root-6.00.02.ebuild,
   +files/root-6.00.02-tm_zone.patch, metadata.xml:
   Backport fix for build failure

diff --git a/sci-physics/root/root-5.34.18-r2.ebuild 
b/sci-physics/root/root-5.34.18-r2.ebuild
index 072b81d..7ce12fd 100644
--- a/sci-physics/root/root-5.34.18-r2.ebuild
+++ b/sci-physics/root/root-5.34.18-r2.ebuild
@@ -260,6 +260,8 @@ src_configure() {
$(use_enable math tmva)
$(use_enable math unuran)
$(use_enable mysql)
+   $(usex mysql \
+   
--with-mysql-incdir=${EPREFIX}/usr/include/mysql )
$(use_enable odbc)
$(use_enable opengl)
$(use_enable oracle)

diff --git a/sci-physics/root/root-6.00.01-r1.ebuild 
b/sci-physics/root/root-6.00.01-r1.ebuild
index ebc10e1..6fe0c16 100644
--- a/sci-physics/root/root-6.00.01-r1.ebuild
+++ b/sci-physics/root/root-6.00.01-r1.ebuild
@@ -322,6 +322,8 @@ src_configure() {
$(use_enable math vdt)
$(use_enable math unuran)
$(use_enable mysql)
+   $(usex mysql \
+   
--with-mysql-incdir=${EPREFIX}/usr/include/mysql )
$(use_enable odbc)
$(use_enable opengl)
$(use_enable oracle)

diff --git a/sci-physics/root/root-6.00.02.ebuild 
b/sci-physics/root/root-6.00.02.ebuild
index 5208cc9..e53ed3d 100644
--- a/sci-physics/root/root-6.00.02.ebuild
+++ b/sci-physics/root/root-6.00.02.ebuild
@@ -128,10 +128,10 @@ PDEPEND=doc? ( ~app-doc/root-docs-${PV}[http=,math=] )
 DOC_DIR=/usr/share/doc/${P}
 
 die_compiler() {
-   die Need one of the following C++11 capable compilers:
-   die =sys-devel/gcc[cxx]-4.8
-   die =sys-devel/clang-3.4
-   die =dev-lang/icc-13
+   die Need one of the following C++11 capable compilers:\
+   =sys-devel/gcc[cxx]-4.8\
+   =sys-devel/clang-3.4\
+   =dev-lang/icc-13
 }
 
 pkg_setup() {
@@ -322,6 +322,8 @@ src_configure() {
$(use_enable math vdt)
$(use_enable math unuran)
$(use_enable mysql)
+   $(usex mysql \
+   
--with-mysql-incdir=${EPREFIX}/usr/include/mysql )
$(use_enable odbc)
$(use_enable opengl)
$(use_enable oracle)

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index b2074ac..00f4946 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -128,10 +128,10 @@ PDEPEND=doc? ( ~app-doc/root-docs-${PV}[http=,math=] )
 DOC_DIR=/usr/share/doc/${P}
 
 die_compiler() {
-   die Need one of the following C++11 capable compilers:
-   die =sys-devel/gcc[cxx]-4.8
-   die =sys-devel/clang-3.4
-   die =dev-lang/icc-13
+   die Need one of the following C++11 capable compilers:\
+   =sys-devel/gcc[cxx]-4.8\
+   =sys-devel/clang-3.4\
+   =dev-lang/icc-13
 }
 
 pkg_setup() {
@@ -320,6 +320,8 @@ src_configure() {
$(use_enable math vdt)
$(use_enable math unuran)
$(use_enable mysql)
+   $(usex mysql \
+   
--with-mysql-incdir=${EPREFIX}/usr/include/mysql )

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

2014-09-29 Thread Justin Lecher 
commit: df5e38cf351735f4822dd8706a8739368269bf6b
Author: Justin Lecher jlec AT gentoo DOT org
AuthorDate: Mon Sep 29 13:12:24 2014 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Mon Sep 29 13:12:24 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=df5e38cf

sci-physics/root: Backport fix for build failure

Package-Manager: portage-2.2.14_rc1

---
 sci-physics/root/ChangeLog|  4 +++
 sci-physics/root/files/root-6.00.02-tm_zone.patch | 22 +
 sci-physics/root/metadata.xml | 38 +++
 sci-physics/root/root-6.00.02.ebuild  |  3 +-
 4 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index e2b9be7..9b455b6 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # 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 $
 
+  29 Sep 2014; Justin Lecher j...@gentoo.org root-6.00.02.ebuild,
+  +files/root-6.00.02-tm_zone.patch, metadata.xml:
+  Backport fix for build failure
+
 *root-5.34.18-r2 (06 Jul 2014)
 
   06 Jul 2014; Andrew Savchenko birc...@gmail.com +root-5.34.18-r2.ebuild,

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
new file mode 100644
index 000..cdd1b13
--- /dev/null
+++ b/sci-physics/root/files/root-6.00.02-tm_zone.patch
@@ -0,0 +1,22 @@
+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/metadata.xml b/sci-physics/root/metadata.xml
index 622d99a..abe803e 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,14 +1,14 @@
 ?xml version=1.0 encoding=UTF-8?
 !DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
 pkgmetadata
-maintainer
-  emailbirc...@gmail.com/email
-  nameAndrew Savchenko/name
-  descriptionMaintainer. Assign bugs to him/description
-/maintainer
-herdsci-physics/herd
-herdproxy-maintainers/herd
-longdescription lang=en
+  maintainer
+emailbirc...@gmail.com/email
+nameAndrew Savchenko/name
+descriptionMaintainer. Assign bugs to him/description
+  /maintainer
+  herdsci-physics/herd
+  herdproxy-maintainers/herd
+  longdescription lang=en
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in
   high energy physics, but also in other data analysis applications. It
@@ -16,15 +16,15 @@
   statistics, serialization, optimization, linear algebra, graphics,
   GUI toolkit, and a complete visualization framework.
 /longdescription
-use
-  flag name=c++0x Build ROOT using the C++11 standard. Not supported, 
requires pkgsys-devel/gcc/pkggt;=4.7.0/flag
-  flag name=fitsSupport for images and data from FITS files with 
pkgsci-libs/cfitsio/pkg/flag
-  flag name=geocadEnable ROOT-CAD interface using 
pkgsci-libs/opencascade/pkg/flag
-  flag name=httpEnable http server support including but not limited to 
fastcgi support/flag
-  flag name=mathBuild all math related libraries plugins, needs 
pkgsci-libs/gsl/pkg /flag
-  flag name=pythia6Build the interface for pkgsci-physics/pythia/pkg 
version 6.x /flag
-  flag name=pythia8Build the interface for pkgsci-physics/pythia/pkg 
version 8.x /flag
-  flag name=reflexBuild the reflection database for the C++ 
interpreter/flag
-  flag name=xrootdBuild the interface for pkgnet-libs/xrootd/pkg 
/flag
-/use
+  use
+flag name=c++0x Build ROOT using the C++11 standard. Not supported, 
requires pkgsys-devel/gcc/pkggt;=4.7.0/flag
+flag name=fitsSupport for images and data from FITS files with 
pkgsci-libs/cfitsio/pkg/flag
+flag name=geocadEnable ROOT-CAD interface using 
pkgsci-libs/opencascade/pkg/flag
+flag name=httpEnable http server support including but not limited to 
fastcgi support/flag
+flag name=mathBuild all math related libraries plugins, needs 
pkgsci-libs/gsl/pkg /flag
+flag

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

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

sci-physics/root: rectify license list

---
 sci-physics/root/ChangeLog  | 4 
 sci-physics/root/root-6.00.01-r1.ebuild | 2 +-
 sci-physics/root/root-6.00.02.ebuild| 2 +-
 sci-physics/root/root-.ebuild   | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 3759527..0af159b 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # 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 $
 
+  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.
+
 *root-6.00.02 (05 Jul 2014)
 
   05 Jul 2014; Andrew Savchenko birc...@gmail.com +root-6.00.02.ebuild:

diff --git a/sci-physics/root/root-6.00.01-r1.ebuild 
b/sci-physics/root/root-6.00.01-r1.ebuild
index d5993c0..ebc10e1 100644
--- a/sci-physics/root/root-6.00.01-r1.ebuild
+++ b/sci-physics/root/root-6.00.01-r1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE=http://root.cern.ch/;
 DOC_URI=ftp://root.cern.ch/${PN}/doc;
 
 SLOT=0/$(get_version_component_range 1-3 ${PV})
-LICENSE=LGPL-2.1 freedist GPL-2 MSttfEULA LGPL-3 libpng UoI-NCSA
+LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
 IUSE=+X afs avahi doc emacs examples fits fftw geocad graphviz
http kerberos ldap +math minimal mpi mysql odbc +opengl openmp
oracle postgres prefix pythia6 pythia8 python qt4 sqlite ssl

diff --git a/sci-physics/root/root-6.00.02.ebuild 
b/sci-physics/root/root-6.00.02.ebuild
index 9c76fed..01d4eda 100644
--- a/sci-physics/root/root-6.00.02.ebuild
+++ b/sci-physics/root/root-6.00.02.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE=http://root.cern.ch/;
 DOC_URI=ftp://root.cern.ch/${PN}/doc;
 
 SLOT=0/$(get_version_component_range 1-3 ${PV})
-LICENSE=LGPL-2.1 freedist GPL-2 MSttfEULA LGPL-3 libpng UoI-NCSA
+LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
 IUSE=+X afs avahi doc emacs examples fits fftw geocad graphviz
http kerberos ldap +math minimal mpi mysql odbc +opengl openmp
oracle postgres prefix pythia6 pythia8 python qt4 sqlite ssl

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index 66f8d87..b2074ac 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE=http://root.cern.ch/;
 DOC_URI=ftp://root.cern.ch/${PN}/doc;
 
 SLOT=0/$(get_version_component_range 1-3 ${PV})
-LICENSE=LGPL-2.1 freedist GPL-2 MSttfEULA LGPL-3 libpng UoI-NCSA
+LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
 IUSE=+X afs avahi doc emacs examples fits fftw geocad graphviz
http kerberos ldap +math minimal mpi mysql odbc +opengl openmp
oracle postgres prefix pythia6 pythia8 python qt4 sqlite ssl

[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/

2014-07-03 Thread Andrew Savchenko 
commit: 9ba6913bfa97c94855dd0a0834a66ff0111298f8
Author: Andrew Savchenko bircoph AT gmail DOT com
AuthorDate: Thu Jul  3 14:15:06 2014 +
Commit: Andrew Savchenko bircoph AT gmail DOT com
CommitDate: Thu Jul  3 14:15:06 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9ba6913b

sci-physcis/root-: patch moved to upstream

---
 sci-physics/root/ChangeLog| 3 +++
 sci-physics/root/root-.ebuild | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 4770753..893e1ea 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,9 @@
 # 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 $
 
+  03 Jul 2014; Andrew Savchenko birc...@gmail.com root-.ebuild:
+  Tutorial-dirs patch is accepted upstream.
+
   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

diff --git a/sci-physics/root/root-.ebuild 
b/sci-physics/root/root-.ebuild
index 9c76fed..66f8d87 100644
--- a/sci-physics/root/root-.ebuild
+++ b/sci-physics/root/root-.ebuild
@@ -200,8 +200,7 @@ 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-tutorials-path.patch
+   ${FILESDIR}/${PN}-6.00.01-geocad.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/

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() {