Added various patches: one to respect flags in xrootd (needed for afs), one to properly handle -truetype without libXft (bug #204725) and last one for postgresql (bug #203015). Added pch use flag for faster compilation with g++

Package-Manager: portage-2.1.4_rc14

6 files changed, 125 insertions, 26 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 2d9336de01cb..a7fc1bb59bd4 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-physics/root
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.18 2007/12/16 17:04:42 markusle Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.19 2008/01/10 00:08:22 bicatali Exp $
+
+  10 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/root-5.16.00-flags.patch, +files/root-5.16.00-postgres.patch,
+  +files/root-5.16.00-xft.patch, root-5.16.00-r1.ebuild:
+  Added various patches: one to respect flags in xrootd (needed for afs), one
+  to properly handle -truetype without libXft (bug #204725) and last one for
+  postgresql (bug #203015). Added pch use flag for faster compilation with g++
 
   16 Dec 2007; Markus Dittrich <markusle@gentoo.org>
   +files/root-5.16.00-afs.patch, root-5.16.00-r1.ebuild:
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 614c4e6c2971..4c99b6cf4211 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,11 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX root-5.16.00-afs.patch 1320 RMD160 76896f12113782f9ee534b6920a1dde53eb09c72 SHA1 052a6113f5c2c4bc786f7f1d567c1990a5791d8b SHA256 04b2e484cad98943487f3691d57d20b923bb0ce5998f28f423f94995a832a9dc
 MD5 f10c6e4f1295312df2d13e3bf25614ad files/root-5.16.00-afs.patch 1320
 RMD160 76896f12113782f9ee534b6920a1dde53eb09c72 files/root-5.16.00-afs.patch 1320
 SHA256 04b2e484cad98943487f3691d57d20b923bb0ce5998f28f423f94995a832a9dc files/root-5.16.00-afs.patch 1320
+AUX root-5.16.00-flags.patch 502 RMD160 758a2b4977dc16f61e51297de855b532e30bf2c6 SHA1 17435caa24eb4ee5da738df11b167991b2663cbf SHA256 51eebc176ec25c46b470ef55f622cb3fcf60fbc2294ec94109cf10c13167f3c1
+MD5 1a83951498f22bf8fb9df3a9c97cd626 files/root-5.16.00-flags.patch 502
+RMD160 758a2b4977dc16f61e51297de855b532e30bf2c6 files/root-5.16.00-flags.patch 502
+SHA256 51eebc176ec25c46b470ef55f622cb3fcf60fbc2294ec94109cf10c13167f3c1 files/root-5.16.00-flags.patch 502
 AUX root-5.16.00-fortran.patch 5076 RMD160 2218584a3a5093a8d4171913a2b024bb759aae03 SHA1 4ed648d54260fd2593174154d8331c5d5afd5f09 SHA256 4ad7a3057528f30716d200c8f1462cf92da6f1ebef9bc3fee1874000bc10deec
 MD5 4d5db674fa620228fe7e50057ac40e95 files/root-5.16.00-fortran.patch 5076
 RMD160 2218584a3a5093a8d4171913a2b024bb759aae03 files/root-5.16.00-fortran.patch 5076
 SHA256 4ad7a3057528f30716d200c8f1462cf92da6f1ebef9bc3fee1874000bc10deec files/root-5.16.00-fortran.patch 5076
+AUX root-5.16.00-postgres.patch 868 RMD160 5a79ae0308968bb579f4ae04eb8067fdb5c1668b SHA1 cf8eef875bd755ccbe827332661a2ce573dfafba SHA256 40e33d371e4cec38f7680a16bf089705ebdd835ef1c06989082508bf2c6dd638
+MD5 f8776c87aa526914625eb55cdcd38f6c files/root-5.16.00-postgres.patch 868
+RMD160 5a79ae0308968bb579f4ae04eb8067fdb5c1668b files/root-5.16.00-postgres.patch 868
+SHA256 40e33d371e4cec38f7680a16bf089705ebdd835ef1c06989082508bf2c6dd638 files/root-5.16.00-postgres.patch 868
+AUX root-5.16.00-xft.patch 687 RMD160 58efbc6efea7970ce267d05998deb8f849ecd5c5 SHA1 19ba24f17846a46d0ca10d0958587bd9166efd6d SHA256 e3540b4cecae6eb9e1c80e7edc923334056d63b4dedfc8bece34d29eec76d0a1
+MD5 7fe0038a72a179c4ca93c5cc93bcad6f files/root-5.16.00-xft.patch 687
+RMD160 58efbc6efea7970ce267d05998deb8f849ecd5c5 files/root-5.16.00-xft.patch 687
+SHA256 e3540b4cecae6eb9e1c80e7edc923334056d63b4dedfc8bece34d29eec76d0a1 files/root-5.16.00-xft.patch 687
 AUX sparc-root-5.16.00.patch 1337 RMD160 182648130788f70df92342042a889e91ba665d24 SHA1 d46dbb7f10e83e5bcde97175ef5df71ea9750140 SHA256 bd3f08a8283e7b0e4b4f5f583fbe448cbc2908e2935e6bcc961085a58d6bbe3a
 MD5 1fbd4e44dbf474dc10c320a1cc076fd6 files/sparc-root-5.16.00.patch 1337
 RMD160 182648130788f70df92342042a889e91ba665d24 files/sparc-root-5.16.00.patch 1337
@@ -18,18 +33,18 @@ EBUILD root-3.05.04.ebuild 1657 RMD160 140ae365418c6b9252c892b76963d17cd8235c8f
 MD5 d1257ceae44d122672696002845f5667 root-3.05.04.ebuild 1657
 RMD160 140ae365418c6b9252c892b76963d17cd8235c8f root-3.05.04.ebuild 1657
 SHA256 1ad7642aaaffa6d272ab5bde1b1c4f53ddadf48098fc97f7b5abfc31c69a264f root-3.05.04.ebuild 1657
-EBUILD root-5.16.00-r1.ebuild 4840 RMD160 87b71fa07fc5af677c5a3720fceff656dc7f016a SHA1 4ee3c6d1cc6f2da68950244480f6ebb519d2a355 SHA256 9a15074fe0ece12e5127e3faeb0bb0534ae6149931f92f993820c1436b16f1e4
-MD5 dd90124e5a4f2438d9425ef6272108ef root-5.16.00-r1.ebuild 4840
-RMD160 87b71fa07fc5af677c5a3720fceff656dc7f016a root-5.16.00-r1.ebuild 4840
-SHA256 9a15074fe0ece12e5127e3faeb0bb0534ae6149931f92f993820c1436b16f1e4 root-5.16.00-r1.ebuild 4840
+EBUILD root-5.16.00-r1.ebuild 5039 RMD160 dafa868330f11b5e0a1ba58eeaff8389bd8757ff SHA1 13674913ec004f3a4a115e3cd965752f7b35b484 SHA256 85c1968371e86a60a3b1acaabb5d9059104bec6a17867ebb935aed558a387f27
+MD5 64ecc4caad26da9abf84b638460ad241 root-5.16.00-r1.ebuild 5039
+RMD160 dafa868330f11b5e0a1ba58eeaff8389bd8757ff root-5.16.00-r1.ebuild 5039
+SHA256 85c1968371e86a60a3b1acaabb5d9059104bec6a17867ebb935aed558a387f27 root-5.16.00-r1.ebuild 5039
 EBUILD root-5.16.00.ebuild 4958 RMD160 04990b1c710a41f838e82bb4954b57d05b929def SHA1 d61b11680d81b2d6f26a9b6b0a1b1efaab5f8bb9 SHA256 96ecabd5853ab5883aa64596470d5b316c4c55af3fdfaddc7bf42fdbd147a657
 MD5 460aec45e5f5d33358a82e5216af95a1 root-5.16.00.ebuild 4958
 RMD160 04990b1c710a41f838e82bb4954b57d05b929def root-5.16.00.ebuild 4958
 SHA256 96ecabd5853ab5883aa64596470d5b316c4c55af3fdfaddc7bf42fdbd147a657 root-5.16.00.ebuild 4958
-MISC ChangeLog 7299 RMD160 8dfd0c1bdd56333b0b3f23c0d9b11d15449e9cb7 SHA1 7c3d8fb64b0776010c8f52a59c29b340f9b7c717 SHA256 b05c5bd7de4d249354e5e0132be3252b7346b3db53941d28ea2679d45d89798d
-MD5 911312279f00326272a3b308b399a479 ChangeLog 7299
-RMD160 8dfd0c1bdd56333b0b3f23c0d9b11d15449e9cb7 ChangeLog 7299
-SHA256 b05c5bd7de4d249354e5e0132be3252b7346b3db53941d28ea2679d45d89798d ChangeLog 7299
+MISC ChangeLog 7717 RMD160 d111dbcbcc576183b34cc403386ba6e38e1b42f5 SHA1 f533a7b14905bab2f10cb6e5e220156bab882f87 SHA256 7ad164f899502a3009cffe7733f4b8303bc31c10428ea16b747d913c79f9a124
+MD5 2d91e359c87929fb113e0869d65ba88a ChangeLog 7717
+RMD160 d111dbcbcc576183b34cc403386ba6e38e1b42f5 ChangeLog 7717
+SHA256 7ad164f899502a3009cffe7733f4b8303bc31c10428ea16b747d913c79f9a124 ChangeLog 7717
 MISC metadata.xml 597 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d SHA1 8fd69478a8a90f6222b1e428961815e0e697905a SHA256 8ae8ab4051e8534ca2df70f81fb999c478b8f1223980c0b366dc0501fa987c6c
 MD5 0aa16bc6128c88a9afdbf32450c6f8de metadata.xml 597
 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d metadata.xml 597
@@ -43,3 +58,10 @@ SHA256 2b7d5a7f6cbd05f99a5f477558c685f569bc053dc287ae46e1c0fea13da0bf44 files/di
 MD5 668dbb87ada7665125ae9410687d7b82 files/digest-root-5.16.00-r1 783
 RMD160 0e1ce56ae701f1415c3858ef898404903a14b715 files/digest-root-5.16.00-r1 783
 SHA256 911789ecbbac211492181d667dc13ce3f59920b5bd23f258b6e0805400273dd8 files/digest-root-5.16.00-r1 783
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHhWIF1ycZbhPLE2ARAr2FAJ9RZ1J7tH2c22W/RmB6tEiG/NGuUACgnd60
+RGRFnMyIaY+N4t0yMdAcH70=
+=QAGz
+-----END PGP SIGNATURE-----
diff --git a/sci-physics/root/files/root-5.16.00-flags.patch b/sci-physics/root/files/root-5.16.00-flags.patch
new file mode 100644
index 000000000000..05bf8e7531f8
--- /dev/null
+++ b/sci-physics/root/files/root-5.16.00-flags.patch
@@ -0,0 +1,13 @@
+--- 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
new file mode 100644
index 000000000000..9e48819fe743
--- /dev/null
+++ b/sci-physics/root/files/root-5.16.00-postgres.patch
@@ -0,0 +1,24 @@
+--- ./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.16.00-xft.patch b/sci-physics/root/files/root-5.16.00-xft.patch
new file mode 100644
index 000000000000..cc0055f5f81a
--- /dev/null
+++ b/sci-physics/root/files/root-5.16.00-xft.patch
@@ -0,0 +1,24 @@
+--- 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/root-5.16.00-r1.ebuild b/sci-physics/root/root-5.16.00-r1.ebuild
index 5868e77b9614..eeeda55ef9b4 100644
--- a/sci-physics/root/root-5.16.00-r1.ebuild
+++ b/sci-physics/root/root-5.16.00-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.2 2007/12/16 17:04:42 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.16.00-r1.ebuild,v 1.3 2008/01/10 00:08:22 bicatali Exp $
 
 inherit versionator flag-o-matic eutils toolchain-funcs qt3 fortran
 
@@ -16,10 +16,10 @@ SLOT="0"
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~sparc ~x86"
 
-IUSE="afs cern doc fftw kerberos ldap mysql odbc postgres
+IUSE="afs cern doc fftw kerberos ldap mysql odbc pch postgres
 	python ruby qt3 ssl truetype xml"
 
-DEPEND="sys-apps/shadow
+RDEPEND="sys-apps/shadow
 	x11-libs/libXpm
 	>=sci-libs/gsl-1.8
 	dev-libs/libpcre
@@ -41,6 +41,9 @@ DEPEND="sys-apps/shadow
 	odbc? ( dev-db/unixODBC )
 	truetype? ( x11-libs/libXft )"
 
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {
@@ -48,11 +51,11 @@ pkg_setup() {
 	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 "You can use the EXTRA_ECONF variable for this."
 	elog "Example, for PYTHIA, you would do: "
-	elog "EXTRA_CONF=\"--enable-pythia --with-pythia-libdir=/usr/$(get_libdir)\" emerge root"
+	elog "EXTRA_ECONF=\"--enable-pythia --with-pythia-libdir=/usr/$(get_libdir)\" emerge root"
 	elog
-	epause 10
+	epause 7
 	if use cern; then
 		FORTRAN="gfortran g77 ifc"
 		fortran_pkg_setup
@@ -66,30 +69,36 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-fortran.patch
 	epatch "${DISTDIR}"/${P}-gcc-4.2.patch.bz2
 	epatch "${FILESDIR}"/${P}-afs.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
+	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
-	# disable-pch: precompiled headers buggy with icc
+	# precompiled headers buggy with icc
+
 
 	./configure ${target} \
 		--prefix=/usr \
@@ -117,7 +126,6 @@ src_compile() {
 		--disable-chirp \
 		--disable-dcache \
 		--disable-globus \
-		--disable-pch \
 		--disable-rfio \
 		--disable-rpath \
 		--disable-sapdb \
@@ -154,7 +162,8 @@ src_compile() {
 		$(use_enable ssl) \
 		$(use_enable truetype xft) \
 		$(use_enable xml) \
-		${EXTRA_CONF} \
+		${myconf} \
+		${EXTRA_ECONF} \
 		|| die "configure failed"
 
 	emake \