Version bump and little gcc 3.4 patch

6 files changed, 249 insertions, 2 deletions

diff --git a/dev-libs/root/ChangeLog b/dev-libs/root/ChangeLog
index b5b9ba9ceebe..cf5c1eb920a8 100644
--- a/dev-libs/root/ChangeLog
+++ b/dev-libs/root/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/root
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/root/ChangeLog,v 1.15 2004/06/24 23:32:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/root/ChangeLog,v 1.16 2004/07/02 19:17:21 phosphan Exp $
+
+*root-4.00.06a (02 Jul 2004)
+
+  02 Jul 2004; Patrick Kursawe <phosphan@gentoo.org> metadata.xml,
+  root-4.00.06a.ebuild, files/root-4.00.06a-gcc-3.4.patch:
+  Version bump, see bug #55719 - gcc 3.4 patch extracted from "root" CVS.
 
 *root-3.10.02-r1 (15 Jun 2004)
 
diff --git a/dev-libs/root/Manifest b/dev-libs/root/Manifest
index f641725ecac9..2f46cab93c4f 100644
--- a/dev-libs/root/Manifest
+++ b/dev-libs/root/Manifest
@@ -1,9 +1,13 @@
 MD5 9893a8e3cd01c95b9ee82a60761659cf root-3.10.02-r1.ebuild 4745
 MD5 5a28f8a50ce243f5fbeba3d1d2695018 root-3.05.04.ebuild 1613
 MD5 cc509e0ccf736a6d1b4d255d00959d20 root-3.03.04-r2.ebuild 1617
-MD5 6f6ca7358782a5356419a10a8970e6c1 ChangeLog 1941
+MD5 b0bb7e87f069560e14b250406ffc4c57 root-4.00.06a.ebuild 4938
+MD5 48488ed7710d5111413ffed065be608d ChangeLog 2172
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 58ce6f63773b28de747663b7e908e2bb files/root-makefile.patch 742
 MD5 053f8a5dbe37435f2b62ee44c79e9523 files/digest-root-3.05.04 73
 MD5 cb6730d3f0de83973de47c6bf1d82cfa files/digest-root-3.03.04-r2 73
 MD5 1ef2792a1fad865173670aa5942bef6c files/pgsql-no-libpq-int.patch 290
+MD5 20d87dacea92f9c1128048bf8a7e5e32 files/digest-root-4.00.06a 75
 MD5 da92522ba08f8d50e5197b6a9fd7549f files/digest-root-3.10.02-r1 74
