Major revision with lots of changes. See ChangeLog for details

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.25-gentoo-r7 x86_64

22 files changed, 351 insertions, 780 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index e414e9312099..7e08b16b1e86 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for sci-physics/root
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.36 2008/12/05 17:06:55 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.37 2008/12/18 18:10:18 bicatali Exp $
+
+*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:
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index ad428333c824..53fdff19c941 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,33 +1,36 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX olbd.confd 197 RMD160 798de1808502f3e4ecfc5f024b56a419d9824057 SHA1 f2a4385fdf9849eafb1d5457727f6fbe80af1da3 SHA256 5a34da76bbe56cd3b8128f05c0d9900f9d7f7ffdcffc5deeb816c78ea46679ba
+AUX olbd.initd 714 RMD160 e2cc28474a280345f6962f890f5ddb3884d7f69f SHA1 4dcdf7ba35a834db2ac5a5bdfe4d2c31938f0552 SHA256 5d6c1b6e7b40d6842df6a6f7314fa2f49329b820ff86592d2f8d2662a414ec39
+AUX proofd.confd 415 RMD160 3814aacb63d82b9d060086f9bef304d431a15b4e SHA1 31eb7af239a0042f887b5089a7c6c7ec5d6662e9 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38
+AUX proofd.initd 704 RMD160 bac76a1d23b45acc484e3566cb836fd249b63276 SHA1 2f1cc27911761a5e9fc3e60446be7f5d985d660e SHA256 e74df67028937807c9ded564f1d3c8d684ae12bfa8de30772041ffdc8eff4501
+AUX proofd.xinetd 242 RMD160 3a9350673d6d0a3d9fa093a3707dcbb6f71010a7 SHA1 5dcf674f20c680d35b01f56aa3a47f55384c86bc SHA256 f862a89e1a6953df87db78bb977830493aa529bbe72f9597c25f63e02d26228c
 AUX root-5.16.00-fortran.patch 5076 RMD160 2218584a3a5093a8d4171913a2b024bb759aae03 SHA1 4ed648d54260fd2593174154d8331c5d5afd5f09 SHA256 4ad7a3057528f30716d200c8f1462cf92da6f1ebef9bc3fee1874000bc10deec
 AUX root-5.16.00-xft.patch 687 RMD160 58efbc6efea7970ce267d05998deb8f849ecd5c5 SHA1 19ba24f17846a46d0ca10d0958587bd9166efd6d SHA256 e3540b4cecae6eb9e1c80e7edc923334056d63b4dedfc8bece34d29eec76d0a1
-AUX root-5.20.00-as-needed.patch 326 RMD160 aa4e118c8ad51835d3c99f6ff8cd368176c480b6 SHA1 c3d6a2bf52a0e7fc0504e43eee7faeb0b1613366 SHA256 55fd8c249ed8abadc0b773e62b90e9f42cc69baab3ea786e8a6c80fb46825bdb
-AUX root-5.20.00-configure.patch 1639 RMD160 55a7a0e5c32e0947cf0115159f1c41b74c8a8e69 SHA1 087251b79c8e04e0327cebd18bd9dd15dd34cb41 SHA256 06e78624dc0458aa32787ccb660014eb50ac0735cadbc4352ecfa2dede9868f1
-AUX root-5.20.00-ftgl.patch 1191 RMD160 8cf74741ba3b425f92b282449093ee2f361e0886 SHA1 ca28629b8e23fd06858ebd84fc316a8c530c398b SHA256 3d6c04744aa9553a38ebcd21a92f37cd8e1c4a49c7c9e62c97577788fcbf1726
-AUX root-5.20.00-ftgl_header.patch 750 RMD160 59ba833c93a0b7fcf9b4afb1291c29e1370973fa SHA1 37a58cf302408f705ea93765ff1ee8921eab3b70 SHA256 0edcb1d4fdc1ff62c36df7e3088e1283d03a17e198184f9c3ae1c7a0c50b9570
-AUX root-5.20.00-include-defines-file.patch 173 RMD160 c52739827cf2ae052cec3ca9b888b6afa2f2f487 SHA1 78f706fefa2af75ce4027fcadaff0933eeef4a1e SHA256 958dba11b2bf421e53aa567cd0260d53cf0fec0df6572a6cfbdd08e12ed47bad
-AUX root-5.20.00-pic.patch 3759 RMD160 6b2f0f8fac4abc596a1361f44c3bda4b8ea5c368 SHA1 7ebf6296631146e14346d3a055d8e2fbfee9fa64 SHA256 c0964ec0cc9ec5060174802779fa5d15c12b4f154752fbbf8793d4fd86997162
-AUX root-5.20.00-upstream.patch 5474 RMD160 50d64e1b766d6c233385459a29a2ddacfda618a2 SHA1 d5aaea3a7b08d3bcde568880d8d16588ffefb561 SHA256 43962cb61dfae61bba3e4ed98e7df8731ecdf3f785aec6d62e4082bb29520cf9
+AUX root.xinetd 249 RMD160 04dcca6acdcce43c57753238aba74353796f2f42 SHA1 ea3ccec135f72d8e2d0565fee9f4a33a57883387 SHA256 073841ebfa16f7bc3200f837b454d40f198e24a43b7b6b1e79af232f8eb58a35
+AUX rootd.confd 199 RMD160 9ca9864292e7301d3feb6c36d88ba16002b7d7fa SHA1 822983a24e219bd860124f363a1e4250a17026dd SHA256 7b69f646ce0b2546ce797ec4a05949b02302dc5f4e41d2e8896ed0bc6575ac8d
+AUX rootd.initd 734 RMD160 435513c0bd4a2ac1e551730a87a2e3be6fcf4296 SHA1 b5d0caca1918bc1998885329c96e8dc9d7dd37fb SHA256 c3f1a6d140144e288b631e63d53e6e6e4c33db5fb68b80b370424ed827bf166b
 AUX sparc-root-5.16.00.patch 1337 RMD160 182648130788f70df92342042a889e91ba665d24 SHA1 d46dbb7f10e83e5bcde97175ef5df71ea9750140 SHA256 bd3f08a8283e7b0e4b4f5f583fbe448cbc2908e2935e6bcc961085a58d6bbe3a
