Forced opengl as a dep, since it needs it anyway, added a possible fix for afs support, a die function for a g++ >= 4.2 and now use virtual/mysql instead of dev-db/mysql

Package-Manager: portage-2.1.4_rc8

5 files changed, 39 insertions, 205 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index c1bbf39bf314..9af86e9d5909 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,12 @@
 # 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.15 2007/11/23 16:01:06 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.16 2007/12/09 17:35:12 bicatali Exp $
+
+  09 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org> -root-4.02.00.ebuild,
+  root-5.16.00.ebuild:
+  Forced opengl as a dep, since it needs it anyway, added a possible fix for
+  afs support, a die function for a g++ >= 4.2 and now use virtual/mysql
+  instead of dev-db/mysql
 
   23 Nov 2007; Samuli Suominen <drac@gentoo.org> root-5.16.00.ebuild:
   amd64 stable wrt #196282
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 3aef9d2c5ae2..2b5ec165fdde 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -8,24 +11,19 @@ RMD160 182648130788f70df92342042a889e91ba665d24 files/sparc-root-5.16.00.patch 1
 SHA256 bd3f08a8283e7b0e4b4f5f583fbe448cbc2908e2935e6bcc961085a58d6bbe3a files/sparc-root-5.16.00.patch 1337
 DIST Users_Guide_5_16.pdf 11196352 RMD160 149c2421b7453273e6e1d849e17b736878ebb316 SHA1 b5d4eade69a5b945aa37c182d83d5233c2d54475 SHA256 c20fb206aa3eff6f3ec034c24483c4ceed04e08a1eef8b117da7956c2f471d34
 DIST root_v3.05.04.source.tar.gz 9386408 RMD160 d20b2b5d933d8abf1a3343a9b8886a3ed97f1cfb SHA1 481f2b3a60e0c56be0a61f3e652e7e43c065aeb7 SHA256 ae93c08cfe4dc05c53fade420ac560fff88ec967b2e85b26a7268ef12e1bbe9e
-DIST root_v4.02.00.source.tar.gz 13074632 RMD160 d2ab4f3dd4ae8fe9526aa6e2f1ad23d6b16af42c SHA1 5b1cf9068811898f83057be1a7c9877c291fea24 SHA256 fd4094311c5f3e2566340c00300d6fa681bb27c9d071475d484c4e961bf23dc9
 DIST root_v5.16.00.source.tar.gz 22210601 RMD160 3e9a29e6b899e3fb0986ef8a7b4a162d4933bf47 SHA1 0fcb1aba303b463598373ba44aa38a45279773e3 SHA256 41a36d9a469c8b86247aca59317fa40371db846555045679e759f7f332a927f8
 EBUILD root-3.05.04.ebuild 1652 RMD160 309dcf4de73a0258164fc11da18d0cb2786a1a3e SHA1 7090f9c490937c9681decd917ab3c4023e59a29a SHA256 2cbbaf469d3338395643a3519a65334c74972aaef2381e32b58d45687a4bfb4d
 MD5 27bbe039c2fc29773489a31e2ac14106 root-3.05.04.ebuild 1652
 RMD160 309dcf4de73a0258164fc11da18d0cb2786a1a3e root-3.05.04.ebuild 1652
 SHA256 2cbbaf469d3338395643a3519a65334c74972aaef2381e32b58d45687a4bfb4d root-3.05.04.ebuild 1652
