public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2011-03-16 21:16 Sebastien Fabbro
  0 siblings, 0 replies; 41+ messages in thread
From: Sebastien Fabbro @ 2011-03-16 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     086ac5af129b75fd0d829c0b5bd2d21356943761
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Wed Mar 16 21:15:51 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 21:15:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=086ac5af

[sci-physics/root] now in main tree

---
 sci-physics/root/ChangeLog                         |  562 ------------------
 sci-physics/root/files/olbd.confd                  |    9 -
 sci-physics/root/files/olbd.initd                  |   26 -
 sci-physics/root/files/proofd.confd                |   12 -
 sci-physics/root/files/proofd.initd                |   26 -
 sci-physics/root/files/root-5.28.00-asneeded.patch |   20 -
 .../root/files/root-5.28.00-configure-paths.patch  |   23 -
 sci-physics/root/files/root-5.28.00-glibc212.patch |   11 -
 .../root/files/root-5.28.00-nobyte-compile.patch   |  138 -----
 .../root/files/root-5.28.00-prop-ldflags.patch     |   13 -
 sci-physics/root/files/root-5.28.00-unuran.patch   |   39 --
 .../files/root-5.28.00-xrootd-prop-flags.patch     |  606 --------------------
 sci-physics/root/files/rootd.confd                 |    8 -
 sci-physics/root/files/rootd.initd                 |   28 -
 sci-physics/root/files/xrootd.confd                |    8 -
 sci-physics/root/files/xrootd.initd                |   26 -
 sci-physics/root/metadata.xml                      |   31 -
 sci-physics/root/root-5.28.00.ebuild               |  323 -----------
 18 files changed, 0 insertions(+), 1909 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
deleted file mode 100644
index d495c04..0000000
--- a/sci-physics/root/ChangeLog
+++ /dev/null
@@ -1,562 +0,0 @@
-# ChangeLog for sci-physics/root
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.73 2010/07/10 19:05:23 armin76 Exp $
-
-  07 Mar 2011; Justin Lecher <jlec@gentoo.org> root-5.28.00.ebuild:
-  Correct Slots for gtk 3 introduction to tree
-
-  08 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org> root-5.28.00.ebuild,
-  files/root-5.28.00-xrootd-prop-flags.patch:
-  Respect more LDFLAGS. Go back to old style python and ruby modules, multiple
-  ABIs too much of a bloat.
-
-*root-5.28.00 (20 Dec 2010)
-
-  20 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> -root-5.26.00e.ebuild,
-  -files/root-5.26.00e-configure-paths.patch,
-  -files/root-5.26.00e-glibc212.patch, -files/root-5.26.00e-make-3.82.patch,
-  -files/root-5.26.00e-nobyte-compile.patch,
-  -files/root-5.26.00e-prop-ldflags.patch,
-  -files/root-5.26.00e-xrootd-prop-flags.patch, +root-5.28.00.ebuild,
-  +files/root-5.28.00-asneeded.patch,
-  +files/root-5.28.00-configure-paths.patch,
-  +files/root-5.28.00-glibc212.patch, +files/root-5.28.00-nobyte-compile.patch,
-  +files/root-5.28.00-prop-ldflags.patch, +files/root-5.28.00-unuran.patch,
-  +files/root-5.28.00-xrootd-prop-flags.patch, metadata.xml:
-  Version bump. Still a bit experimental. Changed python directory and ruby
-  directory to more standard paths. Unbundled unuran. A few more options.
-  Thanks much to Andrew Savchenko for his work on the patches (bug #348993).
-  Also prefix clean, bug #346933, thanks XU Benda
-
-  16 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org> root-5.26.00e.ebuild,
-  +files/root-5.26.00e-make-3.82.patch:
-  backport upstream patch to fix build with gmake-3.82
-
-  14 Oct 2010; Sébastien Fabbro <bicatali@gentoo.org>
-  +root-5.26.00e.ebuild, +files/root-5.26.00e-configure-paths.patch,
-  +files/root-5.26.00e-glibc212.patch,
-  +files/root-5.26.00e-nobyte-compile.patch,
-  +files/root-5.26.00e-prop-ldflags.patch,
-  +files/root-5.26.00e-xrootd-prop-flags.patch, +files/olbd.confd,
-  +files/olbd.initd, +files/proofd.confd, +files/proofd.initd,
-  +files/rootd.confd, +files/rootd.initd, +files/xrootd.confd,
-  +files/xrootd.initd, +metadata.xml:
-  root experimental
-
-*root-5.26.00e (14 Oct 2010)
-
-  14 Oct 2010; Sébastien Fabbro <bicatali@gentoo.org>
-  +root-5.26.00e.ebuild, +files/root-5.26.00e-configure-paths.patch,
-  +files/root-5.26.00e-glibc212.patch,
-  +files/root-5.26.00e-nobyte-compile.patch,
-  +files/root-5.26.00e-prop-ldflags.patch,
-  +files/root-5.26.00e-xrootd-prop-flags.patch, +files/olbd.confd,
-  +files/olbd.initd, +files/proofd.confd, +files/proofd.initd,
-  +files/rootd.confd, +files/rootd.initd, +files/xrootd.confd,
-  +files/xrootd.initd, +metadata.xml:
-  Version bump, patch for afs submitted by Andrew Savchenko. Still buggy
-  with glibc-2.12 with cint.
-
-  10 Jul 2010; Raúl Porcel <armin76@gentoo.org> root-5.26.00-r2.ebuild:
-  sparc stable wrt #318469
-
-  06 Jul 2010; Sébastien Fabbro <bicatali@gentoo.org>
-  root-5.26.00-r4.ebuild:
-  Added graphviz use flag
-
-  25 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  root-5.26.00-r4.ebuild:
-  Fix usage of python_set_active_version() and python_mod_optimize(), use
-  python_mod_cleanup() instead of python_mod_optimize() in pkg_postrm() (bug
-  #316247).
-
-  25 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
-  -root-5.22.00-r3.ebuild, -root-5.24.00-r1.ebuild, -root-5.26.00-r3.ebuild,
-  root-5.26.00-r4.ebuild, -files/root-5.26.00-nobyte-compile.patch:
-  Patch bump and removed useless gsl flag
-
-*root-5.26.00-r4 (25 Jun 2010)
-
-  25 Jun 2010; Justin Lecher <jlec@gentoo.org> +root-5.26.00-r4.ebuild:
-  Fixes for PYTHON ABIs
-
-  22 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
-  root-5.26.00-r3.ebuild:
-  Removed cint7 flag, discontinued effort, and does not compile (bug
-  #324957)
-
-  17 Jun 2010; Patrick Lauer <patrick@gentoo.org> root-5.22.00-r2.ebuild,
-  root-5.22.00-r3.ebuild, root-5.24.00-r1.ebuild, root-5.26.00-r2.ebuild,
-  root-5.26.00-r3.ebuild:
-  Migrating away from deprecated postgres virtuals
-
-*root-5.26.00-r3 (14 Jun 2010)
-
-  14 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
-  +root-5.26.00-r3.ebuild:
-  New patch set from upstream fixing a number of bugs, more LDFLAGS
-  propagation fixes, added gsl flag and released as-needed for more testing
-
-  01 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
-  root-5.26.00-r2.ebuild:
-  x86 stable wrt bug #318469
-
-  25 May 2010; Pacho Ramos <pacho@gentoo.org> root-5.26.00-r2.ebuild:
-  stable amd64, bug 318469
-
-  13 May 2010; Jeroen Roovers <jer@gentoo.org> root-5.26.00-r2.ebuild:
-  Stable for HPPA (bug #318469).
-
-*root-5.26.00-r2 (10 Mar 2010)
-
-  10 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org> -root-5.26.00.ebuild,
-  -root-5.26.00-r1.ebuild, +root-5.26.00-r2.ebuild:
-  Now do not optimize dictionary upon upstream recomendation, remove buggy
-  gcc44 patch (fixing bug #305871), update various patches, documentation
-  (bug #307915) and cleaned up some seds
-
-*root-5.26.00-r1 (19 Feb 2010)
-
-  19 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org>
-  +root-5.26.00-r1.ebuild:
-  Patch version bump. Also fixed a configure problem when checking for
-  symbol (bug #305279)
-
-*root-5.26.00 (09 Jan 2010)
-
-  09 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org> +root-5.26.00.ebuild:
-  Version bump. Thanks Andrew Savchenko for his input, bug #298284
-
-  24 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
-  root-5.24.00-r1.ebuild:
-  Fixed a PIC problem when configuring with AFS (bug #294038)
-
-*root-5.24.00-r1 (19 Nov 2009)
-
-  19 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
-  root-5.22.00-r2.ebuild, root-5.22.00-r3.ebuild, -root-5.24.00.ebuild,
-  +root-5.24.00-r1.ebuild:
-  Forbid as-needed (bug #287178), fixed a syntax while installing TMVA
-  documentation, new version bump with new set of patches. Thanks Andrew
-  Savchenko for his contribution.
-
-  06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> root-5.22.00-r2.ebuild,
-  root-5.22.00-r3.ebuild, root-5.24.00.ebuild:
-  Removed alternative dependency on Qt metapackage
-
-*root-5.24.00 (24 Sep 2009)
-
-  24 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> +root-5.24.00.ebuild:
-  Version bump, still masked. A bit buggy with xrootd, cint7 and afs at
-  least on amd64. Thanks Andrew Savchenko for his work
-
-*root-5.22.00-r3 (23 Sep 2009)
-
-  23 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> -root-3.05.04.ebuild,
-  -root-5.16.00.ebuild, -files/root-5.16.00-fortran.patch,
-  -files/root-5.16.00-xft.patch, -files/sparc-root-5.16.00.patch,
-  -root-5.20.00-r3.ebuild, -files/root-5.20.00-defind.patch,
-  -root-5.22.00-r1.ebuild, +root-5.22.00-r3.ebuild, -files/proofd.xinetd,
-  -files/root.xinetd:
-  Added a few patches, including: new upstream patch revision, gcc-4.4
-  fixes, sandbox violation, passing CXXFLAGS for g4root, newer kerberos.
-  Removed fortran eclass, relying on toolchain eclass. Closing bug #275978,
-  bug #280197, bug #280869. Removed older versions, including ancient
-  root-3.x which was the only one ppc stable, but just too buggy on all
-  arches, and unsupported. Thanks to Andrew Savchenko for his contributions.
-
-  19 Jul 2009; Jeremy Olexa <darkside@gentoo.org> root-5.22.00-r2.ebuild:
-  amd64 stable, bug 275997
-
-  16 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
-  root-5.22.00-r2.ebuild:
-  stable x86, bug 275997
-
-  16 Jul 2009; Ferris McCormick <fmccor@gentoo.org> root-5.22.00-r2.ebuild:
-  Sparc stable, bug #275997.
-
-  25 Jun 2009; Sébastien Fabbro <bicatali@gentoo.org> Manifest:
-  Fixed a patch for python checking, bug #275284, thanks Adam Hunt
-
-*root-5.22.00-r2 (24 Jun 2009)
-
-  24 Jun 2009; Sébastien Fabbro <bicatali@gentoo.org>
-  +root-5.22.00-r2.ebuild:
-  New patch revision (svn #29183 )from upstream including many bug fixes
-
-  23 Jun 2009; Jeroen Roovers <jer@gentoo.org> root-5.20.00-r3.ebuild,
-  +files/root-5.20.00-defind.patch:
-  Fix spelling error causing compile failure (bug #275205).
-
-  05 May 2009; Christian Faulhammer <fauli@gentoo.org>
-  root-5.20.00-r3.ebuild:
-  stable x86, bug 245875
-
-  05 May 2009; Christian Faulhammer <fauli@gentoo.org>
-  root-5.20.00-r3.ebuild, root-5.22.00-r1.ebuild:
-  add dev-ruby/rubygems as dependency
-
-  13 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
-  root-5.20.00-r3.ebuild, -root-5.22.00.ebuild, root-5.22.00-r1.ebuild:
-  Applied a patch from Ben Bannier to fix cint7 without ROOTSYS (bug
-  #263332) and allow cross-compiling (thanks jer, bug #265482)
-
-*root-5.22.00-r1 (06 Apr 2009)
-
-  06 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
-  root-5.20.00-r3.ebuild, +root-5.22.00-r1.ebuild:
-  Fixed hicolor icons, thanks ulm, added new upstream patch and fixed doc
-  name for TMVA, thanks Ben Bannier
-
-  22 Mar 2009; Jeremy Olexa <darkside@gentoo.org> root-5.20.00-r3.ebuild:
-  amd64 stable, bug 245875
-
-  05 Mar 2009; Ferris McCormick <fmccor@gentoo.org> root-5.20.00-r3.ebuild:
-  Sparc stable and done with Bug #245875.
-
-  20 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> files/proofd.initd,
-  files/rootd.initd, files/xrootd.initd, root-5.20.00-r3.ebuild,
-  root-5.22.00.ebuild:
-  Fixed postgresql configuration (bug #251590), fixed server rootd and
-  proofd files
-
-  19 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org> root-5.22.00.ebuild:
-  Fixed ftgl dependency, closing bug #251634
-
-*root-5.22.00 (19 Dec 2008)
-
-  19 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org> +root-5.22.00.ebuild:
-  Version bump, moved to EAPI=2
-
-  19 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  root-5.20.00-r3.ebuild:
-  Forgot to apply xrootd-prop-flags patch
-
-*root-5.20.00-r3 (18 Dec 2008)
-
-  18 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  files/root-5.20.00-as-needed.patch, -files/root-5.20.00-configure.patch,
-  +files/root-5.20.00-configure-paths.patch, -files/root-5.20.00-pic.patch,
-  +files/root-5.20.00-prop-flags.patch,
-  +files/root-5.20.00-xrootd-shared.patch, +files/olbd.confd,
-  +files/olbd.initd, +files/proofd.confd, +files/proofd.initd,
-  +files/proofd.xinetd, +files/root.xinetd, +files/rootd.confd,
-  +files/rootd.initd, +files/xrootd.confd, +files/xrootd.initd,
-  -root-5.20.00-r1.ebuild, -root-5.20.00-r2.ebuild, +root-5.20.00-r3.ebuild:
-  Major revision bump with lots of changes:
-	- added proofd, rootd, xrootd initd daemons
-	- added xinetd support (use flag) for proofd and xrootd
-	- added desktop files and mimetypes
-	- fix cfortran dependency (closing bug #250432)
-	- fix qt:4 dependency
-	- fix for bad cfortran include file
-	- fix for more as-needed
-	- now propagates all flags everywhere (should close bug #250653)
-	- removed a bunch of installed files useless on gentoo
-	- install tmva tutorials
-	- now installs tutorials and tests with 'examples' use flag in 
-	  /usr/share/doc/root*/examples directory
-	- do patches instead of sed's to propose upstream.
-  Removed older revisions.
-
-  05 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  +files/root-5.20.00-ftgl_header.patch, root-5.20.00-r2.ebuild:
-  Fixed for older ftgl versions, bug #249885, thanks to Benjamin Bannier
-
-*root-5.20.00-r2 (04 Dec 2008)
-
-  04 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  -files/root-5.18.00d-gcc43.patch, -files/root-5.18.00d-makefile.patch,
-  +files/root-5.20.00-as-needed.patch, +files/root-5.20.00-ftgl.patch,
-  -files/xrootd-20071116-checksymbol.patch,
-  -files/xrootd-20071116-gcc43.patch, -files/root-pic.patch,
-  -root-5.18.00d.ebuild, -root-5.20.00.ebuild, +root-5.20.00-r2.ebuild:
-  Fixed flags propagation, fixed dependency for qt-4, fixed for forced
-  as-needed (bug #248380), fixed for ftgl > 2.1.3_rc5 (bug #248789, thanks
-  tao@post.cz), removed unixODBC as a possible odbc implementation (bug
-  #242150, thanks Benjamin Bennier), removed old version with big patches
-  (closing bug #249009)
-
-*root-5.20.00-r1 (23 Sep 2008)
-
-  23 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  +files/root-5.20.00-include-defines-file.patch,
-  +files/root-5.20.00-upstream.patch, +root-5.20.00-r1.ebuild:
-  Added a bunch of patches from Benjamin Bannier for Pythia libraries (bug
-  #230673), ruby name changes (bug #236072), opengl include files (bug
-  #236071), extra documentation (bug #236070). Also added a reflex flag to
-  enable users encountering bug #233698, some emacs changes thanks to ulm.
-  Finally, added some patches from upstream documented in
-  http://root.cern.ch/twiki/bin/view/ROOT/PatchesV5-20-00.
-
-  29 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
-  root-5.18.00d.ebuild, root-5.20.00.ebuild:
-  Added use flags in metadata.xml, removed pch use flag (buggy upstream),
-  added libiodbc as a possible implementation for ODBC. Also fixed
-  qt-xmlpatterns dependency.
-
-  27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> root-5.16.00.ebuild,
-  root-5.18.00d.ebuild:
-  QA: Get rid of deprecated qt_min_version().
-
-  26 Jul 2008; Carsten Lohrke <carlo@gentoo.org> root-5.18.00d.ebuild,
-  root-5.20.00.ebuild:
-  Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
-
-  18 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> root-5.16.00.ebuild,
-  root-5.18.00d.ebuild, root-5.20.00.ebuild:
-  Now update PYTHONPATH, thanks Benjamin Bannier, bug #232124
-
-  13 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> root-5.16.00.ebuild:
-  Added libXft dep in 5.16.00 stable version, closing bug #204725
-
-*root-5.20.00 (08 Jul 2008)
-
-  08 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  -files/root-5.16.00-afs.patch, -files/root-5.16.00-flags.patch,
-  -files/root-5.16.00-postgres.patch, +files/root-5.20.00-configure.patch,
-  +files/root-5.20.00-pic.patch, -files/root-xrootd-flags.patch,
-  -root-5.16.00-r1.ebuild, -root-5.18.00.ebuild, root-5.18.00d.ebuild,
-  +root-5.20.00.ebuild:
-  Version bump, removed some older versions. Still buggy for pre-compiled
-  headers (use flag pch), xrootd+afs, and could not test properly with
-  oracle flag
-
-  16 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  files/root-5.18.00d-gcc43.patch:
-  Added more gcc-4.3 love to the mathcore, thanks to Derek Dolney, bug
-  #226013
-
-  30 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  files/xrootd-20071116-gcc43.patch:
-  Removed cvs tags in xrootd patch, closing bug #224195
-
-*root-5.18.00d (29 May 2008)
-
-  29 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  +files/root-5.18.00d-gcc43.patch, +files/root-5.18.00d-makefile.patch,
-  +files/xrootd-20071116-checksymbol.patch,
-  +files/xrootd-20071116-gcc43.patch, +root-5.18.00d.ebuild:
-  Version bump. This version is includes patches from upstream (included in
-  sources), some local gcc-4.3 patches and various xrootd patches. Now works
-  with afs on amd64. Removed cint7 flag as it is still too buggy, added
-  xrootd use flag, added a math flag triggering all math libraries
-  (mathcore, mathmore, minuit2, roofit, unuran). Much cleanup: qt-4.4 ready,
-  removed afterimage dependency (will be back in 5.20). This version should
-  be targeted for stabilization.
-
-  21 May 2008; Tiziano Müller <dev-zero@gentoo.org> root-3.05.04.ebuild,
-  root-5.16.00.ebuild, root-5.16.00-r1.ebuild, root-5.18.00.ebuild:
-  Changed dependency for postgresql from dev-db/postgresql to
-  virtual/postgresql-server
-
-  04 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org> root-5.18.00.ebuild:
-  Fixed tutorial->tutorials, closing bug #216130
-
-  04 Apr 2008; Jeroen Roovers <jer@gentoo.org> root-5.18.00.ebuild:
-  Marked ~hppa.
-
-  18 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> root-5.18.00.ebuild:
-  Check for qt4 to be built with qt3support, closing bug #206540)
-
-*root-5.18.00 (17 Jan 2008)
-
-  17 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  +files/root-pic.patch, +files/root-xrootd-flags.patch,
-  +root-5.18.00.ebuild:
-  Version bump. Compiles with pic shared libs (via patches). Most earlier
-  patches and problems have been sent upstream.
-
-  10 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  +files/root-5.16.00-flags.patch, +files/root-5.16.00-postgres.patch,
-  +files/root-5.16.00-xft.patch, root-5.16.00-r1.ebuild:
-  Added various patches: one to respect flags in xrootd (needed for afs), one
-  to properly handle -truetype without libXft (bug #204725) and last one for
-  postgresql (bug #203015). Added pch use flag for faster compilation with g++
-
-  16 Dec 2007; Markus Dittrich <markusle@gentoo.org>
-  +files/root-5.16.00-afs.patch, root-5.16.00-r1.ebuild:
-  Added patch to fix linking problem with afs libs. Re-added afs
-  USE flag.
-
-*root-5.16.00-r1 (15 Dec 2007)
-
-  15 Dec 2007; Markus Dittrich <markusle@gentoo.org>
-  +root-5.16.00-r1.ebuild:
-  New revision with patch fixing compile failure under gcc-4.2 
-  (see bug #199591). Also removed afs support until compilation 
-  problems are fixed.
-
-  09 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org> -root-4.02.00.ebuild,
-  root-5.16.00.ebuild:
-  Forced opengl as a dep, since it needs it anyway, added a possible fix for
-  afs support, a die function for a g++ >= 4.2 and now use virtual/mysql
-  instead of dev-db/mysql
-
-  23 Nov 2007; Samuli Suominen <drac@gentoo.org> root-5.16.00.ebuild:
-  amd64 stable wrt #196282
-
-  24 Oct 2007; Christian Faulhammer <opfer@gentoo.org> root-5.16.00.ebuild:
-  stable x86, bug 196282
-
-  22 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> root-5.16.00.ebuild:
-  removed some doc install
-
-  19 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> root-5.16.00.ebuild:
-  Added a pause at the end of pkg_setup.
-
-  18 Oct 2007; Ferris McCormick <fmccor@gentoo.org> root-5.16.00.ebuild:
-  Sparc stable - Bug #196282 --- Hooray!  It's been rough, but we made it.
-
-  17 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> root-5.16.00.ebuild:
-  added libXpm as a dependency.
-
-  16 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org>
-  -files/sparc-root-5.14.00c.patch, +files/sparc-root-5.16.00.patch,
-  -files/pgsql-no-libpq-int.patch, -files/root-makefile.patch,
-  -root-3.10.02-r1.ebuild, -root-5.14.00b.ebuild, -root-5.14.00c.ebuild,
-  root-5.16.00.ebuild:
-  Cleaning old versions and fixing bug #190163, thanks to fmccor
-
-*root-5.16.00 (24 Aug 2007)
-
-  24 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org>
-  +files/root-5.16.00-fortran.patch, +root-5.16.00.ebuild:
-  Version bump. Added cern use flag. Upstream fixed xrootd for sparc and
-  parallell makes.
-
-  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; root-3.05.04.ebuild,
-  root-3.10.02-r1.ebuild, root-4.02.00.ebuild:
-  Drop virtual/x11 references.
-
-*root-5.14.00c (05 Mar 2007)
-
-  05 Mar 2007; Sébastien Fabbro <bicatali@gentoo.org>
-  +files/sparc-root-5.14.00c.patch, +root-5.14.00c.ebuild:
-  Version bump. Fixed parallel compiling and sparc architecture with a 
-  patch, from bug #87305, thanks to fmmcor.
-
-*root-5.14.00b (05 Feb 2007)
-
-  05 Feb 2007; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
-  +root-5.14.00b.ebuild:
-  Major version bump, with a lot of changes in ebuild. LICENSE changed.
-  Closing bugs #34415, #98235, #109307. Thanks for everyone in bug #109307 
-  for testing.
-
-  23 Nov 2006; Francesco Riosa <vivo@gentoo.org> root-3.05.04.ebuild,
-  root-3.10.02-r1.ebuild, root-4.02.00.ebuild:
-  dev-db/mysql => virtual/mysql
-
-  02 Jul 2006; Luis Medinas <metalgod@gentoo.org> metadata.xml:
-  Update metadata to sci-physics.
-
-  02 Jul 2006; Luis Medinas <metalgod@gentoo.org>
-  +files/pgsql-no-libpq-int.patch, +files/root-makefile.patch,
-  +metadata.xml, +root-3.05.04.ebuild, +root-3.10.02-r1.ebuild,
-  +root-4.02.00.ebuild:
-  Moved from sci-libs/root to sci-physics/root.
-
-  23 Jun 2006; Doug Goldstein <cardoe@gentoo.org> root-3.10.02-r1.ebuild,
-  root-4.02.00.ebuild:
-  USE flag qt->qt3/qt4 change
-
-  03 Feb 2006; Patrick Kursawe <phosphan@gentoo.org> root-3.05.04.ebuild,
-  root-3.10.02-r1.ebuild, root-4.02.00.ebuild:
-  Porting to modular X
-
-  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> root-3.10.02-r1.ebuild,
-  root-4.02.00.ebuild:
-  Fix qt dep per bug #100235
-
-  26 Jun 2005; Olivier Fisette <ribosome@gentoo.org>
-  -files/root-4.00.06a-gcc-3.4.patch, -root-3.03.04-r2.ebuild,
-  -root-4.00.06a.ebuild:
-  Removed obsolete versions.
-
-  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> root-4.02.00.ebuild:
-  Like on sparc, this package doesn't work yet on ppc.
-
-  29 Mar 2005; Ferris McCormick <fmccor@gentoo.org> root-4.02.00.ebuild:
-  Add -sparc keyword to make explicit that as distributed, this package cannot
-  build on sparc.  Supported architectures are hardwired in a tgz file included
-  within the package: xrootd/src/xrootd-20041124-0752.src.tgz, and in
-  unix/src/TUnixSystem.cxx, and linux:sparc is not among them.  There is no
-  apparent for this package not to work on sparc, but as constituted, it cannot
-  without upstream support.
-
-  12 Mar 2005; Patrick Kursawe <phosphan@gentoo.org> root-4.02.00.ebuild:
-  No bugs for this version for about two months -> stable
-
-*root-4.02.00 (15 Jan 2005)
-
-  15 Jan 2005; Olivier Fisette <ribosome@gentoo.org> +root-4.02.00.ebuild:
-  New version. GCC 3.4 patch no longer required.
-
-  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-*root-3.10.02-r1 (28 Dec 2004)
-
-  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> +metadata.xml,
-  +files/pgsql-no-libpq-int.patch, +files/root-4.00.06a-gcc-3.4.patch,
-  +files/root-makefile.patch, +root-3.03.04-r2.ebuild, +root-3.05.04.ebuild,
-  +root-3.10.02-r1.ebuild, +root-4.00.06a.ebuild:
-  Moved from dev-libs/root to sci-libs/root.
-
-*root-4.00.06a (02 Jul 2004)
-
-  02 Jul 2004; Patrick Kursawe <phosphan@gentoo.org> metadata.xml,
-  root-4.00.06a.ebuild, files/root-4.00.06a-gcc-3.4.patch:
-  Version bump, see bug #55719 - gcc 3.4 patch extracted from "root" CVS.
-
-*root-3.10.02-r1 (15 Jun 2004)
-
-  15 Jun 2004; Patrick Kursawe <phosphan@gentoo.org> root-3.10.02-r1.ebuild,
-  root-3.10.02.ebuild:
-  Shared libs were not found, see bug #53095
-
-  07 Jun 2004; Patrick Kursawe <phosphan@gentoo.org> root-3.10.02.ebuild:
-  According to user report (forums/slackerman) it works for amd64.
-
-*root-3.10.02 (20 Apr 2004)
-
-  20 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> root-3.10.02.ebuild:
-  Version bump, see bug #34412
-
-  06 Oct 2003; Heinrich Wendel <lanius@gentoo.org> root-3.05.04.ebuild:
-  stable bump #29947
-
-  12 Jun 2003; Seemant Kulleen <seemant@gentoo.org> root-3.03.04-r2.ebuild:
-  xfree provides xpm
-
-*root-3.05.04 (25 Apr 2003)
-
-  25 Feb 2003; Luca Barbato <kain@kain.org> root-3.05.04.ebuild :
-  New version, as suggested by Dmitry Kustov <dimok77@hotmail.com>
-  
-*root-3.03.04-r2 (22 Feb 2003)
-
-  22 Feb 2003; Bryon Roche <kain@kain.org> root-3.03.04-r1.ebuild root-3.03.04-r2.ebuild files/digest-root-3.03.04-r2 files/pgsql-no-libpq-int.patch files/root-makefile.patch :
-  Fixed header include issues with the PostgreSQL api, as well as configuration/compilation issues.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*root-3.03.04-r1 (11 Apr 2002)
-
-  24 Oct 2002; J.Alberto Suárez López <bass@gentoo.org> root-3.03.04-r1.ebuild
-  Typo error in the ebuild appear 'econ' not 'econf'.
-  
-  11 Apr 2002; G.Bevin <gbevin@gentoo.org> root-3.03.04-r1.ebuild
-  files/digest-root-3.03.04-r1 :
-  
-  Added env entry for the libs.
-  Removed rpath switch from configure since it created a segfaulting root
-  executable.
-  
-*root-3.03.04 (11 Apr 2002)
-
-  11 Apr 2002; G.Bevin <gbevin@gentoo.org> root-3.03.04.ebuild
-  files/digest-root-3.03.04 :
-  
-  Initial release

diff --git a/sci-physics/root/files/olbd.confd b/sci-physics/root/files/olbd.confd
deleted file mode 100644
index 848f4d7..0000000
--- a/sci-physics/root/files/olbd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# conf.d file for olbd daemon
-
-# User to run as (default is `xrootd')
-OLBD_USER="root"
-
-#
-# Please refer to the olbd(1) man(1) page for more
-# information on command line parameters. 
-OLBD_OPTS=""

diff --git a/sci-physics/root/files/olbd.initd b/sci-physics/root/files/olbd.initd
deleted file mode 100644
index adeb629..0000000
--- a/sci-physics/root/files/olbd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/olbd.initd,v 1.1 2008/12/18 18:10:18 bicatali Exp $
-
-depend() {
-    need net
-    use dns logger
-    provide root-file-server
-}
-
-start() {
-    ebegin "Starting ROOT open load balancer server"
-    start-stop-daemon --start --quiet --user=${OLBD_USER} \
-	--make-pidfile --pidfile=/var/run/olbd.pid \
-	--exec /usr/bin/olbd --background -- ${OLBD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ROOT open load balancer server"
-    start-stop-daemon --stop --quiet \
-	--pidfile=/var/run/olbd.pid \
-	--exec /usr/bin/olbd
-    eend $?
-}

diff --git a/sci-physics/root/files/proofd.confd b/sci-physics/root/files/proofd.confd
deleted file mode 100644
index 81720a7..0000000
--- 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 4071d1f..0000000
--- a/sci-physics/root/files/proofd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/proofd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
-
-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.00-asneeded.patch b/sci-physics/root/files/root-5.28.00-asneeded.patch
deleted file mode 100644
index b845247..0000000
--- a/sci-physics/root/files/root-5.28.00-asneeded.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- root.orig/configure	2010-12-20 07:17:54.000000000 +0000
-+++ root/configure	2010-12-20 07:16:05.000000000 +0000
-@@ -709,7 +709,7 @@
-        cat <<EOF > conftest.mk
- include ${ac_srcdir}/config/Makefile.${arch}
- conftest: conftest.c
--	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
-+	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib  -o \$@
- 
- conftest.c:
- 	echo "int main() { return 0; }" > \$@
-@@ -723,7 +723,7 @@
-        cat <<EOF > conftest.mk
- include ${ac_srcdir}/config/Makefile.${arch}
- conftest:conftest.c
--	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
-+	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@
- 
- conftest.c:
- 	echo "extern int $linksymbol (); " > \$@

diff --git a/sci-physics/root/files/root-5.28.00-configure-paths.patch b/sci-physics/root/files/root-5.28.00-configure-paths.patch
deleted file mode 100644
index e2bc30c..0000000
--- a/sci-physics/root/files/root-5.28.00-configure-paths.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- root.orig/configure	2010-12-17 22:34:50.987000643 +0300
-+++ root/configure	2010-12-17 22:35:55.046516404 +0300
-@@ -2703,8 +2703,8 @@
- if test ! "x$enable_pgsql" = "xno"; then
-     # Check for PgSQL include and library
-     check_header "libpq-fe.h" "$pgsqlincdir" $PGSQL $PGSQL/include \
--        /usr/include /usr/local/include /usr/local/pgsql/include \
--        /usr/include/pgsql /usr/include/postgresql \
-+        /usr/include/postgresql /usr/include /usr/local/include \
-+        /usr/local/pgsql/include /usr/include/pgsql \
-         /usr/include/postgresql/8.0 /usr/pgsql/include \
-         /usr/local/include/pgsql /usr/local/include/postgresql \
-         /usr/include/postgresql/8.0 /usr/pgsql /usr/local/pgsql \
-@@ -2786,7 +2786,7 @@
-     else
-         check_header "sqlext.h" "$odbcincdir" \
-             $ODBC $ODBC/include $ODBCINCDIR /usr/local/include \
--            /usr/include $finkdir/include
-+            /usr/include $finkdir/include /usr/include/iodbc
-         odbcinc=$found_hdr
-         odbcincdir=$found_dir
- 
-

diff --git a/sci-physics/root/files/root-5.28.00-glibc212.patch b/sci-physics/root/files/root-5.28.00-glibc212.patch
deleted file mode 100644
index a365431..0000000
--- a/sci-physics/root/files/root-5.28.00-glibc212.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- root.orig/net/auth/src/TAFS.cxx	2010-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 <unistd.h>
-+#   include <sys/stat.h>
- #else
- #   define ssize_t int
- #   include <io.h>
-

diff --git a/sci-physics/root/files/root-5.28.00-nobyte-compile.patch b/sci-physics/root/files/root-5.28.00-nobyte-compile.patch
deleted file mode 100644
index 7029bf1..0000000
--- a/sci-physics/root/files/root-5.28.00-nobyte-compile.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur root.orig/Makefile root/Makefile
---- root.orig/Makefile	2010-12-17 22:48:40.577775091 +0300
-+++ root/Makefile	2010-12-17 22:49:27.902497903 +0300
-@@ -1148,10 +1148,7 @@
- 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
- 	   fi; \
--	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
--	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
--	   fi; \
--	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      dir=$(RFLX_GRFLXDD:lib/=); \
- 	      while test "x$${dir}" != "x" && \
- 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-diff -Naur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.orig/bindings/pyroot/Module.mk	2010-12-17 22:48:39.941179413 +0300
-+++ root/bindings/pyroot/Module.mk	2010-12-17 22:49:27.899164943 +0300
-@@ -48,8 +48,6 @@
- ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
- $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
- endif
--ROOTPYC      := $(ROOTPY:.py=.pyc)
--ROOTPYO      := $(ROOTPY:.py=.pyo)
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- 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)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff -Naur root.orig/build/package/debian/rules root/build/package/debian/rules
---- root.orig/build/package/debian/rules	2010-12-17 22:48:40.197817461 +0300
-+++ root/build/package/debian/rules	2010-12-17 22:49:27.902497903 +0300
-@@ -623,10 +623,6 @@
- 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
- 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			
- #		$(foreach i, \
- #		   $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
- #		    -X$(i:$(DTMP)/%=%) )
-diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.orig/cint/cintex/Module.mk	2010-12-17 22:48:40.057833071 +0300
-+++ root/cint/cintex/Module.mk	2010-12-17 22:49:27.902497903 +0300
-@@ -31,10 +31,6 @@
- CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC    := $(CINTEXPY:.py=.pyc)
--CINTEXPYO    := $(CINTEXPY:.py=.pyo)
--endif
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- 		fi)
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.orig/cint/reflex/Module.mk	2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/Module.mk	2010-12-17 22:51:36.871451359 +0300
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
- 
- RFLX_LIBDIR = $(LIBDIR)
- 
-@@ -92,7 +89,7 @@
- 
- ALLEXECS += $(RFLX_GENMAPX)
- 
--POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN  += $(RFLX_GRFLXPY)
- 
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- 		  mkdir -p lib/python/genreflex; fi )
- 		cp $< $@
- 
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
--		@python -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
- 
-@@ -149,7 +144,7 @@
- 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
- 
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
- 
- clean-genreflex:
- 		@rm -rf lib/python/genreflex
-diff -Naur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.orig/cint/reflex/python/CMakeLists.txt	2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/python/CMakeLists.txt	2010-12-17 22:49:27.902497903 +0300
-@@ -15,7 +15,7 @@
- #####################   sources   ####################
- 
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
- 
- #####################  gccxmlpath ####################
- 
-

diff --git a/sci-physics/root/files/root-5.28.00-prop-ldflags.patch b/sci-physics/root/files/root-5.28.00-prop-ldflags.patch
deleted file mode 100644
index 7324319..0000000
--- a/sci-physics/root/files/root-5.28.00-prop-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur root.orig/config/Makefile.in root/config/Makefile.in
---- root.orig/config/Makefile.in	2010-12-14 17:20:26.000000000 +0300
-+++ root/config/Makefile.in	2010-12-17 22:33:34.902161458 +0300
-@@ -27,7 +27,7 @@
- 
- EXTRA_CFLAGS   := -Iinclude @cflags@
- EXTRA_CXXFLAGS := -Iinclude @cflags@
--EXTRA_LDFLAGS  := @ldflags@
-+EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
- WINRTDEBUG     := @winrtdebug@
- 
- GLBPATCHFLAGS  := @glbpatchcflags@
-

diff --git a/sci-physics/root/files/root-5.28.00-unuran.patch b/sci-physics/root/files/root-5.28.00-unuran.patch
deleted file mode 100644
index 76422da..0000000
--- a/sci-physics/root/files/root-5.28.00-unuran.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur root-trunk.orig/math/unuran/Module.mk root-trunk/math/unuran/Module.mk
---- root.orig/math/unuran/Module.mk	2010-11-25 20:41:32.000000000 +0100
-+++ root/math/unuran/Module.mk	2010-11-25 20:51:47.190704977 +0100
-@@ -20,7 +20,7 @@
- UNURANETAG   := $(call stripsrc,$(UNURANDIRS)/headers.d)
- UNRCFG       := $(call stripsrc,$(UNURANDIRS)/$(UNRVERS)/config.h)
- 
--UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -))
-+UNRTARCONTENT:=
- UNRS         := $(filter %.c, \
-                 $(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \
-                 $(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \
-@@ -69,10 +69,9 @@
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
- 
--include/%.h: 	$(UNURANDIRI)/%.h $(UNURANETAG)
-+include/%.h: 	$(UNURANDIRI)/%.h
- 		cp $< $@
- 
--$(UNURANDEP):   $(UNRCFG)
- $(UNRS):        $(UNURANETAG)
- 
- $(UNURANETAG):	$(UNRSRCS)
-@@ -125,12 +124,12 @@
- 		GNUMAKE=$(MAKE) ./configure  CC="$$ACC"  \
- 		CFLAGS="$$ACFLAGS");
- 
--$(UNURANLIB):   $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
-+$(UNURANLIB):   $(UNURANO) $(UNURANDO) $(ORDER_) \
-                 $(MAINLIBS) $(UNURANLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"  \
- 		   "$(SOFLAGS)" libUnuran.$(SOEXT) $@     \
- 		   "$(UNURANO) $(UNURANDO)"             \
--		   "$(UNURANLIBEXTRA) $(UNRO)"
-+		   "$(UNURANLIBEXTRA) -lunuran"
- 
- $(UNURANDS):    $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP)
- 		$(MAKEDIR)

diff --git a/sci-physics/root/files/root-5.28.00-xrootd-prop-flags.patch b/sci-physics/root/files/root-5.28.00-xrootd-prop-flags.patch
deleted file mode 100644
index 33ac9ae..0000000
--- a/sci-physics/root/files/root-5.28.00-xrootd-prop-flags.patch
+++ /dev/null
@@ -1,606 +0,0 @@
-diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.env.in root/net/xrootd/src/xrootd/config/GNUmake.env.in
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.env.in	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/config/GNUmake.env.in	2011-01-08 18:49:30.000000000 +0000
-@@ -45,6 +45,7 @@
- CFHASXRDCRYPTO = @hasxrdcrypto@
- 
- CFLAGS += $(CFSTRLCPY) $(CFHASOLDHDRS) $(CFFSTATAT) $(CFHASLIBZ)
-+CFLAGS += $(CXXFLAGS)
- 
- # AFS relevant variables
- @incafs@
-diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.options.in root/net/xrootd/src/xrootd/config/GNUmake.options.in
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.options.in	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/config/GNUmake.options.in	2011-01-08 18:49:30.000000000 +0000
-@@ -16,7 +16,7 @@
- CF32="$(TYPECF32)" \
- CFOP="$(@buildopt@)" \
- LD="$(TYPELD)" \
--LDOP="$(@buildopt@)" \
-+LDOP="$(LDFLAGS)" \
- LDSO="$(TYPELDSO)" \
- LIBS=" @ldsyslibs@ $(TYPELIBS)" \
- TYPE="$(TYPE)"
-@@ -33,7 +33,7 @@
- CF32="$(TYPECF32)" \
- CFOP="$(@buildopt@)" \
- LD="$(TYPELD)" \
--LDOP="$(@buildopt@)" \
-+LDOP="$(LDFLAGS)" \
- LDSO="$(TYPELDSO)" \
- LIBS=" @ldsyslibs@ $(TYPELIBS)" \
- TYPE="$(TYPE)"
-diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd	2011-01-08 18:49:30.000000000 +0000
-@@ -11,7 +11,7 @@
-              -Wall -Wno-deprecated $(CFTRACE)
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- TYPELDSO   = -shared
- TYPESHLIB  = so
-diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc	2011-01-08 18:49:30.000000000 +0000
-@@ -11,7 +11,7 @@
-              -Wall -Wno-deprecated -D__linux__ $(CFTRACE)
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- TYPELDSO   = -shared
- TYPESHLIB  = so
-diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64	2011-01-08 18:49:30.000000000 +0000
-@@ -11,7 +11,7 @@
-              -Wall -Wno-deprecated -D__linux__ $(CFTRACE)
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- TYPELDSO   = -shared
- TYPESHLIB  = so
-diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664	2011-01-08 18:49:30.000000000 +0000
-@@ -11,7 +11,7 @@
-              -Wall -Wno-deprecated -D__linux__ $(CFTRACE)
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- TYPELDSO   = -m64 -shared
- TYPESHLIB  = so
-diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc root/net/xrootd/src/xrootd/config/GNUmake.rules.icc
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.icc	2011-01-08 18:49:30.000000000 +0000
-@@ -13,7 +13,7 @@
-              -ansi -D__linux__ -D__ICC__ -wd1476 -wd191 -wd468 -wd858 -wd1224 -wd584 $(CFTRACE)
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- TYPELDSO   = -m32 -shared
- TYPESHLIB  = so
-diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664	2011-01-08 18:49:30.000000000 +0000
-@@ -14,7 +14,7 @@
-              -wd1572 -wd584 -i-dynamic $(CFTRACE)
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- TYPELDSO   = -m64 -shared
- TYPESHLIB  = so
-diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos root/net/xrootd/src/xrootd/config/GNUmake.rules.macos
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos	2011-01-08 18:49:30.000000000 +0000
-@@ -18,7 +18,7 @@
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- TYPELINK   = -undefined dynamic_lookup -multiply_defined suppress 
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
- TYPELDSO   = $(TYPELINK) -dynamiclib -single_module -m32
-diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64	2011-01-08 18:49:30.000000000 +0000
-@@ -15,7 +15,7 @@
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- TYPELINK   = -undefined dynamic_lookup -multiply_defined suppress 
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
- TYPELDSO   = $(TYPELINK) -dynamiclib -single_module -m64
-diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc	2011-01-08 18:49:30.000000000 +0000
-@@ -11,7 +11,7 @@
-              -Wall -Wno-deprecated -DSUNGCC $(CFTRACE)
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- TYPELDSO   = -shared
- TYPESHLIB  = so
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -71,7 +71,7 @@
- 
- $(TESTBIN): $(OBJECTB) $(LIBDEPS)
- 	@echo Creating executable $(TESTBIN) 
--	$(ECHO)$(LD) $(CFLAGS) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN)
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN)
- 
- $(OBJDIR)/XrdAccAccess.o: XrdAccAccess.cc     XrdAccAccess.hh \
-                           XrdAccCapability.hh XrdAccConfig.hh    XrdAccGroups.hh \
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -50,7 +50,7 @@
-   
- $(XRDADLER32): $(XRDADLER32_OBJ) $(XRDADLERDEPS)
- 	@echo Creating executable $(XRDADLER32)
--	$(ECHO)$(LD) $(LDOP) $(XRDADLER32_OBJ) $(XRDADLERLIBS) -o $(XRDADLER32)
-+	$(ECHO)$(CC) $(CXXFLAGS) $(LDFLAGS) $(XRDADLER32_OBJ) $(XRDADLERLIBS) -o $(XRDADLER32)
- 
- $(XRDADLER32_OBJ): Xrdadler32.cc \
-                    XrdPosixExtern.hh    XrdPosixXrootd.hh \
-@@ -67,7 +67,7 @@
- 
- $(XRDMPXBIN): $(XRDMPXOBJ)
- 	@echo Creating executable $(XRDMPXBIN)
--	$(ECHO)$(LD) $(LDOP) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN)
-+	$(ECHO)$(CC) $(CXXFLAGS) $(LDFLAGS) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN)
-  
- $(XRDMPXOBJ): XrdMpxStats.cc \
-               XrdNetDNS.hh       XrdNetSocket.hh   XrdNetOpts.hh \
-@@ -83,7 +83,7 @@
-  
- $(XRDW41): $(XRDW41_OBJ) $(XRDW41_DEPS)
- 	@echo Creating executable $(XRDW41)
--	$(ECHO)$(LD) $(LDOP) $(XRDW41_OBJ) $(XRDW41LIBS) -o $(XRDW41)
-+	$(ECHO)$(CC) $(CXXFLAGS) $(LDFLAGS) $(XRDW41_OBJ) $(XRDW41LIBS) -o $(XRDW41)
- 
- $(XRDW41_OBJ): XrdWait41.cc \
-                    XrdOucTList.hh \
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -67,7 +67,7 @@
- 	$(ECHO)ranlib $(LIBARCH)
- 
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS)  -o $(LIBRARY)
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS)  -o $(LIBRARY)
- 
- $(OBJDIR)/XrdBwm.o:  XrdBwm.cc           XrdBwm.hh \
-                      XrdAccAuthorize.hh \
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile	2010-12-14 14:20:22.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -160,17 +160,17 @@
- $(LIBSHARED): $(OBJECTS) $(LIBDEP)
- 	@echo Creating shared library $(LIBSHARED) 
- 	$(ECHO)rm -f $(LIBSHARED)
--	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED)
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED)
- ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
- 	$(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \
--	          $(CC) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \
-+	          $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \
- 	fi
- endif
- 
- $(LIBRARY_JNI): $(OBJECT_JNI)
- 	@echo Creating shared library $(LIBRARY_JNI) 
- 	$(ECHO)rm -f $(LIBRARY_JNI);
--	$(ECHO)$(CC) $(CFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI)
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI)
- 
- $(CLASS_JNI_TARGET): $(CLASS_JNI).java
- 	@echo Creating JNI class file $(CLASS_JNI_TARGET)
-@@ -178,27 +178,27 @@
- 
- $(BINDIR)/TestXrdClient_read: $(OBJECTS) $(OBJECTD) $(LIBDEPS)
- 	@echo Creating executable $(BINDIR)/TestXrdClient_read 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTD) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient_read
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTD) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient_read
- 
- $(BINDIR)/TestXrdClient: $(OBJECTS) $(OBJECTB) $(LIBDEPS)
- 	@echo Creating executable $(BINDIR)/TestXrdClient 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient
- 
- $(XRDCP): $(OBJECTS) $(OBJECTC) $(LIBDEPS)
- 	@echo Creating executable $(XRDCP) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTC) $(BINLIBS) $(LIBS) $(LIBZ) -o $(XRDCP)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTC) $(BINLIBS) $(LIBS) $(LIBZ) -o $(XRDCP)
- 
- $(XRDPREPTOOL): $(OBJECTS) $(OBJECT_PREPTOOL) $(LIBDEPS)
- 	@echo Creating executable $(XRDPREPTOOL)
--	$(ECHO)$(LD) $(LDOP) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBS) -o $(XRDPREPTOOL)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBS) -o $(XRDPREPTOOL)
- 
- $(XRDSTAGETOOL): $(OBJECTS) $(OBJECT_STAGETOOL) $(LIBDEPS)
- 	@echo Creating executable $(XRDSTAGETOOL) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBS) -o $(XRDSTAGETOOL)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBS) -o $(XRDSTAGETOOL)
- 
- $(XRDCLI): $(OBJECTS) $(OBJECT_CLI) $(LIBDEPS)
- 	@echo Creating executable $(XRDCLI) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECT_CLI) $(BINLIBS) $(LIBS) $(LIBREADLINE) -o $(XRDCLI)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECT_CLI) $(BINLIBS) $(LIBS) $(LIBREADLINE) -o $(XRDCLI)
- 
- $(XRDADMIN): $(PERLMOD)
- 	$(ECHO)if [ "$(PERLBIN)" != "" ]; then \
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -136,7 +136,7 @@
- 
- $(BINARY): $(OBJSRVR) $(OBJBOTH) $(LIBDEPS)
- 	@echo Creating executable $(BINARY) 
--	$(ECHO)$(LD) $(LDOP) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY)
- 
- 
- $(LIBRARY): $(OBJCLNT) $(OBJBOTH)
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -89,11 +89,11 @@
- 
- $(TARGCNSD): $(OBJCNSD) $(OBJCOM) $(LIBDEP)
- 	@echo Creating executable $(BINDIR)/XrdCnsd
--	$(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd
-+	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd
- 
- $(TARGSSI): $(OBJSSI) $(OBJCOM) $(LIBDEP)
- 	@echo Creating executable $(BINDIR)/cns_ssi
--	$(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi
-+	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi
- 
- $(OBJDIR)/XrdCnsConfig.o:  XrdCnsConfig.hh    XrdCnsConfig.cc \
-                            XrdCnsDaemon.hh    XrdCnsLogRec.hh \
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -139,7 +139,7 @@
- 
- $(LIBRARY): $(OBJECTS) $(LIBUTIL)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY)
- 
- $(LIBASSL): $(OBJCSSL)
- 	@echo Creating archive $(LIBASSL) 
-@@ -149,11 +149,11 @@
- 
- $(LIBCSSL): $(OBJCSSL) $(LIBARCH) $(LIBUTIL)
- 	@echo Creating shared library $(LIBCSSL) 
--	$(ECHO)$(LD) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL)
- 
- $(CRYPTOTEST): $(OBJECTA) $(LIBARCH) $(LIBDEPS)
- 	@echo Creating executable $(CRYPTOTEST) 
--	$(ECHO)$(LD) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST)
- 
- $(OBJDIR)/XrdCryptotest.o: XrdCryptotest.cc XrdSutAux.hh XProtocol.hh XrdSutBucket.hh \
- 			   XrdCryptoAux.hh XrdCryptoFactory.hh XrdCryptoCipher.hh \
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -133,15 +133,15 @@
- 
- $(BINADMIN): $(OBJLIB) $(OBJADMIN)          $(OBJDEPS)
- 	@echo Creating executable $(BINADMIN)
--	$(ECHO)$(LD) $(LDOP) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINADMIN)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINADMIN)
- 
- $(BINPURGD): $(OBJLIB) $(OBJPURG) $(OBJADDS) $(OBJDEPS)
- 	@echo Creating executable $(BINPURGD)
--	$(ECHO)$(LD) $(LDOP) $(OBJPURG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPURGD)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJPURG) $(OBJADDS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINPURGD)
- 
- $(BINXFRD): $(OBJLIB) $(OBJXFR) $(OBJADDS) $(OBJDEPS)
- 	@echo Creating executables $(BINXFRD)
--	$(ECHO)$(LD) $(LDOP) $(OBJXFR) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINXFRD)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJXFR) $(OBJADDS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINXFRD)
- 
- $(BINAGNT): $(BINXFRD)
- 	@echo Creating executables $(BINAGNT)
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -141,45 +141,45 @@
- 
- $(ADMIN):	$(OBJECTS_BIN_ADM) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys
- 
- $(COLLECTOR):	$(OBJECTS_BIN_CTR) $(LIBRARY_CTR) \
- 	$(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys
- 
- $(CONVTIME):	$(OBJECTS_BIN_CTM) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^
- 
- $(COUT2FILE):	$(OBJECTS_BIN_C2F) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^
- 
- $(DEBUGPACKET):	$(OBJECTS_BIN_DBP) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^
- 
- $(DECODER):	$(OBJECTS_BIN_DEC) $(LIBRARY_DEC) $(LIBRARY_OUC) \
- 	$(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^
- 
- $(DUMPPACKETS):	$(OBJECTS_BIN_DMP) $(LIBRARY_DEC) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^
- 
- $(FSENDER):	$(OBJECTS_BIN_FSD) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^
- 
- $(SENDER):	$(OBJECTS_BIN_SND) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys
- 
- $(TESTPARSER):	$(OBJECTS_BIN_TPR) $(LIBRARY_COMMON)
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^
- 
- $(OBJDIR)/%.o : %.cc
- 	@echo Compiling $(<F)
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile root/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile	2010-12-14 14:20:22.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile	2011-01-08 18:52:20.000000000 +0000
-@@ -76,14 +76,14 @@
- 
- $(LIBPLDR): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP)
- 	@echo Creating shared library $(LIBPLDR)
--	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJECTT) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBPLDR)
-+	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(OBJECTT) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBPLDR)
- 
- $(LIBRARY): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
- ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
- 	$(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \
--	   $(CC) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(MORELIBS) $(LIBS) -o $(LIBDIR)/libXrdPosix.$(TYPEDYLIB); \
-+	   $(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(MORELIBS) $(LIBS) -o $(LIBDIR)/libXrdPosix.$(TYPEDYLIB); \
- 	fi
- endif
- # MacOS X does not support linking against shared libraries so include
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile root/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile	2010-12-14 14:20:22.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -66,7 +66,7 @@
- 
- $(TARGETS): $(OBJECTS) $(OBJECTT) $(LIBDEP)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(CFLAGS) $(OBJECTT) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTT) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
- 
- $(OBJDIR)/XrdPss.o:  XrdPss.cc         XrdPss.hh      XrdPosixXrootd.hh \
-                      XrdOss.hh         XrdOssError.hh XrdOucEnv.hh \
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -6,7 +6,7 @@
-   
- include ../GNUmake.env
- 
--LFLAGS  = -L$(LIBDIR) -lXrdOuc $(LDSO)
-+LFLAGS  = $(LDSO) -L$(LIBDIR) -lXrdOuc
- 
- LIBDEPS = $(LIBDIR)/libXrdOuc.a
- 
-@@ -48,7 +48,7 @@
- 
- $(TARGETS): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJECTS) $(LFLAGS) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LFLAGS) -o $(LIBRARY)
- 
- $(OBJDIR)/XrdRootdProtocol.o: XrdRootdProtocol.hh XrdLink.hh \
-                               XrdScheduler.hh     XrdTrace.hh \
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -78,15 +78,15 @@
- 
- $(LIBRARY): $(OBJSLIB) $(LIBDEPS)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
- 
- $(TSTBINA): $(OBJECTA) $(LIBDEPS)
- 	@echo Creating executable $(TSTBINA) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTA) $(LIBS) $(BINLIBS) -o $(TSTBINA)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(LIBS) $(BINLIBS) -o $(TSTBINA)
- 
- $(TSTBINB): $(OBJECTB) $(LIBDEPS)
- 	@echo Creating executable $(TSTBINB) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTB) $(LIBS) $(BINLIBS) -o $(TSTBINB)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTB) $(LIBS) $(BINLIBS) -o $(TSTBINB)
- 
- $(OBJDIR)/XrdSecClient.o: XrdSysPthread.hh XrdSecPManager.hh XrdSecInterface.hh \
-                           XrdOucErrInfo.hh XrdSecClient.cc   XrdSecEntity.hh
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -109,19 +109,19 @@
- 
- $(LIBRARY): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(LD) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBRARY)
- 
- $(LIBLDAP): $(OBJECTC)
- 	@echo Creating shared library $(LIBLDAP) 
--	$(ECHO)$(LD) $(OBJECTC) $(LDSO) $(LIBS) -o $(LIBLDAP)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTC) $(LDSO) $(LIBS) -o $(LIBLDAP)
- 
- $(SECGSITEST): $(OBJECTA) $(LIBDEPS)
- 	@echo Creating executable $(SECGSITEST) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS) -o $(SECGSITEST)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(BINLIBS) $(LIBS) -o $(SECGSITEST)
- 
- $(SECGSIPROXY): $(OBJECTB) $(LIBDEPS)
- 	@echo Creating executable $(SECGSIPROXY) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(SECGSIPROXY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(SECGSIPROXY)
- 
- $(OBJDIR)/XrdSecgsitest.o: XrdSecgsitest.cc XrdOucString.hh \
- 		XrdSysError.hh XrdSutAux.hh XProtocol.hh XPtypes.hh XrdCryptoAux.hh \
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -45,7 +45,7 @@
- 
- $(TARGETS): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(TARGETS) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
- 
- $(OBJDIR)/XrdSecProtocolkrb4.o: XrdSecProtocolkrb4.cc XrdSecInterface.hh \
-                                 XrdSysPthread.hh      XrdOucTokenizer.hh \
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -49,7 +49,7 @@
- 
- $(TARGETS): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(TARGETS) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
- 
- $(OBJDIR)/XrdSecProtocolkrb5.o: XrdSecProtocolkrb5.cc XrdSecInterface.hh \
-                                 XrdSysPthread.hh      XrdOucTokenizer.hh \
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -65,11 +65,11 @@
- 
- $(LIBRARY): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(LIBRARY)
- 
- $(SRVADMIN): $(OBJECTA) $(LIBDEPS)
- 	@echo Creating executable $(SRVADMIN) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS)  $(RESOLVLIB) -o $(SRVADMIN)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(BINLIBS) $(LIBS)  $(RESOLVLIB) -o $(SRVADMIN)
- 
- $(OBJDIR)/XrdSecpwdSrvAdmin.o: XrdSecpwdSrvAdmin.cc \
- 		XrdOucString.hh XrdSutAux.hh XProtocol.hh XPtypes.hh \
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -85,7 +85,7 @@
- 
- $(LIBRARY): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
- 
- $(LIBGRST): $(OBJGRST)
- 	@echo Creating archive $(LIBGRST)
-@@ -95,7 +95,7 @@
- 
- $(SECSSLTEST): $(OBJECTA) $(LIBDEPS)
- 	@echo Creating executable $(SECSSLTEST)
--	$(ECHO)$(LD) $(LDOP) $(OBJECTA) -L$(LIBDIR) -lXrdSecssl $(MORELIBS) $(LIBS) -o $(SECSSLTEST)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) -L$(LIBDIR) -lXrdSecssl $(MORELIBS) $(LIBS) -o $(SECSSLTEST)
- 
- $(OBJDIR)/XrdSecProtocolsslProc.o:  XrdSecProtocolsslProc.cc 	XrdSecProtocolsslProc.hh \
- 			        XrdOucString.hh 	XrdOucHash.hh
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile	2010-12-14 14:20:22.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -69,11 +69,11 @@
- 
- $(TARGLIB): $(OBJSLIB) $(LIBDEPS)
- 	@echo Creating shared library $(TARGLIB)
--	$(ECHO)$(CC) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBSSL) $(LIBS) -o $(TARGLIB);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBSSL) $(LIBS) -o $(TARGLIB);
- 
- $(TARGBIN): $(OBJSBIN)
- 	@echo Creating executable $(TARGBIN)
--	$(ECHO)$(LD) $(LDOP) $(OBJSBIN) $(MORELIBS) $(LIBS) -o $(TARGBIN);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJSBIN) $(MORELIBS) $(LIBS) -o $(TARGBIN);
- 
- $(OBJDIR)/XrdSecProtocolsss.o: XrdSecProtocolsss.cc    XrdSecProtocolsss.hh \
-                                XrdNetDNS.hh            XrdOucErrInfo.hh \
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile	2010-12-14 14:20:23.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -45,7 +45,7 @@
- 
- $(TARGETS): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(TARGETS) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
- 
- $(OBJDIR)/XrdSecProtocolunix.o: XrdSecProtocolunix.cc XrdSecInterface.hh \
-                                 XrdSysHeaders.hh \
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile	2010-12-14 14:20:22.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -67,7 +67,7 @@
- 
- $(LIBRARY): $(OBJECTS) $(LIBDIR)/libXrdOuc.a
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJECTS) $(LIBDIR)/libXrdOuc.a $(LDSO) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LIBDIR)/libXrdOuc.a $(LDSO) -o $(LIBRARY)
- 
- $(OBJDIR)/XrdSutPFAdmin.o: XrdSutPFAdmin.cc XrdOucString.hh \
- 		XrdSutAux.hh XProtocol.hh XPtypes.hh \
-diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile	2010-12-14 14:20:22.000000000 +0000
-+++ root/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile	2011-01-08 18:49:30.000000000 +0000
-@@ -94,7 +94,7 @@
- 
- $(TARGETS): $(OBJECTS) $(OBJDEPS)
- 	@echo Creating executable $(TARGETS) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTS) $(OBJFS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(TARGETS)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(OBJFS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(TARGETS)
- 
- $(OBJDIR)/XrdXrootdAdmin.o: XrdXrootdAdmin.hh      XrdXrootdAdmin.cc \
-                             XrdXrootdTrace.hh      XrdXrootdProtocol.hh \

diff --git a/sci-physics/root/files/rootd.confd b/sci-physics/root/files/rootd.confd
deleted file mode 100644
index 7516b8c..0000000
--- a/sci-physics/root/files/rootd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# conf.d file for root daemon
-
-# User to run as (default is `rootd')
-ROOTD_USER="rootd"
-
-# Please refer to the rootd(1) man(1) page for more information on 
-# command line parameters. 
-ROOTD_OPTS=""

diff --git a/sci-physics/root/files/rootd.initd b/sci-physics/root/files/rootd.initd
deleted file mode 100644
index fe00a48..0000000
--- a/sci-physics/root/files/rootd.initd
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/rootd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
-
-depend() {
-    need net
-    use logger
-    provide root-file-server
-}
-
-start() {
-    ebegin "Starting ROOT file server"
-    pid=$(start-stop-daemon --start --quiet --user ${ROOTD_USER} \
-	--pidfile /var/run/rootd.pid \
-	--exec /usr/bin/rootd -- ${ROOTD_OPTS})
-    retval=$?
-    echo ${ROOTD_PID} > /var/run/rootd.pid
-    eend ${retval}
-}
-
-stop() {
-    ebegin "Stopping ROOT file server"
-    start-stop-daemon --stop --quiet \
-	--pidfile /var/run/rootd.pid \
-	--exec /usr/bin/rootd
-    eend $?
-}

diff --git a/sci-physics/root/files/xrootd.confd b/sci-physics/root/files/xrootd.confd
deleted file mode 100644
index e725cd1..0000000
--- a/sci-physics/root/files/xrootd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# conf.d file for xroot daemon
-
-# User to run as (default is `root')
-XROOTD_USER="root"
-
-# Please refer to the xrootd(1) man(1) page for more
-# information on command line parameters. 
-XROOTD_OPTS=""

diff --git a/sci-physics/root/files/xrootd.initd b/sci-physics/root/files/xrootd.initd
deleted file mode 100644
index 7af3355..0000000
--- a/sci-physics/root/files/xrootd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/xrootd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
-
-depend() {
-    need net
-    use logger dns
-    provide root-file-server
-}
-
-start() {
-    ebegin "Starting extended ROOTD file server"
-    start-stop-daemon --start --quiet --user ${XROOTD_USER} \
-	--make-pidfile --pidfile /var/run/xrootd.pid \
-	--exec /usr/bin/xrootd --background -- ${XROOTD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping extended ROOTD file server"
-    start-stop-daemon --stop --quiet \
-	--pidfile /var/run/xrootd.pid \
-	--exec /usr/bin/xrootd
-    eend $?
-}

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
deleted file mode 100644
index 3de1bc1..0000000
--- a/sci-physics/root/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci-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
-  contains the CINT C/C++ interpreter and many classes such as
-  statistics, serialization, optimization, linear algebra, graphics,
-  GUI toolkit, and a complete visualization framework.
-</longdescription>
-<use>
-  <flag name="clarens">
-    Buld the Clarens and PEAC plug-ins, to use in a GRID enabled
-    analysis.</flag>
-  <flag name="fits">Support for images and data from FITS files</flag>
-  <flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
-  <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
-  <flag name="pythia6">
-    Builds the interface to Pythia-6 (<pkg>sci-physics/pythia</pkg>)
-    high energy physics generation events library
-  </flag>
-  <flag name="pythia8">
-    Builds the interface to Pythia-8 (<pkg>sci-physics/pythia</pkg>)
-    high energy physics generation events library
-  </flag>
-  <flag name="reflex">Builds the reflection database for the C++ interpretor </flag>
-  <flag name="xrootd">Build the xrootd low latency file server</flag>
-</use>
-</pkgmetadata>

diff --git a/sci-physics/root/root-5.28.00.ebuild b/sci-physics/root/root-5.28.00.ebuild
deleted file mode 100644
index f460567..0000000
--- a/sci-physics/root/root-5.28.00.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2"
-
-inherit versionator eutils elisp-common fdo-mime python toolchain-funcs flag-o-matic
-
-#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-DOC_PV=5_26
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="
-	ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-	doc? (
-		ftp://root.cern.ch/root/doc/Users_Guide_${DOC_PV}.pdf
-		ftp://root.cern.ch/root/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mysql ncurses odbc +opengl openmp oracle postgres pythia6 pythia8
-	python	+reflex	ruby qt4 ssl xft xml xinetd xrootd"
-
-# libafterimage ignored, to check every version
-# see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944
-#	|| ( >=media-libs/libafterimage-1.18 x11-wm/afterstep )
-CDEPEND="
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-libs/ftgl
-	media-libs/giflib
-	media-libs/glew
-	media-libs/libpng
-	media-libs/tiff
-	sys-apps/shadow
-	virtual/jpeg
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	llvm? ( sys-devel/llvm )
-	math? ( sci-libs/gsl sci-mathematics/unuran )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	opengl? ( virtual/opengl virtual/glu )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	qt4? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-opengl:4
-		x11-libs/qt-qt3support:4
-		x11-libs/qt-svg:4
-		x11-libs/qt-webkit:4
-		x11-libs/qt-xmlpatterns:4 )
-	ruby? (
-		dev-lang/ruby
-		dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2:2 )"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	elog
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
-	elog
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-		ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
-		ewarn "If you want to build this package with OpenMP, abort now,"
-		ewarn "and set CC to an OpenMP capable compiler"
-	elif use openmp; then
-		export USE_OPENMP=1
-		use math && export USE_PARALLEL_MINUIT2=1
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-prop-ldflags.patch \
-		"${FILESDIR}"/${P}-configure-paths.patch \
-		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-nobyte-compile.patch \
-		"${FILESDIR}"/${P}-glibc212.patch \
-		"${FILESDIR}"/${P}-xrootd-prop-flags.patch \
-		"${FILESDIR}"/${P}-unuran.patch
-
-	# use system cfortran
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
-
-	# in gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif
-	sed -i \
-		-e 's/libPythia6/libpythia6/g' \
-		-e 's/ungif/gif/g' \
-		configure || die "adjusting library names failed"
-
-	# libafterimage flags are hardcoded
-	sed -i \
-		-e 's/CFLAGS="-O3"//' \
-		-e 's/CFLAGS=$$ACFLAGS//' \
-		graf2d/asimage/Module.mk graf2d/asimage/src/libAfterImage/configure \
-		|| die "flag propagation in libafterimage failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-}
-
-src_configure() {
-	# the configure script is not the standard autotools
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-rpath \
-		--enable-asimage \
-		--enable-astiff \
-		--enable-exceptions	\
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		--with-afs-shared=yes \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable ncurses editline) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable llvm cling) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable postgres pgsql) \
-		$(use_enable pythia6) \
-		$(use_enable pythia8) \
-		$(use_enable python) \
-		$(use_enable qt4 qt) \
-		$(use_enable qt4 qtgsi) \
-		$(use_enable reflex cintex) \
-		$(use_enable reflex) \
-		$(use_enable ruby) \
-		$(use_enable ssl) \
-		$(use_enable xft) \
-		$(use_enable xml) \
-		$(use_enable xrootd) \
-		${EXTRA_ECONF} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed"
-	if use emacs; then
-		elisp-compile build/misc/*.el || die "elisp-compile failed"
-	fi
-}
-
-doc_install() {
-	cd "${S}"
-	if use doc; then
-		einfo "Installing user's guides"
-		insinto /usr/share/doc/${PF}
-		doins \
-			"${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf \
-			|| die "pdf install failed"
-		if use math; then
-			doins "${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-				|| die "math doc install failed"
-		fi
-	fi
-
-	if use examples; then
-		# these should really be taken care of by the root make install
-		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
-		doins -r tmva/test || die
-	else
-		rm -rf "${D}"/usr/share/doc/${PF}/examples
-	fi
-}
-
-daemon_install() {
-	cd "${S}"
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	use xrootd && daemons="${daemons} xrootd olbd"
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins etc/daemons/{rootd,proofd}.xinetd || die
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	sed -e 's,@prefix@,/usr,' \
-		build/package/debian/root-system-bin.desktop.in > root.desktop
-	domenu root.desktop
-	doicon "${S}"/build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root || die "doenvd failed"
-
-	# The build system installs Emacs support unconditionally and in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -rf "${ED}"/usr/share/emacs
-	if use emacs; then
-		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
-	fi
-
-	doc_install
-	daemon_install
-	desktop_install
-
-	# Cleanup of files either already distributed or unused on Gentoo
-	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-	rm "${ED}"usr/share/root/fonts/LICENSE
-	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm -f posix/mktypes dll_stl/setup \
-		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o
-	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-	rm -f "${ED}"/etc/root/proof/*.sample
-	rm -rf "${ED}"/etc/root/daemons
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
-}



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2011-08-02 21:49 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2011-08-02 21:49 UTC (permalink / raw
  To: gentoo-commits

commit:     b7ed6121e261e9cc3bfe7f354230cb3568a5b527
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue Aug  2 21:47:15 2011 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue Aug  2 21:47:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b7ed6121

Version bump based on bug 374709.

(Portage version: 2.2.0_alpha47/git/Linux i686, unsigned Manifest commit)

---
 sci-physics/root/ChangeLog                         |   24 +
 sci-physics/root/files/olbd.confd                  |    9 +
 sci-physics/root/files/olbd.initd                  |   26 +
 sci-physics/root/files/proofd.confd                |   12 +
 sci-physics/root/files/proofd.initd                |   26 +
 .../root/files/root-5.28.00b-asneeded.patch        |   20 +
 .../root/files/root-5.28.00b-glibc212.patch        |   11 +
 .../root/files/root-5.28.00b-prop-ldflags.patch    |   13 +
 sci-physics/root/files/root-5.28.00b-unuran.patch  |   39 ++
 sci-physics/root/files/root-5.30.00-lzma.patch     |   13 +
 .../root/files/root-5.30.00-nobyte-compile.patch   |  137 +++++
 .../files/root-5.30.00-xrootd-prop-flags.patch     |  623 ++++++++++++++++++++
 sci-physics/root/files/rootd.confd                 |    8 +
 sci-physics/root/files/rootd.initd                 |   28 +
 sci-physics/root/files/xrootd.confd                |    8 +
 sci-physics/root/files/xrootd.initd                |   26 +
 sci-physics/root/metadata.xml                      |   31 +
 sci-physics/root/root-5.30.00.ebuild               |  339 +++++++++++
 18 files changed, 1393 insertions(+), 0 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
new file mode 100644
index 0000000..0a930ca
--- /dev/null
+++ b/sci-physics/root/ChangeLog
@@ -0,0 +1,24 @@
+# ChangeLog for sci-physics/root
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*root-5.30.00 (02 Aug 2011)
+
+  02 Aug 2011; <andrew@gentoo.org> +files/root-5.28.00b-asneeded.patch,
+  +files/root-5.28.00b-glibc212.patch, +files/root-5.28.00b-prop-ldflags.patch,
+  +files/root-5.28.00b-unuran.patch, +root-5.30.00.ebuild,
+  +files/root-5.30.00-lzma.patch, +files/root-5.30.00-nobyte-compile.patch,
+  +files/root-5.30.00-xrootd-prop-flags.patch, +files/olbd.confd,
+  +files/olbd.initd, +files/proofd.confd, +files/proofd.initd,
+  +files/rootd.confd, +files/rootd.initd, +files/xrootd.confd,
+  +files/xrootd.initd, +metadata.xml:
+  Version bump. This are changes from bug 374709 including:
+  - upatchset update;
+  - lzma support (for root file data compression);
+  - X support is now optional (but enabled by default, of course),
+  this is extremely useful on X-less computating stations;
+  - fix tmva and roofit documentation installation (pdfs were missed due to
+  ebuild typo;
+  - some missed deps.
+  - libXft dep is controlled by xft flag.
+

diff --git a/sci-physics/root/files/olbd.confd b/sci-physics/root/files/olbd.confd
new file mode 100644
index 0000000..848f4d7
--- /dev/null
+++ b/sci-physics/root/files/olbd.confd
@@ -0,0 +1,9 @@
+# conf.d file for olbd daemon
+
+# User to run as (default is `xrootd')
+OLBD_USER="root"
+
+#
+# Please refer to the olbd(1) man(1) page for more
+# information on command line parameters. 
+OLBD_OPTS=""

diff --git a/sci-physics/root/files/olbd.initd b/sci-physics/root/files/olbd.initd
new file mode 100644
index 0000000..95b7bc5
--- /dev/null
+++ b/sci-physics/root/files/olbd.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/olbd.initd,v 1.1 2008/12/18 18:10:18 bicatali Exp $
+
+depend() {
+    need net
+    use dns logger
+    provide root-file-server
+}
+
+start() {
+    ebegin "Starting ROOT open load balancer server"
+    start-stop-daemon --start --quiet --user=${OLBD_USER} \
+	--make-pidfile --pidfile=/var/run/olbd.pid \
+	--exec /usr/bin/olbd --background -- ${OLBD_OPTS}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ROOT open load balancer server"
+    start-stop-daemon --stop --quiet \
+	--pidfile=/var/run/olbd.pid \
+	--exec /usr/bin/olbd
+    eend $?
+}

diff --git a/sci-physics/root/files/proofd.confd b/sci-physics/root/files/proofd.confd
new file mode 100644
index 0000000..81720a7
--- /dev/null
+++ b/sci-physics/root/files/proofd.confd
@@ -0,0 +1,12 @@
+# 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
new file mode 100644
index 0000000..3fac75c
--- /dev/null
+++ b/sci-physics/root/files/proofd.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/proofd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
+
+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-asneeded.patch b/sci-physics/root/files/root-5.28.00b-asneeded.patch
new file mode 100644
index 0000000..b845247
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00b-asneeded.patch
@@ -0,0 +1,20 @@
+--- root.orig/configure	2010-12-20 07:17:54.000000000 +0000
++++ root/configure	2010-12-20 07:16:05.000000000 +0000
+@@ -709,7 +709,7 @@
+        cat <<EOF > conftest.mk
+ include ${ac_srcdir}/config/Makefile.${arch}
+ conftest: conftest.c
+-	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
++	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib  -o \$@
+ 
+ conftest.c:
+ 	echo "int main() { return 0; }" > \$@
+@@ -723,7 +723,7 @@
+        cat <<EOF > conftest.mk
+ include ${ac_srcdir}/config/Makefile.${arch}
+ conftest:conftest.c
+-	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
++	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@
+ 
+ conftest.c:
+ 	echo "extern int $linksymbol (); " > \$@

diff --git a/sci-physics/root/files/root-5.28.00b-glibc212.patch b/sci-physics/root/files/root-5.28.00b-glibc212.patch
new file mode 100644
index 0000000..a365431
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00b-glibc212.patch
@@ -0,0 +1,11 @@
+--- root.orig/net/auth/src/TAFS.cxx	2010-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 <unistd.h>
++#   include <sys/stat.h>
+ #else
+ #   define ssize_t int
+ #   include <io.h>
+

diff --git a/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch b/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch
new file mode 100644
index 0000000..7324319
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch
@@ -0,0 +1,13 @@
+diff -Naur root.orig/config/Makefile.in root/config/Makefile.in
+--- root.orig/config/Makefile.in	2010-12-14 17:20:26.000000000 +0300
++++ root/config/Makefile.in	2010-12-17 22:33:34.902161458 +0300
+@@ -27,7 +27,7 @@
+ 
+ EXTRA_CFLAGS   := -Iinclude @cflags@
+ EXTRA_CXXFLAGS := -Iinclude @cflags@
+-EXTRA_LDFLAGS  := @ldflags@
++EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
+ WINRTDEBUG     := @winrtdebug@
+ 
+ GLBPATCHFLAGS  := @glbpatchcflags@
+

diff --git a/sci-physics/root/files/root-5.28.00b-unuran.patch b/sci-physics/root/files/root-5.28.00b-unuran.patch
new file mode 100644
index 0000000..76422da
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00b-unuran.patch
@@ -0,0 +1,39 @@
+diff -ur root-trunk.orig/math/unuran/Module.mk root-trunk/math/unuran/Module.mk
+--- root.orig/math/unuran/Module.mk	2010-11-25 20:41:32.000000000 +0100
++++ root/math/unuran/Module.mk	2010-11-25 20:51:47.190704977 +0100
+@@ -20,7 +20,7 @@
+ UNURANETAG   := $(call stripsrc,$(UNURANDIRS)/headers.d)
+ UNRCFG       := $(call stripsrc,$(UNURANDIRS)/$(UNRVERS)/config.h)
+ 
+-UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -))
++UNRTARCONTENT:=
+ UNRS         := $(filter %.c, \
+                 $(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \
+                 $(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \
+@@ -69,10 +69,9 @@
+ ##### local rules #####
+ .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+ 
+-include/%.h: 	$(UNURANDIRI)/%.h $(UNURANETAG)
++include/%.h: 	$(UNURANDIRI)/%.h
+ 		cp $< $@
+ 
+-$(UNURANDEP):   $(UNRCFG)
+ $(UNRS):        $(UNURANETAG)
+ 
+ $(UNURANETAG):	$(UNRSRCS)
+@@ -125,12 +124,12 @@
+ 		GNUMAKE=$(MAKE) ./configure  CC="$$ACC"  \
+ 		CFLAGS="$$ACFLAGS");
+ 
+-$(UNURANLIB):   $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
++$(UNURANLIB):   $(UNURANO) $(UNURANDO) $(ORDER_) \
+                 $(MAINLIBS) $(UNURANLIBDEP)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"  \
+ 		   "$(SOFLAGS)" libUnuran.$(SOEXT) $@     \
+ 		   "$(UNURANO) $(UNURANDO)"             \
+-		   "$(UNURANLIBEXTRA) $(UNRO)"
++		   "$(UNURANLIBEXTRA) -lunuran"
+ 
+ $(UNURANDS):    $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP)
+ 		$(MAKEDIR)

diff --git a/sci-physics/root/files/root-5.30.00-lzma.patch b/sci-physics/root/files/root-5.30.00-lzma.patch
new file mode 100644
index 0000000..b35f7fd
--- /dev/null
+++ b/sci-physics/root/files/root-5.30.00-lzma.patch
@@ -0,0 +1,13 @@
+--- root/configure.orig	2011-07-10 11:51:42.000000000 +0400
++++ root/configure	2011-07-10 11:54:40.053175390 +0400
+@@ -2430,8 +2430,8 @@
+     check_header "lzma.h" "" \
+         $LZMA ${LZMA:+$LZMA/include} \
+         ${finkdir:+$finkdir/include} \
+-        /usr/local/include /usr/include/lzma /usr/local/include/lzma \
+-        /opt/lzma/include /usr/include
++        /usr/local/include /usr/include /usr/local/include \
++        /opt/lzma/include
+     if test "x$found_dir" = "x" ; then
+         enable_builtin_lzma=yes
+     else

diff --git a/sci-physics/root/files/root-5.30.00-nobyte-compile.patch b/sci-physics/root/files/root-5.30.00-nobyte-compile.patch
new file mode 100644
index 0000000..179e579
--- /dev/null
+++ b/sci-physics/root/files/root-5.30.00-nobyte-compile.patch
@@ -0,0 +1,137 @@
+diff -Naur root.as-needed/Makefile root/Makefile
+--- root.as-needed/Makefile	2011-07-10 10:42:49.758191296 +0400
++++ root/Makefile	2011-07-10 10:43:21.493339703 +0400
+@@ -1167,10 +1167,7 @@
+ 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
+ 	   fi; \
+-	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
+-	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
+-	   fi; \
+-	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
++	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      dir=$(RFLX_GRFLXDD:lib/=); \
+ 	      while test "x$${dir}" != "x" && \
+ 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
+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 $< $@
+ endif
+-ROOTPYC      := $(ROOTPY:.py=.pyc)
+-ROOTPYO      := $(ROOTPY:.py=.pyo)
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
+@@ -68,10 +66,8 @@
+ 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)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
+@@ -113,7 +109,7 @@
+ 
+ distclean-$(MODNAME): clean-$(MODNAME)
+ 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
+-		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
++		   $(ROOTPY) $(PYROOTMAP) \
+ 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
+ 
+ distclean::     distclean-$(MODNAME)
+diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules
+--- root.as-needed/build/package/debian/rules	2011-07-10 10:42:49.241549346 +0400
++++ root/build/package/debian/rules	2011-07-10 10:48:06.989670589 +0400
+@@ -691,10 +691,6 @@
+ 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
+ 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/cint7			\
+ 		-X$(PREFIX)/include/root/Minuit2
+ #		$(foreach i, \
+diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
+--- root.as-needed/cint/cintex/Module.mk	2011-07-10 10:42:49.104889217 +0400
++++ root/cint/cintex/Module.mk	2011-07-10 10:43:21.496672876 +0400
+@@ -31,10 +31,6 @@
+ CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
+ $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
+ endif
+-ifneq ($(BUILDPYTHON),no)
+-CINTEXPYC    := $(CINTEXPY:.py=.pyc)
+-CINTEXPYO    := $(CINTEXPY:.py=.pyo)
+-endif
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
+@@ -86,8 +82,6 @@
+ 		fi)
+ 		cp $< $@
+ 
+-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
+-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
+                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
+diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
+--- root.as-needed/cint/reflex/Module.mk	2011-07-10 10:42:49.074890651 +0400
++++ root/cint/reflex/Module.mk	2011-07-10 10:43:21.496672876 +0400
+@@ -48,9 +48,6 @@
+ RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
+ RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
+ RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
+-ifneq ($(BUILDPYTHON),no)
+-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
+-endif
+ 
+ RFLX_LIBDIR = $(LIBDIR)
+ 
+@@ -92,7 +89,7 @@
+ 
+ ALLEXECS += $(RFLX_GENMAPX)
+ 
+-POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++POSTBIN  += $(RFLX_GRFLXPY)
+ 
+ ##### local rules #####
+ .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
+@@ -122,8 +119,6 @@
+ 		  mkdir -p lib/python/genreflex; fi )
+ 		cp $< $@
+ 
+-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
+-		@python -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
+ 
+@@ -149,7 +144,7 @@
+ 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
+ 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
+ 
+-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
+ 
+ clean-genreflex:
+ 		@rm -rf lib/python/genreflex
+diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
+--- root.as-needed/cint/reflex/python/CMakeLists.txt	2011-07-10 10:42:49.074890651 +0400
++++ root/cint/reflex/python/CMakeLists.txt	2011-07-10 10:43:21.496672876 +0400
+@@ -15,7 +15,7 @@
+ #####################   sources   ####################
+ 
+ FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
+-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
++SET(GENREFLEX_SCRIPT PARENT_SCOPE)
+ 
+ #####################  gccxmlpath ####################
+ 

diff --git a/sci-physics/root/files/root-5.30.00-xrootd-prop-flags.patch b/sci-physics/root/files/root-5.30.00-xrootd-prop-flags.patch
new file mode 100644
index 0000000..671cfe3
--- /dev/null
+++ b/sci-physics/root/files/root-5.30.00-xrootd-prop-flags.patch
@@ -0,0 +1,623 @@
+diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.env.in root/net/xrootd/src/xrootd/config/GNUmake.env.in
+--- root.orig/net/xrootd/src/xrootd/config/GNUmake.env.in	2011-06-28 13:49:44.000000000 +0400
++++ root/net/xrootd/src/xrootd/config/GNUmake.env.in	2011-07-10 10:27:45.001375019 +0400
+@@ -47,6 +47,7 @@
+ CFHASXRDCRYPTO = @hasxrdcrypto@
+ 
+ CFLAGS += $(CFSTRLCPY) $(CFHASOLDHDRS) $(CFFSTATAT) $(CFHASLIBZ) $(CFATOMICS)
++CFLAGS += $(CXXFLAGS)
+ 
+ # AFS relevant variables
+ @incafs@
+diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.options.in root/net/xrootd/src/xrootd/config/GNUmake.options.in
+--- root.orig/net/xrootd/src/xrootd/config/GNUmake.options.in	2011-06-28 13:49:44.000000000 +0400
++++ root/net/xrootd/src/xrootd/config/GNUmake.options.in	2011-07-10 10:24:16.131357441 +0400
+@@ -16,7 +16,7 @@
+ CF32="$(TYPECF32)" \
+ CFOP="$(@buildopt@)" \
+ LD="$(TYPELD)" \
+-LDOP="$(@buildopt@)" \
++LDOP="$(LDFLAGS)" \
+ LDSO="$(TYPELDSO)" \
+ LIBS=" @ldsyslibs@ $(TYPELIBS)" \
+ TYPE="$(TYPE)"
+@@ -33,7 +33,7 @@
+ CF32="$(TYPECF32)" \
+ CFOP="$(@buildopt@)" \
+ LD="$(TYPELD)" \
+-LDOP="$(@buildopt@)" \
++LDOP="$(LDFLAGS)" \
+ LDSO="$(TYPELDSO)" \
+ LIBS=" @ldsyslibs@ $(TYPELIBS)" \
+ TYPE="$(TYPE)"
+diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd
+--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd	2011-06-28 13:49:44.000000000 +0400
++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd	2011-07-10 10:24:16.131357441 +0400
+@@ -11,7 +11,7 @@
+              -Wall -Wno-deprecated $(CFTRACE)
+ TYPECF32   =
+ TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-TYPEOPT    = $(TYPEMISC) -O2
++TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
+ TYPEDBG    = $(TYPEMISC) -g
+ TYPELDSO   = -shared
+ TYPESHLIB  = so
+diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc
+--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc	2011-06-28 13:49:44.000000000 +0400
++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc	2011-07-10 10:24:16.131357441 +0400
+@@ -11,7 +11,7 @@
+              -Wall -Wno-deprecated -D__linux__ $(CFTRACE)
+ TYPECF32   =
+ TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-TYPEOPT    = $(TYPEMISC) -O2
++TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
+ TYPEDBG    = $(TYPEMISC) -g
+ TYPELDSO   = -shared
+ TYPESHLIB  = so
+diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64
+--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64	2011-06-28 13:49:44.000000000 +0400
++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64	2011-07-10 10:24:16.131357441 +0400
+@@ -11,7 +11,7 @@
+              -Wall -Wno-deprecated -D__linux__ $(CFTRACE)
+ TYPECF32   =
+ TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-TYPEOPT    = $(TYPEMISC) -O2
++TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
+ TYPEDBG    = $(TYPEMISC) -g
+ TYPELDSO   = -shared
+ TYPESHLIB  = so
+diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664
+--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664	2011-06-28 13:49:44.000000000 +0400
++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664	2011-07-10 10:24:16.131357441 +0400
+@@ -11,7 +11,7 @@
+              -Wall -Wno-deprecated -D__linux__ $(CFTRACE)
+ TYPECF32   =
+ TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-TYPEOPT    = $(TYPEMISC) -O2
++TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
+ TYPEDBG    = $(TYPEMISC) -g
+ TYPELDSO   = -m64 -shared
+ TYPESHLIB  = so
+diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc root/net/xrootd/src/xrootd/config/GNUmake.rules.icc
+--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc	2011-06-28 13:49:44.000000000 +0400
++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.icc	2011-07-10 10:24:16.131357441 +0400
+@@ -13,7 +13,7 @@
+              -ansi -D__linux__ -D__ICC__ -wd1476 -wd191 -wd468 -wd858 -wd1224 -wd584 $(CFTRACE)
+ TYPECF32   =
+ TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-TYPEOPT    = $(TYPEMISC) -O2
++TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
+ TYPEDBG    = $(TYPEMISC) -g
+ TYPELDSO   = -m32 -shared
+ TYPESHLIB  = so
+diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664
+--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664	2011-06-28 13:49:44.000000000 +0400
++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664	2011-07-10 10:24:16.131357441 +0400
+@@ -14,7 +14,7 @@
+              -wd1572 -wd584 -i-dynamic $(CFTRACE)
+ TYPECF32   =
+ TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-TYPEOPT    = $(TYPEMISC) -O2
++TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
+ TYPEDBG    = $(TYPEMISC) -g
+ TYPELDSO   = -m64 -shared
+ TYPESHLIB  = so
+diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos root/net/xrootd/src/xrootd/config/GNUmake.rules.macos
+--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos	2011-06-28 13:49:44.000000000 +0400
++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos	2011-07-10 10:24:16.131357441 +0400
+@@ -18,7 +18,7 @@
+ TYPECF32   =
+ TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ TYPELINK   = -undefined dynamic_lookup -multiply_defined suppress 
+-TYPEOPT    = $(TYPEMISC) -O2
++TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
+ TYPEDBG    = $(TYPEMISC) -g
+ ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
+ TYPELDSO   = $(TYPELINK) -dynamiclib -single_module -m32
+diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64
+--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64	2011-06-28 13:49:44.000000000 +0400
++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64	2011-07-10 10:24:16.131357441 +0400
+@@ -15,7 +15,7 @@
+ TYPECF32   =
+ TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ TYPELINK   = -undefined dynamic_lookup -multiply_defined suppress 
+-TYPEOPT    = $(TYPEMISC) -O2
++TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
+ TYPEDBG    = $(TYPEMISC) -g
+ ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
+ TYPELDSO   = $(TYPELINK) -dynamiclib -single_module -m64
+diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc
+--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc	2011-06-28 13:49:44.000000000 +0400
++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc	2011-07-10 10:24:16.131357441 +0400
+@@ -11,7 +11,7 @@
+              -Wall -Wno-deprecated -DSUNGCC $(CFTRACE)
+ TYPECF32   =
+ TYPECF64   = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+-TYPEOPT    = $(TYPEMISC) -O2
++TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
+ TYPEDBG    = $(TYPEMISC) -g
+ TYPELDSO   = -shared
+ TYPESHLIB  = so
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile	2011-07-10 10:24:16.131357441 +0400
+@@ -71,7 +71,7 @@
+ 
+ $(TESTBIN): $(OBJECTB) $(LIBDEPS)
+ 	@echo Creating executable $(TESTBIN) 
+-	$(ECHO)$(LD) $(CFLAGS) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN)
++	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN)
+ 
+ $(OBJDIR)/XrdAccAccess.o: XrdAccAccess.cc     XrdAccAccess.hh \
+                           XrdAccCapability.hh XrdAccConfig.hh    XrdAccGroups.hh \
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile	2011-07-10 10:24:16.131357441 +0400
+@@ -59,7 +59,7 @@
+   
+ $(XRDADLER32): $(XRDADLER32_OBJ) $(XRDADLERDEPT)
+ 	@echo Creating executable $(XRDADLER32)
+-	$(ECHO)$(LD) $(LDOP) $(XRDADLER32_OBJ) $(XRDADLERDEPS) $(XRDADLERLIBS) -o $(XRDADLER32)
++	$(ECHO) $(LD) $(LDFLAGS) $(XRDADLER32_OBJ) $(XRDADLERDEPS) $(XRDADLERLIBS) -o $(XRDADLER32)
+ 
+ $(XRDADLER32_OBJ): Xrdadler32.cc \
+                    XrdPosixExtern.hh    XrdPosixXrootd.hh \
+@@ -90,7 +90,7 @@
+ 
+ $(XRDMPXBIN): $(XRDMPXOBJ) $(XrdMPXDEPS)
+ 	@echo Creating executable $(XRDMPXBIN)
+-	$(ECHO)$(LD) $(LDOP) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN)
++	$(ECHO)$(CC) $(CXXFLAGS) $(LDFLAGS) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN)
+  
+ $(XRDMPXOBJ): XrdMpxStats.cc \
+               XrdNetDNS.hh       XrdNetSocket.hh   XrdNetOpts.hh \
+@@ -106,7 +106,7 @@
+  
+ $(XRDW41): $(XRDW41_OBJ) $(XRDW41_DEPS)
+ 	@echo Creating executable $(XRDW41)
+-	$(ECHO)$(LD) $(LDOP) $(XRDW41_OBJ) $(XRDW41LIBS) -o $(XRDW41)
++	$(ECHO)$(CC) $(CXXFLAGS) $(LDFLAGS) $(XRDW41_OBJ) $(XRDW41LIBS) -o $(XRDW41)
+ 
+ $(XRDW41_OBJ): XrdWait41.cc \
+                    XrdOucTList.hh \
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile	2011-06-28 13:49:43.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile	2011-07-10 10:24:16.131357441 +0400
+@@ -67,7 +67,7 @@
+ 	$(ECHO)ranlib $(LIBARCH)
+ 
+ 	@echo Creating shared library $(LIBRARY) 
+-	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS)  -o $(LIBRARY)
++	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS)  -o $(LIBRARY)
+ 
+ $(OBJDIR)/XrdBwm.o:  XrdBwm.cc           XrdBwm.hh \
+                      XrdAccAuthorize.hh \
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile	2011-06-28 13:49:41.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile	2011-07-10 10:24:16.131357441 +0400
+@@ -160,17 +160,17 @@
+ $(LIBSHARED): $(OBJECTS) $(LIBDEP)
+ 	@echo Creating shared library $(LIBSHARED) 
+ 	$(ECHO)rm -f $(LIBSHARED)
+-	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED)
++	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED)
+ ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
+ 	$(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \
+-	          $(CC) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \
++	          $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \
+ 	fi
+ endif
+ 
+ $(LIBRARY_JNI): $(OBJECT_JNI)
+ 	@echo Creating shared library $(LIBRARY_JNI) 
+ 	$(ECHO)rm -f $(LIBRARY_JNI);
+-	$(ECHO)$(CC) $(CFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI)
++	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI)
+ 
+ $(CLASS_JNI_TARGET): $(CLASS_JNI).java
+ 	@echo Creating JNI class file $(CLASS_JNI_TARGET)
+@@ -178,27 +178,27 @@
+ 
+ $(BINDIR)/TestXrdClient_read: $(OBJECTS) $(OBJECTD) $(LIBDEPS)
+ 	@echo Creating executable $(BINDIR)/TestXrdClient_read 
+-	$(ECHO)$(LD) $(LDOP) $(OBJECTD) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient_read
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTD) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient_read
+ 
+ $(BINDIR)/TestXrdClient: $(OBJECTS) $(OBJECTB) $(LIBDEPS)
+ 	@echo Creating executable $(BINDIR)/TestXrdClient 
+-	$(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient
+ 
+ $(XRDCP): $(OBJECTS) $(OBJECTC) $(LIBDEPS)
+ 	@echo Creating executable $(XRDCP) 
+-	$(ECHO)$(LD) $(LDOP) $(OBJECTC) $(BINLIBS) $(LIBS) $(LIBZ) -o $(XRDCP)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTC) $(BINLIBS) $(LIBS) $(LIBZ) -o $(XRDCP)
+ 
+ $(XRDPREPTOOL): $(OBJECTS) $(OBJECT_PREPTOOL) $(LIBDEPS)
+ 	@echo Creating executable $(XRDPREPTOOL)
+-	$(ECHO)$(LD) $(LDOP) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBS) -o $(XRDPREPTOOL)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBS) -o $(XRDPREPTOOL)
+ 
+ $(XRDSTAGETOOL): $(OBJECTS) $(OBJECT_STAGETOOL) $(LIBDEPS)
+ 	@echo Creating executable $(XRDSTAGETOOL) 
+-	$(ECHO)$(LD) $(LDOP) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBS) -o $(XRDSTAGETOOL)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBS) -o $(XRDSTAGETOOL)
+ 
+ $(XRDCLI): $(OBJECTS) $(OBJECT_CLI) $(LIBDEPS)
+ 	@echo Creating executable $(XRDCLI) 
+-	$(ECHO)$(LD) $(LDOP) $(OBJECT_CLI) $(BINLIBS) $(LIBS) $(LIBREADLINE) -o $(XRDCLI)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECT_CLI) $(BINLIBS) $(LIBS) $(LIBREADLINE) -o $(XRDCLI)
+ 
+ $(XRDADMIN): $(PERLMOD)
+ 	$(ECHO)if [ "$(PERLBIN)" != "" ]; then \
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile	2011-06-28 13:49:43.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
+@@ -136,7 +136,7 @@
+ 
+ $(BINARY): $(OBJSRVR) $(OBJBOTH) $(LIBDEPS)
+ 	@echo Creating executable $(BINARY) 
+-	$(ECHO)$(LD) $(LDOP) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY)
+ 
+ 
+ $(LIBRARY): $(OBJCLNT) $(OBJBOTH)
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile	2011-06-28 13:49:41.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
+@@ -90,11 +90,11 @@
+ 
+ $(TARGCNSD): $(OBJCNSD) $(OBJCOM) $(LIBDEP)
+ 	@echo Creating executable $(BINDIR)/XrdCnsd
+-	$(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd
++	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd
+ 
+ $(TARGSSI): $(OBJSSI) $(OBJCOM) $(LIBDEP)
+ 	@echo Creating executable $(BINDIR)/cns_ssi
+-	$(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi
++	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi
+ 
+ $(OBJDIR)/XrdCnsConfig.o:  XrdCnsConfig.hh    XrdCnsConfig.cc \
+                            XrdCnsDaemon.hh    XrdCnsLogRec.hh \
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
+@@ -139,7 +139,7 @@
+ 
+ $(LIBRARY): $(OBJECTS) $(LIBUTIL)
+ 	@echo Creating shared library $(LIBRARY) 
+-	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY)
+ 
+ $(LIBASSL): $(OBJCSSL)
+ 	@echo Creating archive $(LIBASSL) 
+@@ -149,11 +149,11 @@
+ 
+ $(LIBCSSL): $(OBJCSSL) $(LIBARCH) $(LIBUTIL)
+ 	@echo Creating shared library $(LIBCSSL) 
+-	$(ECHO)$(LD) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL)
+ 
+ $(CRYPTOTEST): $(OBJECTA) $(LIBARCH) $(LIBDEPS)
+ 	@echo Creating executable $(CRYPTOTEST) 
+-	$(ECHO)$(LD) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST)
+ 
+ $(OBJDIR)/XrdCryptotest.o: XrdCryptotest.cc XrdSutAux.hh XProtocol.hh XrdSutBucket.hh \
+ 			   XrdCryptoAux.hh XrdCryptoFactory.hh XrdCryptoCipher.hh \
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdFfs/GNUmakefile root/net/xrootd/src/xrootd/src/XrdFfs/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdFfs/GNUmakefile	2011-06-28 13:49:41.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdFfs/GNUmakefile	2011-07-10 10:37:08.791154841 +0400
+@@ -82,7 +82,7 @@
+ 
+ $(BINARY): $(OBJECTS) $(OBJBIN) $(BINDEPS)
+ 	@echo Creating executable $(BINARY)
+-	$(ECHO)$(LD) $(LDOP) $(OBJBIN) $(BINDEPS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJBIN) $(BINDEPS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY)
+ 
+ $(OBJDIR)/XrdFfsDent.o: XrdFfsDent.cc  XrdFfsDent.hh
+ 	@echo Compiling XrdFfsDent.cc
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
+@@ -134,15 +134,15 @@
+ 
+ $(BINADMIN): $(OBJLIB) $(OBJADMIN)          $(OBJDEPS)
+ 	@echo Creating executable $(BINADMIN)
+-	$(ECHO)$(LD) $(LDOP) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINADMIN)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINADMIN)
+ 
+ $(BINPURGD): $(OBJLIB) $(OBJPURG) $(OBJADDS) $(OBJDEPS)
+ 	@echo Creating executable $(BINPURGD)
+-	$(ECHO)$(LD) $(LDOP) $(OBJPURG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPURGD)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJPURG) $(OBJADDS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINPURGD)
+ 
+ $(BINXFRD): $(OBJLIB) $(OBJXFR) $(OBJADDS) $(OBJDEPS)
+ 	@echo Creating executables $(BINXFRD)
+-	$(ECHO)$(LD) $(LDOP) $(OBJXFR) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINXFRD)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJXFR) $(OBJADDS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINXFRD)
+ 
+ $(BINAGNT): $(BINXFRD)
+ 	@echo Creating executables $(BINAGNT)
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile	2011-06-28 13:49:43.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
+@@ -141,45 +141,45 @@
+ 
+ $(ADMIN):	$(OBJECTS_BIN_ADM) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
+ 	@echo Creating executable $(@F)
+-	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys
++	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys
+ 
+ $(COLLECTOR):	$(OBJECTS_BIN_CTR) $(LIBRARY_CTR) \
+ 	$(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
+ 	@echo Creating executable $(@F)
+-	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys
++	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys
+ 
+ $(CONVTIME):	$(OBJECTS_BIN_CTM) $(LIBRARY_COMMON) 
+ 	@echo Creating executable $(@F)
+-	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
++	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^
+ 
+ $(COUT2FILE):	$(OBJECTS_BIN_C2F) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
+ 	@echo Creating executable $(@F)
+-	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^
++	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^
+ 
+ $(DEBUGPACKET):	$(OBJECTS_BIN_DBP) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
+ 	@echo Creating executable $(@F)
+-	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
++	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^
+ 
+ $(DECODER):	$(OBJECTS_BIN_DEC) $(LIBRARY_DEC) $(LIBRARY_OUC) \
+ 	$(LIBRARY_COMMON) 
+ 	@echo Creating executable $(@F)
+-	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
++	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^
+ 
+ $(DUMPPACKETS):	$(OBJECTS_BIN_DMP) $(LIBRARY_DEC) $(LIBRARY_COMMON) 
+ 	@echo Creating executable $(@F)
+-	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
++	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^
+ 
+ $(FSENDER):	$(OBJECTS_BIN_FSD) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
+ 	@echo Creating executable $(@F)
+-	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^
++	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^
+ 
+ $(SENDER):	$(OBJECTS_BIN_SND) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
+ 	@echo Creating executable $(@F)
+-	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys
++	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys
+ 
+ $(TESTPARSER):	$(OBJECTS_BIN_TPR) $(LIBRARY_COMMON)
+ 	@echo Creating executable $(@F)
+-	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^
++	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^
+ 
+ $(OBJDIR)/%.o : %.cc
+ 	@echo Compiling $(<F)
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile root/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile	2011-06-28 13:49:40.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
+@@ -76,14 +76,14 @@
+ 
+ $(LIBPLDR): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP)
+ 	@echo Creating shared library $(LIBPLDR)
+-	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJECTT) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBPLDR)
++	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(OBJECTT) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBPLDR)
+ 
+ $(LIBRARY): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP)
+ 	@echo Creating shared library $(LIBRARY) 
+-	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
++	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
+ ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
+ 	$(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \
+-	   $(CC) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(MORELIBS) $(LIBS) -o $(LIBDIR)/libXrdPosix.$(TYPEDYLIB); \
++	   $(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(MORELIBS) $(LIBS) -o $(LIBDIR)/libXrdPosix.$(TYPEDYLIB); \
+ 	fi
+ endif
+ # MacOS X does not support linking against shared libraries so include
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile root/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile	2011-06-28 13:49:40.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
+@@ -70,7 +70,7 @@
+ 
+ $(TARGETS): $(OBJECTS) $(OBJECTT) $(LIBDEP)
+ 	@echo Creating shared library $(LIBRARY) 
+-	$(ECHO)$(CC) $(CFLAGS) $(OBJECTT) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
++	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTT) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
+ 
+ $(OBJDIR)/XrdPss.o:  XrdPss.cc         XrdPss.hh \
+                      XrdFfsPosix.hh    XrdPosixXrootd.hh \
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
+@@ -6,7 +6,7 @@
+   
+ include ../GNUmake.env
+ 
+-LFLAGS  = -L$(LIBDIR) -lXrdOuc $(LDSO)
++LFLAGS  = $(LDSO) -L$(LIBDIR) -lXrdOuc
+ 
+ LIBDEPS = $(LIBDIR)/libXrdOuc.a
+ 
+@@ -48,7 +48,7 @@
+ 
+ $(TARGETS): $(OBJECTS) $(LIBDEPS)
+ 	@echo Creating shared library $(LIBRARY) 
+-	$(ECHO)$(CC) $(OBJECTS) $(LFLAGS) -o $(LIBRARY)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LFLAGS) -o $(LIBRARY)
+ 
+ $(OBJDIR)/XrdRootdProtocol.o: XrdRootdProtocol.hh XrdLink.hh \
+                               XrdScheduler.hh     XrdTrace.hh \
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
+@@ -78,15 +78,15 @@
+ 
+ $(LIBRARY): $(OBJSLIB) $(LIBDEPS)
+ 	@echo Creating shared library $(LIBRARY) 
+-	$(ECHO)$(CC) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
+ 
+ $(TSTBINA): $(OBJECTA) $(LIBDEPS)
+ 	@echo Creating executable $(TSTBINA) 
+-	$(ECHO)$(LD) $(LDOP) $(OBJECTA) $(LIBS) $(BINLIBS) -o $(TSTBINA)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(LIBS) $(BINLIBS) -o $(TSTBINA)
+ 
+ $(TSTBINB): $(OBJECTB) $(LIBDEPS)
+ 	@echo Creating executable $(TSTBINB) 
+-	$(ECHO)$(LD) $(LDOP) $(OBJECTB) $(LIBS) $(BINLIBS) -o $(TSTBINB)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTB) $(LIBS) $(BINLIBS) -o $(TSTBINB)
+ 
+ $(OBJDIR)/XrdSecClient.o: XrdSysPthread.hh XrdSecPManager.hh XrdSecInterface.hh \
+                           XrdOucErrInfo.hh XrdSecClient.cc   XrdSecEntity.hh
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile	2011-07-10 10:31:48.396441015 +0400
+@@ -115,23 +115,23 @@
+ 
+ $(LIBRARY): $(OBJECTS) $(LIBDEPS)
+ 	@echo Creating shared library $(LIBRARY) 
+-	$(ECHO)$(LD) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBRARY)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBRARY)
+ 
+ $(LIBGMLDAP): $(OBJECTC)
+ 	@echo Creating shared library $(LIBGMLDAP) 
+-	$(ECHO)$(LD) $(OBJECTC) $(LDSO) $(LIBS) -o $(LIBGMLDAP)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTC) $(LDSO) $(LIBS) -o $(LIBGMLDAP)
+ 
+ $(LIBGMDN): $(OBJECTD)
+ 	@echo Creating shared library $(LIBGMDN) 
+-	$(ECHO)$(LD) $(OBJECTD) $(LDSO) $(LIBDIR)/libXrdOuc.a $(LIBS) -o $(LIBGMDN)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTD) $(LDSO) $(LIBDIR)/libXrdOuc.a $(LIBS) -o $(LIBGMDN)
+ 
+ $(SECGSITEST): $(OBJECTA) $(LIBDEPS)
+ 	@echo Creating executable $(SECGSITEST) 
+-	$(ECHO)$(LD) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS) -o $(SECGSITEST)
++	$(ECHO)$(CC) $(LDFLAGS) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS) -o $(SECGSITEST)
+ 
+ $(SECGSIPROXY): $(OBJECTB) $(LIBDEPS)
+ 	@echo Creating executable $(SECGSIPROXY) 
+-	$(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(SECGSIPROXY)
++	$(ECHO)$(CC) $(LDFLAGS) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(SECGSIPROXY)
+ 
+ $(OBJDIR)/XrdSecgsitest.o: XrdSecgsitest.cc XrdOucString.hh \
+ 		XrdSysError.hh XrdSutAux.hh XProtocol.hh XPtypes.hh XrdCryptoAux.hh \
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile	2011-06-28 13:49:44.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
+@@ -45,7 +45,7 @@
+ 
+ $(TARGETS): $(OBJECTS) $(LIBDEPS)
+ 	@echo Creating shared library $(TARGETS) 
+-	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
+ 
+ $(OBJDIR)/XrdSecProtocolkrb4.o: XrdSecProtocolkrb4.cc XrdSecInterface.hh \
+                                 XrdSysPthread.hh      XrdOucTokenizer.hh \
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile	2011-06-28 13:49:44.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
+@@ -49,7 +49,7 @@
+ 
+ $(TARGETS): $(OBJECTS) $(LIBDEPS)
+ 	@echo Creating shared library $(TARGETS) 
+-	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
+ 
+ $(OBJDIR)/XrdSecProtocolkrb5.o: XrdSecProtocolkrb5.cc XrdSecInterface.hh \
+                                 XrdSysPthread.hh      XrdOucTokenizer.hh \
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile	2011-06-28 13:49:43.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
+@@ -65,11 +65,11 @@
+ 
+ $(LIBRARY): $(OBJECTS) $(LIBDEPS)
+ 	@echo Creating shared library $(LIBRARY) 
+-	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(LIBRARY)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(LIBRARY)
+ 
+ $(SRVADMIN): $(OBJECTA) $(LIBDEPS)
+ 	@echo Creating executable $(SRVADMIN) 
+-	$(ECHO)$(LD) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS)  $(RESOLVLIB) -o $(SRVADMIN)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(BINLIBS) $(LIBS)  $(RESOLVLIB) -o $(SRVADMIN)
+ 
+ $(OBJDIR)/XrdSecpwdSrvAdmin.o: XrdSecpwdSrvAdmin.cc \
+ 		XrdOucString.hh XrdSutAux.hh XProtocol.hh XPtypes.hh \
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile	2011-06-28 13:49:44.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
+@@ -85,7 +85,7 @@
+ 
+ $(LIBRARY): $(OBJECTS) $(LIBDEPS)
+ 	@echo Creating shared library $(LIBRARY) 
+-	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
+ 
+ $(LIBGRST): $(OBJGRST)
+ 	@echo Creating archive $(LIBGRST)
+@@ -95,7 +95,7 @@
+ 
+ $(SECSSLTEST): $(OBJECTA) $(LIBDEPS)
+ 	@echo Creating executable $(SECSSLTEST)
+-	$(ECHO)$(LD) $(LDOP) $(OBJECTA) -L$(LIBDIR) -lXrdSecssl $(MORELIBS) $(LIBS) -o $(SECSSLTEST)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) -L$(LIBDIR) -lXrdSecssl $(MORELIBS) $(LIBS) -o $(SECSSLTEST)
+ 
+ $(OBJDIR)/XrdSecProtocolsslProc.o:  XrdSecProtocolsslProc.cc 	XrdSecProtocolsslProc.hh \
+ 			        XrdOucString.hh 	XrdOucHash.hh
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile	2011-06-28 13:49:40.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
+@@ -77,11 +77,11 @@
+ 
+ $(TARGLSO): $(OBJSLIB) $(LIBDEPS)
+ 	@echo Creating shared library $(TARGLSO)
+-	$(ECHO)$(CC) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBSSL) $(LIBS) -o $(TARGLSO);
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBSSL) $(LIBS) -o $(TARGLSO);
+ 
+ $(TARGBIN): $(OBJSBIN)
+ 	@echo Creating executable $(TARGBIN)
+-	$(ECHO)$(LD) $(LDOP) $(OBJSBIN) $(MORELIBS) $(LIBS) -o $(TARGBIN);
++	$(ECHO) $(LD) $(LDFLAGS) $(OBJSBIN) $(MORELIBS) $(LIBS) -o $(TARGBIN);
+ 
+ $(OBJDIR)/XrdSecProtocolsss.o: XrdSecProtocolsss.cc    XrdSecProtocolsss.hh \
+                                XrdNetDNS.hh            XrdOucErrInfo.hh \
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
+@@ -45,7 +45,7 @@
+ 
+ $(TARGETS): $(OBJECTS) $(LIBDEPS)
+ 	@echo Creating shared library $(TARGETS) 
+-	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
+ 
+ $(OBJDIR)/XrdSecProtocolunix.o: XrdSecProtocolunix.cc XrdSecInterface.hh \
+                                 XrdSysHeaders.hh \
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile	2011-06-28 13:49:40.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
+@@ -67,7 +67,7 @@
+ 
+ $(LIBRARY): $(OBJECTS) $(LIBDIR)/libXrdOuc.a
+ 	@echo Creating shared library $(LIBRARY) 
+-	$(ECHO)$(CC) $(OBJECTS) $(LIBDIR)/libXrdOuc.a $(LDSO) -o $(LIBRARY)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LIBDIR)/libXrdOuc.a $(LDSO) -o $(LIBRARY)
+ 
+ $(OBJDIR)/XrdSutPFAdmin.o: XrdSutPFAdmin.cc XrdOucString.hh \
+ 		XrdSutAux.hh XProtocol.hh XPtypes.hh \
+diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile
+--- root.orig/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile	2011-06-28 13:49:41.000000000 +0400
++++ root/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
+@@ -95,7 +95,7 @@
+ 
+ $(TARGETS): $(OBJECTS) $(OBJDEPS)
+ 	@echo Creating executable $(TARGETS) 
+-	$(ECHO)$(LD) $(LDOP) $(OBJECTS) $(OBJFS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(TARGETS)
++	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(OBJFS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(TARGETS)
+ 
+ $(OBJDIR)/XrdXrootdAdmin.o: XrdXrootdAdmin.hh      XrdXrootdAdmin.cc \
+                             XrdXrootdTrace.hh      XrdXrootdProtocol.hh \

diff --git a/sci-physics/root/files/rootd.confd b/sci-physics/root/files/rootd.confd
new file mode 100644
index 0000000..7516b8c
--- /dev/null
+++ b/sci-physics/root/files/rootd.confd
@@ -0,0 +1,8 @@
+# conf.d file for root daemon
+
+# User to run as (default is `rootd')
+ROOTD_USER="rootd"
+
+# Please refer to the rootd(1) man(1) page for more information on 
+# command line parameters. 
+ROOTD_OPTS=""

diff --git a/sci-physics/root/files/rootd.initd b/sci-physics/root/files/rootd.initd
new file mode 100644
index 0000000..de42e93
--- /dev/null
+++ b/sci-physics/root/files/rootd.initd
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/rootd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
+
+depend() {
+    need net
+    use logger
+    provide root-file-server
+}
+
+start() {
+    ebegin "Starting ROOT file server"
+    pid=$(start-stop-daemon --start --quiet --user ${ROOTD_USER} \
+	--pidfile /var/run/rootd.pid \
+	--exec /usr/bin/rootd -- ${ROOTD_OPTS})
+    retval=$?
+    echo ${ROOTD_PID} > /var/run/rootd.pid
+    eend ${retval}
+}
+
+stop() {
+    ebegin "Stopping ROOT file server"
+    start-stop-daemon --stop --quiet \
+	--pidfile /var/run/rootd.pid \
+	--exec /usr/bin/rootd
+    eend $?
+}

diff --git a/sci-physics/root/files/xrootd.confd b/sci-physics/root/files/xrootd.confd
new file mode 100644
index 0000000..e725cd1
--- /dev/null
+++ b/sci-physics/root/files/xrootd.confd
@@ -0,0 +1,8 @@
+# conf.d file for xroot daemon
+
+# User to run as (default is `root')
+XROOTD_USER="root"
+
+# Please refer to the xrootd(1) man(1) page for more
+# information on command line parameters. 
+XROOTD_OPTS=""

diff --git a/sci-physics/root/files/xrootd.initd b/sci-physics/root/files/xrootd.initd
new file mode 100644
index 0000000..27e0001
--- /dev/null
+++ b/sci-physics/root/files/xrootd.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/xrootd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
+
+depend() {
+    need net
+    use logger dns
+    provide root-file-server
+}
+
+start() {
+    ebegin "Starting extended ROOTD file server"
+    start-stop-daemon --start --quiet --user ${XROOTD_USER} \
+	--make-pidfile --pidfile /var/run/xrootd.pid \
+	--exec /usr/bin/xrootd --background -- ${XROOTD_OPTS}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping extended ROOTD file server"
+    start-stop-daemon --stop --quiet \
+	--pidfile /var/run/xrootd.pid \
+	--exec /usr/bin/xrootd
+    eend $?
+}

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
new file mode 100644
index 0000000..ba73668
--- /dev/null
+++ b/sci-physics/root/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-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
+  contains the CINT C/C++ interpreter and many classes such as
+  statistics, serialization, optimization, linear algebra, graphics,
+  GUI toolkit, and a complete visualization framework.
+</longdescription>
+<use>
+  <flag name="clarens">
+    Buld the Clarens and PEAC plug-ins, to use in a GRID enabled
+    analysis.</flag>
+  <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+  <flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
+  <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
+  <flag name="pythia6">
+    Builds the interface to Pythia-6 (<pkg>sci-physics/pythia</pkg>)
+    high energy physics generation events library
+  </flag>
+  <flag name="pythia8">
+    Builds the interface to Pythia-8 (<pkg>sci-physics/pythia</pkg>)
+    high energy physics generation events library
+  </flag>
+  <flag name="reflex">Builds the reflection database for the C++ interpretor </flag>
+  <flag name="xrootd">Build the xrootd low latency file server</flag>
+</use>
+</pkgmetadata>

diff --git a/sci-physics/root/root-5.30.00.ebuild b/sci-physics/root/root-5.30.00.ebuild
new file mode 100644
index 0000000..a4c4bf8
--- /dev/null
+++ b/sci-physics/root/root-5.30.00.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.3 2011/06/21 14:31:50 jlec Exp $
+
+EAPI=3
+PYTHON_DEPEND="python? 2"
+inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
+
+#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
+DOC_PV=5_26
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
+	math? (
+		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
+	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres pythia6
+	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
+
+CDEPEND="app-arch/xz-utils
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-libs/freetype
+	media-libs/giflib
+	media-libs/libpng
+	media-libs/tiff
+	sys-apps/shadow
+	sys-libs/zlib
+	virtual/jpeg
+	X? (
+		media-libs/ftgl
+		media-libs/glew
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+		qt4? ( x11-libs/qt-gui:4
+			x11-libs/qt-opengl:4
+			x11-libs/qt-qt3support:4
+			x11-libs/qt-svg:4
+			x11-libs/qt-webkit:4
+			x11-libs/qt-xmlpatterns:4 )
+		xft? ( x11-libs/libXft ) )
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi )
+	clarens? ( dev-libs/xmlrpc-c )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio )
+	fftw? ( sci-libs/fftw:3.0 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	llvm? ( sys-devel/llvm )
+	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	mysql? ( virtual/mysql )
+	ncurses? ( sys-libs/ncurses )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	ruby? ( dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="
+	virtual/fortran
+${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	elog
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
+	elog
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	if use math; then
+		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+			ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
+			ewarn "If you want to build this package with OpenMP, abort now,"
+			ewarn "and set CC to an OpenMP capable compiler"
+		elif use openmp; then
+			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-xrootd-prop-flags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
+		"${FILESDIR}"/${P}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
+		"${FILESDIR}"/${P}-lzma.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
+	rm -rf graf2d/asimage/src/libAfterImage
+	rm -rf graf3d/ftgl/{inc,src}
+	rm -rf graf2d/freetype/src
+	rm -rf graf3d/glew/{inc,src}
+	rm -rf core/pcre/src
+	rm -rf math/unuran/src/unuran-*.tar.gz
+	find core/zip -type f -name "[a-z]*" | xargs rm
+	rm -rf core/lzma/src/*.tar.gz
+	rm graf3d/gl/{inc,src}/gl2ps.*
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
+
+	# TODO: unbundle xrootd as a new package
+	#rm -rf net/xrootd/src
+	#sed -i \
+	#	-e 's:-lXrdOuc:-lXrd &:' \
+	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
+	#	proof/proofd/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINC:$ODBCINC /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+}
+
+src_configure() {
+	# the configure script is not the standard autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-builtin-lzma \
+		--disable-rpath \
+		--enable-astiff \
+		--enable-exceptions	\
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		--with-afs-shared=yes \
+		$(use_enable X x11) \
+		$(use_enable X asimage) \
+		$(use_enable afs) \
+		$(use_enable avahi bonjour) \
+		$(use_enable clarens) \
+		$(use_enable clarens peac) \
+		$(use_enable ncurses editline) \
+		$(use_enable fits fitsio) \
+		$(use_enable fftw fftw3) \
+		$(use_enable graphviz gviz) \
+		$(use_enable kerberos krb5) \
+		$(use_enable ldap) \
+		$(use_enable llvm cling) \
+		$(use_enable math gsl-shared) \
+		$(use_enable math genvector) \
+		$(use_enable math mathmore) \
+		$(use_enable math minuit2) \
+		$(use_enable math roofit) \
+		$(use_enable math tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable postgres pgsql) \
+		$(use_enable pythia6) \
+		$(use_enable pythia8) \
+		$(use_enable python) \
+		$(use_enable qt4 qt) \
+		$(use_enable qt4 qtgsi) \
+		$(use_enable reflex cintex) \
+		$(use_enable reflex) \
+		$(use_enable ruby) \
+		$(use_enable ssl) \
+		$(use_enable xft) \
+		$(use_enable xml) \
+		$(use_enable xrootd) \
+		${EXTRA_ECONF} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed"
+	if use emacs; then
+		elisp-compile build/misc/*.el || die "elisp-compile failed"
+	fi
+}
+
+doc_install() {
+	cd "${S}"
+	if use doc; then
+		einfo "Installing user's guides"
+		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	fi
+
+	if use examples; then
+		# these should really be taken care of by the root make install
+		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
+		doins -r tmva/test
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+	fi
+}
+
+daemon_install() {
+	cd "${S}"
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	use xrootd && daemons="${daemons} xrootd olbd"
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins etc/daemons/{rootd,proofd}.xinetd
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	sed -e 's,@prefix@,/usr,' \
+		build/package/debian/root-system-bin.desktop.in > root.desktop
+	domenu root.desktop
+	doicon "${S}"/build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	doenvd 99root || die "doenvd failed"
+
+	# The build system installs Emacs support unconditionally and in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -rf "${ED}"/usr/share/emacs
+	if use emacs; then
+		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
+	fi
+
+	doc_install
+	daemon_install
+	desktop_install
+
+	# Cleanup of files either already distributed or unused on Gentoo
+	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
+	rm "${ED}"usr/share/root/fonts/LICENSE
+	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
+	rm -f posix/mktypes dll_stl/setup \
+		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o
+	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
+	rm -f "${ED}"/etc/root/proof/*.sample
+	rm -rf "${ED}"/etc/root/daemons
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_optimize /usr/$(get_libdir)/root
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_cleanup /usr/$(get_libdir)/root
+}



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2011-10-07 19:43 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2011-10-07 19:43 UTC (permalink / raw
  To: gentoo-commits

commit:     37b775a77832687fe12ffddf84fe3d1c115174d9
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Oct  7 19:42:06 2011 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Oct  7 19:42:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=37b775a7

sci-physics/root: 5.28.00g update

Version bump for 5.28 branch as requester per bug 384729.

---
 sci-physics/root/ChangeLog                         |    6 +
 .../root/files/root-5.28.00b-nobyte-compile.patch  |  138 ++++++++
 sci-physics/root/root-5.28.00g.ebuild              |  332 ++++++++++++++++++++
 3 files changed, 476 insertions(+), 0 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 77b72ad..e5d0e09 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-5.28.00g (07 Oct 2011)
+
+  07 Oct 2011; Andrew Savchenko <bircoph@gmail.com>
+  +files/root-5.28.00b-nobyte-compile.patch, +root-5.28.00g.ebuild:
+  Version bump for 5.28 branch as requester per bug 384729.
+
 *root-5.30.02 (03 Oct 2011)
 
   03 Oct 2011; Andrew Savchenko <bircoph@gmail.com> +root-5.30.02.ebuild:

diff --git a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
new file mode 100644
index 0000000..7029bf1
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
@@ -0,0 +1,138 @@
+diff -Naur root.orig/Makefile root/Makefile
+--- root.orig/Makefile	2010-12-17 22:48:40.577775091 +0300
++++ root/Makefile	2010-12-17 22:49:27.902497903 +0300
+@@ -1148,10 +1148,7 @@
+ 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
+ 	   fi; \
+-	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
+-	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
+-	   fi; \
+-	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
++	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      dir=$(RFLX_GRFLXDD:lib/=); \
+ 	      while test "x$${dir}" != "x" && \
+ 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
+diff -Naur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
+--- root.orig/bindings/pyroot/Module.mk	2010-12-17 22:48:39.941179413 +0300
++++ root/bindings/pyroot/Module.mk	2010-12-17 22:49:27.899164943 +0300
+@@ -48,8 +48,6 @@
+ ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
+ $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
+ endif
+-ROOTPYC      := $(ROOTPY:.py=.pyc)
+-ROOTPYO      := $(ROOTPY:.py=.pyo)
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
+@@ -68,10 +66,8 @@
+ 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)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
+@@ -113,7 +109,7 @@
+ 
+ distclean-$(MODNAME): clean-$(MODNAME)
+ 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
+-		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
++		   $(ROOTPY) $(PYROOTMAP) \
+ 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
+ 
+ distclean::     distclean-$(MODNAME)
+diff -Naur root.orig/build/package/debian/rules root/build/package/debian/rules
+--- root.orig/build/package/debian/rules	2010-12-17 22:48:40.197817461 +0300
++++ root/build/package/debian/rules	2010-12-17 22:49:27.902497903 +0300
+@@ -623,10 +623,6 @@
+ 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
+ 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			
+ #		$(foreach i, \
+ #		   $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
+ #		    -X$(i:$(DTMP)/%=%) )
+diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk
+--- root.orig/cint/cintex/Module.mk	2010-12-17 22:48:40.057833071 +0300
++++ root/cint/cintex/Module.mk	2010-12-17 22:49:27.902497903 +0300
+@@ -31,10 +31,6 @@
+ CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
+ $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
+ endif
+-ifneq ($(BUILDPYTHON),no)
+-CINTEXPYC    := $(CINTEXPY:.py=.pyc)
+-CINTEXPYO    := $(CINTEXPY:.py=.pyo)
+-endif
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
+@@ -86,8 +82,6 @@
+ 		fi)
+ 		cp $< $@
+ 
+-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
+-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
+                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
+diff -Naur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk
+--- root.orig/cint/reflex/Module.mk	2010-12-17 22:48:40.037835301 +0300
++++ root/cint/reflex/Module.mk	2010-12-17 22:51:36.871451359 +0300
+@@ -48,9 +48,6 @@
+ RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
+ RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
+ RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
+-ifneq ($(BUILDPYTHON),no)
+-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
+-endif
+ 
+ RFLX_LIBDIR = $(LIBDIR)
+ 
+@@ -92,7 +89,7 @@
+ 
+ ALLEXECS += $(RFLX_GENMAPX)
+ 
+-POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++POSTBIN  += $(RFLX_GRFLXPY)
+ 
+ ##### local rules #####
+ .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
+@@ -122,8 +119,6 @@
+ 		  mkdir -p lib/python/genreflex; fi )
+ 		cp $< $@
+ 
+-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
+-		@python -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
+ 
+@@ -149,7 +144,7 @@
+ 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
+ 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
+ 
+-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
+ 
+ clean-genreflex:
+ 		@rm -rf lib/python/genreflex
+diff -Naur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
+--- root.orig/cint/reflex/python/CMakeLists.txt	2010-12-17 22:48:40.037835301 +0300
++++ root/cint/reflex/python/CMakeLists.txt	2010-12-17 22:49:27.902497903 +0300
+@@ -15,7 +15,7 @@
+ #####################   sources   ####################
+ 
+ FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
+-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
++SET(GENREFLEX_SCRIPT PARENT_SCOPE)
+ 
+ #####################  gccxmlpath ####################
+ 
+

diff --git a/sci-physics/root/root-5.28.00g.ebuild b/sci-physics/root/root-5.28.00g.ebuild
new file mode 100644
index 0000000..8990411
--- /dev/null
+++ b/sci-physics/root/root-5.28.00g.ebuild
@@ -0,0 +1,332 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.3 2011/06/21 14:31:50 jlec Exp $
+
+EAPI=3
+PYTHON_DEPEND="python? 2"
+inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
+
+#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
+DOC_PV=5_26
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+	http://dev.gentoo.org/~bicatali/${PN}-${PATCH_PV}-xrootd-prop-flags.patch.bz2
+	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
+	math? (
+		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
+	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres pythia6
+	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
+
+CDEPEND=">=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-libs/ftgl
+	media-libs/giflib
+	media-libs/glew
+	media-libs/libpng
+	media-libs/tiff
+	sys-apps/shadow
+	virtual/jpeg
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi )
+	clarens? ( dev-libs/xmlrpc-c )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio )
+	fftw? ( sci-libs/fftw:3.0 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	llvm? ( sys-devel/llvm )
+	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	mysql? ( virtual/mysql )
+	ncurses? ( sys-libs/ncurses )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	qt4? ( x11-libs/qt-gui:4
+		x11-libs/qt-opengl:4
+		x11-libs/qt-qt3support:4
+		x11-libs/qt-svg:4
+		x11-libs/qt-webkit:4
+		x11-libs/qt-xmlpatterns:4 )
+	ruby? ( dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="
+	virtual/fortran
+${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	elog
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
+	elog
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	if use math; then
+		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+			ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
+			ewarn "If you want to build this package with OpenMP, abort now,"
+			ewarn "and set CC to an OpenMP capable compiler"
+		elif use openmp; then
+			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/${PN}-${PATCH_PV}-xrootd-prop-flags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
+	rm -rf graf2d/asimage/src/libAfterImage
+	rm -rf graf3d/ftgl/{inc,src}
+	rm -rf graf2d/freetype/src
+	rm -rf graf3d/glew/{inc,src}
+	rm -rf core/pcre/src
+	rm -rf math/unuran/src/unuran-*.tar.gz
+	find core/zip -type f -name "[a-z]*" | xargs rm
+	rm graf3d/gl/{inc,src}/gl2ps.*
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
+
+	# TODO: unbundle xrootd as a new package
+	#rm -rf net/xrootd/src
+	#sed -i \
+	#	-e 's:-lXrdOuc:-lXrd &:' \
+	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
+	#	proof/proofd/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINC:$ODBCINC /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+}
+
+src_configure() {
+	# the configure script is not the standard autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-rpath \
+		--enable-asimage \
+		--enable-astiff \
+		--enable-exceptions	\
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		--with-afs-shared=yes \
+		$(use_enable afs) \
+		$(use_enable avahi bonjour) \
+		$(use_enable clarens) \
+		$(use_enable clarens peac) \
+		$(use_enable ncurses editline) \
+		$(use_enable fits fitsio) \
+		$(use_enable fftw fftw3) \
+		$(use_enable graphviz gviz) \
+		$(use_enable kerberos krb5) \
+		$(use_enable ldap) \
+		$(use_enable llvm cling) \
+		$(use_enable math gsl-shared) \
+		$(use_enable math genvector) \
+		$(use_enable math mathmore) \
+		$(use_enable math minuit2) \
+		$(use_enable math roofit) \
+		$(use_enable math tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable postgres pgsql) \
+		$(use_enable pythia6) \
+		$(use_enable pythia8) \
+		$(use_enable python) \
+		$(use_enable qt4 qt) \
+		$(use_enable qt4 qtgsi) \
+		$(use_enable reflex cintex) \
+		$(use_enable reflex) \
+		$(use_enable ruby) \
+		$(use_enable ssl) \
+		$(use_enable xft) \
+		$(use_enable xml) \
+		$(use_enable xrootd) \
+		${EXTRA_ECONF} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed"
+	if use emacs; then
+		elisp-compile build/misc/*.el || die "elisp-compile failed"
+	fi
+}
+
+doc_install() {
+	cd "${S}"
+	if use doc; then
+		einfo "Installing user's guides"
+		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	fi
+
+	if use examples; then
+		# these should really be taken care of by the root make install
+		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
+		doins -r tmva/test
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+	fi
+}
+
+daemon_install() {
+	cd "${S}"
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	use xrootd && daemons="${daemons} xrootd olbd"
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins etc/daemons/{rootd,proofd}.xinetd
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	sed -e 's,@prefix@,/usr,' \
+		build/package/debian/root-system-bin.desktop.in > root.desktop
+	domenu root.desktop
+	doicon "${S}"/build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	doenvd 99root || die "doenvd failed"
+
+	# The build system installs Emacs support unconditionally and in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -rf "${ED}"/usr/share/emacs
+	if use emacs; then
+		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
+	fi
+
+	doc_install
+	daemon_install
+	desktop_install
+
+	# Cleanup of files either already distributed or unused on Gentoo
+	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
+	rm "${ED}"usr/share/root/fonts/LICENSE
+	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
+	rm -f posix/mktypes dll_stl/setup \
+		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o
+	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
+	rm -f "${ED}"/etc/root/proof/*.sample
+	rm -rf "${ED}"/etc/root/daemons
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_optimize /usr/$(get_libdir)/root
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_cleanup /usr/$(get_libdir)/root
+}



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2011-10-21 12:36 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2011-10-21 12:36 UTC (permalink / raw
  To: gentoo-commits

commit:     d9d29e108c763681264da30ef078ba4a7a6b8879
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Oct 21 12:34:38 2011 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Oct 21 12:34:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d9d29e10

sci-physics/root: remove old versions

---
 sci-physics/root/files/root-5.30.00-lzma.patch |   13 -
 sci-physics/root/root-5.30.00.ebuild           |  339 ------------------------
 sci-physics/root/root-5.30.01.ebuild           |  339 ------------------------
 3 files changed, 0 insertions(+), 691 deletions(-)

diff --git a/sci-physics/root/files/root-5.30.00-lzma.patch b/sci-physics/root/files/root-5.30.00-lzma.patch
deleted file mode 100644
index b35f7fd..0000000
--- a/sci-physics/root/files/root-5.30.00-lzma.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- root/configure.orig	2011-07-10 11:51:42.000000000 +0400
-+++ root/configure	2011-07-10 11:54:40.053175390 +0400
-@@ -2430,8 +2430,8 @@
-     check_header "lzma.h" "" \
-         $LZMA ${LZMA:+$LZMA/include} \
-         ${finkdir:+$finkdir/include} \
--        /usr/local/include /usr/include/lzma /usr/local/include/lzma \
--        /opt/lzma/include /usr/include
-+        /usr/local/include /usr/include /usr/local/include \
-+        /opt/lzma/include
-     if test "x$found_dir" = "x" ; then
-         enable_builtin_lzma=yes
-     else

diff --git a/sci-physics/root/root-5.30.00.ebuild b/sci-physics/root/root-5.30.00.ebuild
deleted file mode 100644
index f802d13..0000000
--- a/sci-physics/root/root-5.30.00.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.3 2011/06/21 14:31:50 jlec Exp $
-
-EAPI=3
-PYTHON_DEPEND="python? 2"
-inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
-
-#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-DOC_PV=5_26
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
-	math? (
-		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
-	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
-
-CDEPEND="app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng
-	media-libs/tiff
-	sys-apps/shadow
-	sys-libs/zlib
-	virtual/jpeg
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		qt4? ( x11-libs/qt-gui:4
-			x11-libs/qt-opengl:4
-			x11-libs/qt-qt3support:4
-			x11-libs/qt-svg:4
-			x11-libs/qt-webkit:4
-			x11-libs/qt-xmlpatterns:4 )
-		xft? ( x11-libs/libXft ) )
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	llvm? ( sys-devel/llvm )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	ruby? ( dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="
-	virtual/fortran
-${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	elog
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
-	elog
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-			ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
-			ewarn "If you want to build this package with OpenMP, abort now,"
-			ewarn "and set CC to an OpenMP capable compiler"
-		elif use openmp; then
-			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-xrootd-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
-		"${FILESDIR}"/${P}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${P}-lzma.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
-	rm -rf graf2d/asimage/src/libAfterImage
-	rm -rf graf3d/ftgl/{inc,src}
-	rm -rf graf2d/freetype/src
-	rm -rf graf3d/glew/{inc,src}
-	rm -rf core/pcre/src
-	rm -rf math/unuran/src/unuran-*.tar.gz
-	find core/zip -type f -name "[a-z]*" | xargs rm
-	rm -rf core/lzma/src/*.tar.gz
-	rm graf3d/gl/{inc,src}/gl2ps.*
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
-
-	# TODO: unbundle xrootd as a new package
-	#rm -rf net/xrootd/src
-	#sed -i \
-	#	-e 's:-lXrdOuc:-lXrd &:' \
-	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
-	#	proof/proofd/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINC:$ODBCINC /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-}
-
-src_configure() {
-	# the configure script is not the standard autotools
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--enable-astiff \
-		--enable-exceptions	\
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		--with-afs-shared=yes \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable ncurses editline) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable llvm cling) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable postgres pgsql) \
-		$(use_enable prefix rpath) \
-		$(use_enable pythia6) \
-		$(use_enable pythia8) \
-		$(use_enable python) \
-		$(use_enable qt4 qt) \
-		$(use_enable qt4 qtgsi) \
-		$(use_enable reflex cintex) \
-		$(use_enable reflex) \
-		$(use_enable ruby) \
-		$(use_enable ssl) \
-		$(use_enable xft) \
-		$(use_enable xml) \
-		$(use_enable xrootd) \
-		${EXTRA_ECONF} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed"
-	if use emacs; then
-		elisp-compile build/misc/*.el || die "elisp-compile failed"
-	fi
-}
-
-doc_install() {
-	cd "${S}"
-	if use doc; then
-		einfo "Installing user's guides"
-		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	fi
-
-	if use examples; then
-		# these should really be taken care of by the root make install
-		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
-		doins -r tmva/test
-	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-	fi
-}
-
-daemon_install() {
-	cd "${S}"
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	use xrootd && daemons="${daemons} xrootd olbd"
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	sed -e 's,@prefix@,/usr,' \
-		build/package/debian/root-system-bin.desktop.in > root.desktop
-	domenu root.desktop
-	doicon "${S}"/build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root || die "doenvd failed"
-
-	# The build system installs Emacs support unconditionally and in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -rf "${ED}"/usr/share/emacs
-	if use emacs; then
-		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
-	fi
-
-	doc_install
-	daemon_install
-	desktop_install
-
-	# Cleanup of files either already distributed or unused on Gentoo
-	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-	rm "${ED}"usr/share/root/fonts/LICENSE
-	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm -f posix/mktypes dll_stl/setup \
-		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o
-	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-	rm -f "${ED}"/etc/root/proof/*.sample
-	rm -rf "${ED}"/etc/root/daemons
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
-}

diff --git a/sci-physics/root/root-5.30.01.ebuild b/sci-physics/root/root-5.30.01.ebuild
deleted file mode 100644
index 452c573..0000000
--- a/sci-physics/root/root-5.30.01.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.3 2011/06/21 14:31:50 jlec Exp $
-
-EAPI=3
-PYTHON_DEPEND="python? 2"
-inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
-
-#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-DOC_PV=5_26
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.30.00
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
-	math? (
-		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
-	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
-
-CDEPEND="app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng
-	media-libs/tiff
-	sys-apps/shadow
-	sys-libs/zlib
-	virtual/jpeg
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		qt4? ( x11-libs/qt-gui:4
-			x11-libs/qt-opengl:4
-			x11-libs/qt-qt3support:4
-			x11-libs/qt-svg:4
-			x11-libs/qt-webkit:4
-			x11-libs/qt-xmlpatterns:4 )
-		xft? ( x11-libs/libXft ) )
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	llvm? ( sys-devel/llvm )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	ruby? ( dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="
-	virtual/fortran
-${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	elog
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
-	elog
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-			ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
-			ewarn "If you want to build this package with OpenMP, abort now,"
-			ewarn "and set CC to an OpenMP capable compiler"
-		elif use openmp; then
-			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-xrootd-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
-	rm -rf graf2d/asimage/src/libAfterImage
-	rm -rf graf3d/ftgl/{inc,src}
-	rm -rf graf2d/freetype/src
-	rm -rf graf3d/glew/{inc,src}
-	rm -rf core/pcre/src
-	rm -rf math/unuran/src/unuran-*.tar.gz
-	find core/zip -type f -name "[a-z]*" | xargs rm
-	rm -rf core/lzma/src/*.tar.gz
-	rm graf3d/gl/{inc,src}/gl2ps.*
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
-
-	# TODO: unbundle xrootd as a new package
-	#rm -rf net/xrootd/src
-	#sed -i \
-	#	-e 's:-lXrdOuc:-lXrd &:' \
-	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
-	#	proof/proofd/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINC:$ODBCINC /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-}
-
-src_configure() {
-	# the configure script is not the standard autotools
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--enable-astiff \
-		--enable-exceptions	\
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		--with-afs-shared=yes \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable ncurses editline) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable llvm cling) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable postgres pgsql) \
-		$(use_enable prefix rpath) \
-		$(use_enable pythia6) \
-		$(use_enable pythia8) \
-		$(use_enable python) \
-		$(use_enable qt4 qt) \
-		$(use_enable qt4 qtgsi) \
-		$(use_enable reflex cintex) \
-		$(use_enable reflex) \
-		$(use_enable ruby) \
-		$(use_enable ssl) \
-		$(use_enable xft) \
-		$(use_enable xml) \
-		$(use_enable xrootd) \
-		${EXTRA_ECONF} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed"
-	if use emacs; then
-		elisp-compile build/misc/*.el || die "elisp-compile failed"
-	fi
-}
-
-doc_install() {
-	cd "${S}"
-	if use doc; then
-		einfo "Installing user's guides"
-		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	fi
-
-	if use examples; then
-		# these should really be taken care of by the root make install
-		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
-		doins -r tmva/test
-	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-	fi
-}
-
-daemon_install() {
-	cd "${S}"
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	use xrootd && daemons="${daemons} xrootd olbd"
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	sed -e 's,@prefix@,/usr,' \
-		build/package/debian/root-system-bin.desktop.in > root.desktop
-	domenu root.desktop
-	doicon "${S}"/build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root || die "doenvd failed"
-
-	# The build system installs Emacs support unconditionally and in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -rf "${ED}"/usr/share/emacs
-	if use emacs; then
-		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
-	fi
-
-	doc_install
-	daemon_install
-	desktop_install
-
-	# Cleanup of files either already distributed or unused on Gentoo
-	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-	rm "${ED}"usr/share/root/fonts/LICENSE
-	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm -f posix/mktypes dll_stl/setup \
-		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o
-	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-	rm -f "${ED}"/etc/root/proof/*.sample
-	rm -rf "${ED}"/etc/root/daemons
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
-}



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2011-12-04  0:29 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2011-12-04  0:29 UTC (permalink / raw
  To: gentoo-commits

commit:     36674bd9b66a67fc529c5d7650c1a1f342e4065d
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Dec  4 00:25:09 2011 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Dec  4 00:25:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=36674bd9

sci-physics/root: new production release bump

Main changes:
- xrootd is now unbundled as a separate package;
- build with USE=afs works with an openafs patch from bug 393071.

For more details please see package ChangeLog.

---
 sci-physics/root/ChangeLog                         |   28 +
 sci-physics/root/files/olbd.confd                  |    9 -
 sci-physics/root/files/olbd.initd                  |   26 -
 .../root/files/root-5.28.00b-nobyte-compile.patch  |  138 -----
 .../files/root-5.30.00-xrootd-prop-flags.patch     |  623 --------------------
 sci-physics/root/files/root-5.32.00-afs.patch      |   33 +
 sci-physics/root/files/xrootd.confd                |    8 -
 sci-physics/root/files/xrootd.initd                |   26 -
 .../{root-5.30.05.ebuild => root-5.32.00.ebuild}   |   16 +-
 9 files changed, 66 insertions(+), 841 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index c42ef3c..d657b4a 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,34 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-5.32.00 (03 Dec 2011)
+
+  03 Dec 2011; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-5.28.00b-nobyte-compile.patch,
+  -files/root-5.30.00-xrootd-prop-flags.patch, -root-5.30.05.ebuild,
+  +root-5.32.00.ebuild, +files/root-5.32.00-afs.patch, -files/olbd.confd,
+  -files/olbd.initd, -files/rootd.initd, -files/xrootd.confd,
+  -files/xrootd.initd:
+  Version bump to the new production release 5.32.00
+
+  Major changes are:
+  - xrootd is now unbundled upstream, separate sci-physics/xrootd
+  package was added to the science overlay for this support, all
+  xrootd-related patches and scripts are removed from this ebuild and
+  used in sci-physcis/xrootd.
+  - AFS support for net-fs/openafs-1.6.0 is fixed now with a patch
+  for openafs itself: the problem is that openafs hides some symbols
+  from shared versions of the libraries which are present in the same
+  static libraries. One of such symbols, ka_GetAFSTicket, is required
+  for root to build and root can't use static libafsauthent.a due to
+  relocation issues.
+
+  To enable AFS support the following needed:
+  - type cast patch;
+  - strlcpy and strlcat from ROOT core lib must be defined weak,
+  since they are redefined in openafs lib;
+  - ka_GetAFSTicket symbol is added to openafs by patch in bug #393071.
+
 *root-5.30.05 (25 Nov 2011)
 
   25 Nov 2011; Andrew Savchenko <bircoph@gmail.com> -root-5.30.03-r1.ebuild,

diff --git a/sci-physics/root/files/olbd.confd b/sci-physics/root/files/olbd.confd
deleted file mode 100644
index 848f4d7..0000000
--- a/sci-physics/root/files/olbd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# conf.d file for olbd daemon
-
-# User to run as (default is `xrootd')
-OLBD_USER="root"
-
-#
-# Please refer to the olbd(1) man(1) page for more
-# information on command line parameters. 
-OLBD_OPTS=""

diff --git a/sci-physics/root/files/olbd.initd b/sci-physics/root/files/olbd.initd
deleted file mode 100644
index 95b7bc5..0000000
--- a/sci-physics/root/files/olbd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/olbd.initd,v 1.1 2008/12/18 18:10:18 bicatali Exp $
-
-depend() {
-    need net
-    use dns logger
-    provide root-file-server
-}
-
-start() {
-    ebegin "Starting ROOT open load balancer server"
-    start-stop-daemon --start --quiet --user=${OLBD_USER} \
-	--make-pidfile --pidfile=/var/run/olbd.pid \
-	--exec /usr/bin/olbd --background -- ${OLBD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ROOT open load balancer server"
-    start-stop-daemon --stop --quiet \
-	--pidfile=/var/run/olbd.pid \
-	--exec /usr/bin/olbd
-    eend $?
-}

diff --git a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
deleted file mode 100644
index 7029bf1..0000000
--- a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur root.orig/Makefile root/Makefile
---- root.orig/Makefile	2010-12-17 22:48:40.577775091 +0300
-+++ root/Makefile	2010-12-17 22:49:27.902497903 +0300
-@@ -1148,10 +1148,7 @@
- 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
- 	   fi; \
--	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
--	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
--	   fi; \
--	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      dir=$(RFLX_GRFLXDD:lib/=); \
- 	      while test "x$${dir}" != "x" && \
- 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-diff -Naur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.orig/bindings/pyroot/Module.mk	2010-12-17 22:48:39.941179413 +0300
-+++ root/bindings/pyroot/Module.mk	2010-12-17 22:49:27.899164943 +0300
-@@ -48,8 +48,6 @@
- ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
- $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
- endif
--ROOTPYC      := $(ROOTPY:.py=.pyc)
--ROOTPYO      := $(ROOTPY:.py=.pyo)
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- 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)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff -Naur root.orig/build/package/debian/rules root/build/package/debian/rules
---- root.orig/build/package/debian/rules	2010-12-17 22:48:40.197817461 +0300
-+++ root/build/package/debian/rules	2010-12-17 22:49:27.902497903 +0300
-@@ -623,10 +623,6 @@
- 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
- 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			
- #		$(foreach i, \
- #		   $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
- #		    -X$(i:$(DTMP)/%=%) )
-diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.orig/cint/cintex/Module.mk	2010-12-17 22:48:40.057833071 +0300
-+++ root/cint/cintex/Module.mk	2010-12-17 22:49:27.902497903 +0300
-@@ -31,10 +31,6 @@
- CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC    := $(CINTEXPY:.py=.pyc)
--CINTEXPYO    := $(CINTEXPY:.py=.pyo)
--endif
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- 		fi)
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.orig/cint/reflex/Module.mk	2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/Module.mk	2010-12-17 22:51:36.871451359 +0300
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
- 
- RFLX_LIBDIR = $(LIBDIR)
- 
-@@ -92,7 +89,7 @@
- 
- ALLEXECS += $(RFLX_GENMAPX)
- 
--POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN  += $(RFLX_GRFLXPY)
- 
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- 		  mkdir -p lib/python/genreflex; fi )
- 		cp $< $@
- 
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
--		@python -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
- 
-@@ -149,7 +144,7 @@
- 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
- 
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
- 
- clean-genreflex:
- 		@rm -rf lib/python/genreflex
-diff -Naur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.orig/cint/reflex/python/CMakeLists.txt	2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/python/CMakeLists.txt	2010-12-17 22:49:27.902497903 +0300
-@@ -15,7 +15,7 @@
- #####################   sources   ####################
- 
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
- 
- #####################  gccxmlpath ####################
- 
-

diff --git a/sci-physics/root/files/root-5.30.00-xrootd-prop-flags.patch b/sci-physics/root/files/root-5.30.00-xrootd-prop-flags.patch
deleted file mode 100644
index 671cfe3..0000000
--- a/sci-physics/root/files/root-5.30.00-xrootd-prop-flags.patch
+++ /dev/null
@@ -1,623 +0,0 @@
-diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.env.in root/net/xrootd/src/xrootd/config/GNUmake.env.in
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.env.in	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/config/GNUmake.env.in	2011-07-10 10:27:45.001375019 +0400
-@@ -47,6 +47,7 @@
- CFHASXRDCRYPTO = @hasxrdcrypto@
- 
- CFLAGS += $(CFSTRLCPY) $(CFHASOLDHDRS) $(CFFSTATAT) $(CFHASLIBZ) $(CFATOMICS)
-+CFLAGS += $(CXXFLAGS)
- 
- # AFS relevant variables
- @incafs@
-diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.options.in root/net/xrootd/src/xrootd/config/GNUmake.options.in
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.options.in	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/config/GNUmake.options.in	2011-07-10 10:24:16.131357441 +0400
-@@ -16,7 +16,7 @@
- CF32="$(TYPECF32)" \
- CFOP="$(@buildopt@)" \
- LD="$(TYPELD)" \
--LDOP="$(@buildopt@)" \
-+LDOP="$(LDFLAGS)" \
- LDSO="$(TYPELDSO)" \
- LIBS=" @ldsyslibs@ $(TYPELIBS)" \
- TYPE="$(TYPE)"
-@@ -33,7 +33,7 @@
- CF32="$(TYPECF32)" \
- CFOP="$(@buildopt@)" \
- LD="$(TYPELD)" \
--LDOP="$(@buildopt@)" \
-+LDOP="$(LDFLAGS)" \
- LDSO="$(TYPELDSO)" \
- LIBS=" @ldsyslibs@ $(TYPELIBS)" \
- TYPE="$(TYPE)"
-diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd	2011-07-10 10:24:16.131357441 +0400
-@@ -11,7 +11,7 @@
-              -Wall -Wno-deprecated $(CFTRACE)
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- TYPELDSO   = -shared
- TYPESHLIB  = so
-diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc	2011-07-10 10:24:16.131357441 +0400
-@@ -11,7 +11,7 @@
-              -Wall -Wno-deprecated -D__linux__ $(CFTRACE)
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- TYPELDSO   = -shared
- TYPESHLIB  = so
-diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64	2011-07-10 10:24:16.131357441 +0400
-@@ -11,7 +11,7 @@
-              -Wall -Wno-deprecated -D__linux__ $(CFTRACE)
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- TYPELDSO   = -shared
- TYPESHLIB  = so
-diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664	2011-07-10 10:24:16.131357441 +0400
-@@ -11,7 +11,7 @@
-              -Wall -Wno-deprecated -D__linux__ $(CFTRACE)
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- TYPELDSO   = -m64 -shared
- TYPESHLIB  = so
-diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc root/net/xrootd/src/xrootd/config/GNUmake.rules.icc
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.icc	2011-07-10 10:24:16.131357441 +0400
-@@ -13,7 +13,7 @@
-              -ansi -D__linux__ -D__ICC__ -wd1476 -wd191 -wd468 -wd858 -wd1224 -wd584 $(CFTRACE)
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- TYPELDSO   = -m32 -shared
- TYPESHLIB  = so
-diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664	2011-07-10 10:24:16.131357441 +0400
-@@ -14,7 +14,7 @@
-              -wd1572 -wd584 -i-dynamic $(CFTRACE)
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- TYPELDSO   = -m64 -shared
- TYPESHLIB  = so
-diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos root/net/xrootd/src/xrootd/config/GNUmake.rules.macos
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos	2011-07-10 10:24:16.131357441 +0400
-@@ -18,7 +18,7 @@
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- TYPELINK   = -undefined dynamic_lookup -multiply_defined suppress 
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
- TYPELDSO   = $(TYPELINK) -dynamiclib -single_module -m32
-diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64	2011-07-10 10:24:16.131357441 +0400
-@@ -15,7 +15,7 @@
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- TYPELINK   = -undefined dynamic_lookup -multiply_defined suppress 
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
- TYPELDSO   = $(TYPELINK) -dynamiclib -single_module -m64
-diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc
---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc	2011-07-10 10:24:16.131357441 +0400
-@@ -11,7 +11,7 @@
-              -Wall -Wno-deprecated -DSUNGCC $(CFTRACE)
- TYPECF32   =
- TYPECF64   = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
--TYPEOPT    = $(TYPEMISC) -O2
-+TYPEOPT    = $(TYPEMISC) $(CXXFLAGS)
- TYPEDBG    = $(TYPEMISC) -g
- TYPELDSO   = -shared
- TYPESHLIB  = so
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile	2011-07-10 10:24:16.131357441 +0400
-@@ -71,7 +71,7 @@
- 
- $(TESTBIN): $(OBJECTB) $(LIBDEPS)
- 	@echo Creating executable $(TESTBIN) 
--	$(ECHO)$(LD) $(CFLAGS) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN)
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN)
- 
- $(OBJDIR)/XrdAccAccess.o: XrdAccAccess.cc     XrdAccAccess.hh \
-                           XrdAccCapability.hh XrdAccConfig.hh    XrdAccGroups.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile	2011-07-10 10:24:16.131357441 +0400
-@@ -59,7 +59,7 @@
-   
- $(XRDADLER32): $(XRDADLER32_OBJ) $(XRDADLERDEPT)
- 	@echo Creating executable $(XRDADLER32)
--	$(ECHO)$(LD) $(LDOP) $(XRDADLER32_OBJ) $(XRDADLERDEPS) $(XRDADLERLIBS) -o $(XRDADLER32)
-+	$(ECHO) $(LD) $(LDFLAGS) $(XRDADLER32_OBJ) $(XRDADLERDEPS) $(XRDADLERLIBS) -o $(XRDADLER32)
- 
- $(XRDADLER32_OBJ): Xrdadler32.cc \
-                    XrdPosixExtern.hh    XrdPosixXrootd.hh \
-@@ -90,7 +90,7 @@
- 
- $(XRDMPXBIN): $(XRDMPXOBJ) $(XrdMPXDEPS)
- 	@echo Creating executable $(XRDMPXBIN)
--	$(ECHO)$(LD) $(LDOP) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN)
-+	$(ECHO)$(CC) $(CXXFLAGS) $(LDFLAGS) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN)
-  
- $(XRDMPXOBJ): XrdMpxStats.cc \
-               XrdNetDNS.hh       XrdNetSocket.hh   XrdNetOpts.hh \
-@@ -106,7 +106,7 @@
-  
- $(XRDW41): $(XRDW41_OBJ) $(XRDW41_DEPS)
- 	@echo Creating executable $(XRDW41)
--	$(ECHO)$(LD) $(LDOP) $(XRDW41_OBJ) $(XRDW41LIBS) -o $(XRDW41)
-+	$(ECHO)$(CC) $(CXXFLAGS) $(LDFLAGS) $(XRDW41_OBJ) $(XRDW41LIBS) -o $(XRDW41)
- 
- $(XRDW41_OBJ): XrdWait41.cc \
-                    XrdOucTList.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile	2011-06-28 13:49:43.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile	2011-07-10 10:24:16.131357441 +0400
-@@ -67,7 +67,7 @@
- 	$(ECHO)ranlib $(LIBARCH)
- 
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS)  -o $(LIBRARY)
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS)  -o $(LIBRARY)
- 
- $(OBJDIR)/XrdBwm.o:  XrdBwm.cc           XrdBwm.hh \
-                      XrdAccAuthorize.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile	2011-06-28 13:49:41.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile	2011-07-10 10:24:16.131357441 +0400
-@@ -160,17 +160,17 @@
- $(LIBSHARED): $(OBJECTS) $(LIBDEP)
- 	@echo Creating shared library $(LIBSHARED) 
- 	$(ECHO)rm -f $(LIBSHARED)
--	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED)
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED)
- ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
- 	$(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \
--	          $(CC) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \
-+	          $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \
- 	fi
- endif
- 
- $(LIBRARY_JNI): $(OBJECT_JNI)
- 	@echo Creating shared library $(LIBRARY_JNI) 
- 	$(ECHO)rm -f $(LIBRARY_JNI);
--	$(ECHO)$(CC) $(CFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI)
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI)
- 
- $(CLASS_JNI_TARGET): $(CLASS_JNI).java
- 	@echo Creating JNI class file $(CLASS_JNI_TARGET)
-@@ -178,27 +178,27 @@
- 
- $(BINDIR)/TestXrdClient_read: $(OBJECTS) $(OBJECTD) $(LIBDEPS)
- 	@echo Creating executable $(BINDIR)/TestXrdClient_read 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTD) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient_read
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTD) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient_read
- 
- $(BINDIR)/TestXrdClient: $(OBJECTS) $(OBJECTB) $(LIBDEPS)
- 	@echo Creating executable $(BINDIR)/TestXrdClient 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient
- 
- $(XRDCP): $(OBJECTS) $(OBJECTC) $(LIBDEPS)
- 	@echo Creating executable $(XRDCP) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTC) $(BINLIBS) $(LIBS) $(LIBZ) -o $(XRDCP)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTC) $(BINLIBS) $(LIBS) $(LIBZ) -o $(XRDCP)
- 
- $(XRDPREPTOOL): $(OBJECTS) $(OBJECT_PREPTOOL) $(LIBDEPS)
- 	@echo Creating executable $(XRDPREPTOOL)
--	$(ECHO)$(LD) $(LDOP) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBS) -o $(XRDPREPTOOL)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBS) -o $(XRDPREPTOOL)
- 
- $(XRDSTAGETOOL): $(OBJECTS) $(OBJECT_STAGETOOL) $(LIBDEPS)
- 	@echo Creating executable $(XRDSTAGETOOL) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBS) -o $(XRDSTAGETOOL)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBS) -o $(XRDSTAGETOOL)
- 
- $(XRDCLI): $(OBJECTS) $(OBJECT_CLI) $(LIBDEPS)
- 	@echo Creating executable $(XRDCLI) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECT_CLI) $(BINLIBS) $(LIBS) $(LIBREADLINE) -o $(XRDCLI)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECT_CLI) $(BINLIBS) $(LIBS) $(LIBREADLINE) -o $(XRDCLI)
- 
- $(XRDADMIN): $(PERLMOD)
- 	$(ECHO)if [ "$(PERLBIN)" != "" ]; then \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile	2011-06-28 13:49:43.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
-@@ -136,7 +136,7 @@
- 
- $(BINARY): $(OBJSRVR) $(OBJBOTH) $(LIBDEPS)
- 	@echo Creating executable $(BINARY) 
--	$(ECHO)$(LD) $(LDOP) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY)
- 
- 
- $(LIBRARY): $(OBJCLNT) $(OBJBOTH)
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile	2011-06-28 13:49:41.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
-@@ -90,11 +90,11 @@
- 
- $(TARGCNSD): $(OBJCNSD) $(OBJCOM) $(LIBDEP)
- 	@echo Creating executable $(BINDIR)/XrdCnsd
--	$(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd
-+	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd
- 
- $(TARGSSI): $(OBJSSI) $(OBJCOM) $(LIBDEP)
- 	@echo Creating executable $(BINDIR)/cns_ssi
--	$(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi
-+	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi
- 
- $(OBJDIR)/XrdCnsConfig.o:  XrdCnsConfig.hh    XrdCnsConfig.cc \
-                            XrdCnsDaemon.hh    XrdCnsLogRec.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
-@@ -139,7 +139,7 @@
- 
- $(LIBRARY): $(OBJECTS) $(LIBUTIL)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY)
- 
- $(LIBASSL): $(OBJCSSL)
- 	@echo Creating archive $(LIBASSL) 
-@@ -149,11 +149,11 @@
- 
- $(LIBCSSL): $(OBJCSSL) $(LIBARCH) $(LIBUTIL)
- 	@echo Creating shared library $(LIBCSSL) 
--	$(ECHO)$(LD) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL)
- 
- $(CRYPTOTEST): $(OBJECTA) $(LIBARCH) $(LIBDEPS)
- 	@echo Creating executable $(CRYPTOTEST) 
--	$(ECHO)$(LD) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST)
- 
- $(OBJDIR)/XrdCryptotest.o: XrdCryptotest.cc XrdSutAux.hh XProtocol.hh XrdSutBucket.hh \
- 			   XrdCryptoAux.hh XrdCryptoFactory.hh XrdCryptoCipher.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdFfs/GNUmakefile root/net/xrootd/src/xrootd/src/XrdFfs/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdFfs/GNUmakefile	2011-06-28 13:49:41.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdFfs/GNUmakefile	2011-07-10 10:37:08.791154841 +0400
-@@ -82,7 +82,7 @@
- 
- $(BINARY): $(OBJECTS) $(OBJBIN) $(BINDEPS)
- 	@echo Creating executable $(BINARY)
--	$(ECHO)$(LD) $(LDOP) $(OBJBIN) $(BINDEPS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJBIN) $(BINDEPS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY)
- 
- $(OBJDIR)/XrdFfsDent.o: XrdFfsDent.cc  XrdFfsDent.hh
- 	@echo Compiling XrdFfsDent.cc
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
-@@ -134,15 +134,15 @@
- 
- $(BINADMIN): $(OBJLIB) $(OBJADMIN)          $(OBJDEPS)
- 	@echo Creating executable $(BINADMIN)
--	$(ECHO)$(LD) $(LDOP) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINADMIN)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINADMIN)
- 
- $(BINPURGD): $(OBJLIB) $(OBJPURG) $(OBJADDS) $(OBJDEPS)
- 	@echo Creating executable $(BINPURGD)
--	$(ECHO)$(LD) $(LDOP) $(OBJPURG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPURGD)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJPURG) $(OBJADDS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINPURGD)
- 
- $(BINXFRD): $(OBJLIB) $(OBJXFR) $(OBJADDS) $(OBJDEPS)
- 	@echo Creating executables $(BINXFRD)
--	$(ECHO)$(LD) $(LDOP) $(OBJXFR) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINXFRD)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJXFR) $(OBJADDS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINXFRD)
- 
- $(BINAGNT): $(BINXFRD)
- 	@echo Creating executables $(BINAGNT)
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile	2011-06-28 13:49:43.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
-@@ -141,45 +141,45 @@
- 
- $(ADMIN):	$(OBJECTS_BIN_ADM) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys
- 
- $(COLLECTOR):	$(OBJECTS_BIN_CTR) $(LIBRARY_CTR) \
- 	$(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys
- 
- $(CONVTIME):	$(OBJECTS_BIN_CTM) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^
- 
- $(COUT2FILE):	$(OBJECTS_BIN_C2F) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^
- 
- $(DEBUGPACKET):	$(OBJECTS_BIN_DBP) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^
- 
- $(DECODER):	$(OBJECTS_BIN_DEC) $(LIBRARY_DEC) $(LIBRARY_OUC) \
- 	$(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^
- 
- $(DUMPPACKETS):	$(OBJECTS_BIN_DMP) $(LIBRARY_DEC) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^
- 
- $(FSENDER):	$(OBJECTS_BIN_FSD) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^
- 
- $(SENDER):	$(OBJECTS_BIN_SND) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) 
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys
- 
- $(TESTPARSER):	$(OBJECTS_BIN_TPR) $(LIBRARY_COMMON)
- 	@echo Creating executable $(@F)
--	$(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^
-+	$(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^
- 
- $(OBJDIR)/%.o : %.cc
- 	@echo Compiling $(<F)
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile root/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile	2011-06-28 13:49:40.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
-@@ -76,14 +76,14 @@
- 
- $(LIBPLDR): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP)
- 	@echo Creating shared library $(LIBPLDR)
--	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJECTT) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBPLDR)
-+	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(OBJECTT) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBPLDR)
- 
- $(LIBRARY): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
- ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
- 	$(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \
--	   $(CC) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(MORELIBS) $(LIBS) -o $(LIBDIR)/libXrdPosix.$(TYPEDYLIB); \
-+	   $(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(MORELIBS) $(LIBS) -o $(LIBDIR)/libXrdPosix.$(TYPEDYLIB); \
- 	fi
- endif
- # MacOS X does not support linking against shared libraries so include
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile root/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile	2011-06-28 13:49:40.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
-@@ -70,7 +70,7 @@
- 
- $(TARGETS): $(OBJECTS) $(OBJECTT) $(LIBDEP)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(CFLAGS) $(OBJECTT) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTT) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
- 
- $(OBJDIR)/XrdPss.o:  XrdPss.cc         XrdPss.hh \
-                      XrdFfsPosix.hh    XrdPosixXrootd.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
-@@ -6,7 +6,7 @@
-   
- include ../GNUmake.env
- 
--LFLAGS  = -L$(LIBDIR) -lXrdOuc $(LDSO)
-+LFLAGS  = $(LDSO) -L$(LIBDIR) -lXrdOuc
- 
- LIBDEPS = $(LIBDIR)/libXrdOuc.a
- 
-@@ -48,7 +48,7 @@
- 
- $(TARGETS): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJECTS) $(LFLAGS) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LFLAGS) -o $(LIBRARY)
- 
- $(OBJDIR)/XrdRootdProtocol.o: XrdRootdProtocol.hh XrdLink.hh \
-                               XrdScheduler.hh     XrdTrace.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
-@@ -78,15 +78,15 @@
- 
- $(LIBRARY): $(OBJSLIB) $(LIBDEPS)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
- 
- $(TSTBINA): $(OBJECTA) $(LIBDEPS)
- 	@echo Creating executable $(TSTBINA) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTA) $(LIBS) $(BINLIBS) -o $(TSTBINA)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(LIBS) $(BINLIBS) -o $(TSTBINA)
- 
- $(TSTBINB): $(OBJECTB) $(LIBDEPS)
- 	@echo Creating executable $(TSTBINB) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTB) $(LIBS) $(BINLIBS) -o $(TSTBINB)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTB) $(LIBS) $(BINLIBS) -o $(TSTBINB)
- 
- $(OBJDIR)/XrdSecClient.o: XrdSysPthread.hh XrdSecPManager.hh XrdSecInterface.hh \
-                           XrdOucErrInfo.hh XrdSecClient.cc   XrdSecEntity.hh
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile	2011-07-10 10:31:48.396441015 +0400
-@@ -115,23 +115,23 @@
- 
- $(LIBRARY): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(LD) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBRARY)
- 
- $(LIBGMLDAP): $(OBJECTC)
- 	@echo Creating shared library $(LIBGMLDAP) 
--	$(ECHO)$(LD) $(OBJECTC) $(LDSO) $(LIBS) -o $(LIBGMLDAP)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTC) $(LDSO) $(LIBS) -o $(LIBGMLDAP)
- 
- $(LIBGMDN): $(OBJECTD)
- 	@echo Creating shared library $(LIBGMDN) 
--	$(ECHO)$(LD) $(OBJECTD) $(LDSO) $(LIBDIR)/libXrdOuc.a $(LIBS) -o $(LIBGMDN)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTD) $(LDSO) $(LIBDIR)/libXrdOuc.a $(LIBS) -o $(LIBGMDN)
- 
- $(SECGSITEST): $(OBJECTA) $(LIBDEPS)
- 	@echo Creating executable $(SECGSITEST) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS) -o $(SECGSITEST)
-+	$(ECHO)$(CC) $(LDFLAGS) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS) -o $(SECGSITEST)
- 
- $(SECGSIPROXY): $(OBJECTB) $(LIBDEPS)
- 	@echo Creating executable $(SECGSIPROXY) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(SECGSIPROXY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(SECGSIPROXY)
- 
- $(OBJDIR)/XrdSecgsitest.o: XrdSecgsitest.cc XrdOucString.hh \
- 		XrdSysError.hh XrdSutAux.hh XProtocol.hh XPtypes.hh XrdCryptoAux.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -45,7 +45,7 @@
- 
- $(TARGETS): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(TARGETS) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
- 
- $(OBJDIR)/XrdSecProtocolkrb4.o: XrdSecProtocolkrb4.cc XrdSecInterface.hh \
-                                 XrdSysPthread.hh      XrdOucTokenizer.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -49,7 +49,7 @@
- 
- $(TARGETS): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(TARGETS) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
- 
- $(OBJDIR)/XrdSecProtocolkrb5.o: XrdSecProtocolkrb5.cc XrdSecInterface.hh \
-                                 XrdSysPthread.hh      XrdOucTokenizer.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile	2011-06-28 13:49:43.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -65,11 +65,11 @@
- 
- $(LIBRARY): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(LIBRARY)
- 
- $(SRVADMIN): $(OBJECTA) $(LIBDEPS)
- 	@echo Creating executable $(SRVADMIN) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS)  $(RESOLVLIB) -o $(SRVADMIN)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(BINLIBS) $(LIBS)  $(RESOLVLIB) -o $(SRVADMIN)
- 
- $(OBJDIR)/XrdSecpwdSrvAdmin.o: XrdSecpwdSrvAdmin.cc \
- 		XrdOucString.hh XrdSutAux.hh XProtocol.hh XPtypes.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -85,7 +85,7 @@
- 
- $(LIBRARY): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
- 
- $(LIBGRST): $(OBJGRST)
- 	@echo Creating archive $(LIBGRST)
-@@ -95,7 +95,7 @@
- 
- $(SECSSLTEST): $(OBJECTA) $(LIBDEPS)
- 	@echo Creating executable $(SECSSLTEST)
--	$(ECHO)$(LD) $(LDOP) $(OBJECTA) -L$(LIBDIR) -lXrdSecssl $(MORELIBS) $(LIBS) -o $(SECSSLTEST)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) -L$(LIBDIR) -lXrdSecssl $(MORELIBS) $(LIBS) -o $(SECSSLTEST)
- 
- $(OBJDIR)/XrdSecProtocolsslProc.o:  XrdSecProtocolsslProc.cc 	XrdSecProtocolsslProc.hh \
- 			        XrdOucString.hh 	XrdOucHash.hh
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile	2011-06-28 13:49:40.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -77,11 +77,11 @@
- 
- $(TARGLSO): $(OBJSLIB) $(LIBDEPS)
- 	@echo Creating shared library $(TARGLSO)
--	$(ECHO)$(CC) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBSSL) $(LIBS) -o $(TARGLSO);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBSSL) $(LIBS) -o $(TARGLSO);
- 
- $(TARGBIN): $(OBJSBIN)
- 	@echo Creating executable $(TARGBIN)
--	$(ECHO)$(LD) $(LDOP) $(OBJSBIN) $(MORELIBS) $(LIBS) -o $(TARGBIN);
-+	$(ECHO) $(LD) $(LDFLAGS) $(OBJSBIN) $(MORELIBS) $(LIBS) -o $(TARGBIN);
- 
- $(OBJDIR)/XrdSecProtocolsss.o: XrdSecProtocolsss.cc    XrdSecProtocolsss.hh \
-                                XrdNetDNS.hh            XrdOucErrInfo.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -45,7 +45,7 @@
- 
- $(TARGETS): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(TARGETS) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
- 
- $(OBJDIR)/XrdSecProtocolunix.o: XrdSecProtocolunix.cc XrdSecInterface.hh \
-                                 XrdSysHeaders.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile	2011-06-28 13:49:40.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -67,7 +67,7 @@
- 
- $(LIBRARY): $(OBJECTS) $(LIBDIR)/libXrdOuc.a
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJECTS) $(LIBDIR)/libXrdOuc.a $(LDSO) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LIBDIR)/libXrdOuc.a $(LDSO) -o $(LIBRARY)
- 
- $(OBJDIR)/XrdSutPFAdmin.o: XrdSutPFAdmin.cc XrdOucString.hh \
- 		XrdSutAux.hh XProtocol.hh XPtypes.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile	2011-06-28 13:49:41.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -95,7 +95,7 @@
- 
- $(TARGETS): $(OBJECTS) $(OBJDEPS)
- 	@echo Creating executable $(TARGETS) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTS) $(OBJFS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(TARGETS)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(OBJFS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(TARGETS)
- 
- $(OBJDIR)/XrdXrootdAdmin.o: XrdXrootdAdmin.hh      XrdXrootdAdmin.cc \
-                             XrdXrootdTrace.hh      XrdXrootdProtocol.hh \

diff --git a/sci-physics/root/files/root-5.32.00-afs.patch b/sci-physics/root/files/root-5.32.00-afs.patch
new file mode 100644
index 0000000..c0ca29a
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-afs.patch
@@ -0,0 +1,33 @@
+--- root/net/auth/src/TAFS.cxx.orig	2011-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<char *> 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 --git a/sci-physics/root/files/xrootd.confd b/sci-physics/root/files/xrootd.confd
deleted file mode 100644
index e725cd1..0000000
--- a/sci-physics/root/files/xrootd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# conf.d file for xroot daemon
-
-# User to run as (default is `root')
-XROOTD_USER="root"
-
-# Please refer to the xrootd(1) man(1) page for more
-# information on command line parameters. 
-XROOTD_OPTS=""

diff --git a/sci-physics/root/files/xrootd.initd b/sci-physics/root/files/xrootd.initd
deleted file mode 100644
index 27e0001..0000000
--- a/sci-physics/root/files/xrootd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/xrootd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
-
-depend() {
-    need net
-    use logger dns
-    provide root-file-server
-}
-
-start() {
-    ebegin "Starting extended ROOTD file server"
-    start-stop-daemon --start --quiet --user ${XROOTD_USER} \
-	--make-pidfile --pidfile /var/run/xrootd.pid \
-	--exec /usr/bin/xrootd --background -- ${XROOTD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping extended ROOTD file server"
-    start-stop-daemon --stop --quiet \
-	--pidfile /var/run/xrootd.pid \
-	--exec /usr/bin/xrootd
-    eend $?
-}

diff --git a/sci-physics/root/root-5.30.05.ebuild b/sci-physics/root/root-5.32.00.ebuild
similarity index 96%
rename from sci-physics/root/root-5.30.05.ebuild
rename to sci-physics/root/root-5.32.00.ebuild
index d237779..94e0940 100644
--- a/sci-physics/root/root-5.30.05.ebuild
+++ b/sci-physics/root/root-5.32.00.ebuild
@@ -12,6 +12,7 @@ ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
 PATCH_PV=5.28.00b
 PATCH_PV2=5.30.00
+PATCH_PV3=5.32.00
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
@@ -78,7 +79,8 @@ CDEPEND="
 			dev-lang/ruby
 			dev-ruby/rubygems )
 	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )"
+	xml? ( dev-libs/libxml2 )
+	xrootd? ( sci-physics/xrootd )"
 
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig"
@@ -122,12 +124,12 @@ pkg_setup() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-xrootd-prop-flags.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV3}-afs.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
@@ -142,13 +144,6 @@ src_prepare() {
 	rm graf3d/gl/{inc,src}/gl2ps.*
 	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
 
-	# TODO: unbundle xrootd as a new package
-	#rm -rf net/xrootd/src
-	#sed -i \
-	#	-e 's:-lXrdOuc:-lXrd &:' \
-	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
-	#	proof/proofd/Module.mk || die
-
 	# In Gentoo, libPythia6 is called libpythia6
 	# libungif is called libgif,
 	# iodbc is in /usr/include/iodbc
@@ -275,7 +270,6 @@ daemon_install() {
 	dodir /var/spool/rootd/{pub,tmp}
 	fperms 1777 /var/spool/rootd/{pub,tmp}
 
-	use xrootd && daemons="${daemons} xrootd olbd"
 	for i in ${daemons}; do
 		newinitd "${FILESDIR}"/${i}.initd ${i}
 		newconfd "${FILESDIR}"/${i}.confd ${i}



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2011-12-04  0:50 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2011-12-04  0:50 UTC (permalink / raw
  To: gentoo-commits

commit:     51d4092aaf3fc3e176701510b2aa7a0afb8fcc56
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Dec  4 00:49:49 2011 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Dec  4 00:49:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=51d4092a

sci-physics/root: fix afs patch

Oooops, previously submitted afs patch was corrupted.

---
 sci-physics/root/ChangeLog                         |    6 ++++++
 sci-physics/root/files/root-5.32.00-afs.patch      |    2 +-
 ...{root-5.32.00.ebuild => root-5.32.00-r1.ebuild} |    0
 3 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index d657b4a..0a3c872 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-5.32.00-r1 (04 Dec 2011)
+
+  04 Dec 2011; Andrew Savchenko <bircoph@gmail.com> -root-5.32.00.ebuild,
+  +root-5.32.00-r1.ebuild, files/root-5.32.00-afs.patch:
+  use proper afs patch
+
 *root-5.32.00 (03 Dec 2011)
 
   03 Dec 2011; Andrew Savchenko <bircoph@gmail.com>

diff --git a/sci-physics/root/files/root-5.32.00-afs.patch b/sci-physics/root/files/root-5.32.00-afs.patch
index c0ca29a..2bf3179 100644
--- a/sci-physics/root/files/root-5.32.00-afs.patch
+++ b/sci-physics/root/files/root-5.32.00-afs.patch
@@ -5,7 +5,7 @@
           if (isatty(0) != 0 && isatty(1) != 0) {
              Gl_config("noecho", 1);
 -            pw = Getline((char *) prompt.Data());
-+            pw = const_cast<char *> Getline((char *) prompt.Data());
++            pw = const_cast<char *>( Getline((char *) prompt.Data()) );
              Gl_config("noecho", 0);
           } else {
              Warning("TAFS", "not tty: cannot prompt for passwd: failure");

diff --git a/sci-physics/root/root-5.32.00.ebuild b/sci-physics/root/root-5.32.00-r1.ebuild
similarity index 100%
rename from sci-physics/root/root-5.32.00.ebuild
rename to sci-physics/root/root-5.32.00-r1.ebuild



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-01-20  9:14 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-01-20  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     02f7b4d3df6d752586427e33da332b5407284265
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Jan 20 09:01:29 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Jan 20 09:01:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=02f7b4d3

sci-physics/root: fix cfitsio linking

Link with shared cfitsio library when for static and shared
versions are available. Thanks Marcel Straub for the report and the
patch. See bug 374709 for details.

---
 sci-physics/root/ChangeLog                         |   16 +++++++++++++++-
 sci-physics/root/files/root-5.32.00-cfitsio.patch  |   13 +++++++++++++
 ...ile.patch => root-5.32.00-nobyte-compile.patch} |    0
 ...ot-5.32.00-r1.ebuild => root-5.32.00-r2.ebuild} |    8 ++++----
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 5fb2231..be09608 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,7 +1,21 @@
 # ChangeLog for sci-physics/root
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-5.32.00-r2 (20 Jan 2012)
+
+  20 Jan 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-5.30.00-nobyte-compile.patch, -root-5.32.00-r1.ebuild,
+  +root-5.32.00-r2.ebuild, +files/root-5.32.00-cfitsio.patch,
+  +files/root-5.32.00-nobyte-compile.patch:
+  Link with dynamic cfistsio library if both static and dynamic
+  versions are present. Thanks Marcel Straub for the report and the
+  patch. See bug 374709 for details.
+
+  Rename root-5.30.00-nobyte-compile.patch ->
+  root-5.32.00-nobyte-compile.patch to simplify patch versioning in
+  the ebuild.
+
   15 Dec 2011; Andrew Savchenko <bircoph@gmail.com> root-5.32.00-r1.ebuild:
   sci-physics/root: update clarens requirements
 

diff --git a/sci-physics/root/files/root-5.32.00-cfitsio.patch b/sci-physics/root/files/root-5.32.00-cfitsio.patch
new file mode 100644
index 0000000..853c3f3
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-cfitsio.patch
@@ -0,0 +1,13 @@
+--- configure.orig	2012-01-19 23:44:44.127607638 +0100
++++ configure	2012-01-20 00:19:20.420652913 +0100
+@@ -3435,9 +3435,7 @@
+     cfitsioinc=$found_hdr
+     cfitsioincdir=$found_dir
+ 
+-    # At this time, libcfitsio.a should always be prefered over .so,
+-    # to avoid forcing users to install cfitsio.
+-    check_library "libcfitsio cfitsio" "no" "$cfitsiolibdir" \
++    check_library "libcfitsio cfitsio" "yes" "$cfitsiolibdir" \
+         $CFITSIO ${CFITSIO:+$CFITSIO/lib} ${CFITSIO:+$CFITSIO/.libs} \
+         ${finkdir:+$finkdir/lib} \
+         /usr/local/lib /usr/lib /opt/cfitsio/lib

diff --git a/sci-physics/root/files/root-5.30.00-nobyte-compile.patch b/sci-physics/root/files/root-5.32.00-nobyte-compile.patch
similarity index 100%
rename from sci-physics/root/files/root-5.30.00-nobyte-compile.patch
rename to sci-physics/root/files/root-5.32.00-nobyte-compile.patch

diff --git a/sci-physics/root/root-5.32.00-r1.ebuild b/sci-physics/root/root-5.32.00-r2.ebuild
similarity index 98%
rename from sci-physics/root/root-5.32.00-r1.ebuild
rename to sci-physics/root/root-5.32.00-r2.ebuild
index acca805..ff34acb 100644
--- a/sci-physics/root/root-5.32.00-r1.ebuild
+++ b/sci-physics/root/root-5.32.00-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.3 2011/06/21 14:31:50 jlec Exp $
 
@@ -11,8 +11,7 @@ DOC_PV=5_26
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
 PATCH_PV=5.28.00b
-PATCH_PV2=5.30.00
-PATCH_PV3=5.32.00
+PATCH_PV2=5.32.00
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
@@ -129,7 +128,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV3}-afs.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-02-13 17:43 Sebastien Fabbro
  0 siblings, 0 replies; 41+ messages in thread
From: Sebastien Fabbro @ 2012-02-13 17:43 UTC (permalink / raw
  To: gentoo-commits

commit:     2278c960d0e3930b9972c7281033da1f44fec921
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Mon Feb 13 17:41:48 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 17:41:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2278c960

in main tree

---
 sci-physics/root/ChangeLog                         |  127 --------
 sci-physics/root/files/proofd.confd                |   12 -
 sci-physics/root/files/proofd.initd                |   26 --
 .../root/files/root-5.28.00b-asneeded.patch        |   20 --
 .../root/files/root-5.28.00b-glibc212.patch        |   11 -
 .../root/files/root-5.28.00b-prop-ldflags.patch    |   13 -
 sci-physics/root/files/root-5.28.00b-unuran.patch  |   39 ---
 sci-physics/root/files/root-5.32.00-afs.patch      |   33 --
 sci-physics/root/files/root-5.32.00-cfitsio.patch  |   13 -
 .../root/files/root-5.32.00-nobyte-compile.patch   |  137 --------
 sci-physics/root/files/rootd.confd                 |    8 -
 sci-physics/root/files/rootd.initd                 |   28 --
 sci-physics/root/metadata.xml                      |   31 --
 sci-physics/root/root-5.32.00-r2.ebuild            |  340 --------------------
 14 files changed, 0 insertions(+), 838 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
deleted file mode 100644
index be09608..0000000
--- a/sci-physics/root/ChangeLog
+++ /dev/null
@@ -1,127 +0,0 @@
-# ChangeLog for sci-physics/root
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*root-5.32.00-r2 (20 Jan 2012)
-
-  20 Jan 2012; Andrew Savchenko <bircoph@gmail.com>
-  -files/root-5.30.00-nobyte-compile.patch, -root-5.32.00-r1.ebuild,
-  +root-5.32.00-r2.ebuild, +files/root-5.32.00-cfitsio.patch,
-  +files/root-5.32.00-nobyte-compile.patch:
-  Link with dynamic cfistsio library if both static and dynamic
-  versions are present. Thanks Marcel Straub for the report and the
-  patch. See bug 374709 for details.
-
-  Rename root-5.30.00-nobyte-compile.patch ->
-  root-5.32.00-nobyte-compile.patch to simplify patch versioning in
-  the ebuild.
-
-  15 Dec 2011; Andrew Savchenko <bircoph@gmail.com> root-5.32.00-r1.ebuild:
-  sci-physics/root: update clarens requirements
-
-  root[clarens] fails to build if clarens dependency
-  dev-libs/xmlrpc-c was build with USE="-curl", so request
-  dev-libs/xmlrpc-c[curl].
-
-  11 Dec 2011; Andrew Savchenko <bircoph@gmail.com> root-5.32.00-r1.ebuild:
-  Add ~x86-linux keyword per bug 346933 request.
-
-*root-5.32.00-r1 (04 Dec 2011)
-
-  04 Dec 2011; Andrew Savchenko <bircoph@gmail.com> -root-5.32.00.ebuild,
-  +root-5.32.00-r1.ebuild, files/root-5.32.00-afs.patch:
-  use proper afs patch
-
-*root-5.32.00 (03 Dec 2011)
-
-  03 Dec 2011; Andrew Savchenko <bircoph@gmail.com>
-  -files/root-5.28.00b-nobyte-compile.patch,
-  -files/root-5.30.00-xrootd-prop-flags.patch, -root-5.30.05.ebuild,
-  +root-5.32.00.ebuild, +files/root-5.32.00-afs.patch, -files/olbd.confd,
-  -files/olbd.initd, -files/rootd.initd, -files/xrootd.confd,
-  -files/xrootd.initd:
-  Version bump to the new production release 5.32.00
-
-  Major changes are:
-  - xrootd is now unbundled upstream, separate sci-physics/xrootd
-  package was added to the science overlay for this support, all
-  xrootd-related patches and scripts are removed from this ebuild and
-  used in sci-physcis/xrootd.
-  - AFS support for net-fs/openafs-1.6.0 is fixed now with a patch
-  for openafs itself: the problem is that openafs hides some symbols
-  from shared versions of the libraries which are present in the same
-  static libraries. One of such symbols, ka_GetAFSTicket, is required
-  for root to build and root can't use static libafsauthent.a due to
-  relocation issues.
-
-  To enable AFS support the following needed:
-  - type cast patch;
-  - strlcpy and strlcat from ROOT core lib must be defined weak,
-  since they are redefined in openafs lib;
-  - ka_GetAFSTicket symbol is added to openafs by patch in bug #393071.
-
-*root-5.30.05 (25 Nov 2011)
-
-  25 Nov 2011; Andrew Savchenko <bircoph@gmail.com> -root-5.30.03-r1.ebuild,
-  +root-5.30.05.ebuild:
-  Version bump (patch release).
-
-  16 Nov 2011; Justin Lecher <jlec@gentoo.org> -root-5.28.00g.ebuild,
-  root-5.30.03-r1.ebuild, metadata.xml:
-  Corrected Slotting of media-libs/libpng and media-libs/tiff
-
-*root-5.30.03-r1 (21 Oct 2011)
-
-  21 Oct 2011; Andrew Savchenko <bircoph@gmail.com> +root-5.30.03-r1.ebuild:
-  sci-physics/root: update the latest ebuild
-
-  - switch to EAPI=4 in order to use REQUIRED_USE to constrain
-  X-related USE flags;
-  - fix build with libiodbc-3.52.7 (sed replace pattern changed).
-
-*root-5.30.03 (21 Oct 2011)
-
-  21 Oct 2011; Andrew Savchenko <bircoph@gmail.com> +root-5.30.03.ebuild:
-  Version bump for 5.30.03 production patch release.
-
-*root-5.28.00g (07 Oct 2011)
-
-  07 Oct 2011; Andrew Savchenko <bircoph@gmail.com>
-  +files/root-5.28.00b-nobyte-compile.patch, +root-5.28.00g.ebuild:
-  Version bump for 5.28 branch as requester per bug 384729.
-
-*root-5.30.02 (03 Oct 2011)
-
-  03 Oct 2011; Andrew Savchenko <bircoph@gmail.com> +root-5.30.02.ebuild:
-  Version bump for patch release.
-
-*root-5.30.01 (24 Aug 2011)
-
-  24 Aug 2011; Andrew Savchenko <bircoph@gmail.com> +root-5.30.01.ebuild:
-  Version bump for patch release.
-  lzma build was fixed upstream.
-
-  02 Aug 2011; Andrew Savchenko <bircoph@gmail.com> root-5.30.00.ebuild:
-  Enable rpath if prefix is used, see bug 346933.
-
-*root-5.30.00 (02 Aug 2011)
-
-  02 Aug 2011; Andrew Savchenko <bircoph@gmail.com> 
-  +files/root-5.28.00b-asneeded.patch, +files/root-5.28.00b-glibc212.patch,
-  +files/root-5.28.00b-prop-ldflags.patch, +files/root-5.28.00b-unuran.patch,
-  +root-5.30.00.ebuild, +files/root-5.30.00-lzma.patch,
-  +files/root-5.30.00-nobyte-compile.patch,
-  +files/root-5.30.00-xrootd-prop-flags.patch, +files/olbd.confd,
-  +files/olbd.initd, +files/proofd.confd, +files/proofd.initd,
-  +files/rootd.confd, +files/rootd.initd, +files/xrootd.confd,
-  +files/xrootd.initd, +metadata.xml:
-  Version bump. This are changes from bug 374709 including:
-  - upatchset update;
-  - lzma support (for root file data compression);
-  - X support is now optional (but enabled by default, of course),
-  this is extremely useful on X-less computating stations;
-  - fix tmva and roofit documentation installation (pdfs were missed due to
-  ebuild typo;
-  - some missed deps.
-  - libXft dep is controlled by xft flag.
-

diff --git a/sci-physics/root/files/proofd.confd b/sci-physics/root/files/proofd.confd
deleted file mode 100644
index 81720a7..0000000
--- 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 3fac75c..0000000
--- a/sci-physics/root/files/proofd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/proofd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
-
-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-asneeded.patch b/sci-physics/root/files/root-5.28.00b-asneeded.patch
deleted file mode 100644
index b845247..0000000
--- a/sci-physics/root/files/root-5.28.00b-asneeded.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- root.orig/configure	2010-12-20 07:17:54.000000000 +0000
-+++ root/configure	2010-12-20 07:16:05.000000000 +0000
-@@ -709,7 +709,7 @@
-        cat <<EOF > conftest.mk
- include ${ac_srcdir}/config/Makefile.${arch}
- conftest: conftest.c
--	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
-+	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib  -o \$@
- 
- conftest.c:
- 	echo "int main() { return 0; }" > \$@
-@@ -723,7 +723,7 @@
-        cat <<EOF > conftest.mk
- include ${ac_srcdir}/config/Makefile.${arch}
- conftest:conftest.c
--	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
-+	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@
- 
- conftest.c:
- 	echo "extern int $linksymbol (); " > \$@

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 a365431..0000000
--- a/sci-physics/root/files/root-5.28.00b-glibc212.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- root.orig/net/auth/src/TAFS.cxx	2010-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 <unistd.h>
-+#   include <sys/stat.h>
- #else
- #   define ssize_t int
- #   include <io.h>
-

diff --git a/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch b/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch
deleted file mode 100644
index 7324319..0000000
--- a/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur root.orig/config/Makefile.in root/config/Makefile.in
---- root.orig/config/Makefile.in	2010-12-14 17:20:26.000000000 +0300
-+++ root/config/Makefile.in	2010-12-17 22:33:34.902161458 +0300
-@@ -27,7 +27,7 @@
- 
- EXTRA_CFLAGS   := -Iinclude @cflags@
- EXTRA_CXXFLAGS := -Iinclude @cflags@
--EXTRA_LDFLAGS  := @ldflags@
-+EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
- WINRTDEBUG     := @winrtdebug@
- 
- GLBPATCHFLAGS  := @glbpatchcflags@
-

diff --git a/sci-physics/root/files/root-5.28.00b-unuran.patch b/sci-physics/root/files/root-5.28.00b-unuran.patch
deleted file mode 100644
index 76422da..0000000
--- a/sci-physics/root/files/root-5.28.00b-unuran.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur root-trunk.orig/math/unuran/Module.mk root-trunk/math/unuran/Module.mk
---- root.orig/math/unuran/Module.mk	2010-11-25 20:41:32.000000000 +0100
-+++ root/math/unuran/Module.mk	2010-11-25 20:51:47.190704977 +0100
-@@ -20,7 +20,7 @@
- UNURANETAG   := $(call stripsrc,$(UNURANDIRS)/headers.d)
- UNRCFG       := $(call stripsrc,$(UNURANDIRS)/$(UNRVERS)/config.h)
- 
--UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -))
-+UNRTARCONTENT:=
- UNRS         := $(filter %.c, \
-                 $(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \
-                 $(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \
-@@ -69,10 +69,9 @@
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
- 
--include/%.h: 	$(UNURANDIRI)/%.h $(UNURANETAG)
-+include/%.h: 	$(UNURANDIRI)/%.h
- 		cp $< $@
- 
--$(UNURANDEP):   $(UNRCFG)
- $(UNRS):        $(UNURANETAG)
- 
- $(UNURANETAG):	$(UNRSRCS)
-@@ -125,12 +124,12 @@
- 		GNUMAKE=$(MAKE) ./configure  CC="$$ACC"  \
- 		CFLAGS="$$ACFLAGS");
- 
--$(UNURANLIB):   $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
-+$(UNURANLIB):   $(UNURANO) $(UNURANDO) $(ORDER_) \
-                 $(MAINLIBS) $(UNURANLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"  \
- 		   "$(SOFLAGS)" libUnuran.$(SOEXT) $@     \
- 		   "$(UNURANO) $(UNURANDO)"             \
--		   "$(UNURANLIBEXTRA) $(UNRO)"
-+		   "$(UNURANLIBEXTRA) -lunuran"
- 
- $(UNURANDS):    $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP)
- 		$(MAKEDIR)

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 2bf3179..0000000
--- a/sci-physics/root/files/root-5.32.00-afs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- root/net/auth/src/TAFS.cxx.orig	2011-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<char *>( 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 --git a/sci-physics/root/files/root-5.32.00-cfitsio.patch b/sci-physics/root/files/root-5.32.00-cfitsio.patch
deleted file mode 100644
index 853c3f3..0000000
--- a/sci-physics/root/files/root-5.32.00-cfitsio.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	2012-01-19 23:44:44.127607638 +0100
-+++ configure	2012-01-20 00:19:20.420652913 +0100
-@@ -3435,9 +3435,7 @@
-     cfitsioinc=$found_hdr
-     cfitsioincdir=$found_dir
- 
--    # At this time, libcfitsio.a should always be prefered over .so,
--    # to avoid forcing users to install cfitsio.
--    check_library "libcfitsio cfitsio" "no" "$cfitsiolibdir" \
-+    check_library "libcfitsio cfitsio" "yes" "$cfitsiolibdir" \
-         $CFITSIO ${CFITSIO:+$CFITSIO/lib} ${CFITSIO:+$CFITSIO/.libs} \
-         ${finkdir:+$finkdir/lib} \
-         /usr/local/lib /usr/lib /opt/cfitsio/lib

diff --git a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch b/sci-physics/root/files/root-5.32.00-nobyte-compile.patch
deleted file mode 100644
index 179e579..0000000
--- a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Naur root.as-needed/Makefile root/Makefile
---- root.as-needed/Makefile	2011-07-10 10:42:49.758191296 +0400
-+++ root/Makefile	2011-07-10 10:43:21.493339703 +0400
-@@ -1167,10 +1167,7 @@
- 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
- 	   fi; \
--	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
--	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
--	   fi; \
--	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      dir=$(RFLX_GRFLXDD:lib/=); \
- 	      while test "x$${dir}" != "x" && \
- 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-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 $< $@
- endif
--ROOTPYC      := $(ROOTPY:.py=.pyc)
--ROOTPYO      := $(ROOTPY:.py=.pyo)
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- 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)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules
---- root.as-needed/build/package/debian/rules	2011-07-10 10:42:49.241549346 +0400
-+++ root/build/package/debian/rules	2011-07-10 10:48:06.989670589 +0400
-@@ -691,10 +691,6 @@
- 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
- 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/cint7			\
- 		-X$(PREFIX)/include/root/Minuit2
- #		$(foreach i, \
-diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.as-needed/cint/cintex/Module.mk	2011-07-10 10:42:49.104889217 +0400
-+++ root/cint/cintex/Module.mk	2011-07-10 10:43:21.496672876 +0400
-@@ -31,10 +31,6 @@
- CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC    := $(CINTEXPY:.py=.pyc)
--CINTEXPYO    := $(CINTEXPY:.py=.pyo)
--endif
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- 		fi)
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.as-needed/cint/reflex/Module.mk	2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/Module.mk	2011-07-10 10:43:21.496672876 +0400
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
- 
- RFLX_LIBDIR = $(LIBDIR)
- 
-@@ -92,7 +89,7 @@
- 
- ALLEXECS += $(RFLX_GENMAPX)
- 
--POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN  += $(RFLX_GRFLXPY)
- 
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- 		  mkdir -p lib/python/genreflex; fi )
- 		cp $< $@
- 
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
--		@python -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
- 
-@@ -149,7 +144,7 @@
- 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
- 
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
- 
- clean-genreflex:
- 		@rm -rf lib/python/genreflex
-diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.as-needed/cint/reflex/python/CMakeLists.txt	2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/python/CMakeLists.txt	2011-07-10 10:43:21.496672876 +0400
-@@ -15,7 +15,7 @@
- #####################   sources   ####################
- 
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
- 
- #####################  gccxmlpath ####################
- 

diff --git a/sci-physics/root/files/rootd.confd b/sci-physics/root/files/rootd.confd
deleted file mode 100644
index 7516b8c..0000000
--- a/sci-physics/root/files/rootd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# conf.d file for root daemon
-
-# User to run as (default is `rootd')
-ROOTD_USER="rootd"
-
-# Please refer to the rootd(1) man(1) page for more information on 
-# command line parameters. 
-ROOTD_OPTS=""

diff --git a/sci-physics/root/files/rootd.initd b/sci-physics/root/files/rootd.initd
deleted file mode 100644
index de42e93..0000000
--- a/sci-physics/root/files/rootd.initd
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/rootd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
-
-depend() {
-    need net
-    use logger
-    provide root-file-server
-}
-
-start() {
-    ebegin "Starting ROOT file server"
-    pid=$(start-stop-daemon --start --quiet --user ${ROOTD_USER} \
-	--pidfile /var/run/rootd.pid \
-	--exec /usr/bin/rootd -- ${ROOTD_OPTS})
-    retval=$?
-    echo ${ROOTD_PID} > /var/run/rootd.pid
-    eend ${retval}
-}
-
-stop() {
-    ebegin "Stopping ROOT file server"
-    start-stop-daemon --stop --quiet \
-	--pidfile /var/run/rootd.pid \
-	--exec /usr/bin/rootd
-    eend $?
-}

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
deleted file mode 100644
index 222eb19..0000000
--- a/sci-physics/root/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci-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
-  contains the CINT C/C++ interpreter and many classes such as
-  statistics, serialization, optimization, linear algebra, graphics,
-  GUI toolkit, and a complete visualization framework.
-</longdescription>
-	<use>
-		<flag name="clarens">
-    Buld the Clarens and PEAC plug-ins, to use in a GRID enabled
-    analysis.</flag>
-		<flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-		<flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
-		<flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
-		<flag name="pythia6">
-    Builds the interface to Pythia-6 (<pkg>sci-physics/pythia</pkg>)
-    high energy physics generation events library
-  </flag>
-		<flag name="pythia8">
-    Builds the interface to Pythia-8 (<pkg>sci-physics/pythia</pkg>)
-    high energy physics generation events library
-  </flag>
-		<flag name="reflex">Builds the reflection database for the C++ interpretor </flag>
-		<flag name="xrootd">Build the xrootd low latency file server</flag>
-	</use>
-</pkgmetadata>

diff --git a/sci-physics/root/root-5.32.00-r2.ebuild b/sci-physics/root/root-5.32.00-r2.ebuild
deleted file mode 100644
index ff34acb..0000000
--- a/sci-physics/root/root-5.32.00-r2.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.3 2011/06/21 14:31:50 jlec Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2"
-inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
-
-#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-DOC_PV=5_26
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.32.00
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
-	math? (
-		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
-	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
-
-CDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-apps/shadow
-	sys-libs/zlib
-	virtual/jpeg
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		qt4? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-opengl:4
-			x11-libs/qt-qt3support:4
-			x11-libs/qt-svg:4
-			x11-libs/qt-webkit:4
-			x11-libs/qt-xmlpatterns:4 )
-		xft? ( x11-libs/libXft )
-		)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c[curl] )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	llvm? ( sys-devel/llvm )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	xrootd? ( net-libs/xrootd )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="
-	virtual/fortran
-	${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-REQUIRED_USE="!X? ( !opengl !qt4 !xft )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-			ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
-			ewarn "If you want to build this package with OpenMP, abort now,"
-			ewarn "and set CC to an OpenMP capable compiler"
-		elif use openmp; then
-			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
-	rm -rf graf2d/asimage/src/libAfterImage
-	rm -rf graf3d/ftgl/{inc,src}
-	rm -rf graf2d/freetype/src
-	rm -rf graf3d/glew/{inc,src}
-	rm -rf core/pcre/src
-	rm -rf math/unuran/src/unuran-*.tar.gz
-	find core/zip -type f -name "[a-z]*" | xargs rm
-	rm -rf core/lzma/src/*.tar.gz
-	rm graf3d/gl/{inc,src}/gl2ps.*
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-}
-
-src_configure() {
-	# the configure script is not the standard autotools
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--enable-astiff \
-		--enable-exceptions	\
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		--with-afs-shared=yes \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable ncurses editline) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable llvm cling) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable postgres pgsql) \
-		$(use_enable prefix rpath) \
-		$(use_enable pythia6) \
-		$(use_enable pythia8) \
-		$(use_enable python) \
-		$(use_enable qt4 qt) \
-		$(use_enable qt4 qtgsi) \
-		$(use_enable reflex cintex) \
-		$(use_enable reflex) \
-		$(use_enable ruby) \
-		$(use_enable ssl) \
-		$(use_enable xft) \
-		$(use_enable xml) \
-		$(use_enable xrootd) \
-		${EXTRA_ECONF} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed"
-	if use emacs; then
-		elisp-compile build/misc/*.el || die "elisp-compile failed"
-	fi
-}
-
-doc_install() {
-	cd "${S}"
-	if use doc; then
-		einfo "Installing user's guides"
-		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	fi
-
-	if use examples; then
-		# these should really be taken care of by the root make install
-		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
-		doins -r tmva/test
-	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-	fi
-}
-
-daemon_install() {
-	cd "${S}"
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	sed -e 's,@prefix@,/usr,' \
-		build/package/debian/root-system-bin.desktop.in > root.desktop
-	domenu root.desktop
-	doicon "${S}"/build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root || die "doenvd failed"
-
-	# The build system installs Emacs support unconditionally and in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -rf "${ED}"/usr/share/emacs
-	if use emacs; then
-		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
-	fi
-
-	doc_install
-	daemon_install
-	desktop_install
-
-	# Cleanup of files either already distributed or unused on Gentoo
-	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-	rm "${ED}"usr/share/root/fonts/LICENSE
-	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm -f posix/mktypes dll_stl/setup \
-		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o
-	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-	rm -f "${ED}"/etc/root/proof/*.sample
-	rm -rf "${ED}"/etc/root/daemons
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
-}



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-02-27 18:11 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-02-27 18:11 UTC (permalink / raw
  To: gentoo-commits

commit:     3de1a19e6fd417276097e6fc2b456c5aebd54683
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Mon Feb 27 18:10:28 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Mon Feb 27 18:10:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3de1a19e

sci-physics/root: fix build on non-english locales

---
 sci-physics/root/ChangeLog                         |  606 ++++++++++++++++++++
 sci-physics/root/files/olbd.confd                  |    9 +
 sci-physics/root/files/olbd.initd                  |   26 +
 sci-physics/root/files/proofd.confd                |   12 +
 sci-physics/root/files/proofd.initd                |   26 +
 .../root/files/root-5.26.00-make-3.82.patch        |   36 ++
 .../root/files/root-5.26.00e-libpng15.patch        |   33 ++
 .../root/files/root-5.28.00b-asneeded.patch        |   20 +
 .../root/files/root-5.28.00b-glibc212.patch        |   11 +
 .../root/files/root-5.28.00b-nobyte-compile.patch  |  138 +++++
 .../root/files/root-5.28.00b-prop-ldflags.patch    |   13 +
 sci-physics/root/files/root-5.28.00b-unuran.patch  |   39 ++
 sci-physics/root/files/root-5.32.00-afs.patch      |   33 ++
 sci-physics/root/files/root-5.32.00-cfitsio.patch  |   13 +
 .../root/files/root-5.32.00-nobyte-compile.patch   |  137 +++++
 sci-physics/root/files/rootd.confd                 |    8 +
 sci-physics/root/files/rootd.initd                 |   28 +
 sci-physics/root/files/xrootd.confd                |    8 +
 sci-physics/root/files/xrootd.initd                |   26 +
 sci-physics/root/metadata.xml                      |   29 +
 sci-physics/root/root-5.26.00e-r1.ebuild           |  316 ++++++++++
 sci-physics/root/root-5.28.00d.ebuild              |  338 +++++++++++
 sci-physics/root/root-5.32.00-r2.ebuild            |  340 +++++++++++
 23 files changed, 2245 insertions(+), 0 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
new file mode 100644
index 0000000..8b69c5c
--- /dev/null
+++ b/sci-physics/root/ChangeLog
@@ -0,0 +1,606 @@
+# ChangeLog for sci-physics/root
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.92 2012/01/21 19:23:26 bicatali Exp $
+
+  27 Feb 2012; Andrew Savchenko <bircoph@gmail.com>
+  root-5.26.00e-r1.ebuild:
+  Fix build on non-english locales. find tool may become crazy on
+  them, so force LANG=C LC_ALL=C for find only.
+
+*root-5.32.00-r2 (21 Jan 2012)
+
+  21 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> +root-5.32.00-r2.ebuild,
+  +files/root-5.32.00-afs.patch, +files/root-5.32.00-cfitsio.patch,
+  +files/root-5.32.00-nobyte-compile.patch, files/proofd.initd,
+  files/rootd.initd, metadata.xml:
+  Import root ebuild from the science overlay. Main work from Andrew Savchenko,
+  now proxy-maintainer
+
+  13 Nov 2011; Justin Lecher <jlec@gentoo.org> -root-5.26.00-r2.ebuild,
+  root-5.26.00e-r1.ebuild, root-5.28.00d.ebuild, metadata.xml:
+  Cleaned old, fixed slotting for media-libs/libpng and media-libs/tiff, sort
+  Deps, converted elog -> echo where needed, cleaned illegal epause, formated
+  metadat.xml
+
+  18 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> root-5.26.00e-r1.ebuild,
+  +files/root-5.26.00e-libpng15.patch:
+  Fix building with libpng15 wrt #387553 by Daniel Savard
+
+  21 Jun 2011; Justin Lecher <jlec@gentoo.org> root-5.26.00-r2.ebuild,
+  root-5.26.00e-r1.ebuild, root-5.28.00d.ebuild:
+  Add dependency on virtual/fortran
+
+  21 Jun 2011; Justin Lecher <jlec@gentoo.org> root-5.26.00-r2.ebuild,
+  root-5.26.00e-r1.ebuild, root-5.28.00d.ebuild:
+  Added fortran-2.eclass support
+
+  06 Jun 2011; Jeroen Roovers <jer@gentoo.org> root-5.26.00-r2.ebuild,
+  root-5.26.00e-r1.ebuild:
+  Drop HPPA keywording (bug #355963).
+
+  31 May 2011; Markus Meier <maekke@gentoo.org> root-5.26.00e-r1.ebuild:
+  x86 stable, bug #367321
+
+  23 May 2011; Markos Chandras <hwoarang@gentoo.org> root-5.26.00e-r1.ebuild:
+  Stable on amd64 wrt bug #367321
+
+  20 May 2011; Jeroen Roovers <jer@gentoo.org> root-5.26.00e-r1.ebuild:
+  Stable for HPPA (bug #367321).
+
+*root-5.28.00d (17 May 2011)
+
+  17 May 2011; Sébastien Fabbro <bicatali@gentoo.org> -root-5.28.00b.ebuild,
+  +root-5.28.00d.ebuild:
+  Version bump
+
+*root-5.28.00b (16 Mar 2011)
+
+  16 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> +root-5.28.00b.ebuild,
+  +files/root-5.28.00b-asneeded.patch, +files/root-5.28.00b-glibc212.patch,
+  +files/root-5.28.00b-nobyte-compile.patch,
+  +files/root-5.28.00b-prop-ldflags.patch, +files/root-5.28.00b-unuran.patch,
+  metadata.xml:
+  Version bump. Now builds with unbundled libafterimage (bug #252918), gl2ps.
+  Added a few flags (fits for cfitsio, llvm for cling support). More ebuild
+  cleaning.
+
+  02 Mar 2011; Justin Lecher <jlec@gentoo.org> root-5.26.00-r2.ebuild,
+  root-5.26.00e-r1.ebuild:
+  Correct Slots for gtk 3 introduction to tree
+
+  13 Feb 2011; Raúl Porcel <armin76@gentoo.org> root-5.26.00-r2.ebuild,
+  root-5.26.00e-r1.ebuild:
+  Drop sparc keywords
+
+  18 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> -root-5.26.00-r4.ebuild:
+  Drop old.
+
+  08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  root-5.26.00-r2.ebuild, root-5.26.00-r4.ebuild, root-5.26.00e-r1.ebuild:
+  media-libs/jpeg -> virtual/jpeg
+
+*root-5.26.00e-r1 (22 Oct 2010)
+
+  22 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org> -root-5.26.00e.ebuild,
+  +root-5.26.00e-r1.ebuild, -files/root-5.26.00e-configure-paths.patch,
+  -files/root-5.26.00e-glibc212.patch, -files/root-5.26.00e-make-3.82.patch,
+  -files/root-5.26.00e-nobyte-compile.patch,
+  -files/root-5.26.00e-prop-ldflags.patch:
+  Move patches to mirrors. Fixes bug 341971.
+
+*root-5.26.00e (19 Oct 2010)
+
+  19 Oct 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  +root-5.26.00e.ebuild, +files/root-5.26.00e-configure-paths.patch,
+  +files/root-5.26.00e-glibc212.patch, +files/root-5.26.00e-make-3.82.patch,
+  +files/root-5.26.00e-nobyte-compile.patch,
+  +files/root-5.26.00e-prop-ldflags.patch:
+  Version bump, patch for afs submitted by Andrew Savchenko.
+
+  16 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  root-5.26.00-r4.ebuild, +files/root-5.26.00-make-3.82.patch:
+  Fix building with gmake-3.82 wrt 333083. Thanks to Diego for reporting.
+
+  10 Jul 2010; Raúl Porcel <armin76@gentoo.org> root-5.26.00-r2.ebuild:
+  sparc stable wrt #318469
+
+  06 Jul 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  root-5.26.00-r4.ebuild:
+  Added graphviz use flag
+
+  25 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  root-5.26.00-r4.ebuild:
+  Fix usage of python_set_active_version() and python_mod_optimize(), use
+  python_mod_cleanup() instead of python_mod_optimize() in pkg_postrm() (bug
+  #316247).
+
+  25 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -root-5.22.00-r3.ebuild, -root-5.24.00-r1.ebuild, -root-5.26.00-r3.ebuild,
+  root-5.26.00-r4.ebuild, -files/root-5.26.00-nobyte-compile.patch:
+  Patch bump and removed useless gsl flag
+
+*root-5.26.00-r4 (25 Jun 2010)
+
+  25 Jun 2010; Justin Lecher <jlec@gentoo.org> +root-5.26.00-r4.ebuild:
+  Fixes for PYTHON ABIs
+
+  22 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  root-5.26.00-r3.ebuild:
+  Removed cint7 flag, discontinued effort, and does not compile (bug
+  #324957)
+
+  17 Jun 2010; Patrick Lauer <patrick@gentoo.org> root-5.22.00-r2.ebuild,
+  root-5.22.00-r3.ebuild, root-5.24.00-r1.ebuild, root-5.26.00-r2.ebuild,
+  root-5.26.00-r3.ebuild:
+  Migrating away from deprecated postgres virtuals
+
+*root-5.26.00-r3 (14 Jun 2010)
+
+  14 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  +root-5.26.00-r3.ebuild:
+  New patch set from upstream fixing a number of bugs, more LDFLAGS
+  propagation fixes, added gsl flag and released as-needed for more testing
+
+  01 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  root-5.26.00-r2.ebuild:
+  x86 stable wrt bug #318469
+
+  25 May 2010; Pacho Ramos <pacho@gentoo.org> root-5.26.00-r2.ebuild:
+  stable amd64, bug 318469
+
+  13 May 2010; Jeroen Roovers <jer@gentoo.org> root-5.26.00-r2.ebuild:
+  Stable for HPPA (bug #318469).
+
+*root-5.26.00-r2 (10 Mar 2010)
+
+  10 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org> -root-5.26.00.ebuild,
+  -root-5.26.00-r1.ebuild, +root-5.26.00-r2.ebuild:
+  Now do not optimize dictionary upon upstream recomendation, remove buggy
+  gcc44 patch (fixing bug #305871), update various patches, documentation
+  (bug #307915) and cleaned up some seds
+
+*root-5.26.00-r1 (19 Feb 2010)
+
+  19 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  +root-5.26.00-r1.ebuild:
+  Patch version bump. Also fixed a configure problem when checking for
+  symbol (bug #305279)
+
+*root-5.26.00 (09 Jan 2010)
+
+  09 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org> +root-5.26.00.ebuild:
+  Version bump. Thanks Andrew Savchenko for his input, bug #298284
+
+  24 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  root-5.24.00-r1.ebuild:
+  Fixed a PIC problem when configuring with AFS (bug #294038)
+
+*root-5.24.00-r1 (19 Nov 2009)
+
+  19 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  root-5.22.00-r2.ebuild, root-5.22.00-r3.ebuild, -root-5.24.00.ebuild,
+  +root-5.24.00-r1.ebuild:
+  Forbid as-needed (bug #287178), fixed a syntax while installing TMVA
+  documentation, new version bump with new set of patches. Thanks Andrew
+  Savchenko for his contribution.
+
+  06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> root-5.22.00-r2.ebuild,
+  root-5.22.00-r3.ebuild, root-5.24.00.ebuild:
+  Removed alternative dependency on Qt metapackage
+
+*root-5.24.00 (24 Sep 2009)
+
+  24 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> +root-5.24.00.ebuild:
+  Version bump, still masked. A bit buggy with xrootd, cint7 and afs at
+  least on amd64. Thanks Andrew Savchenko for his work
+
+*root-5.22.00-r3 (23 Sep 2009)
+
+  23 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> -root-3.05.04.ebuild,
+  -root-5.16.00.ebuild, -files/root-5.16.00-fortran.patch,
+  -files/root-5.16.00-xft.patch, -files/sparc-root-5.16.00.patch,
+  -root-5.20.00-r3.ebuild, -files/root-5.20.00-defind.patch,
+  -root-5.22.00-r1.ebuild, +root-5.22.00-r3.ebuild, -files/proofd.xinetd,
+  -files/root.xinetd:
+  Added a few patches, including: new upstream patch revision, gcc-4.4
+  fixes, sandbox violation, passing CXXFLAGS for g4root, newer kerberos.
+  Removed fortran eclass, relying on toolchain eclass. Closing bug #275978,
+  bug #280197, bug #280869. Removed older versions, including ancient
+  root-3.x which was the only one ppc stable, but just too buggy on all
+  arches, and unsupported. Thanks to Andrew Savchenko for his contributions.
+
+  19 Jul 2009; Jeremy Olexa <darkside@gentoo.org> root-5.22.00-r2.ebuild:
+  amd64 stable, bug 275997
+
+  16 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
+  root-5.22.00-r2.ebuild:
+  stable x86, bug 275997
+
+  16 Jul 2009; Ferris McCormick <fmccor@gentoo.org> root-5.22.00-r2.ebuild:
+  Sparc stable, bug #275997.
+
+  25 Jun 2009; Sébastien Fabbro <bicatali@gentoo.org> Manifest:
+  Fixed a patch for python checking, bug #275284, thanks Adam Hunt
+
+*root-5.22.00-r2 (24 Jun 2009)
+
+  24 Jun 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +root-5.22.00-r2.ebuild:
+  New patch revision (svn #29183 )from upstream including many bug fixes
+
+  23 Jun 2009; Jeroen Roovers <jer@gentoo.org> root-5.20.00-r3.ebuild,
+  +files/root-5.20.00-defind.patch:
+  Fix spelling error causing compile failure (bug #275205).
+
+  05 May 2009; Christian Faulhammer <fauli@gentoo.org>
+  root-5.20.00-r3.ebuild:
+  stable x86, bug 245875
+
+  05 May 2009; Christian Faulhammer <fauli@gentoo.org>
+  root-5.20.00-r3.ebuild, root-5.22.00-r1.ebuild:
+  add dev-ruby/rubygems as dependency
+
+  13 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  root-5.20.00-r3.ebuild, -root-5.22.00.ebuild, root-5.22.00-r1.ebuild:
+  Applied a patch from Ben Bannier to fix cint7 without ROOTSYS (bug
+  #263332) and allow cross-compiling (thanks jer, bug #265482)
+
+*root-5.22.00-r1 (06 Apr 2009)
+
+  06 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  root-5.20.00-r3.ebuild, +root-5.22.00-r1.ebuild:
+  Fixed hicolor icons, thanks ulm, added new upstream patch and fixed doc
+  name for TMVA, thanks Ben Bannier
+
+  22 Mar 2009; Jeremy Olexa <darkside@gentoo.org> root-5.20.00-r3.ebuild:
+  amd64 stable, bug 245875
+
+  05 Mar 2009; Ferris McCormick <fmccor@gentoo.org> root-5.20.00-r3.ebuild:
+  Sparc stable and done with Bug #245875.
+
+  20 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> files/proofd.initd,
+  files/rootd.initd, files/xrootd.initd, root-5.20.00-r3.ebuild,
+  root-5.22.00.ebuild:
+  Fixed postgresql configuration (bug #251590), fixed server rootd and
+  proofd files
+
+  19 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org> root-5.22.00.ebuild:
+  Fixed ftgl dependency, closing bug #251634
+
+*root-5.22.00 (19 Dec 2008)
+
+  19 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org> +root-5.22.00.ebuild:
+  Version bump, moved to EAPI=2
+
+  19 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  root-5.20.00-r3.ebuild:
+  Forgot to apply xrootd-prop-flags patch
+
+*root-5.20.00-r3 (18 Dec 2008)
+
+  18 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  files/root-5.20.00-as-needed.patch, -files/root-5.20.00-configure.patch,
+  +files/root-5.20.00-configure-paths.patch, -files/root-5.20.00-pic.patch,
+  +files/root-5.20.00-prop-flags.patch,
+  +files/root-5.20.00-xrootd-shared.patch, +files/olbd.confd,
+  +files/olbd.initd, +files/proofd.confd, +files/proofd.initd,
+  +files/proofd.xinetd, +files/root.xinetd, +files/rootd.confd,
+  +files/rootd.initd, +files/xrootd.confd, +files/xrootd.initd,
+  -root-5.20.00-r1.ebuild, -root-5.20.00-r2.ebuild, +root-5.20.00-r3.ebuild:
+  Major revision bump with lots of changes:
+	- added proofd, rootd, xrootd initd daemons
+	- added xinetd support (use flag) for proofd and xrootd
+	- added desktop files and mimetypes
+	- fix cfortran dependency (closing bug #250432)
+	- fix qt:4 dependency
+	- fix for bad cfortran include file
+	- fix for more as-needed
+	- now propagates all flags everywhere (should close bug #250653)
+	- removed a bunch of installed files useless on gentoo
+	- install tmva tutorials
+	- now installs tutorials and tests with 'examples' use flag in 
+	  /usr/share/doc/root*/examples directory
+	- do patches instead of sed's to propose upstream.
+  Removed older revisions.
+
+  05 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/root-5.20.00-ftgl_header.patch, root-5.20.00-r2.ebuild:
+  Fixed for older ftgl versions, bug #249885, thanks to Benjamin Bannier
+
+*root-5.20.00-r2 (04 Dec 2008)
+
+  04 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/root-5.18.00d-gcc43.patch, -files/root-5.18.00d-makefile.patch,
+  +files/root-5.20.00-as-needed.patch, +files/root-5.20.00-ftgl.patch,
+  -files/xrootd-20071116-checksymbol.patch,
+  -files/xrootd-20071116-gcc43.patch, -files/root-pic.patch,
+  -root-5.18.00d.ebuild, -root-5.20.00.ebuild, +root-5.20.00-r2.ebuild:
+  Fixed flags propagation, fixed dependency for qt-4, fixed for forced
+  as-needed (bug #248380), fixed for ftgl > 2.1.3_rc5 (bug #248789, thanks
+  tao@post.cz), removed unixODBC as a possible odbc implementation (bug
+  #242150, thanks Benjamin Bennier), removed old version with big patches
+  (closing bug #249009)
+
+*root-5.20.00-r1 (23 Sep 2008)
+
+  23 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/root-5.20.00-include-defines-file.patch,
+  +files/root-5.20.00-upstream.patch, +root-5.20.00-r1.ebuild:
+  Added a bunch of patches from Benjamin Bannier for Pythia libraries (bug
+  #230673), ruby name changes (bug #236072), opengl include files (bug
+  #236071), extra documentation (bug #236070). Also added a reflex flag to
+  enable users encountering bug #233698, some emacs changes thanks to ulm.
+  Finally, added some patches from upstream documented in
+  http://root.cern.ch/twiki/bin/view/ROOT/PatchesV5-20-00.
+
+  29 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
+  root-5.18.00d.ebuild, root-5.20.00.ebuild:
+  Added use flags in metadata.xml, removed pch use flag (buggy upstream),
+  added libiodbc as a possible implementation for ODBC. Also fixed
+  qt-xmlpatterns dependency.
+
+  27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> root-5.16.00.ebuild,
+  root-5.18.00d.ebuild:
+  QA: Get rid of deprecated qt_min_version().
+
+  26 Jul 2008; Carsten Lohrke <carlo@gentoo.org> root-5.18.00d.ebuild,
+  root-5.20.00.ebuild:
+  Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
+
+  18 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> root-5.16.00.ebuild,
+  root-5.18.00d.ebuild, root-5.20.00.ebuild:
+  Now update PYTHONPATH, thanks Benjamin Bannier, bug #232124
+
+  13 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> root-5.16.00.ebuild:
+  Added libXft dep in 5.16.00 stable version, closing bug #204725
+
+*root-5.20.00 (08 Jul 2008)
+
+  08 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/root-5.16.00-afs.patch, -files/root-5.16.00-flags.patch,
+  -files/root-5.16.00-postgres.patch, +files/root-5.20.00-configure.patch,
+  +files/root-5.20.00-pic.patch, -files/root-xrootd-flags.patch,
+  -root-5.16.00-r1.ebuild, -root-5.18.00.ebuild, root-5.18.00d.ebuild,
+  +root-5.20.00.ebuild:
+  Version bump, removed some older versions. Still buggy for pre-compiled
+  headers (use flag pch), xrootd+afs, and could not test properly with
+  oracle flag
+
+  16 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  files/root-5.18.00d-gcc43.patch:
+  Added more gcc-4.3 love to the mathcore, thanks to Derek Dolney, bug
+  #226013
+
+  30 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  files/xrootd-20071116-gcc43.patch:
+  Removed cvs tags in xrootd patch, closing bug #224195
+
+*root-5.18.00d (29 May 2008)
+
+  29 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/root-5.18.00d-gcc43.patch, +files/root-5.18.00d-makefile.patch,
+  +files/xrootd-20071116-checksymbol.patch,
+  +files/xrootd-20071116-gcc43.patch, +root-5.18.00d.ebuild:
+  Version bump. This version is includes patches from upstream (included in
+  sources), some local gcc-4.3 patches and various xrootd patches. Now works
+  with afs on amd64. Removed cint7 flag as it is still too buggy, added
+  xrootd use flag, added a math flag triggering all math libraries
+  (mathcore, mathmore, minuit2, roofit, unuran). Much cleanup: qt-4.4 ready,
+  removed afterimage dependency (will be back in 5.20). This version should
+  be targeted for stabilization.
+
+  21 May 2008; Tiziano Müller <dev-zero@gentoo.org> root-3.05.04.ebuild,
+  root-5.16.00.ebuild, root-5.16.00-r1.ebuild, root-5.18.00.ebuild:
+  Changed dependency for postgresql from dev-db/postgresql to
+  virtual/postgresql-server
+
+  04 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org> root-5.18.00.ebuild:
+  Fixed tutorial->tutorials, closing bug #216130
+
+  04 Apr 2008; Jeroen Roovers <jer@gentoo.org> root-5.18.00.ebuild:
+  Marked ~hppa.
+
+  18 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> root-5.18.00.ebuild:
+  Check for qt4 to be built with qt3support, closing bug #206540)
+
+*root-5.18.00 (17 Jan 2008)
+
+  17 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/root-pic.patch, +files/root-xrootd-flags.patch,
+  +root-5.18.00.ebuild:
+  Version bump. Compiles with pic shared libs (via patches). Most earlier
+  patches and problems have been sent upstream.
+
+  10 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/root-5.16.00-flags.patch, +files/root-5.16.00-postgres.patch,
+  +files/root-5.16.00-xft.patch, root-5.16.00-r1.ebuild:
+  Added various patches: one to respect flags in xrootd (needed for afs), one
+  to properly handle -truetype without libXft (bug #204725) and last one for
+  postgresql (bug #203015). Added pch use flag for faster compilation with g++
+
+  16 Dec 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/root-5.16.00-afs.patch, root-5.16.00-r1.ebuild:
+  Added patch to fix linking problem with afs libs. Re-added afs
+  USE flag.
+
+*root-5.16.00-r1 (15 Dec 2007)
+
+  15 Dec 2007; Markus Dittrich <markusle@gentoo.org>
+  +root-5.16.00-r1.ebuild:
+  New revision with patch fixing compile failure under gcc-4.2 
+  (see bug #199591). Also removed afs support until compilation 
+  problems are fixed.
+
+  09 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org> -root-4.02.00.ebuild,
+  root-5.16.00.ebuild:
+  Forced opengl as a dep, since it needs it anyway, added a possible fix for
+  afs support, a die function for a g++ >= 4.2 and now use virtual/mysql
+  instead of dev-db/mysql
+
+  23 Nov 2007; Samuli Suominen <drac@gentoo.org> root-5.16.00.ebuild:
+  amd64 stable wrt #196282
+
+  24 Oct 2007; Christian Faulhammer <opfer@gentoo.org> root-5.16.00.ebuild:
+  stable x86, bug 196282
+
+  22 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> root-5.16.00.ebuild:
+  removed some doc install
+
+  19 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> root-5.16.00.ebuild:
+  Added a pause at the end of pkg_setup.
+
+  18 Oct 2007; Ferris McCormick <fmccor@gentoo.org> root-5.16.00.ebuild:
+  Sparc stable - Bug #196282 --- Hooray!  It's been rough, but we made it.
+
+  17 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> root-5.16.00.ebuild:
+  added libXpm as a dependency.
+
+  16 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/sparc-root-5.14.00c.patch, +files/sparc-root-5.16.00.patch,
+  -files/pgsql-no-libpq-int.patch, -files/root-makefile.patch,
+  -root-3.10.02-r1.ebuild, -root-5.14.00b.ebuild, -root-5.14.00c.ebuild,
+  root-5.16.00.ebuild:
+  Cleaning old versions and fixing bug #190163, thanks to fmccor
+
+*root-5.16.00 (24 Aug 2007)
+
+  24 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/root-5.16.00-fortran.patch, +root-5.16.00.ebuild:
+  Version bump. Added cern use flag. Upstream fixed xrootd for sparc and
+  parallell makes.
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; root-3.05.04.ebuild,
+  root-3.10.02-r1.ebuild, root-4.02.00.ebuild:
+  Drop virtual/x11 references.
+
+*root-5.14.00c (05 Mar 2007)
+
+  05 Mar 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/sparc-root-5.14.00c.patch, +root-5.14.00c.ebuild:
+  Version bump. Fixed parallel compiling and sparc architecture with a 
+  patch, from bug #87305, thanks to fmmcor.
+
+*root-5.14.00b (05 Feb 2007)
+
+  05 Feb 2007; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
+  +root-5.14.00b.ebuild:
+  Major version bump, with a lot of changes in ebuild. LICENSE changed.
+  Closing bugs #34415, #98235, #109307. Thanks for everyone in bug #109307 
+  for testing.
+
+  23 Nov 2006; Francesco Riosa <vivo@gentoo.org> root-3.05.04.ebuild,
+  root-3.10.02-r1.ebuild, root-4.02.00.ebuild:
+  dev-db/mysql => virtual/mysql
+
+  02 Jul 2006; Luis Medinas <metalgod@gentoo.org> metadata.xml:
+  Update metadata to sci-physics.
+
+  02 Jul 2006; Luis Medinas <metalgod@gentoo.org>
+  +files/pgsql-no-libpq-int.patch, +files/root-makefile.patch,
+  +metadata.xml, +root-3.05.04.ebuild, +root-3.10.02-r1.ebuild,
+  +root-4.02.00.ebuild:
+  Moved from sci-libs/root to sci-physics/root.
+
+  23 Jun 2006; Doug Goldstein <cardoe@gentoo.org> root-3.10.02-r1.ebuild,
+  root-4.02.00.ebuild:
+  USE flag qt->qt3/qt4 change
+
+  03 Feb 2006; Patrick Kursawe <phosphan@gentoo.org> root-3.05.04.ebuild,
+  root-3.10.02-r1.ebuild, root-4.02.00.ebuild:
+  Porting to modular X
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> root-3.10.02-r1.ebuild,
+  root-4.02.00.ebuild:
+  Fix qt dep per bug #100235
+
+  26 Jun 2005; Olivier Fisette <ribosome@gentoo.org>
+  -files/root-4.00.06a-gcc-3.4.patch, -root-3.03.04-r2.ebuild,
+  -root-4.00.06a.ebuild:
+  Removed obsolete versions.
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> root-4.02.00.ebuild:
+  Like on sparc, this package doesn't work yet on ppc.
+
+  29 Mar 2005; Ferris McCormick <fmccor@gentoo.org> root-4.02.00.ebuild:
+  Add -sparc keyword to make explicit that as distributed, this package cannot
+  build on sparc.  Supported architectures are hardwired in a tgz file included
+  within the package: xrootd/src/xrootd-20041124-0752.src.tgz, and in
+  unix/src/TUnixSystem.cxx, and linux:sparc is not among them.  There is no
+  apparent for this package not to work on sparc, but as constituted, it cannot
+  without upstream support.
+
+  12 Mar 2005; Patrick Kursawe <phosphan@gentoo.org> root-4.02.00.ebuild:
+  No bugs for this version for about two months -> stable
+
+*root-4.02.00 (15 Jan 2005)
+
+  15 Jan 2005; Olivier Fisette <ribosome@gentoo.org> +root-4.02.00.ebuild:
+  New version. GCC 3.4 patch no longer required.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*root-3.10.02-r1 (28 Dec 2004)
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> +metadata.xml,
+  +files/pgsql-no-libpq-int.patch, +files/root-4.00.06a-gcc-3.4.patch,
+  +files/root-makefile.patch, +root-3.03.04-r2.ebuild, +root-3.05.04.ebuild,
+  +root-3.10.02-r1.ebuild, +root-4.00.06a.ebuild:
+  Moved from dev-libs/root to sci-libs/root.
+
+*root-4.00.06a (02 Jul 2004)
+
+  02 Jul 2004; Patrick Kursawe <phosphan@gentoo.org> metadata.xml,
+  root-4.00.06a.ebuild, files/root-4.00.06a-gcc-3.4.patch:
+  Version bump, see bug #55719 - gcc 3.4 patch extracted from "root" CVS.
+
+*root-3.10.02-r1 (15 Jun 2004)
+
+  15 Jun 2004; Patrick Kursawe <phosphan@gentoo.org> root-3.10.02-r1.ebuild,
+  root-3.10.02.ebuild:
+  Shared libs were not found, see bug #53095
+
+  07 Jun 2004; Patrick Kursawe <phosphan@gentoo.org> root-3.10.02.ebuild:
+  According to user report (forums/slackerman) it works for amd64.
+
+*root-3.10.02 (20 Apr 2004)
+
+  20 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> root-3.10.02.ebuild:
+  Version bump, see bug #34412
+
+  06 Oct 2003; Heinrich Wendel <lanius@gentoo.org> root-3.05.04.ebuild:
+  stable bump #29947
+
+  12 Jun 2003; Seemant Kulleen <seemant@gentoo.org> root-3.03.04-r2.ebuild:
+  xfree provides xpm
+
+*root-3.05.04 (25 Apr 2003)
+
+  25 Feb 2003; Luca Barbato <kain@kain.org> root-3.05.04.ebuild :
+  New version, as suggested by Dmitry Kustov <dimok77@hotmail.com>
+  
+*root-3.03.04-r2 (22 Feb 2003)
+
+  22 Feb 2003; Bryon Roche <kain@kain.org> root-3.03.04-r1.ebuild root-3.03.04-r2.ebuild files/digest-root-3.03.04-r2 files/pgsql-no-libpq-int.patch files/root-makefile.patch :
+  Fixed header include issues with the PostgreSQL api, as well as configuration/compilation issues.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*root-3.03.04-r1 (11 Apr 2002)
+
+  24 Oct 2002; J.Alberto Suárez López <bass@gentoo.org> root-3.03.04-r1.ebuild
+  Typo error in the ebuild appear 'econ' not 'econf'.
+  
+  11 Apr 2002; G.Bevin <gbevin@gentoo.org> root-3.03.04-r1.ebuild
+  files/digest-root-3.03.04-r1 :
+  
+  Added env entry for the libs.
+  Removed rpath switch from configure since it created a segfaulting root
+  executable.
+  
+*root-3.03.04 (11 Apr 2002)
+
+  11 Apr 2002; G.Bevin <gbevin@gentoo.org> root-3.03.04.ebuild
+  files/digest-root-3.03.04 :
+  
+  Initial release

diff --git a/sci-physics/root/files/olbd.confd b/sci-physics/root/files/olbd.confd
new file mode 100644
index 0000000..848f4d7
--- /dev/null
+++ b/sci-physics/root/files/olbd.confd
@@ -0,0 +1,9 @@
+# conf.d file for olbd daemon
+
+# User to run as (default is `xrootd')
+OLBD_USER="root"
+
+#
+# Please refer to the olbd(1) man(1) page for more
+# information on command line parameters. 
+OLBD_OPTS=""

diff --git a/sci-physics/root/files/olbd.initd b/sci-physics/root/files/olbd.initd
new file mode 100644
index 0000000..1793300
--- /dev/null
+++ b/sci-physics/root/files/olbd.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/olbd.initd,v 1.1 2008/12/18 18:10:18 bicatali Exp $
+
+depend() {
+    need net
+    use dns logger
+    provide root-file-server
+}
+
+start() {
+    ebegin "Starting ROOT open load balancer server"
+    start-stop-daemon --start --quiet --user=${OLBD_USER} \
+	--make-pidfile --pidfile=/var/run/olbd.pid \
+	--exec /usr/bin/olbd --background -- ${OLBD_OPTS}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ROOT open load balancer server"
+    start-stop-daemon --stop --quiet \
+	--pidfile=/var/run/olbd.pid \
+	--exec /usr/bin/olbd
+    eend $?
+}

diff --git a/sci-physics/root/files/proofd.confd b/sci-physics/root/files/proofd.confd
new file mode 100644
index 0000000..81720a7
--- /dev/null
+++ b/sci-physics/root/files/proofd.confd
@@ -0,0 +1,12 @@
+# 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
new file mode 100644
index 0000000..7fc275a
--- /dev/null
+++ b/sci-physics/root/files/proofd.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/proofd.initd,v 1.3 2012/01/21 19:23:26 bicatali Exp $
+
+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.26.00-make-3.82.patch b/sci-physics/root/files/root-5.26.00-make-3.82.patch
new file mode 100644
index 0000000..dc6d8a0
--- /dev/null
+++ b/sci-physics/root/files/root-5.26.00-make-3.82.patch
@@ -0,0 +1,36 @@
+http://root.cern.ch/viewcvs?view=rev&revision=35096
+https://savannah.cern.ch/bugs/?func=detailitem&item_id=72166
+
+--- root-5.26.00d/Makefile
++++ root-5.26.00d/Makefile
+@@ -544,6 +544,30 @@
+ .PRECIOUS: include/%.h
+ 
+ # special rules (need to be defined before generic ones)
++cint/cint/lib/dll_stl/G__%.o: cint/cint/lib/dll_stl/G__%.cxx
++	$(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \
++	   $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \
++	   -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $<
++	$(CXX) $(NOOPT) $(CXXFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc  $(CXXOUT)$@ -c $<
++
++cint/cint/lib/dll_stl/G__c_%.o: cint/cint/lib/dll_stl/G__c_%.c
++	$(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \
++	   $(CFLAGS) $(DICTFLAGS) -I$(CINTDIR)/lib/prec_stl \
++	   -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $<
++	$(CC) $(NOOPT) $(CFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc  $(CXXOUT)$@ -c $<
++
++cint/cint/lib/G__%.o: cint/cint/lib/G__%.cxx
++	$(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \
++	   $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \
++	   -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $<
++	$(CXX) $(NOOPT) $(CXXFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc  $(CXXOUT)$@ -c $<
++
++cint/cint/lib/G__c_%.o: cint/cint/lib/G__c_%.c
++	$(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \
++	   $(CFLAGS) $(DICTFLAGS) -I$(CINTDIR)/lib/prec_stl \
++	   -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $<
++	$(CC) $(NOOPT) $(CFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc  $(CXXOUT)$@ -c $<
++
+ G__%.o: G__%.cxx
+ 	$(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \
+ 	   $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \

diff --git a/sci-physics/root/files/root-5.26.00e-libpng15.patch b/sci-physics/root/files/root-5.26.00e-libpng15.patch
new file mode 100644
index 0000000..91ed9c4
--- /dev/null
+++ b/sci-physics/root/files/root-5.26.00e-libpng15.patch
@@ -0,0 +1,33 @@
+This patch is a copy from media-libs/libafterimage.
+
+--- graf2d/asimage/src/libAfterImage/export.c
++++ graf2d/asimage/src/libAfterImage/export.c
+@@ -496,7 +496,7 @@
+ 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
+     if ( png_ptr != NULL )
+     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
+-			if( setjmp(png_ptr->jmpbuf) )
++			if( setjmp(png_jmpbuf(png_ptr)) )
+ 			{
+ 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
+ 				info_ptr = NULL ;
+--- graf2d/asimage/src/libAfterImage/import.c
++++ graf2d/asimage/src/libAfterImage/import.c
+@@ -1251,7 +1251,7 @@
+ 			 * the normal method of doing things with libpng).  REQUIRED unless you
+ 			 * set up your own error handlers in the png_create_read_struct() earlier.
+ 			 */
+-			if ( !setjmp (png_ptr->jmpbuf))
++			if ( !setjmp (png_jmpbuf(png_ptr)))
+ 			{
+ 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
+ 
+@@ -1468,7 +1468,7 @@
+ 
+ static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+-   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
++   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
+    memcpy(data, buf->buffer, length);
+    buf->buffer += length;
+ }

diff --git a/sci-physics/root/files/root-5.28.00b-asneeded.patch b/sci-physics/root/files/root-5.28.00b-asneeded.patch
new file mode 100644
index 0000000..b845247
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00b-asneeded.patch
@@ -0,0 +1,20 @@
+--- root.orig/configure	2010-12-20 07:17:54.000000000 +0000
++++ root/configure	2010-12-20 07:16:05.000000000 +0000
+@@ -709,7 +709,7 @@
+        cat <<EOF > conftest.mk
+ include ${ac_srcdir}/config/Makefile.${arch}
+ conftest: conftest.c
+-	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
++	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib  -o \$@
+ 
+ conftest.c:
+ 	echo "int main() { return 0; }" > \$@
+@@ -723,7 +723,7 @@
+        cat <<EOF > conftest.mk
+ include ${ac_srcdir}/config/Makefile.${arch}
+ conftest:conftest.c
+-	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
++	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@
+ 
+ conftest.c:
+ 	echo "extern int $linksymbol (); " > \$@

diff --git a/sci-physics/root/files/root-5.28.00b-glibc212.patch b/sci-physics/root/files/root-5.28.00b-glibc212.patch
new file mode 100644
index 0000000..a365431
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00b-glibc212.patch
@@ -0,0 +1,11 @@
+--- root.orig/net/auth/src/TAFS.cxx	2010-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 <unistd.h>
++#   include <sys/stat.h>
+ #else
+ #   define ssize_t int
+ #   include <io.h>
+

diff --git a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
new file mode 100644
index 0000000..7029bf1
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
@@ -0,0 +1,138 @@
+diff -Naur root.orig/Makefile root/Makefile
+--- root.orig/Makefile	2010-12-17 22:48:40.577775091 +0300
++++ root/Makefile	2010-12-17 22:49:27.902497903 +0300
+@@ -1148,10 +1148,7 @@
+ 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
+ 	   fi; \
+-	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
+-	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
+-	   fi; \
+-	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
++	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      dir=$(RFLX_GRFLXDD:lib/=); \
+ 	      while test "x$${dir}" != "x" && \
+ 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
+diff -Naur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
+--- root.orig/bindings/pyroot/Module.mk	2010-12-17 22:48:39.941179413 +0300
++++ root/bindings/pyroot/Module.mk	2010-12-17 22:49:27.899164943 +0300
+@@ -48,8 +48,6 @@
+ ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
+ $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
+ endif
+-ROOTPYC      := $(ROOTPY:.py=.pyc)
+-ROOTPYO      := $(ROOTPY:.py=.pyo)
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
+@@ -68,10 +66,8 @@
+ 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)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
+@@ -113,7 +109,7 @@
+ 
+ distclean-$(MODNAME): clean-$(MODNAME)
+ 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
+-		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
++		   $(ROOTPY) $(PYROOTMAP) \
+ 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
+ 
+ distclean::     distclean-$(MODNAME)
+diff -Naur root.orig/build/package/debian/rules root/build/package/debian/rules
+--- root.orig/build/package/debian/rules	2010-12-17 22:48:40.197817461 +0300
++++ root/build/package/debian/rules	2010-12-17 22:49:27.902497903 +0300
+@@ -623,10 +623,6 @@
+ 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
+ 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			
+ #		$(foreach i, \
+ #		   $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
+ #		    -X$(i:$(DTMP)/%=%) )
+diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk
+--- root.orig/cint/cintex/Module.mk	2010-12-17 22:48:40.057833071 +0300
++++ root/cint/cintex/Module.mk	2010-12-17 22:49:27.902497903 +0300
+@@ -31,10 +31,6 @@
+ CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
+ $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
+ endif
+-ifneq ($(BUILDPYTHON),no)
+-CINTEXPYC    := $(CINTEXPY:.py=.pyc)
+-CINTEXPYO    := $(CINTEXPY:.py=.pyo)
+-endif
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
+@@ -86,8 +82,6 @@
+ 		fi)
+ 		cp $< $@
+ 
+-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
+-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
+                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
+diff -Naur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk
+--- root.orig/cint/reflex/Module.mk	2010-12-17 22:48:40.037835301 +0300
++++ root/cint/reflex/Module.mk	2010-12-17 22:51:36.871451359 +0300
+@@ -48,9 +48,6 @@
+ RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
+ RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
+ RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
+-ifneq ($(BUILDPYTHON),no)
+-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
+-endif
+ 
+ RFLX_LIBDIR = $(LIBDIR)
+ 
+@@ -92,7 +89,7 @@
+ 
+ ALLEXECS += $(RFLX_GENMAPX)
+ 
+-POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++POSTBIN  += $(RFLX_GRFLXPY)
+ 
+ ##### local rules #####
+ .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
+@@ -122,8 +119,6 @@
+ 		  mkdir -p lib/python/genreflex; fi )
+ 		cp $< $@
+ 
+-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
+-		@python -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
+ 
+@@ -149,7 +144,7 @@
+ 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
+ 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
+ 
+-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
+ 
+ clean-genreflex:
+ 		@rm -rf lib/python/genreflex
+diff -Naur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
+--- root.orig/cint/reflex/python/CMakeLists.txt	2010-12-17 22:48:40.037835301 +0300
++++ root/cint/reflex/python/CMakeLists.txt	2010-12-17 22:49:27.902497903 +0300
+@@ -15,7 +15,7 @@
+ #####################   sources   ####################
+ 
+ FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
+-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
++SET(GENREFLEX_SCRIPT PARENT_SCOPE)
+ 
+ #####################  gccxmlpath ####################
+ 
+

diff --git a/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch b/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch
new file mode 100644
index 0000000..7324319
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch
@@ -0,0 +1,13 @@
+diff -Naur root.orig/config/Makefile.in root/config/Makefile.in
+--- root.orig/config/Makefile.in	2010-12-14 17:20:26.000000000 +0300
++++ root/config/Makefile.in	2010-12-17 22:33:34.902161458 +0300
+@@ -27,7 +27,7 @@
+ 
+ EXTRA_CFLAGS   := -Iinclude @cflags@
+ EXTRA_CXXFLAGS := -Iinclude @cflags@
+-EXTRA_LDFLAGS  := @ldflags@
++EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
+ WINRTDEBUG     := @winrtdebug@
+ 
+ GLBPATCHFLAGS  := @glbpatchcflags@
+

diff --git a/sci-physics/root/files/root-5.28.00b-unuran.patch b/sci-physics/root/files/root-5.28.00b-unuran.patch
new file mode 100644
index 0000000..76422da
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00b-unuran.patch
@@ -0,0 +1,39 @@
+diff -ur root-trunk.orig/math/unuran/Module.mk root-trunk/math/unuran/Module.mk
+--- root.orig/math/unuran/Module.mk	2010-11-25 20:41:32.000000000 +0100
++++ root/math/unuran/Module.mk	2010-11-25 20:51:47.190704977 +0100
+@@ -20,7 +20,7 @@
+ UNURANETAG   := $(call stripsrc,$(UNURANDIRS)/headers.d)
+ UNRCFG       := $(call stripsrc,$(UNURANDIRS)/$(UNRVERS)/config.h)
+ 
+-UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -))
++UNRTARCONTENT:=
+ UNRS         := $(filter %.c, \
+                 $(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \
+                 $(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \
+@@ -69,10 +69,9 @@
+ ##### local rules #####
+ .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+ 
+-include/%.h: 	$(UNURANDIRI)/%.h $(UNURANETAG)
++include/%.h: 	$(UNURANDIRI)/%.h
+ 		cp $< $@
+ 
+-$(UNURANDEP):   $(UNRCFG)
+ $(UNRS):        $(UNURANETAG)
+ 
+ $(UNURANETAG):	$(UNRSRCS)
+@@ -125,12 +124,12 @@
+ 		GNUMAKE=$(MAKE) ./configure  CC="$$ACC"  \
+ 		CFLAGS="$$ACFLAGS");
+ 
+-$(UNURANLIB):   $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
++$(UNURANLIB):   $(UNURANO) $(UNURANDO) $(ORDER_) \
+                 $(MAINLIBS) $(UNURANLIBDEP)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"  \
+ 		   "$(SOFLAGS)" libUnuran.$(SOEXT) $@     \
+ 		   "$(UNURANO) $(UNURANDO)"             \
+-		   "$(UNURANLIBEXTRA) $(UNRO)"
++		   "$(UNURANLIBEXTRA) -lunuran"
+ 
+ $(UNURANDS):    $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP)
+ 		$(MAKEDIR)

diff --git a/sci-physics/root/files/root-5.32.00-afs.patch b/sci-physics/root/files/root-5.32.00-afs.patch
new file mode 100644
index 0000000..2bf3179
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-afs.patch
@@ -0,0 +1,33 @@
+--- root/net/auth/src/TAFS.cxx.orig	2011-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<char *>( 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 --git a/sci-physics/root/files/root-5.32.00-cfitsio.patch b/sci-physics/root/files/root-5.32.00-cfitsio.patch
new file mode 100644
index 0000000..853c3f3
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-cfitsio.patch
@@ -0,0 +1,13 @@
+--- configure.orig	2012-01-19 23:44:44.127607638 +0100
++++ configure	2012-01-20 00:19:20.420652913 +0100
+@@ -3435,9 +3435,7 @@
+     cfitsioinc=$found_hdr
+     cfitsioincdir=$found_dir
+ 
+-    # At this time, libcfitsio.a should always be prefered over .so,
+-    # to avoid forcing users to install cfitsio.
+-    check_library "libcfitsio cfitsio" "no" "$cfitsiolibdir" \
++    check_library "libcfitsio cfitsio" "yes" "$cfitsiolibdir" \
+         $CFITSIO ${CFITSIO:+$CFITSIO/lib} ${CFITSIO:+$CFITSIO/.libs} \
+         ${finkdir:+$finkdir/lib} \
+         /usr/local/lib /usr/lib /opt/cfitsio/lib

diff --git a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch b/sci-physics/root/files/root-5.32.00-nobyte-compile.patch
new file mode 100644
index 0000000..179e579
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-nobyte-compile.patch
@@ -0,0 +1,137 @@
+diff -Naur root.as-needed/Makefile root/Makefile
+--- root.as-needed/Makefile	2011-07-10 10:42:49.758191296 +0400
++++ root/Makefile	2011-07-10 10:43:21.493339703 +0400
+@@ -1167,10 +1167,7 @@
+ 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
+ 	   fi; \
+-	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
+-	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
+-	   fi; \
+-	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
++	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      dir=$(RFLX_GRFLXDD:lib/=); \
+ 	      while test "x$${dir}" != "x" && \
+ 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
+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 $< $@
+ endif
+-ROOTPYC      := $(ROOTPY:.py=.pyc)
+-ROOTPYO      := $(ROOTPY:.py=.pyo)
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
+@@ -68,10 +66,8 @@
+ 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)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
+@@ -113,7 +109,7 @@
+ 
+ distclean-$(MODNAME): clean-$(MODNAME)
+ 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
+-		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
++		   $(ROOTPY) $(PYROOTMAP) \
+ 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
+ 
+ distclean::     distclean-$(MODNAME)
+diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules
+--- root.as-needed/build/package/debian/rules	2011-07-10 10:42:49.241549346 +0400
++++ root/build/package/debian/rules	2011-07-10 10:48:06.989670589 +0400
+@@ -691,10 +691,6 @@
+ 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
+ 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/cint7			\
+ 		-X$(PREFIX)/include/root/Minuit2
+ #		$(foreach i, \
+diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
+--- root.as-needed/cint/cintex/Module.mk	2011-07-10 10:42:49.104889217 +0400
++++ root/cint/cintex/Module.mk	2011-07-10 10:43:21.496672876 +0400
+@@ -31,10 +31,6 @@
+ CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
+ $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
+ endif
+-ifneq ($(BUILDPYTHON),no)
+-CINTEXPYC    := $(CINTEXPY:.py=.pyc)
+-CINTEXPYO    := $(CINTEXPY:.py=.pyo)
+-endif
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
+@@ -86,8 +82,6 @@
+ 		fi)
+ 		cp $< $@
+ 
+-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
+-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
+                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
+diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
+--- root.as-needed/cint/reflex/Module.mk	2011-07-10 10:42:49.074890651 +0400
++++ root/cint/reflex/Module.mk	2011-07-10 10:43:21.496672876 +0400
+@@ -48,9 +48,6 @@
+ RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
+ RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
+ RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
+-ifneq ($(BUILDPYTHON),no)
+-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
+-endif
+ 
+ RFLX_LIBDIR = $(LIBDIR)
+ 
+@@ -92,7 +89,7 @@
+ 
+ ALLEXECS += $(RFLX_GENMAPX)
+ 
+-POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++POSTBIN  += $(RFLX_GRFLXPY)
+ 
+ ##### local rules #####
+ .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
+@@ -122,8 +119,6 @@
+ 		  mkdir -p lib/python/genreflex; fi )
+ 		cp $< $@
+ 
+-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
+-		@python -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
+ 
+@@ -149,7 +144,7 @@
+ 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
+ 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
+ 
+-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
+ 
+ clean-genreflex:
+ 		@rm -rf lib/python/genreflex
+diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
+--- root.as-needed/cint/reflex/python/CMakeLists.txt	2011-07-10 10:42:49.074890651 +0400
++++ root/cint/reflex/python/CMakeLists.txt	2011-07-10 10:43:21.496672876 +0400
+@@ -15,7 +15,7 @@
+ #####################   sources   ####################
+ 
+ FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
+-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
++SET(GENREFLEX_SCRIPT PARENT_SCOPE)
+ 
+ #####################  gccxmlpath ####################
+ 

diff --git a/sci-physics/root/files/rootd.confd b/sci-physics/root/files/rootd.confd
new file mode 100644
index 0000000..7516b8c
--- /dev/null
+++ b/sci-physics/root/files/rootd.confd
@@ -0,0 +1,8 @@
+# conf.d file for root daemon
+
+# User to run as (default is `rootd')
+ROOTD_USER="rootd"
+
+# Please refer to the rootd(1) man(1) page for more information on 
+# command line parameters. 
+ROOTD_OPTS=""

diff --git a/sci-physics/root/files/rootd.initd b/sci-physics/root/files/rootd.initd
new file mode 100644
index 0000000..14c0d8e
--- /dev/null
+++ b/sci-physics/root/files/rootd.initd
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/rootd.initd,v 1.3 2012/01/21 19:23:26 bicatali Exp $
+
+depend() {
+    need net
+    use logger
+    provide root-file-server
+}
+
+start() {
+    ebegin "Starting ROOT file server"
+    pid=$(start-stop-daemon --start --quiet --user ${ROOTD_USER} \
+	--pidfile /var/run/rootd.pid \
+	--exec /usr/bin/rootd -- ${ROOTD_OPTS})
+    retval=$?
+    echo ${ROOTD_PID} > /var/run/rootd.pid
+    eend ${retval}
+}
+
+stop() {
+    ebegin "Stopping ROOT file server"
+    start-stop-daemon --stop --quiet \
+	--pidfile /var/run/rootd.pid \
+	--exec /usr/bin/rootd
+    eend $?
+}

diff --git a/sci-physics/root/files/xrootd.confd b/sci-physics/root/files/xrootd.confd
new file mode 100644
index 0000000..e725cd1
--- /dev/null
+++ b/sci-physics/root/files/xrootd.confd
@@ -0,0 +1,8 @@
+# conf.d file for xroot daemon
+
+# User to run as (default is `root')
+XROOTD_USER="root"
+
+# Please refer to the xrootd(1) man(1) page for more
+# information on command line parameters. 
+XROOTD_OPTS=""

diff --git a/sci-physics/root/files/xrootd.initd b/sci-physics/root/files/xrootd.initd
new file mode 100644
index 0000000..28dd8a5
--- /dev/null
+++ b/sci-physics/root/files/xrootd.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/xrootd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
+
+depend() {
+    need net
+    use logger dns
+    provide root-file-server
+}
+
+start() {
+    ebegin "Starting extended ROOTD file server"
+    start-stop-daemon --start --quiet --user ${XROOTD_USER} \
+	--make-pidfile --pidfile /var/run/xrootd.pid \
+	--exec /usr/bin/xrootd --background -- ${XROOTD_OPTS}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping extended ROOTD file server"
+    start-stop-daemon --stop --quiet \
+	--pidfile /var/run/xrootd.pid \
+	--exec /usr/bin/xrootd
+    eend $?
+}

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
new file mode 100644
index 0000000..aaec26a
--- /dev/null
+++ b/sci-physics/root/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>bircoph@gmail.com</email>
+  <name>Andrew Savchenko</name>
+  <description>Maintainer. Assign bugs to him</description>
+</maintainer>
+<herd>sci-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
+  contains the CINT C/C++ interpreter and many classes such as
+  statistics, serialization, optimization, linear algebra, graphics,
+  GUI toolkit, and a complete visualization framework.
+</longdescription>
+<use>
+  <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
+  <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+  <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag>
+  <flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
+  <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
+  <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
+  <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
+  <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
+  <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
+</use>
+</pkgmetadata>

diff --git a/sci-physics/root/root-5.26.00e-r1.ebuild b/sci-physics/root/root-5.26.00e-r1.ebuild
new file mode 100644
index 0000000..777617b
--- /dev/null
+++ b/sci-physics/root/root-5.26.00e-r1.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00e-r1.ebuild,v 1.12 2011/11/13 11:21:12 jlec Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2"
+
+inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs
+
+DOC_PV=$(get_major_version)_$(get_version_component_range 2)
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="
+	ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+	mirror://gentoo/${P}-patches.tar.bz2
+	doc? (
+		ftp://root.cern.ch/root/doc/Users_Guide_${DOC_PV}.pdf
+		ftp://root.cern.ch/root/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="amd64 x86"
+IUSE="afs clarens doc emacs examples fftw geant4 graphviz kerberos ldap
+	+math mysql	odbc +opengl openmp oracle postgres pythia6 pythia8 python
+	+reflex	ruby qt4 ssl xft xml xinetd xrootd"
+
+# libafterimage ignored, to check every version
+# see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944
+#	|| ( >=media-libs/libafterimage-1.18 x11-wm/afterstep )
+CDEPEND="
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	>=media-libs/ftgl-2.1.3_rc5
+	media-libs/giflib
+	media-libs/glew
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sys-apps/shadow
+	virtual/jpeg
+	x11-libs/libXft
+	x11-libs/libXpm
+	afs? ( >=net-fs/openafs-1.4.7 )
+	clarens? ( dev-libs/xmlrpc-c )
+	emacs? ( virtual/emacs )
+	fftw? ( sci-libs/fftw:3.0 )
+	geant4? ( sci-physics/geant:4 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	math? ( sci-libs/gsl )
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	opengl? ( virtual/opengl virtual/glu )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-opengl:4
+		x11-libs/qt-qt3support:4
+		x11-libs/qt-xmlpatterns:4 )
+	ruby? (
+			dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2:2 )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="
+	virtual/fortran
+	${CDEPEND}
+	xinetd? ( sys-apps/xinetd )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	echo
+	elog "You may want to build ROOT with these non Gentoo extra packages:"
+	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
+	echo
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	if use openmp && \
+		[[ $(tc-getCC)$ == *gcc* ]] && \
+		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || \
+			! has_version sys-devel/gcc[openmp] ); then
+		ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
+		ewarn "If you want to build this package with OpenMP, abort now,"
+		ewarn "and set CC to an OpenMP capable compiler"
+	elif use openmp; then
+		export USE_OPENMP=1
+		use math && export USE_PARALLEL_MINUIT2=1
+	fi
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/${P}-make-3.82.patch \
+		"${WORKDIR}"/${P}-prop-ldflags.patch \
+		"${WORKDIR}"/${P}-configure-paths.patch \
+		"${WORKDIR}"/${P}-nobyte-compile.patch \
+		"${WORKDIR}"/${P}-glibc212.patch \
+		"${WORKDIR}"/${P}-xrootd-prop-flags.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+
+	# use system cfortran
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
+
+	# take a more descriptive name for ruby libs
+	sed -i \
+		-e 's/libRuby/libRubyROOT/g' \
+		bindings/ruby/Module.mk bindings/ruby/src/drr.cxx \
+		|| die "ajusting ruby libname failed"
+
+	# in gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif
+	sed -i \
+		-e 's/libPythia6/libpythia6/g' \
+		-e 's/ungif/gif/g' \
+		configure || die "adjusting library names failed"
+
+	# libafterimage flags are hardcoded
+	sed -i \
+		-e 's/CFLAGS="-O3"//' \
+		-e 's/CFLAGS=$$ACFLAGS//' \
+		graf2d/asimage/Module.mk graf2d/asimage/src/libAfterImage/configure \
+		|| die "flag propagation in libafterimage failed"
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+}
+
+src_configure() {
+	# the configure script is not the standard autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-rpath \
+		--enable-asimage \
+		--enable-astiff \
+		--enable-exceptions	\
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		--with-afs-shared=yes \
+		$(use_enable afs) \
+		$(use_enable clarens) \
+		$(use_enable clarens peac) \
+		$(use_enable fftw fftw3) \
+		$(use_enable geant4 g4root) \
+		$(use_enable graphviz gviz) \
+		$(use_enable kerberos krb5) \
+		$(use_enable ldap) \
+		$(use_enable math gsl-shared) \
+		$(use_enable math genvector) \
+		$(use_enable math mathmore) \
+		$(use_enable math minuit2) \
+		$(use_enable math roofit) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable postgres pgsql) \
+		$(use_enable pythia6) \
+		$(use_enable pythia8) \
+		$(use_enable python) \
+		$(use_enable qt4 qt) \
+		$(use_enable qt4 qtgsi) \
+		$(use_enable reflex cintex) \
+		$(use_enable reflex) \
+		$(use_enable ruby) \
+		$(use_enable ssl) \
+		$(use_enable xft) \
+		$(use_enable xml) \
+		$(use_enable xrootd) \
+		${EXTRA_ECONF} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed"
+	if use emacs; then
+		elisp-compile build/misc/*.el || die "elisp-compile failed"
+	fi
+}
+
+doc_install() {
+	cd "${S}"
+	if use doc; then
+		einfo "Installing user's guides"
+		insinto /usr/share/doc/${PF}
+		doins \
+			"${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf \
+			|| die "pdf install failed"
+		if use math; then
+			doins "${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+				|| die "math doc install failed"
+		fi
+	fi
+
+	if use examples; then
+		# these should really be taken care of by the root make install
+		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
+		doins -r tmva/test || die
+	else
+		rm -rf "${D}"/usr/share/doc/${PF}/examples
+	fi
+}
+
+daemon_install() {
+	cd "${S}"
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	use xrootd && daemons="${daemons} xrootd olbd"
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins etc/daemons/{rootd,proofd}.xinetd || die
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	sed -e 's,@prefix@,/usr,' \
+		build/package/debian/root-system-bin.desktop.in > root.desktop
+	domenu root.desktop
+	doicon "${S}"/build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	doenvd 99root || die "doenvd failed"
+
+	# The build system installs Emacs support unconditionally and in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -rf "${D}"/usr/share/emacs
+	if use emacs; then
+		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
+	fi
+
+	doc_install
+	daemon_install
+	desktop_install
+
+	# Cleanup of files either already distributed or unused on Gentoo
+	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
+	rm "${ED}"usr/share/root/fonts/LICENSE
+	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
+	rm -f posix/mktypes dll_stl/setup \
+		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o
+	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
+	rm -f "${ED}"/etc/root/proof/*.sample
+	rm -rf "${ED}"/etc/root/daemons
+	popd > /dev/null
+}
+
+pkg_postinst() {
+	use ruby && elog "ROOT Ruby module is available as libRubyROOT"
+	fdo-mime_desktop_database_update
+	use python && python_mod_optimize /usr/$(get_libdir)/root
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_cleanup /usr/$(get_libdir)/root
+}

diff --git a/sci-physics/root/root-5.28.00d.ebuild b/sci-physics/root/root-5.28.00d.ebuild
new file mode 100644
index 0000000..f685450
--- /dev/null
+++ b/sci-physics/root/root-5.28.00d.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.4 2011/11/13 11:21:12 jlec Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2"
+
+inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
+
+#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
+DOC_PV=5_26
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="
+	ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+	http://dev.gentoo.org/~bicatali/${PN}-${PATCH_PV}-xrootd-prop-flags.patch.bz2
+	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
+	math? (
+		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
+	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres pythia6
+	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
+
+CDEPEND="
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-libs/ftgl
+	media-libs/giflib
+	media-libs/glew
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sys-apps/shadow
+	virtual/jpeg
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi )
+	clarens? ( dev-libs/xmlrpc-c )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio )
+	fftw? ( sci-libs/fftw:3.0 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	llvm? ( sys-devel/llvm )
+	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	mysql? ( virtual/mysql )
+	ncurses? ( sys-libs/ncurses )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-opengl:4
+		x11-libs/qt-qt3support:4
+		x11-libs/qt-svg:4
+		x11-libs/qt-webkit:4
+		x11-libs/qt-xmlpatterns:4 )
+	ruby? (
+			dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2:2 )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="
+	virtual/fortran
+${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	echo
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
+	echo
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	if use math; then
+		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+			ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
+			ewarn "If you want to build this package with OpenMP, abort now,"
+			ewarn "and set CC to an OpenMP capable compiler"
+		elif use openmp; then
+			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/${PN}-${PATCH_PV}-xrootd-prop-flags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
+	rm -rf graf2d/asimage/src/libAfterImage
+	rm -rf graf3d/ftgl/{inc,src}
+	rm -rf graf2d/freetype/src
+	rm -rf graf3d/glew/{inc,src}
+	rm -rf core/pcre/src
+	rm -rf math/unuran/src/unuran-*.tar.gz
+	find core/zip -type f -name "[a-z]*" | xargs rm
+	rm graf3d/gl/{inc,src}/gl2ps.*
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
+
+	# TODO: unbundle xrootd as a new package
+	#rm -rf net/xrootd/src
+	#sed -i \
+	#	-e 's:-lXrdOuc:-lXrd &:' \
+	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
+	#	proof/proofd/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINC:$ODBCINC /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+}
+
+src_configure() {
+	# the configure script is not the standard autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-rpath \
+		--enable-asimage \
+		--enable-astiff \
+		--enable-exceptions	\
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		--with-afs-shared=yes \
+		$(use_enable afs) \
+		$(use_enable avahi bonjour) \
+		$(use_enable clarens) \
+		$(use_enable clarens peac) \
+		$(use_enable ncurses editline) \
+		$(use_enable fits fitsio) \
+		$(use_enable fftw fftw3) \
+		$(use_enable graphviz gviz) \
+		$(use_enable kerberos krb5) \
+		$(use_enable ldap) \
+		$(use_enable llvm cling) \
+		$(use_enable math gsl-shared) \
+		$(use_enable math genvector) \
+		$(use_enable math mathmore) \
+		$(use_enable math minuit2) \
+		$(use_enable math roofit) \
+		$(use_enable math tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable postgres pgsql) \
+		$(use_enable pythia6) \
+		$(use_enable pythia8) \
+		$(use_enable python) \
+		$(use_enable qt4 qt) \
+		$(use_enable qt4 qtgsi) \
+		$(use_enable reflex cintex) \
+		$(use_enable reflex) \
+		$(use_enable ruby) \
+		$(use_enable ssl) \
+		$(use_enable xft) \
+		$(use_enable xml) \
+		$(use_enable xrootd) \
+		${EXTRA_ECONF} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed"
+	if use emacs; then
+		elisp-compile build/misc/*.el || die "elisp-compile failed"
+	fi
+}
+
+doc_install() {
+	cd "${S}"
+	if use doc; then
+		einfo "Installing user's guides"
+		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	fi
+
+	if use examples; then
+		# these should really be taken care of by the root make install
+		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
+		doins -r tmva/test
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+	fi
+}
+
+daemon_install() {
+	cd "${S}"
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	use xrootd && daemons="${daemons} xrootd olbd"
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins etc/daemons/{rootd,proofd}.xinetd
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	sed -e 's,@prefix@,/usr,' \
+		build/package/debian/root-system-bin.desktop.in > root.desktop
+	domenu root.desktop
+	doicon "${S}"/build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	doenvd 99root || die "doenvd failed"
+
+	# The build system installs Emacs support unconditionally and in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -rf "${ED}"/usr/share/emacs
+	if use emacs; then
+		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
+	fi
+
+	doc_install
+	daemon_install
+	desktop_install
+
+	# Cleanup of files either already distributed or unused on Gentoo
+	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
+	rm "${ED}"usr/share/root/fonts/LICENSE
+	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
+	rm -f posix/mktypes dll_stl/setup \
+		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o
+	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
+	rm -f "${ED}"/etc/root/proof/*.sample
+	rm -rf "${ED}"/etc/root/daemons
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_optimize /usr/$(get_libdir)/root
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_cleanup /usr/$(get_libdir)/root
+}

diff --git a/sci-physics/root/root-5.32.00-r2.ebuild b/sci-physics/root/root-5.32.00-r2.ebuild
new file mode 100644
index 0000000..093c935
--- /dev/null
+++ b/sci-physics/root/root-5.32.00-r2.ebuild
@@ -0,0 +1,340 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.00-r2.ebuild,v 1.1 2012/01/21 19:19:46 bicatali Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
+
+#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
+DOC_PV=5_26
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+PATCH_PV2=5.32.00
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
+	math? (
+		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
+	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
+	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
+
+CDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-libs/freetype
+	media-libs/giflib
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sys-apps/shadow
+	sys-libs/zlib
+	virtual/jpeg
+	X? (
+		media-libs/ftgl
+		media-libs/glew
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+		qt4? (
+			x11-libs/qt-gui:4
+			x11-libs/qt-opengl:4
+			x11-libs/qt-qt3support:4
+			x11-libs/qt-svg:4
+			x11-libs/qt-webkit:4
+			x11-libs/qt-xmlpatterns:4 )
+		xft? ( x11-libs/libXft )
+		)
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi )
+	clarens? ( dev-libs/xmlrpc-c[curl] )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio )
+	fftw? ( sci-libs/fftw:3.0 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	llvm? ( sys-devel/llvm )
+	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	mysql? ( virtual/mysql )
+	ncurses? ( sys-libs/ncurses )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	ruby? (
+			dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )
+	xrootd? ( net-libs/xrootd )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="
+	virtual/fortran
+	${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+REQUIRED_USE="!X? ( !opengl !qt4 !xft )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python_pkg_setup
+	echo
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
+	echo
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	if use math; then
+		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+			ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
+			ewarn "If you want to build this package with OpenMP, abort now,"
+			ewarn "and set CC to an OpenMP capable compiler"
+		elif use openmp; then
+			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
+	rm -rf graf2d/asimage/src/libAfterImage
+	rm -rf graf3d/ftgl/{inc,src}
+	rm -rf graf2d/freetype/src
+	rm -rf graf3d/glew/{inc,src}
+	rm -rf core/pcre/src
+	rm -rf math/unuran/src/unuran-*.tar.gz
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" | xargs rm
+	rm -rf core/lzma/src/*.tar.gz
+	rm graf3d/gl/{inc,src}/gl2ps.*
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+}
+
+src_configure() {
+	# the configure script is not the standard autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-builtin-lzma \
+		--enable-astiff \
+		--enable-exceptions	\
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		--with-afs-shared=yes \
+		$(use_enable X x11) \
+		$(use_enable X asimage) \
+		$(use_enable afs) \
+		$(use_enable avahi bonjour) \
+		$(use_enable clarens) \
+		$(use_enable clarens peac) \
+		$(use_enable ncurses editline) \
+		$(use_enable fits fitsio) \
+		$(use_enable fftw fftw3) \
+		$(use_enable graphviz gviz) \
+		$(use_enable kerberos krb5) \
+		$(use_enable ldap) \
+		$(use_enable llvm cling) \
+		$(use_enable math gsl-shared) \
+		$(use_enable math genvector) \
+		$(use_enable math mathmore) \
+		$(use_enable math minuit2) \
+		$(use_enable math roofit) \
+		$(use_enable math tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable postgres pgsql) \
+		$(use_enable prefix rpath) \
+		$(use_enable pythia6) \
+		$(use_enable pythia8) \
+		$(use_enable python) \
+		$(use_enable qt4 qt) \
+		$(use_enable qt4 qtgsi) \
+		$(use_enable reflex cintex) \
+		$(use_enable reflex) \
+		$(use_enable ruby) \
+		$(use_enable ssl) \
+		$(use_enable xft) \
+		$(use_enable xml) \
+		$(use_enable xrootd) \
+		${EXTRA_ECONF} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed"
+	if use emacs; then
+		elisp-compile build/misc/*.el || die "elisp-compile failed"
+	fi
+}
+
+doc_install() {
+	cd "${S}"
+	if use doc; then
+		einfo "Installing user's guides"
+		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	fi
+
+	if use examples; then
+		# these should really be taken care of by the root make install
+		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
+		doins -r tmva/test
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+	fi
+}
+
+daemon_install() {
+	cd "${S}"
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins etc/daemons/{rootd,proofd}.xinetd
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	sed -e 's,@prefix@,/usr,' \
+		build/package/debian/root-system-bin.desktop.in > root.desktop
+	domenu root.desktop
+	doicon "${S}"/build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	doenvd 99root || die "doenvd failed"
+
+	# The build system installs Emacs support unconditionally and in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -rf "${ED}"/usr/share/emacs
+	if use emacs; then
+		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
+	fi
+
+	doc_install
+	daemon_install
+	desktop_install
+
+	# Cleanup of files either already distributed or unused on Gentoo
+	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
+	rm "${ED}"usr/share/root/fonts/LICENSE
+	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
+	rm -f posix/mktypes dll_stl/setup \
+		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o
+	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
+	rm -f "${ED}"/etc/root/proof/*.sample
+	rm -rf "${ED}"/etc/root/daemons
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_optimize /usr/$(get_libdir)/root
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_cleanup /usr/$(get_libdir)/root
+}



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-03-01 14:37 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-03-01 14:37 UTC (permalink / raw
  To: gentoo-commits

commit:     636b2c74fae655c34a3f96368ae6101795865fc9
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Mar  1 14:21:03 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Thu Mar  1 14:21:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=636b2c74

sci-physics/root: version bump

---
 sci-physics/root/ChangeLog                         |   12 +-
 sci-physics/root/files/olbd.confd                  |    9 -
 sci-physics/root/files/olbd.initd                  |   26 --
 .../root/files/root-5.26.00-make-3.82.patch        |   36 --
 .../root/files/root-5.26.00e-libpng15.patch        |   33 --
 .../root/files/root-5.28.00b-nobyte-compile.patch  |  138 --------
 sci-physics/root/files/xrootd.confd                |    8 -
 sci-physics/root/files/xrootd.initd                |   26 --
 sci-physics/root/root-5.26.00e-r1.ebuild           |  316 ------------------
 sci-physics/root/root-5.28.00d.ebuild              |  338 --------------------
 ...{root-5.32.00-r2.ebuild => root-5.32.01.ebuild} |    0
 11 files changed, 11 insertions(+), 931 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 8b69c5c..dd9250e 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,8 +2,18 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.92 2012/01/21 19:23:26 bicatali Exp $
 
+*root-5.32.01 (01 Mar 2012)
+
+  01 Mar 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-5.26.00-make-3.82.patch, -root-5.26.00e-r1.ebuild,
+  -files/root-5.26.00e-libpng15.patch,
+  -files/root-5.28.00b-nobyte-compile.patch, -root-5.28.00d.ebuild,
+  -root-5.32.00-r2.ebuild, +root-5.32.01.ebuild, -files/olbd.confd,
+  -files/olbd.initd, -files/xrootd.confd, -files/xrootd.initd:
+  Version bump for patch release 5.32/01.
+
   27 Feb 2012; Andrew Savchenko <bircoph@gmail.com>
-  root-5.26.00e-r1.ebuild:
+  root-5.32.00-r1.ebuild:
   Fix build on non-english locales. find tool may become crazy on
   them, so force LANG=C LC_ALL=C for find only.
 

diff --git a/sci-physics/root/files/olbd.confd b/sci-physics/root/files/olbd.confd
deleted file mode 100644
index 848f4d7..0000000
--- a/sci-physics/root/files/olbd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# conf.d file for olbd daemon
-
-# User to run as (default is `xrootd')
-OLBD_USER="root"
-
-#
-# Please refer to the olbd(1) man(1) page for more
-# information on command line parameters. 
-OLBD_OPTS=""

diff --git a/sci-physics/root/files/olbd.initd b/sci-physics/root/files/olbd.initd
deleted file mode 100644
index 1793300..0000000
--- a/sci-physics/root/files/olbd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/olbd.initd,v 1.1 2008/12/18 18:10:18 bicatali Exp $
-
-depend() {
-    need net
-    use dns logger
-    provide root-file-server
-}
-
-start() {
-    ebegin "Starting ROOT open load balancer server"
-    start-stop-daemon --start --quiet --user=${OLBD_USER} \
-	--make-pidfile --pidfile=/var/run/olbd.pid \
-	--exec /usr/bin/olbd --background -- ${OLBD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ROOT open load balancer server"
-    start-stop-daemon --stop --quiet \
-	--pidfile=/var/run/olbd.pid \
-	--exec /usr/bin/olbd
-    eend $?
-}

diff --git a/sci-physics/root/files/root-5.26.00-make-3.82.patch b/sci-physics/root/files/root-5.26.00-make-3.82.patch
deleted file mode 100644
index dc6d8a0..0000000
--- a/sci-physics/root/files/root-5.26.00-make-3.82.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://root.cern.ch/viewcvs?view=rev&revision=35096
-https://savannah.cern.ch/bugs/?func=detailitem&item_id=72166
-
---- root-5.26.00d/Makefile
-+++ root-5.26.00d/Makefile
-@@ -544,6 +544,30 @@
- .PRECIOUS: include/%.h
- 
- # special rules (need to be defined before generic ones)
-+cint/cint/lib/dll_stl/G__%.o: cint/cint/lib/dll_stl/G__%.cxx
-+	$(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \
-+	   $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \
-+	   -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $<
-+	$(CXX) $(NOOPT) $(CXXFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc  $(CXXOUT)$@ -c $<
-+
-+cint/cint/lib/dll_stl/G__c_%.o: cint/cint/lib/dll_stl/G__c_%.c
-+	$(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \
-+	   $(CFLAGS) $(DICTFLAGS) -I$(CINTDIR)/lib/prec_stl \
-+	   -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $<
-+	$(CC) $(NOOPT) $(CFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc  $(CXXOUT)$@ -c $<
-+
-+cint/cint/lib/G__%.o: cint/cint/lib/G__%.cxx
-+	$(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \
-+	   $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \
-+	   -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $<
-+	$(CXX) $(NOOPT) $(CXXFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc  $(CXXOUT)$@ -c $<
-+
-+cint/cint/lib/G__c_%.o: cint/cint/lib/G__c_%.c
-+	$(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \
-+	   $(CFLAGS) $(DICTFLAGS) -I$(CINTDIR)/lib/prec_stl \
-+	   -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $<
-+	$(CC) $(NOOPT) $(CFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc  $(CXXOUT)$@ -c $<
-+
- G__%.o: G__%.cxx
- 	$(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \
- 	   $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \

diff --git a/sci-physics/root/files/root-5.26.00e-libpng15.patch b/sci-physics/root/files/root-5.26.00e-libpng15.patch
deleted file mode 100644
index 91ed9c4..0000000
--- a/sci-physics/root/files/root-5.26.00e-libpng15.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-This patch is a copy from media-libs/libafterimage.
-
---- graf2d/asimage/src/libAfterImage/export.c
-+++ graf2d/asimage/src/libAfterImage/export.c
-@@ -496,7 +496,7 @@
- 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
-     if ( png_ptr != NULL )
-     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
--			if( setjmp(png_ptr->jmpbuf) )
-+			if( setjmp(png_jmpbuf(png_ptr)) )
- 			{
- 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
- 				info_ptr = NULL ;
---- graf2d/asimage/src/libAfterImage/import.c
-+++ graf2d/asimage/src/libAfterImage/import.c
-@@ -1251,7 +1251,7 @@
- 			 * the normal method of doing things with libpng).  REQUIRED unless you
- 			 * set up your own error handlers in the png_create_read_struct() earlier.
- 			 */
--			if ( !setjmp (png_ptr->jmpbuf))
-+			if ( !setjmp (png_jmpbuf(png_ptr)))
- 			{
- 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
- 
-@@ -1468,7 +1468,7 @@
- 
- static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
- {
--   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
-+   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
-    memcpy(data, buf->buffer, length);
-    buf->buffer += length;
- }

diff --git a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
deleted file mode 100644
index 7029bf1..0000000
--- a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur root.orig/Makefile root/Makefile
---- root.orig/Makefile	2010-12-17 22:48:40.577775091 +0300
-+++ root/Makefile	2010-12-17 22:49:27.902497903 +0300
-@@ -1148,10 +1148,7 @@
- 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
- 	   fi; \
--	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
--	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
--	   fi; \
--	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      dir=$(RFLX_GRFLXDD:lib/=); \
- 	      while test "x$${dir}" != "x" && \
- 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-diff -Naur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.orig/bindings/pyroot/Module.mk	2010-12-17 22:48:39.941179413 +0300
-+++ root/bindings/pyroot/Module.mk	2010-12-17 22:49:27.899164943 +0300
-@@ -48,8 +48,6 @@
- ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
- $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
- endif
--ROOTPYC      := $(ROOTPY:.py=.pyc)
--ROOTPYO      := $(ROOTPY:.py=.pyo)
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- 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)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff -Naur root.orig/build/package/debian/rules root/build/package/debian/rules
---- root.orig/build/package/debian/rules	2010-12-17 22:48:40.197817461 +0300
-+++ root/build/package/debian/rules	2010-12-17 22:49:27.902497903 +0300
-@@ -623,10 +623,6 @@
- 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
- 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			
- #		$(foreach i, \
- #		   $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
- #		    -X$(i:$(DTMP)/%=%) )
-diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.orig/cint/cintex/Module.mk	2010-12-17 22:48:40.057833071 +0300
-+++ root/cint/cintex/Module.mk	2010-12-17 22:49:27.902497903 +0300
-@@ -31,10 +31,6 @@
- CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC    := $(CINTEXPY:.py=.pyc)
--CINTEXPYO    := $(CINTEXPY:.py=.pyo)
--endif
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- 		fi)
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.orig/cint/reflex/Module.mk	2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/Module.mk	2010-12-17 22:51:36.871451359 +0300
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
- 
- RFLX_LIBDIR = $(LIBDIR)
- 
-@@ -92,7 +89,7 @@
- 
- ALLEXECS += $(RFLX_GENMAPX)
- 
--POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN  += $(RFLX_GRFLXPY)
- 
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- 		  mkdir -p lib/python/genreflex; fi )
- 		cp $< $@
- 
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
--		@python -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
- 
-@@ -149,7 +144,7 @@
- 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
- 
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
- 
- clean-genreflex:
- 		@rm -rf lib/python/genreflex
-diff -Naur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.orig/cint/reflex/python/CMakeLists.txt	2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/python/CMakeLists.txt	2010-12-17 22:49:27.902497903 +0300
-@@ -15,7 +15,7 @@
- #####################   sources   ####################
- 
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
- 
- #####################  gccxmlpath ####################
- 
-

diff --git a/sci-physics/root/files/xrootd.confd b/sci-physics/root/files/xrootd.confd
deleted file mode 100644
index e725cd1..0000000
--- a/sci-physics/root/files/xrootd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# conf.d file for xroot daemon
-
-# User to run as (default is `root')
-XROOTD_USER="root"
-
-# Please refer to the xrootd(1) man(1) page for more
-# information on command line parameters. 
-XROOTD_OPTS=""

diff --git a/sci-physics/root/files/xrootd.initd b/sci-physics/root/files/xrootd.initd
deleted file mode 100644
index 28dd8a5..0000000
--- a/sci-physics/root/files/xrootd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/xrootd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
-
-depend() {
-    need net
-    use logger dns
-    provide root-file-server
-}
-
-start() {
-    ebegin "Starting extended ROOTD file server"
-    start-stop-daemon --start --quiet --user ${XROOTD_USER} \
-	--make-pidfile --pidfile /var/run/xrootd.pid \
-	--exec /usr/bin/xrootd --background -- ${XROOTD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping extended ROOTD file server"
-    start-stop-daemon --stop --quiet \
-	--pidfile /var/run/xrootd.pid \
-	--exec /usr/bin/xrootd
-    eend $?
-}

diff --git a/sci-physics/root/root-5.26.00e-r1.ebuild b/sci-physics/root/root-5.26.00e-r1.ebuild
deleted file mode 100644
index 777617b..0000000
--- a/sci-physics/root/root-5.26.00e-r1.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00e-r1.ebuild,v 1.12 2011/11/13 11:21:12 jlec Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2"
-
-inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs
-
-DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="
-	ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-	mirror://gentoo/${P}-patches.tar.bz2
-	doc? (
-		ftp://root.cern.ch/root/doc/Users_Guide_${DOC_PV}.pdf
-		ftp://root.cern.ch/root/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
-IUSE="afs clarens doc emacs examples fftw geant4 graphviz kerberos ldap
-	+math mysql	odbc +opengl openmp oracle postgres pythia6 pythia8 python
-	+reflex	ruby qt4 ssl xft xml xinetd xrootd"
-
-# libafterimage ignored, to check every version
-# see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944
-#	|| ( >=media-libs/libafterimage-1.18 x11-wm/afterstep )
-CDEPEND="
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	>=media-libs/ftgl-2.1.3_rc5
-	media-libs/giflib
-	media-libs/glew
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-apps/shadow
-	virtual/jpeg
-	x11-libs/libXft
-	x11-libs/libXpm
-	afs? ( >=net-fs/openafs-1.4.7 )
-	clarens? ( dev-libs/xmlrpc-c )
-	emacs? ( virtual/emacs )
-	fftw? ( sci-libs/fftw:3.0 )
-	geant4? ( sci-physics/geant:4 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	math? ( sci-libs/gsl )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	opengl? ( virtual/opengl virtual/glu )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	qt4? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-opengl:4
-		x11-libs/qt-qt3support:4
-		x11-libs/qt-xmlpatterns:4 )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2:2 )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="
-	virtual/fortran
-	${CDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	echo
-	elog "You may want to build ROOT with these non Gentoo extra packages:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use openmp && \
-		[[ $(tc-getCC)$ == *gcc* ]] && \
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || \
-			! has_version sys-devel/gcc[openmp] ); then
-		ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
-		ewarn "If you want to build this package with OpenMP, abort now,"
-		ewarn "and set CC to an OpenMP capable compiler"
-	elif use openmp; then
-		export USE_OPENMP=1
-		use math && export USE_PARALLEL_MINUIT2=1
-	fi
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${P}-make-3.82.patch \
-		"${WORKDIR}"/${P}-prop-ldflags.patch \
-		"${WORKDIR}"/${P}-configure-paths.patch \
-		"${WORKDIR}"/${P}-nobyte-compile.patch \
-		"${WORKDIR}"/${P}-glibc212.patch \
-		"${WORKDIR}"/${P}-xrootd-prop-flags.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-
-	# use system cfortran
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
-
-	# take a more descriptive name for ruby libs
-	sed -i \
-		-e 's/libRuby/libRubyROOT/g' \
-		bindings/ruby/Module.mk bindings/ruby/src/drr.cxx \
-		|| die "ajusting ruby libname failed"
-
-	# in gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif
-	sed -i \
-		-e 's/libPythia6/libpythia6/g' \
-		-e 's/ungif/gif/g' \
-		configure || die "adjusting library names failed"
-
-	# libafterimage flags are hardcoded
-	sed -i \
-		-e 's/CFLAGS="-O3"//' \
-		-e 's/CFLAGS=$$ACFLAGS//' \
-		graf2d/asimage/Module.mk graf2d/asimage/src/libAfterImage/configure \
-		|| die "flag propagation in libafterimage failed"
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-}
-
-src_configure() {
-	# the configure script is not the standard autotools
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-rpath \
-		--enable-asimage \
-		--enable-astiff \
-		--enable-exceptions	\
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		--with-afs-shared=yes \
-		$(use_enable afs) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable fftw fftw3) \
-		$(use_enable geant4 g4root) \
-		$(use_enable graphviz gviz) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable postgres pgsql) \
-		$(use_enable pythia6) \
-		$(use_enable pythia8) \
-		$(use_enable python) \
-		$(use_enable qt4 qt) \
-		$(use_enable qt4 qtgsi) \
-		$(use_enable reflex cintex) \
-		$(use_enable reflex) \
-		$(use_enable ruby) \
-		$(use_enable ssl) \
-		$(use_enable xft) \
-		$(use_enable xml) \
-		$(use_enable xrootd) \
-		${EXTRA_ECONF} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed"
-	if use emacs; then
-		elisp-compile build/misc/*.el || die "elisp-compile failed"
-	fi
-}
-
-doc_install() {
-	cd "${S}"
-	if use doc; then
-		einfo "Installing user's guides"
-		insinto /usr/share/doc/${PF}
-		doins \
-			"${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf \
-			|| die "pdf install failed"
-		if use math; then
-			doins "${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-				|| die "math doc install failed"
-		fi
-	fi
-
-	if use examples; then
-		# these should really be taken care of by the root make install
-		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
-		doins -r tmva/test || die
-	else
-		rm -rf "${D}"/usr/share/doc/${PF}/examples
-	fi
-}
-
-daemon_install() {
-	cd "${S}"
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	use xrootd && daemons="${daemons} xrootd olbd"
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins etc/daemons/{rootd,proofd}.xinetd || die
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	sed -e 's,@prefix@,/usr,' \
-		build/package/debian/root-system-bin.desktop.in > root.desktop
-	domenu root.desktop
-	doicon "${S}"/build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root || die "doenvd failed"
-
-	# The build system installs Emacs support unconditionally and in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -rf "${D}"/usr/share/emacs
-	if use emacs; then
-		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
-	fi
-
-	doc_install
-	daemon_install
-	desktop_install
-
-	# Cleanup of files either already distributed or unused on Gentoo
-	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-	rm "${ED}"usr/share/root/fonts/LICENSE
-	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm -f posix/mktypes dll_stl/setup \
-		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o
-	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-	rm -f "${ED}"/etc/root/proof/*.sample
-	rm -rf "${ED}"/etc/root/daemons
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	use ruby && elog "ROOT Ruby module is available as libRubyROOT"
-	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
-}

diff --git a/sci-physics/root/root-5.28.00d.ebuild b/sci-physics/root/root-5.28.00d.ebuild
deleted file mode 100644
index f685450..0000000
--- a/sci-physics/root/root-5.28.00d.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.4 2011/11/13 11:21:12 jlec Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2"
-
-inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
-
-#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-DOC_PV=5_26
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="
-	ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-	http://dev.gentoo.org/~bicatali/${PN}-${PATCH_PV}-xrootd-prop-flags.patch.bz2
-	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
-	math? (
-		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres pythia6
-	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
-
-CDEPEND="
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-libs/ftgl
-	media-libs/giflib
-	media-libs/glew
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-apps/shadow
-	virtual/jpeg
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	llvm? ( sys-devel/llvm )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	qt4? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-opengl:4
-		x11-libs/qt-qt3support:4
-		x11-libs/qt-svg:4
-		x11-libs/qt-webkit:4
-		x11-libs/qt-xmlpatterns:4 )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2:2 )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="
-	virtual/fortran
-${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-			ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
-			ewarn "If you want to build this package with OpenMP, abort now,"
-			ewarn "and set CC to an OpenMP capable compiler"
-		elif use openmp; then
-			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${PN}-${PATCH_PV}-xrootd-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
-	rm -rf graf2d/asimage/src/libAfterImage
-	rm -rf graf3d/ftgl/{inc,src}
-	rm -rf graf2d/freetype/src
-	rm -rf graf3d/glew/{inc,src}
-	rm -rf core/pcre/src
-	rm -rf math/unuran/src/unuran-*.tar.gz
-	find core/zip -type f -name "[a-z]*" | xargs rm
-	rm graf3d/gl/{inc,src}/gl2ps.*
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
-
-	# TODO: unbundle xrootd as a new package
-	#rm -rf net/xrootd/src
-	#sed -i \
-	#	-e 's:-lXrdOuc:-lXrd &:' \
-	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
-	#	proof/proofd/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINC:$ODBCINC /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-}
-
-src_configure() {
-	# the configure script is not the standard autotools
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-rpath \
-		--enable-asimage \
-		--enable-astiff \
-		--enable-exceptions	\
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		--with-afs-shared=yes \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable ncurses editline) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable llvm cling) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable postgres pgsql) \
-		$(use_enable pythia6) \
-		$(use_enable pythia8) \
-		$(use_enable python) \
-		$(use_enable qt4 qt) \
-		$(use_enable qt4 qtgsi) \
-		$(use_enable reflex cintex) \
-		$(use_enable reflex) \
-		$(use_enable ruby) \
-		$(use_enable ssl) \
-		$(use_enable xft) \
-		$(use_enable xml) \
-		$(use_enable xrootd) \
-		${EXTRA_ECONF} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed"
-	if use emacs; then
-		elisp-compile build/misc/*.el || die "elisp-compile failed"
-	fi
-}
-
-doc_install() {
-	cd "${S}"
-	if use doc; then
-		einfo "Installing user's guides"
-		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	fi
-
-	if use examples; then
-		# these should really be taken care of by the root make install
-		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
-		doins -r tmva/test
-	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-	fi
-}
-
-daemon_install() {
-	cd "${S}"
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	use xrootd && daemons="${daemons} xrootd olbd"
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	sed -e 's,@prefix@,/usr,' \
-		build/package/debian/root-system-bin.desktop.in > root.desktop
-	domenu root.desktop
-	doicon "${S}"/build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root || die "doenvd failed"
-
-	# The build system installs Emacs support unconditionally and in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -rf "${ED}"/usr/share/emacs
-	if use emacs; then
-		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
-	fi
-
-	doc_install
-	daemon_install
-	desktop_install
-
-	# Cleanup of files either already distributed or unused on Gentoo
-	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-	rm "${ED}"usr/share/root/fonts/LICENSE
-	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm -f posix/mktypes dll_stl/setup \
-		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o
-	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-	rm -f "${ED}"/etc/root/proof/*.sample
-	rm -rf "${ED}"/etc/root/daemons
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
-}

diff --git a/sci-physics/root/root-5.32.00-r2.ebuild b/sci-physics/root/root-5.32.01.ebuild
similarity index 100%
rename from sci-physics/root/root-5.32.00-r2.ebuild
rename to sci-physics/root/root-5.32.01.ebuild



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-03-09  1:11 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-03-09  1:11 UTC (permalink / raw
  To: gentoo-commits

commit:     16ab2a5dc87362afee72c6a74b4cfb0f96b51190
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Mar  9 01:09:14 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Mar  9 01:09:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=16ab2a5d

sci-physics/root: version bump and bugfix

Version bump for 5.26 and 5.28 branches.
Hopefully fix bug 386905 for all branches.

---
 sci-physics/root/ChangeLog                         |   32 +++-
 sci-physics/root/files/olbd.confd                  |    9 +
 sci-physics/root/files/olbd.initd                  |   26 +++
 .../root/files/root-5.26.00e-libpng15.patch        |   33 +++
 .../files/root-5.26.00g-explicit-functions.patch   |   12 +
 .../root/files/root-5.28.00b-nobyte-compile.patch  |  138 +++++++++++++
 .../files/root-5.28.00h-explicit-functions.patch   |   12 +
 .../files/root-5.32.00-explicit-functions.patch    |   18 ++
 sci-physics/root/files/xrootd.confd                |    8 +
 sci-physics/root/files/xrootd.initd                |   26 +++
 sci-physics/root/metadata.xml                      |    3 +-
 .../{root-5.32.01.ebuild => root-5.26.00g.ebuild}  |  212 +++++++++-----------
 .../{root-5.32.01.ebuild => root-5.28.00h.ebuild}  |   93 ++++-----
 sci-physics/root/root-5.32.01.ebuild               |    7 +-
 14 files changed, 452 insertions(+), 177 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 3f23c0b..a78dfa4 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,18 +1,34 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.92 2012/01/21 19:23:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.93 2012/03/02 05:34:01 bicatali Exp $
+
+*root-5.28.00h (09 Mar 2012)
+*root-5.26.00g (09 Mar 2012)
+
+  09 Mar 2012; Andrew Savchenko <bircoph@gmail.com>
+  +files/root-5.26.00e-libpng15.patch, +root-5.26.00g.ebuild,
+  +files/root-5.26.00g-explicit-functions.patch,
+  +files/root-5.28.00b-nobyte-compile.patch, +root-5.28.00h.ebuild,
+  +files/root-5.28.00h-explicit-functions.patch,
+  +files/root-5.32.00-explicit-functions.patch, root-5.32.01.ebuild,
+  +files/olbd.confd, +files/olbd.initd, +files/xrootd.confd,
+  +files/xrootd.initd, metadata.xml:
+  Version bump for 5.26 and 5.28 branches to the latest patchlevels.
+  Fix bug 386905 for all branches by applying upstream fix. Thanks
+  gcc and ROOT developers for their hard work.
+  Fix pq2 files installation.
+
+*root-5.32.01 (02 Mar 2012)
+
+  02 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> +root-5.32.01.ebuild,
+  metadata.xml:
+  Imported bump from the sci overlay
 
   01 Mar 2012; Andrew Savchenko <bircoph@gmail.com> metadata.xml:
   Fix repoman warning.
 
-*root-5.32.01 (01 Mar 2012)
-
   01 Mar 2012; Andrew Savchenko <bircoph@gmail.com>
-  -files/root-5.26.00-make-3.82.patch, -root-5.26.00e-r1.ebuild,
-  -files/root-5.26.00e-libpng15.patch,
-  -files/root-5.28.00b-nobyte-compile.patch, -root-5.28.00d.ebuild,
-  -root-5.32.00-r2.ebuild, +root-5.32.01.ebuild, -files/olbd.confd,
-  -files/olbd.initd, -files/xrootd.confd, -files/xrootd.initd:
+  +root-5.32.01.ebuild
   Version bump for patch release 5.32/01.
 
   27 Feb 2012; Andrew Savchenko <bircoph@gmail.com>

diff --git a/sci-physics/root/files/olbd.confd b/sci-physics/root/files/olbd.confd
new file mode 100644
index 0000000..848f4d7
--- /dev/null
+++ b/sci-physics/root/files/olbd.confd
@@ -0,0 +1,9 @@
+# conf.d file for olbd daemon
+
+# User to run as (default is `xrootd')
+OLBD_USER="root"
+
+#
+# Please refer to the olbd(1) man(1) page for more
+# information on command line parameters. 
+OLBD_OPTS=""

diff --git a/sci-physics/root/files/olbd.initd b/sci-physics/root/files/olbd.initd
new file mode 100644
index 0000000..1793300
--- /dev/null
+++ b/sci-physics/root/files/olbd.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/olbd.initd,v 1.1 2008/12/18 18:10:18 bicatali Exp $
+
+depend() {
+    need net
+    use dns logger
+    provide root-file-server
+}
+
+start() {
+    ebegin "Starting ROOT open load balancer server"
+    start-stop-daemon --start --quiet --user=${OLBD_USER} \
+	--make-pidfile --pidfile=/var/run/olbd.pid \
+	--exec /usr/bin/olbd --background -- ${OLBD_OPTS}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ROOT open load balancer server"
+    start-stop-daemon --stop --quiet \
+	--pidfile=/var/run/olbd.pid \
+	--exec /usr/bin/olbd
+    eend $?
+}

diff --git a/sci-physics/root/files/root-5.26.00e-libpng15.patch b/sci-physics/root/files/root-5.26.00e-libpng15.patch
new file mode 100644
index 0000000..91ed9c4
--- /dev/null
+++ b/sci-physics/root/files/root-5.26.00e-libpng15.patch
@@ -0,0 +1,33 @@
+This patch is a copy from media-libs/libafterimage.
+
+--- graf2d/asimage/src/libAfterImage/export.c
++++ graf2d/asimage/src/libAfterImage/export.c
+@@ -496,7 +496,7 @@
+ 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
+     if ( png_ptr != NULL )
+     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
+-			if( setjmp(png_ptr->jmpbuf) )
++			if( setjmp(png_jmpbuf(png_ptr)) )
+ 			{
+ 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
+ 				info_ptr = NULL ;
+--- graf2d/asimage/src/libAfterImage/import.c
++++ graf2d/asimage/src/libAfterImage/import.c
+@@ -1251,7 +1251,7 @@
+ 			 * the normal method of doing things with libpng).  REQUIRED unless you
+ 			 * set up your own error handlers in the png_create_read_struct() earlier.
+ 			 */
+-			if ( !setjmp (png_ptr->jmpbuf))
++			if ( !setjmp (png_jmpbuf(png_ptr)))
+ 			{
+ 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
+ 
+@@ -1468,7 +1468,7 @@
+ 
+ static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+-   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
++   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
+    memcpy(data, buf->buffer, length);
+    buf->buffer += length;
+ }

diff --git a/sci-physics/root/files/root-5.26.00g-explicit-functions.patch b/sci-physics/root/files/root-5.26.00g-explicit-functions.patch
new file mode 100644
index 0000000..16a7206
--- /dev/null
+++ b/sci-physics/root/files/root-5.26.00g-explicit-functions.patch
@@ -0,0 +1,12 @@
+--- root/io/io/Module.mk.orig	2011-09-29 13:49:50.000000000 +0400
++++ root/io/io/Module.mk	2012-03-09 02:57:20.518370595 +0400
+@@ -66,9 +66,4 @@
+ distclean::     distclean-$(MODNAME)
+ 
+ ##### extra rules ######
+-#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
+-ifeq ($(GCC_VERS),gcc-4.4)
+-ifneq ($(filter -O%,$(OPT)),)
+    $(IODIRS)/TStreamerInfoReadBuffer.o: CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
+-endif
+-endif

diff --git a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
new file mode 100644
index 0000000..7029bf1
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
@@ -0,0 +1,138 @@
+diff -Naur root.orig/Makefile root/Makefile
+--- root.orig/Makefile	2010-12-17 22:48:40.577775091 +0300
++++ root/Makefile	2010-12-17 22:49:27.902497903 +0300
+@@ -1148,10 +1148,7 @@
+ 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
+ 	   fi; \
+-	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
+-	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
+-	   fi; \
+-	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
++	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      dir=$(RFLX_GRFLXDD:lib/=); \
+ 	      while test "x$${dir}" != "x" && \
+ 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
+diff -Naur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
+--- root.orig/bindings/pyroot/Module.mk	2010-12-17 22:48:39.941179413 +0300
++++ root/bindings/pyroot/Module.mk	2010-12-17 22:49:27.899164943 +0300
+@@ -48,8 +48,6 @@
+ ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
+ $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
+ endif
+-ROOTPYC      := $(ROOTPY:.py=.pyc)
+-ROOTPYO      := $(ROOTPY:.py=.pyo)
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
+@@ -68,10 +66,8 @@
+ 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)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
+@@ -113,7 +109,7 @@
+ 
+ distclean-$(MODNAME): clean-$(MODNAME)
+ 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
+-		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
++		   $(ROOTPY) $(PYROOTMAP) \
+ 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
+ 
+ distclean::     distclean-$(MODNAME)
+diff -Naur root.orig/build/package/debian/rules root/build/package/debian/rules
+--- root.orig/build/package/debian/rules	2010-12-17 22:48:40.197817461 +0300
++++ root/build/package/debian/rules	2010-12-17 22:49:27.902497903 +0300
+@@ -623,10 +623,6 @@
+ 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
+ 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			
+ #		$(foreach i, \
+ #		   $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
+ #		    -X$(i:$(DTMP)/%=%) )
+diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk
+--- root.orig/cint/cintex/Module.mk	2010-12-17 22:48:40.057833071 +0300
++++ root/cint/cintex/Module.mk	2010-12-17 22:49:27.902497903 +0300
+@@ -31,10 +31,6 @@
+ CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
+ $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
+ endif
+-ifneq ($(BUILDPYTHON),no)
+-CINTEXPYC    := $(CINTEXPY:.py=.pyc)
+-CINTEXPYO    := $(CINTEXPY:.py=.pyo)
+-endif
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
+@@ -86,8 +82,6 @@
+ 		fi)
+ 		cp $< $@
+ 
+-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
+-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
+                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
+diff -Naur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk
+--- root.orig/cint/reflex/Module.mk	2010-12-17 22:48:40.037835301 +0300
++++ root/cint/reflex/Module.mk	2010-12-17 22:51:36.871451359 +0300
+@@ -48,9 +48,6 @@
+ RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
+ RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
+ RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
+-ifneq ($(BUILDPYTHON),no)
+-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
+-endif
+ 
+ RFLX_LIBDIR = $(LIBDIR)
+ 
+@@ -92,7 +89,7 @@
+ 
+ ALLEXECS += $(RFLX_GENMAPX)
+ 
+-POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++POSTBIN  += $(RFLX_GRFLXPY)
+ 
+ ##### local rules #####
+ .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
+@@ -122,8 +119,6 @@
+ 		  mkdir -p lib/python/genreflex; fi )
+ 		cp $< $@
+ 
+-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
+-		@python -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
+ 
+@@ -149,7 +144,7 @@
+ 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
+ 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
+ 
+-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
+ 
+ clean-genreflex:
+ 		@rm -rf lib/python/genreflex
+diff -Naur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
+--- root.orig/cint/reflex/python/CMakeLists.txt	2010-12-17 22:48:40.037835301 +0300
++++ root/cint/reflex/python/CMakeLists.txt	2010-12-17 22:49:27.902497903 +0300
+@@ -15,7 +15,7 @@
+ #####################   sources   ####################
+ 
+ FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
+-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
++SET(GENREFLEX_SCRIPT PARENT_SCOPE)
+ 
+ #####################  gccxmlpath ####################
+ 
+

diff --git a/sci-physics/root/files/root-5.28.00h-explicit-functions.patch b/sci-physics/root/files/root-5.28.00h-explicit-functions.patch
new file mode 100644
index 0000000..918b696
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00h-explicit-functions.patch
@@ -0,0 +1,12 @@
+--- root/io/io/Module.mk.orig	2011-11-24 20:12:56.000000000 +0400
++++ root/io/io/Module.mk	2012-03-09 03:45:42.850549826 +0400
+@@ -67,9 +67,4 @@
+ distclean::     distclean-$(MODNAME)
+ 
+ ##### extra rules ######
+-#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
+-ifeq ($(GCC_VERS),gcc-4.4)
+-ifneq ($(filter -O%,$(OPT)),)
+    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
+-endif
+-endif

diff --git a/sci-physics/root/files/root-5.32.00-explicit-functions.patch b/sci-physics/root/files/root-5.32.00-explicit-functions.patch
new file mode 100644
index 0000000..570d61e
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-explicit-functions.patch
@@ -0,0 +1,18 @@
+--- root/io/io/Module.mk.orig	2012-02-29 19:46:38.000000000 +0400
++++ root/io/io/Module.mk	2012-03-09 02:29:19.905665572 +0400
+@@ -67,15 +67,5 @@
+ distclean::     distclean-$(MODNAME)
+ 
+ ##### extra rules ######
+-#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
+-ifeq ($(GCC_VERS),gcc-4.4)
+-ifneq ($(filter -O%,$(OPT)),)
+    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
+-endif
+-endif
+-ifeq ($(GCC_VERS),gcc-4.5)
+-ifneq ($(filter -O%,$(OPT)),)
+    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
+-endif
+-endif
+-

diff --git a/sci-physics/root/files/xrootd.confd b/sci-physics/root/files/xrootd.confd
new file mode 100644
index 0000000..e725cd1
--- /dev/null
+++ b/sci-physics/root/files/xrootd.confd
@@ -0,0 +1,8 @@
+# conf.d file for xroot daemon
+
+# User to run as (default is `root')
+XROOTD_USER="root"
+
+# Please refer to the xrootd(1) man(1) page for more
+# information on command line parameters. 
+XROOTD_OPTS=""

diff --git a/sci-physics/root/files/xrootd.initd b/sci-physics/root/files/xrootd.initd
new file mode 100644
index 0000000..28dd8a5
--- /dev/null
+++ b/sci-physics/root/files/xrootd.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/xrootd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
+
+depend() {
+    need net
+    use logger dns
+    provide root-file-server
+}
+
+start() {
+    ebegin "Starting extended ROOTD file server"
+    start-stop-daemon --start --quiet --user ${XROOTD_USER} \
+	--make-pidfile --pidfile /var/run/xrootd.pid \
+	--exec /usr/bin/xrootd --background -- ${XROOTD_OPTS}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping extended ROOTD file server"
+    start-stop-daemon --stop --quiet \
+	--pidfile /var/run/xrootd.pid \
+	--exec /usr/bin/xrootd
+    eend $?
+}

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index b15afdd..c1f9fd7 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -18,7 +18,8 @@
 <use>
   <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
   <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-  <flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
+  <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag>
+  <flag name="llvm">Build the new experimental cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
   <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
   <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
   <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>

diff --git a/sci-physics/root/root-5.32.01.ebuild b/sci-physics/root/root-5.26.00g.ebuild
similarity index 58%
copy from sci-physics/root/root-5.32.01.ebuild
copy to sci-physics/root/root-5.26.00g.ebuild
index 093c935..1674a15 100644
--- a/sci-physics/root/root-5.32.01.ebuild
+++ b/sci-physics/root/root-5.26.00g.ebuild
@@ -1,85 +1,76 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.00-r2.ebuild,v 1.1 2012/01/21 19:19:46 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00e-r1.ebuild,v 1.12 2011/11/13 11:21:12 jlec Exp $
+
+EAPI=3
 
-EAPI=4
 PYTHON_DEPEND="python? 2"
-inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
 
-#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-DOC_PV=5_26
+inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs
+
+DOC_PV=$(get_major_version)_$(get_version_component_range 2)
 ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.32.00
+TMVA_DOC_PV=4
+PATCH_PV="5.26.00e"
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
-	math? (
-		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
+SRC_URI="
+	ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+	mirror://gentoo/${PN}-${PATCH_PV}-patches.tar.bz2
+	doc? (
+		ftp://root.cern.ch/root/doc/Users_Guide_${DOC_PV}.pdf
+		ftp://root.cern.ch/root/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
-	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
-
+KEYWORDS="~amd64 ~x86"
+IUSE="afs clarens doc emacs examples fftw geant4 graphviz kerberos ldap
+	+math mysql	odbc +opengl openmp oracle postgres pythia6 pythia8 python
+	+reflex	ruby qt4 ssl xft xml xinetd xrootd"
+
+# libafterimage ignored, to check every version
+# see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944
+#	|| ( >=media-libs/libafterimage-1.18 x11-wm/afterstep )
 CDEPEND="
-	app-arch/xz-utils
 	>=dev-lang/cfortran-4.4-r2
 	dev-libs/libpcre
-	media-libs/freetype
+	>=media-libs/ftgl-2.1.3_rc5
 	media-libs/giflib
+	media-libs/glew
 	media-libs/libpng:0
 	media-libs/tiff:0
 	sys-apps/shadow
-	sys-libs/zlib
 	virtual/jpeg
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		qt4? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-opengl:4
-			x11-libs/qt-qt3support:4
-			x11-libs/qt-svg:4
-			x11-libs/qt-webkit:4
-			x11-libs/qt-xmlpatterns:4 )
-		xft? ( x11-libs/libXft )
-		)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c[curl] )
+	x11-libs/libXft
+	x11-libs/libXpm
+	afs? ( >=net-fs/openafs-1.4.7 )
+	clarens? ( dev-libs/xmlrpc-c )
 	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
 	fftw? ( sci-libs/fftw:3.0 )
+	geant4? ( sci-physics/geant:4 )
 	graphviz? ( media-gfx/graphviz )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	llvm? ( sys-devel/llvm )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	math? ( sci-libs/gsl )
 	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	opengl? ( virtual/opengl virtual/glu )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	postgres? ( dev-db/postgresql-base )
 	pythia6? ( sci-physics/pythia:6 )
 	pythia8? ( sci-physics/pythia:8 )
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-opengl:4
+		x11-libs/qt-qt3support:4
+		x11-libs/qt-xmlpatterns:4 )
 	ruby? (
 			dev-lang/ruby
 			dev-ruby/rubygems )
 	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	xrootd? ( net-libs/xrootd )"
+	xml? ( dev-libs/libxml2:2 )"
 
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig"
@@ -87,20 +78,16 @@ DEPEND="${CDEPEND}
 RDEPEND="
 	virtual/fortran
 	${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
 	xinetd? ( sys-apps/xinetd )"
 
-REQUIRED_USE="!X? ( !opengl !qt4 !xft )"
-
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	fortran-2_pkg_setup
-	python_pkg_setup
 	echo
-	elog "There are extra options on packages not yet in Gentoo:"
+	elog "You may want to build ROOT with these non Gentoo extra packages:"
 	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+	elog "Monalisa, MaxDB/SapDB, SRP."
 	elog "You can use the env variable EXTRA_ECONF variable for this."
 	elog "For example, for SRP, you would set: "
 	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
@@ -108,58 +95,53 @@ pkg_setup() {
 	enewgroup rootd
 	enewuser rootd -1 -1 /var/spool/rootd rootd
 
-	if use math; then
-		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-			ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
-			ewarn "If you want to build this package with OpenMP, abort now,"
-			ewarn "and set CC to an OpenMP capable compiler"
-		elif use openmp; then
-			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
+	if use openmp && \
+		[[ $(tc-getCC)$ == *gcc* ]] && \
+		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || \
+			! has_version sys-devel/gcc[openmp] ); then
+		ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
+		ewarn "If you want to build this package with OpenMP, abort now,"
+		ewarn "and set CC to an OpenMP capable compiler"
+	elif use openmp; then
+		export USE_OPENMP=1
+		use math && export USE_PARALLEL_MINUIT2=1
 	fi
+	use python && python_set_active_version 2
 }
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch
-
-	# make sure we use system libs and headers
+		"${WORKDIR}"/${PN}-${PATCH_PV}-make-3.82.patch \
+		"${WORKDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${WORKDIR}"/${PN}-${PATCH_PV}-configure-paths.patch \
+		"${WORKDIR}"/${PN}-${PATCH_PV}-nobyte-compile.patch \
+		"${WORKDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${WORKDIR}"/${PN}-${PATCH_PV}-xrootd-prop-flags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-libpng15.patch \
+		"${FILESDIR}"/${P}-explicit-functions.patch
+
+	# use system cfortran
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
-	rm -rf graf2d/asimage/src/libAfterImage
-	rm -rf graf3d/ftgl/{inc,src}
-	rm -rf graf2d/freetype/src
-	rm -rf graf3d/glew/{inc,src}
-	rm -rf core/pcre/src
-	rm -rf math/unuran/src/unuran-*.tar.gz
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" | xargs rm
-	rm -rf core/lzma/src/*.tar.gz
-	rm graf3d/gl/{inc,src}/gl2ps.*
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
+
+	# take a more descriptive name for ruby libs
 	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
+		-e 's/libRuby/libRubyROOT/g' \
+		bindings/ruby/Module.mk bindings/ruby/src/drr.cxx \
+		|| die "ajusting ruby libname failed"
 
-	# prefixify the configure script
+	# in gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif
 	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
+		-e 's/libPythia6/libpythia6/g' \
+		-e 's/ungif/gif/g' \
+		configure || die "adjusting library names failed"
 
+	# libafterimage flags are hardcoded
+	sed -i \
+		-e 's/CFLAGS="-O3"//' \
+		-e 's/CFLAGS=$$ACFLAGS//' \
+		graf2d/asimage/Module.mk graf2d/asimage/src/libAfterImage/configure \
+		|| die "flag propagation in libafterimage failed"
 	# QTDIR only used for qt3 in gentoo, and configure looks for it.
 	unset QTDIR
 }
@@ -168,7 +150,6 @@ src_configure() {
 	# the configure script is not the standard autotools
 	./configure \
 		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
 		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
@@ -177,13 +158,13 @@ src_configure() {
 		--with-cxx=$(tc-getCXX) \
 		--with-f77=$(tc-getFC) \
 		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
 		--disable-builtin-freetype \
 		--disable-builtin-ftgl \
 		--disable-builtin-glew \
 		--disable-builtin-pcre \
 		--disable-builtin-zlib \
-		--disable-builtin-lzma \
+		--disable-rpath \
+		--enable-asimage \
 		--enable-astiff \
 		--enable-exceptions	\
 		--enable-explicitlink \
@@ -195,31 +176,24 @@ src_configure() {
 		--enable-table \
 		--fail-on-missing \
 		--with-afs-shared=yes \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
 		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
 		$(use_enable clarens) \
 		$(use_enable clarens peac) \
-		$(use_enable ncurses editline) \
-		$(use_enable fits fitsio) \
 		$(use_enable fftw fftw3) \
+		$(use_enable geant4 g4root) \
 		$(use_enable graphviz gviz) \
 		$(use_enable kerberos krb5) \
 		$(use_enable ldap) \
-		$(use_enable llvm cling) \
 		$(use_enable math gsl-shared) \
 		$(use_enable math genvector) \
 		$(use_enable math mathmore) \
 		$(use_enable math minuit2) \
 		$(use_enable math roofit) \
-		$(use_enable math tmva) \
 		$(use_enable math unuran) \
 		$(use_enable mysql) \
 		$(use_enable odbc) \
 		$(use_enable opengl) \
 		$(use_enable postgres pgsql) \
-		$(use_enable prefix rpath) \
 		$(use_enable pythia6) \
 		$(use_enable pythia8) \
 		$(use_enable python) \
@@ -247,18 +221,23 @@ doc_install() {
 	cd "${S}"
 	if use doc; then
 		einfo "Installing user's guides"
-		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+		insinto /usr/share/doc/${PF}
+		doins \
+			"${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf \
+			|| die "pdf install failed"
+		if use math; then
+			doins "${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+				|| die "math doc install failed"
+		fi
 	fi
 
 	if use examples; then
 		# these should really be taken care of by the root make install
 		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
-		doins -r tmva/test
+		doins -r tmva/test || die
 	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${D}"/usr/share/doc/${PF}/examples
 	fi
 }
 
@@ -270,13 +249,14 @@ daemon_install() {
 	dodir /var/spool/rootd/{pub,tmp}
 	fperms 1777 /var/spool/rootd/{pub,tmp}
 
+	use xrootd && daemons="${daemons} xrootd olbd"
 	for i in ${daemons}; do
 		newinitd "${FILESDIR}"/${i}.initd ${i}
 		newconfd "${FILESDIR}"/${i}.confd ${i}
 	done
 	if use xinetd; then
 		insinto /etc/xinetd
-		doins etc/daemons/{rootd,proofd}.xinetd
+		doins etc/daemons/{rootd,proofd}.xinetd || die
 	fi
 }
 
@@ -305,7 +285,7 @@ src_install() {
 
 	# The build system installs Emacs support unconditionally and in the wrong
 	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -rf "${ED}"/usr/share/emacs
+	rm -rf "${D}"/usr/share/emacs
 	if use emacs; then
 		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
 	fi
@@ -324,12 +304,10 @@ src_install() {
 	rm -f "${ED}"/etc/root/proof/*.sample
 	rm -rf "${ED}"/etc/root/daemons
 	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin
 }
 
 pkg_postinst() {
+	use ruby && elog "ROOT Ruby module is available as libRubyROOT"
 	fdo-mime_desktop_database_update
 	use python && python_mod_optimize /usr/$(get_libdir)/root
 }

diff --git a/sci-physics/root/root-5.32.01.ebuild b/sci-physics/root/root-5.28.00h.ebuild
similarity index 84%
copy from sci-physics/root/root-5.32.01.ebuild
copy to sci-physics/root/root-5.28.00h.ebuild
index 093c935..75fb7dd 100644
--- a/sci-physics/root/root-5.32.01.ebuild
+++ b/sci-physics/root/root-5.28.00h.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.00-r2.ebuild,v 1.1 2012/01/21 19:19:46 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.4 2011/11/13 11:21:12 jlec Exp $
+
+EAPI=3
 
-EAPI=4
 PYTHON_DEPEND="python? 2"
+
 inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
 
 #DOC_PV=$(get_major_version)_$(get_version_component_range 2)
@@ -11,11 +13,12 @@ DOC_PV=5_26
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
 PATCH_PV=5.28.00b
-PATCH_PV2=5.32.00
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+SRC_URI="
+	ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+	http://dev.gentoo.org/~bicatali/${PN}-${PATCH_PV}-xrootd-prop-flags.patch.bz2
 	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
 	math? (
 		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
@@ -23,80 +26,70 @@ SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
-	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
+KEYWORDS="~amd64 ~x86"
+IUSE="afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
+	+math mpi mysql ncurses odbc +opengl openmp oracle postgres pythia6
+	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
 
 CDEPEND="
-	app-arch/xz-utils
 	>=dev-lang/cfortran-4.4-r2
 	dev-libs/libpcre
-	media-libs/freetype
+	media-libs/ftgl
 	media-libs/giflib
+	media-libs/glew
 	media-libs/libpng:0
 	media-libs/tiff:0
 	sys-apps/shadow
-	sys-libs/zlib
 	virtual/jpeg
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		qt4? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-opengl:4
-			x11-libs/qt-qt3support:4
-			x11-libs/qt-svg:4
-			x11-libs/qt-webkit:4
-			x11-libs/qt-xmlpatterns:4 )
-		xft? ( x11-libs/libXft )
-		)
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
 	afs? ( net-fs/openafs )
 	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c[curl] )
+	clarens? ( dev-libs/xmlrpc-c )
 	emacs? ( virtual/emacs )
 	fits? ( sci-libs/cfitsio )
 	fftw? ( sci-libs/fftw:3.0 )
 	graphviz? ( media-gfx/graphviz )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	llvm? ( sys-devel/llvm )
 	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
 	mysql? ( virtual/mysql )
 	ncurses? ( sys-libs/ncurses )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	postgres? ( dev-db/postgresql-base )
 	pythia6? ( sci-physics/pythia:6 )
 	pythia8? ( sci-physics/pythia:8 )
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-opengl:4
+		x11-libs/qt-qt3support:4
+		x11-libs/qt-svg:4
+		x11-libs/qt-webkit:4
+		x11-libs/qt-xmlpatterns:4 )
 	ruby? (
 			dev-lang/ruby
 			dev-ruby/rubygems )
 	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	xrootd? ( net-libs/xrootd )"
+	xml? ( dev-libs/libxml2:2 )"
 
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig"
 
 RDEPEND="
 	virtual/fortran
-	${CDEPEND}
+${CDEPEND}
 	reflex? ( dev-cpp/gccxml )
 	xinetd? ( sys-apps/xinetd )"
 
-REQUIRED_USE="!X? ( !opengl !qt4 !xft )"
-
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	fortran-2_pkg_setup
-	python_pkg_setup
 	echo
 	elog "There are extra options on packages not yet in Gentoo:"
 	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
@@ -123,13 +116,13 @@ pkg_setup() {
 
 src_prepare() {
 	epatch \
+		"${WORKDIR}"/${PN}-${PATCH_PV}-xrootd-prop-flags.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch
+		"${FILESDIR}"/${P}-explicit-functions.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
@@ -139,11 +132,17 @@ src_prepare() {
 	rm -rf graf3d/glew/{inc,src}
 	rm -rf core/pcre/src
 	rm -rf math/unuran/src/unuran-*.tar.gz
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" | xargs rm
-	rm -rf core/lzma/src/*.tar.gz
+	find core/zip -type f -name "[a-z]*" | xargs rm
 	rm graf3d/gl/{inc,src}/gl2ps.*
 	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
 
+	# TODO: unbundle xrootd as a new package
+	#rm -rf net/xrootd/src
+	#sed -i \
+	#	-e 's:-lXrdOuc:-lXrd &:' \
+	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
+	#	proof/proofd/Module.mk || die
+
 	# In Gentoo, libPythia6 is called libpythia6
 	# libungif is called libgif,
 	# iodbc is in /usr/include/iodbc
@@ -151,7 +150,7 @@ src_prepare() {
 	sed -i \
 		-e 's:libPythia6:libpythia6:g' \
 		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:$ODBCINC:$ODBCINC /usr/include/iodbc:' \
 		-e 's:libpq-fe.h:pg_config.h:' \
 		configure || die "adjusting configure for Gentoo failed"
 
@@ -183,7 +182,8 @@ src_configure() {
 		--disable-builtin-glew \
 		--disable-builtin-pcre \
 		--disable-builtin-zlib \
-		--disable-builtin-lzma \
+		--disable-rpath \
+		--enable-asimage \
 		--enable-astiff \
 		--enable-exceptions	\
 		--enable-explicitlink \
@@ -195,8 +195,6 @@ src_configure() {
 		--enable-table \
 		--fail-on-missing \
 		--with-afs-shared=yes \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
 		$(use_enable afs) \
 		$(use_enable avahi bonjour) \
 		$(use_enable clarens) \
@@ -207,7 +205,6 @@ src_configure() {
 		$(use_enable graphviz gviz) \
 		$(use_enable kerberos krb5) \
 		$(use_enable ldap) \
-		$(use_enable llvm cling) \
 		$(use_enable math gsl-shared) \
 		$(use_enable math genvector) \
 		$(use_enable math mathmore) \
@@ -219,7 +216,6 @@ src_configure() {
 		$(use_enable odbc) \
 		$(use_enable opengl) \
 		$(use_enable postgres pgsql) \
-		$(use_enable prefix rpath) \
 		$(use_enable pythia6) \
 		$(use_enable pythia8) \
 		$(use_enable python) \
@@ -270,6 +266,7 @@ daemon_install() {
 	dodir /var/spool/rootd/{pub,tmp}
 	fperms 1777 /var/spool/rootd/{pub,tmp}
 
+	use xrootd && daemons="${daemons} xrootd olbd"
 	for i in ${daemons}; do
 		newinitd "${FILESDIR}"/${i}.initd ${i}
 		newconfd "${FILESDIR}"/${i}.confd ${i}
@@ -325,7 +322,7 @@ src_install() {
 	rm -rf "${ED}"/etc/root/daemons
 	popd > /dev/null
 	# these should be in PATH
-	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
+	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
 		"${ED}"usr/bin
 }
 

diff --git a/sci-physics/root/root-5.32.01.ebuild b/sci-physics/root/root-5.32.01.ebuild
index 093c935..6981501 100644
--- a/sci-physics/root/root-5.32.01.ebuild
+++ b/sci-physics/root/root-5.32.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.00-r2.ebuild,v 1.1 2012/01/21 19:19:46 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.01.ebuild,v 1.1 2012/03/02 05:34:01 bicatali Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2"
@@ -129,7 +129,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
@@ -325,7 +326,7 @@ src_install() {
 	rm -rf "${ED}"/etc/root/daemons
 	popd > /dev/null
 	# these should be in PATH
-	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
+	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
 		"${ED}"usr/bin
 }
 



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-03-21 23:46 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-03-21 23:46 UTC (permalink / raw
  To: gentoo-commits

commit:     4d1e31f7099763ae3dbe9655b594288648ab3b02
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Mar 21 23:45:37 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Mar 21 23:45:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4d1e31f7

sci-physics/root: bug fix for #406817

---
 sci-physics/root/ChangeLog                         |    8 +++++++
 sci-physics/root/files/root-5.32.00-chklib64.patch |   23 ++++++++++++++++++++
 sci-physics/root/root-5.32.01-r2.ebuild            |    2 +-
 3 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 8478ce8..de4fe34 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.93 2012/03/02 05:34:01 bicatali Exp $
 
+  21 Mar 2012; Andrew Savchenko <bircoph@gmail.com>
+  +files/root-5.32.00-chklib64.patch, root-5.32.01-r2.ebuild:
+  Fix library architecture check (32/64 bit) for libraries having .so
+  file installed as an ld script instead of normal binary file.
+  See bug 406817 for details.
+  Thanks to Jean-Francois Ostiguy and Jauhien Piatlicki for their
+  major work on this bug.
+
 *root-9999 (09 Mar 2012)
 *root-5.32.01-r2 (09 Mar 2012)
 

diff --git a/sci-physics/root/files/root-5.32.00-chklib64.patch b/sci-physics/root/files/root-5.32.00-chklib64.patch
new file mode 100644
index 0000000..a5c052c
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-chklib64.patch
@@ -0,0 +1,23 @@
+--- configure.orig	2012-02-29 19:46:41.000000000 +0400
++++ configure	2012-03-22 03:28:43.458968696 +0400
+@@ -441,14 +441,13 @@
+         fi
+     else
+         if file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
+-            check_link $chklib64
+-            ret=$link_result
+-        else
+-            logmsg " file $filearg $chklib64 | grep '64-bit'"
+-            if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
+-                ret=1
+-            fi
++            # get real binary .so name from .so ld script
++            chklib64=$(gawk '($1 == "GROUP") { print $3 }' $chklib64)
+         fi
++        logmsg " file $filearg $chklib64 | grep '64-bit'"
++        if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
++            ret=1
++            fi
+     fi
+     logmsg " result: $ret"
+     if test $ret -eq 1 ; then

diff --git a/sci-physics/root/root-5.32.01-r2.ebuild b/sci-physics/root/root-5.32.01-r2.ebuild
index c0a7944..35728a9 100644
--- a/sci-physics/root/root-5.32.01-r2.ebuild
+++ b/sci-physics/root/root-5.32.01-r2.ebuild
@@ -128,6 +128,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch
 
 	# make sure we use system libs and headers
@@ -138,7 +139,6 @@ src_prepare() {
 	rm -rf graf3d/glew/{inc,src}
 	rm -rf core/pcre/src
 	rm -rf math/unuran/src/unuran-*.tar.gz
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" | xargs rm
 	rm -rf core/lzma/src/*.tar.gz
 	rm graf3d/gl/{inc,src}/gl2ps.*
 	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-05-15  8:49 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-05-15  8:49 UTC (permalink / raw
  To: gentoo-commits

commit:     ee103db4bd9fcb17d2d8631487cf33107297d5b8
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue May 15 08:47:57 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue May 15 08:47:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ee103db4

sci-physics/root: version bump

---
 sci-physics/root/ChangeLog                         |   12 ++
 .../root/files/root-5.26.00e-libpng15.patch        |   33 -----
 .../files/root-5.26.00g-explicit-functions.patch   |   12 --
 .../root/files/root-5.28.00b-nobyte-compile.patch  |  138 --------------------
 .../files/root-5.28.00h-explicit-functions.patch   |   12 --
 .../root/{root-9999.ebuild => root-5.32.03.ebuild} |   14 +-
 sci-physics/root/root-9999.ebuild                  |    3 +-
 7 files changed, 19 insertions(+), 205 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 6d49d5c..bd33ae5 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,18 @@
 # Copyright 1999-2012 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.32.03 (15 May 2012)
+
+  15 May 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-5.26.00e-libpng15.patch,
+  -files/root-5.26.00g-explicit-functions.patch,
+  -files/root-5.28.00b-nobyte-compile.patch,
+  -files/root-5.28.00h-explicit-functions.patch, +root-5.32.03.ebuild,
+  root-9999.ebuild:
+  Bump ebuild, use live ebuild as a template.
+  Switch to virtual/pkgconfig. Remove extra KEYWORDS from live
+  ebuild.
+
   03 Apr 2012; Justin Lecher <jlec@gentoo.org> -root-5.26.00g.ebuild,
   -root-5.28.00h-r1.ebuild, -root-5.32.02-r1.ebuild:
   Drop in tree version

diff --git a/sci-physics/root/files/root-5.26.00e-libpng15.patch b/sci-physics/root/files/root-5.26.00e-libpng15.patch
deleted file mode 100644
index 91ed9c4..0000000
--- a/sci-physics/root/files/root-5.26.00e-libpng15.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-This patch is a copy from media-libs/libafterimage.
-
---- graf2d/asimage/src/libAfterImage/export.c
-+++ graf2d/asimage/src/libAfterImage/export.c
-@@ -496,7 +496,7 @@
- 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
-     if ( png_ptr != NULL )
-     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
--			if( setjmp(png_ptr->jmpbuf) )
-+			if( setjmp(png_jmpbuf(png_ptr)) )
- 			{
- 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
- 				info_ptr = NULL ;
---- graf2d/asimage/src/libAfterImage/import.c
-+++ graf2d/asimage/src/libAfterImage/import.c
-@@ -1251,7 +1251,7 @@
- 			 * the normal method of doing things with libpng).  REQUIRED unless you
- 			 * set up your own error handlers in the png_create_read_struct() earlier.
- 			 */
--			if ( !setjmp (png_ptr->jmpbuf))
-+			if ( !setjmp (png_jmpbuf(png_ptr)))
- 			{
- 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
- 
-@@ -1468,7 +1468,7 @@
- 
- static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
- {
--   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
-+   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
-    memcpy(data, buf->buffer, length);
-    buf->buffer += length;
- }

diff --git a/sci-physics/root/files/root-5.26.00g-explicit-functions.patch b/sci-physics/root/files/root-5.26.00g-explicit-functions.patch
deleted file mode 100644
index 16a7206..0000000
--- a/sci-physics/root/files/root-5.26.00g-explicit-functions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- root/io/io/Module.mk.orig	2011-09-29 13:49:50.000000000 +0400
-+++ root/io/io/Module.mk	2012-03-09 02:57:20.518370595 +0400
-@@ -66,9 +66,4 @@
- distclean::     distclean-$(MODNAME)
- 
- ##### extra rules ######
--#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
--ifeq ($(GCC_VERS),gcc-4.4)
--ifneq ($(filter -O%,$(OPT)),)
-    $(IODIRS)/TStreamerInfoReadBuffer.o: CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
--endif
--endif

diff --git a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
deleted file mode 100644
index 7029bf1..0000000
--- a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur root.orig/Makefile root/Makefile
---- root.orig/Makefile	2010-12-17 22:48:40.577775091 +0300
-+++ root/Makefile	2010-12-17 22:49:27.902497903 +0300
-@@ -1148,10 +1148,7 @@
- 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
- 	   fi; \
--	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
--	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
--	   fi; \
--	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      dir=$(RFLX_GRFLXDD:lib/=); \
- 	      while test "x$${dir}" != "x" && \
- 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-diff -Naur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.orig/bindings/pyroot/Module.mk	2010-12-17 22:48:39.941179413 +0300
-+++ root/bindings/pyroot/Module.mk	2010-12-17 22:49:27.899164943 +0300
-@@ -48,8 +48,6 @@
- ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
- $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
- endif
--ROOTPYC      := $(ROOTPY:.py=.pyc)
--ROOTPYO      := $(ROOTPY:.py=.pyo)
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- 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)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff -Naur root.orig/build/package/debian/rules root/build/package/debian/rules
---- root.orig/build/package/debian/rules	2010-12-17 22:48:40.197817461 +0300
-+++ root/build/package/debian/rules	2010-12-17 22:49:27.902497903 +0300
-@@ -623,10 +623,6 @@
- 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
- 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			
- #		$(foreach i, \
- #		   $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
- #		    -X$(i:$(DTMP)/%=%) )
-diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.orig/cint/cintex/Module.mk	2010-12-17 22:48:40.057833071 +0300
-+++ root/cint/cintex/Module.mk	2010-12-17 22:49:27.902497903 +0300
-@@ -31,10 +31,6 @@
- CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC    := $(CINTEXPY:.py=.pyc)
--CINTEXPYO    := $(CINTEXPY:.py=.pyo)
--endif
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- 		fi)
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.orig/cint/reflex/Module.mk	2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/Module.mk	2010-12-17 22:51:36.871451359 +0300
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
- 
- RFLX_LIBDIR = $(LIBDIR)
- 
-@@ -92,7 +89,7 @@
- 
- ALLEXECS += $(RFLX_GENMAPX)
- 
--POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN  += $(RFLX_GRFLXPY)
- 
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- 		  mkdir -p lib/python/genreflex; fi )
- 		cp $< $@
- 
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
--		@python -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
- 
-@@ -149,7 +144,7 @@
- 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
- 
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
- 
- clean-genreflex:
- 		@rm -rf lib/python/genreflex
-diff -Naur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.orig/cint/reflex/python/CMakeLists.txt	2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/python/CMakeLists.txt	2010-12-17 22:49:27.902497903 +0300
-@@ -15,7 +15,7 @@
- #####################   sources   ####################
- 
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
- 
- #####################  gccxmlpath ####################
- 
-

diff --git a/sci-physics/root/files/root-5.28.00h-explicit-functions.patch b/sci-physics/root/files/root-5.28.00h-explicit-functions.patch
deleted file mode 100644
index 918b696..0000000
--- a/sci-physics/root/files/root-5.28.00h-explicit-functions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- root/io/io/Module.mk.orig	2011-11-24 20:12:56.000000000 +0400
-+++ root/io/io/Module.mk	2012-03-09 03:45:42.850549826 +0400
-@@ -67,9 +67,4 @@
- distclean::     distclean-$(MODNAME)
- 
- ##### extra rules ######
--#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
--ifeq ($(GCC_VERS),gcc-4.4)
--ifneq ($(filter -O%,$(OPT)),)
-    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
--endif
--endif

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-5.32.03.ebuild
similarity index 96%
copy from sci-physics/root/root-9999.ebuild
copy to sci-physics/root/root-5.32.03.ebuild
index 6b3c224..8366d86 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-5.32.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.01.ebuild,v 1.1 2012/03/02 05:34:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2"
@@ -33,9 +33,8 @@ SRC_URI="${SRC_URI}
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS=""
 IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
+	+math mpi mysql odbc +opengl openmp oracle postgres prefix
 	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
 CDEPEND="
@@ -78,7 +77,6 @@ CDEPEND="
 	graphviz? ( media-gfx/graphviz )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	llvm? ( =sys-devel/clang-9999 =sys-devel/llvm-9999 )
 	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
 	mysql? ( virtual/mysql )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
@@ -94,7 +92,7 @@ CDEPEND="
 	xrootd? ( net-libs/xrootd )"
 
 DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
+	virtual/pkgconfig"
 
 RDEPEND="
 	virtual/fortran
@@ -142,7 +140,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -191,7 +190,6 @@ src_configure() {
 		--with-f77=$(tc-getFC) \
 		--with-ld=$(tc-getCXX) \
 		--with-afs-shared=yes \
-		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
 		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
 		--disable-builtin-afterimage \
 		--disable-builtin-freetype \
@@ -200,6 +198,7 @@ src_configure() {
 		--disable-builtin-pcre \
 		--disable-builtin-zlib \
 		--disable-builtin-lzma \
+		--disable-cling \
 		--enable-astiff \
 		--enable-exceptions	\
 		--enable-explicitlink \
@@ -221,7 +220,6 @@ src_configure() {
 		$(use_enable graphviz gviz) \
 		$(use_enable kerberos krb5) \
 		$(use_enable ldap) \
-		$(use_enable llvm cling) \
 		$(use_enable math gsl-shared) \
 		$(use_enable math genvector) \
 		$(use_enable math mathmore) \

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 6b3c224..1b9f8e8 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -33,7 +33,6 @@ SRC_URI="${SRC_URI}
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS=""
 IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
 	llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
 	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
@@ -94,7 +93,7 @@ CDEPEND="
 	xrootd? ( net-libs/xrootd )"
 
 DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
+	virtual/pkgconfig"
 
 RDEPEND="
 	virtual/fortran



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-05-29 23:01 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-05-29 23:01 UTC (permalink / raw
  To: gentoo-commits

commit:     2f8112e0becd3197a6c9df2518236fe6a8095c95
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue May 29 22:59:34 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue May 29 22:59:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2f8112e0

sci-physics/root: html documentation generation

This adds htmldoc USE flag to generate what was previously
app-doc/root-docs. Fonts for dot charts are fixed.

---
 sci-physics/root/ChangeLog                         |   10 +++
 sci-physics/root/files/root-5.32.00-dotfont.patch  |   58 +++++++++++++++++
 sci-physics/root/files/root-5.32.00-htmldoc.patch  |   50 +++++++++++++++
 sci-physics/root/files/root-5.34-htmldoc.patch     |   58 +++++++++++++++++
 sci-physics/root/metadata.xml                      |    1 +
 ...ot-5.32.03-r1.ebuild => root-5.32.03-r2.ebuild} |   62 ++++++++++++++++---
 sci-physics/root/root-9999.ebuild                  |   65 +++++++++++++++++---
 7 files changed, 287 insertions(+), 17 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index d6d086b..b632101 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2012 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.32.03-r2 (29 May 2012)
+
+  29 May 2012; Andrew Savchenko <bircoph@gmail.com>
+  +files/root-5.32.00-dotfont.patch, +files/root-5.32.00-htmldoc.patch,
+  -root-5.32.03-r1.ebuild, +root-5.32.03-r2.ebuild,
+  +files/root-5.34-htmldoc.patch, root-9999.ebuild, metadata.xml:
+  Add USE="htmldoc" for htmtl documentation build. This obsoletes
+  app-doc/root-docs. Fix fonts for dot code generation, force DejeVu
+  Serif.
+
   25 May 2012; Andrew Savchenko <bircoph@gmail.com> root-9999.ebuild:
   Adapt for upstream changes:
   - enable-exceptions is gone;

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 0000000..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.000000000 +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;
+-   outdot << "  node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << endl;
++   outdot << "  node [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::list<std::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-htmldoc.patch b/sci-physics/root/files/root-5.32.00-htmldoc.patch
new file mode 100644
index 0000000..e6d4981
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-htmldoc.patch
@@ -0,0 +1,50 @@
+--- root/Makefile.orig	2012-05-23 21:07:07.000000000 +0400
++++ root/Makefile	2012-05-23 22:47:48.935680301 +0400
+@@ -1039,8 +1039,7 @@
+ releasenotes:
+ 	@$(MAKERELNOTES)
+ 
+-html: $(ROOTEXE) changelog releasenotes
+-	@$(MAKELOGHTML)
++html: $(ROOTEXE) releasenotes
+ 	@$(MAKEHTML)
+ 
+ # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
+--- root/build/unix/makehtml.sh.orig	2012-05-23 23:25:45.000000000 +0400
++++ root/build/unix/makehtml.sh	2012-05-24 13:04:43.919062126 +0400
+@@ -6,12 +6,12 @@
+ cd tutorials
+ # we need tutorials/hsimple.root
+ if [ ! -f hsimple.root ]; then
+-   $ROOT -l -b -q hsimple.C
++   ../$ROOT -l -b -q hsimple.C && exit 1
+ fi
+ cd tree
+ # we need tutorials/tree/cernstaff.root
+ if [ ! -f cernstaff.root ]; then
+-   $ROOT -l -b -q cernbuild.C
++   ../../$ROOT -l -b -q cernbuild.C || exit 1
+ fi
+ cd $dir
+ 
+@@ -19,7 +19,7 @@
+ echo "Generating doc in directory htmldoc/..."
+ echo ""
+ 
+-$ROOT -l <<makedoc
++$ROOT -l <<makedoc || exit 1
+     THtml h;
+     h.LoadAllLibs();
+     h.MakeAll();
+--- root/html/src/THtml.cxx.orig	2012-05-25 16:18:10.000000000 +0400
++++ root/html/src/THtml.cxx	2012-05-29 19:22:40.810563296 +0400
+@@ -1913,6 +1913,9 @@
+ void THtml::CreateStyleSheet() const {
+    // Write the default ROOT style sheet.
+    CopyFileFromEtcDir("ROOT.css");
++   CopyFileFromEtcDir("info.png");
++   CopyFileFromEtcDir("root-banner.png");
++   CopyFileFromEtcDir("rootdrawing-logo.png");
+    CopyFileFromEtcDir("shadowAlpha.png");
+    CopyFileFromEtcDir("shadow.gif");
+ }

diff --git a/sci-physics/root/files/root-5.34-htmldoc.patch b/sci-physics/root/files/root-5.34-htmldoc.patch
new file mode 100644
index 0000000..a999d0c
--- /dev/null
+++ b/sci-physics/root/files/root-5.34-htmldoc.patch
@@ -0,0 +1,58 @@
+--- root/Makefile.orig	2012-05-30 00:50:46.000000000 +0400
++++ root/Makefile	2012-05-30 00:51:05.839679686 +0400
+@@ -1088,16 +1088,7 @@
+ releasenotes:
+ 	@$(MAKERELNOTES)
+ 
+-html: $(ROOTEXE) changelog releasenotes
+-ifneq ($(USECONFIG),FALSE)
+-	@if [ "x`which root.exe`" != "x$(DESTDIR)$(BINDIR)/root.exe" ] \
+-	  || [ "`which root.exe`" -ot "bin/root.exe" ]; then \
+-	  echo 'ERROR: root.exe has not been installed by this build.'; \
+-	  echo '       Run "make install" before running "make html".'; \
+-	  exit 1; \
+-	fi
+-endif
+-	@$(MAKELOGHTML)
++html: $(ROOTEXE) releasenotes
+ 	@$(MAKEHTML)
+ 
+ # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
+--- root/build/unix/makehtml.sh.orig	2012-05-23 23:25:45.000000000 +0400
++++ root/build/unix/makehtml.sh	2012-05-24 13:04:43.919062126 +0400
+@@ -6,12 +6,12 @@
+ cd tutorials
+ # we need tutorials/hsimple.root
+ if [ ! -f hsimple.root ]; then
+-   $ROOT -l -b -q hsimple.C
++   ../$ROOT -l -b -q hsimple.C && exit 1
+ fi
+ cd tree
+ # we need tutorials/tree/cernstaff.root
+ if [ ! -f cernstaff.root ]; then
+-   $ROOT -l -b -q cernbuild.C
++   ../../$ROOT -l -b -q cernbuild.C || exit 1
+ fi
+ cd $dir
+ 
+@@ -19,7 +19,7 @@
+ echo "Generating doc in directory htmldoc/..."
+ echo ""
+ 
+-$ROOT -l <<makedoc
++$ROOT -l <<makedoc || exit 1
+     THtml h;
+     h.LoadAllLibs();
+     h.MakeAll();
+--- root/html/src/THtml.cxx.orig	2012-05-25 16:18:10.000000000 +0400
++++ root/html/src/THtml.cxx	2012-05-29 19:22:40.810563296 +0400
+@@ -1913,6 +1913,9 @@
+ void THtml::CreateStyleSheet() const {
+    // Write the default ROOT style sheet.
+    CopyFileFromEtcDir("ROOT.css");
++   CopyFileFromEtcDir("info.png");
++   CopyFileFromEtcDir("root-banner.png");
++   CopyFileFromEtcDir("rootdrawing-logo.png");
+    CopyFileFromEtcDir("shadowAlpha.png");
+    CopyFileFromEtcDir("shadow.gif");
+ }

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 0af5788..4eb1afc 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
 		<flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
 		<flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag>
+		<flag name="htmldoc">Generate html documentation</flag>
 		<flag name="llvm">Build the new EXPERIMENTAL cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
 		<flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
 		<flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>

diff --git a/sci-physics/root/root-5.32.03-r1.ebuild b/sci-physics/root/root-5.32.03-r2.ebuild
similarity index 81%
rename from sci-physics/root/root-5.32.03-r1.ebuild
rename to sci-physics/root/root-5.32.03-r2.ebuild
index eaa1734..27cad96 100644
--- a/sci-physics/root/root-5.32.03-r1.ebuild
+++ b/sci-physics/root/root-5.32.03-r2.ebuild
@@ -17,7 +17,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils user fdo-mime fortran-2 python toolchain-funcs ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${_SVN}
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -30,18 +30,24 @@ SRC_URI="${SRC_URI}
 	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf
 		math? (
 			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
+			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
+		htmldoc? (
+			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	+math mpi mysql odbc +opengl openmp oracle postgres prefix
-	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
+IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerberos
+	ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6
+	pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
 CDEPEND="
 	app-arch/xz-utils
+	!app-doc/root-docs
 	>=dev-lang/cfortran-4.4-r2
 	dev-libs/libpcre
+	media-fonts/dejavu
 	media-libs/freetype
 	media-libs/giflib
 	media-libs/libpng:0
@@ -93,7 +99,8 @@ CDEPEND="
 	xrootd? ( net-libs/xrootd )"
 
 DEPEND="${CDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	htmldoc? ( x11-base/xorg-server[xvfb] )"
 
 RDEPEND="
 	virtual/fortran
@@ -101,7 +108,9 @@ RDEPEND="
 	reflex? ( dev-cpp/gccxml )
 	xinetd? ( sys-apps/xinetd )"
 
-REQUIRED_USE="!X? ( !opengl !qt4 !xft )"
+REQUIRED_USE="
+	!X? ( !opengl !qt4 !xft )
+	htmldoc? ( X doc graphviz )"
 
 S="${WORKDIR}/${PN}"
 
@@ -142,7 +151,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -175,6 +185,24 @@ src_prepare() {
 
 	# QTDIR only used for qt3 in gentoo, and configure looks for it.
 	unset QTDIR
+
+	# Make html docs self-consistent for offline work (based on Fedora spec)
+	if use htmldoc; then
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
+		# make images local
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
+			-i etc/html/header.html || die "htmldoc sed failed"
+
+		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
+			die "htmldoc preparation failed"
+
+		# set build etc directory
+		sed "s%@PWD@%${S}%" -i build/unix/makehtml.sh || die "htmldoc sed failed"
+	fi
 }
 
 src_configure() {
@@ -254,6 +282,22 @@ src_compile() {
 	if use emacs; then
 		elisp-compile build/misc/*.el || die "elisp-compile failed"
 	fi
+	if use htmldoc; then
+		# we need X server running, THtml uses it for GUI snapshots
+		Xvfb -screen 0 1280x1024x24 :50 >/dev/null 2>&1 &
+		local xvfb_pid=$!
+		ps h -C Xvfb | grep -q ${xvfb_pid} || die "Xvfb failed to start"
+
+		LD_LIBRARY_PATH=${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \
+		ROOTSYS=${S} DISPLAY=":50" \
+		emake html || die "html doc generation failed"
+		# if root.exe crashes, return code will be 0 due to gdb attach,
+		# so we need to check if last html file was generated;
+		# this check is volatile and can't catch crash on the last file.
+		[[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
+
+		kill ${xvfb_pid}
+	fi
 }
 
 doc_install() {
@@ -264,6 +308,8 @@ doc_install() {
 		use math && dodoc \
 			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
 			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+		# too large data to copy
+		use htmldoc && mv htmldoc "${ED}usr/share/doc/${PF}/html"
 	fi
 
 	if use examples; then

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index d5fb847..53e7853 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.01.ebuild,v 1.1 2012/03/02 05:34:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
 
 EAPI=4
 
@@ -17,12 +17,13 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils user fdo-mime fortran-2 python toolchain-funcs ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${_SVN}
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
 PATCH_PV=5.28.00b
 PATCH_PV2=5.32.00
+PATCH_PV3=5.34
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
@@ -30,18 +31,24 @@ SRC_URI="${SRC_URI}
 	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf
 		math? (
 			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
+			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
+		htmldoc? (
+			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
-	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
+IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerberos
+	ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6
+	pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
 CDEPEND="
 	app-arch/xz-utils
+	!app-doc/root-docs
 	>=dev-lang/cfortran-4.4-r2
 	dev-libs/libpcre
+	media-fonts/dejavu
 	media-libs/freetype
 	media-libs/giflib
 	media-libs/libpng:0
@@ -94,7 +101,8 @@ CDEPEND="
 	xrootd? ( net-libs/xrootd )"
 
 DEPEND="${CDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	htmldoc? ( x11-base/xorg-server[xvfb] )"
 
 RDEPEND="
 	virtual/fortran
@@ -102,7 +110,9 @@ RDEPEND="
 	reflex? ( dev-cpp/gccxml )
 	xinetd? ( sys-apps/xinetd )"
 
-REQUIRED_USE="!X? ( !opengl !qt4 !xft )"
+REQUIRED_USE="
+	!X? ( !opengl !qt4 !xft )
+	htmldoc? ( X doc graphviz )"
 
 S="${WORKDIR}/${PN}"
 
@@ -141,7 +151,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -174,6 +185,24 @@ src_prepare() {
 
 	# QTDIR only used for qt3 in gentoo, and configure looks for it.
 	unset QTDIR
+
+	# Make html docs self-consistent for offline work (based on Fedora spec)
+	if use htmldoc; then
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV3}-htmldoc.patch
+		# make images local
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
+			-i etc/html/header.html || die "htmldoc sed failed"
+
+		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
+			die "htmldoc preparation failed"
+
+		# set build etc directory
+		sed "s%@PWD@%${S}%" -i build/unix/makehtml.sh || die "htmldoc sed failed"
+	fi
 }
 
 src_configure() {
@@ -253,6 +282,22 @@ src_compile() {
 	if use emacs; then
 		elisp-compile build/misc/*.el || die "elisp-compile failed"
 	fi
+	if use htmldoc; then
+		# we need X server running, THtml uses it for GUI snapshots
+		Xvfb -screen 0 1280x1024x24 :50 >/dev/null 2>&1 &
+		local xvfb_pid=$!
+		ps h -C Xvfb | grep -q ${xvfb_pid} || die "Xvfb failed to start"
+
+		LD_LIBRARY_PATH=${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \
+		ROOTSYS=${S} DISPLAY=":50" \
+		emake html || die "html doc generation failed"
+		# if root.exe crashes, return code will be 0 due to gdb attach,
+		# so we need to check if last html file was generated;
+		# this check is volatile and can't catch crash on the last file.
+		[[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
+
+		kill ${xvfb_pid}
+	fi
 }
 
 doc_install() {
@@ -263,6 +308,8 @@ doc_install() {
 		use math && dodoc \
 			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
 			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+		# too large data to copy
+		use htmldoc && mv htmldoc "${ED}usr/share/doc/${PF}/html"
 	fi
 
 	if use examples; then



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-06-19 20:20 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-06-19 20:20 UTC (permalink / raw
  To: gentoo-commits

commit:     3c83c3996ace8d596f5a69204ddcb7e027fc45b5
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Jun 14 21:10:29 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Thu Jun 14 21:10:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3c83c399

sci-physics/root: update live ebuild

---
 sci-physics/root/ChangeLog                     |    7 +++
 sci-physics/root/files/root-5.34-dotfont.patch |   58 ++++++++++++++++++++++++
 sci-physics/root/metadata.xml                  |    1 +
 sci-physics/root/root-9999.ebuild              |   35 ++++++++-------
 4 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index b583997..dad708f 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 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 $
 
+  14 Jun 2012; Andrew Savchenko <bircoph@gmail.com>
+  +files/root-5.34-dotfont.patch, root-9999.ebuild, metadata.xml:
+  Update live ebuild to account 5.34 barnch changes.
+  This adds experimental support for C++0x startard, imroves chances
+  of llvm build and makes clear openmp and mpi relationship: they are
+  used only for math and are mutually exclusive.
+
   13 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> root-5.32.03-r2.ebuild,
   metadata.xml:
   sync with tree

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

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index bcbc04f..cb56d9f 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -16,6 +16,7 @@
   GUI toolkit, and a complete visualization framework.
 </longdescription>
 <use>
+  <flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>>=4.7.0</flag>
   <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
   <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
   <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag>

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 9f55ad4..0ff75fe 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -17,7 +17,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs virtualx ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs user virtualx ${_SVN}
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -39,9 +39,9 @@ SRC_URI="${SRC_URI}
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerberos
-	ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6
-	pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
+IUSE="+X afs avahi c++0x clarens doc emacs examples fits fftw graphviz htmldoc
+	kerberos ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
+	pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
 CDEPEND="
 	app-arch/xz-utils
@@ -78,6 +78,7 @@ CDEPEND="
 		)
 	afs? ( net-fs/openafs )
 	avahi? ( net-dns/avahi )
+	c++0x? ( >=sys-devel/gcc-4.7.0 )
 	clarens? ( dev-libs/xmlrpc-c[curl] )
 	emacs? ( virtual/emacs )
 	fits? ( sci-libs/cfitsio )
@@ -98,7 +99,7 @@ CDEPEND="
 			dev-ruby/rubygems )
 	ssl? ( dev-libs/openssl )
 	xml? ( dev-libs/libxml2 )
-	xrootd? ( net-libs/xrootd )"
+	xrootd? ( >=net-libs/xrootd-3.2.0 )"
 
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -111,7 +112,9 @@ RDEPEND="
 
 REQUIRED_USE="
 	!X? ( !opengl !qt4 !xft )
-	htmldoc? ( X doc graphviz )"
+	htmldoc? ( X doc graphviz )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )"
 
 VIRTUALX_REQUIRED="htmldoc"
 
@@ -132,12 +135,13 @@ pkg_setup() {
 	enewuser rootd -1 -1 /var/spool/rootd rootd
 
 	if use math; then
-		if use openmp && ! tc-has-openmp; then
-			ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
-			ewarn "If you want to build this package with OpenMP, abort now,"
-			ewarn "and set CC to an OpenMP capable compiler"
-		elif use openmp; then
-			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+		if use openmp; then
+			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+				ewarn "You are using a gcc without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
 		elif use mpi; then
 			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
 		fi
@@ -153,7 +157,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV3}-dotfont.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -279,13 +283,12 @@ src_configure() {
 }
 
 src_compile() {
-	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}"
+	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS=${S} LD_LIBRARY_PATH=${S}/lib
 	if use emacs; then
 		elisp-compile build/misc/*.el || die "elisp-compile failed"
 	fi
 	if use htmldoc; then
-		LD_LIBRARY_PATH=${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \
-		ROOTSYS=${S} DISPLAY=":50" \
+		ROOTSYS=${S} LD_LIBRARY_PATH=${S}/lib DISPLAY=":50" \
 		Xemake html || die "html doc generation failed"
 		# if root.exe crashes, return code will be 0 due to gdb attach,
 		# so we need to check if last html file was generated;



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-06-19 20:20 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-06-19 20:20 UTC (permalink / raw
  To: gentoo-commits

commit:     057f0255ad19162bd9b7b90fa5db478025aff657
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue Jun 19 20:04:34 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue Jun 19 20:04:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=057f0255

sci-physics/root: separate htmldoc package

---
 sci-physics/root/ChangeLog                         |    6 +++
 sci-physics/root/files/root-5.34-htmldoc.patch     |   46 --------------------
 ...-5.34-dotfont.patch => root-9999-dotfont.patch} |    0
 sci-physics/root/root-9999.ebuild                  |   28 +++---------
 4 files changed, 12 insertions(+), 68 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index dad708f..281ea31 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 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 $
 
+  19 Jun 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-5.34-dotfont.patch, files/root-5.34-htmldoc.patch,
+  root-9999.ebuild, +files/root-9999-dotfont.patch:
+  Split htmldoc to a separate ebuild: docs are supposed to be
+  generated after root was installed onto the live filesystem.
+
   14 Jun 2012; Andrew Savchenko <bircoph@gmail.com>
   +files/root-5.34-dotfont.patch, root-9999.ebuild, metadata.xml:
   Update live ebuild to account 5.34 barnch changes.

diff --git a/sci-physics/root/files/root-5.34-htmldoc.patch b/sci-physics/root/files/root-5.34-htmldoc.patch
index a999d0c..3b80b39 100644
--- a/sci-physics/root/files/root-5.34-htmldoc.patch
+++ b/sci-physics/root/files/root-5.34-htmldoc.patch
@@ -1,49 +1,3 @@
---- root/Makefile.orig	2012-05-30 00:50:46.000000000 +0400
-+++ root/Makefile	2012-05-30 00:51:05.839679686 +0400
-@@ -1088,16 +1088,7 @@
- releasenotes:
- 	@$(MAKERELNOTES)
- 
--html: $(ROOTEXE) changelog releasenotes
--ifneq ($(USECONFIG),FALSE)
--	@if [ "x`which root.exe`" != "x$(DESTDIR)$(BINDIR)/root.exe" ] \
--	  || [ "`which root.exe`" -ot "bin/root.exe" ]; then \
--	  echo 'ERROR: root.exe has not been installed by this build.'; \
--	  echo '       Run "make install" before running "make html".'; \
--	  exit 1; \
--	fi
--endif
--	@$(MAKELOGHTML)
-+html: $(ROOTEXE) releasenotes
- 	@$(MAKEHTML)
- 
- # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
---- root/build/unix/makehtml.sh.orig	2012-05-23 23:25:45.000000000 +0400
-+++ root/build/unix/makehtml.sh	2012-05-24 13:04:43.919062126 +0400
-@@ -6,12 +6,12 @@
- cd tutorials
- # we need tutorials/hsimple.root
- if [ ! -f hsimple.root ]; then
--   $ROOT -l -b -q hsimple.C
-+   ../$ROOT -l -b -q hsimple.C && exit 1
- fi
- cd tree
- # we need tutorials/tree/cernstaff.root
- if [ ! -f cernstaff.root ]; then
--   $ROOT -l -b -q cernbuild.C
-+   ../../$ROOT -l -b -q cernbuild.C || exit 1
- fi
- cd $dir
- 
-@@ -19,7 +19,7 @@
- echo "Generating doc in directory htmldoc/..."
- echo ""
- 
--$ROOT -l <<makedoc
-+$ROOT -l <<makedoc || exit 1
-     THtml h;
-     h.LoadAllLibs();
-     h.MakeAll();
 --- root/html/src/THtml.cxx.orig	2012-05-25 16:18:10.000000000 +0400
 +++ root/html/src/THtml.cxx	2012-05-29 19:22:40.810563296 +0400
 @@ -1913,6 +1913,9 @@

diff --git a/sci-physics/root/files/root-5.34-dotfont.patch b/sci-physics/root/files/root-9999-dotfont.patch
similarity index 100%
rename from sci-physics/root/files/root-5.34-dotfont.patch
rename to sci-physics/root/files/root-9999-dotfont.patch

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 0ff75fe..572e3a2 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -8,8 +8,7 @@ PYTHON_DEPEND="python? 2"
 
 if [[ ${PV} == "9999" ]] ; then
 	_SVN=subversion
-	ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk"
-	ESVN_OPTIONS="--non-interactive --trust-server-cert"
+	ESVN_REPO_URI="http://root.cern.ch/svn/root/trunk"
 	SRC_URI=""
 	KEYWORDS=""
 else
@@ -17,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs user virtualx ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user virtualx ${_SVN}
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -45,7 +44,6 @@ IUSE="+X afs avahi c++0x clarens doc emacs examples fits fftw graphviz htmldoc
 
 CDEPEND="
 	app-arch/xz-utils
-	!app-doc/root-docs
 	>=dev-lang/cfortran-4.4-r2
 	dev-libs/libpcre
 	media-fonts/dejavu
@@ -110,14 +108,13 @@ RDEPEND="
 	reflex? ( dev-cpp/gccxml )
 	xinetd? ( sys-apps/xinetd )"
 
+PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
+
 REQUIRED_USE="
 	!X? ( !opengl !qt4 !xft )
-	htmldoc? ( X doc graphviz )
 	mpi? ( math !openmp )
 	openmp? ( math !mpi )"
 
-VIRTUALX_REQUIRED="htmldoc"
-
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {
@@ -157,7 +154,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV3}-dotfont.patch
+		"${FILESDIR}"/${PN}-9999-dotfont.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -204,9 +201,6 @@ src_prepare() {
 
 		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
 			die "htmldoc preparation failed"
-
-		# set build etc directory
-		sed "s%@PWD@%${S}%" -i build/unix/makehtml.sh || die "htmldoc sed failed"
 	fi
 }
 
@@ -283,18 +277,10 @@ src_configure() {
 }
 
 src_compile() {
-	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS=${S} LD_LIBRARY_PATH=${S}/lib
+	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
 	if use emacs; then
 		elisp-compile build/misc/*.el || die "elisp-compile failed"
 	fi
-	if use htmldoc; then
-		ROOTSYS=${S} LD_LIBRARY_PATH=${S}/lib DISPLAY=":50" \
-		Xemake html || die "html doc generation failed"
-		# if root.exe crashes, return code will be 0 due to gdb attach,
-		# so we need to check if last html file was generated;
-		# this check is volatile and can't catch crash on the last file.
-		[[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
-	fi
 }
 
 doc_install() {
@@ -305,8 +291,6 @@ doc_install() {
 		use math && dodoc \
 			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
 			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-		# too large data to copy
-		use htmldoc && mv htmldoc "${ED}usr/share/doc/${PF}/html"
 	fi
 
 	if use examples; then



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-06-20  9:18 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-06-20  9:18 UTC (permalink / raw
  To: gentoo-commits

commit:     ed821a8f48d461576b55d67da723294a54858995
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Jun 20 07:30:31 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Jun 20 07:30:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ed821a8f

sci-physics/root: reuse htmldoc patch

---
 sci-physics/root/files/root-5.32.00-htmldoc.patch |   38 ---------------------
 sci-physics/root/files/root-5.34-htmldoc.patch    |   12 ------
 sci-physics/root/root-5.34.00.ebuild              |    3 +-
 sci-physics/root/root-9999.ebuild                 |    3 +-
 4 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/sci-physics/root/files/root-5.32.00-htmldoc.patch b/sci-physics/root/files/root-5.32.00-htmldoc.patch
index e6d4981..3b80b39 100644
--- a/sci-physics/root/files/root-5.32.00-htmldoc.patch
+++ b/sci-physics/root/files/root-5.32.00-htmldoc.patch
@@ -1,41 +1,3 @@
---- root/Makefile.orig	2012-05-23 21:07:07.000000000 +0400
-+++ root/Makefile	2012-05-23 22:47:48.935680301 +0400
-@@ -1039,8 +1039,7 @@
- releasenotes:
- 	@$(MAKERELNOTES)
- 
--html: $(ROOTEXE) changelog releasenotes
--	@$(MAKELOGHTML)
-+html: $(ROOTEXE) releasenotes
- 	@$(MAKEHTML)
- 
- # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
---- root/build/unix/makehtml.sh.orig	2012-05-23 23:25:45.000000000 +0400
-+++ root/build/unix/makehtml.sh	2012-05-24 13:04:43.919062126 +0400
-@@ -6,12 +6,12 @@
- cd tutorials
- # we need tutorials/hsimple.root
- if [ ! -f hsimple.root ]; then
--   $ROOT -l -b -q hsimple.C
-+   ../$ROOT -l -b -q hsimple.C && exit 1
- fi
- cd tree
- # we need tutorials/tree/cernstaff.root
- if [ ! -f cernstaff.root ]; then
--   $ROOT -l -b -q cernbuild.C
-+   ../../$ROOT -l -b -q cernbuild.C || exit 1
- fi
- cd $dir
- 
-@@ -19,7 +19,7 @@
- echo "Generating doc in directory htmldoc/..."
- echo ""
- 
--$ROOT -l <<makedoc
-+$ROOT -l <<makedoc || exit 1
-     THtml h;
-     h.LoadAllLibs();
-     h.MakeAll();
 --- root/html/src/THtml.cxx.orig	2012-05-25 16:18:10.000000000 +0400
 +++ root/html/src/THtml.cxx	2012-05-29 19:22:40.810563296 +0400
 @@ -1913,6 +1913,9 @@

diff --git a/sci-physics/root/files/root-5.34-htmldoc.patch b/sci-physics/root/files/root-5.34-htmldoc.patch
deleted file mode 100644
index 3b80b39..0000000
--- a/sci-physics/root/files/root-5.34-htmldoc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- root/html/src/THtml.cxx.orig	2012-05-25 16:18:10.000000000 +0400
-+++ root/html/src/THtml.cxx	2012-05-29 19:22:40.810563296 +0400
-@@ -1913,6 +1913,9 @@
- void THtml::CreateStyleSheet() const {
-    // Write the default ROOT style sheet.
-    CopyFileFromEtcDir("ROOT.css");
-+   CopyFileFromEtcDir("info.png");
-+   CopyFileFromEtcDir("root-banner.png");
-+   CopyFileFromEtcDir("rootdrawing-logo.png");
-    CopyFileFromEtcDir("shadowAlpha.png");
-    CopyFileFromEtcDir("shadow.gif");
- }

diff --git a/sci-physics/root/root-5.34.00.ebuild b/sci-physics/root/root-5.34.00.ebuild
index 08d6e3f..29d1b79 100644
--- a/sci-physics/root/root-5.34.00.ebuild
+++ b/sci-physics/root/root-5.34.00.ebuild
@@ -22,7 +22,6 @@ ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
 PATCH_PV=5.28.00b
 PATCH_PV2=5.32.00
-PATCH_PV3=5.34
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
@@ -189,7 +188,7 @@ src_prepare() {
 
 	# Make html docs self-consistent for offline work (based on Fedora spec)
 	if use htmldoc; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV3}-htmldoc.patch
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
 		# make images local
 		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
 			-i etc/html/ROOT.css || die "htmldoc sed failed"

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 572e3a2..cc68915 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -22,7 +22,6 @@ ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
 PATCH_PV=5.28.00b
 PATCH_PV2=5.32.00
-PATCH_PV3=5.34
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
@@ -190,7 +189,7 @@ src_prepare() {
 
 	# Make html docs self-consistent for offline work (based on Fedora spec)
 	if use htmldoc; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV3}-htmldoc.patch
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
 		# make images local
 		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
 			-i etc/html/ROOT.css || die "htmldoc sed failed"



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-07-01  6:59 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-07-01  6:59 UTC (permalink / raw
  To: gentoo-commits

commit:     24c15d7d99615871d6fb2d36b17509f1d4af49cc
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Jul  1 06:58:08 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Jul  1 06:58:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=24c15d7d

sci-physics/root: backport fixes from the portage

and remove old data

---
 sci-physics/root/ChangeLog           |    6 +++++
 sci-physics/root/files/olbd.confd    |    9 -------
 sci-physics/root/files/olbd.initd    |   26 ----------------------
 sci-physics/root/files/xrootd.confd  |    8 -------
 sci-physics/root/files/xrootd.initd  |   26 ----------------------
 sci-physics/root/metadata.xml        |   39 ++++++++++++++++-----------------
 sci-physics/root/root-5.34.00.ebuild |   16 ++++++++-----
 sci-physics/root/root-9999.ebuild    |   14 +++++++----
 8 files changed, 44 insertions(+), 100 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 53f4413..1c0138f 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 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 Jul 2012; Andrew Savchenko <bircoph@gmail.com> root-5.34.00.ebuild,
+  root-9999.ebuild, -files/olbd.confd, -files/olbd.initd, -files/xrootd.confd,
+  -files/xrootd.initd, metadata.xml:
+  Backport fixes from the portage.
+  Remove unused files and USE flag description.
+
 *root-5.32.03-r3 (20 Jun 2012)
 
   20 Jun 2012; Andrew Savchenko <bircoph@gmail.com> -root-5.32.03-r2.ebuild,

diff --git a/sci-physics/root/files/olbd.confd b/sci-physics/root/files/olbd.confd
deleted file mode 100644
index 848f4d7..0000000
--- a/sci-physics/root/files/olbd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# conf.d file for olbd daemon
-
-# User to run as (default is `xrootd')
-OLBD_USER="root"
-
-#
-# Please refer to the olbd(1) man(1) page for more
-# information on command line parameters. 
-OLBD_OPTS=""

diff --git a/sci-physics/root/files/olbd.initd b/sci-physics/root/files/olbd.initd
deleted file mode 100644
index 1793300..0000000
--- a/sci-physics/root/files/olbd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/olbd.initd,v 1.1 2008/12/18 18:10:18 bicatali Exp $
-
-depend() {
-    need net
-    use dns logger
-    provide root-file-server
-}
-
-start() {
-    ebegin "Starting ROOT open load balancer server"
-    start-stop-daemon --start --quiet --user=${OLBD_USER} \
-	--make-pidfile --pidfile=/var/run/olbd.pid \
-	--exec /usr/bin/olbd --background -- ${OLBD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ROOT open load balancer server"
-    start-stop-daemon --stop --quiet \
-	--pidfile=/var/run/olbd.pid \
-	--exec /usr/bin/olbd
-    eend $?
-}

diff --git a/sci-physics/root/files/xrootd.confd b/sci-physics/root/files/xrootd.confd
deleted file mode 100644
index e725cd1..0000000
--- a/sci-physics/root/files/xrootd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# conf.d file for xroot daemon
-
-# User to run as (default is `root')
-XROOTD_USER="root"
-
-# Please refer to the xrootd(1) man(1) page for more
-# information on command line parameters. 
-XROOTD_OPTS=""

diff --git a/sci-physics/root/files/xrootd.initd b/sci-physics/root/files/xrootd.initd
deleted file mode 100644
index 28dd8a5..0000000
--- a/sci-physics/root/files/xrootd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/xrootd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
-
-depend() {
-    need net
-    use logger dns
-    provide root-file-server
-}
-
-start() {
-    ebegin "Starting extended ROOTD file server"
-    start-stop-daemon --start --quiet --user ${XROOTD_USER} \
-	--make-pidfile --pidfile /var/run/xrootd.pid \
-	--exec /usr/bin/xrootd --background -- ${XROOTD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping extended ROOTD file server"
-    start-stop-daemon --stop --quiet \
-	--pidfile /var/run/xrootd.pid \
-	--exec /usr/bin/xrootd
-    eend $?
-}

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index cb56d9f..e7da68b 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bircoph@gmail.com</email>
-  <name>Andrew Savchenko</name>
-  <description>Maintainer. Assign bugs to him</description>
-</maintainer>
-<herd>sci-physics</herd>
-<longdescription lang="en">
+	<maintainer>
+		<email>bircoph@gmail.com</email>
+		<name>Andrew Savchenko</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<herd>sci-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
@@ -15,17 +15,16 @@
   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 <pkg>sys-devel/gcc</pkg>>=4.7.0</flag>
-  <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
-  <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-  <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag>
-  <flag name="htmldoc">Generate html documentation</flag>
-  <flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
-  <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
-  <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
-  <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
-  <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
-  <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
-</use>
+	<use>
+		<flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>&gt;=4.7.0</flag>
+		<flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
+		<flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+		<flag name="htmldoc">Generate html documentation</flag>
+		<flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
+		<flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
+		<flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
+		<flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
+		<flag name="reflex">Build the reflection database for the C++ interpreter</flag>
+		<flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
+	</use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-5.34.00.ebuild b/sci-physics/root/root-5.34.00.ebuild
index 2a75fd8..54afec9 100644
--- a/sci-physics/root/root-5.34.00.ebuild
+++ b/sci-physics/root/root-5.34.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.00.ebuild,v 1.2 2012/06/28 17:02:39 jlec Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 multilib python ${_SVN} toolchain-funcs user versionator
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -37,7 +37,7 @@ SRC_URI="${SRC_URI}
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="+X afs avahi c++0x clarens doc emacs examples fits fftw graphviz htmldoc
+IUSE="+X afs avahi -c++0x clarens doc emacs examples fits fftw graphviz htmldoc
 	kerberos ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix
 	pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
@@ -75,7 +75,6 @@ CDEPEND="
 		)
 	afs? ( net-fs/openafs )
 	avahi? ( net-dns/avahi )
-	c++0x? ( >=sys-devel/gcc-4.7.0 )
 	clarens? ( dev-libs/xmlrpc-c[curl] )
 	emacs? ( virtual/emacs )
 	fits? ( sci-libs/cfitsio )
@@ -131,8 +130,8 @@ pkg_setup() {
 
 	if use math; then
 		if use openmp; then
-			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-				ewarn "You are using a gcc without OpenMP capabilities"
+			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
+				ewarn "You are using a g++ without OpenMP capabilities"
 				die "Need an OpenMP capable compiler"
 			else
 				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
@@ -141,6 +140,11 @@ pkg_setup() {
 			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
 		fi
 	fi
+	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
+		! version_is_at_least "4.7" "$(gcc-version)"; then
+		eerror "You are using a g++ without C++0x capabilities"
+		die "Need an C++0x capable compiler"
+	fi
 }
 
 src_prepare() {

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index e9b5476..689046e 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 multilib python ${_SVN} toolchain-funcs user versionator
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -37,7 +37,7 @@ SRC_URI="${SRC_URI}
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="+X afs avahi c++0x clarens doc emacs examples fits fftw graphviz htmldoc
+IUSE="+X afs avahi -c++0x clarens doc emacs examples fits fftw graphviz htmldoc
 	kerberos ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
 	pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
@@ -75,7 +75,6 @@ CDEPEND="
 		)
 	afs? ( net-fs/openafs )
 	avahi? ( net-dns/avahi )
-	c++0x? ( >=sys-devel/gcc-4.7.0 )
 	clarens? ( dev-libs/xmlrpc-c[curl] )
 	emacs? ( virtual/emacs )
 	fits? ( sci-libs/cfitsio )
@@ -132,8 +131,8 @@ pkg_setup() {
 
 	if use math; then
 		if use openmp; then
-			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-				ewarn "You are using a gcc without OpenMP capabilities"
+			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
+				ewarn "You are using a g++ without OpenMP capabilities"
 				die "Need an OpenMP capable compiler"
 			else
 				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
@@ -142,6 +141,11 @@ pkg_setup() {
 			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
 		fi
 	fi
+	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
+		! version_is_at_least "4.7" "$(gcc-version)"; then
+		eerror "You are using a g++ without C++0x capabilities"
+		die "Need an C++0x capable compiler"
+	fi
 }
 
 src_prepare() {



^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-07-21 17:12 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-07-21 17:12 UTC (permalink / raw
  To: gentoo-commits

commit:     7ed79edb194c4c6625804dad7ca17109ef56967a
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Jul 21 17:11:40 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sat Jul 21 17:11:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7ed79edb

sci-physics/root: fix bug 426432

---
 sci-physics/root/ChangeLog                         |    6 +++++
 .../files/root-5.32.00-explicit-functions.patch    |   18 -----------------
 .../root/{root-9999.ebuild => root-5.34.00.ebuild} |   21 +++++++++----------
 sci-physics/root/root-9999.ebuild                  |    8 +++---
 4 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index cd986fd..f03cc43 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 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 $
 
+  21 Jul 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-5.32.00-explicit-functions.patch, +root-5.34.00.ebuild,
+  root-9999.ebuild:
+  Fix bug 426432: xft now is a strict dependency for X.
+  Remove unused.
+
   01 Jul 2012; Andrew Savchenko <bircoph@gmail.com> root-5.34.00.ebuild,
   root-9999.ebuild, -files/olbd.confd, -files/olbd.initd, -files/xrootd.confd,
   -files/xrootd.initd, metadata.xml:

diff --git a/sci-physics/root/files/root-5.32.00-explicit-functions.patch b/sci-physics/root/files/root-5.32.00-explicit-functions.patch
deleted file mode 100644
index 570d61e..0000000
--- a/sci-physics/root/files/root-5.32.00-explicit-functions.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- root/io/io/Module.mk.orig	2012-02-29 19:46:38.000000000 +0400
-+++ root/io/io/Module.mk	2012-03-09 02:29:19.905665572 +0400
-@@ -67,15 +67,5 @@
- distclean::     distclean-$(MODNAME)
- 
- ##### extra rules ######
--#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
--ifeq ($(GCC_VERS),gcc-4.4)
--ifneq ($(filter -O%,$(OPT)),)
-    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
--endif
--endif
--ifeq ($(GCC_VERS),gcc-4.5)
--ifneq ($(filter -O%,$(OPT)),)
-    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
--endif
--endif
--

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-5.34.00.ebuild
similarity index 94%
copy from sci-physics/root/root-9999.ebuild
copy to sci-physics/root/root-5.34.00.ebuild
index 689046e..358fed1 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-5.34.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.00.ebuild,v 1.3 2012/07/03 18:58:04 jlec Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 multilib python ${_SVN} toolchain-funcs user versionator
+inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN} versionator
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -38,8 +38,8 @@ SRC_URI="${SRC_URI}
 SLOT="0"
 LICENSE="LGPL-2.1"
 IUSE="+X afs avahi -c++0x clarens doc emacs examples fits fftw graphviz htmldoc
-	kerberos ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
-	pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
+	kerberos ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix
+	pythia6 pythia8 python qt4 +reflex ruby ssl xinetd xml xrootd"
 
 CDEPEND="
 	app-arch/xz-utils
@@ -71,7 +71,7 @@ CDEPEND="
 			x11-libs/qt-svg:4
 			x11-libs/qt-webkit:4
 			x11-libs/qt-xmlpatterns:4 )
-		xft? ( x11-libs/libXft )
+		x11-libs/libXft
 		)
 	afs? ( net-fs/openafs )
 	avahi? ( net-dns/avahi )
@@ -82,7 +82,6 @@ CDEPEND="
 	graphviz? ( media-gfx/graphviz )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	llvm? ( =sys-devel/clang-9999 =sys-devel/llvm-9999 )
 	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
 	mysql? ( virtual/mysql )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
@@ -109,7 +108,7 @@ RDEPEND="
 PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
 
 REQUIRED_USE="
-	!X? ( !opengl !qt4 !xft )
+	!X? ( !opengl !qt4 )
 	mpi? ( math !openmp )
 	openmp? ( math !mpi )"
 
@@ -117,6 +116,7 @@ S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	fortran-2_pkg_setup
+	python_set_active_version 2
 	python_pkg_setup
 	echo
 	elog "There are extra options on packages not yet in Gentoo:"
@@ -157,7 +157,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-9999-dotfont.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -221,7 +221,6 @@ src_configure() {
 		--with-f77=$(tc-getFC) \
 		--with-ld=$(tc-getCXX) \
 		--with-afs-shared=yes \
-		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
 		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
 		--disable-builtin-afterimage \
 		--disable-builtin-freetype \
@@ -230,6 +229,7 @@ src_configure() {
 		--disable-builtin-pcre \
 		--disable-builtin-zlib \
 		--disable-builtin-lzma \
+		--disable-cling \
 		--enable-astiff \
 		--enable-explicitlink \
 		--enable-gdml \
@@ -241,6 +241,7 @@ src_configure() {
 		--fail-on-missing \
 		$(use_enable X x11) \
 		$(use_enable X asimage) \
+		$(use_enable X xft) \
 		$(use_enable afs) \
 		$(use_enable avahi bonjour) \
 		$(use_enable clarens) \
@@ -250,7 +251,6 @@ src_configure() {
 		$(use_enable graphviz gviz) \
 		$(use_enable kerberos krb5) \
 		$(use_enable ldap) \
-		$(use_enable llvm cling) \
 		$(use_enable math gsl-shared) \
 		$(use_enable math genvector) \
 		$(use_enable math mathmore) \
@@ -272,7 +272,6 @@ src_configure() {
 		$(use_enable reflex) \
 		$(use_enable ruby) \
 		$(use_enable ssl) \
-		$(use_enable xft) \
 		$(use_enable xml) \
 		$(use_enable xrootd) \
 		${EXTRA_ECONF} \

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 689046e..d28ef75 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -39,7 +39,7 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 IUSE="+X afs avahi -c++0x clarens doc emacs examples fits fftw graphviz htmldoc
 	kerberos ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
-	pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
+	pythia6 pythia8 python qt4 +reflex ruby ssl xinetd xml xrootd"
 
 CDEPEND="
 	app-arch/xz-utils
@@ -71,7 +71,7 @@ CDEPEND="
 			x11-libs/qt-svg:4
 			x11-libs/qt-webkit:4
 			x11-libs/qt-xmlpatterns:4 )
-		xft? ( x11-libs/libXft )
+		x11-libs/libXft
 		)
 	afs? ( net-fs/openafs )
 	avahi? ( net-dns/avahi )
@@ -109,7 +109,7 @@ RDEPEND="
 PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
 
 REQUIRED_USE="
-	!X? ( !opengl !qt4 !xft )
+	!X? ( !opengl !qt4 )
 	mpi? ( math !openmp )
 	openmp? ( math !mpi )"
 
@@ -241,6 +241,7 @@ src_configure() {
 		--fail-on-missing \
 		$(use_enable X x11) \
 		$(use_enable X asimage) \
+		$(use_enable X xft) \
 		$(use_enable afs) \
 		$(use_enable avahi bonjour) \
 		$(use_enable clarens) \
@@ -272,7 +273,6 @@ src_configure() {
 		$(use_enable reflex) \
 		$(use_enable ruby) \
 		$(use_enable ssl) \
-		$(use_enable xft) \
 		$(use_enable xml) \
 		$(use_enable xrootd) \
 		${EXTRA_ECONF} \


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-07-22  8:03 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-07-22  8:03 UTC (permalink / raw
  To: gentoo-commits

commit:     a115046e7624dd639db7afea3b3863bc1aedab36
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Jul 22 08:02:06 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Jul 22 08:02:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a115046e

sci-physics/root: improve cling support

However, patched llvm/clang is still required.

---
 sci-physics/root/ChangeLog                   |    6 ++++++
 sci-physics/root/files/root-9999-cling.patch |   13 +++++++++++++
 sci-physics/root/root-9999.ebuild            |    3 ++-
 3 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 6867500..f575ac2 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 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 $
 
+  22 Jul 2012; Andrew Savchenko <bircoph@gmail.com> root-9999.ebuild,
+  +files/root-9999-cling.patch:
+  One step further to build with cling. But ATM patched version of
+  llvm/clang is still required. Perhaps, we should install it
+  elsewhere as a separate package?
+
   21 Jul 2012; Andrew Savchenko <bircoph@gmail.com> root-9999.ebuild,
   metadata.xml:
   Clarens and PEAC were removed from ROOT.

diff --git a/sci-physics/root/files/root-9999-cling.patch b/sci-physics/root/files/root-9999-cling.patch
new file mode 100644
index 0000000..9c240dd
--- /dev/null
+++ b/sci-physics/root/files/root-9999-cling.patch
@@ -0,0 +1,13 @@
+--- root/core/utils/Module.mk.orig	2012-07-22 11:18:33.000000000 +0400
++++ root/core/utils/Module.mk	2012-07-22 11:20:02.633436297 +0400
+@@ -95,6 +95,10 @@
+ 	$(MAKEDIR)
+ 	cp $< $@
+ 
++$(UTILSDIRS)/%_tmp.cxx: $(UTILSDIRS)/%.cxx
++	$(MAKEDIR)
++	cp $< $@
++
+ $(call stripsrc,$(UTILSDIRS)/rootcint_tmp.o): $(call stripsrc,$(UTILSDIRS)/rootcint_tmp.cxx)
+ 
+ $(call stripsrc,$(UTILSDIRS)/RStl_tmp.o): $(call stripsrc,$(UTILSDIRS)/RStl_tmp.cxx)

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 4e2f20d..af9c8ad 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -157,7 +157,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-9999-dotfont.patch
+		"${FILESDIR}"/${PN}-9999-dotfont.patch \
+		"${FILESDIR}"/${PN}-9999-cling.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-07-23 21:11 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-07-23 21:11 UTC (permalink / raw
  To: gentoo-commits

commit:     45c88b5f2265c3a14b3000462d9af88be4754aa1
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Mon Jul 23 21:10:49 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Mon Jul 23 21:10:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=45c88b5f

sci-physics/root: update User's Guide

---
 sci-physics/root/ChangeLog                         |    4 ++
 .../root/files/root-5.28.00b-asneeded.patch        |   20 -------
 sci-physics/root/files/root-5.32.00-dotfont.patch  |   58 --------------------
 3 files changed, 4 insertions(+), 78 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index ca85e0b..f98dcd9 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 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 Jul 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-5.28.00b-asneeded.patch, -files/root-5.32.00-dotfont.patch:
+  Update User's Guide. Remove old.
+
 *root-5.34.01 (22 Jul 2012)
 
   22 Jul 2012; Andrew Savchenko <bircoph@gmail.com> -root-5.34.00.ebuild,

diff --git a/sci-physics/root/files/root-5.28.00b-asneeded.patch b/sci-physics/root/files/root-5.28.00b-asneeded.patch
deleted file mode 100644
index b845247..0000000
--- a/sci-physics/root/files/root-5.28.00b-asneeded.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- root.orig/configure	2010-12-20 07:17:54.000000000 +0000
-+++ root/configure	2010-12-20 07:16:05.000000000 +0000
-@@ -709,7 +709,7 @@
-        cat <<EOF > conftest.mk
- include ${ac_srcdir}/config/Makefile.${arch}
- conftest: conftest.c
--	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
-+	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib  -o \$@
- 
- conftest.c:
- 	echo "int main() { return 0; }" > \$@
-@@ -723,7 +723,7 @@
-        cat <<EOF > conftest.mk
- include ${ac_srcdir}/config/Makefile.${arch}
- conftest:conftest.c
--	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
-+	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@
- 
- conftest.c:
- 	echo "extern int $linksymbol (); " > \$@

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..0000000
--- 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.000000000 +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;
--   outdot << "  node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << endl;
-+   outdot << "  node [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::list<std::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;


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-10-19 21:32 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-10-19 21:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ad450b5a8244258f75e1db6030e51b437129cee8
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Oct 19 21:31:37 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Oct 19 21:31:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ad450b5a

sci-physics/root: version bump

Version bump in 5.32 and 5.34 branches.

---
 sci-physics/root/ChangeLog                         |   12 +
 .../root/files/root-5.28.00b-asneeded.patch        |   20 +
 .../root/files/root-5.28.00b-nobyte-compile.patch  |  138 +++++++
 .../files/root-5.28.00h-explicit-functions.patch   |   12 +
 sci-physics/root/files/root-5.32.00-dotfont.patch  |   58 +++
 .../files/root-5.32.00-explicit-functions.patch    |   18 +
 sci-physics/root/files/root-5.34.01-glibc216.patch |   35 ++
 sci-physics/root/metadata.xml                      |    1 +
 sci-physics/root/root-5.32.04.ebuild               |  378 +++++++++++++++++++
 sci-physics/root/root-5.34.02.ebuild               |  379 ++++++++++++++++++++
 10 files changed, 1051 insertions(+), 0 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index f98dcd9..77624c1 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,18 @@
 # Copyright 1999-2012 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.02 (19 Oct 2012)
+*root-5.32.04 (19 Oct 2012)
+
+  19 Oct 2012; Andrew Savchenko <bircoph@gmail.com>
+  +files/root-5.28.00b-asneeded.patch,
+  +files/root-5.28.00b-nobyte-compile.patch,
+  +files/root-5.28.00h-explicit-functions.patch,
+  +files/root-5.32.00-dotfont.patch,
+  +files/root-5.32.00-explicit-functions.patch, +root-5.32.04.ebuild,
+  +files/root-5.34.01-glibc216.patch, +root-5.34.02.ebuild:
+  Version bump for 5.32.04 and 5.34.02 patch releases.
+
   23 Jul 2012; Andrew Savchenko <bircoph@gmail.com>
   -files/root-5.28.00b-asneeded.patch, -files/root-5.32.00-dotfont.patch:
   Update User's Guide. Remove old.

diff --git a/sci-physics/root/files/root-5.28.00b-asneeded.patch b/sci-physics/root/files/root-5.28.00b-asneeded.patch
new file mode 100644
index 0000000..b845247
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00b-asneeded.patch
@@ -0,0 +1,20 @@
+--- root.orig/configure	2010-12-20 07:17:54.000000000 +0000
++++ root/configure	2010-12-20 07:16:05.000000000 +0000
+@@ -709,7 +709,7 @@
+        cat <<EOF > conftest.mk
+ include ${ac_srcdir}/config/Makefile.${arch}
+ conftest: conftest.c
+-	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
++	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib  -o \$@
+ 
+ conftest.c:
+ 	echo "int main() { return 0; }" > \$@
+@@ -723,7 +723,7 @@
+        cat <<EOF > conftest.mk
+ include ${ac_srcdir}/config/Makefile.${arch}
+ conftest:conftest.c
+-	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
++	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@
+ 
+ conftest.c:
+ 	echo "extern int $linksymbol (); " > \$@

diff --git a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
new file mode 100644
index 0000000..7029bf1
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
@@ -0,0 +1,138 @@
+diff -Naur root.orig/Makefile root/Makefile
+--- root.orig/Makefile	2010-12-17 22:48:40.577775091 +0300
++++ root/Makefile	2010-12-17 22:49:27.902497903 +0300
+@@ -1148,10 +1148,7 @@
+ 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
+ 	   fi; \
+-	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
+-	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
+-	   fi; \
+-	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
++	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      dir=$(RFLX_GRFLXDD:lib/=); \
+ 	      while test "x$${dir}" != "x" && \
+ 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
+diff -Naur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
+--- root.orig/bindings/pyroot/Module.mk	2010-12-17 22:48:39.941179413 +0300
++++ root/bindings/pyroot/Module.mk	2010-12-17 22:49:27.899164943 +0300
+@@ -48,8 +48,6 @@
+ ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
+ $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
+ endif
+-ROOTPYC      := $(ROOTPY:.py=.pyc)
+-ROOTPYO      := $(ROOTPY:.py=.pyo)
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
+@@ -68,10 +66,8 @@
+ 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)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
+@@ -113,7 +109,7 @@
+ 
+ distclean-$(MODNAME): clean-$(MODNAME)
+ 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
+-		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
++		   $(ROOTPY) $(PYROOTMAP) \
+ 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
+ 
+ distclean::     distclean-$(MODNAME)
+diff -Naur root.orig/build/package/debian/rules root/build/package/debian/rules
+--- root.orig/build/package/debian/rules	2010-12-17 22:48:40.197817461 +0300
++++ root/build/package/debian/rules	2010-12-17 22:49:27.902497903 +0300
+@@ -623,10 +623,6 @@
+ 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
+ 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			
+ #		$(foreach i, \
+ #		   $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
+ #		    -X$(i:$(DTMP)/%=%) )
+diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk
+--- root.orig/cint/cintex/Module.mk	2010-12-17 22:48:40.057833071 +0300
++++ root/cint/cintex/Module.mk	2010-12-17 22:49:27.902497903 +0300
+@@ -31,10 +31,6 @@
+ CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
+ $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
+ endif
+-ifneq ($(BUILDPYTHON),no)
+-CINTEXPYC    := $(CINTEXPY:.py=.pyc)
+-CINTEXPYO    := $(CINTEXPY:.py=.pyo)
+-endif
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
+@@ -86,8 +82,6 @@
+ 		fi)
+ 		cp $< $@
+ 
+-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
+-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
+                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
+diff -Naur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk
+--- root.orig/cint/reflex/Module.mk	2010-12-17 22:48:40.037835301 +0300
++++ root/cint/reflex/Module.mk	2010-12-17 22:51:36.871451359 +0300
+@@ -48,9 +48,6 @@
+ RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
+ RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
+ RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
+-ifneq ($(BUILDPYTHON),no)
+-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
+-endif
+ 
+ RFLX_LIBDIR = $(LIBDIR)
+ 
+@@ -92,7 +89,7 @@
+ 
+ ALLEXECS += $(RFLX_GENMAPX)
+ 
+-POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++POSTBIN  += $(RFLX_GRFLXPY)
+ 
+ ##### local rules #####
+ .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
+@@ -122,8 +119,6 @@
+ 		  mkdir -p lib/python/genreflex; fi )
+ 		cp $< $@
+ 
+-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
+-		@python -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
+ 
+@@ -149,7 +144,7 @@
+ 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
+ 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
+ 
+-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
+ 
+ clean-genreflex:
+ 		@rm -rf lib/python/genreflex
+diff -Naur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
+--- root.orig/cint/reflex/python/CMakeLists.txt	2010-12-17 22:48:40.037835301 +0300
++++ root/cint/reflex/python/CMakeLists.txt	2010-12-17 22:49:27.902497903 +0300
+@@ -15,7 +15,7 @@
+ #####################   sources   ####################
+ 
+ FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
+-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
++SET(GENREFLEX_SCRIPT PARENT_SCOPE)
+ 
+ #####################  gccxmlpath ####################
+ 
+

diff --git a/sci-physics/root/files/root-5.28.00h-explicit-functions.patch b/sci-physics/root/files/root-5.28.00h-explicit-functions.patch
new file mode 100644
index 0000000..918b696
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00h-explicit-functions.patch
@@ -0,0 +1,12 @@
+--- root/io/io/Module.mk.orig	2011-11-24 20:12:56.000000000 +0400
++++ root/io/io/Module.mk	2012-03-09 03:45:42.850549826 +0400
+@@ -67,9 +67,4 @@
+ distclean::     distclean-$(MODNAME)
+ 
+ ##### extra rules ######
+-#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
+-ifeq ($(GCC_VERS),gcc-4.4)
+-ifneq ($(filter -O%,$(OPT)),)
+    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
+-endif
+-endif

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 0000000..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.000000000 +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;
+-   outdot << "  node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << endl;
++   outdot << "  node [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::list<std::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-explicit-functions.patch b/sci-physics/root/files/root-5.32.00-explicit-functions.patch
new file mode 100644
index 0000000..570d61e
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-explicit-functions.patch
@@ -0,0 +1,18 @@
+--- root/io/io/Module.mk.orig	2012-02-29 19:46:38.000000000 +0400
++++ root/io/io/Module.mk	2012-03-09 02:29:19.905665572 +0400
+@@ -67,15 +67,5 @@
+ distclean::     distclean-$(MODNAME)
+ 
+ ##### extra rules ######
+-#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
+-ifeq ($(GCC_VERS),gcc-4.4)
+-ifneq ($(filter -O%,$(OPT)),)
+    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
+-endif
+-endif
+-ifeq ($(GCC_VERS),gcc-4.5)
+-ifneq ($(filter -O%,$(OPT)),)
+    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
+-endif
+-endif
+-

diff --git a/sci-physics/root/files/root-5.34.01-glibc216.patch b/sci-physics/root/files/root-5.34.01-glibc216.patch
new file mode 100644
index 0000000..b2da159
--- /dev/null
+++ b/sci-physics/root/files/root-5.34.01-glibc216.patch
@@ -0,0 +1,35 @@
+diff -ur root-5.34.00.orig/build/rmkdepend/main.c root-5.34.00/build/rmkdepend/main.c
+--- root-5.34.00.orig/build/rmkdepend/main.c	2012-06-05 15:31:46.000000000 +0200
++++ root-5.34.00/build/rmkdepend/main.c	2012-07-05 20:42:58.938953353 +0200
+@@ -60,7 +60,7 @@
+ #  endif
+ # elif defined(__CYGWIN__)
+ extern int fchmod(int, mode_t);
+-#else
++# elif !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 16)
+ extern int fchmod(int, int);
+ # endif
+ #endif
+diff -ur root-5.34.00.orig/cint/tool/rmkdepend/main.c root-5.34.00/cint/tool/rmkdepend/main.c
+--- root-5.34.00.orig/cint/tool/rmkdepend/main.c	2012-06-05 15:31:30.000000000 +0200
++++ root-5.34.00/cint/tool/rmkdepend/main.c	2012-07-05 20:42:58.492949104 +0200
+@@ -58,7 +58,7 @@
+ #if !defined(MAC_OS_X_VERSION_10_4)
+ extern int fchmod();
+ #endif
+-#else
++#elif !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 16)
+ extern int fchmod();
+ #endif
+ #endif
+diff -ur root-5.34.00.orig/core/unix/src/TUnixSystem.cxx root-5.34.00/core/unix/src/TUnixSystem.cxx
+--- root-5.34.00.orig/core/unix/src/TUnixSystem.cxx	2012-06-05 15:31:17.000000000 +0200
++++ root-5.34.00/core/unix/src/TUnixSystem.cxx	2012-07-05 20:29:29.969242837 +0200
+@@ -98,6 +98,7 @@
+ #include <pwd.h>
+ #include <grp.h>
+ #include <errno.h>
++#include <sys/resource.h>
+ #include <sys/wait.h>
+ #include <time.h>
+ #include <sys/time.h>

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index bea8306..705abb6 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -17,6 +17,7 @@
 </longdescription>
 	<use>
 		<flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>&gt;=4.7.0</flag>
+		<flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
 		<flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
 		<flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
 		<flag name="htmldoc">Generate html documentation</flag>

diff --git a/sci-physics/root/root-5.32.04.ebuild b/sci-physics/root/root-5.32.04.ebuild
new file mode 100644
index 0000000..1e6d663
--- /dev/null
+++ b/sci-physics/root/root-5.32.04.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.03-r2.ebuild,v 1.5 2012/10/16 18:50:45 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+
+if [[ ${PV} == "9999" ]] ; then
+	_SVN=subversion
+	ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk"
+	ESVN_OPTIONS="--non-interactive --trust-server-cert"
+	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
+
+inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
+
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+PATCH_PV2=5.32.00
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="${SRC_URI}
+	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf
+		math? (
+			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
+		htmldoc? (
+			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerberos
+	ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6
+	pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
+
+CDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-fonts/dejavu
+	media-libs/freetype
+	media-libs/giflib
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/shadow
+	X? (
+		media-libs/ftgl
+		media-libs/glew
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		|| (
+			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
+			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+		)
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+		qt4? (
+			x11-libs/qt-gui:4
+			x11-libs/qt-opengl:4
+			x11-libs/qt-qt3support:4
+			x11-libs/qt-svg:4
+			x11-libs/qt-webkit:4
+			x11-libs/qt-xmlpatterns:4 )
+		xft? ( x11-libs/libXft )
+		)
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi )
+	clarens? ( dev-libs/xmlrpc-c[curl] )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio )
+	fftw? ( sci-libs/fftw:3.0 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	ruby? (
+			dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )
+	xrootd? ( net-libs/xrootd )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
+
+REQUIRED_USE="
+	!X? ( !opengl !qt4 !xft )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python_pkg_setup
+	echo
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
+	echo
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	if use math; then
+		if use openmp; then
+			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+				ewarn "You are using a gcc without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+	rm -rf graf2d/asimage/src/libAfterImage || die
+	rm -rf graf3d/ftgl/{inc,src} || die
+	rm -rf graf2d/freetype/src || die
+	rm -rf graf3d/glew/{inc,src} || die
+	rm -rf core/pcre/src || die
+	rm -rf math/unuran/src/unuran-*.tar.gz || die
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
+	rm -rf core/lzma/src/*.tar.gz || die
+	rm graf3d/gl/{inc,src}/gl2ps.* || die
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+
+	# Make html docs self-consistent for offline work (based on Fedora spec)
+	if use htmldoc; then
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
+		# make images local
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
+			-i etc/html/header.html || die "htmldoc sed failed"
+
+		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
+			die "htmldoc preparation failed"
+	fi
+}
+
+src_configure() {
+	# the configure script is not the standard autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
+		--with-afs-shared=yes \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-builtin-lzma \
+		--disable-cling \
+		--enable-astiff \
+		--enable-exceptions	\
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		$(use_enable X x11) \
+		$(use_enable X asimage) \
+		$(use_enable afs) \
+		$(use_enable avahi bonjour) \
+		$(use_enable clarens) \
+		$(use_enable clarens peac) \
+		$(use_enable fits fitsio) \
+		$(use_enable fftw fftw3) \
+		$(use_enable graphviz gviz) \
+		$(use_enable kerberos krb5) \
+		$(use_enable ldap) \
+		$(use_enable math gsl-shared) \
+		$(use_enable math genvector) \
+		$(use_enable math mathmore) \
+		$(use_enable math minuit2) \
+		$(use_enable math roofit) \
+		$(use_enable math tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable postgres pgsql) \
+		$(use_enable prefix rpath) \
+		$(use_enable pythia6) \
+		$(use_enable pythia8) \
+		$(use_enable python) \
+		$(use_enable qt4 qt) \
+		$(use_enable qt4 qtgsi) \
+		$(use_enable reflex cintex) \
+		$(use_enable reflex) \
+		$(use_enable ruby) \
+		$(use_enable ssl) \
+		$(use_enable xft) \
+		$(use_enable xml) \
+		$(use_enable xrootd) \
+		${EXTRA_ECONF} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}"
+	if use emacs; then
+		elisp-compile build/misc/*.el || die "elisp-compile failed"
+	fi
+}
+
+doc_install() {
+	cd "${S}"
+	if use doc; then
+		einfo "Installing user's guides"
+		dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	fi
+
+	if use examples; then
+		# these should really be taken care of by the root make install
+		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
+		doins -r tmva/test
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+	fi
+}
+
+daemon_install() {
+	cd "${S}"
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins etc/daemons/{rootd,proofd}.xinetd
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	sed -e 's,@prefix@,/usr,' \
+		build/package/debian/root-system-bin.desktop.in > root.desktop
+	domenu root.desktop
+	doicon "${S}"/build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	doenvd 99root
+
+	# The build system installs Emacs support unconditionally and in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -rf "${ED}"/usr/share/emacs
+	if use emacs; then
+		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
+	fi
+
+	doc_install
+	daemon_install
+	desktop_install
+
+	# Cleanup of files either already distributed or unused on Gentoo
+	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
+	rm "${ED}"usr/share/root/fonts/LICENSE || die
+	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
+	rm -f posix/mktypes dll_stl/setup \
+		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
+	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
+	rm -f "${ED}"/etc/root/proof/*.sample || die
+	rm -rf "${ED}"/etc/root/daemons || die
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin/ || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_optimize /usr/$(get_libdir)/root
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_cleanup /usr/$(get_libdir)/root
+}

diff --git a/sci-physics/root/root-5.34.02.ebuild b/sci-physics/root/root-5.34.02.ebuild
new file mode 100644
index 0000000..9f28943
--- /dev/null
+++ b/sci-physics/root/root-5.34.02.ebuild
@@ -0,0 +1,379 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.01.ebuild,v 1.2 2012/10/16 18:50:45 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+
+if [[ ${PV} == "9999" ]] ; then
+	_SVN=subversion
+	ESVN_REPO_URI="http://root.cern.ch/svn/root/trunk"
+	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
+
+inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN} versionator
+
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+PATCH_PV2=5.32.00
+PATCH_PV3=5.34.01
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="${SRC_URI}
+	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf -> ROOTUsersGuide-${PV}.pdf
+		math? (
+			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
+		htmldoc? (
+			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="+X afs avahi -c++0x doc emacs examples fits fftw graphviz htmldoc
+	kerberos ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix
+	pythia6 pythia8 python qt4 +reflex ruby ssl xinetd xml xrootd"
+
+CDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-fonts/dejavu
+	media-libs/freetype
+	media-libs/giflib
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/shadow
+	X? (
+		media-libs/ftgl
+		media-libs/glew
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		|| (
+			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
+			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+		)
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+		qt4? (
+			x11-libs/qt-gui:4
+			x11-libs/qt-opengl:4
+			x11-libs/qt-qt3support:4
+			x11-libs/qt-svg:4
+			x11-libs/qt-webkit:4
+			x11-libs/qt-xmlpatterns:4 )
+			x11-libs/libXft
+		)
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio )
+	fftw? ( sci-libs/fftw:3.0 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	ruby? (
+			dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )
+	xrootd? ( >=net-libs/xrootd-3.2.0 )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
+
+REQUIRED_USE="
+	!X? ( !opengl !qt4 )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python_set_active_version 2
+	python_pkg_setup
+	echo
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
+	echo
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	if use math; then
+		if use openmp; then
+			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
+				ewarn "You are using a g++ without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
+		! version_is_at_least "4.7" "$(gcc-version)"; then
+		eerror "You are using a g++ without C++0x capabilities"
+		die "Need an C++0x capable compiler"
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV3}-glibc216.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+	rm -r graf2d/asimage/src/libAfterImage || die
+	rm -r graf3d/ftgl/{inc,src} || die
+	rm -r graf2d/freetype/src || die
+	rm -r graf3d/glew/{inc,src} || die
+	rm -r core/pcre/src || die
+	rm -r math/unuran/src/unuran-*.tar.gz || die
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
+	rm -r core/lzma/src/*.tar.gz || die
+	rm graf3d/gl/{inc,src}/gl2ps.* || die
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+
+	# Make html docs self-consistent for offline work (based on Fedora spec)
+	if use htmldoc; then
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
+		# make images local
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
+			-i etc/html/header.html || die "htmldoc sed failed"
+
+		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
+			die "htmldoc preparation failed"
+	fi
+}
+
+src_configure() {
+	# the configure script is not the standard autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
+		--with-afs-shared=yes \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-builtin-lzma \
+		--disable-cling \
+		--enable-astiff \
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		$(use_enable X x11) \
+		$(use_enable X asimage) \
+		$(use_enable X xft) \
+		$(use_enable afs) \
+		$(use_enable avahi bonjour) \
+		$(use_enable fits fitsio) \
+		$(use_enable fftw fftw3) \
+		$(use_enable graphviz gviz) \
+		$(use_enable kerberos krb5) \
+		$(use_enable ldap) \
+		$(use_enable math gsl-shared) \
+		$(use_enable math genvector) \
+		$(use_enable math mathmore) \
+		$(use_enable math minuit2) \
+		$(use_enable math roofit) \
+		$(use_enable math tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable postgres pgsql) \
+		$(use_enable prefix rpath) \
+		$(use_enable pythia6) \
+		$(use_enable pythia8) \
+		$(use_enable python) \
+		$(use_enable qt4 qt) \
+		$(use_enable qt4 qtgsi) \
+		$(use_enable reflex cintex) \
+		$(use_enable reflex) \
+		$(use_enable ruby) \
+		$(use_enable ssl) \
+		$(use_enable xml) \
+		$(use_enable xrootd) \
+		${EXTRA_ECONF} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
+	if use emacs; then
+		elisp-compile build/misc/*.el || die "elisp-compile failed"
+	fi
+}
+
+doc_install() {
+	cd "${S}"
+	if use doc; then
+		einfo "Installing user's guides"
+		dodoc "${DISTDIR}"/ROOTUsersGuide-${PV}.pdf
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	fi
+
+	if use examples; then
+		# these should really be taken care of by the root make install
+		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
+		doins -r tmva/test
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+	fi
+}
+
+daemon_install() {
+	cd "${S}"
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins etc/daemons/{rootd,proofd}.xinetd
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	sed -e 's,@prefix@,/usr,' \
+		build/package/debian/root-system-bin.desktop.in > root.desktop
+	domenu root.desktop
+	doicon "${S}"/build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	doenvd 99root
+
+	# The build system installs Emacs support unconditionally and in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -r "${ED}"/usr/share/emacs
+	if use emacs; then
+		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
+	fi
+
+	doc_install
+	daemon_install
+	desktop_install
+
+	# Cleanup of files either already distributed or unused on Gentoo
+	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
+	rm "${ED}"usr/share/root/fonts/LICENSE || die
+	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
+	rm posix/mktypes dll_stl/setup \
+		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
+	rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
+	rm "${ED}"/etc/root/proof/*.sample || die
+	rm -r "${ED}"/etc/root/daemons || die
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin/ || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_optimize /usr/$(get_libdir)/root
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_cleanup /usr/$(get_libdir)/root
+}


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-10-25 16:37 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-10-25 16:37 UTC (permalink / raw
  To: gentoo-commits

commit:     06ead511fb43504e0f262de74b294c03e38fb05a
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Oct 25 16:34:47 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Thu Oct 25 16:34:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=06ead511

sci-physics/root: version bump

---
 sci-physics/root/ChangeLog                         |    8 ++++
 sci-physics/root/files/root-5.34.01-glibc216.patch |   35 --------------------
 .../{root-5.34.02.ebuild => root-5.34.03.ebuild}   |    3 +-
 3 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 77624c1..65ee183 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2012 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.03 (25 Oct 2012)
+
+  25 Oct 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-5.34.01-glibc216.patch, -root-5.34.02.ebuild,
+  +root-5.34.03.ebuild:
+  Version bump with important fixes in RooFit.
+  Drop old.
+
 *root-5.34.02 (19 Oct 2012)
 *root-5.32.04 (19 Oct 2012)
 

diff --git a/sci-physics/root/files/root-5.34.01-glibc216.patch b/sci-physics/root/files/root-5.34.01-glibc216.patch
deleted file mode 100644
index b2da159..0000000
--- a/sci-physics/root/files/root-5.34.01-glibc216.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur root-5.34.00.orig/build/rmkdepend/main.c root-5.34.00/build/rmkdepend/main.c
---- root-5.34.00.orig/build/rmkdepend/main.c	2012-06-05 15:31:46.000000000 +0200
-+++ root-5.34.00/build/rmkdepend/main.c	2012-07-05 20:42:58.938953353 +0200
-@@ -60,7 +60,7 @@
- #  endif
- # elif defined(__CYGWIN__)
- extern int fchmod(int, mode_t);
--#else
-+# elif !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 16)
- extern int fchmod(int, int);
- # endif
- #endif
-diff -ur root-5.34.00.orig/cint/tool/rmkdepend/main.c root-5.34.00/cint/tool/rmkdepend/main.c
---- root-5.34.00.orig/cint/tool/rmkdepend/main.c	2012-06-05 15:31:30.000000000 +0200
-+++ root-5.34.00/cint/tool/rmkdepend/main.c	2012-07-05 20:42:58.492949104 +0200
-@@ -58,7 +58,7 @@
- #if !defined(MAC_OS_X_VERSION_10_4)
- extern int fchmod();
- #endif
--#else
-+#elif !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 16)
- extern int fchmod();
- #endif
- #endif
-diff -ur root-5.34.00.orig/core/unix/src/TUnixSystem.cxx root-5.34.00/core/unix/src/TUnixSystem.cxx
---- root-5.34.00.orig/core/unix/src/TUnixSystem.cxx	2012-06-05 15:31:17.000000000 +0200
-+++ root-5.34.00/core/unix/src/TUnixSystem.cxx	2012-07-05 20:29:29.969242837 +0200
-@@ -98,6 +98,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <errno.h>
-+#include <sys/resource.h>
- #include <sys/wait.h>
- #include <time.h>
- #include <sys/time.h>

diff --git a/sci-physics/root/root-5.34.02.ebuild b/sci-physics/root/root-5.34.03.ebuild
similarity index 99%
rename from sci-physics/root/root-5.34.02.ebuild
rename to sci-physics/root/root-5.34.03.ebuild
index 9f28943..1ce0d9c 100644
--- a/sci-physics/root/root-5.34.02.ebuild
+++ b/sci-physics/root/root-5.34.03.ebuild
@@ -155,8 +155,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV3}-glibc216.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2012-10-28 22:46 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2012-10-28 22:46 UTC (permalink / raw
  To: gentoo-commits

commit:     2a45c11233426aede4fa4edb2f74f0417fcd28cc
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Oct 28 22:39:12 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Oct 28 22:39:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2a45c112

sci-physics/root: remove unused patch

---
 sci-physics/root/ChangeLog                         |    4 ++++
 .../files/root-5.28.00h-explicit-functions.patch   |   12 ------------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 65ee183..eced212 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 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 $
 
+  28 Oct 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-5.28.00h-explicit-functions.patch:
+  Remove unused patch.
+
 *root-5.34.03 (25 Oct 2012)
 
   25 Oct 2012; Andrew Savchenko <bircoph@gmail.com>

diff --git a/sci-physics/root/files/root-5.28.00h-explicit-functions.patch b/sci-physics/root/files/root-5.28.00h-explicit-functions.patch
deleted file mode 100644
index 918b696..0000000
--- a/sci-physics/root/files/root-5.28.00h-explicit-functions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- root/io/io/Module.mk.orig	2011-11-24 20:12:56.000000000 +0400
-+++ root/io/io/Module.mk	2012-03-09 03:45:42.850549826 +0400
-@@ -67,9 +67,4 @@
- distclean::     distclean-$(MODNAME)
- 
- ##### extra rules ######
--#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
--ifeq ($(GCC_VERS),gcc-4.4)
--ifneq ($(filter -O%,$(OPT)),)
-    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
--endif
--endif


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2013-01-21 22:32 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2013-01-21 22:32 UTC (permalink / raw
  To: gentoo-commits

commit:     21d42709772f069ee251b1b82d412f727b77c63f
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Mon Jan 21 22:31:03 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Mon Jan 21 22:31:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=21d42709

Fix bug 452806

Honor system *FLAGS for all build objects.
Remove old version and old patches.

---
 sci-physics/root/ChangeLog                         |   12 +-
 .../root/files/root-5.28.00b-asneeded.patch        |   20 -
 .../root/files/root-5.28.00b-nobyte-compile.patch  |  138 -------
 .../root/files/root-5.28.00b-prop-ldflags.patch    |   13 -
 .../files/root-5.32.00-explicit-functions.patch    |   18 -
 .../root/files/root-5.32.00-prop-flags.patch       |   15 +
 sci-physics/root/metadata.xml                      |    1 -
 sci-physics/root/root-5.32.04.ebuild               |  378 --------------------
 sci-physics/root/root-5.34.03.ebuild               |    6 +-
 sci-physics/root/root-9999.ebuild                  |    4 +-
 10 files changed, 31 insertions(+), 574 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index f0d5394..ee4803a 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,7 +1,17 @@
 # ChangeLog for sci-physics/root
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 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 $
 
+  21 Jan 2013; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-5.28.00b-asneeded.patch,
+  -files/root-5.28.00b-nobyte-compile.patch,
+  -files/root-5.28.00b-prop-ldflags.patch,
+  -files/root-5.32.00-explicit-functions.patch,
+  +files/root-5.32.00-prop-flags.patch, -root-5.32.04.ebuild,
+  root-5.34.03.ebuild, root-9999.ebuild:
+  Honor system *FLAGS, this fixes bug 452806.
+  Remove old versions.
+
   28 Oct 2012; Andrew Savchenko <bircoph@gmail.com>
   -files/root-5.28.00h-explicit-functions.patch:
   Remove unused patch.

diff --git a/sci-physics/root/files/root-5.28.00b-asneeded.patch b/sci-physics/root/files/root-5.28.00b-asneeded.patch
deleted file mode 100644
index b845247..0000000
--- a/sci-physics/root/files/root-5.28.00b-asneeded.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- root.orig/configure	2010-12-20 07:17:54.000000000 +0000
-+++ root/configure	2010-12-20 07:16:05.000000000 +0000
-@@ -709,7 +709,7 @@
-        cat <<EOF > conftest.mk
- include ${ac_srcdir}/config/Makefile.${arch}
- conftest: conftest.c
--	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
-+	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib  -o \$@
- 
- conftest.c:
- 	echo "int main() { return 0; }" > \$@
-@@ -723,7 +723,7 @@
-        cat <<EOF > conftest.mk
- include ${ac_srcdir}/config/Makefile.${arch}
- conftest:conftest.c
--	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
-+	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@
- 
- conftest.c:
- 	echo "extern int $linksymbol (); " > \$@

diff --git a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
deleted file mode 100644
index 7029bf1..0000000
--- a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur root.orig/Makefile root/Makefile
---- root.orig/Makefile	2010-12-17 22:48:40.577775091 +0300
-+++ root/Makefile	2010-12-17 22:49:27.902497903 +0300
-@@ -1148,10 +1148,7 @@
- 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
- 	   fi; \
--	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
--	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
--	   fi; \
--	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      dir=$(RFLX_GRFLXDD:lib/=); \
- 	      while test "x$${dir}" != "x" && \
- 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-diff -Naur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.orig/bindings/pyroot/Module.mk	2010-12-17 22:48:39.941179413 +0300
-+++ root/bindings/pyroot/Module.mk	2010-12-17 22:49:27.899164943 +0300
-@@ -48,8 +48,6 @@
- ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
- $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
- endif
--ROOTPYC      := $(ROOTPY:.py=.pyc)
--ROOTPYO      := $(ROOTPY:.py=.pyo)
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- 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)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff -Naur root.orig/build/package/debian/rules root/build/package/debian/rules
---- root.orig/build/package/debian/rules	2010-12-17 22:48:40.197817461 +0300
-+++ root/build/package/debian/rules	2010-12-17 22:49:27.902497903 +0300
-@@ -623,10 +623,6 @@
- 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
- 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			
- #		$(foreach i, \
- #		   $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
- #		    -X$(i:$(DTMP)/%=%) )
-diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.orig/cint/cintex/Module.mk	2010-12-17 22:48:40.057833071 +0300
-+++ root/cint/cintex/Module.mk	2010-12-17 22:49:27.902497903 +0300
-@@ -31,10 +31,6 @@
- CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC    := $(CINTEXPY:.py=.pyc)
--CINTEXPYO    := $(CINTEXPY:.py=.pyo)
--endif
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- 		fi)
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.orig/cint/reflex/Module.mk	2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/Module.mk	2010-12-17 22:51:36.871451359 +0300
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
- 
- RFLX_LIBDIR = $(LIBDIR)
- 
-@@ -92,7 +89,7 @@
- 
- ALLEXECS += $(RFLX_GENMAPX)
- 
--POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN  += $(RFLX_GRFLXPY)
- 
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- 		  mkdir -p lib/python/genreflex; fi )
- 		cp $< $@
- 
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
--		@python -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
- 
-@@ -149,7 +144,7 @@
- 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
- 
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
- 
- clean-genreflex:
- 		@rm -rf lib/python/genreflex
-diff -Naur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.orig/cint/reflex/python/CMakeLists.txt	2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/python/CMakeLists.txt	2010-12-17 22:49:27.902497903 +0300
-@@ -15,7 +15,7 @@
- #####################   sources   ####################
- 
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
- 
- #####################  gccxmlpath ####################
- 
-

diff --git a/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch b/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch
deleted file mode 100644
index 7324319..0000000
--- a/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur root.orig/config/Makefile.in root/config/Makefile.in
---- root.orig/config/Makefile.in	2010-12-14 17:20:26.000000000 +0300
-+++ root/config/Makefile.in	2010-12-17 22:33:34.902161458 +0300
-@@ -27,7 +27,7 @@
- 
- EXTRA_CFLAGS   := -Iinclude @cflags@
- EXTRA_CXXFLAGS := -Iinclude @cflags@
--EXTRA_LDFLAGS  := @ldflags@
-+EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
- WINRTDEBUG     := @winrtdebug@
- 
- GLBPATCHFLAGS  := @glbpatchcflags@
-

diff --git a/sci-physics/root/files/root-5.32.00-explicit-functions.patch b/sci-physics/root/files/root-5.32.00-explicit-functions.patch
deleted file mode 100644
index 570d61e..0000000
--- a/sci-physics/root/files/root-5.32.00-explicit-functions.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- root/io/io/Module.mk.orig	2012-02-29 19:46:38.000000000 +0400
-+++ root/io/io/Module.mk	2012-03-09 02:29:19.905665572 +0400
-@@ -67,15 +67,5 @@
- distclean::     distclean-$(MODNAME)
- 
- ##### extra rules ######
--#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
--ifeq ($(GCC_VERS),gcc-4.4)
--ifneq ($(filter -O%,$(OPT)),)
-    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
--endif
--endif
--ifeq ($(GCC_VERS),gcc-4.5)
--ifneq ($(filter -O%,$(OPT)),)
-    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
--endif
--endif
--

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 0000000..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.in	2013-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/metadata.xml b/sci-physics/root/metadata.xml
index 94d70a3..86b00d1 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -17,7 +17,6 @@
 </longdescription>
 	<use>
 		<flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>&gt;=4.7.0</flag>
-		<flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
 		<flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
 		<flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
 		<flag name="htmldoc">Generate html documentation</flag>

diff --git a/sci-physics/root/root-5.32.04.ebuild b/sci-physics/root/root-5.32.04.ebuild
deleted file mode 100644
index 1e6d663..0000000
--- a/sci-physics/root/root-5.32.04.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.03-r2.ebuild,v 1.5 2012/10/16 18:50:45 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
-
-if [[ ${PV} == "9999" ]] ; then
-	_SVN=subversion
-	ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk"
-	ESVN_OPTIONS="--non-interactive --trust-server-cert"
-	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
-
-inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
-
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.32.00
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="${SRC_URI}
-	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf
-		math? (
-			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
-		htmldoc? (
-			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerberos
-	ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6
-	pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
-
-CDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-fonts/dejavu
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/shadow
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| (
-			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
-			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
-		)
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		qt4? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-opengl:4
-			x11-libs/qt-qt3support:4
-			x11-libs/qt-svg:4
-			x11-libs/qt-webkit:4
-			x11-libs/qt-xmlpatterns:4 )
-		xft? ( x11-libs/libXft )
-		)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c[curl] )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	xrootd? ( net-libs/xrootd )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
-
-REQUIRED_USE="
-	!X? ( !opengl !qt4 !xft )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp; then
-			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-				ewarn "You are using a gcc without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -rf graf2d/asimage/src/libAfterImage || die
-	rm -rf graf3d/ftgl/{inc,src} || die
-	rm -rf graf2d/freetype/src || die
-	rm -rf graf3d/glew/{inc,src} || die
-	rm -rf core/pcre/src || die
-	rm -rf math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
-	rm -rf core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-
-	# Make html docs self-consistent for offline work (based on Fedora spec)
-	if use htmldoc; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
-		# make images local
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
-			-i etc/html/header.html || die "htmldoc sed failed"
-
-		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
-			die "htmldoc preparation failed"
-	fi
-}
-
-src_configure() {
-	# the configure script is not the standard autotools
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-ld=$(tc-getCXX) \
-		--with-afs-shared=yes \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--disable-cling \
-		--enable-astiff \
-		--enable-exceptions	\
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable postgres pgsql) \
-		$(use_enable prefix rpath) \
-		$(use_enable pythia6) \
-		$(use_enable pythia8) \
-		$(use_enable python) \
-		$(use_enable qt4 qt) \
-		$(use_enable qt4 qtgsi) \
-		$(use_enable reflex cintex) \
-		$(use_enable reflex) \
-		$(use_enable ruby) \
-		$(use_enable ssl) \
-		$(use_enable xft) \
-		$(use_enable xml) \
-		$(use_enable xrootd) \
-		${EXTRA_ECONF} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}"
-	if use emacs; then
-		elisp-compile build/misc/*.el || die "elisp-compile failed"
-	fi
-}
-
-doc_install() {
-	cd "${S}"
-	if use doc; then
-		einfo "Installing user's guides"
-		dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	fi
-
-	if use examples; then
-		# these should really be taken care of by the root make install
-		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
-		doins -r tmva/test
-	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-}
-
-daemon_install() {
-	cd "${S}"
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	sed -e 's,@prefix@,/usr,' \
-		build/package/debian/root-system-bin.desktop.in > root.desktop
-	domenu root.desktop
-	doicon "${S}"/build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root
-
-	# The build system installs Emacs support unconditionally and in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -rf "${ED}"/usr/share/emacs
-	if use emacs; then
-		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
-	fi
-
-	doc_install
-	daemon_install
-	desktop_install
-
-	# Cleanup of files either already distributed or unused on Gentoo
-	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
-	rm "${ED}"usr/share/root/fonts/LICENSE || die
-	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm -f posix/mktypes dll_stl/setup \
-		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
-	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
-	rm -f "${ED}"/etc/root/proof/*.sample || die
-	rm -rf "${ED}"/etc/root/daemons || die
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin/ || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
-}

diff --git a/sci-physics/root/root-5.34.03.ebuild b/sci-physics/root/root-5.34.03.ebuild
index 1ce0d9c..f410d92 100644
--- a/sci-physics/root/root-5.34.03.ebuild
+++ b/sci-physics/root/root-5.34.03.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.01.ebuild,v 1.2 2012/10/16 18:50:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.03.ebuild,v 1.1 2012/10/26 15:40:47 bicatali Exp $
 
 EAPI=4
 
@@ -148,7 +148,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 9523e3a..c987a03 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
 
@@ -148,7 +148,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2013-02-23 12:45 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2013-02-23 12:45 UTC (permalink / raw
  To: gentoo-commits

commit:     ad17e8d42638b8f63f720365c8374ff34140b91d
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Feb 23 12:39:29 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sat Feb 23 12:39:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ad17e8d4

sci-physics/root: version bump

---
 sci-physics/root/ChangeLog                         |    6 +
 .../root/files/root-5.34.05-nobyte-compile.patch   |  137 ++++++++++++++++++++
 .../{root-5.34.03.ebuild => root-5.34.05.ebuild}   |    7 +-
 3 files changed, 147 insertions(+), 3 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index ee4803a..577734d 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 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.05 (23 Feb 2013)
+
+  23 Feb 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.34.03.ebuild,
+  +root-5.34.05.ebuild, +files/root-5.34.05-nobyte-compile.patch:
+  Version bump.
+
   21 Jan 2013; Andrew Savchenko <bircoph@gmail.com>
   -files/root-5.28.00b-asneeded.patch,
   -files/root-5.28.00b-nobyte-compile.patch,

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 0000000..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.orig	2013-02-15 02:27:56.000000000 +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 "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      dir=$(subst lib/,,$(RFLX_GRFLXDD)); \
+ 	      while test "x$${dir}" != "x" && \
+ 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
+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 $< $@
+ endif
+-ROOTPYC      := $(ROOTPY:.py=.pyc)
+-ROOTPYO      := $(ROOTPY:.py=.pyo)
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
+@@ -68,10 +66,8 @@
+ 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)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
+@@ -113,7 +109,7 @@
+ 
+ distclean-$(MODNAME): clean-$(MODNAME)
+ 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
+-		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
++		   $(ROOTPY) $(PYROOTMAP) \
+ 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
+ 
+ distclean::     distclean-$(MODNAME)
+diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules
+--- root.as-needed/build/package/debian/rules	2011-07-10 10:42:49.241549346 +0400
++++ root/build/package/debian/rules	2011-07-10 10:48:06.989670589 +0400
+@@ -691,10 +691,6 @@
+ 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
+ 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/cint7			\
+ 		-X$(PREFIX)/include/root/Minuit2
+ #		$(foreach i, \
+diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
+--- root.as-needed/cint/cintex/Module.mk	2011-07-10 10:42:49.104889217 +0400
++++ root/cint/cintex/Module.mk	2011-07-10 10:43:21.496672876 +0400
+@@ -31,10 +31,6 @@
+ CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
+ $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
+ endif
+-ifneq ($(BUILDPYTHON),no)
+-CINTEXPYC    := $(CINTEXPY:.py=.pyc)
+-CINTEXPYO    := $(CINTEXPY:.py=.pyo)
+-endif
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
+@@ -86,8 +82,6 @@
+ 		fi)
+ 		cp $< $@
+ 
+-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
+-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
+                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
+diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
+--- root.as-needed/cint/reflex/Module.mk	2011-07-10 10:42:49.074890651 +0400
++++ root/cint/reflex/Module.mk	2011-07-10 10:43:21.496672876 +0400
+@@ -48,9 +48,6 @@
+ RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
+ RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
+ RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
+-ifneq ($(BUILDPYTHON),no)
+-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
+-endif
+ 
+ RFLX_LIBDIR = $(LIBDIR)
+ 
+@@ -92,7 +89,7 @@
+ 
+ ALLEXECS += $(RFLX_GENMAPX)
+ 
+-POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++POSTBIN  += $(RFLX_GRFLXPY)
+ 
+ ##### local rules #####
+ .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
+@@ -122,8 +119,6 @@
+ 		  mkdir -p lib/python/genreflex; fi )
+ 		cp $< $@
+ 
+-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
+-		@python -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
+ 
+@@ -149,7 +144,7 @@
+ 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
+ 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
+ 
+-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
+ 
+ clean-genreflex:
+ 		@rm -rf lib/python/genreflex
+diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
+--- root.as-needed/cint/reflex/python/CMakeLists.txt	2011-07-10 10:42:49.074890651 +0400
++++ root/cint/reflex/python/CMakeLists.txt	2011-07-10 10:43:21.496672876 +0400
+@@ -15,7 +15,7 @@
+ #####################   sources   ####################
+ 
+ FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
+-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
++SET(GENREFLEX_SCRIPT PARENT_SCOPE)
+ 
+ #####################  gccxmlpath ####################
+ 

diff --git a/sci-physics/root/root-5.34.03.ebuild b/sci-physics/root/root-5.34.05.ebuild
similarity index 98%
rename from sci-physics/root/root-5.34.03.ebuild
rename to sci-physics/root/root-5.34.05.ebuild
index f410d92..51cb521 100644
--- a/sci-physics/root/root-5.34.03.ebuild
+++ b/sci-physics/root/root-5.34.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.03.ebuild,v 1.1 2012/10/26 15:40:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.03.ebuild,v 1.2 2013/01/22 17:18:55 bicatali Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
 PATCH_PV=5.28.00b
 PATCH_PV2=5.32.00
-PATCH_PV3=5.34.01
+PATCH_PV3=5.34.05
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
@@ -107,6 +107,7 @@ PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
 
 REQUIRED_USE="
 	!X? ( !opengl !qt4 )
+	htmldoc? ( doc )
 	mpi? ( math !openmp )
 	openmp? ( math !mpi )"
 
@@ -149,7 +150,7 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2013-10-15 14:17 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2013-10-15 14:17 UTC (permalink / raw
  To: gentoo-commits

commit:     d299a87a7ea9a2643586ff6baa702d06490f786c
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue Oct 15 14:16:32 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue Oct 15 14:16:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d299a87a

sci-physics/root: cleanup

---
 sci-physics/root/ChangeLog                         |   5 +
 .../root/files/root-5.32.00-nobyte-compile.patch   | 137 --------
 sci-physics/root/files/root-9999-cling.patch       |  13 -
 sci-physics/root/root-5.34.10-r1.ebuild            | 390 ---------------------
 sci-physics/root/root-5.34.10-r2.ebuild            |   2 +-
 sci-physics/root/root-5.34.10.ebuild               | 387 --------------------
 sci-physics/root/root-9999.ebuild                  | 215 +++++++-----
 7 files changed, 127 insertions(+), 1022 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 9b280ee..0f5a8e8 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 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 $
 
+  15 Oct 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.34.10.ebuild,
+  -root-5.34.10-r1.ebuild, root-5.34.10-r2.ebuild, root-9999.ebuild,
+  -files/root-5.32.00-nobyte-compile.patch, -files/root-9999-cling.patch:
+  Remove old versions and unused patches. WIP on live ebuild.
+
 *root-5.34.10-r2 (07 Oct 2013)
 
   07 Oct 2013; Andrew Savchenko <bircoph@gmail.com> +root-5.34.10-r2.ebuild,

diff --git a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch b/sci-physics/root/files/root-5.32.00-nobyte-compile.patch
deleted file mode 100644
index 179e579..0000000
--- a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Naur root.as-needed/Makefile root/Makefile
---- root.as-needed/Makefile	2011-07-10 10:42:49.758191296 +0400
-+++ root/Makefile	2011-07-10 10:43:21.493339703 +0400
-@@ -1167,10 +1167,7 @@
- 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
- 	   fi; \
--	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
--	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
--	   fi; \
--	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      dir=$(RFLX_GRFLXDD:lib/=); \
- 	      while test "x$${dir}" != "x" && \
- 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-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 $< $@
- endif
--ROOTPYC      := $(ROOTPY:.py=.pyc)
--ROOTPYO      := $(ROOTPY:.py=.pyo)
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- 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)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules
---- root.as-needed/build/package/debian/rules	2011-07-10 10:42:49.241549346 +0400
-+++ root/build/package/debian/rules	2011-07-10 10:48:06.989670589 +0400
-@@ -691,10 +691,6 @@
- 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
- 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/cint7			\
- 		-X$(PREFIX)/include/root/Minuit2
- #		$(foreach i, \
-diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.as-needed/cint/cintex/Module.mk	2011-07-10 10:42:49.104889217 +0400
-+++ root/cint/cintex/Module.mk	2011-07-10 10:43:21.496672876 +0400
-@@ -31,10 +31,6 @@
- CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC    := $(CINTEXPY:.py=.pyc)
--CINTEXPYO    := $(CINTEXPY:.py=.pyo)
--endif
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- 		fi)
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.as-needed/cint/reflex/Module.mk	2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/Module.mk	2011-07-10 10:43:21.496672876 +0400
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
- 
- RFLX_LIBDIR = $(LIBDIR)
- 
-@@ -92,7 +89,7 @@
- 
- ALLEXECS += $(RFLX_GENMAPX)
- 
--POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN  += $(RFLX_GRFLXPY)
- 
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- 		  mkdir -p lib/python/genreflex; fi )
- 		cp $< $@
- 
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
--		@python -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
- 
-@@ -149,7 +144,7 @@
- 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
- 
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
- 
- clean-genreflex:
- 		@rm -rf lib/python/genreflex
-diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.as-needed/cint/reflex/python/CMakeLists.txt	2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/python/CMakeLists.txt	2011-07-10 10:43:21.496672876 +0400
-@@ -15,7 +15,7 @@
- #####################   sources   ####################
- 
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
- 
- #####################  gccxmlpath ####################
- 

diff --git a/sci-physics/root/files/root-9999-cling.patch b/sci-physics/root/files/root-9999-cling.patch
deleted file mode 100644
index 9c240dd..0000000
--- a/sci-physics/root/files/root-9999-cling.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- root/core/utils/Module.mk.orig	2012-07-22 11:18:33.000000000 +0400
-+++ root/core/utils/Module.mk	2012-07-22 11:20:02.633436297 +0400
-@@ -95,6 +95,10 @@
- 	$(MAKEDIR)
- 	cp $< $@
- 
-+$(UTILSDIRS)/%_tmp.cxx: $(UTILSDIRS)/%.cxx
-+	$(MAKEDIR)
-+	cp $< $@
-+
- $(call stripsrc,$(UTILSDIRS)/rootcint_tmp.o): $(call stripsrc,$(UTILSDIRS)/rootcint_tmp.cxx)
- 
- $(call stripsrc,$(UTILSDIRS)/RStl_tmp.o): $(call stripsrc,$(UTILSDIRS)/RStl_tmp.cxx)

diff --git a/sci-physics/root/root-5.34.10-r1.ebuild b/sci-physics/root/root-5.34.10-r1.ebuild
deleted file mode 100644
index 833cd85..0000000
--- a/sci-physics/root/root-5.34.10-r1.ebuild
+++ /dev/null
@@ -1,390 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	_GIT=git-2
-	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_{6,7} )
-inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_GIT} versionator
-
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.32.00
-PATCH_PV3=5.34.05
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="${SRC_URI}
-	doc? (
-		math? (
-			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
-		metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf )
-	   !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf )
-		htmldoc? (
-			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="+X afs avahi c++0x doc emacs examples fits fftw graphviz htmldoc
-	kerberos ldap +math +metric mpi mysql odbc +opengl openmp oracle postgres
-	prefix pythia6 pythia8 python qt4 +reflex ruby sqlite ssl xinetd xml xrootd"
-
-REQUIRED_USE="
-	!X? ( !opengl !qt4 )
-	htmldoc? ( doc )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-fonts/dejavu
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/shadow
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| (
-			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
-			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
-		)
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		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
-		)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	xrootd? ( >=net-libs/xrootd-3.2.0 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp; then
-			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
-				ewarn "You are using a g++ without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
-		! version_is_at_least "4.7" "$(gcc-version)"; then
-		eerror "You are using a g++ without C++0x capabilities"
-		die "Need an C++0x capable compiler"
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -r graf2d/asimage/src/libAfterImage || die
-	rm -r graf3d/ftgl/{inc,src} || die
-	rm -r graf2d/freetype/src || die
-	rm -r graf3d/glew/{inc,src} || die
-	rm -r core/pcre/src || die
-	rm -r math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
-	rm -r core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-
-	# Make html docs self-consistent for offline work (based on Fedora spec)
-	if use htmldoc; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
-		# make images local
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
-			-i etc/html/header.html || die "htmldoc sed failed"
-
-		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
-			die "htmldoc preparation failed"
-	fi
-}
-
-src_configure() {
-	local myconfflags=""
-	use postgres && myconfflags+=" --with-pgsql-incdir=$(pg_config --includedir)"
-	# the configure script is not the standard autotools
-	# cling is disabled because in requires live llvm and clang
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-ld=$(tc-getCXX) \
-		--with-afs-shared=yes \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-ftgl \
-		--disable-builtin-freetype \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--disable-cling \
-		--enable-astiff \
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable X xft) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable c++0x c++11) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable oracle) \
-		$(use_enable postgres pgsql) \
-		$(use_enable prefix rpath) \
-		$(use_enable pythia6) \
-		$(use_enable pythia8) \
-		$(use_enable python) \
-		$(use_enable qt4 qt) \
-		$(use_enable qt4 qtgsi) \
-		$(use_enable reflex cintex) \
-		$(use_enable reflex) \
-		$(use_enable ruby) \
-		$(use_enable sqlite) \
-		$(use_enable ssl) \
-		$(use_enable xml) \
-		$(use_enable xrootd) \
-		${myconfflags} \
-		${EXTRA_ECONF} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
-	if use emacs; then
-		elisp-compile build/misc/*.el || die "elisp-compile failed"
-	fi
-}
-
-doc_install() {
-	cd "${S}"
-	if use doc; then
-		einfo "Installing user's guides"
-		use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \
-			dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	fi
-
-	if use examples; then
-		# these should really be taken care of by the root make install
-		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
-		doins -r tmva/test
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-}
-
-daemon_install() {
-	cd "${S}"
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	echo "Icon=root-system-bin" >> etc/root.desktop
-	domenu etc/root.desktop
-	doicon build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	if use python; then
-		echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-		python_optimize /usr/$(get_libdir)/root
-	fi
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root
-
-	# The build system installs Emacs support unconditionally and in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -r "${ED}"/usr/share/emacs
-	if use emacs; then
-		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
-	fi
-
-	doc_install
-	daemon_install
-	desktop_install
-
-	# Cleanup of files either already distributed or unused on Gentoo
-	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
-	rm "${ED}"usr/share/root/fonts/LICENSE || die
-	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm posix/mktypes dll_stl/setup \
-		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
-	rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
-	rm "${ED}"/etc/root/proof/*.sample || die
-	rm -r "${ED}"/etc/root/daemons || die
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin/ || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

diff --git a/sci-physics/root/root-5.34.10-r2.ebuild b/sci-physics/root/root-5.34.10-r2.ebuild
index fa064f8..8d18cef 100644
--- a/sci-physics/root/root-5.34.10-r2.ebuild
+++ b/sci-physics/root/root-5.34.10-r2.ebuild
@@ -15,7 +15,7 @@ else
 fi
 
 PYTHON_COMPAT=( python2_{6,7} )
-inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_GIT} versionator
+inherit elisp-common eutils fdo-mime fortran-2 ${_GIT} multilib python-single-r1 toolchain-funcs user versionator
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03

diff --git a/sci-physics/root/root-5.34.10.ebuild b/sci-physics/root/root-5.34.10.ebuild
deleted file mode 100644
index 041300d..0000000
--- a/sci-physics/root/root-5.34.10.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	_GIT=git-2
-	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_{6,7} )
-inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_GIT} versionator
-
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.32.00
-PATCH_PV3=5.34.05
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="${SRC_URI}
-	doc? (
-		math? (
-			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
-		metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf )
-	   !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf )
-		htmldoc? (
-			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="+X afs avahi -c++0x doc emacs examples fits fftw graphviz htmldoc
-	kerberos ldap +math +metric mpi mysql odbc +opengl openmp oracle postgres
-	prefix pythia6 pythia8 python qt4 +reflex ruby sqlite ssl xinetd xml xrootd"
-
-REQUIRED_USE="
-	!X? ( !opengl !qt4 )
-	htmldoc? ( doc )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-fonts/dejavu
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/shadow
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| (
-			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
-			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
-		)
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		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
-		)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	xrootd? ( >=net-libs/xrootd-3.2.0 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp; then
-			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
-				ewarn "You are using a g++ without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
-		! version_is_at_least "4.7" "$(gcc-version)"; then
-		eerror "You are using a g++ without C++0x capabilities"
-		die "Need an C++0x capable compiler"
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -r graf2d/asimage/src/libAfterImage || die
-	rm -r graf3d/ftgl/{inc,src} || die
-	rm -r graf2d/freetype/src || die
-	rm -r graf3d/glew/{inc,src} || die
-	rm -r core/pcre/src || die
-	rm -r math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
-	rm -r core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-
-	# Make html docs self-consistent for offline work (based on Fedora spec)
-	if use htmldoc; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
-		# make images local
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
-			-i etc/html/header.html || die "htmldoc sed failed"
-
-		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
-			die "htmldoc preparation failed"
-	fi
-}
-
-src_configure() {
-	local myconfflags=""
-	use postgres && myconfflags+=" --with-pgsql-incdir=$(pg_config --includedir)"
-	# the configure script is not the standard autotools
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-ld=$(tc-getCXX) \
-		--with-afs-shared=yes \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--disable-cling \
-		--enable-astiff \
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable X xft) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable postgres pgsql) \
-		$(use_enable prefix rpath) \
-		$(use_enable pythia6) \
-		$(use_enable pythia8) \
-		$(use_enable python) \
-		$(use_enable qt4 qt) \
-		$(use_enable qt4 qtgsi) \
-		$(use_enable reflex cintex) \
-		$(use_enable reflex) \
-		$(use_enable ruby) \
-		$(use_enable sqlite) \
-		$(use_enable ssl) \
-		$(use_enable xml) \
-		$(use_enable xrootd) \
-		${myconfflags} \
-		${EXTRA_ECONF} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
-	if use emacs; then
-		elisp-compile build/misc/*.el || die "elisp-compile failed"
-	fi
-}
-
-doc_install() {
-	cd "${S}"
-	if use doc; then
-		einfo "Installing user's guides"
-		use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \
-			dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	fi
-
-	if use examples; then
-		# these should really be taken care of by the root make install
-		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
-		doins -r tmva/test
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-}
-
-daemon_install() {
-	cd "${S}"
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	echo "Icon=root-system-bin" >> etc/root.desktop
-	domenu etc/root.desktop
-	doicon build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	if use python; then
-		echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-		python_optimize /usr/$(get_libdir)/root
-	fi
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root
-
-	# The build system installs Emacs support unconditionally and in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -r "${ED}"/usr/share/emacs
-	if use emacs; then
-		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
-	fi
-
-	doc_install
-	daemon_install
-	desktop_install
-
-	# Cleanup of files either already distributed or unused on Gentoo
-	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
-	rm "${ED}"usr/share/root/fonts/LICENSE || die
-	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm posix/mktypes dll_stl/setup \
-		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
-	rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
-	rm "${ED}"/etc/root/proof/*.sample || die
-	rm -r "${ED}"/etc/root/daemons || die
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin/ || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 0543c90..4c6ffdb 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $
 
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
+EAPI=5
 
 if [[ ${PV} == "9999" ]] ; then
-	_SVN=subversion
-	ESVN_REPO_URI="http://root.cern.ch/svn/root/trunk"
+	_GIT=git-2
+	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
 	SRC_URI=""
 	KEYWORDS=""
 else
@@ -16,30 +14,43 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 multilib python ${_SVN} toolchain-funcs user versionator
+PYTHON_COMPAT=( python2_{6,7} )
+inherit elisp-common eutils fdo-mime fortran-2 ${_GIT} multilib python-single-r1 toolchain-funcs user versionator
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
 PATCH_PV=5.28.00b
 PATCH_PV2=5.32.00
+PATCH_PV3=5.34.05
+PATCH_PVLIVE=9999
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
 SRC_URI="${SRC_URI}
-	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf
+	!minimal? ( doc? (
 		math? (
 			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
 			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
+		metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf )
+	   !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf )
 		htmldoc? (
 			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
 			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png )
+	) )"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="+X afs avahi -c++0x doc emacs examples fits fftw geocad graphviz htmldoc
-	kerberos ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
-	pythia6 pythia8 python qt4 +reflex ruby ssl xinetd xml xrootd"
+IUSE="+X afs avahi c++0x doc emacs examples fits fftw geocad graphviz htmldoc
+	kerberos ldap +math +metric minimal mpi mysql odbc +opengl openmp oracle postgres
+	prefix pythia6 pythia8 python qt4 ruby sqlite ssl xinetd xml xrootd"
+
+REQUIRED_USE="
+	!X? ( !opengl !qt4 )
+	htmldoc? ( doc )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 CDEPEND="
 	app-arch/xz-utils
@@ -59,66 +70,65 @@ CDEPEND="
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXpm
-		|| (
-			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
-			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+		!minimal? (
+			|| (
+				>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
+				>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+			)
+			opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+			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
 		)
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		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
-		)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	geocad? ( sci-libs/opencascade )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	llvm? ( >=sys-devel/clang-9999 =sys-devel/llvm-9999 )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	xrootd? ( >=net-libs/xrootd-3.2.0 )"
+	)
+	!minimal? (
+		afs? ( net-fs/openafs )
+		avahi? ( net-dns/avahi )
+		emacs? ( virtual/emacs )
+		fits? ( sci-libs/cfitsio )
+		fftw? ( sci-libs/fftw:3.0 )
+		geocad? ( sci-libs/opencascade )
+		graphviz? ( media-gfx/graphviz )
+		kerberos? ( virtual/krb5 )
+		ldap? ( net-nds/openldap )
+		math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+		mysql? ( virtual/mysql )
+		odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+		oracle? ( dev-db/oracle-instantclient-basic )
+		postgres? ( dev-db/postgresql-base )
+		pythia6? ( sci-physics/pythia:6 )
+		pythia8? ( sci-physics/pythia:8 )
+		python? ( ${PYTHON_DEPS} )
+		ruby? (
+				dev-lang/ruby
+				dev-ruby/rubygems )
+		sqlite? ( dev-db/sqlite:3 )
+		ssl? ( dev-libs/openssl )
+		xml? ( dev-libs/libxml2 )
+		xrootd? ( >=net-libs/xrootd-3.2.0 )
+	)"
 
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 
 RDEPEND="${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
 	xinetd? ( sys-apps/xinetd )"
 
 PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
 
-REQUIRED_USE="
-	!X? ( !opengl !qt4 )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )"
-
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	fortran-2_pkg_setup
-	python_pkg_setup
 	echo
 	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
 	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
 	elog "You can use the env variable EXTRA_ECONF variable for this."
 	elog "For example, for SRP, you would set: "
@@ -126,7 +136,9 @@ pkg_setup() {
 	echo
 	enewgroup rootd
 	enewuser rootd -1 -1 /var/spool/rootd rootd
+	use minimal && return
 
+	use python && python-single-r1_pkg_setup
 	if use math; then
 		if use openmp; then
 			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
@@ -149,25 +161,24 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-9999-dotfont.patch \
-		"${FILESDIR}"/${PN}-9999-cling.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -rf graf2d/asimage/src/libAfterImage || die
-	rm -rf graf3d/ftgl/{inc,src} || die
-	rm -rf graf2d/freetype/src || die
-	rm -rf graf3d/glew/{inc,src} || die
-	rm -rf core/pcre/src || die
-	rm -rf math/unuran/src/unuran-*.tar.gz || die
+	rm -r graf2d/asimage/src/libAfterImage || die
+	rm -r graf3d/ftgl/{inc,src} || die
+	rm -r graf2d/freetype/src || die
+	rm -r graf3d/glew/{inc,src} || die
+	rm -r core/pcre/src || die
+	rm -r math/unuran/src/unuran-*.tar.gz || die
 	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
-	rm -rf core/lzma/src/*.tar.gz || die
+	rm -r core/lzma/src/*.tar.gz || die
 	rm graf3d/gl/{inc,src}/gl2ps.* || die
 	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
 
@@ -191,8 +202,8 @@ src_prepare() {
 	unset QTDIR
 
 	# Make html docs self-consistent for offline work (based on Fedora spec)
-	if use htmldoc; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
+	if use htmldoc && ! use minimal; then
+		epatch "${FILESDIR}"/${PN}-${PATCH_PVLIVE}-htmldoc.patch
 		# make images local
 		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
 			-i etc/html/ROOT.css || die "htmldoc sed failed"
@@ -208,7 +219,7 @@ src_prepare() {
 
 src_configure() {
 	# the configure script is not the standard autotools
-	./configure \
+	local mycommonconf="
 		--prefix="${EPREFIX}"/usr \
 		--etcdir="${EPREFIX}"/etc/root \
 		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
@@ -219,12 +230,22 @@ src_configure() {
 		--with-cxx=$(tc-getCXX) \
 		--with-f77=$(tc-getFC) \
 		--with-ld=$(tc-getCXX) \
+		--nohowto
+	"
+	if use minimal; then
+		./configure \
+			${mycommonconf} \
+			$(usex X --gminimal --minimal) \
+			|| die "configure failed"
+		return
+	fi
+	./configure \
+		${mycommonconf} \
 		--with-afs-shared=yes \
-		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
 		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
 		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
 		--disable-builtin-ftgl \
+		--disable-builtin-freetype \
 		--disable-builtin-glew \
 		--disable-builtin-pcre \
 		--disable-builtin-zlib \
@@ -243,12 +264,13 @@ src_configure() {
 		$(use_enable X xft) \
 		$(use_enable afs) \
 		$(use_enable avahi bonjour) \
+		$(use_enable c++0x c++11) \
 		$(use_enable fits fitsio) \
 		$(use_enable fftw fftw3) \
+		$(use_enable geocad) \
 		$(use_enable graphviz gviz) \
 		$(use_enable kerberos krb5) \
 		$(use_enable ldap) \
-		$(use_enable llvm cling) \
 		$(use_enable math gsl-shared) \
 		$(use_enable math genvector) \
 		$(use_enable math mathmore) \
@@ -256,19 +278,21 @@ src_configure() {
 		$(use_enable math roofit) \
 		$(use_enable math tmva) \
 		$(use_enable math unuran) \
+		$(use_enable math vc) \
 		$(use_enable mysql) \
 		$(use_enable odbc) \
 		$(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) \
 		$(use_enable python) \
 		$(use_enable qt4 qt) \
 		$(use_enable qt4 qtgsi) \
-		$(use_enable reflex cintex) \
-		$(use_enable reflex) \
 		$(use_enable ruby) \
+		$(use_enable sqlite) \
 		$(use_enable ssl) \
 		$(use_enable xml) \
 		$(use_enable xrootd) \
@@ -278,27 +302,28 @@ src_configure() {
 
 src_compile() {
 	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
-	if use emacs; then
+	if use emacs && ! use minimal; then
 		elisp-compile build/misc/*.el || die "elisp-compile failed"
 	fi
 }
 
 doc_install() {
 	cd "${S}"
-	if use doc; then
+	if use doc && ! use minimal; then
 		einfo "Installing user's guides"
-		dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
+		use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \
+			dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf
 		use math && dodoc \
 			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
 			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
 	fi
 
-	if use examples; then
+	if use examples && ! use minimal; then
 		# these should really be taken care of by the root make install
 		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
 		doins -r tmva/test
 	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
 	fi
 }
 
@@ -322,10 +347,9 @@ daemon_install() {
 
 desktop_install() {
 	cd "${S}"
-	sed -e 's,@prefix@,/usr,' \
-		build/package/debian/root-system-bin.desktop.in > root.desktop
-	domenu root.desktop
-	doicon "${S}"/build/package/debian/root-system-bin.png
+	echo "Icon=root-system-bin" >> etc/root.desktop
+	domenu etc/root.desktop
+	doicon build/package/debian/root-system-bin.png
 
 	insinto /usr/share/icons/hicolor/48x48/mimetypes
 	doins build/package/debian/application-x-root.png
@@ -338,15 +362,20 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	if ! use minimal; then
+		use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+		if use python; then
+			echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+			python_optimize /usr/$(get_libdir)/root
+		fi
+		use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	fi
 	doenvd 99root
 
 	# The build system installs Emacs support unconditionally and in the wrong
 	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -rf "${ED}"/usr/share/emacs
-	if use emacs; then
+	rm -r "${ED}"/usr/share/emacs
+	if use emacs && ! use minimal; then
 		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
 	fi
 
@@ -358,11 +387,11 @@ src_install() {
 	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
 	rm "${ED}"usr/share/root/fonts/LICENSE || die
 	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm -f posix/mktypes dll_stl/setup \
+	rm posix/mktypes dll_stl/setup \
 		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
-	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
-	rm -f "${ED}"/etc/root/proof/*.sample || die
-	rm -rf "${ED}"/etc/root/daemons || die
+	rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
+	rm "${ED}"/etc/root/proof/*.sample || die
+	rm -r "${ED}"/etc/root/daemons || die
 	popd > /dev/null
 	# these should be in PATH
 	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
@@ -371,10 +400,8 @@ src_install() {
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
 }
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
 }


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2013-10-16  4:49 Nicolas Bock
  0 siblings, 0 replies; 41+ messages in thread
From: Nicolas Bock @ 2013-10-16  4:49 UTC (permalink / raw
  To: gentoo-commits

commit:     732e2157c56af64b7d5c06ce08e5056aebfd577a
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue Oct 15 14:16:32 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Wed Oct 16 04:48:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=732e2157

sci-physics/root: cleanup

---
 sci-physics/root/ChangeLog                         |   5 +
 .../root/files/root-5.32.00-nobyte-compile.patch   | 137 --------
 sci-physics/root/files/root-9999-cling.patch       |  13 -
 sci-physics/root/root-5.34.10-r1.ebuild            | 390 ---------------------
 sci-physics/root/root-5.34.10-r2.ebuild            |   2 +-
 sci-physics/root/root-5.34.10.ebuild               | 387 --------------------
 sci-physics/root/root-9999.ebuild                  | 215 +++++++-----
 7 files changed, 127 insertions(+), 1022 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 9b280ee..0f5a8e8 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 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 $
 
+  15 Oct 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.34.10.ebuild,
+  -root-5.34.10-r1.ebuild, root-5.34.10-r2.ebuild, root-9999.ebuild,
+  -files/root-5.32.00-nobyte-compile.patch, -files/root-9999-cling.patch:
+  Remove old versions and unused patches. WIP on live ebuild.
+
 *root-5.34.10-r2 (07 Oct 2013)
 
   07 Oct 2013; Andrew Savchenko <bircoph@gmail.com> +root-5.34.10-r2.ebuild,

diff --git a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch b/sci-physics/root/files/root-5.32.00-nobyte-compile.patch
deleted file mode 100644
index 179e579..0000000
--- a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Naur root.as-needed/Makefile root/Makefile
---- root.as-needed/Makefile	2011-07-10 10:42:49.758191296 +0400
-+++ root/Makefile	2011-07-10 10:43:21.493339703 +0400
-@@ -1167,10 +1167,7 @@
- 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
- 	   fi; \
--	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
--	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
--	   fi; \
--	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      dir=$(RFLX_GRFLXDD:lib/=); \
- 	      while test "x$${dir}" != "x" && \
- 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-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 $< $@
- endif
--ROOTPYC      := $(ROOTPY:.py=.pyc)
--ROOTPYO      := $(ROOTPY:.py=.pyo)
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- 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)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules
---- root.as-needed/build/package/debian/rules	2011-07-10 10:42:49.241549346 +0400
-+++ root/build/package/debian/rules	2011-07-10 10:48:06.989670589 +0400
-@@ -691,10 +691,6 @@
- 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
- 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/cint7			\
- 		-X$(PREFIX)/include/root/Minuit2
- #		$(foreach i, \
-diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.as-needed/cint/cintex/Module.mk	2011-07-10 10:42:49.104889217 +0400
-+++ root/cint/cintex/Module.mk	2011-07-10 10:43:21.496672876 +0400
-@@ -31,10 +31,6 @@
- CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC    := $(CINTEXPY:.py=.pyc)
--CINTEXPYO    := $(CINTEXPY:.py=.pyo)
--endif
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- 		fi)
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.as-needed/cint/reflex/Module.mk	2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/Module.mk	2011-07-10 10:43:21.496672876 +0400
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
- 
- RFLX_LIBDIR = $(LIBDIR)
- 
-@@ -92,7 +89,7 @@
- 
- ALLEXECS += $(RFLX_GENMAPX)
- 
--POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN  += $(RFLX_GRFLXPY)
- 
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- 		  mkdir -p lib/python/genreflex; fi )
- 		cp $< $@
- 
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
--		@python -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
- 
-@@ -149,7 +144,7 @@
- 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
- 
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
- 
- clean-genreflex:
- 		@rm -rf lib/python/genreflex
-diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.as-needed/cint/reflex/python/CMakeLists.txt	2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/python/CMakeLists.txt	2011-07-10 10:43:21.496672876 +0400
-@@ -15,7 +15,7 @@
- #####################   sources   ####################
- 
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
- 
- #####################  gccxmlpath ####################
- 

diff --git a/sci-physics/root/files/root-9999-cling.patch b/sci-physics/root/files/root-9999-cling.patch
deleted file mode 100644
index 9c240dd..0000000
--- a/sci-physics/root/files/root-9999-cling.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- root/core/utils/Module.mk.orig	2012-07-22 11:18:33.000000000 +0400
-+++ root/core/utils/Module.mk	2012-07-22 11:20:02.633436297 +0400
-@@ -95,6 +95,10 @@
- 	$(MAKEDIR)
- 	cp $< $@
- 
-+$(UTILSDIRS)/%_tmp.cxx: $(UTILSDIRS)/%.cxx
-+	$(MAKEDIR)
-+	cp $< $@
-+
- $(call stripsrc,$(UTILSDIRS)/rootcint_tmp.o): $(call stripsrc,$(UTILSDIRS)/rootcint_tmp.cxx)
- 
- $(call stripsrc,$(UTILSDIRS)/RStl_tmp.o): $(call stripsrc,$(UTILSDIRS)/RStl_tmp.cxx)

diff --git a/sci-physics/root/root-5.34.10-r1.ebuild b/sci-physics/root/root-5.34.10-r1.ebuild
deleted file mode 100644
index 833cd85..0000000
--- a/sci-physics/root/root-5.34.10-r1.ebuild
+++ /dev/null
@@ -1,390 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	_GIT=git-2
-	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_{6,7} )
-inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_GIT} versionator
-
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.32.00
-PATCH_PV3=5.34.05
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="${SRC_URI}
-	doc? (
-		math? (
-			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
-		metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf )
-	   !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf )
-		htmldoc? (
-			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="+X afs avahi c++0x doc emacs examples fits fftw graphviz htmldoc
-	kerberos ldap +math +metric mpi mysql odbc +opengl openmp oracle postgres
-	prefix pythia6 pythia8 python qt4 +reflex ruby sqlite ssl xinetd xml xrootd"
-
-REQUIRED_USE="
-	!X? ( !opengl !qt4 )
-	htmldoc? ( doc )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-fonts/dejavu
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/shadow
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| (
-			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
-			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
-		)
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		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
-		)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	xrootd? ( >=net-libs/xrootd-3.2.0 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp; then
-			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
-				ewarn "You are using a g++ without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
-		! version_is_at_least "4.7" "$(gcc-version)"; then
-		eerror "You are using a g++ without C++0x capabilities"
-		die "Need an C++0x capable compiler"
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -r graf2d/asimage/src/libAfterImage || die
-	rm -r graf3d/ftgl/{inc,src} || die
-	rm -r graf2d/freetype/src || die
-	rm -r graf3d/glew/{inc,src} || die
-	rm -r core/pcre/src || die
-	rm -r math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
-	rm -r core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-
-	# Make html docs self-consistent for offline work (based on Fedora spec)
-	if use htmldoc; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
-		# make images local
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
-			-i etc/html/header.html || die "htmldoc sed failed"
-
-		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
-			die "htmldoc preparation failed"
-	fi
-}
-
-src_configure() {
-	local myconfflags=""
-	use postgres && myconfflags+=" --with-pgsql-incdir=$(pg_config --includedir)"
-	# the configure script is not the standard autotools
-	# cling is disabled because in requires live llvm and clang
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-ld=$(tc-getCXX) \
-		--with-afs-shared=yes \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-ftgl \
-		--disable-builtin-freetype \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--disable-cling \
-		--enable-astiff \
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable X xft) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable c++0x c++11) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable oracle) \
-		$(use_enable postgres pgsql) \
-		$(use_enable prefix rpath) \
-		$(use_enable pythia6) \
-		$(use_enable pythia8) \
-		$(use_enable python) \
-		$(use_enable qt4 qt) \
-		$(use_enable qt4 qtgsi) \
-		$(use_enable reflex cintex) \
-		$(use_enable reflex) \
-		$(use_enable ruby) \
-		$(use_enable sqlite) \
-		$(use_enable ssl) \
-		$(use_enable xml) \
-		$(use_enable xrootd) \
-		${myconfflags} \
-		${EXTRA_ECONF} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
-	if use emacs; then
-		elisp-compile build/misc/*.el || die "elisp-compile failed"
-	fi
-}
-
-doc_install() {
-	cd "${S}"
-	if use doc; then
-		einfo "Installing user's guides"
-		use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \
-			dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	fi
-
-	if use examples; then
-		# these should really be taken care of by the root make install
-		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
-		doins -r tmva/test
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-}
-
-daemon_install() {
-	cd "${S}"
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	echo "Icon=root-system-bin" >> etc/root.desktop
-	domenu etc/root.desktop
-	doicon build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	if use python; then
-		echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-		python_optimize /usr/$(get_libdir)/root
-	fi
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root
-
-	# The build system installs Emacs support unconditionally and in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -r "${ED}"/usr/share/emacs
-	if use emacs; then
-		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
-	fi
-
-	doc_install
-	daemon_install
-	desktop_install
-
-	# Cleanup of files either already distributed or unused on Gentoo
-	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
-	rm "${ED}"usr/share/root/fonts/LICENSE || die
-	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm posix/mktypes dll_stl/setup \
-		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
-	rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
-	rm "${ED}"/etc/root/proof/*.sample || die
-	rm -r "${ED}"/etc/root/daemons || die
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin/ || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

diff --git a/sci-physics/root/root-5.34.10-r2.ebuild b/sci-physics/root/root-5.34.10-r2.ebuild
index fa064f8..8d18cef 100644
--- a/sci-physics/root/root-5.34.10-r2.ebuild
+++ b/sci-physics/root/root-5.34.10-r2.ebuild
@@ -15,7 +15,7 @@ else
 fi
 
 PYTHON_COMPAT=( python2_{6,7} )
-inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_GIT} versionator
+inherit elisp-common eutils fdo-mime fortran-2 ${_GIT} multilib python-single-r1 toolchain-funcs user versionator
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03

diff --git a/sci-physics/root/root-5.34.10.ebuild b/sci-physics/root/root-5.34.10.ebuild
deleted file mode 100644
index 041300d..0000000
--- a/sci-physics/root/root-5.34.10.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	_GIT=git-2
-	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_{6,7} )
-inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_GIT} versionator
-
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.32.00
-PATCH_PV3=5.34.05
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="${SRC_URI}
-	doc? (
-		math? (
-			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
-		metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf )
-	   !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf )
-		htmldoc? (
-			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="+X afs avahi -c++0x doc emacs examples fits fftw graphviz htmldoc
-	kerberos ldap +math +metric mpi mysql odbc +opengl openmp oracle postgres
-	prefix pythia6 pythia8 python qt4 +reflex ruby sqlite ssl xinetd xml xrootd"
-
-REQUIRED_USE="
-	!X? ( !opengl !qt4 )
-	htmldoc? ( doc )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-fonts/dejavu
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/shadow
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| (
-			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
-			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
-		)
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		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
-		)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	xrootd? ( >=net-libs/xrootd-3.2.0 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp; then
-			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
-				ewarn "You are using a g++ without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
-		! version_is_at_least "4.7" "$(gcc-version)"; then
-		eerror "You are using a g++ without C++0x capabilities"
-		die "Need an C++0x capable compiler"
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -r graf2d/asimage/src/libAfterImage || die
-	rm -r graf3d/ftgl/{inc,src} || die
-	rm -r graf2d/freetype/src || die
-	rm -r graf3d/glew/{inc,src} || die
-	rm -r core/pcre/src || die
-	rm -r math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
-	rm -r core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-
-	# Make html docs self-consistent for offline work (based on Fedora spec)
-	if use htmldoc; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
-		# make images local
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
-			-i etc/html/header.html || die "htmldoc sed failed"
-
-		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
-			die "htmldoc preparation failed"
-	fi
-}
-
-src_configure() {
-	local myconfflags=""
-	use postgres && myconfflags+=" --with-pgsql-incdir=$(pg_config --includedir)"
-	# the configure script is not the standard autotools
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-ld=$(tc-getCXX) \
-		--with-afs-shared=yes \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--disable-cling \
-		--enable-astiff \
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable X xft) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable postgres pgsql) \
-		$(use_enable prefix rpath) \
-		$(use_enable pythia6) \
-		$(use_enable pythia8) \
-		$(use_enable python) \
-		$(use_enable qt4 qt) \
-		$(use_enable qt4 qtgsi) \
-		$(use_enable reflex cintex) \
-		$(use_enable reflex) \
-		$(use_enable ruby) \
-		$(use_enable sqlite) \
-		$(use_enable ssl) \
-		$(use_enable xml) \
-		$(use_enable xrootd) \
-		${myconfflags} \
-		${EXTRA_ECONF} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
-	if use emacs; then
-		elisp-compile build/misc/*.el || die "elisp-compile failed"
-	fi
-}
-
-doc_install() {
-	cd "${S}"
-	if use doc; then
-		einfo "Installing user's guides"
-		use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \
-			dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	fi
-
-	if use examples; then
-		# these should really be taken care of by the root make install
-		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
-		doins -r tmva/test
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-}
-
-daemon_install() {
-	cd "${S}"
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	echo "Icon=root-system-bin" >> etc/root.desktop
-	domenu etc/root.desktop
-	doicon build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	if use python; then
-		echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-		python_optimize /usr/$(get_libdir)/root
-	fi
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root
-
-	# The build system installs Emacs support unconditionally and in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -r "${ED}"/usr/share/emacs
-	if use emacs; then
-		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
-	fi
-
-	doc_install
-	daemon_install
-	desktop_install
-
-	# Cleanup of files either already distributed or unused on Gentoo
-	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
-	rm "${ED}"usr/share/root/fonts/LICENSE || die
-	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm posix/mktypes dll_stl/setup \
-		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
-	rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
-	rm "${ED}"/etc/root/proof/*.sample || die
-	rm -r "${ED}"/etc/root/daemons || die
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin/ || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 0543c90..4c6ffdb 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $
 
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
+EAPI=5
 
 if [[ ${PV} == "9999" ]] ; then
-	_SVN=subversion
-	ESVN_REPO_URI="http://root.cern.ch/svn/root/trunk"
+	_GIT=git-2
+	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
 	SRC_URI=""
 	KEYWORDS=""
 else
@@ -16,30 +14,43 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 multilib python ${_SVN} toolchain-funcs user versionator
+PYTHON_COMPAT=( python2_{6,7} )
+inherit elisp-common eutils fdo-mime fortran-2 ${_GIT} multilib python-single-r1 toolchain-funcs user versionator
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
 PATCH_PV=5.28.00b
 PATCH_PV2=5.32.00
+PATCH_PV3=5.34.05
+PATCH_PVLIVE=9999
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
 SRC_URI="${SRC_URI}
-	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf
+	!minimal? ( doc? (
 		math? (
 			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
 			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
+		metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf )
+	   !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf )
 		htmldoc? (
 			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
 			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png )
+	) )"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="+X afs avahi -c++0x doc emacs examples fits fftw geocad graphviz htmldoc
-	kerberos ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
-	pythia6 pythia8 python qt4 +reflex ruby ssl xinetd xml xrootd"
+IUSE="+X afs avahi c++0x doc emacs examples fits fftw geocad graphviz htmldoc
+	kerberos ldap +math +metric minimal mpi mysql odbc +opengl openmp oracle postgres
+	prefix pythia6 pythia8 python qt4 ruby sqlite ssl xinetd xml xrootd"
+
+REQUIRED_USE="
+	!X? ( !opengl !qt4 )
+	htmldoc? ( doc )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 CDEPEND="
 	app-arch/xz-utils
@@ -59,66 +70,65 @@ CDEPEND="
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXpm
-		|| (
-			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
-			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+		!minimal? (
+			|| (
+				>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
+				>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+			)
+			opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+			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
 		)
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		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
-		)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	geocad? ( sci-libs/opencascade )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	llvm? ( >=sys-devel/clang-9999 =sys-devel/llvm-9999 )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	xrootd? ( >=net-libs/xrootd-3.2.0 )"
+	)
+	!minimal? (
+		afs? ( net-fs/openafs )
+		avahi? ( net-dns/avahi )
+		emacs? ( virtual/emacs )
+		fits? ( sci-libs/cfitsio )
+		fftw? ( sci-libs/fftw:3.0 )
+		geocad? ( sci-libs/opencascade )
+		graphviz? ( media-gfx/graphviz )
+		kerberos? ( virtual/krb5 )
+		ldap? ( net-nds/openldap )
+		math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+		mysql? ( virtual/mysql )
+		odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+		oracle? ( dev-db/oracle-instantclient-basic )
+		postgres? ( dev-db/postgresql-base )
+		pythia6? ( sci-physics/pythia:6 )
+		pythia8? ( sci-physics/pythia:8 )
+		python? ( ${PYTHON_DEPS} )
+		ruby? (
+				dev-lang/ruby
+				dev-ruby/rubygems )
+		sqlite? ( dev-db/sqlite:3 )
+		ssl? ( dev-libs/openssl )
+		xml? ( dev-libs/libxml2 )
+		xrootd? ( >=net-libs/xrootd-3.2.0 )
+	)"
 
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 
 RDEPEND="${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
 	xinetd? ( sys-apps/xinetd )"
 
 PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
 
-REQUIRED_USE="
-	!X? ( !opengl !qt4 )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )"
-
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	fortran-2_pkg_setup
-	python_pkg_setup
 	echo
 	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
 	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
 	elog "You can use the env variable EXTRA_ECONF variable for this."
 	elog "For example, for SRP, you would set: "
@@ -126,7 +136,9 @@ pkg_setup() {
 	echo
 	enewgroup rootd
 	enewuser rootd -1 -1 /var/spool/rootd rootd
+	use minimal && return
 
+	use python && python-single-r1_pkg_setup
 	if use math; then
 		if use openmp; then
 			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
@@ -149,25 +161,24 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-9999-dotfont.patch \
-		"${FILESDIR}"/${PN}-9999-cling.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -rf graf2d/asimage/src/libAfterImage || die
-	rm -rf graf3d/ftgl/{inc,src} || die
-	rm -rf graf2d/freetype/src || die
-	rm -rf graf3d/glew/{inc,src} || die
-	rm -rf core/pcre/src || die
-	rm -rf math/unuran/src/unuran-*.tar.gz || die
+	rm -r graf2d/asimage/src/libAfterImage || die
+	rm -r graf3d/ftgl/{inc,src} || die
+	rm -r graf2d/freetype/src || die
+	rm -r graf3d/glew/{inc,src} || die
+	rm -r core/pcre/src || die
+	rm -r math/unuran/src/unuran-*.tar.gz || die
 	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
-	rm -rf core/lzma/src/*.tar.gz || die
+	rm -r core/lzma/src/*.tar.gz || die
 	rm graf3d/gl/{inc,src}/gl2ps.* || die
 	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
 
@@ -191,8 +202,8 @@ src_prepare() {
 	unset QTDIR
 
 	# Make html docs self-consistent for offline work (based on Fedora spec)
-	if use htmldoc; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
+	if use htmldoc && ! use minimal; then
+		epatch "${FILESDIR}"/${PN}-${PATCH_PVLIVE}-htmldoc.patch
 		# make images local
 		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
 			-i etc/html/ROOT.css || die "htmldoc sed failed"
@@ -208,7 +219,7 @@ src_prepare() {
 
 src_configure() {
 	# the configure script is not the standard autotools
-	./configure \
+	local mycommonconf="
 		--prefix="${EPREFIX}"/usr \
 		--etcdir="${EPREFIX}"/etc/root \
 		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
@@ -219,12 +230,22 @@ src_configure() {
 		--with-cxx=$(tc-getCXX) \
 		--with-f77=$(tc-getFC) \
 		--with-ld=$(tc-getCXX) \
+		--nohowto
+	"
+	if use minimal; then
+		./configure \
+			${mycommonconf} \
+			$(usex X --gminimal --minimal) \
+			|| die "configure failed"
+		return
+	fi
+	./configure \
+		${mycommonconf} \
 		--with-afs-shared=yes \
-		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
 		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
 		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
 		--disable-builtin-ftgl \
+		--disable-builtin-freetype \
 		--disable-builtin-glew \
 		--disable-builtin-pcre \
 		--disable-builtin-zlib \
@@ -243,12 +264,13 @@ src_configure() {
 		$(use_enable X xft) \
 		$(use_enable afs) \
 		$(use_enable avahi bonjour) \
+		$(use_enable c++0x c++11) \
 		$(use_enable fits fitsio) \
 		$(use_enable fftw fftw3) \
+		$(use_enable geocad) \
 		$(use_enable graphviz gviz) \
 		$(use_enable kerberos krb5) \
 		$(use_enable ldap) \
-		$(use_enable llvm cling) \
 		$(use_enable math gsl-shared) \
 		$(use_enable math genvector) \
 		$(use_enable math mathmore) \
@@ -256,19 +278,21 @@ src_configure() {
 		$(use_enable math roofit) \
 		$(use_enable math tmva) \
 		$(use_enable math unuran) \
+		$(use_enable math vc) \
 		$(use_enable mysql) \
 		$(use_enable odbc) \
 		$(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) \
 		$(use_enable python) \
 		$(use_enable qt4 qt) \
 		$(use_enable qt4 qtgsi) \
-		$(use_enable reflex cintex) \
-		$(use_enable reflex) \
 		$(use_enable ruby) \
+		$(use_enable sqlite) \
 		$(use_enable ssl) \
 		$(use_enable xml) \
 		$(use_enable xrootd) \
@@ -278,27 +302,28 @@ src_configure() {
 
 src_compile() {
 	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
-	if use emacs; then
+	if use emacs && ! use minimal; then
 		elisp-compile build/misc/*.el || die "elisp-compile failed"
 	fi
 }
 
 doc_install() {
 	cd "${S}"
-	if use doc; then
+	if use doc && ! use minimal; then
 		einfo "Installing user's guides"
-		dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
+		use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \
+			dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf
 		use math && dodoc \
 			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
 			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
 	fi
 
-	if use examples; then
+	if use examples && ! use minimal; then
 		# these should really be taken care of by the root make install
 		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
 		doins -r tmva/test
 	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
 	fi
 }
 
@@ -322,10 +347,9 @@ daemon_install() {
 
 desktop_install() {
 	cd "${S}"
-	sed -e 's,@prefix@,/usr,' \
-		build/package/debian/root-system-bin.desktop.in > root.desktop
-	domenu root.desktop
-	doicon "${S}"/build/package/debian/root-system-bin.png
+	echo "Icon=root-system-bin" >> etc/root.desktop
+	domenu etc/root.desktop
+	doicon build/package/debian/root-system-bin.png
 
 	insinto /usr/share/icons/hicolor/48x48/mimetypes
 	doins build/package/debian/application-x-root.png
@@ -338,15 +362,20 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	if ! use minimal; then
+		use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+		if use python; then
+			echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+			python_optimize /usr/$(get_libdir)/root
+		fi
+		use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	fi
 	doenvd 99root
 
 	# The build system installs Emacs support unconditionally and in the wrong
 	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -rf "${ED}"/usr/share/emacs
-	if use emacs; then
+	rm -r "${ED}"/usr/share/emacs
+	if use emacs && ! use minimal; then
 		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
 	fi
 
@@ -358,11 +387,11 @@ src_install() {
 	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
 	rm "${ED}"usr/share/root/fonts/LICENSE || die
 	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm -f posix/mktypes dll_stl/setup \
+	rm posix/mktypes dll_stl/setup \
 		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
-	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
-	rm -f "${ED}"/etc/root/proof/*.sample || die
-	rm -rf "${ED}"/etc/root/daemons || die
+	rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
+	rm "${ED}"/etc/root/proof/*.sample || die
+	rm -r "${ED}"/etc/root/daemons || die
 	popd > /dev/null
 	# these should be in PATH
 	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
@@ -371,10 +400,8 @@ src_install() {
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
 }
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
 }


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2013-11-09  5:04 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2013-11-09  5:04 UTC (permalink / raw
  To: gentoo-commits

commit:     23ba3390b4d4287a87586013853f50d9b15f7632
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Nov  9 05:02:40 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sat Nov  9 05:02:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=23ba3390

sci-physics/root: update dependencies and eclass

- Update pythia8 dependency.
- Use EAPI=5.
- Migration to python-single-r1 eclass.

---
 sci-physics/root/ChangeLog                         |   7 +
 .../root/files/root-5.28.00b-asneeded.patch        |  20 ++
 .../root/files/root-5.28.00b-prop-ldflags.patch    |  13 +
 .../files/root-5.32.00-explicit-functions.patch    |  18 +
 .../root/files/root-5.32.00-nobyte-compile.patch   | 137 ++++++++
 sci-physics/root/metadata.xml                      |   3 +-
 sci-physics/root/root-5.32.04.ebuild               | 378 +++++++++++++++++++++
 7 files changed, 575 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 74b3f01..4f26aae 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 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 $
 
+  09 Nov 2013; Andrew Savchenko <bircoph@gmail.com> +root-5.32.04.ebuild,
+  +files/root-5.28.00b-asneeded.patch, +files/root-5.28.00b-prop-ldflags.patch,
+  +files/root-5.32.00-explicit-functions.patch,
+  +files/root-5.32.00-nobyte-compile.patch:
+  Update pythia8 dependency for 5.32 branch, migrate for
+  python-single-r1 and EAPI=5.
+
   08 Nov 2013; Andrew Savchenko <bircoph@gmail.com> root-5.34.10-r2.ebuild:
   Fix pythia dependency: versions >= 8.1.80 changed API and are no
   longer supported for this root verison.

diff --git a/sci-physics/root/files/root-5.28.00b-asneeded.patch b/sci-physics/root/files/root-5.28.00b-asneeded.patch
new file mode 100644
index 0000000..b845247
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00b-asneeded.patch
@@ -0,0 +1,20 @@
+--- root.orig/configure	2010-12-20 07:17:54.000000000 +0000
++++ root/configure	2010-12-20 07:16:05.000000000 +0000
+@@ -709,7 +709,7 @@
+        cat <<EOF > conftest.mk
+ include ${ac_srcdir}/config/Makefile.${arch}
+ conftest: conftest.c
+-	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
++	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib  -o \$@
+ 
+ conftest.c:
+ 	echo "int main() { return 0; }" > \$@
+@@ -723,7 +723,7 @@
+        cat <<EOF > conftest.mk
+ include ${ac_srcdir}/config/Makefile.${arch}
+ conftest:conftest.c
+-	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
++	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@
+ 
+ conftest.c:
+ 	echo "extern int $linksymbol (); " > \$@

diff --git a/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch b/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch
new file mode 100644
index 0000000..7324319
--- /dev/null
+++ b/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch
@@ -0,0 +1,13 @@
+diff -Naur root.orig/config/Makefile.in root/config/Makefile.in
+--- root.orig/config/Makefile.in	2010-12-14 17:20:26.000000000 +0300
++++ root/config/Makefile.in	2010-12-17 22:33:34.902161458 +0300
+@@ -27,7 +27,7 @@
+ 
+ EXTRA_CFLAGS   := -Iinclude @cflags@
+ EXTRA_CXXFLAGS := -Iinclude @cflags@
+-EXTRA_LDFLAGS  := @ldflags@
++EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
+ WINRTDEBUG     := @winrtdebug@
+ 
+ GLBPATCHFLAGS  := @glbpatchcflags@
+

diff --git a/sci-physics/root/files/root-5.32.00-explicit-functions.patch b/sci-physics/root/files/root-5.32.00-explicit-functions.patch
new file mode 100644
index 0000000..570d61e
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-explicit-functions.patch
@@ -0,0 +1,18 @@
+--- root/io/io/Module.mk.orig	2012-02-29 19:46:38.000000000 +0400
++++ root/io/io/Module.mk	2012-03-09 02:29:19.905665572 +0400
+@@ -67,15 +67,5 @@
+ distclean::     distclean-$(MODNAME)
+ 
+ ##### extra rules ######
+-#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
+-ifeq ($(GCC_VERS),gcc-4.4)
+-ifneq ($(filter -O%,$(OPT)),)
+    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
+-endif
+-endif
+-ifeq ($(GCC_VERS),gcc-4.5)
+-ifneq ($(filter -O%,$(OPT)),)
+    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
+-endif
+-endif
+-

diff --git a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch b/sci-physics/root/files/root-5.32.00-nobyte-compile.patch
new file mode 100644
index 0000000..179e579
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-nobyte-compile.patch
@@ -0,0 +1,137 @@
+diff -Naur root.as-needed/Makefile root/Makefile
+--- root.as-needed/Makefile	2011-07-10 10:42:49.758191296 +0400
++++ root/Makefile	2011-07-10 10:43:21.493339703 +0400
+@@ -1167,10 +1167,7 @@
+ 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
+ 	   fi; \
+-	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
+-	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
+-	   fi; \
+-	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
++	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      dir=$(RFLX_GRFLXDD:lib/=); \
+ 	      while test "x$${dir}" != "x" && \
+ 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
+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 $< $@
+ endif
+-ROOTPYC      := $(ROOTPY:.py=.pyc)
+-ROOTPYO      := $(ROOTPY:.py=.pyo)
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
+@@ -68,10 +66,8 @@
+ 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)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
+@@ -113,7 +109,7 @@
+ 
+ distclean-$(MODNAME): clean-$(MODNAME)
+ 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
+-		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
++		   $(ROOTPY) $(PYROOTMAP) \
+ 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
+ 
+ distclean::     distclean-$(MODNAME)
+diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules
+--- root.as-needed/build/package/debian/rules	2011-07-10 10:42:49.241549346 +0400
++++ root/build/package/debian/rules	2011-07-10 10:48:06.989670589 +0400
+@@ -691,10 +691,6 @@
+ 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
+ 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/cint7			\
+ 		-X$(PREFIX)/include/root/Minuit2
+ #		$(foreach i, \
+diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
+--- root.as-needed/cint/cintex/Module.mk	2011-07-10 10:42:49.104889217 +0400
++++ root/cint/cintex/Module.mk	2011-07-10 10:43:21.496672876 +0400
+@@ -31,10 +31,6 @@
+ CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
+ $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
+ endif
+-ifneq ($(BUILDPYTHON),no)
+-CINTEXPYC    := $(CINTEXPY:.py=.pyc)
+-CINTEXPYO    := $(CINTEXPY:.py=.pyo)
+-endif
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
+@@ -86,8 +82,6 @@
+ 		fi)
+ 		cp $< $@
+ 
+-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
+-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
+                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
+diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
+--- root.as-needed/cint/reflex/Module.mk	2011-07-10 10:42:49.074890651 +0400
++++ root/cint/reflex/Module.mk	2011-07-10 10:43:21.496672876 +0400
+@@ -48,9 +48,6 @@
+ RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
+ RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
+ RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
+-ifneq ($(BUILDPYTHON),no)
+-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
+-endif
+ 
+ RFLX_LIBDIR = $(LIBDIR)
+ 
+@@ -92,7 +89,7 @@
+ 
+ ALLEXECS += $(RFLX_GENMAPX)
+ 
+-POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++POSTBIN  += $(RFLX_GRFLXPY)
+ 
+ ##### local rules #####
+ .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
+@@ -122,8 +119,6 @@
+ 		  mkdir -p lib/python/genreflex; fi )
+ 		cp $< $@
+ 
+-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
+-		@python -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
+ 
+@@ -149,7 +144,7 @@
+ 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
+ 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
+ 
+-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
+ 
+ clean-genreflex:
+ 		@rm -rf lib/python/genreflex
+diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
+--- root.as-needed/cint/reflex/python/CMakeLists.txt	2011-07-10 10:42:49.074890651 +0400
++++ root/cint/reflex/python/CMakeLists.txt	2011-07-10 10:43:21.496672876 +0400
+@@ -15,7 +15,7 @@
+ #####################   sources   ####################
+ 
+ FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
+-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
++SET(GENREFLEX_SCRIPT PARENT_SCOPE)
+ 
+ #####################  gccxmlpath ####################
+ 

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index c6422fa..30f4635 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -17,10 +17,11 @@
 </longdescription>
   <use>
     <flag name="c++0x"> Build ROOT using the C++11 standard. Requires <pkg>sys-devel/gcc</pkg>&gt;=4.7.0</flag>
+    <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
     <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
     <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
     <flag name="htmldoc">Generate html documentation</flag>
-    <flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
+    <!--<flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>!-->
     <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
     <flag name="metric">Default to A4 paper size and metric measurement</flag>
     <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>

diff --git a/sci-physics/root/root-5.32.04.ebuild b/sci-physics/root/root-5.32.04.ebuild
new file mode 100644
index 0000000..b685c3e
--- /dev/null
+++ b/sci-physics/root/root-5.32.04.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.04.ebuild,v 1.2 2013/03/02 23:27:01 hwoarang Exp $
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+	_SVN=subversion
+	ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk"
+	ESVN_OPTIONS="--non-interactive --trust-server-cert"
+	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_{6,7} )
+inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_SVN}
+
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+PATCH_PV2=5.32.00
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="${SRC_URI}
+	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf
+		math? (
+			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
+		htmldoc? (
+			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerberos
+	ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6
+	pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
+
+CDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-fonts/dejavu
+	media-libs/freetype
+	media-libs/giflib
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/shadow
+	X? (
+		media-libs/ftgl
+		media-libs/glew
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		|| (
+			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
+			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+		)
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+		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 )
+		xft? ( x11-libs/libXft )
+		)
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi )
+	clarens? ( dev-libs/xmlrpc-c[curl] )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio )
+	fftw? ( sci-libs/fftw:3.0 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( <sci-physics/pythia-8.1.80:8 )
+	ruby? (
+			dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )
+	xrootd? ( net-libs/xrootd )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
+
+REQUIRED_USE="
+	!X? ( !opengl !qt4 !xft )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	echo
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
+	echo
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	if use math; then
+		if use openmp; then
+			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+				ewarn "You are using a gcc without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+	rm -rf graf2d/asimage/src/libAfterImage || die
+	rm -rf graf3d/ftgl/{inc,src} || die
+	rm -rf graf2d/freetype/src || die
+	rm -rf graf3d/glew/{inc,src} || die
+	rm -rf core/pcre/src || die
+	rm -rf math/unuran/src/unuran-*.tar.gz || die
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
+	rm -rf core/lzma/src/*.tar.gz || die
+	rm graf3d/gl/{inc,src}/gl2ps.* || die
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+
+	# Make html docs self-consistent for offline work (based on Fedora spec)
+	if use htmldoc; then
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
+		# make images local
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
+			-i etc/html/header.html || die "htmldoc sed failed"
+
+		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
+			die "htmldoc preparation failed"
+	fi
+}
+
+src_configure() {
+	# the configure script is not the standard autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
+		--with-afs-shared=yes \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-builtin-lzma \
+		--disable-cling \
+		--enable-astiff \
+		--enable-exceptions	\
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		$(use_enable X x11) \
+		$(use_enable X asimage) \
+		$(use_enable afs) \
+		$(use_enable avahi bonjour) \
+		$(use_enable clarens) \
+		$(use_enable clarens peac) \
+		$(use_enable fits fitsio) \
+		$(use_enable fftw fftw3) \
+		$(use_enable graphviz gviz) \
+		$(use_enable kerberos krb5) \
+		$(use_enable ldap) \
+		$(use_enable math gsl-shared) \
+		$(use_enable math genvector) \
+		$(use_enable math mathmore) \
+		$(use_enable math minuit2) \
+		$(use_enable math roofit) \
+		$(use_enable math tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable postgres pgsql) \
+		$(use_enable prefix rpath) \
+		$(use_enable pythia6) \
+		$(use_enable pythia8) \
+		$(use_enable python) \
+		$(use_enable qt4 qt) \
+		$(use_enable qt4 qtgsi) \
+		$(use_enable reflex cintex) \
+		$(use_enable reflex) \
+		$(use_enable ruby) \
+		$(use_enable ssl) \
+		$(use_enable xft) \
+		$(use_enable xml) \
+		$(use_enable xrootd) \
+		${EXTRA_ECONF} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}"
+	if use emacs; then
+		elisp-compile build/misc/*.el || die "elisp-compile failed"
+	fi
+}
+
+doc_install() {
+	cd "${S}"
+	if use doc; then
+		einfo "Installing user's guides"
+		dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	fi
+
+	if use examples; then
+		# these should really be taken care of by the root make install
+		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
+		doins -r tmva/test
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+	fi
+}
+
+daemon_install() {
+	cd "${S}"
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins etc/daemons/{rootd,proofd}.xinetd
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	sed -e 's,@prefix@,/usr,' \
+		build/package/debian/root-system-bin.desktop.in > root.desktop
+	domenu root.desktop
+	doicon "${S}"/build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	if use python; then
+		echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+		python_optimize /usr/$(get_libdir)/root
+	fi
+	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	doenvd 99root
+
+	# The build system installs Emacs support unconditionally and in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -rf "${ED}"/usr/share/emacs
+	if use emacs; then
+		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
+	fi
+
+	doc_install
+	daemon_install
+	desktop_install
+
+	# Cleanup of files either already distributed or unused on Gentoo
+	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
+	rm "${ED}"usr/share/root/fonts/LICENSE || die
+	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
+	rm -f posix/mktypes dll_stl/setup \
+		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
+	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
+	rm -f "${ED}"/etc/root/proof/*.sample || die
+	rm -rf "${ED}"/etc/root/daemons || die
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin/ || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2013-12-05 17:08 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2013-12-05 17:08 UTC (permalink / raw
  To: gentoo-commits

commit:     9befbea7304e0ca846512fe8aa6fed392d8e2243
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Dec  5 17:07:45 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Thu Dec  5 17:07:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9befbea7

sci-physics/root: version bump and fixes

---
 sci-physics/root/ChangeLog                         |  14 ++
 .../root/files/root-5.28.00b-asneeded.patch        |  20 --
 .../root/files/root-5.28.00b-prop-ldflags.patch    |  13 --
 .../files/root-5.32.00-explicit-functions.patch    |  18 --
 .../root/files/root-5.32.00-nobyte-compile.patch   | 137 -------------
 sci-physics/root/files/root-5.34.13-desktop.patch  |  12 ++
 sci-physics/root/files/root-5.34.13-pythia8.patch  |  13 ++
 sci-physics/root/files/root-5.34.13-unuran.patch   |  40 ++++
 sci-physics/root/metadata.xml                      |   1 -
 .../{root-5.32.04.ebuild => root-5.34.13.ebuild}   | 223 ++++++++++++---------
 10 files changed, 207 insertions(+), 284 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 4f26aae..cc4b7cb 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,20 @@
 # Copyright 1999-2013 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.13 (05 Dec 2013)
+
+  05 Dec 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.32.04.ebuild,
+  +root-5.34.13.ebuild, -files/root-5.28.00b-asneeded.patch,
+  -files/root-5.28.00b-prop-ldflags.patch,
+  -files/root-5.32.00-explicit-functions.patch,
+  -files/root-5.32.00-nobyte-compile.patch, +files/root-5.34.13-desktop.patch,
+  +files/root-5.34.13-pythia8.patch, +files/root-5.34.13-unuran.patch:
+  Version bump. Fix Pythia8 version requirements and fix Pythia8
+  build using patch from Oliver Freyermuth (see bug 490332 and
+  https://sft.its.cern.ch/jira/browse/ROOT-5667). Fix c++0x USE flag.
+  Fix installaton of python optimized modules. Fix desktop file to
+  conform currest standard. Remove old.
+
   09 Nov 2013; Andrew Savchenko <bircoph@gmail.com> +root-5.32.04.ebuild,
   +files/root-5.28.00b-asneeded.patch, +files/root-5.28.00b-prop-ldflags.patch,
   +files/root-5.32.00-explicit-functions.patch,

diff --git a/sci-physics/root/files/root-5.28.00b-asneeded.patch b/sci-physics/root/files/root-5.28.00b-asneeded.patch
deleted file mode 100644
index b845247..0000000
--- a/sci-physics/root/files/root-5.28.00b-asneeded.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- root.orig/configure	2010-12-20 07:17:54.000000000 +0000
-+++ root/configure	2010-12-20 07:16:05.000000000 +0000
-@@ -709,7 +709,7 @@
-        cat <<EOF > conftest.mk
- include ${ac_srcdir}/config/Makefile.${arch}
- conftest: conftest.c
--	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
-+	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib  -o \$@
- 
- conftest.c:
- 	echo "int main() { return 0; }" > \$@
-@@ -723,7 +723,7 @@
-        cat <<EOF > conftest.mk
- include ${ac_srcdir}/config/Makefile.${arch}
- conftest:conftest.c
--	\$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@
-+	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@
- 
- conftest.c:
- 	echo "extern int $linksymbol (); " > \$@

diff --git a/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch b/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch
deleted file mode 100644
index 7324319..0000000
--- a/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur root.orig/config/Makefile.in root/config/Makefile.in
---- root.orig/config/Makefile.in	2010-12-14 17:20:26.000000000 +0300
-+++ root/config/Makefile.in	2010-12-17 22:33:34.902161458 +0300
-@@ -27,7 +27,7 @@
- 
- EXTRA_CFLAGS   := -Iinclude @cflags@
- EXTRA_CXXFLAGS := -Iinclude @cflags@
--EXTRA_LDFLAGS  := @ldflags@
-+EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
- WINRTDEBUG     := @winrtdebug@
- 
- GLBPATCHFLAGS  := @glbpatchcflags@
-

diff --git a/sci-physics/root/files/root-5.32.00-explicit-functions.patch b/sci-physics/root/files/root-5.32.00-explicit-functions.patch
deleted file mode 100644
index 570d61e..0000000
--- a/sci-physics/root/files/root-5.32.00-explicit-functions.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- root/io/io/Module.mk.orig	2012-02-29 19:46:38.000000000 +0400
-+++ root/io/io/Module.mk	2012-03-09 02:29:19.905665572 +0400
-@@ -67,15 +67,5 @@
- distclean::     distclean-$(MODNAME)
- 
- ##### extra rules ######
--#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
--ifeq ($(GCC_VERS),gcc-4.4)
--ifneq ($(filter -O%,$(OPT)),)
-    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
--endif
--endif
--ifeq ($(GCC_VERS),gcc-4.5)
--ifneq ($(filter -O%,$(OPT)),)
-    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
--endif
--endif
--

diff --git a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch b/sci-physics/root/files/root-5.32.00-nobyte-compile.patch
deleted file mode 100644
index 179e579..0000000
--- a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Naur root.as-needed/Makefile root/Makefile
---- root.as-needed/Makefile	2011-07-10 10:42:49.758191296 +0400
-+++ root/Makefile	2011-07-10 10:43:21.493339703 +0400
-@@ -1167,10 +1167,7 @@
- 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
- 	   fi; \
--	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
--	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
--	   fi; \
--	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      dir=$(RFLX_GRFLXDD:lib/=); \
- 	      while test "x$${dir}" != "x" && \
- 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-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 $< $@
- endif
--ROOTPYC      := $(ROOTPY:.py=.pyc)
--ROOTPYO      := $(ROOTPY:.py=.pyo)
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- 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)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules
---- root.as-needed/build/package/debian/rules	2011-07-10 10:42:49.241549346 +0400
-+++ root/build/package/debian/rules	2011-07-10 10:48:06.989670589 +0400
-@@ -691,10 +691,6 @@
- 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
- 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/cint7			\
- 		-X$(PREFIX)/include/root/Minuit2
- #		$(foreach i, \
-diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.as-needed/cint/cintex/Module.mk	2011-07-10 10:42:49.104889217 +0400
-+++ root/cint/cintex/Module.mk	2011-07-10 10:43:21.496672876 +0400
-@@ -31,10 +31,6 @@
- CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC    := $(CINTEXPY:.py=.pyc)
--CINTEXPYO    := $(CINTEXPY:.py=.pyo)
--endif
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- 		fi)
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.as-needed/cint/reflex/Module.mk	2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/Module.mk	2011-07-10 10:43:21.496672876 +0400
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
- 
- RFLX_LIBDIR = $(LIBDIR)
- 
-@@ -92,7 +89,7 @@
- 
- ALLEXECS += $(RFLX_GENMAPX)
- 
--POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN  += $(RFLX_GRFLXPY)
- 
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- 		  mkdir -p lib/python/genreflex; fi )
- 		cp $< $@
- 
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
--		@python -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
- 
-@@ -149,7 +144,7 @@
- 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
- 
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
- 
- clean-genreflex:
- 		@rm -rf lib/python/genreflex
-diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.as-needed/cint/reflex/python/CMakeLists.txt	2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/python/CMakeLists.txt	2011-07-10 10:43:21.496672876 +0400
-@@ -15,7 +15,7 @@
- #####################   sources   ####################
- 
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
- 
- #####################  gccxmlpath ####################
- 

diff --git a/sci-physics/root/files/root-5.34.13-desktop.patch b/sci-physics/root/files/root-5.34.13-desktop.patch
new file mode 100644
index 0000000..7d47bcf
--- /dev/null
+++ b/sci-physics/root/files/root-5.34.13-desktop.patch
@@ -0,0 +1,12 @@
+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/files/root-5.34.13-pythia8.patch b/sci-physics/root/files/root-5.34.13-pythia8.patch
new file mode 100644
index 0000000..07f62bb
--- /dev/null
+++ b/sci-physics/root/files/root-5.34.13-pythia8.patch
@@ -0,0 +1,13 @@
+diff --git a/montecarlo/pythia8/Module.mk b/montecarlo/pythia8/Module.mk
+index b3d0ee4..86fb3d5 100644
+--- a/montecarlo/pythia8/Module.mk
++++ b/montecarlo/pythia8/Module.mk
+@@ -50,7 +50,7 @@ $(PYTHIA8LIB):  $(PYTHIA8O) $(PYTHIA8DO) $(ORDER_) $(MAINLIBS) $(PYTHIA8LIBDEP)
+ $(PYTHIA8DS):   $(PYTHIA8H) $(PYTHIA8L) $(ROOTCINTTMPDEP)
+ 		$(MAKEDIR)
+ 		@echo "Generating dictionary $@..."
+-		$(ROOTCINTTMP) -f $@ -c -I$(FPYTHIA8INCDIR) $(PYTHIA8H) $(PYTHIA8L)
++		$(ROOTCINTTMP) -f $@ -c -p -I$(FPYTHIA8INCDIR) $(PYTHIA8H) $(PYTHIA8L)
+ 
+ $(PYTHIA8MAP):  $(RLIBMAP) $(MAKEFILEDEP) $(PYTHIA8L)
+ 		$(RLIBMAP) -o $@ -l $(PYTHIA8LIB) \

diff --git a/sci-physics/root/files/root-5.34.13-unuran.patch b/sci-physics/root/files/root-5.34.13-unuran.patch
new file mode 100644
index 0000000..8262313
--- /dev/null
+++ b/sci-physics/root/files/root-5.34.13-unuran.patch
@@ -0,0 +1,40 @@
+diff --git a/math/unuran/Module.mk b/math/unuran/Module.mk
+index 00a530b..7cd22dc 100644
+--- a/math/unuran/Module.mk
++++ b/math/unuran/Module.mk
+@@ -31,7 +31,7 @@ UNRS         := $(wildcard $(UNRDIRS)/src/utils/*.c) \
+                 $(wildcard $(UNRDIRS)/src/uniform/*.c) \
+                 $(wildcard $(UNRDIRS)/src/urng/*.c)
+ else
+-UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -))
++UNRTARCONTENT:=
+ UNRS         := $(filter %.c, \
+                 $(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \
+                 $(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \
+@@ -81,10 +81,9 @@ INCLUDEFILES += $(UNURANDEP)
+ ##### local rules #####
+ .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+ 
+-include/%.h: 	$(UNURANDIRI)/%.h $(UNURANETAG)
++include/%.h: 	$(UNURANDIRI)/%.h
+ 		cp $< $@
+ 
+-$(UNURANDEP):   $(UNRCFG)
+ $(UNRS):        $(UNURANETAG)
+ 
+ $(UNURANETAG):	$(UNRSRCS)
+@@ -137,12 +136,12 @@ $(UNRCFG):	$(UNURANETAG)
+ 		GNUMAKE=$(MAKE) ./configure  CC="$$ACC"  \
+ 		CFLAGS="$$ACFLAGS");
+ 
+-$(UNURANLIB):   $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
++$(UNURANLIB):   $(UNURANO) $(UNURANDO) $(ORDER_) \
+                 $(MAINLIBS) $(UNURANLIBDEP)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"  \
+ 		   "$(SOFLAGS)" libUnuran.$(SOEXT) $@     \
+ 		   "$(UNURANO) $(UNURANDO)"             \
+-		   "$(UNURANLIBEXTRA) $(UNRO)"
++		   "$(UNURANLIBEXTRA) -lunuran"
+ 
+ $(UNURANDS):    $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP)
+ 		$(MAKEDIR)

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 30f4635..67025ea 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -17,7 +17,6 @@
 </longdescription>
   <use>
     <flag name="c++0x"> Build ROOT using the C++11 standard. Requires <pkg>sys-devel/gcc</pkg>&gt;=4.7.0</flag>
-    <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
     <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
     <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
     <flag name="htmldoc">Generate html documentation</flag>

diff --git a/sci-physics/root/root-5.32.04.ebuild b/sci-physics/root/root-5.34.13.ebuild
similarity index 62%
rename from sci-physics/root/root-5.32.04.ebuild
rename to sci-physics/root/root-5.34.13.ebuild
index b685c3e..144d222 100644
--- a/sci-physics/root/root-5.32.04.ebuild
+++ b/sci-physics/root/root-5.34.13.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.04.ebuild,v 1.2 2013/03/02 23:27:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.10-r2.ebuild,v 1.1 2013/10/29 17:00:37 bicatali Exp $
 
 EAPI=5
 
 if [[ ${PV} == "9999" ]] ; then
-	_SVN=subversion
-	ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk"
-	ESVN_OPTIONS="--non-interactive --trust-server-cert"
+	_GIT=git-2
+	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
 	SRC_URI=""
 	KEYWORDS=""
 else
@@ -16,30 +15,42 @@ else
 fi
 
 PYTHON_COMPAT=( python2_{6,7} )
-inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 ${_GIT} multilib python-single-r1 toolchain-funcs user versionator
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
 PATCH_PV=5.28.00b
 PATCH_PV2=5.32.00
+PATCH_PV3=5.34.05
+PATCH_PV4=5.34.13
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
 SRC_URI="${SRC_URI}
-	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf
+	!minimal? ( doc? (
 		math? (
 			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
 			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
+		metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf )
+	   !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf )
 		htmldoc? (
 			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
 			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png )
+	) )"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerberos
-	ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6
-	pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
+IUSE="+X afs avahi c++0x doc emacs examples fits fftw graphviz htmldoc
+	kerberos ldap +math +metric minimal mpi mysql odbc +opengl openmp oracle postgres
+	prefix pythia6 pythia8 python qt4 +reflex ruby sqlite ssl xinetd xml xrootd"
+
+REQUIRED_USE="
+	!X? ( !opengl !qt4 )
+	htmldoc? ( doc )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 CDEPEND="
 	app-arch/xz-utils
@@ -59,42 +70,48 @@ CDEPEND="
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXpm
-		|| (
-			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
-			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
-		)
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		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 )
-		xft? ( x11-libs/libXft )
+		!minimal? (
+			|| (
+				>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
+				>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+			)
+			opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+			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
 		)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c[curl] )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( <sci-physics/pythia-8.1.80:8 )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	xrootd? ( net-libs/xrootd )"
+	)
+	!minimal? (
+		afs? ( net-fs/openafs )
+		avahi? ( net-dns/avahi )
+		emacs? ( virtual/emacs )
+		fits? ( sci-libs/cfitsio )
+		fftw? ( sci-libs/fftw:3.0 )
+		graphviz? ( media-gfx/graphviz )
+		kerberos? ( virtual/krb5 )
+		ldap? ( net-nds/openldap )
+		math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+		mysql? ( virtual/mysql )
+		odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+		oracle? ( dev-db/oracle-instantclient-basic )
+		postgres? ( dev-db/postgresql-base )
+		pythia6? ( sci-physics/pythia:6 )
+		pythia8? ( >=sci-physics/pythia-8.1.80:8 )
+		python? ( ${PYTHON_DEPS} )
+		ruby? (
+				dev-lang/ruby
+				dev-ruby/rubygems )
+		sqlite? ( dev-db/sqlite:3 )
+		ssl? ( dev-libs/openssl )
+		xml? ( dev-libs/libxml2 )
+		xrootd? ( >=net-libs/xrootd-3.2.0 )
+	)"
 
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -105,11 +122,6 @@ RDEPEND="${CDEPEND}
 
 PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
 
-REQUIRED_USE="
-	!X? ( !opengl !qt4 !xft )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )"
-
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {
@@ -117,19 +129,20 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 	echo
 	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
 	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
 	elog "You can use the env variable EXTRA_ECONF variable for this."
 	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
 	echo
 	enewgroup rootd
 	enewuser rootd -1 -1 /var/spool/rootd rootd
+	use minimal && return
 
 	if use math; then
 		if use openmp; then
-			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-				ewarn "You are using a gcc without OpenMP capabilities"
+			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
+				ewarn "You are using a g++ without OpenMP capabilities"
 				die "Need an OpenMP capable compiler"
 			else
 				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
@@ -138,31 +151,36 @@ pkg_setup() {
 			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
 		fi
 	fi
+	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
+		! version_is_at_least "4.7" "$(gcc-version)"; then
+		eerror "You are using a g++ without C++0x capabilities"
+		die "Need an C++0x capable compiler"
+	fi
 }
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV4}-unuran.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV4}-pythia8.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV4}-desktop.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -rf graf2d/asimage/src/libAfterImage || die
-	rm -rf graf3d/ftgl/{inc,src} || die
-	rm -rf graf2d/freetype/src || die
-	rm -rf graf3d/glew/{inc,src} || die
-	rm -rf core/pcre/src || die
-	rm -rf math/unuran/src/unuran-*.tar.gz || die
+	rm -r graf2d/asimage/src/libAfterImage || die
+	rm -r graf3d/ftgl/{inc,src} || die
+	rm -r graf2d/freetype/src || die
+	rm -r graf3d/glew/{inc,src} || die
+	rm -r core/pcre/src || die
+	rm -r math/unuran/src/unuran-*.tar.gz || die
 	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
-	rm -rf core/lzma/src/*.tar.gz || die
+	rm -r core/lzma/src/*.tar.gz || die
 	rm graf3d/gl/{inc,src}/gl2ps.* || die
 	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
 
@@ -186,7 +204,7 @@ src_prepare() {
 	unset QTDIR
 
 	# Make html docs self-consistent for offline work (based on Fedora spec)
-	if use htmldoc; then
+	if use htmldoc && ! use minimal; then
 		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
 		# make images local
 		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
@@ -203,7 +221,7 @@ src_prepare() {
 
 src_configure() {
 	# the configure script is not the standard autotools
-	./configure \
+	local mycommonconf="
 		--prefix="${EPREFIX}"/usr \
 		--etcdir="${EPREFIX}"/etc/root \
 		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
@@ -214,18 +232,29 @@ src_configure() {
 		--with-cxx=$(tc-getCXX) \
 		--with-f77=$(tc-getFC) \
 		--with-ld=$(tc-getCXX) \
+		--nohowto
+	"
+	if use minimal; then
+		./configure \
+			${mycommonconf} \
+			$(usex X --gminimal --minimal) \
+			|| die "configure failed"
+		return
+	fi
+	# cling is disabled because in requires live llvm and clang
+	./configure \
+		${mycommonconf} \
 		--with-afs-shared=yes \
 		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
 		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
 		--disable-builtin-ftgl \
+		--disable-builtin-freetype \
 		--disable-builtin-glew \
 		--disable-builtin-pcre \
 		--disable-builtin-zlib \
 		--disable-builtin-lzma \
 		--disable-cling \
 		--enable-astiff \
-		--enable-exceptions	\
 		--enable-explicitlink \
 		--enable-gdml \
 		--enable-memstat \
@@ -236,10 +265,10 @@ src_configure() {
 		--fail-on-missing \
 		$(use_enable X x11) \
 		$(use_enable X asimage) \
+		$(use_enable X xft) \
 		$(use_enable afs) \
 		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
+		$(use_enable c++0x cxx11) \
 		$(use_enable fits fitsio) \
 		$(use_enable fftw fftw3) \
 		$(use_enable graphviz gviz) \
@@ -255,7 +284,9 @@ src_configure() {
 		$(use_enable mysql) \
 		$(use_enable odbc) \
 		$(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) \
@@ -265,8 +296,8 @@ src_configure() {
 		$(use_enable reflex cintex) \
 		$(use_enable reflex) \
 		$(use_enable ruby) \
+		$(use_enable sqlite) \
 		$(use_enable ssl) \
-		$(use_enable xft) \
 		$(use_enable xml) \
 		$(use_enable xrootd) \
 		${EXTRA_ECONF} \
@@ -274,28 +305,29 @@ src_configure() {
 }
 
 src_compile() {
-	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}"
-	if use emacs; then
+	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
+	if use emacs && ! use minimal; then
 		elisp-compile build/misc/*.el || die "elisp-compile failed"
 	fi
 }
 
 doc_install() {
 	cd "${S}"
-	if use doc; then
+	if use doc && ! use minimal; then
 		einfo "Installing user's guides"
-		dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
+		use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \
+			dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf
 		use math && dodoc \
 			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
 			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
 	fi
 
-	if use examples; then
+	if use examples && ! use minimal; then
 		# these should really be taken care of by the root make install
 		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
 		doins -r tmva/test
 	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
 	fi
 }
 
@@ -319,10 +351,9 @@ daemon_install() {
 
 desktop_install() {
 	cd "${S}"
-	sed -e 's,@prefix@,/usr,' \
-		build/package/debian/root-system-bin.desktop.in > root.desktop
-	domenu root.desktop
-	doicon "${S}"/build/package/debian/root-system-bin.png
+	echo "Icon=root-system-bin" >> etc/root.desktop
+	domenu etc/root.desktop
+	doicon build/package/debian/root-system-bin.png
 
 	insinto /usr/share/icons/hicolor/48x48/mimetypes
 	doins build/package/debian/application-x-root.png
@@ -335,18 +366,20 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	if use python; then
-		echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-		python_optimize /usr/$(get_libdir)/root
+	if ! use minimal; then
+		use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+		if use python; then
+			echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+			python_optimize "${D}/usr/$(get_libdir)/root"
+		fi
+		use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
 	fi
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
 	doenvd 99root
 
 	# The build system installs Emacs support unconditionally and in the wrong
 	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -rf "${ED}"/usr/share/emacs
-	if use emacs; then
+	rm -r "${ED}"/usr/share/emacs
+	if use emacs && ! use minimal; then
 		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
 	fi
 
@@ -358,11 +391,11 @@ src_install() {
 	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
 	rm "${ED}"usr/share/root/fonts/LICENSE || die
 	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm -f posix/mktypes dll_stl/setup \
+	rm posix/mktypes dll_stl/setup \
 		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
-	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
-	rm -f "${ED}"/etc/root/proof/*.sample || die
-	rm -rf "${ED}"/etc/root/daemons || die
+	rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
+	rm "${ED}"/etc/root/proof/*.sample || die
+	rm -r "${ED}"/etc/root/daemons || die
 	popd > /dev/null
 	# these should be in PATH
 	mv "${ED}"etc/root/proof/utils/pq2/pq2* \


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2013-12-10 15:05 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2013-12-10 15:05 UTC (permalink / raw
  To: gentoo-commits

commit:     d2286c057535271f3f1dbefaf0edf90b93d57453
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue Dec 10 15:05:03 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue Dec 10 15:05:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d2286c05

sci-physics/root: update pdf docs, remove old

---
 sci-physics/root/ChangeLog                        |   5 +
 sci-physics/root/files/root-5.28.00b-unuran.patch |  39 ---
 sci-physics/root/root-5.34.10-r2.ebuild           | 408 ----------------------
 sci-physics/root/root-5.34.13.ebuild              |  22 +-
 4 files changed, 23 insertions(+), 451 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index cc4b7cb..3ca347c 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 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 Dec 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.34.10-r2.ebuild,
+  root-5.34.13.ebuild, -files/root-5.28.00b-unuran.patch:
+  Add ROOTPrimer and Spectrum user guides.
+  Remove old versions.
+
 *root-5.34.13 (05 Dec 2013)
 
   05 Dec 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.32.04.ebuild,

diff --git a/sci-physics/root/files/root-5.28.00b-unuran.patch b/sci-physics/root/files/root-5.28.00b-unuran.patch
deleted file mode 100644
index 76422da..0000000
--- a/sci-physics/root/files/root-5.28.00b-unuran.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur root-trunk.orig/math/unuran/Module.mk root-trunk/math/unuran/Module.mk
---- root.orig/math/unuran/Module.mk	2010-11-25 20:41:32.000000000 +0100
-+++ root/math/unuran/Module.mk	2010-11-25 20:51:47.190704977 +0100
-@@ -20,7 +20,7 @@
- UNURANETAG   := $(call stripsrc,$(UNURANDIRS)/headers.d)
- UNRCFG       := $(call stripsrc,$(UNURANDIRS)/$(UNRVERS)/config.h)
- 
--UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -))
-+UNRTARCONTENT:=
- UNRS         := $(filter %.c, \
-                 $(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \
-                 $(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \
-@@ -69,10 +69,9 @@
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
- 
--include/%.h: 	$(UNURANDIRI)/%.h $(UNURANETAG)
-+include/%.h: 	$(UNURANDIRI)/%.h
- 		cp $< $@
- 
--$(UNURANDEP):   $(UNRCFG)
- $(UNRS):        $(UNURANETAG)
- 
- $(UNURANETAG):	$(UNRSRCS)
-@@ -125,12 +124,12 @@
- 		GNUMAKE=$(MAKE) ./configure  CC="$$ACC"  \
- 		CFLAGS="$$ACFLAGS");
- 
--$(UNURANLIB):   $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
-+$(UNURANLIB):   $(UNURANO) $(UNURANDO) $(ORDER_) \
-                 $(MAINLIBS) $(UNURANLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"  \
- 		   "$(SOFLAGS)" libUnuran.$(SOEXT) $@     \
- 		   "$(UNURANO) $(UNURANDO)"             \
--		   "$(UNURANLIBEXTRA) $(UNRO)"
-+		   "$(UNURANLIBEXTRA) -lunuran"
- 
- $(UNURANDS):    $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP)
- 		$(MAKEDIR)

diff --git a/sci-physics/root/root-5.34.10-r2.ebuild b/sci-physics/root/root-5.34.10-r2.ebuild
deleted file mode 100644
index 0d460b0..0000000
--- a/sci-physics/root/root-5.34.10-r2.ebuild
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.10-r2.ebuild,v 1.1 2013/10/29 17:00:37 bicatali Exp $
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	_GIT=git-2
-	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_{6,7} )
-inherit elisp-common eutils fdo-mime fortran-2 ${_GIT} multilib python-single-r1 toolchain-funcs user versionator
-
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.32.00
-PATCH_PV3=5.34.05
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="${SRC_URI}
-	!minimal? ( doc? (
-		math? (
-			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
-		metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf )
-	   !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf )
-		htmldoc? (
-			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png )
-	) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="+X afs avahi c++0x doc emacs examples fits fftw graphviz htmldoc
-	kerberos ldap +math +metric minimal mpi mysql odbc +opengl openmp oracle postgres
-	prefix pythia6 pythia8 python qt4 +reflex ruby sqlite ssl xinetd xml xrootd"
-
-REQUIRED_USE="
-	!X? ( !opengl !qt4 )
-	htmldoc? ( doc )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-fonts/dejavu
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/shadow
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		!minimal? (
-			|| (
-				>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
-				>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
-			)
-			opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-			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
-		)
-	)
-	!minimal? (
-		afs? ( net-fs/openafs )
-		avahi? ( net-dns/avahi )
-		emacs? ( virtual/emacs )
-		fits? ( sci-libs/cfitsio )
-		fftw? ( sci-libs/fftw:3.0 )
-		graphviz? ( media-gfx/graphviz )
-		kerberos? ( virtual/krb5 )
-		ldap? ( net-nds/openldap )
-		math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-		mysql? ( virtual/mysql )
-		odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-		oracle? ( dev-db/oracle-instantclient-basic )
-		postgres? ( dev-db/postgresql-base )
-		pythia6? ( sci-physics/pythia:6 )
-		pythia8? ( <sci-physics/pythia-8.1.80:8 )
-		python? ( ${PYTHON_DEPS} )
-		ruby? (
-				dev-lang/ruby
-				dev-ruby/rubygems )
-		sqlite? ( dev-db/sqlite:3 )
-		ssl? ( dev-libs/openssl )
-		xml? ( dev-libs/libxml2 )
-		xrootd? ( >=net-libs/xrootd-3.2.0 )
-	)"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-	use minimal && return
-
-	if use math; then
-		if use openmp; then
-			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
-				ewarn "You are using a g++ without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
-		! version_is_at_least "4.7" "$(gcc-version)"; then
-		eerror "You are using a g++ without C++0x capabilities"
-		die "Need an C++0x capable compiler"
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -r graf2d/asimage/src/libAfterImage || die
-	rm -r graf3d/ftgl/{inc,src} || die
-	rm -r graf2d/freetype/src || die
-	rm -r graf3d/glew/{inc,src} || die
-	rm -r core/pcre/src || die
-	rm -r math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
-	rm -r core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-
-	# Make html docs self-consistent for offline work (based on Fedora spec)
-	if use htmldoc && ! use minimal; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
-		# make images local
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
-			-i etc/html/header.html || die "htmldoc sed failed"
-
-		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
-			die "htmldoc preparation failed"
-	fi
-}
-
-src_configure() {
-	# the configure script is not the standard autotools
-	local mycommonconf="
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-ld=$(tc-getCXX) \
-		--nohowto
-	"
-	if use minimal; then
-		./configure \
-			${mycommonconf} \
-			$(usex X --gminimal --minimal) \
-			|| die "configure failed"
-		return
-	fi
-	# cling is disabled because in requires live llvm and clang
-	./configure \
-		${mycommonconf} \
-		--with-afs-shared=yes \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-ftgl \
-		--disable-builtin-freetype \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--disable-cling \
-		--enable-astiff \
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable X xft) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable c++0x c++11) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(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) \
-		$(use_enable python) \
-		$(use_enable qt4 qt) \
-		$(use_enable qt4 qtgsi) \
-		$(use_enable reflex cintex) \
-		$(use_enable reflex) \
-		$(use_enable ruby) \
-		$(use_enable sqlite) \
-		$(use_enable ssl) \
-		$(use_enable xml) \
-		$(use_enable xrootd) \
-		${EXTRA_ECONF} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
-	if use emacs && ! use minimal; then
-		elisp-compile build/misc/*.el || die "elisp-compile failed"
-	fi
-}
-
-doc_install() {
-	cd "${S}"
-	if use doc && ! use minimal; then
-		einfo "Installing user's guides"
-		use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \
-			dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	fi
-
-	if use examples && ! use minimal; then
-		# these should really be taken care of by the root make install
-		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
-		doins -r tmva/test
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-}
-
-daemon_install() {
-	cd "${S}"
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	echo "Icon=root-system-bin" >> etc/root.desktop
-	domenu etc/root.desktop
-	doicon build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	if ! use minimal; then
-		use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-		if use python; then
-			echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-			python_optimize /usr/$(get_libdir)/root
-		fi
-		use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	fi
-	doenvd 99root
-
-	# The build system installs Emacs support unconditionally and in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -r "${ED}"/usr/share/emacs
-	if use emacs && ! use minimal; then
-		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
-	fi
-
-	doc_install
-	daemon_install
-	desktop_install
-
-	# Cleanup of files either already distributed or unused on Gentoo
-	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
-	rm "${ED}"usr/share/root/fonts/LICENSE || die
-	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm posix/mktypes dll_stl/setup \
-		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
-	rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
-	rm "${ED}"/etc/root/proof/*.sample || die
-	rm -r "${ED}"/etc/root/daemons || die
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin/ || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

diff --git a/sci-physics/root/root-5.34.13.ebuild b/sci-physics/root/root-5.34.13.ebuild
index 144d222..4bffdd8 100644
--- a/sci-physics/root/root-5.34.13.ebuild
+++ b/sci-physics/root/root-5.34.13.ebuild
@@ -30,9 +30,16 @@ SRC_URI="${SRC_URI}
 	!minimal? ( doc? (
 		math? (
 			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
-		metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf )
-	   !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf )
+			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+			metric? ( ftp://root.cern.ch/root/doc/spectrum/Spectrum.pdf -> Spectrum-${PV}.pdf )
+			!metric? ( ftp://root.cern.ch/root/doc/spectrum/SpectrumLetter.pdf -> SpectrumLetter-${PV}.pdf )
+		)
+		metric? (
+			ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf
+			ftp://root.cern.ch/root/doc/primer/ROOTPrimer.pdf -> ROOTPrimer-${PV}.pdf )
+	   !metric? (
+			ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf
+			ftp://root.cern.ch/root/doc/primer/ROOTPrimerLetter.pdf -> ROOTPrimerLetter-${PV}.pdf )
 		htmldoc? (
 			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
 			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
@@ -315,8 +322,15 @@ doc_install() {
 	cd "${S}"
 	if use doc && ! use minimal; then
 		einfo "Installing user's guides"
-		use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \
+		if use metric; then
+		    dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf
+		    dodoc "${DISTDIR}"/ROOTPrimer-${PV}.pdf
+			use math && dodoc "${DISTDIR}"/Spectrum-${PV}.pdf
+		else
 			dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf
+		    dodoc "${DISTDIR}"/ROOTPrimerLetter-${PV}.pdf
+			use math && dodoc "${DISTDIR}"/SpectrumLetter-${PV}.pdf
+		fi
 		use math && dodoc \
 			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
 			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2014-07-02 13:35 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2014-07-02 13:35 UTC (permalink / raw
  To: gentoo-commits

commit:     a1c3b313be5be9716a761a762ea3651070ed9e43
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Jul  2 13:29:12 2014 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Jul  2 13:29:12 2014 +0000
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-9999.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 <bircoph@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 <bircoph@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 0000000..146e89f
--- /dev/null
+++ b/sci-physics/root/files/root-6.00.01-cling.patch
@@ -0,0 +1,19 @@
+commit eea9517c17bd86beda895a5a8b3ffe59af18596f
+Author: Axel Naumann <Axel.Naumann@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-9999.ebuild b/sci-physics/root/root-9999.ebuild
deleted file mode 120000
index b46789a..0000000
--- a/sci-physics/root/root-9999.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-root-6.00.01.ebuild
\ No newline at end of file

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
new file mode 100644
index 0000000..26f1dd1
--- /dev/null
+++ b/sci-physics/root/root-9999.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} == "9999" ]] ; 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"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}"
+fi
+
+PYTHON_COMPAT=( python2_{6,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 GPL-2 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
+	xinetd xml xrootd"
+
+# TODO: add support for: davix
+# TODO: ROOT-6 supports x32 ABI, but half of its dependencies doesn't
+# TODO: unbundle: cling, vdt
+
+REQUIRED_USE="
+	mpi? ( math !openmp )
+	opengl? ( X )
+	openmp? ( math !mpi )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt4? ( X )
+"
+
+CDEPEND="
+	app-arch/xz-utils:0=
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre:3=
+	media-fonts/dejavu
+	media-libs/freetype:2=
+	media-libs/giflib:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	>=sys-devel/clang-3.4
+	sys-libs/zlib:0=
+	virtual/jpeg:0
+	virtual/shadow
+	X? (
+		media-libs/ftgl:0=
+		media-libs/glew:0=
+		x11-libs/libX11:0=
+		x11-libs/libXext:0=
+		x11-libs/libXpm:0=
+		!minimal? (
+			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=
+		)
+	)
+	!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:= )
+		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 )
+		)
+		mysql? ( virtual/mysql )
+		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
+		oracle? ( dev-db/oracle-instantclient-basic:0= )
+		postgres? ( dev-db/postgresql-base:= )
+		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= )
+	)"
+
+# TODO: ruby is not yet ported to ROOT-6, reenable when (if?) ready
+#		ruby? (
+#			dev-lang/ruby
+#			dev-ruby/rubygems
+#		)
+#
+# TODO: root-6.00.01 crashes with system libafterimage
+#			|| (
+#				media-libs/libafterimage:0=[gif,jpeg,png,tiff]
+#				>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff]
+#			)
+#			--disable-builtin-afterimage
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	xinetd? ( sys-apps/xinetd )"
+
+PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
+
+# install stuff in ${P} and not ${PF} for easier tracking in root-docs
+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"
+}
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	echo
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
+	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
+	echo
+
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	use minimal && return
+
+	if use math; then
+		if use openmp; then
+			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
+				ewarn "You are using a g++ without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+
+	# check for supported compilers
+	case $(tc-getCXX) in
+		*g++*)
+			if ! version_is_at_least "4.8" "$(gcc-version)"; then
+				eerror "You are using a g++ without C++11 capabilities"
+				die_compiler
+			fi
+		;;
+		*clang++*)
+			# >=clang-3.4 is already in DEPEND
+		;;
+		*icc*|*icpc*)
+			if ! version_is_at_least "13" "$(has_version dev-lang/icc)"; then
+				eerror "You are using an icc without C++11 capabilities"
+				die_compiler
+			fi
+		;;
+		*)
+			ewarn "You are using an unsupported compiler."
+			ewarn "Please report any issues upstream."
+		;;
+	esac
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
+		"${FILESDIR}"/${PN}-5.32.00-afs.patch \
+		"${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-prop-flags.patch \
+		"${FILESDIR}"/${PN}-6.00.01-llvm.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
+	#rm -r graf2d/asimage/src/libAfterImage || die
+	rm -r graf3d/ftgl/{inc,src} || die
+	rm -r graf2d/freetype/src || die
+	rm -r graf3d/glew/{inc,src} || die
+	rm -r core/pcre/src || die
+	rm -r math/unuran/src/unuran-*.tar.gz || die
+	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
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
+		graf3d/gl/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# CSS should use local images
+	sed -i -e 's,http://.*/images/,,' etc/html/ROOT.css || die "html sed failed"
+}
+
+# NB: ROOT uses bundled LLVM, because it is patched and API-incompatible with
+# system LLVM.
+# NB: As of 6.00.0.1 cmake is not ready as it can't fully replace configure,
+# e.g. for afs and geocad.
+
+src_configure() {
+	local -a myconf
+	# Some compilers need special care
+	case $(tc-getCXX) in
+		*clang++*)
+			myconf=(
+				--with-clang
+				--with-f77="$(tc-getFC)"
+			)
+		;;
+		*icc*|*icpc*)
+			# For icc we need to provide architecture manually
+			# and not to tamper with tc-get*
+			use x86 && myconf=( linuxicc )
+			use amd64 && myconf=( linuxx8664icc )
+		;;
+		*)	# gcc goes here too
+			myconf=(
+				--with-cc="$(tc-getCC)"
+				--with-cxx="$(tc-getCXX)"
+				--with-f77="$(tc-getFC)"
+				--with-ld="$(tc-getCXX)"
+			)
+		;;
+	esac
+
+	# the configure script is not the standard autotools
+	myconf+=(
+		--prefix="${EPREFIX}/usr"
+		--etcdir="${EPREFIX}/etc/root"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/${PN}"
+		--docdir="${EPREFIX}${DOC_DIR}"
+		--tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials"
+		--testdir="${EPREFIX}${DOC_DIR}/examples/tests"
+		--disable-werror
+		--nohowto
+	)
+
+	if use minimal; then
+		myconf+=( $(usex X --gminimal --minimal) )
+	else
+		myconf+=(
+			--with-afs-shared=yes
+			--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
+			--disable-builtin-ftgl
+			--disable-builtin-freetype
+			--disable-builtin-glew
+			--disable-builtin-pcre
+			--disable-builtin-zlib
+			--disable-builtin-lzma
+			--enable-astiff
+			--enable-explicitlink
+			--enable-gdml
+			--enable-memstat
+			--enable-shadowpw
+			--enable-shared
+			--enable-soversion
+			--enable-table
+			--fail-on-missing
+			$(use_enable X x11)
+			$(use_enable X asimage)
+			$(use_enable X xft)
+			$(use_enable afs)
+			$(use_enable avahi bonjour)
+			$(use_enable fits fitsio)
+			$(use_enable fftw fftw3)
+			$(use_enable geocad)
+			$(use_enable graphviz gviz)
+			$(use_enable kerberos krb5)
+			$(use_enable ldap)
+			$(use_enable math genvector)
+			$(use_enable math gsl-shared)
+			$(use_enable math mathmore)
+			$(use_enable math minuit2)
+			$(use_enable math roofit)
+			$(use_enable math tmva)
+			$(use_enable math vc)
+			$(use_enable math vdt)
+			$(use_enable math unuran)
+			$(use_enable mysql)
+			$(use_enable odbc)
+			$(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)
+			$(use_enable python)
+			$(use_enable qt4 qt)
+			$(use_enable qt4 qtgsi)
+			$(use_enable sqlite)
+			$(use_enable ssl)
+			$(use_enable xml)
+			$(use_enable xrootd)
+			${EXTRA_ECONF}
+		)
+	fi
+
+	./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	emake \
+		OPT="${CXXFLAGS}" \
+		F77OPT="${FFLAGS}" \
+		ROOTSYS="${S}" \
+		LD_LIBRARY_PATH="${S}/lib"
+	use emacs && ! use minimal && elisp-compile build/misc/*.el
+}
+
+daemon_install() {
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	echo "Icon=root-system-bin" >> etc/root.desktop
+	domenu etc/root.desktop
+	doicon build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+cleanup_install() {
+	# Cleanup of files either already distributed or unused on Gentoo
+	pushd "${ED}" > /dev/null
+	rm usr/share/root/fonts/LICENSE || die
+	rm etc/root/proof/*.sample || die
+	rm -r etc/root/daemons || die
+	# these should be in PATH
+	mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
+	rm ${DOC_DIR#/}/{INSTALL,LICENSE} || die
+	use examples || rm -r ${DOC_DIR#/}/examples || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README.md
+
+	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
+
+	if ! use minimal; then
+		use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
+		if use python; then
+			echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
+			python_optimize "${D}/usr/$(get_libdir)/root"
+		fi
+		use emacs && elisp-install ${PN} build/misc/*.{el,elc}
+		if use examples; then
+			# these should really be taken care of by the root make install
+			insinto ${DOC_DIR}/examples/tutorials/tmva
+			doins -r tmva/test
+		fi
+	fi
+	doenvd 99root
+
+	# The build system installs Emacs support unconditionally in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -r "${ED}"/usr/share/emacs || die
+
+	daemon_install
+	desktop_install
+	cleanup_install
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2014-07-02 16:32 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2014-07-02 16:32 UTC (permalink / raw
  To: gentoo-commits

commit:     eb497cec6903e1d22b1f7ac6285217ba6ace468e
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Jul  2 16:30:40 2014 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Jul  2 16:30:40 2014 +0000
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 <bircoph@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 <bircoph@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 0000000..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() {


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2014-07-02 22:37 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2014-07-02 22:37 UTC (permalink / raw
  To: gentoo-commits

commit:     61b06f12bb0b5809ced355582dcf5dd39677f9d5
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Jul  2 22:36:31 2014 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Jul  2 22:36:31 2014 +0000
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-9999.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 <bircoph@gmail.com> root-6.00.01-r1.ebuild,
+  root-9999.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 <bircoph@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-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 26f1dd1..9c76fed 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.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() {


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2014-07-06 12:53 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2014-07-06 12:53 UTC (permalink / raw
  To: gentoo-commits

commit:     6a228c11ec908ae30e7224667d08729527e6a3c8
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Jul  6 12:49:15 2014 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Jul  6 12:49:15 2014 +0000
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 <bircoph@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 <bircoph@gmail.com> root-6.00.01-r1.ebuild,
   root-6.00.02.ebuild, root-9999.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 0000000..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.000000000 +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;
+-   outdot << "  node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << endl;
++   outdot << "  node [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::list<std::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 0000000..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.in	2013-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.05-nobyte-compile.patch b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
new file mode 100644
index 0000000..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.orig	2013-02-15 02:27:56.000000000 +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 "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      dir=$(subst lib/,,$(RFLX_GRFLXDD)); \
+ 	      while test "x$${dir}" != "x" && \
+ 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
+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 $< $@
+ endif
+-ROOTPYC      := $(ROOTPY:.py=.pyc)
+-ROOTPYO      := $(ROOTPY:.py=.pyo)
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
+@@ -68,10 +66,8 @@
+ 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)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
+@@ -113,7 +109,7 @@
+ 
+ distclean-$(MODNAME): clean-$(MODNAME)
+ 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
+-		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
++		   $(ROOTPY) $(PYROOTMAP) \
+ 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
+ 
+ distclean::     distclean-$(MODNAME)
+diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules
+--- root.as-needed/build/package/debian/rules	2011-07-10 10:42:49.241549346 +0400
++++ root/build/package/debian/rules	2011-07-10 10:48:06.989670589 +0400
+@@ -691,10 +691,6 @@
+ 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
+ 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
+-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/cint7			\
+ 		-X$(PREFIX)/include/root/Minuit2
+ #		$(foreach i, \
+diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
+--- root.as-needed/cint/cintex/Module.mk	2011-07-10 10:42:49.104889217 +0400
++++ root/cint/cintex/Module.mk	2011-07-10 10:43:21.496672876 +0400
+@@ -31,10 +31,6 @@
+ CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
+ $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
+ endif
+-ifneq ($(BUILDPYTHON),no)
+-CINTEXPYC    := $(CINTEXPY:.py=.pyc)
+-CINTEXPYO    := $(CINTEXPY:.py=.pyo)
+-endif
+ 
+ # used in the main Makefile
+ ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
+@@ -86,8 +82,6 @@
+ 		fi)
+ 		cp $< $@
+ 
+-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
+-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
+                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
+diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
+--- root.as-needed/cint/reflex/Module.mk	2011-07-10 10:42:49.074890651 +0400
++++ root/cint/reflex/Module.mk	2011-07-10 10:43:21.496672876 +0400
+@@ -48,9 +48,6 @@
+ RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
+ RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
+ RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
+-ifneq ($(BUILDPYTHON),no)
+-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
+-endif
+ 
+ RFLX_LIBDIR = $(LIBDIR)
+ 
+@@ -92,7 +89,7 @@
+ 
+ ALLEXECS += $(RFLX_GENMAPX)
+ 
+-POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++POSTBIN  += $(RFLX_GRFLXPY)
+ 
+ ##### local rules #####
+ .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
+@@ -122,8 +119,6 @@
+ 		  mkdir -p lib/python/genreflex; fi )
+ 		cp $< $@
+ 
+-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
+-		@python -c 'import py_compile; py_compile.compile( "$<" )'
+ 
+ $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
+ 
+@@ -149,7 +144,7 @@
+ 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
+ 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
+ 
+-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
++all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
+ 
+ clean-genreflex:
+ 		@rm -rf lib/python/genreflex
+diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
+--- root.as-needed/cint/reflex/python/CMakeLists.txt	2011-07-10 10:42:49.074890651 +0400
++++ root/cint/reflex/python/CMakeLists.txt	2011-07-10 10:43:21.496672876 +0400
+@@ -15,7 +15,7 @@
+ #####################   sources   ####################
+ 
+ FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
+-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
++SET(GENREFLEX_SCRIPT PARENT_SCOPE)
+ 
+ #####################  gccxmlpath ####################
+ 

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
new file mode 100644
index 0000000..8bf8859
--- /dev/null
+++ b/sci-physics/root/files/root-5.34.18-tutorials-path.patch
@@ -0,0 +1,94 @@
+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
++      ProcessLine(".x $(ROOTSYS)/tutorials/demos.C");
++#endif
++      return 0;
++   }
++
++   if (!strncmp(line, ".license", 8)) {
++#ifdef ROOTDOCDIR
++      return PrintFile(ROOTDOCDIR "/LICENSE");
++#else
++      return PrintFile("$(ROOTSYS)/LICENSE");
++#endif
++   }
++
++   if (!strncmp(line, ".credits", 8)) {
++#ifdef ROOTDOCDIR
++      return PrintFile(ROOTDOCDIR "/CREDITS");
++#else
++      return PrintFile("$(ROOTSYS)/README/CREDITS");
++#endif
++     
++   }
++
+    if (!strncmp(line, ".pwd", 4)) {
+       if (gDirectory)
+          Printf("Current directory: %s", gDirectory->GetPath());

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 2a666cf..622d99a 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -17,12 +17,14 @@
   GUI toolkit, and a complete visualization framework.
 </longdescription>
 <use>
+  <flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>&gt;=4.7.0</flag>
   <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
   <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
   <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
   <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
   <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
   <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
+  <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
   <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
 </use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-5.34.18-r2.ebuild b/sci-physics/root/root-5.34.18-r2.ebuild
new file mode 100644
index 0000000..072b81d
--- /dev/null
+++ b/sci-physics/root/root-5.34.18-r2.ebuild
@@ -0,0 +1,387 @@
+# 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} == "9999" ]] ; 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_{6,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++0x doc emacs examples fits fftw graphviz
+	kerberos ldap +math minimal mpi mysql odbc +opengl openmp
+	oracle postgres	prefix pythia6 pythia8 python qt4 +reflex
+	ruby sqlite	ssl xinetd xml xrootd"
+
+REQUIRED_USE="
+	!X? ( !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=
+	media-libs/giflib:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:0=
+	virtual/jpeg:0
+	virtual/shadow
+	X? (
+		media-libs/ftgl:0=
+		media-libs/glew:0=
+		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=
+		)
+	)
+	!minimal? (
+		afs? ( net-fs/openafs )
+		avahi? ( net-dns/avahi:0= )
+		emacs? ( virtual/emacs )
+		fits? ( sci-libs/cfitsio:0= )
+		fftw? ( sci-libs/fftw:3.0= )
+		graphviz? ( media-gfx/graphviz:0= )
+		kerberos? ( virtual/krb5 )
+		ldap? ( net-nds/openldap:0= )
+		math? (
+			sci-libs/gsl:0=
+			sci-mathematics/unuran:0=
+			mpi? ( virtual/mpi )
+		)
+		mysql? ( virtual/mysql )
+		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
+		oracle? ( dev-db/oracle-instantclient-basic:0= )
+		postgres? ( dev-db/postgresql-base:= )
+		pythia6? ( sci-physics/pythia:6= )
+		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
+		python? ( ${PYTHON_DEPS} )
+		ruby? (
+			dev-lang/ruby
+			dev-ruby/rubygems
+		)
+		sqlite? ( dev-db/sqlite:3= )
+		ssl? ( dev-libs/openssl:0= )
+		xml? ( dev-libs/libxml2:2= )
+		xrootd? ( >=net-libs/xrootd-3.3.5:0= )
+	)"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+PDEPEND="doc? ( ~app-doc/root-docs-${PV}[math=] )"
+
+S="${WORKDIR}/${PN}"
+
+# install stuff in ${P} and not ${PF} for easier tracking in root-docs
+DOC_DIR="/usr/share/doc/${P}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	echo
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
+	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
+	echo
+
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	use minimal && return
+
+	if use math; then
+		if use openmp; then
+			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
+				ewarn "You are using a g++ without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
+		! version_is_at_least "4.7" "$(gcc-version)"; then
+		eerror "You are using a g++ without C++0x capabilities"
+		die "Need an C++0x capable compiler"
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
+		"${FILESDIR}"/${PN}-5.32.00-prop-flags.patch \
+		"${FILESDIR}"/${PN}-5.32.00-afs.patch \
+		"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
+		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
+		"${FILESDIR}"/${PN}-5.32.00-dotfont.patch \
+		"${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.18-tutorials-path.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+	rm -r graf2d/asimage/src/libAfterImage || die
+	rm -r graf3d/ftgl/{inc,src} || die
+	rm -r graf2d/freetype/src || die
+	rm -r graf3d/glew/{inc,src} || die
+	rm -r core/pcre/src || die
+	rm -r math/unuran/src/unuran-*.tar.gz || die
+	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
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
+		graf3d/gl/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# fix reflex path (bug #497280)
+	sed -i -e 's|${ROOTSYS}/lib|@libdir@|' config/genreflex.in || die
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+}
+
+src_configure() {
+
+	# the configure script is not the standard autotools
+	local myconf=(
+		--prefix="${EPREFIX}/usr"
+		--etcdir="${EPREFIX}/etc/root"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/${PN}"
+		--docdir="${EPREFIX}${DOC_DIR}"
+		--tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials"
+		--testdir="${EPREFIX}${DOC_DIR}/examples/tests"
+		--with-cc="$(tc-getCC)"
+		--with-cxx="$(tc-getCXX)"
+		--with-f77="$(tc-getFC)"
+		--with-ld="$(tc-getCXX)"
+		--nohowto
+	)
+
+	if use minimal; then
+		myconf+=( $(usex X --gminimal --minimal) )
+	else
+		myconf+=(
+			--with-afs-shared=yes
+			--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
+			--disable-builtin-afterimage
+			--disable-builtin-ftgl
+			--disable-builtin-freetype
+			--disable-builtin-glew
+			--disable-builtin-pcre
+			--disable-builtin-zlib
+			--disable-builtin-lzma
+			--disable-cling
+			--enable-astiff
+			--enable-explicitlink
+			--enable-gdml
+			--enable-memstat
+			--enable-shadowpw
+			--enable-shared
+			--enable-soversion
+			--enable-table
+			--fail-on-missing
+			$(use_enable X x11)
+			$(use_enable X asimage)
+			$(use_enable X xft)
+			$(use_enable afs)
+			$(use_enable avahi bonjour)
+			$(use_enable c++0x cxx11)
+			$(use_enable fits fitsio)
+			$(use_enable fftw fftw3)
+			$(use_enable graphviz gviz)
+			$(use_enable kerberos krb5)
+			$(use_enable ldap)
+			$(use_enable math gsl-shared)
+			$(use_enable math genvector)
+			$(use_enable math mathmore)
+			$(use_enable math minuit2)
+			$(use_enable math roofit)
+			$(use_enable math tmva)
+			$(use_enable math unuran)
+			$(use_enable mysql)
+			$(use_enable odbc)
+			$(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)
+			$(use_enable python)
+			$(use_enable qt4 qt)
+			$(use_enable qt4 qtgsi)
+			$(use_enable reflex cintex)
+			$(use_enable reflex)
+			$(use_enable ruby)
+			$(use_enable sqlite)
+			$(use_enable ssl)
+			$(use_enable xml)
+			$(use_enable xrootd)
+			${EXTRA_ECONF}
+		)
+	fi
+
+	./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	emake \
+		OPT="${CXXFLAGS}" \
+		F77OPT="${FFLAGS}" \
+		ROOTSYS="${S}" \
+		LD_LIBRARY_PATH="${S}/lib"
+	use emacs && ! use minimal && elisp-compile build/misc/*.el
+}
+
+daemon_install() {
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	echo "Icon=root-system-bin" >> etc/root.desktop
+	domenu etc/root.desktop
+	doicon build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+cleanup_install() {
+	# Cleanup of files either already distributed or unused on Gentoo
+	pushd "${ED}" > /dev/null
+	rm usr/share/root/fonts/LICENSE || die
+	rm etc/root/proof/*.sample || die
+	rm -r etc/root/daemons || die
+	# these should be in PATH
+	mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
+	rm ${DOC_DIR#/}/{INSTALL,LICENSE,COPYING.CINT} || die
+	use examples || rm -r ${DOC_DIR#/}/examples || die
+	cd usr/$(get_libdir)/root/cint/cint
+	rm lib/posix/mktypes lib/dll_stl/setup lib/G__* || die
+	rm lib/dll_stl/G__* lib/dll_stl/rootcint_* lib/posix/exten.o || die
+	rm include/makehpib || die
+	popd > /dev/null
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
+
+	if ! use minimal; then
+		use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
+		if use python; then
+			echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
+			python_optimize "${D}/usr/$(get_libdir)/root"
+		fi
+		use ruby && \
+			echo "RUBYLIB=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
+		use emacs && elisp-install ${PN} build/misc/*.{el,elc}
+		if use examples; then
+			# these should really be taken care of by the root make install
+			insinto ${DOC_DIR}/examples/tutorials/tmva
+			doins -r tmva/test
+		fi
+	fi
+	doenvd 99root
+
+	# The build system installs Emacs support unconditionally in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -r "${ED}"/usr/share/emacs || die
+
+	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() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2015-03-02  7:13 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2015-03-02  7:13 UTC (permalink / raw
  To: gentoo-commits

commit:     b9d3bbace219538f5b0c8d6e65743d05f3012b54
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Mon Mar  2 07:12:48 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Mon Mar  2 07:12:48 2015 +0000
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 <bircoph@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 <bircoph@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.000000000 +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..0000000
--- a/sci-physics/root/files/root-5.34.26-prop-flags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 3c8bc686abf57e7e2037c4c191cb63a1a5172b5b
-Author: Andrew Savchenko <bircoph@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} == "9999" ]] ; 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 @@ 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)


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2015-04-08  2:24 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2015-04-08  2:24 UTC (permalink / raw
  To: gentoo-commits

commit:     12927c96d1a128d55ac21a00cb3595945a17b65b
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Apr  8 02:24:03 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Apr  8 02:24:03 2015 +0000
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 <bircoph@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 <bircoph@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..0000000
--- 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..0000000
--- 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.mato@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 0000000..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.000000000 +0300
++++ root-6.02.05/net/netxng/src/TNetXNGFile.cxx	2015-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 7e1dbd5..a8f8c1f 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -16,11 +16,15 @@
 </longdescription>
 <use>
   <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+  <flag name="gdml">Enable GDML writer and reader</flag>
   <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
   <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
   <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
+  <flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag>
   <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
   <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
+  <flag name="shadow">Enable shadow authentication in rootd and proofd</flag>
+  <flag name="table">Build libTable contrib library</flag>
   <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
 </use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-6.00.02.ebuild b/sci-physics/root/root-6.02.05.ebuild
similarity index 73%
rename from sci-physics/root/root-6.00.02.ebuild
rename to sci-physics/root/root-6.02.05.ebuild
index 2711170..61882d5 100644
--- a/sci-physics/root/root-6.00.02.ebuild
+++ b/sci-physics/root/root-6.02.05.ebuild
@@ -1,20 +1,18 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28.ebuild,v 1.1 2015/03/25 21:38:59 bircoph Exp $
 
 EAPI=5
 
 if [[ ${PV} == "9999" ]] ; 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"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}"
 fi
 
-PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \
 	toolchain-funcs user versionator
@@ -25,21 +23,20 @@ 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 geocad graphviz
-	http kerberos ldap +math minimal mpi mysql odbc +opengl openmp
-	oracle postgres	prefix pythia6 pythia8 python qt4 sqlite ssl
-	xinetd xml xrootd"
+IUSE="+X afs avahi doc emacs examples fits fftw gdml geocad
+	graphviz http kerberos ldap +math +memstat minimal mpi mysql odbc
+	+opengl openmp oracle postgres prefix pythia6 pythia8
+	python qt4 shadow sqlite ssl table +tiff xinetd xml xrootd"
 
 # TODO: add support for: davix
 # TODO: ROOT-6 supports x32 ABI, but half of its dependencies doesn't
 # TODO: unbundle: cling, vdt
 
 REQUIRED_USE="
+	!X? ( !minimal? ( !opengl !qt4 !tiff ) )
 	mpi? ( math !openmp )
-	opengl? ( X )
 	openmp? ( math !mpi )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	qt4? ( X )
 "
 
 CDEPEND="
@@ -48,12 +45,9 @@ CDEPEND="
 	dev-libs/libpcre:3=
 	media-fonts/dejavu
 	media-libs/freetype:2=
-	media-libs/giflib:0=
 	media-libs/libpng:0=
-	media-libs/tiff:0=
 	>=sys-devel/clang-3.4
 	sys-libs/zlib:0=
-	virtual/jpeg:0
 	virtual/shadow
 	X? (
 		media-libs/ftgl:0=
@@ -62,6 +56,10 @@ CDEPEND="
 		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=
@@ -80,7 +78,7 @@ CDEPEND="
 		emacs? ( virtual/emacs )
 		fits? ( sci-libs/cfitsio:0= )
 		fftw? ( sci-libs/fftw:3.0= )
-		geocad? ( sci-libs/opencascade:= )
+		geocad? ( <sci-libs/opencascade-6.8.0:= )
 		graphviz? ( media-gfx/graphviz:0= )
 		http? ( dev-libs/fcgi:0= )
 		kerberos? ( virtual/krb5 )
@@ -105,16 +103,9 @@ CDEPEND="
 
 # TODO: ruby is not yet ported to ROOT-6, reenable when (if?) ready
 #		ruby? (
-#			dev-lang/ruby
-#			dev-ruby/rubygems
+#			dev-lang/ruby:=
+#			dev-ruby/rubygems:=
 #		)
-#
-# TODO: root-6.00.01 crashes with system libafterimage
-#			|| (
-#				media-libs/libafterimage:0=[gif,jpeg,png,tiff]
-#				>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff]
-#			)
-#			--disable-builtin-afterimage
 
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -122,16 +113,44 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	xinetd? ( sys-apps/xinetd )"
 
-PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
+PDEPEND="doc? ( !minimal? ( ~app-doc/root-docs-${PV}[http=,math=] ) )"
 
 # install stuff in ${P} and not ${PF} for easier tracking in root-docs
 DOC_DIR="/usr/share/doc/${P}"
 
+OC_UNSUPPORTED="6.8.0"
+
 die_compiler() {
-	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"
+	eerror "You are using a $(tc-getCXX) without C++$1 capabilities"
+	die "Need one of the following C++$1 capable compilers:\n"\
+		"    >=sys-devel/gcc[cxx]-$2\n"\
+		"    >=sys-devel/clang-$3\n"\
+		"    >=dev-lang/icc-$4"
+}
+
+# check compiler to satisfy minimal versions
+# $1 - std version
+# $2 - g++
+# $3 - clang++
+# $4 - icc/icpc
+check_compiler() {
+	case "$(tc-getCXX)" in
+		*clang++*)
+			version_is_at_least "$3" "$(has_version sys-devel/clang)" || die_compiler "$1" "$2" "$3" "$4"
+		;;
+		*g++*)
+			version_is_at_least "$2" "$(gcc-version)" || die_compiler "$1" "$2" "$3" "$4"
+		;;
+		*icc*|*icpc*)
+			version_is_at_least "$4" "$(has_version dev-lang/icc)" || die_compiler "$1" "$2" "$3" "$4"
+			eerror "ROOT-6 is known not to build with ICC."
+			eerror "Please report any isuses upstream."
+		;;
+		*)
+			ewarn "You are using an unsupported compiler."
+			ewarn "Please report any issues upstream."
+		;;
+	esac
 }
 
 pkg_setup() {
@@ -153,7 +172,7 @@ pkg_setup() {
 
 	if use math; then
 		if use openmp; then
-			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
+			if [[ "$(tc-getCXX)" == *g++* && "$(tc-getCXX)" != *clang++* ]] && ! tc-has-openmp; then
 				ewarn "You are using a g++ without OpenMP capabilities"
 				die "Need an OpenMP capable compiler"
 			else
@@ -164,28 +183,32 @@ pkg_setup() {
 		fi
 	fi
 
-	# check for supported compilers
-	case $(tc-getCXX) in
-		*g++*)
-			if ! version_is_at_least "4.8" "$(gcc-version)"; then
-				eerror "You are using a g++ without C++11 capabilities"
-				die_compiler
-			fi
-		;;
-		*clang++*)
-			# >=clang-3.4 is already in DEPEND
-		;;
-		*icc*|*icpc*)
-			if ! version_is_at_least "13" "$(has_version dev-lang/icc)"; then
-				eerror "You are using an icc without C++11 capabilities"
-				die_compiler
-			fi
-		;;
-		*)
-			ewarn "You are using an unsupported compiler."
-			ewarn "Please report any issues upstream."
-		;;
-	esac
+	# c++11 support is mandatory
+	check_compiler "11" "4.8" "3.4" "13"
+
+	# Active version of opencascade may be >= $OC_UNSUPPORTED,
+	# so we need to eselect proper version (it must exist due to DEPEND requirement)
+	if use geocad; then
+		oc_current=$(eselect opencascade show)
+		# Proceed only if active version is unsupported
+		if version_is_at_least "${OC_UNSUPPORTED}" "${oc_current}"; then
+			local -a vlist
+			vlist=( $(version_sort $(eselect opencascade list | awk '/^ / { print $2 }')) )
+			local i
+			# search for higehr version < $OC_UNSUPPORTED
+			# list is sorted acsending, so loop backwards
+			for (( i=$(( ${#vlist[@]} -1 )); i>=0; i-- )); do
+				version_is_at_least "${OC_UNSUPPORTED}" "${vlist[i]}" || break
+			done
+			[[ $i == "-1" ]] && die "No suitable opencascade eselect slot is available (<${OC_UNSUPPORTED})"
+
+			einfo "Switching opencascade to supported slot: ${oc_current} -> ${vlist[i]}"
+			eselect opencascade set ${vlist[i]} > /dev/null || die "eselect opencascade set ${vlist[i]} failed!"
+		else
+			# forget it, effectively disabling eselect cleanup
+			unset oc_current
+		fi
+	fi
 }
 
 src_prepare() {
@@ -194,19 +217,18 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-5.32.00-afs.patch \
 		"${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}-5.34.13-unuran.patch \
 		"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
+		"${FILESDIR}"/${PN}-6.00.01-geocad.patch \
+		"${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.00.01-llvm.patch \
-		"${FILESDIR}"/${PN}-6.00.01-geocad.patch \
-		"${FILESDIR}"/${PN}-6.00.01-tutorials-path.patch \
-		"${FILESDIR}"/${PN}-6.00.02-tm_zone.patch
+		"${FILESDIR}"/${PN}-6.02.05-xrootd4.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	#rm -r graf2d/asimage/src/libAfterImage || die
+	rm -r graf2d/asimage/src/libAfterImage || die
 	rm -r graf3d/ftgl/{inc,src} || die
 	rm -r graf2d/freetype/src || die
 	rm -r graf3d/glew/{inc,src} || die
@@ -234,7 +256,10 @@ 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"
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
 }
 
 # NB: ROOT uses bundled LLVM, because it is patched and API-incompatible with
@@ -245,7 +270,7 @@ src_prepare() {
 src_configure() {
 	local -a myconf
 	# Some compilers need special care
-	case $(tc-getCXX) in
+	case "$(tc-getCXX)" in
 		*clang++*)
 			myconf=(
 				--with-clang
@@ -286,20 +311,16 @@ src_configure() {
 		myconf+=(
 			--with-afs-shared=yes
 			--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
+			--disable-builtin-afterimage
 			--disable-builtin-ftgl
 			--disable-builtin-freetype
 			--disable-builtin-glew
 			--disable-builtin-pcre
 			--disable-builtin-zlib
 			--disable-builtin-lzma
-			--enable-astiff
 			--enable-explicitlink
-			--enable-gdml
-			--enable-memstat
-			--enable-shadowpw
 			--enable-shared
 			--enable-soversion
-			--enable-table
 			--fail-on-missing
 			$(use_enable X x11)
 			$(use_enable X asimage)
@@ -308,8 +329,10 @@ src_configure() {
 			$(use_enable avahi bonjour)
 			$(use_enable fits fitsio)
 			$(use_enable fftw fftw3)
+			$(use_enable gdml)
 			$(use_enable geocad)
 			$(use_enable graphviz gviz)
+			$(use_enable http)
 			$(use_enable kerberos krb5)
 			$(use_enable ldap)
 			$(use_enable math genvector)
@@ -321,23 +344,25 @@ src_configure() {
 			$(use_enable math vc)
 			$(use_enable math vdt)
 			$(use_enable math unuran)
+			$(use_enable memstat)
 			$(use_enable mysql)
-			$(usex mysql \
-				"--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
+			$(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
 			$(use_enable odbc)
 			$(use_enable opengl)
 			$(use_enable oracle)
 			$(use_enable postgres pgsql)
-			$(usex postgres \
-				"--with-pgsql-incdir=$(pg_config --includedir)" "")
+			$(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "")
 			$(use_enable prefix rpath)
 			$(use_enable pythia6)
 			$(use_enable pythia8)
 			$(use_enable python)
 			$(use_enable qt4 qt)
 			$(use_enable qt4 qtgsi)
+			$(use_enable shadow shadowpw)
 			$(use_enable sqlite)
 			$(use_enable ssl)
+			$(use_enable table)
+			$(use_enable tiff astiff)
 			$(use_enable xml)
 			$(use_enable xrootd)
 			${EXTRA_ECONF}
@@ -363,6 +388,7 @@ daemon_install() {
 	dodir /var/spool/rootd/{pub,tmp}
 	fperms 1777 /var/spool/rootd/{pub,tmp}
 
+	local i
 	for i in ${daemons}; do
 		newinitd "${FILESDIR}"/${i}.initd ${i}
 		newconfd "${FILESDIR}"/${i}.confd ${i}
@@ -428,13 +454,20 @@ 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,examples/tutorials}
 	# needed for .license command to work
 	dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE"
 }
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
+
+	# restort opencascade eselect slot
+	if use geocad && [[ -n ${oc_current} ]]; then
+		einfo "Switching to user set slot: $(eselect opencascade show) -> ${oc_current}"
+		eselect opencascade set ${oc_current} > /dev/null || eerror "eselect opencascade set ${vlist[i]} failed!"
+		unset oc_current
+	fi
 }
 
 pkg_postrm() {


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2015-04-12 13:55 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2015-04-12 13:55 UTC (permalink / raw
  To: gentoo-commits

commit:     a10464578b87f8847a60df6c1aced2690de9fa0b
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Apr 12 13:54:53 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Apr 12 13:54:53 2015 +0000
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 <bircoph@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 <bircoph@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 0000000..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 <axel@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}|" etc/root/dictpch/makepch-gentoo.sh || die
+	etc/root/dictpch/makepch-gentoo.sh etc/root/allDict.cxx.pch || die "PCH generation failed"
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2015-07-18 13:49 Andrew Savchenko
  0 siblings, 0 replies; 41+ messages in thread
From: Andrew Savchenko @ 2015-07-18 13:49 UTC (permalink / raw
  To: gentoo-commits

commit:     b8acd551791321d70d92b21eabf4a28a2ed6dd3d
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Jul 18 13:49:10 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 13:49:10 2015 +0000
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 <bircoph@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 <bircoph@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..0000000
--- 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.000000000 +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;
--   outdot << "  node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << endl;
-+   outdot << "  node [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::list<std::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..0000000
--- 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.orig	2013-02-15 02:27:56.000000000 +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 "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      dir=$(subst lib/,,$(RFLX_GRFLXDD)); \
- 	      while test "x$${dir}" != "x" && \
- 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-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 $< $@
- endif
--ROOTPYC      := $(ROOTPY:.py=.pyc)
--ROOTPYO      := $(ROOTPY:.py=.pyo)
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- 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)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules
---- root.as-needed/build/package/debian/rules	2011-07-10 10:42:49.241549346 +0400
-+++ root/build/package/debian/rules	2011-07-10 10:48:06.989670589 +0400
-@@ -691,10 +691,6 @@
- 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
- 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/cint7			\
- 		-X$(PREFIX)/include/root/Minuit2
- #		$(foreach i, \
-diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.as-needed/cint/cintex/Module.mk	2011-07-10 10:42:49.104889217 +0400
-+++ root/cint/cintex/Module.mk	2011-07-10 10:43:21.496672876 +0400
-@@ -31,10 +31,6 @@
- CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC    := $(CINTEXPY:.py=.pyc)
--CINTEXPYO    := $(CINTEXPY:.py=.pyo)
--endif
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- 		fi)
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.as-needed/cint/reflex/Module.mk	2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/Module.mk	2011-07-10 10:43:21.496672876 +0400
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
- 
- RFLX_LIBDIR = $(LIBDIR)
- 
-@@ -92,7 +89,7 @@
- 
- ALLEXECS += $(RFLX_GENMAPX)
- 
--POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN  += $(RFLX_GRFLXPY)
- 
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- 		  mkdir -p lib/python/genreflex; fi )
- 		cp $< $@
- 
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
--		@python -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
- 
-@@ -149,7 +144,7 @@
- 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
- 
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
- 
- clean-genreflex:
- 		@rm -rf lib/python/genreflex
-diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.as-needed/cint/reflex/python/CMakeLists.txt	2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/python/CMakeLists.txt	2011-07-10 10:43:21.496672876 +0400
-@@ -15,7 +15,7 @@
- #####################   sources   ####################
- 
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
- 
- #####################  gccxmlpath ####################
- 

diff --git a/sci-physics/root/files/root-5.34.26-ldflags.patch b/sci-physics/root/files/root-5.34.26-ldflags.patch
deleted file mode 100644
index b81dbb5..0000000
--- a/sci-physics/root/files/root-5.34.26-ldflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 3c8bc686abf57e7e2037c4c191cb63a1a5172b5b
-Author: Andrew Savchenko <bircoph@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 86bcf98..7e1dbd5 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -15,19 +15,12 @@
   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="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-  <flag name="gdml">Enable GDML writer and reader</flag>
   <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
   <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
   <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
-  <flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag>
   <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
   <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
-  <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
-  <flag name="shadow">Enable shadow authentication in rootd and proofd</flag>
-  <flag name="table">Build libTable contrib library</flag>
   <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
 </use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-5.34.32.ebuild b/sci-physics/root/root-5.34.32.ebuild
deleted file mode 100644
index 4b02cba..0000000
--- a/sci-physics/root/root-5.34.32.ebuild
+++ /dev/null
@@ -1,437 +0,0 @@
-# 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.28-r1.ebuild,v 1.1 2015/04/12 22:24:42 bircoph Exp $
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
-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/"
-
-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 gdml
-	graphviz http kerberos ldap +math +memstat mpi mysql odbc
-	+opengl openmp oracle postgres prefix pythia6 pythia8
-	python qt4 +reflex ruby shadow sqlite ssl table +tiff xinetd xml xrootd"
-
-# TODO: add support for: davix
-# TODO: unbundle: vdt
-
-REQUIRED_USE="
-	!X? ( !opengl !qt4 !tiff )
-	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=
-	media-libs/libpng:0=
-	sys-libs/zlib:0=
-	X? (
-		media-libs/ftgl:0=
-		media-libs/glew:0=
-		x11-libs/libX11:0=
-		x11-libs/libXext:0=
-		x11-libs/libXpm:0=
-		|| (
-			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=
-	)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi:0= )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio:0= )
-	fftw? ( sci-libs/fftw:3.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 )
-	)
-	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= <sci-physics/pythia-8.2.0:8= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		dev-lang/ruby:=
-		dev-ruby/rubygems:=
-	)
-	shadow? ( virtual/shadow )
-	sqlite? ( dev-db/sqlite:3= )
-	ssl? ( dev-libs/openssl:0= )
-	xml? ( dev-libs/libxml2:2= )
-	xrootd? ( >=net-libs/xrootd-3.3.5:0= )
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
-
-S="${WORKDIR}/${PN}"
-
-# install stuff in ${P} and not ${PF} for easier tracking in root-docs
-DOC_DIR="/usr/share/doc/${P}"
-
-die_compiler() {
-	eerror "You are using a $(tc-getCXX)-$5 without C++$1 capabilities"
-	die "Need one of the following C++$1 capable compilers:\n"\
-		"    >=sys-devel/gcc[cxx]-$2\n"\
-		"    >=sys-devel/clang-$3\n"\
-		"    >=dev-lang/icc-$4"
-}
-
-# check compiler to satisfy minimal versions
-# $1 - std version
-# $2 - g++
-# $3 - clang++
-# $4 - icc/icpc
-check_compiler() {
-	local ver
-	case "$(tc-getCXX)" in
-		*clang++*)
-			ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')"
-		;;
-		*g++*)
-			ver="$(gcc-version)"
-		;;
-		*icc*|*icpc*)
-			ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')"
-		;;
-		*)
-			ewarn "You are using an unsupported compiler."
-			ewarn "Please report any issues upstream."
-			return 0
-		;;
-	esac
-	version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
-}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
-	echo
-
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp; then
-			if [[ "$(tc-getCXX)" == *g++* && "$(tc-getCXX)" != *clang++* ]] && ! tc-has-openmp; then
-				ewarn "You are using a g++ without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-
-	use c++11 && check_compiler "11" "4.8" "3.3" "13"
-	use c++14 && check_compiler "14" "4.9" "3.4" "15"
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
-		"${FILESDIR}"/${PN}-5.32.00-afs.patch \
-		"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
-		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
-		"${FILESDIR}"/${PN}-5.32.00-dotfont.patch \
-		"${FILESDIR}"/${PN}-5.34.05-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
-		"${FILESDIR}"/${PN}-5.34.26-ldflags.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -r graf2d/asimage/src/libAfterImage || die
-	rm -r graf3d/ftgl/{inc,src} || die
-	rm -r graf2d/freetype/src || die
-	rm -r graf3d/glew/{inc,src} || die
-	rm -r core/pcre/src || die
-	rm -r math/unuran/src/unuran-*.tar.gz || die
-	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
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
-		graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# CSS should use local images
-	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
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-}
-
-src_configure() {
-	local -a myconf
-	# Some compilers need special care
-	case "$(tc-getCXX)" in
-		*clang++*)
-			myconf=(
-				--with-clang
-				--with-f77="$(tc-getFC)"
-			)
-		;;
-		*icc*|*icpc*)
-			# For icc we need to provide architecture manually
-			# and not to tamper with tc-get*
-			use x86 && myconf=( linuxicc )
-			use amd64 && myconf=( linuxx8664icc )
-		;;
-		*)	# gcc goes here too
-			myconf=(
-				--with-cc="$(tc-getCC)"
-				--with-cxx="$(tc-getCXX)"
-				--with-f77="$(tc-getFC)"
-				--with-ld="$(tc-getCXX)"
-			)
-		;;
-	esac
-
-	# the configure script is not the standard autotools
-	myconf+=(
-		--prefix="${EPREFIX}/usr"
-		--etcdir="${EPREFIX}/etc/root"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/${PN}"
-		--docdir="${EPREFIX}${DOC_DIR}"
-		--tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials"
-		--testdir="${EPREFIX}${DOC_DIR}/examples/tests"
-		--cflags='${CFLAGS}'
-		--cxxflags='${CXXFLAGS}'
-		--disable-builtin-afterimage
-		--disable-builtin-ftgl
-		--disable-builtin-freetype
-		--disable-builtin-glew
-		--disable-builtin-lzma
-		--disable-builtin-pcre
-		--disable-builtin-zlib
-		--disable-cling
-		--disable-werror
-		--enable-explicitlink
-		--enable-shared
-		--enable-soversion
-		--fail-on-missing
-		--nohowto
-		--with-afs-shared=yes
-		--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
-		$(use_enable X x11)
-		$(use_enable X asimage)
-		$(use_enable X xft)
-		$(use_enable afs)
-		$(use_enable avahi bonjour)
-		$(use_enable c++11 cxx11)
-		$(use_enable c++14 cxx14)
-		$(use_enable fits fitsio)
-		$(use_enable fftw fftw3)
-		$(use_enable gdml)
-		$(use_enable graphviz gviz)
-		$(use_enable http)
-		$(use_enable kerberos krb5)
-		$(use_enable ldap)
-		$(use_enable math genvector)
-		$(use_enable math gsl-shared)
-		$(use_enable math mathmore)
-		$(use_enable math minuit2)
-		$(use_enable math roofit)
-		$(use_enable math tmva)
-		$(use_enable math vc)
-		$(use_enable math vdt)
-		$(use_enable math unuran)
-		$(use_enable memstat)
-		$(use_enable mysql)
-		$(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
-		$(use_enable odbc)
-		$(use_enable opengl)
-		$(use_enable oracle)
-		$(use_enable postgres pgsql)
-		$(use_enable prefix rpath)
-		$(use_enable pythia6)
-		$(use_enable pythia8)
-		$(use_enable python)
-		$(use_enable qt4 qt)
-		$(use_enable qt4 qtgsi)
-		$(use_enable reflex cintex)
-		$(use_enable reflex)
-		$(use_enable ruby)
-		$(use_enable shadow shadowpw)
-		$(use_enable sqlite)
-		$(use_enable ssl)
-		$(use_enable table)
-		$(use_enable tiff astiff)
-		$(use_enable xml)
-		$(use_enable xrootd)
-		${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"
-}
-
-src_compile() {
-	emake \
-		OPT="${CXXFLAGS}" \
-		F77OPT="${FFLAGS}" \
-		ROOTSYS="${S}" \
-		LD_LIBRARY_PATH="${S}/lib"
-	use emacs && elisp-compile build/misc/*.el
-}
-
-daemon_install() {
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	local i
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	echo "Icon=root-system-bin" >> etc/root.desktop
-	domenu etc/root.desktop
-	doicon build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-cleanup_install() {
-	# Cleanup of files either already distributed or unused on Gentoo
-	pushd "${ED}" > /dev/null
-	rm usr/share/root/fonts/LICENSE || die
-	rm etc/root/proof/*.sample || die
-	rm -r etc/root/daemons || die
-	# these should be in PATH
-	mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
-	rm ${DOC_DIR#/}/{INSTALL,LICENSE,COPYING.CINT} || die
-	use examples || rm -r ${DOC_DIR#/}/examples || die
-	cd usr/$(get_libdir)/root/cint/cint
-	rm lib/posix/mktypes lib/dll_stl/setup lib/G__* || die
-	rm lib/dll_stl/G__* lib/dll_stl/rootcint_* lib/posix/exten.o || die
-	rm include/makehpib || die
-	popd > /dev/null
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
-
-	use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
-	if use python; then
-		echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
-		python_optimize "${D}/usr/$(get_libdir)/root"
-		use reflex && python_optimize "${D}/usr/$(get_libdir)/root/python/genreflex/"
-	fi
-	use ruby && \
-		echo "RUBYLIB=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
-	use emacs && elisp-install ${PN} build/misc/*.{el,elc}
-	if use examples; then
-		# these should really be taken care of by the root make install
-		insinto ${DOC_DIR}/examples/tutorials/tmva
-		doins -r tmva/test
-	fi
-	doenvd 99root
-
-	# The build system installs Emacs support unconditionally in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -r "${ED}"/usr/share/emacs || die
-
-	daemon_install
-	desktop_install
-	cleanup_install
-
-	# do not copress files used by ROOT's CLI (.credit, .demo, .license)
-	docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials}
-	# needed for .license command to work
-	dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2015-10-01  6:06 Justin Lecher
  0 siblings, 0 replies; 41+ messages in thread
From: Justin Lecher @ 2015-10-01  6:06 UTC (permalink / raw
  To: gentoo-commits

commit:     bc44947211bd480f0d44e86a2a77761ee8b6ae83
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Sep 27 19:36:35 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 19:36:35 2015 +0000
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-9999.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 <o.freyermuth@googlemail.com>
+  -files/root-6.00.01-geocad.patch, root-9999.ebuild:
+  sci-physics/root:  Remove geocad-patch, is now upstream.
+
   27 Sep 2015; Oliver Freyermuth <o.freyermuth@googlemail.com> root-9999.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..0000000
--- 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 <TopoDS_Shape.hxx>
- #include <TopoDS_Wire.hxx>
-+#undef Printf
- 
- //Root
- #ifndef ROOT_TGeoXtru

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 3ff5618..1b3ed72 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.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


^ permalink raw reply related	[flat|nested] 41+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
@ 2018-07-06 14:06 Justin Bronder
  0 siblings, 0 replies; 41+ messages in thread
From: Justin Bronder @ 2018-07-06 14:06 UTC (permalink / raw
  To: gentoo-commits

commit:     854e59ed4c4d28e6e165da84022274fb7675d401
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  6 14:06:24 2018 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Fri Jul  6 14:06:24 2018 +0000
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-9999.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..000000000
--- 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..000000000
--- 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..000000000
--- a/sci-physics/root/files/root-5.28.00b-glibc212.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- root.orig/net/auth/src/TAFS.cxx	2010-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 <unistd.h>
-+#   include <sys/stat.h>
- #else
- #   define ssize_t int
- #   include <io.h>
-

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..000000000
--- a/sci-physics/root/files/root-5.32.00-afs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- root/net/auth/src/TAFS.cxx.orig	2011-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<char *>( 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 --git a/sci-physics/root/files/root-5.32.00-cfitsio.patch b/sci-physics/root/files/root-5.32.00-cfitsio.patch
deleted file mode 100644
index 853c3f39f..000000000
--- a/sci-physics/root/files/root-5.32.00-cfitsio.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	2012-01-19 23:44:44.127607638 +0100
-+++ configure	2012-01-20 00:19:20.420652913 +0100
-@@ -3435,9 +3435,7 @@
-     cfitsioinc=$found_hdr
-     cfitsioincdir=$found_dir
- 
--    # At this time, libcfitsio.a should always be prefered over .so,
--    # to avoid forcing users to install cfitsio.
--    check_library "libcfitsio cfitsio" "no" "$cfitsiolibdir" \
-+    check_library "libcfitsio cfitsio" "yes" "$cfitsiolibdir" \
-         $CFITSIO ${CFITSIO:+$CFITSIO/lib} ${CFITSIO:+$CFITSIO/.libs} \
-         ${finkdir:+$finkdir/lib} \
-         /usr/local/lib /usr/lib /opt/cfitsio/lib

diff --git a/sci-physics/root/files/root-5.32.00-chklib64.patch b/sci-physics/root/files/root-5.32.00-chklib64.patch
deleted file mode 100644
index 979220f02..000000000
--- a/sci-physics/root/files/root-5.32.00-chklib64.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-bug fix for #406817
---- configure.orig	2012-02-29 19:46:41.000000000 +0400
-+++ configure	2012-03-22 03:28:43.458968696 +0400
-@@ -441,14 +441,13 @@
-         fi
-     else
-         if file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
--            check_link $chklib64
--            ret=$link_result
--        else
--            logmsg " file $filearg $chklib64 | grep '64-bit'"
--            if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
--                ret=1
--            fi
-+            # get real binary .so name from .so ld script
-+            chklib64=$(gawk '($1 == "GROUP") { print $3 }' $chklib64)
-         fi
-+        logmsg " file $filearg $chklib64 | grep '64-bit'"
-+        if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
-+            ret=1
-+            fi
-     fi
-     logmsg " result: $ret"
-     if test $ret -eq 1 ; then

diff --git a/sci-physics/root/files/root-5.34.13-unuran.patch b/sci-physics/root/files/root-5.34.13-unuran.patch
deleted file mode 100644
index 826231318..000000000
--- a/sci-physics/root/files/root-5.34.13-unuran.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/math/unuran/Module.mk b/math/unuran/Module.mk
-index 00a530b..7cd22dc 100644
---- a/math/unuran/Module.mk
-+++ b/math/unuran/Module.mk
-@@ -31,7 +31,7 @@ UNRS         := $(wildcard $(UNRDIRS)/src/utils/*.c) \
-                 $(wildcard $(UNRDIRS)/src/uniform/*.c) \
-                 $(wildcard $(UNRDIRS)/src/urng/*.c)
- else
--UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -))
-+UNRTARCONTENT:=
- UNRS         := $(filter %.c, \
-                 $(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \
-                 $(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \
-@@ -81,10 +81,9 @@ INCLUDEFILES += $(UNURANDEP)
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
- 
--include/%.h: 	$(UNURANDIRI)/%.h $(UNURANETAG)
-+include/%.h: 	$(UNURANDIRI)/%.h
- 		cp $< $@
- 
--$(UNURANDEP):   $(UNRCFG)
- $(UNRS):        $(UNURANETAG)
- 
- $(UNURANETAG):	$(UNRSRCS)
-@@ -137,12 +136,12 @@ $(UNRCFG):	$(UNURANETAG)
- 		GNUMAKE=$(MAKE) ./configure  CC="$$ACC"  \
- 		CFLAGS="$$ACFLAGS");
- 
--$(UNURANLIB):   $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
-+$(UNURANLIB):   $(UNURANO) $(UNURANDO) $(ORDER_) \
-                 $(MAINLIBS) $(UNURANLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"  \
- 		   "$(SOFLAGS)" libUnuran.$(SOEXT) $@     \
- 		   "$(UNURANO) $(UNURANDO)"             \
--		   "$(UNURANLIBEXTRA) $(UNRO)"
-+		   "$(UNURANLIBEXTRA) -lunuran"
- 
- $(UNURANDS):    $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP)
- 		$(MAKEDIR)

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

diff --git a/sci-physics/root/files/root-6.00.01-llvm.patch b/sci-physics/root/files/root-6.00.01-llvm.patch
deleted file mode 100644
index c6abb353e..000000000
--- a/sci-physics/root/files/root-6.00.01-llvm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/interpreter/llvm/src/Makefile.config.in b/interpreter/llvm/src/Makefile.config.in
-index 7633be2..c8756b1 100644
---- a/interpreter/llvm/src/Makefile.config.in
-+++ b/interpreter/llvm/src/Makefile.config.in
-@@ -170,6 +170,8 @@ CXXFLAGS += @CXXFLAGS@
- 
- # Linker flags.
- LDFLAGS += @LDFLAGS@
-+NOUNDEF := -Wl,--no-undefined
-+LDFLAGS := $(filter-out $(NOUNDEF),$(LDFLAGS))
- 
- # Path to the library archiver program.
- AR_PATH = @AR@

diff --git a/sci-physics/root/files/root-6.06.00-nobyte-compile.patch b/sci-physics/root/files/root-6.06.00-nobyte-compile.patch
deleted file mode 100644
index 61ffef7ac..000000000
--- a/sci-physics/root/files/root-6.06.00-nobyte-compile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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))
-@@ -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) \
--                $(ROOTAAS) $(ROOTAASC) $(ROOTAASO)
-+                $(ROOTAAS)
- 
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -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
- 

diff --git a/sci-physics/root/files/rootd.confd b/sci-physics/root/files/rootd.confd
deleted file mode 100644
index 7516b8c9b..000000000
--- a/sci-physics/root/files/rootd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# conf.d file for root daemon
-
-# User to run as (default is `rootd')
-ROOTD_USER="rootd"
-
-# Please refer to the rootd(1) man(1) page for more information on 
-# command line parameters. 
-ROOTD_OPTS=""

diff --git a/sci-physics/root/files/rootd.initd b/sci-physics/root/files/rootd.initd
deleted file mode 100644
index b79d7bbed..000000000
--- a/sci-physics/root/files/rootd.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-    need net
-    use logger
-    provide root-file-server
-}
-
-start() {
-    ebegin "Starting ROOT file server"
-    pid=$(start-stop-daemon --start --quiet --user ${ROOTD_USER} \
-	--pidfile /var/run/rootd.pid \
-	--exec /usr/bin/rootd -- ${ROOTD_OPTS})
-    retval=$?
-    echo ${ROOTD_PID} > /var/run/rootd.pid
-    eend ${retval}
-}
-
-stop() {
-    ebegin "Stopping ROOT file server"
-    start-stop-daemon --stop --quiet \
-	--pidfile /var/run/rootd.pid \
-	--exec /usr/bin/rootd
-    eend $?
-}

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
deleted file mode 100644
index 6c223c096..000000000
--- a/sci-physics/root/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-physics@gentoo.org</email>
-		<name>Gentoo Physics Project</name>
-	</maintainer>
-	<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
-contains the CINT C/C++ interpreter and many classes such as
-statistics, serialization, optimization, linear algebra, graphics,
-GUI toolkit, and a complete visualization framework.
-</longdescription>
-	<use>
-		<flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-		<flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
-		<flag name="http">Enable http server support including but not limited to fastcgi support</flag>
-		<flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
-		<flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
-		<flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
-		<flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
-	</use>
-</pkgmetadata>

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
deleted file mode 100644
index bb5692c84..000000000
--- a/sci-physics/root/root-9999.ebuild
+++ /dev/null
@@ -1,444 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]] ; 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"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}"
-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 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
-	xinetd xml xrootd"
-
-# TODO: add support for: davix
-# TODO: ROOT-6 supports x32 ABI, but half of its dependencies doesn't
-# TODO: unbundle: cling, vdt
-
-REQUIRED_USE="
-	mpi? ( math !openmp )
-	opengl? ( X )
-	openmp? ( math !mpi )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt4? ( X )
-"
-
-CDEPEND="
-	app-arch/xz-utils:0=
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre:3=
-	media-fonts/dejavu
-	media-libs/freetype:2=
-	media-libs/giflib:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	>=sys-devel/clang-3.4:=
-	sys-libs/zlib:0=
-	virtual/jpeg:0
-	virtual/shadow
-	X? (
-		media-libs/ftgl:0=
-		media-libs/glew:0=
-		x11-libs/libX11:0=
-		x11-libs/libXext:0=
-		x11-libs/libXpm:0=
-		!minimal? (
-			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=
-		)
-	)
-	!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:= )
-		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 )
-		)
-		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= )
-	)"
-
-# TODO: ruby is not yet ported to ROOT-6, reenable when (if?) ready
-#		ruby? (
-#			dev-lang/ruby
-#			dev-ruby/rubygems
-#		)
-#
-# TODO: root-6.00.01 crashes with system libafterimage
-#			|| (
-#				media-libs/libafterimage:0=[gif,jpeg,png,tiff]
-#				>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff]
-#			)
-#			--disable-builtin-afterimage
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
-
-# install stuff in ${P} and not ${PF} for easier tracking in root-docs
-DOC_DIR="/usr/share/doc/${P}"
-
-die_compiler() {
-	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() {
-	fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
-	elog "For example, for SRP, you would set: "
-	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
-	echo
-
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	use minimal && return
-
-	if use math; then
-		if use openmp; then
-			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
-				ewarn "You are using a g++ without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-
-	# check for supported compilers
-	case $(tc-getCXX) in
-		*g++*)
-			if ! version_is_at_least "4.8" "$(gcc-version)"; then
-				eerror "You are using a g++ without C++11 capabilities"
-				die_compiler
-			fi
-		;;
-		*clang++*)
-			# >=clang-3.4 is already in DEPEND
-		;;
-		*icc*|*icpc*)
-			if ! version_is_at_least "13" "$(has_version dev-lang/icc)"; then
-				eerror "You are using an icc without C++11 capabilities"
-				die_compiler
-			fi
-		;;
-		*)
-			ewarn "You are using an unsupported compiler."
-			ewarn "Please report any issues upstream."
-		;;
-	esac
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
-		"${FILESDIR}"/${PN}-5.32.00-afs.patch \
-		"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
-		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
-		"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
-		"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
-		"${FILESDIR}"/${PN}-6.06.00-nobyte-compile.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
-	#rm -r graf2d/asimage/src/libAfterImage || die
-	rm -r graf3d/ftgl/{inc,src} || die
-	rm -r graf2d/freetype/src || die
-	rm -r graf3d/glew/{inc,src} || die
-	rm -r core/pcre/src || die
-	rm -r math/unuran/src/unuran-*.tar.gz || die
-	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/src/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
-		graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# CSS should use local images
-	sed -i -e 's,http://.*/images/,,' etc/html/ROOT.css || die "html sed failed"
-}
-
-# NB: ROOT uses bundled LLVM, because it is patched and API-incompatible with
-# system LLVM.
-# NB: As of 6.00.0.1 cmake is not ready as it can't fully replace configure,
-# e.g. for afs and geocad.
-
-src_configure() {
-	local -a myconf
-	# Some compilers need special care
-	case $(tc-getCXX) in
-		*clang++*)
-			myconf=(
-				--with-clang
-				--with-f77="$(tc-getFC)"
-			)
-		;;
-		*icc*|*icpc*)
-			# For icc we need to provide architecture manually
-			# and not to tamper with tc-get*
-			use x86 && myconf=( linuxicc )
-			use amd64 && myconf=( linuxx8664icc )
-		;;
-		*)	# gcc goes here too
-			myconf=(
-				--with-cc="$(tc-getCC)"
-				--with-cxx="$(tc-getCXX)"
-				--with-f77="$(tc-getFC)"
-				--with-ld="$(tc-getCXX)"
-			)
-		;;
-	esac
-
-	# the configure script is not the standard autotools
-	myconf+=(
-		--prefix="${EPREFIX}/usr"
-		--etcdir="${EPREFIX}/etc/root"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/${PN}"
-		--docdir="${EPREFIX}${DOC_DIR}"
-		--tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials"
-		--testdir="${EPREFIX}${DOC_DIR}/examples/tests"
-		--disable-werror
-		--nohowto
-	)
-
-	if use minimal; then
-		myconf+=( $(usex X --gminimal --minimal) )
-	else
-		myconf+=(
-			--with-afs-shared=yes
-			--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
-			--disable-builtin-ftgl
-			--disable-builtin-freetype
-			--disable-builtin-glew
-			--disable-builtin-pcre
-			--disable-builtin-zlib
-			--disable-builtin-lzma
-			--enable-astiff
-			--enable-explicitlink
-			--enable-gdml
-			--enable-memstat
-			--enable-shadowpw
-			--enable-shared
-			--enable-soversion
-			--enable-table
-			--fail-on-missing
-			--cflags='${CFLAGS}'
-			--cxxflags='${CXXFLAGS}'
-			$(use_enable X x11)
-			$(use_enable X asimage)
-			$(use_enable X xft)
-			$(use_enable afs)
-			$(use_enable avahi bonjour)
-			$(use_enable fits fitsio)
-			$(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)
-			$(use_enable math gsl-shared)
-			$(use_enable math mathmore)
-			$(use_enable math minuit2)
-			$(use_enable math roofit)
-			$(use_enable math tmva)
-			$(use_enable math vc)
-			$(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)
-			$(use_enable postgres pgsql)
-			$(usex postgres \
-				"--with-pgsql-incdir=$(pg_config --includedir)" "")
-			$(use_enable prefix rpath)
-			$(use_enable pythia6)
-			$(use_enable pythia8)
-			$(use_enable python)
-			$(use_enable qt4 qt)
-			$(use_enable qt4 qtgsi)
-			$(use_enable sqlite)
-			$(use_enable ssl)
-			$(use_enable xml)
-			$(use_enable xrootd)
-			${EXTRA_ECONF}
-		)
-	fi
-
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	emake \
-		OPT="${CXXFLAGS}" \
-		F77OPT="${FFLAGS}" \
-		ROOTSYS="${S}" \
-		LD_LIBRARY_PATH="${S}/lib"
-	use emacs && ! use minimal && elisp-compile build/misc/*.el
-}
-
-daemon_install() {
-	local daemons="rootd proofd"
-	dodir /var/spool/rootd
-	fowners rootd:rootd /var/spool/rootd
-	dodir /var/spool/rootd/{pub,tmp}
-	fperms 1777 /var/spool/rootd/{pub,tmp}
-
-	for i in ${daemons}; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-		newconfd "${FILESDIR}"/${i}.confd ${i}
-	done
-	if use xinetd; then
-		insinto /etc/xinetd
-		doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	echo "Icon=root-system-bin" >> etc/root.desktop
-	domenu etc/root.desktop
-	doicon build/package/debian/root-system-bin.png
-
-	insinto /usr/share/icons/hicolor/48x48/mimetypes
-	doins build/package/debian/application-x-root.png
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doicon build/package/debian/root-system-bin.xpm
-}
-
-cleanup_install() {
-	# Cleanup of files either already distributed or unused on Gentoo
-	pushd "${ED}" > /dev/null
-	rm usr/share/root/fonts/LICENSE || die
-	rm etc/root/proof/*.sample || die
-	rm -r etc/root/daemons || die
-	# these should be in PATH
-	mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
-	rm ${DOC_DIR#/}/{INSTALL,LICENSE} || die
-	use examples || rm -r ${DOC_DIR#/}/examples || die
-}
-
-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
-
-	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
-
-	if ! use minimal; then
-		use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
-		if use python; then
-			echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
-			python_optimize "${D}/usr/$(get_libdir)/root"
-		fi
-		use emacs && elisp-install ${PN} build/misc/*.{el,elc}
-		if use examples; then
-			# these should really be taken care of by the root make install
-			insinto ${DOC_DIR}/examples/tutorials/tmva
-			doins -r tmva/test
-		fi
-	fi
-	doenvd 99root
-
-	# The build system installs Emacs support unconditionally in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -r "${ED}"/usr/share/emacs || die
-
-	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() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 41+ messages in thread

end of thread, other threads:[~2018-07-06 14:06 UTC | newest]

Thread overview: 41+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-19 20:20 [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/ Andrew Savchenko
  -- strict thread matches above, loose matches on Subject: below --
2018-07-06 14:06 Justin Bronder
2015-10-01  6:06 Justin Lecher
2015-07-18 13:49 Andrew Savchenko
2015-04-12 13:55 Andrew Savchenko
2015-04-08  2:24 Andrew Savchenko
2015-03-02  7:13 Andrew Savchenko
2014-07-06 12:53 Andrew Savchenko
2014-07-02 22:37 Andrew Savchenko
2014-07-02 16:32 Andrew Savchenko
2014-07-02 13:35 Andrew Savchenko
2013-12-10 15:05 Andrew Savchenko
2013-12-05 17:08 Andrew Savchenko
2013-11-09  5:04 Andrew Savchenko
2013-10-16  4:49 Nicolas Bock
2013-10-15 14:17 Andrew Savchenko
2013-02-23 12:45 Andrew Savchenko
2013-01-21 22:32 Andrew Savchenko
2012-10-28 22:46 Andrew Savchenko
2012-10-25 16:37 Andrew Savchenko
2012-10-19 21:32 Andrew Savchenko
2012-07-23 21:11 Andrew Savchenko
2012-07-22  8:03 Andrew Savchenko
2012-07-21 17:12 Andrew Savchenko
2012-07-01  6:59 Andrew Savchenko
2012-06-20  9:18 Andrew Savchenko
2012-06-19 20:20 Andrew Savchenko
2012-05-29 23:01 Andrew Savchenko
2012-05-15  8:49 Andrew Savchenko
2012-03-21 23:46 Andrew Savchenko
2012-03-09  1:11 Andrew Savchenko
2012-03-01 14:37 Andrew Savchenko
2012-02-27 18:11 Andrew Savchenko
2012-02-13 17:43 Sebastien Fabbro
2012-01-20  9:14 Andrew Savchenko
2011-12-04  0:50 Andrew Savchenko
2011-12-04  0:29 Andrew Savchenko
2011-10-21 12:36 Andrew Savchenko
2011-10-07 19:43 Andrew Savchenko
2011-08-02 21:49 Andrew Savchenko
2011-03-16 21:16 Sebastien Fabbro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox