New revision with patch fixing compile failure under gcc-4.2 (see bug #199591). Also removed afs support until compilation problems are fixed.

Package-Manager: portage-2.1.4_rc9

5 files changed, 216 insertions, 23 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 9af86e9d5909..ae77aa282b43 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,14 @@
 # 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.16 2007/12/09 17:35:12 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.17 2007/12/16 05:05:17 markusle Exp $
+
+*root-5.16.00-r1 (15 Dec 2007)
+
+  15 Dec 2007; Markus Dittrich <markusle@gentoo.org>
+  +root-5.16.00-r1.ebuild:
+  New revision with patch fixing compile failure under gcc-4.2 
+  (see bug #199591). Also removed afs support until compilation 
+  problems are fixed.
 
   09 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org> -root-4.02.00.ebuild,
   root-5.16.00.ebuild:
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 2b5ec165fdde..c7da275d8f68 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,6 +1,3 @@
------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
@@ -10,20 +7,25 @@ MD5 1fbd4e44dbf474dc10c320a1cc076fd6 files/sparc-root-5.16.00.patch 1337
 RMD160 182648130788f70df92342042a889e91ba665d24 files/sparc-root-5.16.00.patch 1337
 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-5.16.00-gcc-4.2.patch.bz2 18670 RMD160 254e50b4560a3b98dc39dd7a6df431df6935e457 SHA1 1038b64e5d6894bf218c7aea66478b91efd3b096 SHA256 581ac1071a8d5e0c31285ed11e9195a5ffb6577e2746d81d2cc8fadc060656d2
 DIST root_v3.05.04.source.tar.gz 9386408 RMD160 d20b2b5d933d8abf1a3343a9b8886a3ed97f1cfb SHA1 481f2b3a60e0c56be0a61f3e652e7e43c065aeb7 SHA256 ae93c08cfe4dc05c53fade420ac560fff88ec967b2e85b26a7268ef12e1bbe9e
 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-3.05.04.ebuild 1657 RMD160 140ae365418c6b9252c892b76963d17cd8235c8f SHA1 cac3390d76a3dde98b0a5db2f435080ae7efbeb0 SHA256 1ad7642aaaffa6d272ab5bde1b1c4f53ddadf48098fc97f7b5abfc31c69a264f
+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 4775 RMD160 138e56ba1ab2c4627cdfc2e21dc44c094733b2ee SHA1 2a45da537f64596560c592f5aa64e7138d7d7b5e SHA256 3599522ded8a060f19fe7a75aefdf23c4604e08e8281042550bd8b78706d123d
+MD5 1522a4670ebbdc5ebf75c4529fe94b31 root-5.16.00-r1.ebuild 4775
+RMD160 138e56ba1ab2c4627cdfc2e21dc44c094733b2ee root-5.16.00-r1.ebuild 4775
+SHA256 3599522ded8a060f19fe7a75aefdf23c4604e08e8281042550bd8b78706d123d root-5.16.00-r1.ebuild 4775
 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 ChangeLog 7111 RMD160 60ab6ef143d8d10fdc01ce4936f467cd81cb0e14 SHA1 f5998a86202cd7679631b2774fca95bdc16c706d SHA256 29324d1a732058abc2b2c1873e911d3594e51eb1d5ad71f2603ca020b23a77d9
+MD5 967eabb9735e247b28d5fe9fb86ae54c ChangeLog 7111
+RMD160 60ab6ef143d8d10fdc01ce4936f467cd81cb0e14 ChangeLog 7111
+SHA256 29324d1a732058abc2b2c1873e911d3594e51eb1d5ad71f2603ca020b23a77d9 ChangeLog 7111
 MISC metadata.xml 597 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d SHA1 8fd69478a8a90f6222b1e428961815e0e697905a SHA256 8ae8ab4051e8534ca2df70f81fb999c478b8f1223980c0b366dc0501fa987c6c
 MD5 0aa16bc6128c88a9afdbf32450c6f8de metadata.xml 597
 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d metadata.xml 597
@@ -34,10 +36,6 @@ SHA256 67f20e1cc9a5cd846e08a9ac3819f447ebda8c6d7aa8e20ad011db7c63afdac8 files/di
 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-----
+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
diff --git a/sci-physics/root/files/digest-root-5.16.00-r1 b/sci-physics/root/files/digest-root-5.16.00-r1
new file mode 100644
index 000000000000..990027fad6b9
--- /dev/null
+++ b/sci-physics/root/files/digest-root-5.16.00-r1
@@ -0,0 +1,9 @@
+MD5 52332670de3d20f9cd5d7ec5bb87df41 Users_Guide_5_16.pdf 11196352
+RMD160 149c2421b7453273e6e1d849e17b736878ebb316 Users_Guide_5_16.pdf 11196352
+SHA256 c20fb206aa3eff6f3ec034c24483c4ceed04e08a1eef8b117da7956c2f471d34 Users_Guide_5_16.pdf 11196352
+MD5 15de94fc686a6dfda9ff9a1cd5e1f45b root-5.16.00-gcc-4.2.patch.bz2 18670
+RMD160 254e50b4560a3b98dc39dd7a6df431df6935e457 root-5.16.00-gcc-4.2.patch.bz2 18670
+SHA256 581ac1071a8d5e0c31285ed11e9195a5ffb6577e2746d81d2cc8fadc060656d2 root-5.16.00-gcc-4.2.patch.bz2 18670
+MD5 506e9cc17e700c8ccb2b9d97c98bf307 root_v5.16.00.source.tar.gz 22210601
+RMD160 3e9a29e6b899e3fb0986ef8a7b4a162d4933bf47 root_v5.16.00.source.tar.gz 22210601
+SHA256 41a36d9a469c8b86247aca59317fa40371db846555045679e759f7f332a927f8 root_v5.16.00.source.tar.gz 22210601
diff --git a/sci-physics/root/root-3.05.04.ebuild b/sci-physics/root/root-3.05.04.ebuild
index bf36bc6fb5a2..35afedd7c122 100644
--- a/sci-physics/root/root-3.05.04.ebuild
+++ b/sci-physics/root/root-3.05.04.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-3.05.04.ebuild,v 1.3 2007/07/22 06:53:29 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-3.05.04.ebuild,v 1.4 2007/12/16 05:05:17 markusle Exp $
 
 inherit flag-o-matic eutils
 
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	#epatch ${FILESDIR}/root-makefile.patch
 	#epatch ${FILESDIR}/pgsql-no-libpq-int.patch
 }
@@ -64,8 +64,8 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} INSTALL="install" install || die
+	make DESTDIR="${D}" INSTALL="install" install || die
 
 	dodir /etc/env.d
-	echo "LDPATH=/usr/lib/root" > ${D}/etc/env.d/60root
+	echo "LDPATH=/usr/lib/root" > "${D}"/etc/env.d/60root
 }
diff --git a/sci-physics/root/root-5.16.00-r1.ebuild b/sci-physics/root/root-5.16.00-r1.ebuild
new file mode 100644
index 000000000000..64ab3146cb6c
--- /dev/null
+++ b/sci-physics/root/root-5.16.00-r1.ebuild
@@ -0,0 +1,178 @@
+# 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-r1.ebuild,v 1.1 2007/12/16 05:05:17 markusle 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="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 )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	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 )"
+
+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_CONF variable for this."
+	elog "Example, for PYTHIA, you would do: "
+	elog "EXTRA_CONF=\"--enable-pythia --with-pythia-libdir=/usr/$(get_libdir)\" emerge root"
+	elog
+	epause 10
+	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
+	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
+}
+
+src_compile() {
+
+	local target
+	if [[ "$(tc-getCXX)" == icc* ]]; then
+		if use amd64; then
+			target=linuxx8664icc
+		elif use x86; then
+			target=linuxicc
+		fi
+	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
+
+	./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-pch \
+		--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 \
+		--disable-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) \
+		${EXTRA_CONF} \
+		|| die "configure failed"
+
+	emake -j1 \
+		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
+}