Version bump. Compiles with pic shared libs (via patches). Most earlier patches and problems have been sent upstream.

Package-Manager: portage-2.1.4

6 files changed, 270 insertions, 5 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index a7fc1bb59bd4..02673dbbef36 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-physics/root
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.19 2008/01/10 00:08:22 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.20 2008/01/17 20:58:44 bicatali Exp $
+
+*root-5.18.00 (17 Jan 2008)
+
+  17 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/root-pic.patch, +files/root-xrootd-flags.patch,
+  +root-5.18.00.ebuild:
+  Version bump. Compiles with pic shared libs (via patches). Most earlier
+  patches and problems have been sent upstream.
 
   10 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
   +files/root-5.16.00-flags.patch, +files/root-5.16.00-postgres.patch,
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 4d28d9ddeec2..c34cdf26739a 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-afs.patch 1320 RMD160 76896f12113782f9ee534b6920a1dde53eb09c72 SHA1 052a6113f5c2c4bc786f7f1d567c1990a5791d8b SHA256 04b2e484cad98943487f3691d57d20b923bb0ce5998f28f423f94995a832a9dc
 MD5 f10c6e4f1295312df2d13e3bf25614ad files/root-5.16.00-afs.patch 1320
 RMD160 76896f12113782f9ee534b6920a1dde53eb09c72 files/root-5.16.00-afs.patch 1320
@@ -18,6 +21,14 @@ AUX root-5.16.00-xft.patch 687 RMD160 58efbc6efea7970ce267d05998deb8f849ecd5c5 S
 MD5 7fe0038a72a179c4ca93c5cc93bcad6f files/root-5.16.00-xft.patch 687
 RMD160 58efbc6efea7970ce267d05998deb8f849ecd5c5 files/root-5.16.00-xft.patch 687
 SHA256 e3540b4cecae6eb9e1c80e7edc923334056d63b4dedfc8bece34d29eec76d0a1 files/root-5.16.00-xft.patch 687
+AUX root-pic.patch 1308 RMD160 7cd58a088d5b9b6d8dacf24a4966c0ece8ccc1db SHA1 a173c2c2a354df1b61a9ada4df81aa6784733f21 SHA256 204d8959d544e4b94546444d9a1912099cca90b477227ff85107c1e428fbb374
+MD5 b78f260d76add6465132ce5cef0fe7f0 files/root-pic.patch 1308
+RMD160 7cd58a088d5b9b6d8dacf24a4966c0ece8ccc1db files/root-pic.patch 1308
+SHA256 204d8959d544e4b94546444d9a1912099cca90b477227ff85107c1e428fbb374 files/root-pic.patch 1308
+AUX root-xrootd-flags.patch 436 RMD160 5b4a138b795ebe1030c9dabe7088a12c06e736d9 SHA1 03e500d10a6f530669f0b3d2701770561e87f82e SHA256 311ec777faed99503cbf3b1d942f961ace48a42ae051e94d5f085b96c19c3728
+MD5 2a40ea8ff19dfc30c945999fd502ff4f files/root-xrootd-flags.patch 436
+RMD160 5b4a138b795ebe1030c9dabe7088a12c06e736d9 files/root-xrootd-flags.patch 436
+SHA256 311ec777faed99503cbf3b1d942f961ace48a42ae051e94d5f085b96c19c3728 files/root-xrootd-flags.patch 436
 AUX sparc-root-5.16.00.patch 1337 RMD160 182648130788f70df92342042a889e91ba665d24 SHA1 d46dbb7f10e83e5bcde97175ef5df71ea9750140 SHA256 bd3f08a8283e7b0e4b4f5f583fbe448cbc2908e2935e6bcc961085a58d6bbe3a
 MD5 1fbd4e44dbf474dc10c320a1cc076fd6 files/sparc-root-5.16.00.patch 1337
 RMD160 182648130788f70df92342042a889e91ba665d24 files/sparc-root-5.16.00.patch 1337
@@ -26,6 +37,7 @@ DIST Users_Guide_5_16.pdf 11196352 RMD160 149c2421b7453273e6e1d849e17b736878ebb3
 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
+DIST root_v5.18.00.source.tar.gz 23804036 RMD160 e38e075706102cce5b97c4f0e921cf9ff4a53409 SHA1 4c150e93e25087d7594f1346e330901f97115e6e SHA256 a47ac29a826bd55717e4793806277c15d1e186bae9abe291bd2ff72843c19772
 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
@@ -38,10 +50,14 @@ EBUILD root-5.16.00.ebuild 4958 RMD160 04990b1c710a41f838e82bb4954b57d05b929def
 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 7717 RMD160 d111dbcbcc576183b34cc403386ba6e38e1b42f5 SHA1 f533a7b14905bab2f10cb6e5e220156bab882f87 SHA256 7ad164f899502a3009cffe7733f4b8303bc31c10428ea16b747d913c79f9a124
