Version bump, removed some older versions. Still buggy for pre-compiled headers (use flag pch), and could not test properly with oracle flag. Masked for a testing period, see bug #230654

Package-Manager: portage-2.1.4.4

10 files changed, 269 insertions, 339 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 04a17dc97df2..02eb7b9d523c 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,18 @@
 # 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.27 2008/06/16 15:05:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.28 2008/07/08 16:28:18 bicatali Exp $
+
+*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:
diff --git a/sci-physics/root/files/root-5.16.00-afs.patch b/sci-physics/root/files/root-5.16.00-afs.patch
deleted file mode 100644
index cf709362aca8..000000000000
--- a/sci-physics/root/files/root-5.16.00-afs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur root/configure root.new/configure
---- root/configure	2007-06-07 02:48:25.000000000 -0500
-+++ root.new/configure	2007-12-16 07:18:51.000000000 -0500
-@@ -307,7 +307,7 @@
-     # the .lib export library to link.
-     libs=""
-     for i in $lib ; do
--	for ext in .a .lib "" ; do     # lib without extension for MacOS X
-+	for ext in foobar "" ; do     # lib without extension for MacOS X
- 	    libs="$libs $i$ext"
- 	done
-     done
-@@ -403,7 +403,7 @@
- 	flib=""
-         maclib=""
- 	for i in $lib ; do
--	    for ext in .a .lib "" ; do     # lib without extension for MacOS X
-+	    for ext in foobar "" ; do     # lib without extension for MacOS X
- 		if test "x$found_lib" = "x$i$ext" ; then
- 		    flib=$i$ext
-                     if test "x$ext" = "x" ; then
-diff -Naur root/xrootd/Module.mk root.new/xrootd/Module.mk
---- root/xrootd/Module.mk	2007-03-24 09:06:26.000000000 -0500
-+++ root.new/xrootd/Module.mk	2007-12-16 07:25:47.000000000 -0500
-@@ -77,6 +77,8 @@
- 		   gunzip -c $(XROOTDVERS).src.tgz | tar xf -; \
- 		   etag=`basename $(XROOTDETAG)` ; \
- 		   touch $$etag ; \
-+		   sed -e "s:.a .lib:.foobar:" -i xrootd/configure.classic ; \
-+		   sed -e "s:-lXrdSys:-lXrdSys -lresolv:" -i xrootd/src/XrdSecpwd/GNUmakefile ; \
- 		fi)
- ifeq ($(PLATFORM),win32)
- 		@(if [ -d $(XROOTDDIRD)/pthreads-win32 ]; then \
diff --git a/sci-physics/root/files/root-5.16.00-flags.patch b/sci-physics/root/files/root-5.16.00-flags.patch
deleted file mode 100644
index 05bf8e7531f8..000000000000
--- a/sci-physics/root/files/root-5.16.00-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xrootd/config/GNUmake.env.in.orig	2007-12-13 09:23:25.041447494 +0000
-+++ xrootd/config/GNUmake.env.in	2007-12-13 09:24:10.056012728 +0000
-@@ -22,8 +22,8 @@
- LIBDIR  = ../../lib$(ARCHDIR)
- OBJDIR  = ../../obj$(ARCHDIR)
- 
--CFLAGS     = $(CF64) $(CFOP) -DXrdDEBUG=$(XrdDEBUG)
--CFLAGS32   = $(CF32) $(CFOP) -DXrdDEBUG=$(XrdDEBUG)
-+CFLAGS     = $(CF64) $(OPTFLAGS) $(CFOP) -DXrdDEBUG=$(XrdDEBUG)
-+CFLAGS32   = $(CF32) $(OPTFLAGS) $(CFOP) -DXrdDEBUG=$(XrdDEBUG)
- 
- # Extra flags
- CFTRACE   = @tracedbg@
diff --git a/sci-physics/root/files/root-5.16.00-postgres.patch b/sci-physics/root/files/root-5.16.00-postgres.patch
deleted file mode 100644
index 9e48819fe743..000000000000
--- a/sci-physics/root/files/root-5.16.00-postgres.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./pgsql/src/TPgSQLServer.cxx~	2007-06-08 18:45:02.000000000 +0900
-+++ ./pgsql/src/TPgSQLServer.cxx	2007-12-22 22:41:25.000000000 +0900
-@@ -344,16 +344,16 @@
-       SetError(-1, "cannot allocate PGSQL_STMT" , "Statement");
-       return 0;
-    }
--   stmt->conn=fPgSQL;
--   stmt->res=PQprepare(fPgSQL,"", sql,0,(const Oid*)0);
-+   stmt->fConn=fPgSQL;
-+   stmt->fRes=PQprepare(fPgSQL,"", sql,0,(const Oid*)0);
- 
--   ExecStatusType stat = PQresultStatus(stmt->res);
-+   ExecStatusType stat = PQresultStatus(stmt->fRes);
-    if (pgsql_success(stat)) {
-       fErrorOut=stat;
-       return new TPgSQLStatement(stmt, fErrorOut);
-    } else {
--      SetError(stat, PQresultErrorMessage(stmt->res), "Statement");
--      stmt->conn = 0;
-+      SetError(stat, PQresultErrorMessage(stmt->fRes), "Statement");
-+      stmt->fConn = 0;
-       delete stmt;
-       return 0;
-    }
diff --git a/sci-physics/root/files/root-5.20.00-configure.patch b/sci-physics/root/files/root-5.20.00-configure.patch
new file mode 100644
index 000000000000..a60986a2657f
--- /dev/null
+++ b/sci-physics/root/files/root-5.20.00-configure.patch
@@ -0,0 +1,37 @@
+--- 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-pic.patch b/sci-physics/root/files/root-5.20.00-pic.patch
new file mode 100644
index 000000000000..1ecf8f353414
--- /dev/null
+++ b/sci-physics/root/files/root-5.20.00-pic.patch
@@ -0,0 +1,129 @@
+--- ./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-xrootd-flags.patch b/sci-physics/root/files/root-xrootd-flags.patch
deleted file mode 100644
index ed4ef22dfa37..000000000000
--- a/sci-physics/root/files/root-xrootd-flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- xrootd/Module.mk.orig	2008-01-17 17:16:53.152329508 +0000
-+++ xrootd/Module.mk	2008-01-17 17:18:27.318594421 +0000
-@@ -77,6 +77,9 @@
- 		   gunzip -c $(XROOTDVERS).src.tgz | tar xf -; \
- 		   etag=`basename $(XROOTDETAG)` ; \
- 		   touch $$etag ; \
-+		   sed  -i \
-+			-e 's:$$(CFOP):$$(CFOP) $$(OPTFLAGS):g' \
-+			xrootd/config/GNUmake.env.in ; \
- 		fi)
- ifeq ($(PLATFORM),win32)
- 		@(if [ -d $(XROOTDDIRD)/pthreads-win32 ]; then \
diff --git a/sci-physics/root/root-5.16.00-r1.ebuild b/sci-physics/root/root-5.16.00-r1.ebuild
deleted file mode 100644
index 065c4c9ac34d..000000000000
--- a/sci-physics/root/root-5.16.00-r1.ebuild
+++ /dev/null
@@ -1,188 +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-r1.ebuild,v 1.5 2008/05/21 19:02:38 dev-zero Exp $
-
-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
-	mirror://gentoo/${P}-gcc-4.2.patch.bz2
-	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 pch postgres
-	python ruby qt3 ssl truetype xml"
-
-RDEPEND="sys-apps/shadow
-	x11-libs/libXpm
-	>=sci-libs/gsl-1.8
-	dev-libs/libpcre
-	virtual/opengl
-	virtual/glu
-	|| ( media-libs/libafterimage x11-wm/afterstep )
-	afs? ( net-fs/openafs )
-	mysql? ( virtual/mysql )
-	postgres? ( virtual/postgresql-server )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	qt3? ( $(qt_min_version 3.3.4) )
-	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 )
-	truetype? ( x11-libs/libXft )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-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_ECONF variable for this."
-	elog "Example, for PYTHIA, you would do: "
-	elog "EXTRA_ECONF=\"--enable-pythia --with-pythia-libdir=/usr/$(get_libdir)\" emerge root"
-	elog
-	epause 7
-	if use cern; then
-		FORTRAN="gfortran g77 ifc"
-		fortran_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# patch to properly set link flags with fortran compilers
-	epatch "${FILESDIR}"/${P}-fortran.patch
-	epatch "${DISTDIR}"/${P}-gcc-4.2.patch.bz2
-	epatch "${FILESDIR}"/${P}-afs.patch
-	epatch "${FILESDIR}"/${P}-xft.patch
-	epatch "${FILESDIR}"/${P}-postgres.patch
-	cd "${S}"/xrootd/src
-	tar xzf xrootd-20060928-1600.src.tgz
-	epatch "${FILESDIR}"/sparc-${P}.patch
-	epatch "${FILESDIR}"/${P}-flags.patch
-	tar czf xrootd-20060928-1600.src.tgz xrootd
-}
-
-src_compile() {
-
-	local target
-	local myconf="--disable-pch"
-	use pch && myconf="--enable-pch"
-	if [[ "$(tc-getCXX)" == icc* ]]; then
-		if use amd64; then
-			target=linuxx8664icc
-		elif use x86; then
-			target=linuxicc
-		fi
-		myconf="--disable-pch"
-	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
-	# 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-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) \
-		${myconf} \
-		${EXTRA_ECONF} \
-		|| 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
-	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.18.00d.ebuild b/sci-physics/root/root-5.18.00d.ebuild
index ae9e4d2d8359..7e7d02c461d6 100644
--- a/sci-physics/root/root-5.18.00d.ebuild
+++ b/sci-physics/root/root-5.18.00d.ebuild
@@ -1,6 +1,6 @@
 # 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.18.00d.ebuild,v 1.1 2008/05/29 18:55:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.18.00d.ebuild,v 1.2 2008/07/08 16:28:18 bicatali Exp $
 
 EAPI="1"
 inherit versionator flag-o-matic eutils toolchain-funcs qt3 qt4 fortran
@@ -14,7 +14,7 @@ SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
 HOMEPAGE="http://root.cern.ch/"
 
 SLOT="0"
-LICENSE="LGPL-2"
+LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 
 IUSE="afs cern doc fftw kerberos ldap +math mysql odbc
@@ -36,7 +36,11 @@ RDEPEND="sys-apps/shadow
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
 	qt3? ( !qt4? ( $(qt_min_version 3.3.4) ) )
-	qt4? ( || ( >=x11-libs/qt-4.3:4 x11-libs/qt-gui:4 ) )
+	qt4? ( || ( >=x11-libs/qt-4.3:4
+				( x11-libs/qt-gui:4
+				  x11-libs/qt-opengl:4
+				  x11-libs/qt-qt3support:4
+				  x11-libs/qt-xml:4 ) ) )
 	fftw? ( >=sci-libs/fftw-3 )
 	python? ( dev-lang/python )
 	ruby? ( dev-lang/ruby )
@@ -51,7 +55,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}"
 
