public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-physics/root: ChangeLog root-5.18.00d.ebuild root-5.20.00.ebuild root-5.16.00-r1.ebuild root-5.18.00.ebuild
@ 2008-07-08 16:28 Sebastien Fabbro (bicatali)
  0 siblings, 0 replies; only message in thread
From: Sebastien Fabbro (bicatali) @ 2008-07-08 16:28 UTC (permalink / raw
  To: gentoo-commits

bicatali    08/07/08 16:28:18

  Modified:             ChangeLog root-5.18.00d.ebuild
  Added:                root-5.20.00.ebuild
  Removed:              root-5.16.00-r1.ebuild root-5.18.00.ebuild
  Log:
  Version bump, removed some older versions. Still buggy for pre-compiled headers (use flag pch), and could not test properly with oracle flag. Masked for a testing period, see bug #230654
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.28                 sci-physics/root/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/ChangeLog?r1=1.27&r2=1.28

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog	16 Jun 2008 15:05:57 -0000	1.27
+++ ChangeLog	8 Jul 2008 16:28:18 -0000	1.28
@@ -1,6 +1,18 @@
 # 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.27 2008/06/16 15:05:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.28 2008/07/08 16:28:18 bicatali Exp $
+
+*root-5.20.00 (08 Jul 2008)
+
+  08 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/root-5.16.00-afs.patch, -files/root-5.16.00-flags.patch,
+  -files/root-5.16.00-postgres.patch, +files/root-5.20.00-configure.patch,
+  +files/root-5.20.00-pic.patch, -files/root-xrootd-flags.patch,
+  -root-5.16.00-r1.ebuild, -root-5.18.00.ebuild, root-5.18.00d.ebuild,
+  +root-5.20.00.ebuild:
+  Version bump, removed some older versions. Still buggy for pre-compiled
+  headers (use flag pch), xrootd+afs, and could not test properly with
+  oracle flag
 
   16 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
   files/root-5.18.00d-gcc43.patch:



1.2                  sci-physics/root/root-5.18.00d.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-5.18.00d.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-5.18.00d.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-5.18.00d.ebuild?r1=1.1&r2=1.2

Index: root-5.18.00d.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.18.00d.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- root-5.18.00d.ebuild	29 May 2008 18:55:33 -0000	1.1
+++ root-5.18.00d.ebuild	8 Jul 2008 16:28:18 -0000	1.2
@@ -1,6 +1,6 @@
 # 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.00d.ebuild,v 1.1 2008/05/29 18:55:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.18.00d.ebuild,v 1.2 2008/07/08 16:28:18 bicatali Exp $
 
 EAPI="1"
 inherit versionator flag-o-matic eutils toolchain-funcs qt3 qt4 fortran
@@ -14,7 +14,7 @@
 HOMEPAGE="http://root.cern.ch/"
 
 SLOT="0"
-LICENSE="LGPL-2"
+LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 
 IUSE="afs cern doc fftw kerberos ldap +math mysql odbc
@@ -36,7 +36,11 @@
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
 	qt3? ( !qt4? ( $(qt_min_version 3.3.4) ) )
-	qt4? ( || ( >=x11-libs/qt-4.3:4 x11-libs/qt-gui:4 ) )
+	qt4? ( || ( >=x11-libs/qt-4.3:4
+				( x11-libs/qt-gui:4
+				  x11-libs/qt-opengl:4
+				  x11-libs/qt-qt3support:4
+				  x11-libs/qt-xml:4 ) ) )
 	fftw? ( >=sci-libs/fftw-3 )
 	python? ( dev-lang/python )
 	ruby? ( dev-lang/ruby )
@@ -51,7 +55,7 @@
 
 S="${WORKDIR}/${PN}"
 
-QT4_BUILT_WITH_USE_CHECK="qt3support"
+QT4_BUILT_WITH_USE_CHECK="qt3support opengl"
 
 pkg_setup() {
 	elog
@@ -108,6 +112,13 @@
 	else
 		myconf="${myconf} --disable-qt --disable-qtgsi"
 	fi
+	use qt4 && \
+		myconf="${myconf} --with-qt-incdir=/usr/include/qt4" && \
+		myconf="${myconf} --with-qt-libdir=/usr/$(get_libdir)/qt4"
+
+	use qt3 && ! use qt4 && \
+		myconf="${myconf} --with-qt-incdir=/usr/qt/3/include" && \
+		myconf="${myconf} --with-qt-libdir=/usr/qt/3/$(get_libdir)"
 
 	# watch: the configure script is not the standard autotools
 	local docdir=/usr/share/doc/${PF}
@@ -136,7 +147,6 @@
 		${myconf} \
 		$(use_enable afs) \
 		$(use_enable cern) \
-		$(use_enable cint7) \
 		$(use_enable fftw fftw3) \
 		$(use_enable kerberos krb5) \
 		$(use_enable ldap) \



1.1                  sci-physics/root/root-5.20.00.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-5.20.00.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-5.20.00.ebuild?rev=1.1&content-type=text/plain

Index: root-5.20.00.ebuild
===================================================================
# 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.20.00.ebuild,v 1.1 2008/07/08 16:28:18 bicatali Exp $

EAPI=1
inherit versionator flag-o-matic eutils toolchain-funcs 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.1"
KEYWORDS="~amd64 ~hppa ~sparc ~x86"

IUSE="afs cern clarens doc fftw geant4 kerberos ldap +math mysql odbc
	oracle pch postgres python ruby qt4 ssl xml xrootd"

# libafterimage ignored, may be re-install for >=5.20
# see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944
#	|| ( >=media-libs/libafterimage-1.15 x11-wm/afterstep )
RDEPEND="sys-apps/shadow
	dev-libs/libpcre
	x11-libs/libXpm
	x11-libs/libXft
	media-libs/ftgl
	media-libs/libpng
	media-libs/jpeg
	media-libs/giflib
	media-libs/tiff
	virtual/opengl
	virtual/glu
	math? ( >=sci-libs/gsl-1.8 )
	afs? ( >=net-fs/openafs-1.4.7 )
	mysql? ( virtual/mysql )
	postgres? ( virtual/postgresql-server )
	kerberos? ( virtual/krb5 )
	ldap? ( net-nds/openldap )
	qt4? ( || ( >=x11-libs/qt-4.3:4
				( x11-libs/qt-gui:4
				  x11-libs/qt-opengl:4
				  x11-libs/qt-qt3support:4
				  x11-libs/qt-xml:4 ) ) )
	fftw? ( sci-libs/fftw:3.0 )
	python? ( dev-lang/python )
	ruby? ( dev-lang/ruby )
	ssl? ( dev-libs/openssl )
	xml? ( dev-libs/libxml2 )
	geant4? ( sci-physics/geant:4 )
	odbc? ( dev-db/unixODBC )
	oracle? ( dev-db/oracle-instantclient-basic )
	clarens? ( dev-libs/xmlrpc-c )"

DEPEND="${RDEPEND}
	cern? ( dev-lang/cfortran )
	dev-util/pkgconfig"

S="${WORKDIR}/${PN}"

QT4_BUILT_WITH_USE_CHECK="qt3support opengl"

pkg_setup() {
	elog
	elog "You may want to build ROOT with these non Gentoo extra packages:"
	elog "AliEn, castor, Chirp, gfal, gLite, Globus, Monalisa, "
	elog "PYTHIA, PYTHIA6, 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
	epause 5
	if use cern; then
		FORTRAN="gfortran g77 ifc"
		fortran_pkg_setup
	else
		FORTRANC=
		FFLAGS=
	fi
	use qt4 && qt4_pkg_setup
}

src_unpack() {
	unpack ${A}
	cd "${S}"
	epatch "${FILESDIR}"/${P}-configure.patch
	epatch "${FILESDIR}"/${P}-pic.patch
	# use system cfortran
	if use cern; then
		rm -f include/root/cfortran.h
		ln -s /usr/include/cfortran.h include/cfortran.h
	fi
}

src_compile() {

	local target
	if [[ "$(tc-getCXX)" == ic* ]]; then
		if use amd64; then
			target=linuxx8664icc
		elif use x86; then
			target=linuxicc
		fi
	fi

	local myconf
	use postgres && \
		myconf="${myconf} --with-pgsql-incdir=/usr/include/postgresql"

	use qt4 && \
		myconf="${myconf} --with-qt-incdir=/usr/include/qt4" && \
		myconf="${myconf} --with-qt-libdir=/usr/$(get_libdir)/qt4"

	use geant4 && \
		myconf="${myconf} --with-clhep-incdir=/usr/include" && \
		myconf="${myconf} --with-g4-libdir=${G4LIB}"

	# the configure script is not the standard autotools
	./configure \
		${target} \
		--fail-on-missing \
		--prefix=/usr \
		--libdir=/usr/$(get_libdir)/${PN} \
		--docdir=/usr/share/doc/${PF} \
		--with-sys-iconpath=/usr/share/pixmaps \
		--with-f77="${FORTRANC} ${FFLAGS}" \
		--with-cc="$(tc-getCC) ${CFLAGS}" \
		--with-cxx="$(tc-getCXX) ${CXXFLAGS}" \
		--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-memstat \
		--enable-opengl \
		--enable-reflex \
		--enable-shadowpw \
		--enable-shared	\
		--enable-soversion \
		--enable-table \
		${myconf} \
		$(use_enable afs) \
		$(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 pch) \
		$(use_enable postgres pgsql) \
		$(use_enable python) \
		$(use_enable qt4 qt) \
		$(use_enable qt4 qtgsi) \
		$(use_enable ruby) \
		$(use_enable ssl) \
		$(use_enable xml) \
		$(use_enable xrootd) \
		${EXTRA_ECONF} \
		|| die "configure failed"

	emake || die "emake failed"
	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
}



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-07-08 16:28 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-08 16:28 [gentoo-commits] gentoo-x86 commit in sci-physics/root: ChangeLog root-5.18.00d.ebuild root-5.20.00.ebuild root-5.16.00-r1.ebuild root-5.18.00.ebuild Sebastien Fabbro (bicatali)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox