many fixes; builds again

6 files changed, 148 insertions, 6 deletions

diff --git a/dev-libs/root/ChangeLog b/dev-libs/root/ChangeLog
index 02012eade7a6..0b326afdc5ad 100644
--- a/dev-libs/root/ChangeLog
+++ b/dev-libs/root/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for dev-libs/root
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/root/ChangeLog,v 1.7 2003/02/12 06:09:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/root/ChangeLog,v 1.8 2003/02/22 10:39:32 kain Exp $
+
+*root-3.03.04-r2 (22 Feb 2003)
+
+  22 Feb 2003; Bryon Roche <kain@kain.org> root-3.03.04-r1.ebuild root-3.03.04-r2.ebuild files/digest-root-3.03.04-r2 files/pgsql-no-libpq-int.patch files/root-makefile.patch :
+  Fixed header include issues with the PostgreSQL api, as well as configuration/compilation issues.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
 *root-3.03.04-r1 (11 Apr 2002)
-  
+
   24 Oct 2002; J.Alberto Suárez López <bass@gentoo.org> root-3.03.04-r1.ebuild
   Typo error in the ebuild appear 'econ' not 'econf'.
   
diff --git a/dev-libs/root/files/digest-root-3.03.04-r2 b/dev-libs/root/files/digest-root-3.03.04-r2
new file mode 100644
index 000000000000..ef93a97a2fdb
--- /dev/null
+++ b/dev-libs/root/files/digest-root-3.03.04-r2
@@ -0,0 +1 @@
+MD5 70edd37d08af7efb281abafd014bd9d4 root_v3.03.04.source.tar.gz 5367020
diff --git a/dev-libs/root/files/pgsql-no-libpq-int.patch b/dev-libs/root/files/pgsql-no-libpq-int.patch
new file mode 100644
index 000000000000..e099d046d3c5
--- /dev/null
+++ b/dev-libs/root/files/pgsql-no-libpq-int.patch
@@ -0,0 +1,10 @@
+--- root/pgsql/inc/TPgSQLResult.h.orig	2003-02-22 04:11:06.000000000 -0600
++++ root/pgsql/inc/TPgSQLResult.h	2003-02-22 04:11:10.000000000 -0600
+@@ -19,7 +19,6 @@
+ #if !defined(__CINT__)
+ #include <sys/time.h>
+ #include <libpq-fe.h>
+-#include <libpq-int.h>
+ #else
+ struct PGresult;
+ #endif
diff --git a/dev-libs/root/files/root-makefile.patch b/dev-libs/root/files/root-makefile.patch
new file mode 100644
index 000000000000..ef53d0de029e
--- /dev/null
+++ b/dev-libs/root/files/root-makefile.patch
@@ -0,0 +1,28 @@
+--- root/config/Makefile.linux.old	2003-02-22 02:30:14.000000000 -0600
++++ root/config/Makefile.linux	2003-02-22 02:31:00.000000000 -0600
+@@ -8,13 +8,13 @@
+ OPT           = -g
+ NOOPT         =
+ else
+-OPT           = -O
++OPT           = 
+ NOOPT         =
+ endif
+ 
+ # Compiler:
+-CXX           = g++
+-CC            = gcc
++CXX           = g++ $(GENTOO_CXXFLAGS)
++CC            = gcc $(GENTOO_CFLAGS)
+ CXXFLAGS      = -pipe -Wall -Woverloaded-virtual -fPIC $(EXTRA_CXXFLAGS)
+ CFLAGS        = -pipe -Wall -fPIC $(EXTRA_CFLAGS)
+ CINTCXXFLAGS  = -pipe -Wall -Woverloaded-virtual -fPIC $(EXTRA_CXXFLAGS) \
+@@ -38,7 +38,7 @@
+ 
+ # Fortran:
+ F77           = g77
+-F77FLAGS      =
++F77FLAGS      = $(GENTOO_CFLAGS)
+ F77LIBS       = -lg2c -lnsl
+ 
+ # Extras
diff --git a/dev-libs/root/root-3.03.04-r1.ebuild b/dev-libs/root/root-3.03.04-r1.ebuild
index ee588fb8ef2d..0d4072a27080 100644
--- a/dev-libs/root/root-3.03.04-r1.ebuild
+++ b/dev-libs/root/root-3.03.04-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/root/root-3.03.04-r1.ebuild,v 1.9 2003/02/13 10:51:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/root/root-3.03.04-r1.ebuild,v 1.10 2003/02/22 10:39:32 kain Exp $
 
 IUSE="mysql postgres opengl"
 
