public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-physics/root: ChangeLog root-3.05.04.ebuild root-5.16.00-r1.ebuild
@ 2007-12-16  5:05 Markus Dittrich (markusle)
  0 siblings, 0 replies; only message in thread
From: Markus Dittrich (markusle) @ 2007-12-16  5:05 UTC (permalink / raw
  To: gentoo-commits

markusle    07/12/16 05:05:17

  Modified:             ChangeLog root-3.05.04.ebuild
  Added:                root-5.16.00-r1.ebuild
  Log:
  New revision with patch fixing compile failure under gcc-4.2 (see bug #199591). Also removed afs support until compilation problems are fixed.
  (Portage version: 2.1.4_rc9)

Revision  Changes    Path
1.17                 sci-physics/root/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog	9 Dec 2007 17:35:12 -0000	1.16
+++ ChangeLog	16 Dec 2007 05:05:17 -0000	1.17
@@ -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:



1.4                  sci-physics/root/root-3.05.04.ebuild

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

Index: root-3.05.04.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-3.05.04.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- root-3.05.04.ebuild	22 Jul 2007 06:53:29 -0000	1.3
+++ root-3.05.04.ebuild	16 Dec 2007 05:05:17 -0000	1.4
@@ -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 @@
 
 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_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
 }



1.1                  sci-physics/root/root-5.16.00-r1.ebuild

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

Index: root-5.16.00-r1.ebuild
===================================================================
# 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
}



-- 
gentoo-commits@gentoo.org mailing list



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

only message in thread, other threads:[~2007-12-16  5:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-16  5:05 [gentoo-commits] gentoo-x86 commit in sci-physics/root: ChangeLog root-3.05.04.ebuild root-5.16.00-r1.ebuild Markus Dittrich (markusle)

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