Patch version bump. Also fixed a configure problem when checking for symbol (bug #305279)

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

3 files changed, 322 insertions, 5 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 06f7fafc04ef..c5cbe3c27451 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.60 2010/01/09 17:31:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.61 2010/02/19 06:31:28 bicatali Exp $
+
+*root-5.26.00-r1 (19 Feb 2010)
+
+  19 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  +root-5.26.00-r1.ebuild:
+  Patch version bump. Also fixed a configure problem when checking for
+  symbol (bug #305279)
 
 *root-5.26.00 (09 Jan 2010)
 
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index bd0c0e6932a3..fac04b5bb265 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -19,19 +19,21 @@ DIST root-5.22.00-patches-p03.tar.bz2 83157 RMD160 be7229e25854c46feac225905e73b
 DIST root-5.22.00-patches-p04.tar.bz2 92875 RMD160 c87aa60cf1a68a13705df3da123cb0e7153297db SHA1 c46b0d7c9ba6093870640f349376bb049074c402 SHA256 30578a1bf11769bd47589fae11d3c135fb716c3351093764e722625154723076
 DIST root-5.24.00-patches-p02.tar.bz2 65768 RMD160 9ea486b13a1a749cd2dc01cbbdb3fac70a9c7930 SHA1 65d14bc4ea880d44d1e640d53f2393f3c3b4d8f7 SHA256 f242e0bfa3446e7bdd4669f281653068f87a56234184b29551a5a1f7b13caffa
 DIST root-5.26.00-patches-p01.tar.bz2 5600 RMD160 defe7995358a59b4c7ae260337a87e30ac91bb05 SHA1 2e61202acc7a235862ff6699e404a3723c0de6a0 SHA256 4ce883f167111f1efc3c15b7db26fa40e14cded5598006ac0fa01fa86e817d75
+DIST root-5.26.00-patches-p02.tar.bz2 344035 RMD160 c6fabdcb69dc4f984f5888149a853da952bddfaf SHA1 634e33df654cc2ac5180db80e528510df4770849 SHA256 98d57e64a91e811456b8e2bcae0a618a37632d7e7e2be6fcce64e21f3ce805bc
 DIST root_v5.22.00.source.tar.gz 26320334 RMD160 0fba2518802ce1f737b8cededbf518f0e475ba19 SHA1 b63e09d90ffef973fd487fdc7fc1ed3b26cf6d48 SHA256 9445351905e2b1b546bd6fea9d7397054aa1622a91bbc388014f3706b0843fe2
 DIST root_v5.24.00.source.tar.gz 27387383 RMD160 2f400d69dad1db2cd1e5f96fe4208a5a7b156689 SHA1 8a7d73c069798bb0e075cf31c54dd7feb475cefe SHA256 d4df055276a1a96599e553166efbd11f1f7eb0a2dcf0d892959771705bd1914e
 DIST root_v5.26.00.source.tar.gz 29209345 RMD160 bf7f91abd76ec86f69eb80506291cb8d4f87614e SHA1 318c5adf7f54f8206d9173d2fb0dc196a0e87192 SHA256 5ec86599bf7ef0fe3db11e5dd2d01183484cb199ab3a1c28d68f10b804e93e76
 EBUILD root-5.22.00-r2.ebuild 9200 RMD160 32a3c002c902f7a76aa93be7c75a32f9f296da01 SHA1 07849f8fa039e13c1b8668175f92847c51c19ecd SHA256 823aa5ac0e2f3b267b06bce4c99cd59654b162f184bb01be136e6adc3a1416f7
 EBUILD root-5.22.00-r3.ebuild 9563 RMD160 0c9b4bcfdeff47e510889d46f03481cfee23847b SHA1 255f7fdd6c26a9861124b705799f95f6d6546db9 SHA256 027f0e4ce64bd39194a71fecd39603ed7f478b6d321edf80b6dd5e09c6aa7a46
 EBUILD root-5.24.00-r1.ebuild 9089 RMD160 6b9783c1ad8fabaaeec7452c0a165f6187926685 SHA1 6a152f108a8bd6a5cba5a8670d8e6f5f108d7fa5 SHA256 33470e8b1054fc19003eb8145f98bb95c6e22bca1e13e1e374d20df05be3f614
+EBUILD root-5.26.00-r1.ebuild 9083 RMD160 d0843a832c086fd2782b4de5d0a73a7de11e2c24 SHA1 af6ac290db591cd9cac1957487d72e558d6f709c SHA256 afb6b39bfa10d442bddc28d4a2b1df2357ab8f9ad9b3458a74700ffcd4ce01e9
 EBUILD root-5.26.00.ebuild 9039 RMD160 d965604f644957a948568d2fecc8796a2157b0b3 SHA1 dda1ef680e8ad6f053aad3cddca027f90e1a266c SHA256 40c298d8009da57f33e438581bf0efe2f1b1876bc65d732994f1f24a31eef133
-MISC ChangeLog 18250 RMD160 44c830e2c8152bfd78bd8be9de299d3b27422a6f SHA1 6c267ddc7e2fe411b4914c4b05b5cc68151ecd68 SHA256 7fdfc7dab161e5652250e91262906c5cc974a3f880ad2b77428b3c5d5ebd90c3
+MISC ChangeLog 18459 RMD160 1f4090aa5d95045c4424006e1aaaf26b0fe7c7a3 SHA1 ba40b5cf111496f496d622eb60b36d2c7b057a0b SHA256 a7be898cd9ea3563e93207db9f84ff6f90717148a82baf90f1d5e5b28f5c7960
 MISC metadata.xml 1569 RMD160 dba331cab0e10890d441d667416e43098a764c3f SHA1 38d5cc13c7531ac1ba267f447b2ac84cb9c2e6c4 SHA256 884bc118e850e655cdf52e3f7e8171d8a88d2c6c986fd5d5e49cbd303c18aaa2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktIxgsACgkQ1ycZbhPLE2BvwQCgrmrxB9Eaj6Vy1RGLSl1ySsx2
-CEkAoKDCmM97sdD2bz6+gzqs4OUINEY9
-=NdYW
+iEYEARECAAYFAkt+MEkACgkQ1ycZbhPLE2D1bgCgo/Je8Gyp4y5Qbi8jnZ85AdvJ
+zYkAnjxoONZzcTazCWMGWjZzyMkdPKYI
+=sIMz
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/root/root-5.26.00-r1.ebuild b/sci-physics/root/root-5.26.00-r1.ebuild
new file mode 100644
index 000000000000..48b6f2c27a16
--- /dev/null
+++ b/sci-physics/root/root-5.26.00-r1.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00-r1.ebuild,v 1.1 2010/02/19 06:31:28 bicatali Exp $
+
+EAPI=2
+inherit versionator eutils qt4 elisp-common fdo-mime toolchain-funcs flag-o-matic
+
+DOC_PV=$(get_major_version)_$(get_version_component_range 2)
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4
+PATCH_PV=p02
+
+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 cint7 clarens doc emacs examples fftw geant4 kerberos ldap
+	+math mysql	odbc +opengl openmp oracle postgres pythia6 pythia8 python
+	+reflex	ruby qt4 ssl xft xml xinetd xrootd"
+
+# libafterimage ignored, to check every version
+# see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944
+#	|| ( >=media-libs/libafterimage-1.18 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/glew
+	media-libs/tiff
+	sys-apps/shadow
+	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 ) )
+	opengl? ( virtual/opengl virtual/glu )
+	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 )
+	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
+	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
+	# bug #287178
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P}-svn32375.patch
+	epatch "${WORKDIR}"/${P}-gcc44.patch
+	epatch "${WORKDIR}"/${P}-prop-flags.patch
+	epatch "${WORKDIR}"/${P}-xrootd-prop-flags.patch
+	epatch "${WORKDIR}"/${P}-configure-paths.patch
+	epatch "${WORKDIR}"/${P}-g4root-flags.patch
+
+	# 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=$(tc-getFC) \
+		--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-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-rpath \
+		--enable-asimage \
+		--enable-astiff \
+		--enable-exceptions	\
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--with-afs-shared=yes \
+		$(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 opengl) \
+		$(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 xft) \
+		$(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
+}