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.

(Portage version: 2.2_rc41/cvs/Linux x86_64)

11 files changed, 38 insertions, 841 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 3d319c3d33f6..12fecd7a753b 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.53 2009/07/19 22:56:53 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.54 2009/09/23 23:47:18 bicatali Exp $
+
+*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.
 
   19 Jul 2009; Jeremy Olexa <darkside@gentoo.org> root-5.22.00-r2.ebuild:
   amd64 stable, bug 275997
diff --git a/sci-physics/root/files/proofd.xinetd b/sci-physics/root/files/proofd.xinetd
deleted file mode 100644
index bf8845e0311c..000000000000
--- a/sci-physics/root/files/proofd.xinetd
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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.16.00-fortran.patch b/sci-physics/root/files/root-5.16.00-fortran.patch
deleted file mode 100644
index c7c9183127cb..000000000000
--- a/sci-physics/root/files/root-5.16.00-fortran.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-diff -Nur config.orig/Makefile.linux config/Makefile.linux
---- config.orig/Makefile.linux	2007-05-30 11:59:15.000000000 +0100
-+++ config/Makefile.linux	2007-07-05 15:17:22.000000000 +0100
-@@ -44,7 +44,8 @@
- CRYPTLIBS     = -lcrypt
- 
- # Fortran:
--F77           =
-+F77           = gfortran
-+
- ifeq ($(shell which gfortran 2>&1 | sed -ne "s/.*\/gfortran/gfortran/p"),gfortran)
- ifeq ($(shell gfortran -print-libgcc-file-name),$(shell $(CC) -print-libgcc-file-name))
- F77           = gfortran
-@@ -53,7 +54,8 @@
- F77LD         = gfortran
- endif
- endif
--ifneq ($(F77),gfortran)
-+
-+ifeq ($(F77),g77)
- F77           = g77
- F77FLAGS      = -fPIC
- ifneq ($(shell $(F77) -print-file-name=libg2c.so),libg2c.so)
-@@ -63,4 +65,11 @@
- endif
- endif
- 
-+ifeq ($(F77),ifort)
-+F77           = ifort
-+F77FLAGS      = -fPIC 
-+F77LIBS      := -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
-+		-lifcore
-+endif
-+
- # Extras
-diff -Nur config.orig/Makefile.linuxicc config/Makefile.linuxicc
---- config.orig/Makefile.linuxicc	2007-02-13 00:23:09.000000000 +0000
-+++ config/Makefile.linuxicc	2007-07-05 15:17:55.000000000 +0100
-@@ -67,18 +67,33 @@
- CRYPTLIBS     = -lcrypt
- 
- # Fortran:
--F77           = ifort
--F77FLAGS      =
--# check for libg2c and libfrtbegin
--ifneq ($(shell g77 -print-file-name=libg2c.so),libg2c.so)
--LIBG2C        := $(shell g77 -print-file-name=libg2c.so) -lnsl
-+F77           = gfortran
-+
-+ifeq ($(shell which gfortran 2>&1 | sed -ne "s/.*\/gfortran/gfortran/p"),gfortran)
-+ifeq ($(shell gfortran -print-libgcc-file-name),$(shell $(CC) -print-libgcc-file-name))
-+F77           = gfortran
-+F77FLAGS      = -fPIC -std=legacy
-+F77LIBS       = -lgfortran -lgfortranbegin -lnsl
-+F77LD         = gfortran
-+endif
-+endif
-+
-+ifeq ($(F77),g77)
-+F77           = g77
-+F77FLAGS      = -fPIC
-+ifneq ($(shell $(F77) -print-file-name=libg2c.so),libg2c.so)
-+F77LIBS      := $(shell $(F77) -print-file-name=libg2c.so) -lnsl
- else
--LIBG2C        := $(shell g77 -print-file-name=libg2c.a)  -lnsl
-+F77LIBS      := $(shell $(F77) -print-file-name=libg2c.a) -lnsl
-+endif
-+endif
-+
-+ifeq ($(F77),ifort)
-+F77           = ifort
-+F77FLAGS      = -fPIC 
-+F77LIBS      := -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
-+		-lifcore
- endif
--LIBFRTBEGIN  := $(shell g77 -print-file-name=libfrtbegin.a)
--F77LIBS       = $(LIBFRTBEGIN) $(LIBG2C) \
--                -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
--                -lifcore
- 
- # Precompiled headers:
- PCHSUPPORTED := $(ENABLEPCH)
-diff -Nur config.orig/Makefile.linuxx8664gcc config/Makefile.linuxx8664gcc
---- config.orig/Makefile.linuxx8664gcc	2006-06-04 00:48:43.000000000 +0100
-+++ config/Makefile.linuxx8664gcc	2007-07-05 15:18:16.000000000 +0100
-@@ -43,6 +43,18 @@
- CRYPTLIBS     = -lcrypt
- 
- # Fortran:
-+F77           = gfortran
-+
-+ifeq ($(shell which gfortran 2>&1 | sed -ne "s/.*\/gfortran/gfortran/p"),gfortran)
-+ifeq ($(shell gfortran -print-libgcc-file-name),$(shell $(CC) -print-libgcc-file-name))
-+F77           = gfortran
-+F77FLAGS      = -fPIC -std=legacy
-+F77LIBS       = -lgfortran -lgfortranbegin -lnsl
-+F77LD         = gfortran
-+endif
-+endif
-+
-+ifeq ($(F77),g77)
- F77           = g77
- F77FLAGS      = -fPIC
- ifneq ($(shell $(F77) -print-file-name=libg2c.so),libg2c.so)
-@@ -50,5 +62,13 @@
- else
- F77LIBS      := $(shell $(F77) -print-file-name=libg2c.a) -lnsl
- endif
-+endif
-+
-+ifeq ($(F77),ifort)
-+F77           = ifort
-+F77FLAGS      = -fPIC 
-+F77LIBS      := -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
-+		-lifcore
-+endif
- 
- # Extras
-diff -Nur config.orig/Makefile.linuxx8664icc config/Makefile.linuxx8664icc
---- config.orig/Makefile.linuxx8664icc	2007-01-18 13:00:33.000000000 +0000
-+++ config/Makefile.linuxx8664icc	2007-07-05 15:18:32.000000000 +0100
-@@ -67,18 +67,34 @@
- CRYPTLIBS     = -lcrypt
- 
- # Fortran:
--F77           = ifort
-+F77           = gfortran
-+
-+ifeq ($(shell which gfortran 2>&1 | sed -ne "s/.*\/gfortran/gfortran/p"),gfortran)
-+ifeq ($(shell gfortran -print-libgcc-file-name),$(shell $(CC) -print-libgcc-file-name))
-+F77           = gfortran
-+F77FLAGS      = -fPIC -std=legacy
-+F77LIBS       = -lgfortran -lgfortranbegin -lnsl
-+F77LD         = gfortran
-+endif
-+endif
-+
-+ifeq ($(F77),g77)
-+F77           = g77
- F77FLAGS      = -fPIC
--# check for libg2c and libfrtbegin
--ifneq ($(shell g77 -print-file-name=libg2c.so),libg2c.so)
--LIBG2C        := $(shell g77 -print-file-name=libg2c.so) -lnsl
-+ifneq ($(shell $(F77) -print-file-name=libg2c.so),libg2c.so)
-+F77LIBS      := $(shell $(F77) -print-file-name=libg2c.so) -lnsl
- else
--LIBG2C        := $(shell g77 -print-file-name=libg2c.a)  -lnsl
-+F77LIBS      := $(shell $(F77) -print-file-name=libg2c.a) -lnsl
- endif
--LIBFRTBEGIN  := $(shell g77 -print-file-name=libfrtbegin.a)
--F77LIBS       = $(LIBFRTBEGIN) $(LIBG2C) \
--                -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
--                -lifcore
-+endif
-+
-+ifeq ($(F77),ifort)
-+F77           = ifort
-+F77FLAGS      = -fPIC 
-+F77LIBS      := -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
-+		-lifcore
-+endif
-+
- 
- # Precompiled headers:
- PCHSUPPORTED := $(ENABLEPCH)
diff --git a/sci-physics/root/files/root-5.16.00-xft.patch b/sci-physics/root/files/root-5.16.00-xft.patch
deleted file mode 100644
index cc0055f5f81a..000000000000
--- a/sci-physics/root/files/root-5.16.00-xft.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- config/Makefile.in.orig	2007-12-12 22:41:28.000000000 +0000
-+++ config/Makefile.in	2007-12-12 22:45:27.000000000 +0000
-@@ -36,6 +36,7 @@
- X11LIBDIR      := @x11libdir@
- XPMLIBDIR      := @xpmlibdir@
- XPMLIB         := @xpmlib@
-+XFTLIB         := @enable_xft@
- 
- EXCEPTIONS     := @exceptions@
- EXPLICITLINK   := @explicitlink@
---- x11ttf/Module.mk.orig	2008-01-09 01:13:23.000000000 +0000
-+++ x11ttf/Module.mk	2008-01-09 10:20:00.000000000 +0000
-@@ -31,9 +31,9 @@
- ALLLIBS     += $(X11TTFLIB)
- ALLMAPS     += $(X11TTFMAP)
- 
--#ifeq ($(XFTLIB),yes)
-+ifeq ($(XFTLIB),yes)
- XLIBS       += $(X11LIBDIR) -lXft
--#endif
-+endif
- 
- # include all dependency files
- INCLUDEFILES += $(X11TTFDEP)
diff --git a/sci-physics/root/files/root-5.20.00-defind.patch b/sci-physics/root/files/root-5.20.00-defind.patch
deleted file mode 100644
index e52c5025cefc..000000000000
--- a/sci-physics/root/files/root-5.20.00-defind.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- root/cint/cint/src/Type.cxx.orig	2008-06-25 08:24:00.000000000 +0200
-+++ root/cint/cint/src/Type.cxx	2009-06-23 17:59:36.000000000 +0200
-@@ -125,7 +125,7 @@
-   strcpy(G__buf,
- 	 G__type2string((int)type,(int)tagnum,-1,(int)reftype,(int)isconst));
-   return(G__buf);
--#elif  !defind(G__OLDIMPLEMENTATION401)
-+#elif  !defined(G__OLDIMPLEMENTATION401)
-   return(G__type2string((int)type,(int)tagnum,-1,(int)reftype,(int)isconst));
- #else
-   return(G__type2string((int)type,(int)tagnum,-1,(int)reftype));
-@@ -138,7 +138,7 @@
-   strcpy(G__buf,G__type2string((int)type,(int)tagnum,(int)typenum,(int)reftype
- 			       ,(int)isconst));
-   return(G__buf);
--#elif  !defind(G__OLDIMPLEMENTATION401)
-+#elif  !defined(G__OLDIMPLEMENTATION401)
-   return(G__type2string((int)type,(int)tagnum,(int)typenum,(int)reftype
- 	,(int)isconst));
- #else
diff --git a/sci-physics/root/files/root.xinetd b/sci-physics/root/files/root.xinetd
deleted file mode 100644
index 56e0f64e3722..000000000000
--- a/sci-physics/root/files/root.xinetd
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/sparc-root-5.16.00.patch b/sci-physics/root/files/sparc-root-5.16.00.patch
deleted file mode 100644
index 1cb87bdd84f6..000000000000
--- a/sci-physics/root/files/sparc-root-5.16.00.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- xrootd/config/ARCHS-	2007-08-28 15:40:20.000000000 +0000
-+++ xrootd/config/ARCHS		2007-08-28 15:43:33.000000000 +0000
-@@ -35,6 +35,7 @@
- x86_64_linux_26 iccx8664  all    for AMD Opteron 64 Linux kernel 2.6.x Intel icc
- x86_64_linux    iccx8664  all    for AMD Opteron 64 Linux Intel icc
- alpha_linux     gcc       all    for Alpha Linux egcs and glibc
-+sparc_linux     gcc       all    for Sparc Linux gcc and glibc
- arm_linux       gcc       no     for ARM Linux egcs and glibc
- ppc_linux       gcc       all    for PPC Linux egcs/gcc and glibc
- ppc_linux       gccppc64  all    for PPC Linux egcs/gcc and glibc - 64 bit
---- xrootd/configure.classic-	2007-08-28 15:35:58.000000000 +0000
-+++ xrootd/configure.classic	2007-08-28 15:37:38.000000000 +0000
-@@ -421,6 +421,7 @@
-       linux:arm*:*)       arch=arm_linux       ; platform=linux; ccflv=gcc;;
-       linux:ppc64:*)      arch=ppc_linux       ; platform=linux; ccflv=gccppc64;;
-       linux:ppc*:*)       arch=ppc_linux       ; platform=linux; ccflv=gcc;;
-+      linux:sparc*:*)     arch=sparc_linux     ; platform=linux; ccflv=gcc;;
-       darwin:power*:7.4*) arch=macosx_74       ; platform=macosx; ccflv=macos;;
-       darwin:power*:7*)   arch=ppc_darwin_70   ; platform=macosx; ccflv=macos;;
-       darwin:power*:*)    arch=macosx          ; platform=macosx; ccflv=macos;;
diff --git a/sci-physics/root/root-3.05.04.ebuild b/sci-physics/root/root-3.05.04.ebuild
deleted file mode 100644
index 154b7f806624..000000000000
--- a/sci-physics/root/root-3.05.04.ebuild
+++ /dev/null
@@ -1,71 +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-3.05.04.ebuild,v 1.5 2008/05/21 19:02:38 dev-zero Exp $
-
-inherit flag-o-matic eutils
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="An Object-Oriented Data Analysis Framework"
-SRC_URI="ftp://root.cern.ch/root/root_v${PV}.source.tar.gz"
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 sparc ppc"
-IUSE="mysql postgres opengl"
-
-RDEPEND="x11-libs/libXpm
-	>=media-libs/freetype-2.0.9
-	opengl? ( virtual/opengl virtual/glu )
-	mysql? ( virtual/mysql )
-	postgres? ( virtual/postgresql-server )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#epatch ${FILESDIR}/root-makefile.patch
-	#epatch ${FILESDIR}/pgsql-no-libpq-int.patch
-}
-
-src_compile() {
-
-	case $SYSTEM_ARCH in
-		ppc)
-			append-flags "-fsigned-char";;
-	esac
-	#export GENTOO_CFLAGS="${CFLAGS}" GENTOO_CXXFLAGS="${CXXFLAGS}"
-	./configure \
-		linux \
-		--prefix=/usr \
-		--docdir=/usr/share/doc/${P} \
-		--enable-shared \
-		--disable-rpath \
-		--enable-thread \
-		--disable-cern \
-		--disable-sapdb \
-		--disable-rfio \
-		--disable-dcache \
-		--disable-srp \
-		--disable-afs \
-		--disable-krb5 \
-		--enable-shadowpw \
-		--disable-pythia \
-		--disable-pythia6 \
-		--disable-venus \
-		--enable-soversion \
-		`use_enable opengl` \
-		`use_enable mysql` \
-		`use_enable postgres pgsql` \
-		${myconf} || die "./configure failed"
-	make OPT="$CFLAGS" || die
-}
-
-src_install() {
-	make DESTDIR="${D}" INSTALL="install" install || die
-
-	dodir /etc/env.d
-	echo "LDPATH=/usr/lib/root" > "${D}"/etc/env.d/60root
-}
diff --git a/sci-physics/root/root-5.16.00.ebuild b/sci-physics/root/root-5.16.00.ebuild
deleted file mode 100644
index 4b671613f876..000000000000
--- a/sci-physics/root/root-5.16.00.ebuild
+++ /dev/null
@@ -1,185 +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.16.00.ebuild,v 1.14 2008/07/27 22:20:12 carlo Exp $
-
-EAPI=1
-inherit versionator flag-o-matic eutils toolchain-funcs qt3 fortran
-
-DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-
-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 )"
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 sparc x86"
-
-IUSE="afs cern doc fftw kerberos ldap mysql odbc postgres
-	python ruby qt3 ssl truetype xml"
-
-DEPEND="sys-apps/shadow
-	x11-libs/libXpm
-	x11-libs/libXft
-	>=sci-libs/gsl-1.8
-	dev-libs/libpcre
-	virtual/opengl
-	virtual/glu
-	|| ( media-libs/libafterimage x11-wm/afterstep )
-	mysql? ( virtual/mysql )
-	postgres? ( virtual/postgresql-server )
-	afs? ( net-fs/openafs )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	qt3? ( x11-libs/qt:3 )
-	fftw? ( >=sci-libs/fftw-3 )
-	python? ( dev-lang/python )
-	ruby? ( dev-lang/ruby )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	cern? ( sci-physics/cernlib )
-	odbc? ( dev-db/unixODBC )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	elog
-	elog "You may want to build ROOT with these non Gentoo extra packages:"
-	elog "AliEn, castor, Chirp, clarens, Globus, Monalisa, Oracle, peac, "
-	elog "PYTHIA, PYTHIA6, SapDB, SRP, Venus"
-	elog "You can use the EXTRA_CONF variable for this."
-	elog "Example, for PYTHIA, you would do: "
-	elog "EXTRA_CONF=\"--enable-pythia --with-pythia-libdir=/usr/$(get_libdir)\" emerge root"
-	elog
-	epause 10
-	if use cern; then
-		FORTRAN="gfortran g77 ifc"
-		fortran_pkg_setup
-	fi
-	if [[ "$(tc-getCXX)" == *g++* ]] && \
-		version_is_at_least 4.2 $(gcc-version); then
-		eerror "${P} will not compile with g++ >= 4.2"
-		eerror "Either downgrade gcc, use another C++ compiler or use root >= 5.18."
-		die "wrong g++ version"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# patch to properly set link flags with fortran compilers
-	epatch "${FILESDIR}"/${P}-fortran.patch
-	if [[ ${ARCH} == sparc ]]; then
-		cd "${S}/xrootd/src"
-		tar xzf xrootd-20060928-1600.src.tgz
-		epatch "${FILESDIR}"/sparc-${P}.patch
-		tar czf xrootd-20060928-1600.src.tgz xrootd
-	fi
-}
-
-src_compile() {
-
-	local target
-	if [[ "$(tc-getCXX)" == icc* ]]; then
-		if use amd64; then
-			target=linuxx8664icc
-		elif use x86; then
-			target=linuxicc
-		fi
-	fi
-	use afs && append-flags -DAFS_OLD_COM_ERR
-	local myfortran
-	use cern && myfortran="F77=${FORTRANC}"
-
-	# watch: the configure script is not the standard autotools
-	# disable-pch: precompiled headers buggy with icc
-
-	./configure ${target} \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--mandir=/usr/share/man/man1 \
-		--incdir=/usr/include/${PN} \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--aclocaldir=/usr/share/aclocal/ \
-		--datadir=/usr/share/${PN} \
-		--cintincdir=/usr/share/${PN}/cint \
-		--fontdir=/usr/share/${PN}/fonts \
-		--iconpath=/usr/share/${PN}/icons \
-		--macrodir=/usr/share/${PN}/macros \
-		--srcdir=/usr/share/${PN}/src \
-		--docdir=/usr/share/doc/${PF} \
-		--testdir=/usr/share/doc/${PF}/test \
-		--tutdir=/usr/share/doc/${PF}/tutorial \
-		--elispdir=/usr/share/emacs/site-lisp \
-		--etcdir=/etc/${PN} \
-		--disable-alien \
-		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-chirp \
-		--disable-dcache \
-		--disable-globus \
-		--disable-pch \
-		--disable-rfio \
-		--disable-rpath \
-		--disable-sapdb \
-		--disable-srp \
-		--enable-asimage \
-		--enable-astiff \
-		--enable-cintex \
-		--enable-exceptions	\
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-mathcore \
-		--enable-mathmore \
-		--enable-minuit2 \
-		--enable-opengl \
-		--enable-reflex \
-		--enable-roofit \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--enable-unuran \
-		--enable-xrootd \
-		$(use_enable afs) \
-		$(use_enable cern) \
-		$(use_enable fftw fftw3) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable postgres pgsql) \
-		$(use_enable python) \
-		$(use_enable qt3 qt) \
-		$(use_enable qt3 qtgsi) \
-		$(use_enable ruby) \
-		$(use_enable ssl) \
-		$(use_enable truetype xft) \
-		$(use_enable xml) \
-		${EXTRA_CONF} \
-		|| die "configure failed"
-
-	emake \
-		OPTFLAGS="${CXXFLAGS}" \
-		${myfortran} \
-		|| die "emake failed"
-
-	# is this only for windows? not quite sure.
-	emake cintdlls || die "emake cintdlls failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	echo "LDPATH=/usr/$(get_libdir)/root" > 99root
-	use python && echo "PYTHONPATH=/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root || die "doenvd failed"
-
-	if use doc; then
-		einfo "Installing user's guide and ref manual"
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \
-			|| die "pdf install failed"
-	fi
-}
diff --git a/sci-physics/root/root-5.20.00-r3.ebuild b/sci-physics/root/root-5.20.00-r3.ebuild
deleted file mode 100644
index 698ce21b7352..000000000000
--- a/sci-physics/root/root-5.20.00-r3.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2009 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-r3.ebuild,v 1.10 2009/06/23 16:35:48 jer Exp $
-
-EAPI=1
-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
-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 )"
-
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~hppa sparc x86"
-
-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, to check every version
-# see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944
-#	|| ( >=media-libs/libafterimage-1.15 x11-wm/afterstep )
-CDEPEND=">=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	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 )
-	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/libiodbc )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( virtual/postgresql-base )
-	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 ) )
-	ruby? ( dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-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, 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
-	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 "${WORKDIR}"/${P}-prop-flags.patch
-	epatch "${WORKDIR}"/${P}-as-needed.patch
-	epatch "${WORKDIR}"/${P}-xrootd-shared.patch
-	epatch "${WORKDIR}"/${P}-xrootd-prop-flags.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 "${WORKDIR}"/${P}-include-defines-file.patch
-	# various patches from upstream branch
-	epatch "${WORKDIR}"/${P}-upstream.patch
-
-	# fix spelling errors (bug #275205)
-	epatch "${FILESDIR}/${P}-defind.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 "${WORKDIR}"/${P}-ftgl_header.patch
-	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"
-
-	# in gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif, and libftgl_pic is libftgl
-	sed -i \
-		-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/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() {
-	# the configure script is not the standard autotools
-	./configure \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=${FORTRANC} \
-		--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	\
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-opengl \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--enable-xft \
-		$(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 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"
-
-	emake OPT="" || die "emake failed"
-	emake cintdlls || die "emake cintdlls 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=/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
-
-	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
-}
diff --git a/sci-physics/root/root-5.22.00-r1.ebuild b/sci-physics/root/root-5.22.00-r3.ebuild
index 2424ad7287c4..e8b9a198a0d6 100644
--- a/sci-physics/root/root-5.22.00-r1.ebuild
+++ b/sci-physics/root/root-5.22.00-r3.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.22.00-r1.ebuild,v 1.3 2009/05/05 14:44:15 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.22.00-r3.ebuild,v 1.1 2009/09/23 23:47:18 bicatali Exp $
 
 EAPI=2
-inherit versionator eutils qt4 fortran elisp-common fdo-mime toolchain-funcs
+inherit versionator eutils qt4 elisp-common fdo-mime toolchain-funcs
 
-#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-DOC_PV=5_21
+DOC_PV=$(get_major_version)_$(get_version_component_range 2)
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4
-PATCH_PV=p02
+PATCH_PV=p04
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
@@ -30,7 +29,7 @@ IUSE="afs cern cint7 clarens doc emacs examples fftw geant4 kerberos ldap
 
 # 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 )
+#	|| ( >=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
@@ -85,18 +84,12 @@ pkg_setup() {
 	elog "For example, for SRP, you would set: "
 	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
 	elog
-	if use cern; then
-		FORTRAN="gfortran g77 ifc"
-		fortran_pkg_setup
-	else
-		unset F77
-	fi
 	enewgroup rootd
 	enewuser rootd -1 -1 /var/spool/rootd rootd
 
-	if use openmp &&
-		[[ $(tc-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
+	if use openmp && \
+		[[ $(tc-getCC)$ == *gcc* ]] && \
+		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || \
 			! built_with_use 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,"
@@ -106,17 +99,28 @@ pkg_setup() {
 		export USE_OPENMP=1
 		use math && export USE_PARALLEL_MINUIT2=1
 	fi
+	if use cint7 && \
+		[[ $(tc-getCXX)$ == *g++* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -ge 44 ]]; then
+		ewarn "cint7 cannot be compiled with g++ >= 4.4."
+		ewarn "If you want to build this package with CINT7"
+		ewarn "switch to an older gcc version or another compiler"
+		die "cint7 incompatible with gcc>4"
+	fi
 }
 
 src_prepare() {
-
-	epatch "${WORKDIR}"/${P}-svn28086.patch
+	epatch "${WORKDIR}"/${P}-gcc44.patch
+	epatch "${WORKDIR}"/${P}-kerberos-1.7.patch
+	epatch "${WORKDIR}"/${P}-svn29990.patch
 	epatch "${WORKDIR}"/${P}-cint7-libdir.patch
 	epatch "${WORKDIR}"/${P}-prop-flags.patch
 	epatch "${WORKDIR}"/${P}-as-needed.patch
 	epatch "${WORKDIR}"/${P}-xrootd-shared.patch
 	epatch "${WORKDIR}"/${P}-xrootd-prop-flags.patch
 	epatch "${WORKDIR}"/${P}-configure-paths.patch
+	epatch "${WORKDIR}"/${P}-configure-sandbox.patch
+	epatch "${WORKDIR}"/${P}-g4root-flags.patch
 
 	# use system cfortran
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
@@ -150,7 +154,7 @@ src_configure() {
 	./configure \
 		--with-cc=$(tc-getCC) \
 		--with-cxx=$(tc-getCXX) \
-		--with-f77=${FORTRANC} \
+		--with-f77=$(tc-getF77) \
 		--fail-on-missing \
 		--prefix=/usr \
 		--libdir=/usr/$(get_libdir)/${PN} \