+MD5 bd215c79e54b143ed1ecdb7d3e45f10b files/root-4.00.06a-gcc-3.4.patch 2709
diff --git a/dev-libs/root/files/digest-root-4.00.06a b/dev-libs/root/files/digest-root-4.00.06a
new file mode 100644
index 000000000000..377c130309a8
--- /dev/null
+++ b/dev-libs/root/files/digest-root-4.00.06a
@@ -0,0 +1 @@
+MD5 8fec2ea3252dd6bd76f9933665c7142c root_v4.00.06.sourcea.tar.gz 10953070
diff --git a/dev-libs/root/files/root-4.00.06a-gcc-3.4.patch b/dev-libs/root/files/root-4.00.06a-gcc-3.4.patch
new file mode 100644
index 000000000000..de8ee58ece5f
--- /dev/null
+++ b/dev-libs/root/files/root-4.00.06a-gcc-3.4.patch
@@ -0,0 +1,47 @@
+diff -u -r1.17 -r1.18
+--- cint/src/gcc3strm.cxx	2004/04/26 21:50:31	1.17
++++ cint/src/gcc3strm.cxx	2004/07/01 20:02:52	1.18
+@@ -139,7 +139,8 @@
+ }
+ 
+ static int G__G__stream_5_4_0(G__value *result7,G__CONST char *funcname,struct G__param *libp,int hash) {
+-      G__letint(result7,108,(long)((const fpos<mbstate_t>*)(G__getstructoffset()))->operator long());
++   const fpos<mbstate_t>*pos = (const fpos<mbstate_t>*)(G__getstructoffset());
++   G__letint(result7,108,(long)(*pos));
+    return(1 || funcname || hash || result7 || libp) ;
+ }
+ 
+@@ -2023,13 +2024,13 @@
+    return(1 || funcname || hash || result7 || libp) ;
+ }
+ 
+-static int G__G__stream__1_16(G__value *result7,G__CONST char *funcname,struct G__param *libp,int hash) {
+-      {
+-        const ostream& obj=operator<<(*(ostream*)libp->para[0].ref,*(streampos*)libp->para[1].ref);
+-         result7->ref=(long)(&obj); result7->obj.i=(long)(&obj);
+-      }
+-   return(1 || funcname || hash || result7 || libp) ;
+-}
++// static int G__G__stream__1_16(G__value *result7,G__CONST char *funcname,struct G__param *libp,int hash) {
++//       {
++//         const ostream& obj=operator<<(*(ostream*)libp->para[0].ref,*(streampos*)libp->para[1].ref);
++//          result7->ref=(long)(&obj); result7->obj.i=(long)(&obj);
++//       }
++//    return(1 || funcname || hash || result7 || libp) ;
++// }
+ 
+ static int G__G__stream__2_16(G__value *result7,G__CONST char *funcname,struct G__param *libp,int hash) {
+       {
+@@ -3621,9 +3622,9 @@
+    G__memfunc_setup("operator<<",996,G__G__stream__0_16,117,G__get_linked_tagnum(&G__G__streamLN_basic_ostreamlEcharcOchar_traitslEchargRsPgR),G__defined_typename("ostream"),1,2,1,1,0,
+ "u 'basic_ostream<char,char_traits<char> >' 'ostream' 1 - - g - - 0 - -",(char*)NULL
+ ,(void*)NULL,0);
+-   G__memfunc_setup("operator<<",996,G__G__stream__1_16,117,G__get_linked_tagnum(&G__G__streamLN_basic_ostreamlEcharcOchar_traitslEchargRsPgR),G__defined_typename("ostream"),1,2,1,1,0,
+-"u 'basic_ostream<char,char_traits<char> >' 'ostream' 1 - - u 'fpos<mbstate_t>' 'streampos' 11 - -",(char*)NULL
+-,(void*)NULL,0);
++//    G__memfunc_setup("operator<<",996,G__G__stream__1_16,117,G__get_linked_tagnum(&G__G__streamLN_basic_ostreamlEcharcOchar_traitslEchargRsPgR),G__defined_typename("ostream"),1,2,1,1,0,
++// "u 'basic_ostream<char,char_traits<char> >' 'ostream' 1 - - u 'fpos<mbstate_t>' 'streampos' 11 - -",(char*)NULL
++// ,(void*)NULL,0);
+    G__memfunc_setup("operator>>",1000,G__G__stream__2_16,117,G__get_linked_tagnum(&G__G__streamLN_basic_istreamlEcharcOchar_traitslEchargRsPgR),G__defined_typename("istream"),1,2,1,1,0,
+ "u 'basic_istream<char,char_traits<char> >' 'istream' 1 - - c - - 1 - -",(char*)NULL
+ ,(void*)NULL,0);
diff --git a/dev-libs/root/metadata.xml b/dev-libs/root/metadata.xml
new file mode 100644
index 000000000000..b229aec85b8f
--- /dev/null
+++ b/dev-libs/root/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+</pkgmetadata>
diff --git a/dev-libs/root/root-4.00.06a.ebuild b/dev-libs/root/root-4.00.06a.ebuild
new file mode 100644
index 000000000000..e2aed433116c
--- /dev/null
+++ b/dev-libs/root/root-4.00.06a.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/root/root-4.00.06a.ebuild,v 1.1 2004/07/02 19:17:21 phosphan Exp $
+
+inherit flag-o-matic eutils
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="An Object-Oriented Data Analysis Framework"
+MY_VER=${PV%[a-z]}
+MY_PATCH=${PV##"${MY_VER}"}
+SRC_URI="ftp://root.cern.ch/root/root_v${MY_VER}.source${MY_PATCH}.tar.gz"
+HOMEPAGE="http://root.cern.ch/"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86"
+IUSE="mysql postgres opengl afs kerberos ldap qt"
+
+DEPEND="virtual/x11
+	>=media-libs/freetype-2.0.9
+	sys-apps/shadow
+	opengl? ( virtual/opengl virtual/glu )
+	mysql? ( >=dev-db/mysql-3.23.49 )
+	postgres? ( >=dev-db/postgresql-7.1.3-r4 )
+	!amd64? ( afs? ( net-fs/openafs ) )
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap )
+	qt? ( x11-libs/qt )
+	python? ( dev-lang/python )"
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-${PV}-gcc-3.4.patch
+}
+
+src_compile() {
+
+	local myconf
+
+	if [ "x$CERNLIB" = "x" ]
+	then
+		einfo "No support for cernlib, (h/g)2root will not be build."
+		einfo "To install root with cernlib support, use:"
+		einfo "    export CERNLIB=<directory>/lib"
+		einfo "where <directory>/lib contains libpacklib.[so,a] and libkernlib.[so,a]"
+		USECERN="--disable-cern"
+	else
+		if [ -e $CERNLIB/libpacklib.[so,a] -a -e $CERNLIB/libkernlib.[so,a] ]
+		then
+			einfo "Support for cernlib found."
+			USECERN="--enable-cern --with-cern-libdir=$CERNLIB"
+		else
+			einfo "No support for cernlib, (h/g)2root will not be build."
+			einfo "CERNLIB = $CERNLIB has no libpacklib.[so,a] or no libkernlib.[so,a]"
+			USECERN="--disable-cern"
+		fi
+	fi
+	einfo
+	if [ "x$PYTHIA" = "x" ]
+	then
+		einfo "No support for pythia."
+		einfo "To install root with pythia support, use:"
+		einfo "    export PYTHIA=<directory>/lib"
+		einfo "where <directory>/lib contains libPythia.[so,a]"
+		USEPYTHIA="--disable-pythia"
+	else
+		if [ -e $PYTHIA/libPythia.[so,a] ]
+		then
+			einfo "Support for pythia found."
+			USEPYTHIA="--enable-pythia --with-pythia-libdir=$PYTHIA"
+		else
+			einfo "No support for pythia."
+			einfo "PYTHIA = $PYTHIA has no libPythia.[so,a]"
+			USEPYTHIA="--disable-pythia"
+		fi
+	fi
+	einfo
+	if [ "x$PYTHIA6" = "x" ]
+	then
+		einfo "No support for pythia6."
+		einfo "To install root with pythia6 support, use:"
+		einfo "    export PYTHIA6=<directory>/lib"
+		einfo "where <directory>/lib contains libPythia6.[so,a]"
+		USEPYTHIA6="--disable-pythia6"
+	else
+		if [ -e $PYTHIA6/libPythia6.[so,a] ]
+		then
+			einfo "Support for pythia6 found."
+			USEPYTHIA6="--enable-pythia6 --with-pythia6-libdir=$PYTHIA6"
+		else
+			einfo "No support for pythia6."
+			einfo "PYTHIA6 = $PYTHIA6 has no libPythia6.[so,a]"
+			USEPYTHIA6="--disable-pythia6"
+		fi
+	fi
+	einfo
+	if [ "x$VENUS" = "x" ]
+	then
+		einfo "No support for venus."
+		einfo "To install root with venus support, use:"
+		einfo "    export VENUS=<directory>/lib"
+		einfo "where <directory>/lib contains libVenus.[so,a]"
+		USEVENUS="--disable-venus"
+	else
+		if [ -e $VENUS/libVenus.[so,a] ]
+		then
+			einfo "Support for venus found."
+			USEVENUS="--enable-venus --with-venus-libdir=$VENUS"
+		else
+			einfo "No support for venus."
+			einfo "VENUS = $VENUS has no libVenus.[so,a]"
+			USEVENUS="--disable-venus"
+		fi
+	fi
+
+	case $SYSTEM_ARCH in
+		ppc)
+			append-flags "-fsigned-char";;
+	esac
+
+	if ! use amd64; then
+		myconf="${myconf} $(use_enable afs)"
+	else
+		myconf="${myconf} --disable-afs"
+	fi
+
+	./configure linux \
+		--aclocaldir=/usr/share/aclocal/ \
+		--bindir=/usr/bin \
+		--cintincdir=/usr/share/root/cint \
+		--datadir=/usr/share/root \
+		--docdir=/usr/share/doc/${P} \
+		--elispdir=/usr/share/emacs/site-lisp \
+		--etcdir=/etc/root \
+		--fontdir=/usr/share/root/fonts \
+		--iconpath=/usr/share/root/icons \
+		--incdir=/usr/include/root \
+		--libdir=/usr/lib/root \
+		--macrodir=/usr/share/root/macros \
+		--mandir=/usr/share/man/man1 \
+		--prefix=/usr \
+		--proofdir=/usr/share/root/proof \
+		--srcdir=/usr/share/root/src \
+		--testdir=/usr/share/doc/${P}/test \
+		--tutdir=/usr/share/doc/${P}/tutorial \
+		--disable-alien \
+		--disable-asimage \
+		$USECERN \
+		--disable-chirp \
+		--disable-dcache \
+		--disable-exceptions \
+		--disable-explicitlink \
+		--disable-globus \
+		`use_enable kerberos krb5` \
+		`use_enable ldap` \
+		`use_enable mysql` \
+		`use_enable opengl` \
+		--disable-openiv \
+		`use_enable postgres pgsql` \
+		$USEPYTHIA \
+		$USEPYTHIA6 \
+		`use_enable qt` \
+		`use_enable python` \
+		--disable-rfio \
+		--disable-rpath \
+		--disable-sapdb \
+		--enable-shadowpw \
+		--enable-shared \
+		--enable-soversion \
+		--disable-srp \
+		--disable-table \
+		--enable-thread \
+		$USEVENUS \
+		${myconf} || die "configure failed"
+	emake OPT="$CFLAGS" || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} INSTALL="install" install || die "install failed"
+	dodir /etc/env.d
+	echo > ${D}/etc/env.d/99root "LDPATH=\"/usr/lib/root\""
+}