-QT4_BUILT_WITH_USE_CHECK="qt3support"
+QT4_BUILT_WITH_USE_CHECK="qt3support opengl"
 
 pkg_setup() {
 	elog
@@ -108,6 +112,13 @@ src_compile() {
 	else
 		myconf="${myconf} --disable-qt --disable-qtgsi"
 	fi
+	use qt4 && \
+		myconf="${myconf} --with-qt-incdir=/usr/include/qt4" && \
+		myconf="${myconf} --with-qt-libdir=/usr/$(get_libdir)/qt4"
+
+	use qt3 && ! use qt4 && \
+		myconf="${myconf} --with-qt-incdir=/usr/qt/3/include" && \
+		myconf="${myconf} --with-qt-libdir=/usr/qt/3/$(get_libdir)"
 
 	# watch: the configure script is not the standard autotools
 	local docdir=/usr/share/doc/${PF}
@@ -136,7 +147,6 @@ src_compile() {
 		${myconf} \
 		$(use_enable afs) \
 		$(use_enable cern) \
-		$(use_enable cint7) \
 		$(use_enable fftw fftw3) \
 		$(use_enable kerberos krb5) \
 		$(use_enable ldap) \
diff --git a/sci-physics/root/root-5.18.00.ebuild b/sci-physics/root/root-5.20.00.ebuild
index cd132d137950..2ca9d34370a3 100644
--- a/sci-physics/root/root-5.18.00.ebuild
+++ b/sci-physics/root/root-5.20.00.ebuild
@@ -1,8 +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.18.00.ebuild,v 1.5 2008/05/21 19:02:38 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.20.00.ebuild,v 1.1 2008/07/08 16:28:18 bicatali Exp $
 
-inherit versionator flag-o-matic eutils toolchain-funcs qt3 qt4 fortran
+EAPI=1
+inherit versionator flag-o-matic eutils toolchain-funcs qt4 fortran
 
 #DOC_PV=$(get_major_version)_$(get_version_component_range 2)
 DOC_PV=5_16
@@ -13,56 +14,71 @@ SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
 HOMEPAGE="http://root.cern.ch/"
 
 SLOT="0"
-LICENSE="LGPL-2"
+LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 
-IUSE="afs cern cint7 doc fftw kerberos ldap mysql odbc pch postgres
-	python ruby qt3 qt4 ssl truetype xml"
+IUSE="afs cern clarens doc fftw geant4 kerberos ldap +math mysql odbc
+	oracle pch postgres python 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
-	>=sci-libs/gsl-1.8
-	dev-libs/libpcre
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/giflib
+	media-libs/tiff
 	virtual/opengl
 	virtual/glu
-	|| ( >=media-libs/libafterimage-1.15 x11-wm/afterstep )
-	afs? ( net-fs/openafs )
+	math? ( >=sci-libs/gsl-1.8 )
+	afs? ( >=net-fs/openafs-1.4.7 )
 	mysql? ( virtual/mysql )
 	postgres? ( virtual/postgresql-server )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	qt3? ( !qt4? ( $(qt_min_version 3.3.4) ) )
-	qt4? ( $(qt4_min_version 4.3) )
-	fftw? ( >=sci-libs/fftw-3 )
+	qt4? ( || ( >=x11-libs/qt-4.3:4
+				( x11-libs/qt-gui:4
+				  x11-libs/qt-opengl:4
+				  x11-libs/qt-qt3support:4
+				  x11-libs/qt-xml:4 ) ) )
+	fftw? ( sci-libs/fftw:3.0 )
 	python? ( dev-lang/python )
 	ruby? ( dev-lang/ruby )
 	ssl? ( dev-libs/openssl )
 	xml? ( dev-libs/libxml2 )
-	cern? ( sci-physics/cernlib )
+	geant4? ( sci-physics/geant:4 )
 	odbc? ( dev-db/unixODBC )
-	truetype? ( x11-libs/libXft )"
+	oracle? ( dev-db/oracle-instantclient-basic )
+	clarens? ( dev-libs/xmlrpc-c )"
 
 DEPEND="${RDEPEND}
+	cern? ( dev-lang/cfortran )
 	dev-util/pkgconfig"
 
 S="${WORKDIR}/${PN}"
 
-QT4_BUILT_WITH_USE_CHECK="qt3support"
+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, clarens, gfal, Globus, GEANT4, Monalisa, "
-	elog "Oracle, peac, PYTHIA, PYTHIA6, SapDB, SRP, Venus"
-	elog "You can use the EXTRA_ECONF variable for this."
-	elog "Example, for PYTHIA, you would do: "
-	elog "EXTRA_ECONF=\"--enable-pythia --with-pythia-libdir=/usr/$(get_libdir)\" emerge root"
+	elog "AliEn, castor, Chirp, gfal, gLite, Globus, Monalisa, "
+	elog "PYTHIA, PYTHIA6, 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 7
+	epause 5
 	if use cern; then
 		FORTRAN="gfortran g77 ifc"
 		fortran_pkg_setup
+	else
+		FORTRANC=
+		FFLAGS=
 	fi
 	use qt4 && qt4_pkg_setup
 }
@@ -70,52 +86,49 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-5.16.00-xft.patch
-	epatch "${FILESDIR}"/${PN}-pic.patch
+	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-pic.patch
+	# use system cfortran
+	if use cern; then
+		rm -f include/root/cfortran.h
+		ln -s /usr/include/cfortran.h include/cfortran.h
+	fi
 }
 
 src_compile() {
 
 	local target
-	local myconf="--disable-pch"
-	use pch && myconf="--enable-pch"
-	if [[ "$(tc-getCXX)" == icc* ]]; then
+	if [[ "$(tc-getCXX)" == ic* ]]; then
 		if use amd64; then
 			target=linuxx8664icc
 		elif use x86; then
 			target=linuxicc
 		fi
-		myconf="--disable-pch"
 	fi
 
-	local myfortran
-	use cern && \
-		myfortran="${FORTRANC} ${FFLAGS}"
+	local myconf
+	use postgres && \
+		myconf="${myconf} --with-pgsql-incdir=/usr/include/postgresql"
 
-	# watch: the configure script is not the standard autotools
+	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}"
+
+	# the configure script is not the standard autotools
 	./configure \
 		${target} \
-		${myconf} \
-		--with-f77="${myfortran}" \
-		--with-cc="$(tc-getCC) ${CFLAGS}" \
-		--with-cxx="$(tc-getCXX) ${CXXFLAGS}" \
+		--fail-on-missing \
 		--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}/tutorials \
