New patch revision (svn #29183 )from upstream including many bug fixes

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 336 insertions, 2 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index e9a0fccbfc5a..9bb7a6a788be 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.48 2009/06/23 16:35:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.49 2009/06/24 06:58:37 bicatali Exp $
+
+*root-5.22.00-r2 (24 Jun 2009)
+
+  24 Jun 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +root-5.22.00-r2.ebuild:
+  New patch revision (svn #29183 )from upstream including many bug fixes
 
   23 Jun 2009; Jeroen Roovers <jer@gentoo.org> root-5.20.00-r3.ebuild,
   +files/root-5.20.00-defind.patch:
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 49ab5d271176..5bec99e9bf7f 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX olbd.confd 197 RMD160 798de1808502f3e4ecfc5f024b56a419d9824057 SHA1 f2a4385fdf9849eafb1d5457727f6fbe80af1da3 SHA256 5a34da76bbe56cd3b8128f05c0d9900f9d7f7ffdcffc5deeb816c78ea46679ba
 AUX olbd.initd 714 RMD160 e2cc28474a280345f6962f890f5ddb3884d7f69f SHA1 4dcdf7ba35a834db2ac5a5bdfe4d2c31938f0552 SHA256 5d6c1b6e7b40d6842df6a6f7314fa2f49329b820ff86592d2f8d2662a414ec39
 AUX proofd.confd 415 RMD160 3814aacb63d82b9d060086f9bef304d431a15b4e SHA1 31eb7af239a0042f887b5089a7c6c7ec5d6662e9 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38
@@ -21,6 +24,7 @@ DIST Users_Guide_5_20.pdf 9585654 RMD160 9d5b8817f9bf2847b22fe94d003b6c08d2a82d2
 DIST Users_Guide_5_21.pdf 9158092 RMD160 7be83566dea5e9d57ebc96cd54aa6697485c0060 SHA1 68b76412dde018bea20c91312369adc8d302f4a2 SHA256 1dd28c2ceb8acd0cc7a84110367b9091a58ea5ae8d73d1ae85750b5ddaaee385
 DIST root-5.20.00-patches.tar.bz2 8543 RMD160 d78b8dd0fc2aec3b3a5b4a3e81db3dea6292c859 SHA1 ddad0dbd4b580b94941f339e6d254225d65e4fe9 SHA256 9045127c22301a64ce2e2658163727e3dfc750e10eb20b7853821661b026872b
 DIST root-5.22.00-patches-p02.tar.bz2 54610 RMD160 4d6a4c1eca99ed310207791bdba47458893748f7 SHA1 51c9ab7e689afcbc9d3b2acf9b2affb3f4695919 SHA256 5843100102f994a97ab61f3800b043b8b7bd47ce74bb4d2cf9cbb3da2b051f35
+DIST root-5.22.00-patches-p03.tar.bz2 83094 RMD160 b9a2949fcede958d76f5052016d6ab471ecd4e26 SHA1 4449f81455f3ac8fd852dc7847acfa4289bf8d63 SHA256 af17e82c72bc6434ca30a4ba0ab0a14c70ddffc2ec18be4fc0370d200a01850c
 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
 DIST root_v5.20.00.source.tar.gz 25349138 RMD160 daa702dd8729d125f57a4ac3bf35ea1e84c15e22 SHA1 20ab6f3ad974449ad105c3e330a28f80ea310501 SHA256 8286c78d5c9ac10b0d0b93c8ef353f1399b1c034384f0ac4845a4df1efd09a87
@@ -29,5 +33,13 @@ EBUILD root-3.05.04.ebuild 1654 RMD160 7f96255fd29b2fc2f2d30e41aa1e41ac57d24622
 EBUILD root-5.16.00.ebuild 5013 RMD160 596fa91d5aeb62aa1dff05c28506d7c5f5a3fca5 SHA1 6bd6d49c4a94c3ed66a2d080ec34dd7d0910b0a7 SHA256 7257fd10017f5ba8dbe55c61c17e6aa6fc341beafc981216dd09bebd3d55b147
 EBUILD root-5.20.00-r3.ebuild 9006 RMD160 8e69e1b1b7bb275afbb6b505ed7b8bbe6622f5bf SHA1 8d17d76cb68240d627d6520112bab66ae72ec7c0 SHA256 212ba5767c2184139da48a45c57675a0ecd23c5d57260f36d2df76ce774d434b
 EBUILD root-5.22.00-r1.ebuild 9172 RMD160 c38209ecc126b4301f645e8c85f60c0f1934528b SHA1 32e2fab2078852ff71b30292cc6132fd462fccce SHA256 fbdc8fd7c8321a46e83ad5bec859f98bc3ab98eda68d55c6855839ce19ccc745
-MISC ChangeLog 15689 RMD160 baad37a424d4e59a9ea3151679257ef1154980ef SHA1 0c46dbf4f2b489fb7f06c3a4a01a14dd7c14220d SHA256 606d24d1e021ba59b477a099a969bc2ff20b6a53f2d3887ca3b8b4e6c1166724
+EBUILD root-5.22.00-r2.ebuild 9202 RMD160 5f460c4dad67f15fbe7abb61a237ece5eb4e614d SHA1 cc5512b1a7e39c794a6641a44a914f6479adf2a8 SHA256 e4d93431a778ab88bb5071ee04bc16033fa085ceb31ce227974f586e4c5cfef2
+MISC ChangeLog 15882 RMD160 64489de1611a57a32aefaa2e034152448730e596 SHA1 a6bc8b50b6344dfd055a98d3e34ec3f171609168 SHA256 94b26ac026c20672d132d2acc38bcaeabe9b5860da2e722c06f44a07e85f54b6
 MISC metadata.xml 1569 RMD160 dba331cab0e10890d441d667416e43098a764c3f SHA1 38d5cc13c7531ac1ba267f447b2ac84cb9c2e6c4 SHA256 884bc118e850e655cdf52e3f7e8171d8a88d2c6c986fd5d5e49cbd303c18aaa2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iEYEARECAAYFAkpBzqgACgkQ1ycZbhPLE2AVaACgsskgbd2Pe43ogNp5FjZdl5VJ
+RJMAn312ANUE3ms/MdFcSlIaAt/a6M+1
+=gJAQ
+-----END PGP SIGNATURE-----
diff --git a/sci-physics/root/root-5.22.00-r2.ebuild b/sci-physics/root/root-5.22.00-r2.ebuild
new file mode 100644
index 000000000000..7cc59d2e0748
--- /dev/null
+++ b/sci-physics/root/root-5.22.00-r2.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.22.00-r2.ebuild,v 1.1 2009/06/24 06:58:37 bicatali Exp $
+
+EAPI=2
+inherit versionator eutils qt4 fortran elisp-common fdo-mime toolchain-funcs
+
+#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
+DOC_PV=5_21
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4
+PATCH_PV=p03
+
+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}-patches-${PATCH_PV}.tar.bz2
+	doc? ( ftp://root.cern.ch/root/doc/Users_Guide_${DOC_PV}.pdf
+		ftp://root.cern.ch/root/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )"
+
+HOMEPAGE="http://root.cern.ch/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+
+IUSE="afs cern cint7 clarens doc emacs examples fftw geant4 kerberos ldap
+	+math mysql	odbc openmp oracle postgres pythia6 pythia8 python +reflex
+	ruby qt4 ssl xml xinetd xrootd"
+
+# libafterimage ignored, to check every version
+# see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944
+#	|| ( >=media-libs/libafterimage-1.15 x11-wm/afterstep )
+CDEPEND=">=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	>=media-libs/ftgl-2.1.3_rc5
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/giflib
+	media-libs/tiff
+	sys-apps/shadow
+	virtual/opengl
+	virtual/glu
+	x11-libs/libXpm
+	x11-libs/libXft
+	afs? ( >=net-fs/openafs-1.4.7 )
+	clarens? ( dev-libs/xmlrpc-c )
+	emacs? ( virtual/emacs )
+	fftw? ( sci-libs/fftw:3.0 )
+	geant4? ( sci-physics/geant:4 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	math? ( >=sci-libs/gsl-1.8 )
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( virtual/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	python? ( dev-lang/python )
+	qt4? ( || ( ( x11-libs/qt-gui:4
+				  x11-libs/qt-opengl:4
+				  x11-libs/qt-qt3support:4
+				  x11-libs/qt-xmlpatterns:4 )
+			x11-libs/qt:4[qt3support,opengl] ) )
+	ruby? ( dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	xinetd? ( sys-apps/xinetd )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	elog
+	elog "You may want to build ROOT with these non Gentoo extra packages:"
+	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
+	elog
+	if use cern; then
+		FORTRAN="gfortran g77 ifc"
+		fortran_pkg_setup
+	else
+		unset F77
+	fi
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	if use openmp &&
+		[[ $(tc-getCC)$ == *gcc* ]] &&
+		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
+			! built_with_use sys-devel/gcc openmp ); then
+		ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
+		ewarn "If you want to build this package with OpenMP, abort now,"
+		ewarn "and set CC to an OpenMP capable compiler"
+		epause 5
+	elif use openmp; then
+		export USE_OPENMP=1
+		use math && export USE_PARALLEL_MINUIT2=1
+	fi
+}
+
+src_prepare() {
+	cd "${WORKDIR}"
+	epatch "${WORKDIR}"/${P}-svn29183.patch
+	epatch "${WORKDIR}"/${P}-cint7-libdir.patch
+	epatch "${WORKDIR}"/${P}-prop-flags.patch
+	epatch "${WORKDIR}"/${P}-as-needed.patch
+	epatch "${WORKDIR}"/${P}-xrootd-shared.patch
+	epatch "${WORKDIR}"/${P}-xrootd-prop-flags.patch
+	epatch "${WORKDIR}"/${P}-configure-paths.patch
+	cd "${S}"
+
+	# use system cfortran
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
+
+	# take a more descriptive name for ruby libs
+	sed -i \
+		-e 's/libRuby/libRubyROOT/g' \
+		bindings/ruby/Module.mk bindings/ruby/src/drr.cxx \
+		|| die "ajusting ruby libname failed"
+
+	# in gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif, and libftgl_pic is libftgl
+	sed -i \
+		-e 's/libPythia6/libpythia6/g' \
+		-e 's/ungif/gif/g' \
+		-e 's/ftgl_pic/ftgl/g' \
+		configure || die "adjusting library names failed"
+
+	# libafterimage flags are hardcoded
+	sed -i \
+		-e 's/CFLAGS="-O3"//' \
+		-e 's/CFLAGS=$$ACFLAGS//' \
+		graf2d/asimage/Module.mk graf2d/asimage/src/libAfterImage/configure \
+		|| die "flag propagation in libafterimage failed"
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+}
+
+src_configure() {
+	# the configure script is not the standard autotools
+	./configure \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=${FORTRANC} \
+		--fail-on-missing \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--docdir=/usr/share/doc/${PF} \
+		--tutdir=/usr/share/doc/${PF}/examples/tutorials \
+		--testdir=/usr/share/doc/${PF}/examples/tests \
+		--with-sys-iconpath=/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-rpath \
+		--enable-asimage \
+		--enable-astiff \
+		--enable-exceptions	\
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-opengl \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--enable-xft \
+		$(use_enable afs) \
+		$(use_enable cint7) \
+		$(use_enable clarens) \
+		$(use_enable clarens peac) \
+		$(use_enable fftw fftw3) \
+		$(use_enable geant4 g4root) \
+		$(use_enable kerberos krb5) \
+		$(use_enable ldap) \
+		$(use_enable math gsl-shared) \
+		$(use_enable math genvector) \
+		$(use_enable math mathmore) \
+		$(use_enable math minuit2) \
+		$(use_enable math roofit) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable postgres pgsql) \
+		$(use_enable pythia6) \
+		$(use_enable pythia8) \
+		$(use_enable python) \
+		$(use_enable qt4 qt) \
+		$(use_enable qt4 qtgsi) \
+		$(use_enable reflex cintex) \
+		$(use_enable reflex) \
+		$(use_enable ruby) \
+		$(use_enable ssl) \
+		$(use_enable xml) \
+		$(use_enable xrootd) \
+		${EXTRA_ECONF} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake OPT="" || die "emake failed"
+	emake cintdlls || die "emake cintdlls failed"
+	if use emacs; then
+		elisp-compile build/misc/*.el || die "elisp-compile failed"
+	fi
+}
+
+doc_install() {
+	cd "${S}"
+	if use doc; then
+		einfo "Installing user's guides"
+		insinto /usr/share/doc/${PF}
+		doins \
+			"${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide_v${TMVA_DOC_PV}.pdf \
+			|| die "pdf install failed"
+		if use math; then
+			doins "${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+				|| die "math doc install failed"
+		fi
+	fi
+
+	if use examples; then
+		# these should really be taken care of by the root make install
+		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
+		doins -r tmva/test || die
+	else
+		rm -rf "${D}"/usr/share/doc/${PF}/examples
+	fi
+}
+
+daemon_install() {
+	cd "${S}"
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	use xrootd && daemons="${daemons} xrootd olbd"
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins etc/daemons/{rootd,proofd}.xinetd || die
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	sed -e 's,@prefix@,/usr,' \
+		build/package/debian/root-system-bin.desktop.in > root.desktop
+	domenu root.desktop
+	doicon "${S}"/build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	echo "LDPATH=/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=/usr" >> 99root
+	use python && echo "PYTHONPATH=/usr/$(get_libdir)/root" >> 99root
+	use ruby && echo "RUBYLIB=/usr/$(get_libdir)/root" >> 99root
+	doenvd 99root || die "doenvd failed"
+
+	# The build system installs Emacs support unconditionally and in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -rf "${D}"/usr/share/emacs
+	if use emacs; then
+		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
+	fi
+
+	doc_install
+	daemon_install
+	desktop_install
+
+	# Cleanup of files either already distributed or unused on Gentoo
+	rm "${D}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
+	rm "${D}"usr/share/root/fonts/LICENSE
+	pushd "${D}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
+	rm -f posix/mktypes dll_stl/setup \
+		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o
+	rm -f "${D}"usr/$(get_libdir)/root/cint/cint/include/makehpib
+	rm -f "${D}"/etc/root/proof/*.sample
+	rm -rf "${D}"/etc/root/daemons
+	popd > /dev/null
+}
+
+pkg_postinst() {
+	use ruby && elog "ROOT Ruby  module is available as libRubyROOT"
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}