+AUX xrootd.confd 200 RMD160 2344c73ca3c27adeb70b092850cfd292af7d58bd SHA1 f2b895f43d3537e8614a907c7c94642f01c084e4 SHA256 03c1191168ddea3bc6621e26eb56e509e6c9a4d58756ffbbd07ff6657200e57d
+AUX xrootd.initd 720 RMD160 767d8d2073c45a0a0586b6154400e1cdaffc60a3 SHA1 89a99b020d418fccf28964af2d83c5a0e3302928 SHA256 64ed55a77b168693c869b9cf4ef215ac1d43f1d0fab998c21f0954178c308b79
 DIST RooFit_Users_Manual_2.07-29.pdf 823371 RMD160 766f2d4264ff5d8a2c85af59fbe032989b079781 SHA1 6cf5dd1b80d910c4d4a9bfe0c7a74bf68e8e46f6 SHA256 a0c2ba1f9a2f5e7c58d12e78c0ae8f816b48363c7e6cc6b39ac8075b066b048a
 DIST TMVAUsersGuide_v4.pdf 2355827 RMD160 0624a6ed7e006581eacdaa69e82bbdca91aa42a9 SHA1 98016f0ccfa6c54234e22b46032bb0b2f5d7ac20 SHA256 bbc6563fd14a6a4a88efca55fa75e74d9b5c2a9f5d3044239f3f83dc2967ad62
 DIST Users_Guide_5_16.pdf 11196352 RMD160 149c2421b7453273e6e1d849e17b736878ebb316 SHA1 b5d4eade69a5b945aa37c182d83d5233c2d54475 SHA256 c20fb206aa3eff6f3ec034c24483c4ceed04e08a1eef8b117da7956c2f471d34
 DIST Users_Guide_5_20.pdf 9585654 RMD160 9d5b8817f9bf2847b22fe94d003b6c08d2a82d2a SHA1 7ff8b86bc224c1ca088999cfe1d907114dd65104 SHA256 dc8884277e1e3eb2ef997d24dc5ca8fc7d7c2f3fc1a208266604d467f2d27c72
+DIST root-5.20.00-patches.tar.bz2 8414 RMD160 56481054e5eae8f3ff5b153106af46a94262b913 SHA1 ea918e23d830baf89379157b4f95f041241d3ef0 SHA256 4e80d264e7d3bd5fecb72bc67150559ad66b391d8bbb2eddec12c9ad351987d9
 DIST root_v3.05.04.source.tar.gz 9386408 RMD160 d20b2b5d933d8abf1a3343a9b8886a3ed97f1cfb SHA1 481f2b3a60e0c56be0a61f3e652e7e43c065aeb7 SHA256 ae93c08cfe4dc05c53fade420ac560fff88ec967b2e85b26a7268ef12e1bbe9e
 DIST root_v5.16.00.source.tar.gz 22210601 RMD160 3e9a29e6b899e3fb0986ef8a7b4a162d4933bf47 SHA1 0fcb1aba303b463598373ba44aa38a45279773e3 SHA256 41a36d9a469c8b86247aca59317fa40371db846555045679e759f7f332a927f8
 DIST root_v5.20.00.source.tar.gz 25349138 RMD160 daa702dd8729d125f57a4ac3bf35ea1e84c15e22 SHA1 20ab6f3ad974449ad105c3e330a28f80ea310501 SHA256 8286c78d5c9ac10b0d0b93c8ef353f1399b1c034384f0ac4845a4df1efd09a87
 EBUILD root-3.05.04.ebuild 1654 RMD160 7f96255fd29b2fc2f2d30e41aa1e41ac57d24622 SHA1 ca10f01367a50aa1c867a4e48e435f4eb24e5151 SHA256 d74fbfd44a1da70c297196b56885128ca47297c9c349f8a083050ff346058dce
 EBUILD root-5.16.00.ebuild 5013 RMD160 596fa91d5aeb62aa1dff05c28506d7c5f5a3fca5 SHA1 6bd6d49c4a94c3ed66a2d080ec34dd7d0910b0a7 SHA256 7257fd10017f5ba8dbe55c61c17e6aa6fc341beafc981216dd09bebd3d55b147