-		--elispdir=/usr/share/emacs/site-lisp \
-		--etcdir=/etc/${PN} \
+		--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 \
@@ -127,43 +140,42 @@ src_compile() {
 		--enable-exceptions	\
 		--enable-explicitlink \
 		--enable-gdml \
-		--enable-mathcore \
-		--enable-mathmore \
-		--enable-minuit2 \
+		--enable-memstat \
 		--enable-opengl \
 		--enable-reflex \
-		--enable-roofit \
 		--enable-shadowpw \
 		--enable-shared	\
 		--enable-soversion \
 		--enable-table \
-		--enable-unuran \
-		--enable-xrootd \
-		$(use_enable cint7) \
-		$(use_enable pch) \
+		${myconf} \
 		$(use_enable afs) \
-		$(use_enable cern) \
+		$(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 pch) \
 		$(use_enable postgres pgsql) \
 		$(use_enable python) \
-		$(use_enable qt3 qt) \
-		$(use_enable qt3 qtgsi) \
 		$(use_enable qt4 qt) \
 		$(use_enable qt4 qtgsi) \
 		$(use_enable ruby) \
 		$(use_enable ssl) \
-		$(use_enable truetype xft) \
 		$(use_enable xml) \
+		$(use_enable xrootd) \
 		${EXTRA_ECONF} \
 		|| die "configure failed"
 
 	emake || die "emake failed"
-
-	# is this only for windows? not quite sure.
 	emake cintdlls || die "emake cintdlls failed"
 }