-EBUILD root-4.02.00.ebuild 4897 RMD160 08c42bb4f98a3ad4c8f2e6139c7faba633783362 SHA1 5b463596efcd66cc92f54f96eeb88f2a88f11296 SHA256 2991d0fb21e2700806907a8e22bb39f8dd2a5686b762a9c1260f533fb7053632
-MD5 7aae1fdded351b22d1456f3359c03a10 root-4.02.00.ebuild 4897
-RMD160 08c42bb4f98a3ad4c8f2e6139c7faba633783362 root-4.02.00.ebuild 4897
-SHA256 2991d0fb21e2700806907a8e22bb39f8dd2a5686b762a9c1260f533fb7053632 root-4.02.00.ebuild 4897
-EBUILD root-5.16.00.ebuild 4688 RMD160 889b40b60620af3e2dc31f9c61df445725c540bf SHA1 e981f9ca78661e45b9022cf63f605fab5b11f95e SHA256 dc59891af58e7e47c79078efea7c6632faad07f86baa2e3bbe1bd2cceffb29b2
-MD5 3f3b03b184b12504d956e8809e0befa3 root-5.16.00.ebuild 4688
-RMD160 889b40b60620af3e2dc31f9c61df445725c540bf root-5.16.00.ebuild 4688
-SHA256 dc59891af58e7e47c79078efea7c6632faad07f86baa2e3bbe1bd2cceffb29b2 root-5.16.00.ebuild 4688
-MISC ChangeLog 6566 RMD160 fe5c55ed12804c0aae9d1aeef245db6d307f82a3 SHA1 69a696aff2a7293952e056e8b3de42a09657e6d0 SHA256 7dc38f739a72423730e01d5a48d413a4bc619b27f5ccc1715d38d69890bb969f
-MD5 b11544d8c654970651b3371ced7dbff3 ChangeLog 6566
-RMD160 fe5c55ed12804c0aae9d1aeef245db6d307f82a3 ChangeLog 6566
-SHA256 7dc38f739a72423730e01d5a48d413a4bc619b27f5ccc1715d38d69890bb969f ChangeLog 6566
+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 6847 RMD160 a8ade4cc6a2fd201ef736ee52f0051606d1d3a24 SHA1 32ddad8ab9df8002a4c689c7e030085e2d50440e SHA256 5caf431db759875706d07a76db313c173c6ad1543c9fbc6e535eee810f8dd550
+MD5 832e5ed566a6c13819691eba49a83546 ChangeLog 6847
+RMD160 a8ade4cc6a2fd201ef736ee52f0051606d1d3a24 ChangeLog 6847
+SHA256 5caf431db759875706d07a76db313c173c6ad1543c9fbc6e535eee810f8dd550 ChangeLog 6847
 MISC metadata.xml 597 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d SHA1 8fd69478a8a90f6222b1e428961815e0e697905a SHA256 8ae8ab4051e8534ca2df70f81fb999c478b8f1223980c0b366dc0501fa987c6c
 MD5 0aa16bc6128c88a9afdbf32450c6f8de metadata.xml 597
 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d metadata.xml 597
@@ -33,9 +31,13 @@ SHA256 8ae8ab4051e8534ca2df70f81fb999c478b8f1223980c0b366dc0501fa987c6c metadata
 MD5 6b973b12dd7b650b1ab7d0fd85c852e8 files/digest-root-3.05.04 265
 RMD160 70c54517ab1fd6207c5ab1c567a4d80a52427eb0 files/digest-root-3.05.04 265
 SHA256 67f20e1cc9a5cd846e08a9ac3819f447ebda8c6d7aa8e20ad011db7c63afdac8 files/digest-root-3.05.04 265