-EBUILD root-5.20.00-r1.ebuild 7093 RMD160 397490bdb8addb379ccac7f67fa765b2f3023a43 SHA1 ce88d5077b8f8e3090a193b51d8f3e455b952e42 SHA256 63fe039552299fdcbfd8d9c05cb5c02f987d71756746555c3cf8c63dde9566e5
-EBUILD root-5.20.00-r2.ebuild 7586 RMD160 24bd087859f6810408095660a4a1c988084deac0 SHA1 97b79da2c9178bc1e7361c2eb19dac6d1f18aeaa SHA256 5ebba560708b46ec3d9db8b31629648f900cbb6309e6c9f380d5f9cd96687d62
-MISC ChangeLog 12648 RMD160 849f6bdedabda5a34b198987a681b2c99079e7cb SHA1 7fbf9b49807634d3752419cdd7fe7ab826cf713c SHA256 a4dcb03a8268b9fcbd4e9b598d575e7073f8eca860d3b33234ee094802e2266c
-MISC metadata.xml 2759 RMD160 1057121aea912a1e3691a0e48d812c9ecc2bb23d SHA1 01718bac1011bda60e1ea67fa19de5cc91c5ef5b SHA256 e519123b80f5753f8c14a95115a27fefc9ca7eb3aaaa94e020e75aabacb2691d
+EBUILD root-5.20.00-r3.ebuild 8801 RMD160 c732416867f486b87d04e4019847a9f09f83773f SHA1 a9b47715a5870c9c4bda6078323c15477df98fb8 SHA256 0b465cec0aa8dc3ac52adaf680fed799b9ddbf9d4a5c86483f2d392248731b12
+MISC ChangeLog 13910 RMD160 03c1e3dec2d1e42694c79cfe89be4a445fbe991b SHA1 49c4ddd167de92971a7fea36502ea7f88bfe695c SHA256 4778a93005db73273c2f3340f9511e28142eef7aac33db8f4b5b8180f25bb9e5
+MISC metadata.xml 1492 RMD160 57c9eecd07f3ae88ce941f1230104cd7a77aef93 SHA1 915ec13821fa69d7fdde000e17bf7cc57c62eccc SHA256 50eb991cc050c507762c9131ddb18e1f4b9e969f0a6e95d90e22f061e168d7dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk5YOYACgkQ1ycZbhPLE2BnzgCdHc/8YfNp3oMsekLCK5N0s7D/
-q/AAn3gYScRDjDBtAjvSPC32YCA9MMRC
-=p8+Y
+iEYEARECAAYFAklKklcACgkQ1ycZbhPLE2DuDwCfY95emBSZ5RKL+8TPOIbcj+BM
+HUoAn27yfxE0ofUCc5Sg5aVy6Y7ukk0u
+=XsmK
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/root/files/olbd.confd b/sci-physics/root/files/olbd.confd
new file mode 100644
index 000000000000..848f4d7ba4a5
--- /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 000000000000..9aba94b1bf9a
--- /dev/null
+++ b/sci-physics/root/files/olbd.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2008 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 000000000000..81720a7eb335
--- /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 000000000000..524ef2bf67dd
--- /dev/null
+++ b/sci-physics/root/files/proofd.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2008 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.1 2008/12/18 18:10:18 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}
+    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/proofd.xinetd b/sci-physics/root/files/proofd.xinetd
new file mode 100644
index 000000000000..bf8845e0311c
--- /dev/null
+++ b/sci-physics/root/files/proofd.xinetd
@@ -0,0 +1,12 @@
+# The proofd daemon is used to startup PROOF.
+service proofd
+{
+	disable			= no
+	socket_type		= stream
+	wait			= no
+	user			= root
+	server			= /usr/bin/proofd
+	server_args		= -i
+	log_on_success		+= DURATION USERID
+	log_on_failure		+= USERID
+}
diff --git a/sci-physics/root/files/root-5.20.00-as-needed.patch b/sci-physics/root/files/root-5.20.00-as-needed.patch
deleted file mode 100644
index 58954a46f2a9..000000000000
--- a/sci-physics/root/files/root-5.20.00-as-needed.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- root/cint/cint/Module.mk.orig	2008-06-25 07:24:00.000000000 +0100
-+++ root/cint/cint/Module.mk	2008-12-04 17:42:38.000000000 +0000
-@@ -188,6 +188,7 @@
- CINTALLDEP   += $(MODDIRS)/loadfile_tmp.d
- 
- CINTLIB      := $(LPATH)/libCint.$(SOEXT)
-+CINTLIBEXTRA := -ldl
- 
- ##### cint #####
- CINTEXES     := $(CINTDIRM)/cppmain.cxx
diff --git a/sci-physics/root/files/root-5.20.00-configure.patch b/sci-physics/root/files/root-5.20.00-configure.patch
deleted file mode 100644
index a60986a2657f..000000000000
--- a/sci-physics/root/files/root-5.20.00-configure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.orig	2008-07-07 09:43:12.732330045 +0100
-+++ configure	2008-07-07 15:45:27.122015928 +0100
-@@ -1648,7 +1648,7 @@
-       if pkg-config --exists ftgl ; then
- 	  result "ok"
- 	  ftglincdir=`pkg-config --cflags-only-I ftgl | sed 's/-I//g'`
--	  ftgllibs=`pkg-config --libs-only-l ftgl | sed s'/-lftgl/-lftgl_pic/'`
-+	  ftgllibs=`pkg-config --libs-only-l ftgl`
- 	  ftgllibdir=`pkg-config --libs-only-L ftgl | sed 's/-L//g'`
- 	  enable_builtin_ftgl=no
-       else
-@@ -2753,12 +2753,12 @@
-        found_dirz=""
-        # libz must be before libpng, if libz is not found don't
-        # add libpng which needs libz
--       # note that failure to find system libungif is not fatal since
--       # libAfterImage contains embedded libungif source if needed
-+       # note that failure to find system libgif is not fatal since
-+       # libAfterImage contains embedded libgif source if needed
-        if test ! "x$enable_astiff" = "xno" ; then
--           aslibs="libjpeg libtiff libungif libz libpng"
-+           aslibs="libjpeg libtiff libgif libz libpng"
-        else
--           aslibs="libjpeg libungif libz libpng"
-+           aslibs="libjpeg libgif libz libpng"
-        fi
-        for k in $aslibs ; do
-            check_library $k "$enable_shared" "" \
-@@ -2771,7 +2771,7 @@
-            if test "x$k" = "xlibpng" && test "x$found_libz" = "x" ; then
-                break;
-            fi
--           if test "x$k" = "xlibungif" && test "x$found_lib" = "x" ; then
-+           if test "x$k" = "xlibgif" && test "x$found_lib" = "x" ; then
-                asgifincdir=""
-            fi
-            if test ! "x$found_lib" = "x" ; then
diff --git a/sci-physics/root/files/root-5.20.00-ftgl.patch b/sci-physics/root/files/root-5.20.00-ftgl.patch
deleted file mode 100644
index a46bec580437..000000000000
--- a/sci-physics/root/files/root-5.20.00-ftgl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur graf3d/gl/src.original/TGLFontManager.cxx graf3d/gl/src/TGLFontManager.cxx
---- graf3d/gl/src.original/TGLFontManager.cxx	2008-12-03 00:20:07.919338469 +0100
-+++ graf3d/gl/src/TGLFontManager.cxx	2008-12-03 00:25:32.045668987 +0100
-@@ -6,13 +6,14 @@
- #include "TObjString.h"
- #include "TGLUtil.h"
- 
--#include "FTFont.h"
-+#include <FTGL/ftgl.h>
- #include "FTGLExtrdFont.h"
- #include "FTGLOutlineFont.h"
- #include "FTGLPolygonFont.h"
- #include "FTGLTextureFont.h"
- #include "FTGLPixmapFont.h"
- #include "FTGLBitmapFont.h"
-+#include <GL/gl.h>
- 
- //______________________________________________________________________________
- // TGLFont
-diff -Naur graf3d/gl/src.original/TGLText.cxx graf3d/gl/src/TGLText.cxx
---- graf3d/gl/src.original/TGLText.cxx	2008-06-25 08:24:05.000000000 +0200
-+++ graf3d/gl/src/TGLText.cxx	2008-12-03 00:25:13.532655432 +0100
-@@ -18,12 +18,13 @@
- #include "TSystem.h"
- #include "TEnv.h"
- 
--#include "FTGLExtrdFont.h"
-+#include <FTGL/ftgl.h>
- #include "FTGLOutlineFont.h"
- #include "FTGLPolygonFont.h"
- #include "FTGLTextureFont.h"
- #include "FTGLPixmapFont.h"
- #include "FTGLBitmapFont.h"
-+#include <GL/gl.h>
- 
- #define FTGL_BITMAP  0
- #define FTGL_PIXMAP  1
diff --git a/sci-physics/root/files/root-5.20.00-ftgl_header.patch b/sci-physics/root/files/root-5.20.00-ftgl_header.patch
deleted file mode 100644
index de4e18a8f40d..000000000000
--- a/sci-physics/root/files/root-5.20.00-ftgl_header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/graf3d/gl/src/TGLFontManager.cxx b/graf3d/gl/src/TGLFontManager.cxx
-index 5334023..8f35ccc 100644
---- a/graf3d/gl/src/TGLFontManager.cxx
-+++ b/graf3d/gl/src/TGLFontManager.cxx
-@@ -6,7 +6,7 @@
- #include "TObjString.h"
- #include "TGLUtil.h"
- 
--#include <FTGL/ftgl.h>
-+#include <FTGL/FTGL.h>
- #include "FTGLExtrdFont.h"
- #include "FTGLOutlineFont.h"
- #include "FTGLPolygonFont.h"
-diff --git a/graf3d/gl/src/TGLText.cxx b/graf3d/gl/src/TGLText.cxx
-index a60c532..bb0dc7c 100644
---- a/graf3d/gl/src/TGLText.cxx
-+++ b/graf3d/gl/src/TGLText.cxx
-@@ -18,7 +18,7 @@
- #include "TSystem.h"
- #include "TEnv.h"
- 
--#include <FTGL/ftgl.h>
-+#include <FTGL/FTGL.h>
- #include "FTGLOutlineFont.h"
- #include "FTGLPolygonFont.h"
- #include "FTGLTextureFont.h"
diff --git a/sci-physics/root/files/root-5.20.00-include-defines-file.patch b/sci-physics/root/files/root-5.20.00-include-defines-file.patch
deleted file mode 100644
index 60dfb9bbc373..000000000000
--- a/sci-physics/root/files/root-5.20.00-include-defines-file.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- graf3d/gl/src/TGLFontManager.cxx.orig
-+++ graf3d/gl/src/TGLFontManager.cxx
-@@ -1,3 +1,4 @@
-+#include "RConfigure.h"
- #include "TGLFontManager.h"
- 
- #include "TSystem.h"
diff --git a/sci-physics/root/files/root-5.20.00-pic.patch b/sci-physics/root/files/root-5.20.00-pic.patch
deleted file mode 100644
index 1ecf8f353414..000000000000
--- a/sci-physics/root/files/root-5.20.00-pic.patch
+++ /dev/null
@@ -1,129 +0,0 @@
---- ./net/xrootd/src/xrootd/configure.classic.orig	2008-06-25 07:24:15.000000000 +0100
-+++ ./net/xrootd/src/xrootd/configure.classic	2008-07-04 20:06:20.537658375 +0100
-@@ -342,7 +342,8 @@
- 
-     # Assert that we got enough arguments
-     if test $# -ne 3 ; then
--	echo "check_symbol: Not 3 arguments"
-+	echo "check_symbol: not 3 arguments"
-+        found_symbol=0
- 	return 1
-     fi
- 
-@@ -351,34 +352,105 @@
-     symbollib=$1  ; shift
-     symboldir=$1
- 
-+    if test "x$symbollib" = "x" ; then
-+        found_symbol=0
-+        return 1
-+    fi
-+
-+    symbollib=`echo $symbollib | sed -e 's/^-l/lib/'`
-+
-+    if test ! "x$symboldir" = "x" ; then
-+        symboldir=`echo $symboldir | sed -e 's/^-L//'`
-+    fi
-+
-     # Check if we got a specific argument as to where the library
-     # is to be found
-     symbolfile=$symbollib
--    if test ! "x$symboldir" = "x" ; then
--        symbolfile=$symboldir/$symbollib
--        if test ! -r $symbolfile ; then
--            for i in .a .so .lib ; do
--                if test -r $symbolfile$i ; then
--                    symbolfile=$symbolfile$i
--                    break
-+    exts=".so .lib"
-+    if test ! "x$shared" = "xno" ; then
-+	exts="$exts .a"
-+    else
-+	exts=".a $exts"
-+    fi
-+
-+    usrlib="/usr/lib"
-+    # look first in the lib32 directories
-+    if test "x$checklib32" = "xyes" ; then
-+        usrlib="/usr/lib32 $usrlib"
-+    fi
-+    # look first in the lib64 directories
-+    if test "x$checklib64" = "xyes" ; then
-+        usrlib="/usr/lib64 $usrlib"
-+    fi
-+    # look only in the lib64 directories
-+    if test "x$checkonlylib64" = "xyes" ; then
-+        usrlib="/usr/lib64"
-+    fi
-+    # look only in the hpux64 directories
-+    if test "x$checkhpux64" = "xyes" ; then
-+        usrlib="/usr/lib/hpux64"
-+    fi
-+
-+    for d in "$symboldir" $usrlib ; do
-+	echo " Checking in $d"
-+	if test ! -r $d/$symbollib ; then
-+	    echo "  $d/$symbollib not readable"
-+	    for i in $exts ; do
-+		echo "   Checking extension $i with $d/$symbollib"
-+		if test -r $d/$symbollib$i ; then
-+		    echo "   $d/$symbollib$i readable"
-+		    symbolfile=$d/$symbollib$i
-+		    break 2
-                 fi
-              done
-+        else
-+            echo "$d/$symbollib readable"
-+            symbolfile=$d/$symbollib
-+            break
-         fi
--    fi
-+    done
- 
-     if test "x$symbolfile" = "x" || test ! -r $symbolfile ; then
-        found_symbol=0
-+       echo " Symbol not found"
-        return 1
-     fi
- 
--    symbol_in_lib=`nm $symbolfile | grep $symbol > /dev/null 2>&1`
-+    checking_msg "$symbol in $symbolfile"
-+    nm $symbolfile 2>&1 | grep $symbol > /dev/null 2>&1
-     if test $? -eq 0 ; then
-         found_symbol=1
-+        echo " Symbol found"
-     else
--        found_symbol=0
-+	nm $symbolfile 2>&1 | grep "no symbols" > /dev/null 2>&1
-+	if test $? -eq 0 ; then
-+	    echo " $symbolfile is stripped, trying a link"
-+	    # stripped library - only safe test is to link against the
-+	    # library!  However, we do not know what compiler to use
-+	    # so we can not do the test.  Assume the symbol is in
-+	    cat <<EOF > conftest.mk
-+conftest:conftest.c $symbolfile
-+	\$(CC) \$(CFLAGS) \$(LDFLAGS) $symbolfile \$< -o \$@
-+
-+conftest.c:
-+	echo "extern int $symbol (); " > \$@
-+	echo "int main() { $symbol (); return 0; }" >> \$@
-+EOF
-+	    make -f conftest.mk >> config.log 2>&1
-+	    if test $? -eq 0 ; then
-+		found_symbol=1
-+		echo " Link OK"
-+	    else
-+		found_symbol=0
-+		echo " Failed code was"
-+		cat conftest.mk >> config.log
-+	    fi
-+	    rm -rf conftest.c conftest.mk conftest
-+	else
-+	    found_symbol=0
-+	fi
-     fi
- }
--
- #_____________________________________________________________________
- guess_architecture () {
-     # Try to guess the architecture of the host system
diff --git a/sci-physics/root/files/root-5.20.00-upstream.patch b/sci-physics/root/files/root-5.20.00-upstream.patch
deleted file mode 100644
index 2abb74e8dcea..000000000000
--- a/sci-physics/root/files/root-5.20.00-upstream.patch
+++ /dev/null
@@ -1,147 +0,0 @@
---- root.orig/core/base/src/TSystem.cxx	2008-09-23 10:49:37.231691313 +0100
-+++ root/core/base/src/TSystem.cxx	2008-09-23 10:41:11.373018362 +0100
-@@ -49,6 +49,7 @@
- #include "TUrl.h"
- #include "TVirtualMutex.h"
- #include "compiledata.h"
-+#include "RConfigure.h"
- 
- const char *gRootDir;
- const char *gProgName;
---- root.orig/core/meta/src/TClass.cxx	2008-09-23 10:49:33.755717294 +0100
-+++ root/core/meta/src/TClass.cxx	2008-09-23 10:41:09.145105805 +0100
-@@ -3677,14 +3677,14 @@
- 
-    Int_t pos = b.Length();
- 
--   b.ReadString(s, maxsize);
--   while (strlen(s)==maxsize) {
-+   b.ReadString(s, maxsize); // Reads at most maxsize - 1 characters, plus null at end.
-+   while (strlen(s) == (maxsize - 1)) {
-       // The classname is too large, try again with a large buffer.
-       b.SetBufferOffset(pos);
-       maxsize = 2*maxsize;
-       delete [] s;
-       s = new char[maxsize];
--      b.ReadString(s, maxsize);
-+      b.ReadString(s, maxsize); // Reads at most maxsize - 1 characters, plus null at end.
-    }
- 
-    TClass *cl = TClass::GetClass(s, kTRUE);
---- root.orig/hist/hist/inc/TF1.h	2008-09-23 10:50:43.230340286 +0100
-+++ root/hist/hist/inc/TF1.h	2008-09-23 10:42:51.748812440 +0100
-@@ -201,8 +201,8 @@
-    virtual Double_t Eval(Double_t x, Double_t y=0, Double_t z=0, Double_t t=0) const;
-    virtual Double_t EvalPar(const Double_t *x, const Double_t *params=0);
-    // for using TF1 as a callable object (functor)
--   virtual Double_t operator()(Double_t x, Double_t y=0, Double_t z = 0, Double_t t = 0) const { return Eval(x,y,z,t); }
--   virtual Double_t operator()(const Double_t *x, const Double_t *params=0) { return EvalPar(x,params); }
-+   virtual Double_t operator()(Double_t x, Double_t y=0, Double_t z = 0, Double_t t = 0) const; 
-+   virtual Double_t operator()(const Double_t *x, const Double_t *params=0);  
-    virtual void     ExecuteEvent(Int_t event, Int_t px, Int_t py);
-    virtual void     FixParameter(Int_t ipar, Double_t value);
-        Double_t     GetChisquare() const {return fChisquare;}
-@@ -294,6 +294,15 @@
-    ClassDef(TF1,7)  //The Parametric 1-D function
- };
- 
-+inline Double_t TF1::operator()(Double_t x, Double_t y, Double_t z, Double_t t) const  
-+   { return Eval(x,y,z,t); }
-+inline Double_t TF1::operator()(const Double_t *x, const Double_t *params)
-+   { 
-+      if (fMethodCall) InitArgs(x,params);
-+      return EvalPar(x,params); 
-+   }
-+
-+
- inline void TF1::SetRange(Double_t xmin, Double_t,  Double_t xmax, Double_t)
-    { TF1::SetRange(xmin, xmax); }
- inline void TF1::SetRange(Double_t xmin, Double_t, Double_t,  Double_t xmax, Double_t, Double_t)
---- root.orig/tree/tree/src/TBasket.cxx	2008-09-23 10:50:20.366811302 +0100
-+++ root/tree/tree/src/TBasket.cxx	2008-09-23 10:42:14.515788582 +0100
-@@ -612,13 +612,10 @@
-    TDirectory::TContext ctxt(0);
-    TFile *file = fBranch->GetFile(kWrite);
-    if (!file) return 0;
--
--   fBranch->GetDirectory()->cd();
-    if (!file->IsWritable()) { 
-       return -1;
-    }
--   
--   fMotherDir = fBranch->GetDirectory();
-+   fMotherDir = file; // fBranch->GetDirectory();
-    
-    if (fBufferRef->TestBit(TBufferFile::kNotDecompressed)) {
-       // Read the basket information that was saved inside the buffer.
-@@ -632,7 +629,7 @@
- 
-       fBuffer = fBufferRef->Buffer();
- 
--      Create(nout);
-+      Create(nout,file);
-       fBufferRef->SetBufferOffset(0);
-       fHeaderOnly = kTRUE;
- 
-@@ -683,7 +680,7 @@
-             nout = fObjlen;
-             delete [] fBuffer;
-             fBuffer = fBufferRef->Buffer();
--            Create(fObjlen);
-+            Create(fObjlen,file);
-             fBufferRef->SetBufferOffset(0);
- 
-             Streamer(*fBufferRef);         //write key itself again
-@@ -699,7 +696,7 @@
-          nzip   += kMAXBUF;
-       }
-       nout = noutot;
--      Create(noutot);
-+      Create(noutot,file);
-       fBufferRef->SetBufferOffset(0);
- 
-       Streamer(*fBufferRef);         //write key itself again
-@@ -707,7 +704,7 @@
-       delete fBufferRef; fBufferRef = 0;
-    } else {
-       fBuffer = fBufferRef->Buffer();
--      Create(fObjlen);
-+      Create(fObjlen,file);
-       fBufferRef->SetBufferOffset(0);
- 
-       Streamer(*fBufferRef);         //write key itself again
---- root.orig/tree/tree/src/TBranch.cxx	2008-09-23 10:50:20.358811302 +0100
-+++ root/tree/tree/src/TBranch.cxx	2008-09-23 10:42:14.511788861 +0100
-@@ -2071,7 +2071,8 @@
-    fBasketBytes[where]  = basket->GetNbytes();
-    fBasketSeek[where]   = basket->GetSeekKey();
-    Int_t addbytes = basket->GetObjlen() + basket->GetKeylen() ;
--   if (fDirectory && (fDirectory != gROOT) && fDirectory->IsWritable()) {
-+   if (nout>0) {
-+      // The Basket was written so we can now safely drop it.
-       basket->DropBuffers();
-       delete basket;
-       fBaskets[where] = 0;
---- root.orig/tree/tree/src/TTreeSQL.cxx	2008-09-23 10:50:20.346811581 +0100
-+++ root/tree/tree/src/TTreeSQL.cxx	2008-09-23 10:42:14.375798639 +0100
-@@ -180,6 +180,11 @@
-    // Check if the basket is properly setup
- 
-    TBasketSQL * basket = (TBasketSQL *)branch->GetBasket(0);
-+
-+   if (basket==0) {
-+      basket = (TBasketSQL*)CreateBasket(branch);
-+      branch->GetListOfBaskets()->AddAtAndExpand(basket,0);
-+   }
-    TBuffer * buffer = basket->GetBufferRef();
- 
-    if(buffer == 0){
-@@ -399,6 +404,8 @@
- 
-             br->SetEntries(fEntries);
- 
-+            br->GetListOfBaskets()->AddAtAndExpand(CreateBasket(br),0);
-+
-             prevBranch = branchName;
-             decl = "";
-          }
diff --git a/sci-physics/root/files/root.xinetd b/sci-physics/root/files/root.xinetd
new file mode 100644
index 000000000000..56e0f64e3722
--- /dev/null
+++ b/sci-physics/root/files/root.xinetd
@@ -0,0 +1,12 @@
+# The rootd daemon allows remote access to ROOT files.
+service rootd
+{
+	disable			= no
+	socket_type		= stream
+	wait			= no
+	user			= root
+	server			= /usr/bin/rootd
+	server_args		= -i
+	log_on_success		+= DURATION USERID
+	log_on_failure		+= USERID
+}
diff --git a/sci-physics/root/files/rootd.confd b/sci-physics/root/files/rootd.confd
new file mode 100644
index 000000000000..7516b8c9b6dd
--- /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 000000000000..ddebb58fba76
--- /dev/null
+++ b/sci-physics/root/files/rootd.initd
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2008 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.1 2008/12/18 18:10:18 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})
+    eval ${pid}
+    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 000000000000..e725cd1e7e52
--- /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 000000000000..73408a316513
--- /dev/null
+++ b/sci-physics/root/files/xrootd.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2008 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.1 2008/12/18 18:10:18 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 f935f0d30a12..96608e0244e8 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -11,53 +11,22 @@
   GUI toolkit, and a complete visualization framework.
 </longdescription>
 <use>
-  <flag name="cern">
-    Build the HBOOK input/ouput functionality. HBOOK is a histogram
-    library. On ROOT versions previous to 5.20.00, it will depend
-    on <pkg>sci-physics/cernlib</pkg>. On versions above, it only need
-    a FORTRAN compiler.
-  </flag>
+  <flag name="cern">Build the HBOOK input/ouput functionality, needs
+    fortran or <pkg>sci-physics/cernlib</pkg>. </flag>
   <flag name="clarens">
     Buld the Clarens and PEAC plug-ins, to use in a GRID enabled
-    analysis. The Clarens Grid-Enabled Web Services Framework is an
-    open source portal for ubiquitous access to data and computational
-    resources provided by computing grids. PEAC is an interactive
-    distributed analysis framework that uses Clarens as a glue
-    protocol to advertise and communicate amongst SAM, Global Manager
-    (GM), Local Manager (LM), DCache, and PROOF services.
-    It doesn't need Clarens to build, however if you want to use it,
-    you will require to build Clarens and PEAC on your own, it is not
-    yet in the Gentoo Portage tree. 
-    See http://clarens.sourceforge.net/ for Clarens
-    and http://physics.ucsd.edu/~schsu/project/peac.html for
-    PEAC.
-  </flag>
-  <flag name="geant4">
-    Build the <pkg>sci-physics/geant</pkg> (GEANT4) navigator.    
-  </flag>
-  <flag name="math">
-    Build all math libraries plugins. It includes
-    the <pkg>sci-libs/gsl</pkg> bindings in MathMore, the GenVector
-    physical vectors package, the Minuit2 minimization library (same as
-    standalone <pkg>sci-libs/minuit</pkg>), the RooFit toolkit for
-    distribution modeling, and the Universal Non-Uniform RANdom number
-    generators (UNURAN) library.
-  </flag>
+    analysis.</flag>
+  <flag name="geant4">Build the <pkg>sci-physics/geant</pkg> (GEANT4) navigator</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.
+    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. For more on the eXtended Request
-    Daemon (xrd) and associated software, please see
-    http://xrootd.slac.stanford.edu.
+    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.20.00-r1.ebuild b/sci-physics/root/root-5.20.00-r1.ebuild
deleted file mode 100644
index 3ae299c70c0f..000000000000
--- a/sci-physics/root/root-5.20.00-r1.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.20.00-r1.ebuild,v 1.1 2008/09/23 13:02:13 bicatali Exp $
-
-EAPI=1
-inherit versionator eutils toolchain-funcs qt4 fortran elisp-common
-
-DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-ROOFIT_DOC_PV=2.07-29
-TMVA_DOC_PV=4
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-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_v${TMVA_DOC_PV}.pdf )"
-
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-
-IUSE="afs cern clarens doc emacs fftw geant4 kerberos ldap +math mysql odbc
-	oracle postgres pythia6 pythia8 python +reflex ruby qt4 ssl xml xrootd"
-
-# libafterimage ignored, may be re-install for >=5.20
-# see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944
-#	|| ( >=media-libs/libafterimage-1.15 x11-wm/afterstep )
-RDEPEND="sys-apps/shadow
-	dev-libs/libpcre
-	x11-libs/libXpm
-	x11-libs/libXft
-	media-libs/ftgl
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/giflib
-	media-libs/tiff
-	virtual/opengl
-	virtual/glu
-	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 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	math? ( >=sci-libs/gsl-1.8 )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( virtual/postgresql-server )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	python? ( dev-lang/python )
-	qt4? ( || ( ( x11-libs/qt-gui:4
-			x11-libs/qt-opengl:4
-			x11-libs/qt-qt3support:4
-			x11-libs/qt-xmlpatterns:4 )
-			=x11-libs/qt-4.3* ) )
-	ruby? ( dev-lang/ruby )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}
-	cern? ( dev-lang/cfortran )
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${PN}"
-
-QT4_BUILT_WITH_USE_CHECK="qt3support opengl"
-
-pkg_setup() {
-	elog
-	elog "You may want to build ROOT with these non Gentoo extra packages:"
-	elog "AliEn, castor, Chirp, gfal, gLite, Globus, Monalisa, 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
-	epause 3
-	if use cern; then
-		FORTRAN="gfortran g77 ifc"
-		fortran_pkg_setup
-	else
-		FORTRANC=
-		FFLAGS=
-	fi
-	use qt4 && qt4_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${P}-pic.patch
-	# root bug; reported at https://savannah.cern.ch/bugs/?40816, fixed in svn
-	epatch "${FILESDIR}"/${P}-include-defines-file.patch
-	# various patches from upstream branch
-	epatch "${FILESDIR}"/${P}-upstream.patch
-
-	# use system cfortran
-	if use cern; then
-		rm -f include/root/cfortran.h
-		ln -s /usr/include/cfortran.h include/cfortran.h
-	fi
-	# 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"
-
-	# libPythia6 is called libpythia6 in gentoo
-	sed -i -e 's/libPythia6/libpythia6/g' \
-		configure || die "Adjust libpythia6 name failed"
-}
-
-src_compile() {
-
-	local target
-	if [[ "$(tc-getCXX)" == ic* ]]; then
-		if use amd64; then
-			target=linuxx8664icc
-		elif use x86; then
-			target=linuxicc
-		fi
-	fi
-
-	local myconf
-	use postgres && \
-		myconf="${myconf} --with-pgsql-incdir=/usr/include/postgresql"
-
-	use qt4 && \
-		myconf="${myconf} --with-qt-incdir=/usr/include/qt4" && \
-		myconf="${myconf} --with-qt-libdir=/usr/$(get_libdir)/qt4"
-
-	use geant4 && \
-		myconf="${myconf} --with-clhep-incdir=/usr/include" && \
-		myconf="${myconf} --with-g4-libdir=${G4LIB}"
-
-	use odbc && [[ -z $(type -P odbc-config) ]] && \
-		myconf="${myconf} --with-odbc-incdir=/usr/include/iodbc"
-
-	use pythia6 && \
-		myconf="${myconf} --enable-pythia6" && \
-		myconf="${myconf} --with-pythia6-libdir=/usr/$(get_libdir)"
-
-	use pythia8 && \
-		myconf="${myconf} --enable-pythia8" && \
-		myconf="${myconf} --with-pythia8-incdir=/usr/include/pythia"
-
-	# the configure script is not the standard autotools
-	./configure \
-		${target} \
-		--fail-on-missing \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--docdir=/usr/share/doc/${PF} \
-		--with-sys-iconpath=/usr/share/pixmaps \
-		--with-f77="${FORTRANC} ${FFLAGS}" \
-		--with-cc="$(tc-getCC) ${CFLAGS}" \
-		--with-cxx="$(tc-getCXX) ${CXXFLAGS}" \
-		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--enable-asimage \
-		--enable-astiff \
-		--enable-exceptions	\
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-opengl \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		${myconf} \
-		$(use_enable afs) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable fftw fftw3) \
-		$(use_enable geant4 g4root) \
-		$(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 postgres pgsql) \
-		$(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"
-
-	emake || die "emake failed"
-	emake cintdlls || die "emake cintdlls failed"
-	if use emacs; then
-		elisp-compile build/misc/*.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	echo "LDPATH=/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=/usr" >> 99root
-	use python && echo "PYTHONPATH=/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=/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
-
-	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
-}
-
-pkg_postinst() {
-	use ruby && elog "ROOT Ruby  module is available as libRubyROOT"
-}
diff --git a/sci-physics/root/root-5.20.00-r2.ebuild b/sci-physics/root/root-5.20.00-r3.ebuild
index 510fd060a45f..fdeca7dbdb82 100644
--- a/sci-physics/root/root-5.20.00-r2.ebuild
+++ b/sci-physics/root/root-5.20.00-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.20.00-r2.ebuild,v 1.2 2008/12/05 17:06:55 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.20.00-r3.ebuild,v 1.1 2008/12/18 18:10:18 bicatali Exp $
 
 EAPI=1
-inherit versionator eutils toolchain-funcs qt4 fortran elisp-common
+inherit versionator eutils qt4 fortran elisp-common fdo-mime
 
 DOC_PV=$(get_major_version)_$(get_version_component_range 2)
 ROOFIT_DOC_PV=2.07-29
@@ -11,6 +11,7 @@ TMVA_DOC_PV=4
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 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_v${TMVA_DOC_PV}.pdf )"
@@ -21,23 +22,25 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 
-IUSE="afs cern clarens doc emacs fftw geant4 kerberos ldap +math mysql odbc
-	oracle postgres pythia6 pythia8 python +reflex ruby qt4 ssl xml xrootd"
+IUSE="afs cern clarens doc emacs examples fftw geant4 kerberos ldap
+	+math mysql	odbc oracle postgres pythia6 pythia8 python +reflex
+	ruby qt4 ssl xml xinetd xrootd"
 
-# libafterimage ignored, may be re-install for >=5.20
+# libafterimage ignored, to check every version
 # see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944
 #	|| ( >=media-libs/libafterimage-1.15 x11-wm/afterstep )
-RDEPEND="sys-apps/shadow
+CDEPEND=">=dev-lang/cfortran-4.4-r2
 	dev-libs/libpcre
-	x11-libs/libXpm
-	x11-libs/libXft
 	media-libs/ftgl
 	media-libs/libpng
 	media-libs/jpeg
 	media-libs/giflib
 	media-libs/tiff
+	sys-apps/shadow
 	virtual/opengl
 	virtual/glu
+	x11-libs/libXpm
+	x11-libs/libXft
 	afs? ( >=net-fs/openafs-1.4.7 )
 	clarens? ( dev-libs/xmlrpc-c )
 	emacs? ( virtual/emacs )
@@ -62,10 +65,12 @@ RDEPEND="sys-apps/shadow
 	ssl? ( dev-libs/openssl )
 	xml? ( dev-libs/libxml2 )"
 
-DEPEND="${RDEPEND}
-	cern? ( dev-lang/cfortran )
+DEPEND="${CDEPEND}
 	dev-util/pkgconfig"
 
+RDEPEND="${CDEPEND}
+	xinetd? ( sys-apps/xinetd )"
+
 S="${WORKDIR}/${PN}"
 
 QT4_BUILT_WITH_USE_CHECK="qt3support opengl"
@@ -73,113 +78,85 @@ QT4_BUILT_WITH_USE_CHECK="qt3support opengl"
 pkg_setup() {
 	elog
 	elog "You may want to build ROOT with these non Gentoo extra packages:"
-	elog "AliEn, castor, Chirp, gfal, gLite, Globus, Monalisa, SapDB, SRP."
+	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)\""
 	elog
-	epause 3
 	if use cern; then
 		FORTRAN="gfortran g77 ifc"
 		fortran_pkg_setup
+	else
+		unset F77
 	fi
 	use qt4 && qt4_pkg_setup
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
 }
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${P}-pic.patch
-	epatch "${FILESDIR}"/${P}-ftgl.patch
+	epatch "${WORKDIR}"/${P}-prop-flags.patch
+	epatch "${WORKDIR}"/${P}-as-needed.patch
+	epatch "${WORKDIR}"/${P}-xrootd-shared.patch
+	epatch "${WORKDIR}"/${P}-configure-paths.patch
+
+	epatch "${WORKDIR}"/${P}-ftgl.patch
 	# root bug; reported at https://savannah.cern.ch/bugs/?40816, fixed in svn
-	epatch "${FILESDIR}"/${P}-include-defines-file.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${WORKDIR}"/${P}-include-defines-file.patch
 	# various patches from upstream branch
-	epatch "${FILESDIR}"/${P}-upstream.patch
+	epatch "${WORKDIR}"/${P}-upstream.patch
+
+	# use system cfortran
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
 
 	# adjust header names only for older ftgl versions
 	if has_version '<media-libs/ftgl-2.1.3_rc5'; then
-		epatch "${FILESDIR}"/${P}-ftgl_header.patch
+		epatch "${WORKDIR}"/${P}-ftgl_header.patch
 	fi
 
-	if use cern; then
-		mv montecarlo/eg/inc/cfortran.h{,.orig} || die
-		ln -s /usr/include/cfortran.h montecarlo/eg/inc/cfortran.h || die
-	fi
 	# 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"
 
-	# libPythia6 is called libpythia6 in gentoo
-	sed -i -e 's/libPythia6/libpythia6/g' \
-		configure || die "adjusting libpythia6 name failed"
-
-	# flags propagation
+	# in gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif, and libftgl_pic is libftgl
 	sed -i \
-		-e "s/^\(EXTRA_CFLAGS.*:=.*\)/\1 ${CFLAGS}/" \
-		-e "s/^\(EXTRA_CXXFLAGS.*:=.*\)/\1 ${CXXFLAGS}/" \
-		-e "s/^\(EXTRA_LDFLAGS.*:=.*\)/\1 ${LDFLAGS}/" \
-		config/Makefile.in \
-		|| die "flag propagation failed"
-	# same in xrootd
+		-e 's/libPythia6/libpythia6/g' \
+		-e 's/ungif/gif/g' \
+		-e 's/ftgl_pic/ftgl/g' \
+		configure || die "adjusting library names failed"
+
+	# libafterimage flags are hardcoded
 	sed -i \
-		-e "s/-O2/${CXXFLAGS}/g" \
-		net/xrootd/src/xrootd/config/*.rules.* \
-		|| die "flag propagation in xrootd failed"
+		-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_compile() {
-
-	local target=
-	if [[ "$(tc-getCXX)" == ic* ]]; then
-		if use amd64; then
-			target=linuxx8664icc
-		elif use x86; then
-			target=linuxicc
-		fi
-	fi
-
-	local myconf=
-	use postgres && \
-		myconf="${myconf} --with-pgsql-incdir=/usr/include/postgresql"
-
-	use qt4 && \
-		myconf="${myconf} --with-qt-incdir=/usr/include/qt4" && \
-		myconf="${myconf} --with-qt-libdir=/usr/$(get_libdir)/qt4"
-
-	use geant4 && \
-		myconf="${myconf} --with-clhep-incdir=/usr/include" && \
-		myconf="${myconf} --with-g4-libdir=${G4LIB}"
-
-	if use odbc; then
-		# doesn't work with unixODBC, see bug #242150
-		myconf="${myconf} --with-odbc-incdir=/usr/include/iodbc"
-	fi
-
-	use pythia6 && \
-		myconf="${myconf} --enable-pythia6" && \
-		myconf="${myconf} --with-pythia6-libdir=/usr/$(get_libdir)"
-
-	use pythia8 && \
-		myconf="${myconf} --enable-pythia8" && \
-		myconf="${myconf} --with-pythia8-incdir=/usr/include/pythia"
-
 	# the configure script is not the standard autotools
 	./configure \
-		${target} \
 		--fail-on-missing \
 		--prefix=/usr \
 		--libdir=/usr/$(get_libdir)/${PN} \
 		--docdir=/usr/share/doc/${PF} \
+		--tutdir=/usr/share/doc/${PF}/examples/tutorials \
+		--testdir=/usr/share/doc/${PF}/examples/tests \
 		--with-sys-iconpath=/usr/share/pixmaps \
 		--disable-builtin-afterimage \
 		--disable-builtin-freetype \
 		--disable-builtin-ftgl \
 		--disable-builtin-pcre \
 		--disable-builtin-zlib \
+		--disable-rpath \
 		--enable-asimage \
 		--enable-astiff \
 		--enable-exceptions	\
@@ -191,7 +168,7 @@ src_compile() {
 		--enable-shared	\
 		--enable-soversion \
 		--enable-table \
-		${myconf} \
+		--enable-xft \
 		$(use_enable afs) \
 		$(use_enable clarens) \
 		$(use_enable clarens peac) \
@@ -208,6 +185,8 @@ src_compile() {
 		$(use_enable mysql) \
 		$(use_enable odbc) \
 		$(use_enable postgres pgsql) \
+		$(use_enable pythia6) \
+		$(use_enable pythia8) \
 		$(use_enable python) \
 		$(use_enable qt4 qt) \
 		$(use_enable qt4 qtgsi) \
@@ -227,8 +206,66 @@ src_compile() {
 	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/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
+
 	echo "LDPATH=/usr/$(get_libdir)/root" > 99root
 	use pythia8 && echo "PYTHIA8=/usr" >> 99root
 	use python && echo "PYTHONPATH=/usr/$(get_libdir)/root" >> 99root
@@ -242,20 +279,27 @@ src_install() {
 		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
 	fi
 
-	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
+	doc_install
+	daemon_install
+	desktop_install
+
+	# Cleanup of files either already distributed or unused on Gentoo
+	rm "${D}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
+	rm "${D}"usr/share/root/fonts/LICENSE
+	pushd "${D}"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 "${D}"usr/$(get_libdir)/root/cint/cint/include/makehpib
+	rm -f "${D}"/etc/root/proof/*.sample
+	rm -rf "${D}"/etc/root/daemons
+	popd > /dev/null
 }
 
 pkg_postinst() {
 	use ruby && elog "ROOT Ruby  module is available as libRubyROOT"
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
 }