@@ -9,9 +9,12 @@ DESCRIPTION="An Object-Oriented Data Analysis Framework"
 SRC_URI="ftp://root.cern.ch/root/root_v3.03.04.source.tar.gz"
 HOMEPAGE="http://root.cern.ch/"
 
+inherit flag-o-matic
+inherit eutils
+
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc ~ppc"
 
 DEPEND="virtual/x11
 	>=media-libs/xpm-3.4k
@@ -20,8 +23,15 @@ DEPEND="virtual/x11
 	mysql? ( >=dev-db/mysql-3.23.49 )
 	postgres? ( >=dev-db/postgresql-7.1.3-r4 )"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/root-makefile.patch
+	epatch ${FILESDIR}/pgsql-no-libpq-int.patch
+}
 
+src_compile() {
+	
 	use opengl \
 		&& myconf="${myconf} --enable-opengl" \
 		|| myconf="${myconf} --disable-opengl"
@@ -34,8 +44,14 @@ src_compile() {
 		&& myconf="${myconf} --enable-pgsql" \
 		|| myconf="${myconf} --disable-pgsql"
 
-	econf \
+	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 \
diff --git a/dev-libs/root/root-3.03.04-r2.ebuild b/dev-libs/root/root-3.03.04-r2.ebuild
new file mode 100644
index 000000000000..005590a7b1e7
--- /dev/null
+++ b/dev-libs/root/root-3.03.04-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/root/root-3.03.04-r2.ebuild,v 1.1 2003/02/22 10:39:32 kain Exp $
+
+IUSE="mysql postgres opengl"
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="An Object-Oriented Data Analysis Framework"
+SRC_URI="ftp://root.cern.ch/root/root_v3.03.04.source.tar.gz"
+HOMEPAGE="http://root.cern.ch/"
+
+inherit flag-o-matic
+inherit eutils
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 sparc ~ppc"
+
+DEPEND="virtual/x11
+	>=media-libs/xpm-3.4k
+	>=media-libs/freetype-2.0.9
+	opengl? ( virtual/opengl virtual/glu )
+	mysql? ( >=dev-db/mysql-3.23.49 )
+	postgres? ( >=dev-db/postgresql-7.1.3-r4 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/root-makefile.patch
+	epatch ${FILESDIR}/pgsql-no-libpq-int.patch
+}
+
+src_compile() {
+	
+	use opengl \
+		&& myconf="${myconf} --enable-opengl" \
+		|| myconf="${myconf} --disable-opengl"
+
+	use mysql \
+		&& myconf="${myconf} --enable-mysql" \
+		|| myconf="${myconf} --disable-mysql"
+
+	use postgres \
+		&& myconf="${myconf} --enable-pgsql" \
+		|| myconf="${myconf} --disable-pgsql"
+
+	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 \
+		--enable-star \
+		--enable-ttf \
+		--disable-cern \
+		--disable-sapdb \
+		--disable-rfio \
+		--disable-dcache \
+		--disable-srp \
+		--disable-afs \
+		--disable-krb5 \
+		--enable-shadowpw \
+		--disable-pythia \
+		--disable-pythia6 \
+		--disable-venus \
+		--enable-soversion \
+		${myconf} || die "./configure failed"
+	make || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	
+	dodir /etc/env.d
+	echo "LDPATH=/usr/lib/root" > ${D}/etc/env.d/60root
+}