-MD5 2692f7a0c0d4a952df55b48c94c88da9 files/digest-root-4.02.00 268
-RMD160 b1ee0399a0b4f19dd8ab17995d9e388a8f08d266 files/digest-root-4.02.00 268
-SHA256 ab4af1c0dccfb80cb26c760547c705a5867657fd5f1bed2515400bb65a06a807 files/digest-root-4.02.00 268
 MD5 e23542521b0bd3627aed6f0369a276d0 files/digest-root-5.16.00 515
 RMD160 9d986f1e299e9f23f51bc3328168b5c60c4cfe16 files/digest-root-5.16.00 515
 SHA256 2b7d5a7f6cbd05f99a5f477558c685f569bc053dc287ae46e1c0fea13da0bf44 files/digest-root-5.16.00 515
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHXCdY1ycZbhPLE2ARAkIqAKCb+8BHN1/ufwpjdYq2dgc2jsDgpQCfawcx
+ng00kpZajrrThoSaKZ5wz5k=
+=GUd1
+-----END PGP SIGNATURE-----
diff --git a/sci-physics/root/files/digest-root-4.02.00 b/sci-physics/root/files/digest-root-4.02.00
deleted file mode 100644
index 35504e37bd8b..000000000000
--- a/sci-physics/root/files/digest-root-4.02.00
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 621c663e11ca4de453e64ee15f3c5ebc root_v4.02.00.source.tar.gz 13074632
-RMD160 d2ab4f3dd4ae8fe9526aa6e2f1ad23d6b16af42c root_v4.02.00.source.tar.gz 13074632
-SHA256 fd4094311c5f3e2566340c00300d6fa681bb27c9d071475d484c4e961bf23dc9 root_v4.02.00.source.tar.gz 13074632
diff --git a/sci-physics/root/root-4.02.00.ebuild b/sci-physics/root/root-4.02.00.ebuild
deleted file mode 100644
index 51656474c619..000000000000
--- a/sci-physics/root/root-4.02.00.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-4.02.00.ebuild,v 1.3 2007/07/22 06:53:29 dberkholz 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 -sparc -ppc"
-IUSE="afs kerberos ldap mysql opengl postgres python qt3"
-
-RDEPEND="x11-libs/libXpm
-	>=media-libs/freetype-2.0.9
-	sys-apps/shadow
-	opengl? ( virtual/opengl virtual/glu )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.1.3-r4 )
-	!amd64? ( afs? ( net-fs/openafs ) )
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	qt3? ( =x11-libs/qt-3* )
-	python? ( dev-lang/python )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-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` \
-		`use_enable postgres pgsql` \
-		$USEPYTHIA \
-		$USEPYTHIA6 \
-		$(use_enable qt3 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\""
-}
diff --git a/sci-physics/root/root-5.16.00.ebuild b/sci-physics/root/root-5.16.00.ebuild
index b7f356c0d16f..940f9a56ac3a 100644
--- a/sci-physics/root/root-5.16.00.ebuild
+++ b/sci-physics/root/root-5.16.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.9 2007/11/23 16:01:06 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.16.00.ebuild,v 1.10 2007/12/09 17:35:12 bicatali Exp $
 
 inherit versionator flag-o-matic eutils toolchain-funcs qt3 fortran
 
@@ -14,16 +14,18 @@ HOMEPAGE="http://root.cern.ch/"
 SLOT="0"
 LICENSE="LGPL-2"
 KEYWORDS="amd64 sparc x86"
-IUSE="afs cern doc fftw kerberos ldap mysql odbc opengl postgres
+
+IUSE="afs cern doc fftw kerberos ldap mysql odbc postgres
 	python ruby qt3 ssl truetype xml"
 
 DEPEND="sys-apps/shadow
 	x11-libs/libXpm
 	>=sci-libs/gsl-1.8
 	dev-libs/libpcre
+	virtual/opengl
+	virtual/glu
 	|| ( media-libs/libafterimage x11-wm/afterstep )
-	opengl? ( virtual/opengl virtual/glu )
-	mysql? ( dev-db/mysql )
+	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
 	afs? ( net-fs/openafs )
 	kerberos? ( virtual/krb5 )
@@ -54,6 +56,12 @@ pkg_setup() {
 		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() {
@@ -79,7 +87,7 @@ src_compile() {
 			target=linuxicc
 		fi
 	fi
-
+	use afs && append-flags -DAFS_OLD_COM_ERR
 	local myfortran
 	use cern && myfortran="F77=${FORTRANC}"
 
@@ -126,6 +134,7 @@ src_compile() {
 		--enable-mathcore \
 		--enable-mathmore \
 		--enable-minuit2 \
+		--enable-opengl \
 		--enable-reflex \
 		--enable-roofit \
 		--enable-shared	\
@@ -140,7 +149,6 @@ src_compile() {
 		$(use_enable ldap) \
 		$(use_enable mysql) \
 		$(use_enable odbc) \
-		$(use_enable opengl) \
 		$(use_enable postgres pgsql) \
 		$(use_enable python) \
 		$(use_enable qt3 qt) \