-MD5 2d91e359c87929fb113e0869d65ba88a ChangeLog 7717
-RMD160 d111dbcbcc576183b34cc403386ba6e38e1b42f5 ChangeLog 7717
-SHA256 7ad164f899502a3009cffe7733f4b8303bc31c10428ea16b747d913c79f9a124 ChangeLog 7717
+EBUILD root-5.18.00.ebuild 4726 RMD160 661a3ef2f5a42178ec47bfe55db975c995840707 SHA1 48f8c9dfb74b1a447702bfe0555d4d633b613b11 SHA256 8e2863a11cdcbdad352a09f9f546b05f8237e34c349a05cc9f545fdbee5c36e4
+MD5 34ce0b525a458f6f7ac2583be6f6a092 root-5.18.00.ebuild 4726
+RMD160 661a3ef2f5a42178ec47bfe55db975c995840707 root-5.18.00.ebuild 4726
+SHA256 8e2863a11cdcbdad352a09f9f546b05f8237e34c349a05cc9f545fdbee5c36e4 root-5.18.00.ebuild 4726
+MISC ChangeLog 8005 RMD160 56d87c8dd4f6b1c8bc16644947531bae26f87d9f SHA1 cd893f53c1ee68782b941142830942f323d73132 SHA256 c4197ef3c257f86275a48fca98e4837046898453af6f956916cb2d715557a6a3
+MD5 c55cfffa5e7e1202ce533b94f8728d8f ChangeLog 8005
+RMD160 56d87c8dd4f6b1c8bc16644947531bae26f87d9f ChangeLog 8005
+SHA256 c4197ef3c257f86275a48fca98e4837046898453af6f956916cb2d715557a6a3 ChangeLog 8005
 MISC metadata.xml 597 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d SHA1 8fd69478a8a90f6222b1e428961815e0e697905a SHA256 8ae8ab4051e8534ca2df70f81fb999c478b8f1223980c0b366dc0501fa987c6c
 MD5 0aa16bc6128c88a9afdbf32450c6f8de metadata.xml 597
 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d metadata.xml 597
@@ -55,3 +71,13 @@ SHA256 2b7d5a7f6cbd05f99a5f477558c685f569bc053dc287ae46e1c0fea13da0bf44 files/di
 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
+MD5 5f2c25f8526e4bbd5d265f9f4a9b4b25 files/digest-root-5.18.00 515
+RMD160 f0b501c976f33c79e334e626dce70e19c337a5c7 files/digest-root-5.18.00 515
+SHA256 8679534cd83957c3a2794c66369bcd225da3f1de9009aca72bdf4cc5558cbbe9 files/digest-root-5.18.00 515
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHj8GQ1ycZbhPLE2ARApzMAJ96ffEyXCYvN2eqdYeth+WXFUC7LgCfXdOp
+ovq0ZddLdnHANpNbjdMim+s=
+=aX9V
+-----END PGP SIGNATURE-----
diff --git a/sci-physics/root/files/digest-root-5.18.00 b/sci-physics/root/files/digest-root-5.18.00
new file mode 100644
index 000000000000..943868a1bc1d
--- /dev/null
+++ b/sci-physics/root/files/digest-root-5.18.00
@@ -0,0 +1,6 @@
+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 0526f0478c829cc5d858462bfbdf2e48 root_v5.18.00.source.tar.gz 23804036
+RMD160 e38e075706102cce5b97c4f0e921cf9ff4a53409 root_v5.18.00.source.tar.gz 23804036
+SHA256 a47ac29a826bd55717e4793806277c15d1e186bae9abe291bd2ff72843c19772 root_v5.18.00.source.tar.gz 23804036
diff --git a/sci-physics/root/files/root-pic.patch b/sci-physics/root/files/root-pic.patch
new file mode 100644
index 000000000000..796ff34530ef
--- /dev/null
+++ b/sci-physics/root/files/root-pic.patch
@@ -0,0 +1,35 @@
+--- configure.orig	2008-01-17 17:11:16.765239211 +0000
++++ configure	2008-01-17 17:38:57.088901480 +0000
+@@ -1539,7 +1539,7 @@
+       if pkg-config --exists ftgl ; then
+ 	  result "ok"
+ 	  ftglincdir=`pkg-config --cflags-only-I ftgl | sed 's/-I//g'`
+-	  ftgllibs=`pkg-config --libs-only-l ftgl | sed s'/-lftgl/-lftgl_pic/'`
++	  ftgllibs=`pkg-config --libs-only-l ftgl`
+ 	  ftgllibdir=`pkg-config --libs-only-L ftgl | sed 's/-L//g'`
+ 	  enable_builtin_ftgl=no
+       else
+@@ -3868,8 +3868,8 @@
+     gslskip=
+     hasmathmore="define"
+     # by default use now static GSL library everywhere
+-    #enable_gsl_shared=$enable_shared"
+-    enable_gsl_shared="no"
++    enable_gsl_shared="$enable_shared"
++    #enable_gsl_shared="no"
+ 
+     check_header "gsl/gsl_version.h" "$gslincdir" $GSL $GSL/include \
+ 	$GSL/api /usr/local/include /usr/include /opt/gsl/include \
+@@ -3955,10 +3955,10 @@
+ 	        # and linker flags
+ 		result "ok"
+ 	        gslflags=`gsl-config --cflags`
+-	        #gsllibs=`gsl-config --libs`
++	        gsllibs=`gsl-config --libs`
+ 		#use static libs
+ 		gslprefix=`gsl-config --prefix`
+-		gsllibs="$gslprefix/lib/libgsl.a $gslprefix/lib/libgslcblas.a"
++		#gsllibs="$gslprefix/lib/libgsl.a $gslprefix/lib/libgslcblas.a"
+ 		gsllibdir=""
+                 gslversion=$gsl_version
+             fi
diff --git a/sci-physics/root/files/root-xrootd-flags.patch b/sci-physics/root/files/root-xrootd-flags.patch
new file mode 100644
index 000000000000..ed4ef22dfa37
--- /dev/null
+++ b/sci-physics/root/files/root-xrootd-flags.patch
@@ -0,0 +1,12 @@
+--- xrootd/Module.mk.orig	2008-01-17 17:16:53.152329508 +0000
++++ xrootd/Module.mk	2008-01-17 17:18:27.318594421 +0000
+@@ -77,6 +77,9 @@
+ 		   gunzip -c $(XROOTDVERS).src.tgz | tar xf -; \
+ 		   etag=`basename $(XROOTDETAG)` ; \
+ 		   touch $$etag ; \
++		   sed  -i \
++			-e 's:$$(CFOP):$$(CFOP) $$(OPTFLAGS):g' \
++			xrootd/config/GNUmake.env.in ; \
+ 		fi)
+ ifeq ($(PLATFORM),win32)
+ 		@(if [ -d $(XROOTDDIRD)/pthreads-win32 ]; then \
diff --git a/sci-physics/root/root-5.18.00.ebuild b/sci-physics/root/root-5.18.00.ebuild
new file mode 100644
index 000000000000..9f699ee7c1a0
--- /dev/null
+++ b/sci-physics/root/root-5.18.00.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.18.00.ebuild,v 1.1 2008/01/17 20:58:44 bicatali Exp $
+
+inherit versionator flag-o-matic eutils toolchain-funcs qt3 qt4 fortran
+
+#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
+DOC_PV=5_16
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+	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="afs cern cint7 doc fftw kerberos ldap mysql odbc pch postgres
+	python ruby qt3 qt4 ssl truetype xml"
+
+RDEPEND="sys-apps/shadow
+	x11-libs/libXpm
+	media-libs/ftgl
+	>=sci-libs/gsl-1.8
+	dev-libs/libpcre
+	virtual/opengl
+	virtual/glu
+	|| ( >=media-libs/libafterimage-1.15 x11-wm/afterstep )
+	afs? ( net-fs/openafs )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	qt3? ( !qt4? ( $(qt_min_version 3.3.4) ) )
+	qt4? ( $(qt_min_version 4.3) )
+	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 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	elog
+	elog "You may want to build ROOT with these non Gentoo extra packages:"
+	elog "AliEn, castor, Chirp, clarens, gfal, Globus, GEANT4, Monalisa, "
+	elog "Oracle, peac, PYTHIA, PYTHIA6, SapDB, SRP, Venus"
+	elog "You can use the EXTRA_ECONF variable for this."
+	elog "Example, for PYTHIA, you would do: "
+	elog "EXTRA_ECONF=\"--enable-pythia --with-pythia-libdir=/usr/$(get_libdir)\" emerge root"
+	elog
+	epause 7
+	if use cern; then
+		FORTRAN="gfortran g77 ifc"
+		fortran_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-5.16.00-xft.patch
+	epatch "${FILESDIR}"/${PN}-pic.patch
+}
+
+src_compile() {
+
+	local target
+	local myconf="--disable-pch"
+	use pch && myconf="--enable-pch"
+	if [[ "$(tc-getCXX)" == icc* ]]; then
+		if use amd64; then
+			target=linuxx8664icc
+		elif use x86; then
+			target=linuxicc
+		fi
+		myconf="--disable-pch"
+	fi
+
+	local myfortran
+	use cern && \
+		myfortran="${FORTRANC} ${FFLAGS}"
+
+	# watch: the configure script is not the standard autotools
+	./configure \
+		${target} \
+		${myconf} \
+		--with-f77="${myfortran}" \
+		--with-cc="$(tc-getCC) ${CFLAGS}" \
+		--with-cxx="$(tc-getCXX) ${CXXFLAGS}" \
+		--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-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--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-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--enable-unuran \
+		--enable-xrootd \
+		$(use_enable cint7) \
+		$(use_enable pch) \
+		$(use_enable 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 qt4 qt) \
+		$(use_enable qt4 qtgsi) \
+		$(use_enable ruby) \
+		$(use_enable ssl) \
+		$(use_enable truetype xft) \
+		$(use_enable xml) \
+		${EXTRA_ECONF} \
+		|| die "configure failed"
+
+	emake || 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
+}