public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2011-03-07 12:01 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2011-03-07 12:01 UTC (permalink / raw
  To: gentoo-commits

commit:     51ce035ee6b3dcd8ec7caa0f942a8a2aff646220
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  7 11:43:39 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 11:43:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=51ce035e

Correct Slots for gtk 3 introduction to tree

(Portage version: 2.2.0_alpha26/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-physics/root/ChangeLog           |    3 +++
 sci-physics/root/root-5.28.00.ebuild |   19 ++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 705def0..d495c04 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.73 2010/07/10 19:05:23 armin76 Exp $
 
+  07 Mar 2011; Justin Lecher <jlec@gentoo.org> root-5.28.00.ebuild:
+  Correct Slots for gtk 3 introduction to tree
+
   08 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org> root-5.28.00.ebuild,
   files/root-5.28.00-xrootd-prop-flags.patch:
   Respect more LDFLAGS. Go back to old style python and ruby modules, multiple

diff --git a/sci-physics/root/root-5.28.00.ebuild b/sci-physics/root/root-5.28.00.ebuild
index 88fbd41..f460567 100644
--- a/sci-physics/root/root-5.28.00.ebuild
+++ b/sci-physics/root/root-5.28.00.ebuild
@@ -3,7 +3,9 @@
 # $Header: $
 
 EAPI=3
+
 PYTHON_DEPEND="python? 2"
+
 inherit versionator eutils elisp-common fdo-mime python toolchain-funcs flag-o-matic
 
 #DOC_PV=$(get_major_version)_$(get_version_component_range 2)
@@ -13,7 +15,8 @@ TMVA_DOC_PV=4.03
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+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
 		ftp://root.cern.ch/root/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
@@ -29,7 +32,8 @@ IUSE="afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
 # 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
+CDEPEND="
+	>=dev-lang/cfortran-4.4-r2
 	dev-libs/libpcre
 	media-libs/ftgl
 	media-libs/giflib
@@ -61,17 +65,18 @@ CDEPEND=">=dev-lang/cfortran-4.4-r2
 	postgres? ( dev-db/postgresql-base )
 	pythia6? ( sci-physics/pythia:6 )
 	pythia8? ( sci-physics/pythia:8 )
-	qt4? ( x11-libs/qt-gui:4
+	qt4? (
+		x11-libs/qt-gui:4
 		x11-libs/qt-opengl:4
 		x11-libs/qt-qt3support:4
 		x11-libs/qt-svg:4
 		x11-libs/qt-webkit:4
 		x11-libs/qt-xmlpatterns:4 )
-	ruby? ( dev-lang/ruby
-			dev-ruby/rubygems )
+	ruby? (
+		dev-lang/ruby
+		dev-ruby/rubygems )
 	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )"
-
+	xml? ( dev-libs/libxml2:2 )"
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig"
 



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2011-08-02 21:58 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2011-08-02 21:58 UTC (permalink / raw
  To: gentoo-commits

commit:     6fc06f9a531dbfab9438427b1c7aabcd71ab9cf9
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue Aug  2 21:58:26 2011 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue Aug  2 21:58:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6fc06f9a

Fix commiter information in the ChangeLog

(Portage version: 2.2.0_alpha47/git/Linux i686, unsigned Manifest commit)

---
 sci-physics/root/ChangeLog |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 0a930ca..cda314e 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -4,10 +4,11 @@
 
 *root-5.30.00 (02 Aug 2011)
 
-  02 Aug 2011; <andrew@gentoo.org> +files/root-5.28.00b-asneeded.patch,
-  +files/root-5.28.00b-glibc212.patch, +files/root-5.28.00b-prop-ldflags.patch,
-  +files/root-5.28.00b-unuran.patch, +root-5.30.00.ebuild,
-  +files/root-5.30.00-lzma.patch, +files/root-5.30.00-nobyte-compile.patch,
+  02 Aug 2011; Andrew Savchenko <bircoph@gmail.com> 
+  +files/root-5.28.00b-asneeded.patch, +files/root-5.28.00b-glibc212.patch,
+  +files/root-5.28.00b-prop-ldflags.patch, +files/root-5.28.00b-unuran.patch,
+  +root-5.30.00.ebuild, +files/root-5.30.00-lzma.patch,
+  +files/root-5.30.00-nobyte-compile.patch,
   +files/root-5.30.00-xrootd-prop-flags.patch, +files/olbd.confd,
   +files/olbd.initd, +files/proofd.confd, +files/proofd.initd,
   +files/rootd.confd, +files/rootd.initd, +files/xrootd.confd,



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2011-08-02 22:30 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2011-08-02 22:30 UTC (permalink / raw
  To: gentoo-commits

commit:     9779664bcd17fe85e323a003115dbe4b998a055c
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue Aug  2 22:30:00 2011 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue Aug  2 22:30:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9779664b

Use rpath if prefix is enabled.

(Portage version: 2.2.0_alpha50/git/Linux i686, unsigned Manifest commit)

---
 sci-physics/root/ChangeLog           |    3 +++
 sci-physics/root/root-5.30.00.ebuild |    8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index cda314e..91b9580 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Aug 2011; Andrew Savchenko <bircoph@gmail.com> root-5.30.00.ebuild:
+  Enable rpath if prefix is used, see bug 346933.
+
 *root-5.30.00 (02 Aug 2011)
 
   02 Aug 2011; Andrew Savchenko <bircoph@gmail.com> 

diff --git a/sci-physics/root/root-5.30.00.ebuild b/sci-physics/root/root-5.30.00.ebuild
index a4c4bf8..f802d13 100644
--- a/sci-physics/root/root-5.30.00.ebuild
+++ b/sci-physics/root/root-5.30.00.ebuild
@@ -22,10 +22,10 @@ SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres pythia6
-	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
+	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
+	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
 
 CDEPEND="app-arch/xz-utils
 	>=dev-lang/cfortran-4.4-r2
@@ -182,7 +182,6 @@ src_configure() {
 		--disable-builtin-pcre \
 		--disable-builtin-zlib \
 		--disable-builtin-lzma \
-		--disable-rpath \
 		--enable-astiff \
 		--enable-exceptions	\
 		--enable-explicitlink \
@@ -218,6 +217,7 @@ src_configure() {
 		$(use_enable odbc) \
 		$(use_enable opengl) \
 		$(use_enable postgres pgsql) \
+		$(use_enable prefix rpath) \
 		$(use_enable pythia6) \
 		$(use_enable pythia8) \
 		$(use_enable python) \



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2011-08-24 10:43 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2011-08-24 10:43 UTC (permalink / raw
  To: gentoo-commits

commit:     77f838cc891a4536b4517b1c63f3f1bf7a4e8d27
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Aug 24 10:33:01 2011 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Aug 24 10:33:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=77f838cc

sci-physics/root: version bump

Patch release 5.30/01.

(Portage version: 2.2.0_alpha51/git/Linux i686, unsigned Manifest commit)

---
 sci-physics/root/ChangeLog           |    6 +
 sci-physics/root/root-5.30.01.ebuild |  339 ++++++++++++++++++++++++++++++++++
 2 files changed, 345 insertions(+), 0 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 91b9580..14c6a61 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-5.30.01 (24 Aug 2011)
+
+  24 Aug 2011; Andrew Savchenko <bircoph@gmail.com> +root-5.30.01.ebuild:
+  Version bump for patch release.
+  lzma build was fixed upstream.
+
   02 Aug 2011; Andrew Savchenko <bircoph@gmail.com> root-5.30.00.ebuild:
   Enable rpath if prefix is used, see bug 346933.
 

diff --git a/sci-physics/root/root-5.30.01.ebuild b/sci-physics/root/root-5.30.01.ebuild
new file mode 100644
index 0000000..452c573
--- /dev/null
+++ b/sci-physics/root/root-5.30.01.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.3 2011/06/21 14:31:50 jlec Exp $
+
+EAPI=3
+PYTHON_DEPEND="python? 2"
+inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
+
+#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
+DOC_PV=5_26
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+PATCH_PV2=5.30.00
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
+	math? (
+		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
+	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
+	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
+
+CDEPEND="app-arch/xz-utils
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-libs/freetype
+	media-libs/giflib
+	media-libs/libpng
+	media-libs/tiff
+	sys-apps/shadow
+	sys-libs/zlib
+	virtual/jpeg
+	X? (
+		media-libs/ftgl
+		media-libs/glew
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+		qt4? ( x11-libs/qt-gui:4
+			x11-libs/qt-opengl:4
+			x11-libs/qt-qt3support:4
+			x11-libs/qt-svg:4
+			x11-libs/qt-webkit:4
+			x11-libs/qt-xmlpatterns:4 )
+		xft? ( x11-libs/libXft ) )
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi )
+	clarens? ( dev-libs/xmlrpc-c )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio )
+	fftw? ( sci-libs/fftw:3.0 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	llvm? ( sys-devel/llvm )
+	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	mysql? ( virtual/mysql )
+	ncurses? ( sys-libs/ncurses )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	ruby? ( dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="
+	virtual/fortran
+${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	elog
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "HDFS, 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 math; then
+		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-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"
+		elif use openmp; then
+			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-xrootd-prop-flags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
+	rm -rf graf2d/asimage/src/libAfterImage
+	rm -rf graf3d/ftgl/{inc,src}
+	rm -rf graf2d/freetype/src
+	rm -rf graf3d/glew/{inc,src}
+	rm -rf core/pcre/src
+	rm -rf math/unuran/src/unuran-*.tar.gz
+	find core/zip -type f -name "[a-z]*" | xargs rm
+	rm -rf core/lzma/src/*.tar.gz
+	rm graf3d/gl/{inc,src}/gl2ps.*
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
+
+	# TODO: unbundle xrootd as a new package
+	#rm -rf net/xrootd/src
+	#sed -i \
+	#	-e 's:-lXrdOuc:-lXrd &:' \
+	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
+	#	proof/proofd/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINC:$ODBCINC /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure 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 \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-builtin-lzma \
+		--enable-astiff \
+		--enable-exceptions	\
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		--with-afs-shared=yes \
+		$(use_enable X x11) \
+		$(use_enable X asimage) \
+		$(use_enable afs) \
+		$(use_enable avahi bonjour) \
+		$(use_enable clarens) \
+		$(use_enable clarens peac) \
+		$(use_enable ncurses editline) \
+		$(use_enable fits fitsio) \
+		$(use_enable fftw fftw3) \
+		$(use_enable graphviz gviz) \
+		$(use_enable kerberos krb5) \
+		$(use_enable ldap) \
+		$(use_enable llvm cling) \
+		$(use_enable math gsl-shared) \
+		$(use_enable math genvector) \
+		$(use_enable math mathmore) \
+		$(use_enable math minuit2) \
+		$(use_enable math roofit) \
+		$(use_enable math tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable postgres pgsql) \
+		$(use_enable prefix rpath) \
+		$(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="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake 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"
+		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	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
+	else
+		rm -rf "${ED}"/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
+	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=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	use ruby && echo "RUBYLIB=${EPREFIX}/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 "${ED}"/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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
+	rm "${ED}"usr/share/root/fonts/LICENSE
+	pushd "${ED}"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 "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
+	rm -f "${ED}"/etc/root/proof/*.sample
+	rm -rf "${ED}"/etc/root/daemons
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_optimize /usr/$(get_libdir)/root
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_cleanup /usr/$(get_libdir)/root
+}



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2011-10-03  0:15 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2011-10-03  0:15 UTC (permalink / raw
  To: gentoo-commits

commit:     b19f6c67c55197d023d33c5f2b4378105b98cfbd
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Mon Oct  3 00:14:20 2011 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Mon Oct  3 00:14:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b19f6c67

sci-physics/root: version bump to 5.30.02

Patch release 5.30.02 is released.

(Portage version: 2.2.0_alpha60/git/Linux i686, unsigned Manifest commit)

---
 sci-physics/root/ChangeLog           |    5 +
 sci-physics/root/root-5.30.02.ebuild |  339 ++++++++++++++++++++++++++++++++++
 2 files changed, 344 insertions(+), 0 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 14c6a61..77b72ad 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-5.30.02 (03 Oct 2011)
+
+  03 Oct 2011; Andrew Savchenko <bircoph@gmail.com> +root-5.30.02.ebuild:
+  Version bump for patch release.
+
 *root-5.30.01 (24 Aug 2011)
 
   24 Aug 2011; Andrew Savchenko <bircoph@gmail.com> +root-5.30.01.ebuild:

diff --git a/sci-physics/root/root-5.30.02.ebuild b/sci-physics/root/root-5.30.02.ebuild
new file mode 100644
index 0000000..452c573
--- /dev/null
+++ b/sci-physics/root/root-5.30.02.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.3 2011/06/21 14:31:50 jlec Exp $
+
+EAPI=3
+PYTHON_DEPEND="python? 2"
+inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
+
+#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
+DOC_PV=5_26
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+PATCH_PV2=5.30.00
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
+	math? (
+		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
+	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
+	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
+
+CDEPEND="app-arch/xz-utils
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-libs/freetype
+	media-libs/giflib
+	media-libs/libpng
+	media-libs/tiff
+	sys-apps/shadow
+	sys-libs/zlib
+	virtual/jpeg
+	X? (
+		media-libs/ftgl
+		media-libs/glew
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+		qt4? ( x11-libs/qt-gui:4
+			x11-libs/qt-opengl:4
+			x11-libs/qt-qt3support:4
+			x11-libs/qt-svg:4
+			x11-libs/qt-webkit:4
+			x11-libs/qt-xmlpatterns:4 )
+		xft? ( x11-libs/libXft ) )
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi )
+	clarens? ( dev-libs/xmlrpc-c )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio )
+	fftw? ( sci-libs/fftw:3.0 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	llvm? ( sys-devel/llvm )
+	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	mysql? ( virtual/mysql )
+	ncurses? ( sys-libs/ncurses )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	ruby? ( dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="
+	virtual/fortran
+${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	elog
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "HDFS, 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 math; then
+		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-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"
+		elif use openmp; then
+			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-xrootd-prop-flags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
+	rm -rf graf2d/asimage/src/libAfterImage
+	rm -rf graf3d/ftgl/{inc,src}
+	rm -rf graf2d/freetype/src
+	rm -rf graf3d/glew/{inc,src}
+	rm -rf core/pcre/src
+	rm -rf math/unuran/src/unuran-*.tar.gz
+	find core/zip -type f -name "[a-z]*" | xargs rm
+	rm -rf core/lzma/src/*.tar.gz
+	rm graf3d/gl/{inc,src}/gl2ps.*
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
+
+	# TODO: unbundle xrootd as a new package
+	#rm -rf net/xrootd/src
+	#sed -i \
+	#	-e 's:-lXrdOuc:-lXrd &:' \
+	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
+	#	proof/proofd/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINC:$ODBCINC /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure 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 \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-builtin-lzma \
+		--enable-astiff \
+		--enable-exceptions	\
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		--with-afs-shared=yes \
+		$(use_enable X x11) \
+		$(use_enable X asimage) \
+		$(use_enable afs) \
+		$(use_enable avahi bonjour) \
+		$(use_enable clarens) \
+		$(use_enable clarens peac) \
+		$(use_enable ncurses editline) \
+		$(use_enable fits fitsio) \
+		$(use_enable fftw fftw3) \
+		$(use_enable graphviz gviz) \
+		$(use_enable kerberos krb5) \
+		$(use_enable ldap) \
+		$(use_enable llvm cling) \
+		$(use_enable math gsl-shared) \
+		$(use_enable math genvector) \
+		$(use_enable math mathmore) \
+		$(use_enable math minuit2) \
+		$(use_enable math roofit) \
+		$(use_enable math tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable postgres pgsql) \
+		$(use_enable prefix rpath) \
+		$(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="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake 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"
+		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	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
+	else
+		rm -rf "${ED}"/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
+	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=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	use ruby && echo "RUBYLIB=${EPREFIX}/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 "${ED}"/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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
+	rm "${ED}"usr/share/root/fonts/LICENSE
+	pushd "${ED}"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 "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
+	rm -f "${ED}"/etc/root/proof/*.sample
+	rm -rf "${ED}"/etc/root/daemons
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_optimize /usr/$(get_libdir)/root
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_cleanup /usr/$(get_libdir)/root
+}



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2011-10-21 12:36 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2011-10-21 12:36 UTC (permalink / raw
  To: gentoo-commits

commit:     4093b729b87f6fefa1fb05fb42b3709ebf385894
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Oct 21 12:31:06 2011 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Oct 21 12:31:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4093b729

sci-physics/root: update to 5.30.03

Update production version with new patch release.

---
 sci-physics/root/ChangeLog           |    5 +
 sci-physics/root/root-5.30.03.ebuild |  339 ++++++++++++++++++++++++++++++++++
 2 files changed, 344 insertions(+), 0 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index e5d0e09..34d5d7b 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-5.30.03 (21 Oct 2011)
+
+  21 Oct 2011; Andrew Savchenko <bircoph@gmail.com> +root-5.30.03.ebuild:
+  Version bump for 5.30.03 production patch release.
+
 *root-5.28.00g (07 Oct 2011)
 
   07 Oct 2011; Andrew Savchenko <bircoph@gmail.com>

diff --git a/sci-physics/root/root-5.30.03.ebuild b/sci-physics/root/root-5.30.03.ebuild
new file mode 100644
index 0000000..452c573
--- /dev/null
+++ b/sci-physics/root/root-5.30.03.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.3 2011/06/21 14:31:50 jlec Exp $
+
+EAPI=3
+PYTHON_DEPEND="python? 2"
+inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
+
+#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
+DOC_PV=5_26
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+PATCH_PV2=5.30.00
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
+	math? (
+		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
+	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
+	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
+
+CDEPEND="app-arch/xz-utils
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-libs/freetype
+	media-libs/giflib
+	media-libs/libpng
+	media-libs/tiff
+	sys-apps/shadow
+	sys-libs/zlib
+	virtual/jpeg
+	X? (
+		media-libs/ftgl
+		media-libs/glew
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+		qt4? ( x11-libs/qt-gui:4
+			x11-libs/qt-opengl:4
+			x11-libs/qt-qt3support:4
+			x11-libs/qt-svg:4
+			x11-libs/qt-webkit:4
+			x11-libs/qt-xmlpatterns:4 )
+		xft? ( x11-libs/libXft ) )
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi )
+	clarens? ( dev-libs/xmlrpc-c )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio )
+	fftw? ( sci-libs/fftw:3.0 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	llvm? ( sys-devel/llvm )
+	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	mysql? ( virtual/mysql )
+	ncurses? ( sys-libs/ncurses )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	ruby? ( dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="
+	virtual/fortran
+${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	elog
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "HDFS, 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 math; then
+		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-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"
+		elif use openmp; then
+			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-xrootd-prop-flags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
+	rm -rf graf2d/asimage/src/libAfterImage
+	rm -rf graf3d/ftgl/{inc,src}
+	rm -rf graf2d/freetype/src
+	rm -rf graf3d/glew/{inc,src}
+	rm -rf core/pcre/src
+	rm -rf math/unuran/src/unuran-*.tar.gz
+	find core/zip -type f -name "[a-z]*" | xargs rm
+	rm -rf core/lzma/src/*.tar.gz
+	rm graf3d/gl/{inc,src}/gl2ps.*
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
+
+	# TODO: unbundle xrootd as a new package
+	#rm -rf net/xrootd/src
+	#sed -i \
+	#	-e 's:-lXrdOuc:-lXrd &:' \
+	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
+	#	proof/proofd/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINC:$ODBCINC /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure 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 \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-builtin-lzma \
+		--enable-astiff \
+		--enable-exceptions	\
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		--with-afs-shared=yes \
+		$(use_enable X x11) \
+		$(use_enable X asimage) \
+		$(use_enable afs) \
+		$(use_enable avahi bonjour) \
+		$(use_enable clarens) \
+		$(use_enable clarens peac) \
+		$(use_enable ncurses editline) \
+		$(use_enable fits fitsio) \
+		$(use_enable fftw fftw3) \
+		$(use_enable graphviz gviz) \
+		$(use_enable kerberos krb5) \
+		$(use_enable ldap) \
+		$(use_enable llvm cling) \
+		$(use_enable math gsl-shared) \
+		$(use_enable math genvector) \
+		$(use_enable math mathmore) \
+		$(use_enable math minuit2) \
+		$(use_enable math roofit) \
+		$(use_enable math tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable postgres pgsql) \
+		$(use_enable prefix rpath) \
+		$(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="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake 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"
+		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	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
+	else
+		rm -rf "${ED}"/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
+	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=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	use ruby && echo "RUBYLIB=${EPREFIX}/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 "${ED}"/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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
+	rm "${ED}"usr/share/root/fonts/LICENSE
+	pushd "${ED}"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 "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
+	rm -f "${ED}"/etc/root/proof/*.sample
+	rm -rf "${ED}"/etc/root/daemons
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_optimize /usr/$(get_libdir)/root
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_cleanup /usr/$(get_libdir)/root
+}



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2011-10-21 21:04 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2011-10-21 21:04 UTC (permalink / raw
  To: gentoo-commits

commit:     9516408da76a8944aaa77553ceb8de14a4b78fb0
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Oct 21 21:02:28 2011 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Oct 21 21:02:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9516408d

sci-physics/root: switch to EAPI 4

- EAPI 4 allows to use REQUIRED_USE to constrain X-related flags;
- fix build with odbc.

---
 sci-physics/root/ChangeLog              |    9 +
 sci-physics/root/root-5.30.03-r1.ebuild |  342 +++++++++++++++++++++++++++++++
 2 files changed, 351 insertions(+), 0 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 34d5d7b..e7c7c6d 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-5.30.03-r1 (21 Oct 2011)
+
+  21 Oct 2011; Andrew Savchenko <bircoph@gmail.com> +root-5.30.03-r1.ebuild:
+  sci-physics/root: update the latest ebuild
+
+  - switch to EAPI=4 in order to use REQUIRED_USE to constrain
+  X-related USE flags;
+  - fix build with libiodbc-3.52.7 (sed replace pattern changed).
+
 *root-5.30.03 (21 Oct 2011)
 
   21 Oct 2011; Andrew Savchenko <bircoph@gmail.com> +root-5.30.03.ebuild:

diff --git a/sci-physics/root/root-5.30.03-r1.ebuild b/sci-physics/root/root-5.30.03-r1.ebuild
new file mode 100644
index 0000000..f2753e3
--- /dev/null
+++ b/sci-physics/root/root-5.30.03-r1.ebuild
@@ -0,0 +1,342 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.3 2011/06/21 14:31:50 jlec Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
+
+#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
+DOC_PV=5_26
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+PATCH_PV2=5.30.00
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
+	math? (
+		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
+	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
+	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
+
+CDEPEND="app-arch/xz-utils
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-libs/freetype
+	media-libs/giflib
+	media-libs/libpng
+	media-libs/tiff
+	sys-apps/shadow
+	sys-libs/zlib
+	virtual/jpeg
+	X? (
+		media-libs/ftgl
+		media-libs/glew
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+		qt4? ( x11-libs/qt-gui:4
+			x11-libs/qt-opengl:4
+			x11-libs/qt-qt3support:4
+			x11-libs/qt-svg:4
+			x11-libs/qt-webkit:4
+			x11-libs/qt-xmlpatterns:4 )
+		xft? ( x11-libs/libXft ) )
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi )
+	clarens? ( dev-libs/xmlrpc-c )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio )
+	fftw? ( sci-libs/fftw:3.0 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	llvm? ( sys-devel/llvm )
+	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	mysql? ( virtual/mysql )
+	ncurses? ( sys-libs/ncurses )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	ruby? ( dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="
+	virtual/fortran
+	${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+REQUIRED_USE="!X? ( !opengl !qt4 !xft )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python_pkg_setup
+	elog
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "HDFS, 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 math; then
+		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-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"
+		elif use openmp; then
+			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-xrootd-prop-flags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
+	rm -rf graf2d/asimage/src/libAfterImage
+	rm -rf graf3d/ftgl/{inc,src}
+	rm -rf graf2d/freetype/src
+	rm -rf graf3d/glew/{inc,src}
+	rm -rf core/pcre/src
+	rm -rf math/unuran/src/unuran-*.tar.gz
+	find core/zip -type f -name "[a-z]*" | xargs rm
+	rm -rf core/lzma/src/*.tar.gz
+	rm graf3d/gl/{inc,src}/gl2ps.*
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
+
+	# TODO: unbundle xrootd as a new package
+	#rm -rf net/xrootd/src
+	#sed -i \
+	#	-e 's:-lXrdOuc:-lXrd &:' \
+	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
+	#	proof/proofd/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure 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 \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-builtin-lzma \
+		--enable-astiff \
+		--enable-exceptions	\
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		--with-afs-shared=yes \
+		$(use_enable X x11) \
+		$(use_enable X asimage) \
+		$(use_enable afs) \
+		$(use_enable avahi bonjour) \
+		$(use_enable clarens) \
+		$(use_enable clarens peac) \
+		$(use_enable ncurses editline) \
+		$(use_enable fits fitsio) \
+		$(use_enable fftw fftw3) \
+		$(use_enable graphviz gviz) \
+		$(use_enable kerberos krb5) \
+		$(use_enable ldap) \
+		$(use_enable llvm cling) \
+		$(use_enable math gsl-shared) \
+		$(use_enable math genvector) \
+		$(use_enable math mathmore) \
+		$(use_enable math minuit2) \
+		$(use_enable math roofit) \
+		$(use_enable math tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable postgres pgsql) \
+		$(use_enable prefix rpath) \
+		$(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="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake 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"
+		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	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
+	else
+		rm -rf "${ED}"/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
+	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=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	use ruby && echo "RUBYLIB=${EPREFIX}/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 "${ED}"/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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
+	rm "${ED}"usr/share/root/fonts/LICENSE
+	pushd "${ED}"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 "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
+	rm -f "${ED}"/etc/root/proof/*.sample
+	rm -rf "${ED}"/etc/root/daemons
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_optimize /usr/$(get_libdir)/root
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_cleanup /usr/$(get_libdir)/root
+}



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2011-10-27 21:49 Sebastien Fabbro
  0 siblings, 0 replies; 69+ messages in thread
From: Sebastien Fabbro @ 2011-10-27 21:49 UTC (permalink / raw
  To: gentoo-commits

commit:     1e9e0ffd0f069dd639254711e72f2ad8e37d3ae6
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Thu Oct 27 21:48:57 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 21:48:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1e9e0ffd

remanifest

---
 sci-physics/root/root-5.30.02.ebuild |  339 ----------------------------------
 sci-physics/root/root-5.30.03.ebuild |  339 ----------------------------------
 2 files changed, 0 insertions(+), 678 deletions(-)

diff --git a/sci-physics/root/root-5.30.02.ebuild b/sci-physics/root/root-5.30.02.ebuild
deleted file mode 100644
index 452c573..0000000
--- a/sci-physics/root/root-5.30.02.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.3 2011/06/21 14:31:50 jlec Exp $
-
-EAPI=3
-PYTHON_DEPEND="python? 2"
-inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
-
-#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-DOC_PV=5_26
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.30.00
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
-	math? (
-		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
-	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
-
-CDEPEND="app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng
-	media-libs/tiff
-	sys-apps/shadow
-	sys-libs/zlib
-	virtual/jpeg
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		qt4? ( x11-libs/qt-gui:4
-			x11-libs/qt-opengl:4
-			x11-libs/qt-qt3support:4
-			x11-libs/qt-svg:4
-			x11-libs/qt-webkit:4
-			x11-libs/qt-xmlpatterns:4 )
-		xft? ( x11-libs/libXft ) )
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	llvm? ( sys-devel/llvm )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	ruby? ( dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="
-	virtual/fortran
-${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	elog
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, 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 math; then
-		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-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"
-		elif use openmp; then
-			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-xrootd-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
-	rm -rf graf2d/asimage/src/libAfterImage
-	rm -rf graf3d/ftgl/{inc,src}
-	rm -rf graf2d/freetype/src
-	rm -rf graf3d/glew/{inc,src}
-	rm -rf core/pcre/src
-	rm -rf math/unuran/src/unuran-*.tar.gz
-	find core/zip -type f -name "[a-z]*" | xargs rm
-	rm -rf core/lzma/src/*.tar.gz
-	rm graf3d/gl/{inc,src}/gl2ps.*
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
-
-	# TODO: unbundle xrootd as a new package
-	#rm -rf net/xrootd/src
-	#sed -i \
-	#	-e 's:-lXrdOuc:-lXrd &:' \
-	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
-	#	proof/proofd/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINC:$ODBCINC /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure 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 \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--enable-astiff \
-		--enable-exceptions	\
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		--with-afs-shared=yes \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable ncurses editline) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable llvm cling) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable postgres pgsql) \
-		$(use_enable prefix rpath) \
-		$(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="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake 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"
-		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	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
-	else
-		rm -rf "${ED}"/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
-	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=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/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 "${ED}"/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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-	rm "${ED}"usr/share/root/fonts/LICENSE
-	pushd "${ED}"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 "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-	rm -f "${ED}"/etc/root/proof/*.sample
-	rm -rf "${ED}"/etc/root/daemons
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
-}

diff --git a/sci-physics/root/root-5.30.03.ebuild b/sci-physics/root/root-5.30.03.ebuild
deleted file mode 100644
index 452c573..0000000
--- a/sci-physics/root/root-5.30.03.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.3 2011/06/21 14:31:50 jlec Exp $
-
-EAPI=3
-PYTHON_DEPEND="python? 2"
-inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
-
-#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-DOC_PV=5_26
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.30.00
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
-	math? (
-		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
-	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
-
-CDEPEND="app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng
-	media-libs/tiff
-	sys-apps/shadow
-	sys-libs/zlib
-	virtual/jpeg
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		qt4? ( x11-libs/qt-gui:4
-			x11-libs/qt-opengl:4
-			x11-libs/qt-qt3support:4
-			x11-libs/qt-svg:4
-			x11-libs/qt-webkit:4
-			x11-libs/qt-xmlpatterns:4 )
-		xft? ( x11-libs/libXft ) )
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	llvm? ( sys-devel/llvm )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	ruby? ( dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="
-	virtual/fortran
-${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	elog
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, 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 math; then
-		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-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"
-		elif use openmp; then
-			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-xrootd-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
-	rm -rf graf2d/asimage/src/libAfterImage
-	rm -rf graf3d/ftgl/{inc,src}
-	rm -rf graf2d/freetype/src
-	rm -rf graf3d/glew/{inc,src}
-	rm -rf core/pcre/src
-	rm -rf math/unuran/src/unuran-*.tar.gz
-	find core/zip -type f -name "[a-z]*" | xargs rm
-	rm -rf core/lzma/src/*.tar.gz
-	rm graf3d/gl/{inc,src}/gl2ps.*
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
-
-	# TODO: unbundle xrootd as a new package
-	#rm -rf net/xrootd/src
-	#sed -i \
-	#	-e 's:-lXrdOuc:-lXrd &:' \
-	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
-	#	proof/proofd/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINC:$ODBCINC /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure 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 \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--enable-astiff \
-		--enable-exceptions	\
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		--with-afs-shared=yes \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable ncurses editline) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable llvm cling) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable postgres pgsql) \
-		$(use_enable prefix rpath) \
-		$(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="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake 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"
-		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	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
-	else
-		rm -rf "${ED}"/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
-	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=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/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 "${ED}"/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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-	rm "${ED}"usr/share/root/fonts/LICENSE
-	pushd "${ED}"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 "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-	rm -f "${ED}"/etc/root/proof/*.sample
-	rm -rf "${ED}"/etc/root/daemons
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
-}



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2011-11-17 11:25 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2011-11-17 11:25 UTC (permalink / raw
  To: gentoo-commits

commit:     b9fb81e0ef2fe0acd3f02c2fa8898bd3431fbc51
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 10:26:56 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 10:26:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b9fb81e0

Corrected Slotting of media-libs/libpng and media-libs/tiff

(Portage version: 2.2.0_alpha74/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-physics/root/ChangeLog              |    4 +
 sci-physics/root/metadata.xml           |   24 +-
 sci-physics/root/root-5.28.00g.ebuild   |  332 -------------------------------
 sci-physics/root/root-5.30.03-r1.ebuild |   20 +-
 4 files changed, 28 insertions(+), 352 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index e7c7c6d..fd95c42 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Nov 2011; Justin Lecher <jlec@gentoo.org> -root-5.28.00g.ebuild,
+  root-5.30.03-r1.ebuild, metadata.xml:
+  Corrected Slotting of media-libs/libpng and media-libs/tiff
+
 *root-5.30.03-r1 (21 Oct 2011)
 
   21 Oct 2011; Andrew Savchenko <bircoph@gmail.com> +root-5.30.03-r1.ebuild:

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index ba73668..222eb19 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
-<longdescription lang="en">
+	<herd>sci-physics</herd>
+	<longdescription lang="en">
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in
   high energy physics, but also in other data analysis applications. It
@@ -10,22 +10,22 @@
   statistics, serialization, optimization, linear algebra, graphics,
   GUI toolkit, and a complete visualization framework.
 </longdescription>
-<use>
-  <flag name="clarens">
+	<use>
+		<flag name="clarens">
     Buld the Clarens and PEAC plug-ins, to use in a GRID enabled
     analysis.</flag>
-  <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-  <flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
-  <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
-  <flag name="pythia6">
+		<flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+		<flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
+		<flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
+		<flag name="pythia6">
     Builds the interface to Pythia-6 (<pkg>sci-physics/pythia</pkg>)
     high energy physics generation events library
   </flag>
-  <flag name="pythia8">
+		<flag name="pythia8">
     Builds the interface to Pythia-8 (<pkg>sci-physics/pythia</pkg>)
     high energy physics generation events library
   </flag>
-  <flag name="reflex">Builds the reflection database for the C++ interpretor </flag>
-  <flag name="xrootd">Build the xrootd low latency file server</flag>
-</use>
+		<flag name="reflex">Builds the reflection database for the C++ interpretor </flag>
+		<flag name="xrootd">Build the xrootd low latency file server</flag>
+	</use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-5.28.00g.ebuild b/sci-physics/root/root-5.28.00g.ebuild
deleted file mode 100644
index 8990411..0000000
--- a/sci-physics/root/root-5.28.00g.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.3 2011/06/21 14:31:50 jlec Exp $
-
-EAPI=3
-PYTHON_DEPEND="python? 2"
-inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
-
-#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-DOC_PV=5_26
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-	http://dev.gentoo.org/~bicatali/${PN}-${PATCH_PV}-xrootd-prop-flags.patch.bz2
-	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
-	math? (
-		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres pythia6
-	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
-
-CDEPEND=">=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-libs/ftgl
-	media-libs/giflib
-	media-libs/glew
-	media-libs/libpng
-	media-libs/tiff
-	sys-apps/shadow
-	virtual/jpeg
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	llvm? ( sys-devel/llvm )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	qt4? ( x11-libs/qt-gui:4
-		x11-libs/qt-opengl:4
-		x11-libs/qt-qt3support:4
-		x11-libs/qt-svg:4
-		x11-libs/qt-webkit: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="
-	virtual/fortran
-${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	elog
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, 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 math; then
-		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-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"
-		elif use openmp; then
-			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${PN}-${PATCH_PV}-xrootd-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
-	rm -rf graf2d/asimage/src/libAfterImage
-	rm -rf graf3d/ftgl/{inc,src}
-	rm -rf graf2d/freetype/src
-	rm -rf graf3d/glew/{inc,src}
-	rm -rf core/pcre/src
-	rm -rf math/unuran/src/unuran-*.tar.gz
-	find core/zip -type f -name "[a-z]*" | xargs rm
-	rm graf3d/gl/{inc,src}/gl2ps.*
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
-
-	# TODO: unbundle xrootd as a new package
-	#rm -rf net/xrootd/src
-	#sed -i \
-	#	-e 's:-lXrdOuc:-lXrd &:' \
-	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
-	#	proof/proofd/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINC:$ODBCINC /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure 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 \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--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 \
-		--fail-on-missing \
-		--with-afs-shared=yes \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable ncurses editline) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable llvm cling) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math tmva) \
-		$(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="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake 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"
-		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	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
-	else
-		rm -rf "${ED}"/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
-	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=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/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 "${ED}"/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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-	rm "${ED}"usr/share/root/fonts/LICENSE
-	pushd "${ED}"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 "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-	rm -f "${ED}"/etc/root/proof/*.sample
-	rm -rf "${ED}"/etc/root/daemons
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
-}

diff --git a/sci-physics/root/root-5.30.03-r1.ebuild b/sci-physics/root/root-5.30.03-r1.ebuild
index f2753e3..d237779 100644
--- a/sci-physics/root/root-5.30.03-r1.ebuild
+++ b/sci-physics/root/root-5.30.03-r1.ebuild
@@ -28,13 +28,14 @@ IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
 	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
 	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
 
-CDEPEND="app-arch/xz-utils
+CDEPEND="
+	app-arch/xz-utils
 	>=dev-lang/cfortran-4.4-r2
 	dev-libs/libpcre
 	media-libs/freetype
 	media-libs/giflib
-	media-libs/libpng
-	media-libs/tiff
+	media-libs/libpng:0
+	media-libs/tiff:0
 	sys-apps/shadow
 	sys-libs/zlib
 	virtual/jpeg
@@ -46,13 +47,15 @@ CDEPEND="app-arch/xz-utils
 		x11-libs/libXpm
 		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
 		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		qt4? ( x11-libs/qt-gui:4
+		qt4? (
+			x11-libs/qt-gui:4
 			x11-libs/qt-opengl:4
 			x11-libs/qt-qt3support:4
 			x11-libs/qt-svg:4
 			x11-libs/qt-webkit:4
 			x11-libs/qt-xmlpatterns:4 )
-		xft? ( x11-libs/libXft ) )
+		xft? ( x11-libs/libXft )
+		)
 	afs? ( net-fs/openafs )
 	avahi? ( net-dns/avahi )
 	clarens? ( dev-libs/xmlrpc-c )
@@ -71,7 +74,8 @@ CDEPEND="app-arch/xz-utils
 	postgres? ( dev-db/postgresql-base )
 	pythia6? ( sci-physics/pythia:6 )
 	pythia8? ( sci-physics/pythia:8 )
-	ruby? ( dev-lang/ruby
+	ruby? (
+			dev-lang/ruby
 			dev-ruby/rubygems )
 	ssl? ( dev-libs/openssl )
 	xml? ( dev-libs/libxml2 )"
@@ -92,14 +96,14 @@ S="${WORKDIR}/${PN}"
 pkg_setup() {
 	fortran-2_pkg_setup
 	python_pkg_setup
-	elog
+	echo
 	elog "There are extra options on packages not yet in Gentoo:"
 	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
 	elog "HDFS, 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
+	echo
 	enewgroup rootd
 	enewuser rootd -1 -1 /var/spool/rootd rootd
 



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2011-11-25  3:27 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2011-11-25  3:27 UTC (permalink / raw
  To: gentoo-commits

commit:     df013697100e9bb7160dddef83aa963e33398009
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Nov 25 03:26:26 2011 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Nov 25 03:26:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=df013697

sci-physics/root: version bump

---
 sci-physics/root/ChangeLog                         |    6 ++++++
 ...{root-5.30.03-r1.ebuild => root-5.30.05.ebuild} |    0
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index fd95c42..c42ef3c 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-5.30.05 (25 Nov 2011)
+
+  25 Nov 2011; Andrew Savchenko <bircoph@gmail.com> -root-5.30.03-r1.ebuild,
+  +root-5.30.05.ebuild:
+  Version bump (patch release).
+
   16 Nov 2011; Justin Lecher <jlec@gentoo.org> -root-5.28.00g.ebuild,
   root-5.30.03-r1.ebuild, metadata.xml:
   Corrected Slotting of media-libs/libpng and media-libs/tiff

diff --git a/sci-physics/root/root-5.30.03-r1.ebuild b/sci-physics/root/root-5.30.05.ebuild
similarity index 100%
rename from sci-physics/root/root-5.30.03-r1.ebuild
rename to sci-physics/root/root-5.30.05.ebuild



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2011-12-11 21:39 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2011-12-11 21:39 UTC (permalink / raw
  To: gentoo-commits

commit:     bb04a964bc00d67eb18dc00b92e5240c84f7f36b
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Dec 11 21:38:33 2011 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Dec 11 21:38:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bb04a964

sci-physics/root: add ~x86-linux keyword

This is requested in bug 346933.

---
 sci-physics/root/ChangeLog              |    3 +++
 sci-physics/root/root-5.32.00-r1.ebuild |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 0a3c872..d94e07c 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Dec 2011; Andrew Savchenko <bircoph@gmail.com> root-5.32.00-r1.ebuild:
+  Add ~x86-linux keyword per bug 346933 request.
+
 *root-5.32.00-r1 (04 Dec 2011)
 
   04 Dec 2011; Andrew Savchenko <bircoph@gmail.com> -root-5.32.00.ebuild,

diff --git a/sci-physics/root/root-5.32.00-r1.ebuild b/sci-physics/root/root-5.32.00-r1.ebuild
index 94e0940..9352fe1 100644
--- a/sci-physics/root/root-5.32.00-r1.ebuild
+++ b/sci-physics/root/root-5.32.00-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
 	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
 	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2011-12-15 18:50 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2011-12-15 18:50 UTC (permalink / raw
  To: gentoo-commits

commit:     69353f77fa32ff3b802d3f11d362a35cf6ee2b75
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Dec 15 18:47:44 2011 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Thu Dec 15 18:47:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=69353f77

sci-physics/root: fix clarens dependency

sci-physics/root[clarens] requires dev-libs/xmlrpc-c[curl]

---
 sci-physics/root/ChangeLog              |    7 +++++++
 sci-physics/root/root-5.32.00-r1.ebuild |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index d94e07c..5fb2231 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Dec 2011; Andrew Savchenko <bircoph@gmail.com> root-5.32.00-r1.ebuild:
+  sci-physics/root: update clarens requirements
+
+  root[clarens] fails to build if clarens dependency
+  dev-libs/xmlrpc-c was build with USE="-curl", so request
+  dev-libs/xmlrpc-c[curl].
+
   11 Dec 2011; Andrew Savchenko <bircoph@gmail.com> root-5.32.00-r1.ebuild:
   Add ~x86-linux keyword per bug 346933 request.
 

diff --git a/sci-physics/root/root-5.32.00-r1.ebuild b/sci-physics/root/root-5.32.00-r1.ebuild
index 9352fe1..a38df3d 100644
--- a/sci-physics/root/root-5.32.00-r1.ebuild
+++ b/sci-physics/root/root-5.32.00-r1.ebuild
@@ -59,7 +59,7 @@ CDEPEND="
 		)
 	afs? ( net-fs/openafs )
 	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c )
+	clarens? ( dev-libs/xmlrpc-c[curl] )
 	emacs? ( virtual/emacs )
 	fits? ( sci-libs/cfitsio )
 	fftw? ( sci-libs/fftw:3.0 )



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-01-03  3:07 Sebastien Fabbro
  0 siblings, 0 replies; 69+ messages in thread
From: Sebastien Fabbro @ 2012-01-03  3:07 UTC (permalink / raw
  To: gentoo-commits

commit:     754fe5b6302897052bcde97ce130beff6d17a6ba
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Tue Jan  3 02:11:49 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 02:11:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=754fe5b6

move dependency for xrootd from main tree

---
 sci-physics/root/root-5.32.00-r1.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-physics/root/root-5.32.00-r1.ebuild b/sci-physics/root/root-5.32.00-r1.ebuild
index 21cc0fc..acca805 100644
--- a/sci-physics/root/root-5.32.00-r1.ebuild
+++ b/sci-physics/root/root-5.32.00-r1.ebuild
@@ -80,7 +80,7 @@ CDEPEND="
 			dev-ruby/rubygems )
 	ssl? ( dev-libs/openssl )
 	xml? ( dev-libs/libxml2 )
-	xrootd? ( net-misc/xrootd )"
+	xrootd? ( net-libs/xrootd )"
 
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig"



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-01-03  3:07 Sebastien Fabbro
  0 siblings, 0 replies; 69+ messages in thread
From: Sebastien Fabbro @ 2012-01-03  3:07 UTC (permalink / raw
  To: gentoo-commits

commit:     a60d760dd5ee941eb4820b5d07f9d3fe4d57dced
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Tue Jan  3 02:10:48 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 02:10:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a60d760d

move dependency for xrootd from main tree

---
 sci-physics/root/root-5.32.00-r1.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-physics/root/root-5.32.00-r1.ebuild b/sci-physics/root/root-5.32.00-r1.ebuild
index a38df3d..21cc0fc 100644
--- a/sci-physics/root/root-5.32.00-r1.ebuild
+++ b/sci-physics/root/root-5.32.00-r1.ebuild
@@ -80,7 +80,7 @@ CDEPEND="
 			dev-ruby/rubygems )
 	ssl? ( dev-libs/openssl )
 	xml? ( dev-libs/libxml2 )
-	xrootd? ( sci-physics/xrootd )"
+	xrootd? ( net-misc/xrootd )"
 
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig"



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-03-01 14:52 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-03-01 14:52 UTC (permalink / raw
  To: gentoo-commits

commit:     6917fae4bfd2f04743c45316986aa933693cd6e9
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Mar  1 14:51:34 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Thu Mar  1 14:51:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6917fae4

sci-physics/root: fix repoman warning

---
 sci-physics/root/ChangeLog    |    3 +++
 sci-physics/root/metadata.xml |    1 -
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index dd9250e..3f23c0b 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.92 2012/01/21 19:23:26 bicatali Exp $
 
+  01 Mar 2012; Andrew Savchenko <bircoph@gmail.com> metadata.xml:
+  Fix repoman warning.
+
 *root-5.32.01 (01 Mar 2012)
 
   01 Mar 2012; Andrew Savchenko <bircoph@gmail.com>

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index aaec26a..b15afdd 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -18,7 +18,6 @@
 <use>
   <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
   <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-  <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag>
   <flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
   <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
   <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-03-09  2:20 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-03-09  2:20 UTC (permalink / raw
  To: gentoo-commits

commit:     3559225394510ae62148186032911bd555d48e3d
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Mar  9 02:19:12 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Mar  9 02:19:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=35592253

sci-physics/root: fix llvm support

Fix ebuild to honor llvm properly.
Order USE flags alphabetically.

---
 sci-physics/root/ChangeLog                         |    9 +++++++++
 sci-physics/root/metadata.xml                      |    2 +-
 sci-physics/root/root-5.26.00g.ebuild              |    2 +-
 sci-physics/root/root-5.28.00h.ebuild              |    2 +-
 ...{root-5.32.01.ebuild => root-5.32.01-r1.ebuild} |    9 +++++----
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index a78dfa4..f9b57f7 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.93 2012/03/02 05:34:01 bicatali Exp $
 
+*root-5.32.01-r1 (09 Mar 2012)
+
+  09 Mar 2012; Andrew Savchenko <bircoph@gmail.com> root-5.26.00g.ebuild,
+  root-5.28.00h.ebuild, -root-5.32.01.ebuild, +root-5.32.01-r1.ebuild,
+  metadata.xml:
+  Fix llvm support per bug 407097. Patch by Marek Szuba with some
+  changes. cling atm depends on live llvm and clang, so it may fail
+  to build, disabled by default. Fix USE flags ordering in ebuilds.
+
 *root-5.28.00h (09 Mar 2012)
 *root-5.26.00g (09 Mar 2012)
 

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index c1f9fd7..6ce0ec4 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -19,7 +19,7 @@
   <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
   <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
   <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag>
-  <flag name="llvm">Build the new experimental cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
+  <flag name="llvm">Build the new EXPERIMENTAL cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
   <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
   <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
   <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>

diff --git a/sci-physics/root/root-5.26.00g.ebuild b/sci-physics/root/root-5.26.00g.ebuild
index 1674a15..472ff8f 100644
--- a/sci-physics/root/root-5.26.00g.ebuild
+++ b/sci-physics/root/root-5.26.00g.ebuild
@@ -28,7 +28,7 @@ LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 IUSE="afs clarens doc emacs examples fftw geant4 graphviz kerberos ldap
 	+math mysql	odbc +opengl openmp oracle postgres pythia6 pythia8 python
-	+reflex	ruby qt4 ssl xft xml xinetd xrootd"
+	qt4 +reflex	ruby ssl xft xinetd xml xrootd"
 
 # libafterimage ignored, to check every version
 # see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944

diff --git a/sci-physics/root/root-5.28.00h.ebuild b/sci-physics/root/root-5.28.00h.ebuild
index 75fb7dd..2e1e1d5 100644
--- a/sci-physics/root/root-5.28.00h.ebuild
+++ b/sci-physics/root/root-5.28.00h.ebuild
@@ -29,7 +29,7 @@ LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 IUSE="afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
 	+math mpi mysql ncurses odbc +opengl openmp oracle postgres pythia6
-	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
+	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
 CDEPEND="
 	>=dev-lang/cfortran-4.4-r2

diff --git a/sci-physics/root/root-5.32.01.ebuild b/sci-physics/root/root-5.32.01-r1.ebuild
similarity index 97%
rename from sci-physics/root/root-5.32.01.ebuild
rename to sci-physics/root/root-5.32.01-r1.ebuild
index 6981501..6e13d71 100644
--- a/sci-physics/root/root-5.32.01.ebuild
+++ b/sci-physics/root/root-5.32.01-r1.ebuild
@@ -25,8 +25,8 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
-	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
+	-llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
+	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
 CDEPEND="
 	app-arch/xz-utils
@@ -65,7 +65,7 @@ CDEPEND="
 	graphviz? ( media-gfx/graphviz )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	llvm? ( sys-devel/llvm )
+	llvm? ( >=sys-devel/clang-3.1 >=sys-devel/llvm-3.1 )
 	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
 	mysql? ( virtual/mysql )
 	ncurses? ( sys-libs/ncurses )
@@ -177,6 +177,8 @@ src_configure() {
 		--with-cc=$(tc-getCC) \
 		--with-cxx=$(tc-getCXX) \
 		--with-f77=$(tc-getFC) \
+		--with-afs-shared=yes \
+		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
 		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
 		--disable-builtin-afterimage \
 		--disable-builtin-freetype \
@@ -195,7 +197,6 @@ src_configure() {
 		--enable-soversion \
 		--enable-table \
 		--fail-on-missing \
-		--with-afs-shared=yes \
 		$(use_enable X x11) \
 		$(use_enable X asimage) \
 		$(use_enable afs) \



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-03-09 13:32 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-03-09 13:32 UTC (permalink / raw
  To: gentoo-commits

commit:     d197d19d63950798d952261333bc3fb22c2169ca
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Mar  9 13:31:30 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Mar  9 13:31:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d197d19d

sci-physics/root: add live ebuild

Add live ebuild. Remove llvm support from other ebuild.
Order inherit arguments.

---
 sci-physics/root/ChangeLog                         |   12 ++++++++++
 sci-physics/root/root-5.26.00g.ebuild              |    2 +-
 sci-physics/root/root-5.28.00h.ebuild              |    3 +-
 ...ot-5.32.01-r1.ebuild => root-5.32.01-r2.ebuild} |    9 ++-----
 .../{root-5.32.01-r1.ebuild => root-9999.ebuild}   |   24 +++++++++++++------
 5 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index f9b57f7..8478ce8 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,18 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.93 2012/03/02 05:34:01 bicatali Exp $
 
+*root-9999 (09 Mar 2012)
+*root-5.32.01-r2 (09 Mar 2012)
+
+  09 Mar 2012; Andrew Savchenko <bircoph@gmail.com> root-5.26.00g.ebuild,
+  root-5.28.00h.ebuild, -root-5.32.01-r1.ebuild, +root-5.32.01-r2.ebuild,
+  +root-9999.ebuild:
+  Add live ebuild.
+  Remove llvm (cling) support from everywhere but live ebuild.
+  Current cling code highly depends on particular llvm trunk
+  revisions, there is no way to support it for regular ebuilds yet.
+  Order inherit arguments alphabetically.
+
 *root-5.32.01-r1 (09 Mar 2012)
 
   09 Mar 2012; Andrew Savchenko <bircoph@gmail.com> root-5.26.00g.ebuild,

diff --git a/sci-physics/root/root-5.26.00g.ebuild b/sci-physics/root/root-5.26.00g.ebuild
index 472ff8f..59a3a30 100644
--- a/sci-physics/root/root-5.26.00g.ebuild
+++ b/sci-physics/root/root-5.26.00g.ebuild
@@ -6,7 +6,7 @@ EAPI=3
 
 PYTHON_DEPEND="python? 2"
 
-inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs versionator
 
 DOC_PV=$(get_major_version)_$(get_version_component_range 2)
 ROOFIT_DOC_PV=2.91-33

diff --git a/sci-physics/root/root-5.28.00h.ebuild b/sci-physics/root/root-5.28.00h.ebuild
index 2e1e1d5..4aed68c 100644
--- a/sci-physics/root/root-5.28.00h.ebuild
+++ b/sci-physics/root/root-5.28.00h.ebuild
@@ -6,9 +6,8 @@ EAPI=3
 
 PYTHON_DEPEND="python? 2"
 
-inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs
 
-#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
 DOC_PV=5_26
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03

diff --git a/sci-physics/root/root-5.32.01-r1.ebuild b/sci-physics/root/root-5.32.01-r2.ebuild
similarity index 96%
copy from sci-physics/root/root-5.32.01-r1.ebuild
copy to sci-physics/root/root-5.32.01-r2.ebuild
index 6e13d71..c0a7944 100644
--- a/sci-physics/root/root-5.32.01-r1.ebuild
+++ b/sci-physics/root/root-5.32.01-r2.ebuild
@@ -4,9 +4,8 @@
 
 EAPI=4
 PYTHON_DEPEND="python? 2"
-inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs
 
-#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
 DOC_PV=5_26
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -25,7 +24,7 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	-llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
+	+math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
 	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
 CDEPEND="
@@ -65,7 +64,6 @@ CDEPEND="
 	graphviz? ( media-gfx/graphviz )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	llvm? ( >=sys-devel/clang-3.1 >=sys-devel/llvm-3.1 )
 	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
 	mysql? ( virtual/mysql )
 	ncurses? ( sys-libs/ncurses )
@@ -178,7 +176,6 @@ src_configure() {
 		--with-cxx=$(tc-getCXX) \
 		--with-f77=$(tc-getFC) \
 		--with-afs-shared=yes \
-		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
 		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
 		--disable-builtin-afterimage \
 		--disable-builtin-freetype \
@@ -187,6 +184,7 @@ src_configure() {
 		--disable-builtin-pcre \
 		--disable-builtin-zlib \
 		--disable-builtin-lzma \
+		--disable-cling \
 		--enable-astiff \
 		--enable-exceptions	\
 		--enable-explicitlink \
@@ -209,7 +207,6 @@ src_configure() {
 		$(use_enable graphviz gviz) \
 		$(use_enable kerberos krb5) \
 		$(use_enable ldap) \
-		$(use_enable llvm cling) \
 		$(use_enable math gsl-shared) \
 		$(use_enable math genvector) \
 		$(use_enable math mathmore) \

diff --git a/sci-physics/root/root-5.32.01-r1.ebuild b/sci-physics/root/root-9999.ebuild
similarity index 94%
rename from sci-physics/root/root-5.32.01-r1.ebuild
rename to sci-physics/root/root-9999.ebuild
index 6e13d71..bdf6caa 100644
--- a/sci-physics/root/root-5.32.01-r1.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -4,9 +4,19 @@
 
 EAPI=4
 PYTHON_DEPEND="python? 2"
-inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion
+	ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk"
+	ESVN_OPTIONS="--non-interactive --trust-server-cert"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
 
-#DOC_PV=$(get_major_version)_$(get_version_component_range 2)
 DOC_PV=5_26
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -15,7 +25,7 @@ PATCH_PV2=5.32.00
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+SRC_URI="${SRC_URI}
 	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
 	math? (
 		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
@@ -23,9 +33,8 @@ SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	-llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
+	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
 	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
 CDEPEND="
@@ -65,7 +74,7 @@ CDEPEND="
 	graphviz? ( media-gfx/graphviz )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	llvm? ( >=sys-devel/clang-3.1 >=sys-devel/llvm-3.1 )
+	llvm? ( =sys-devel/clang-9999 =sys-devel/llvm-9999 )
 	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
 	mysql? ( virtual/mysql )
 	ncurses? ( sys-libs/ncurses )
@@ -129,8 +138,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-03-22  0:23 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-03-22  0:23 UTC (permalink / raw
  To: gentoo-commits

commit:     4129a6f3ecc803448278563046b782b2d399b284
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Mar 22 00:22:45 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Thu Mar 22 00:22:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4129a6f3

sci-physics/root: updave live ebuild

And remove deprecated ncurses use flag.

---
 sci-physics/root/ChangeLog              |    6 ++++++
 sci-physics/root/root-5.32.01-r2.ebuild |    5 ++---
 sci-physics/root/root-9999.ebuild       |    7 +++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index de4fe34..322c79e 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.93 2012/03/02 05:34:01 bicatali Exp $
 
+  22 Mar 2012; Andrew Savchenko <bircoph@gmail.com> root-5.32.01-r2.ebuild,
+  root-9999.ebuild:
+  Apply chklib64 fix to the live ebuild as well.
+  Remove deprecated ncurses support and editline option: they are
+  deprecated and do nothing actually.
+
   21 Mar 2012; Andrew Savchenko <bircoph@gmail.com>
   +files/root-5.32.00-chklib64.patch, root-5.32.01-r2.ebuild:
   Fix library architecture check (32/64 bit) for libraries having .so

diff --git a/sci-physics/root/root-5.32.01-r2.ebuild b/sci-physics/root/root-5.32.01-r2.ebuild
index 35728a9..244b397 100644
--- a/sci-physics/root/root-5.32.01-r2.ebuild
+++ b/sci-physics/root/root-5.32.01-r2.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	+math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
+	+math mpi mysql odbc +opengl openmp oracle postgres prefix
 	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
 CDEPEND="
@@ -66,7 +66,6 @@ CDEPEND="
 	ldap? ( net-nds/openldap )
 	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
 	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	postgres? ( dev-db/postgresql-base )
@@ -139,6 +138,7 @@ src_prepare() {
 	rm -rf graf3d/glew/{inc,src}
 	rm -rf core/pcre/src
 	rm -rf math/unuran/src/unuran-*.tar.gz
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" | xargs rm
 	rm -rf core/lzma/src/*.tar.gz
 	rm graf3d/gl/{inc,src}/gl2ps.*
 	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
@@ -201,7 +201,6 @@ src_configure() {
 		$(use_enable avahi bonjour) \
 		$(use_enable clarens) \
 		$(use_enable clarens peac) \
-		$(use_enable ncurses editline) \
 		$(use_enable fits fitsio) \
 		$(use_enable fftw fftw3) \
 		$(use_enable graphviz gviz) \

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index bdf6caa..51f5afc 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -34,7 +34,7 @@ SRC_URI="${SRC_URI}
 SLOT="0"
 LICENSE="LGPL-2.1"
 IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
+	llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
 	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
 CDEPEND="
@@ -77,7 +77,6 @@ CDEPEND="
 	llvm? ( =sys-devel/clang-9999 =sys-devel/llvm-9999 )
 	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
 	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	postgres? ( dev-db/postgresql-base )
@@ -138,7 +137,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
@@ -211,7 +211,6 @@ src_configure() {
 		$(use_enable avahi bonjour) \
 		$(use_enable clarens) \
 		$(use_enable clarens peac) \
-		$(use_enable ncurses editline) \
 		$(use_enable fits fitsio) \
 		$(use_enable fftw fftw3) \
 		$(use_enable graphviz gviz) \



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-03-23 16:04 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-03-23 16:04 UTC (permalink / raw
  To: gentoo-commits

commit:     0d8692305a10c8d329ee64f8cad16e665372d869
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Mar 23 15:57:30 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Mar 23 15:57:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0d869230

sci-physics/root: switch to virtual/shadow

---
 sci-physics/root/ChangeLog              |    4 ++++
 sci-physics/root/root-5.26.00g.ebuild   |    2 +-
 sci-physics/root/root-5.28.00h.ebuild   |    2 +-
 sci-physics/root/root-5.32.01-r2.ebuild |    2 +-
 sci-physics/root/root-9999.ebuild       |    2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 322c79e..c409d8b 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.93 2012/03/02 05:34:01 bicatali Exp $
 
+  23 Mar 2012; Andrew Savchenko <bircoph@gmail.com> root-5.26.00g.ebuild,
+  root-5.28.00h.ebuild, root-5.32.01-r2.ebuild, root-9999.ebuild:
+  Switch to virtual/shadow.
+
   22 Mar 2012; Andrew Savchenko <bircoph@gmail.com> root-5.32.01-r2.ebuild,
   root-9999.ebuild:
   Apply chklib64 fix to the live ebuild as well.

diff --git a/sci-physics/root/root-5.26.00g.ebuild b/sci-physics/root/root-5.26.00g.ebuild
index 59a3a30..301999b 100644
--- a/sci-physics/root/root-5.26.00g.ebuild
+++ b/sci-physics/root/root-5.26.00g.ebuild
@@ -41,7 +41,7 @@ CDEPEND="
 	media-libs/glew
 	media-libs/libpng:0
 	media-libs/tiff:0
-	sys-apps/shadow
+	virtual/shadow
 	virtual/jpeg
 	x11-libs/libXft
 	x11-libs/libXpm

diff --git a/sci-physics/root/root-5.28.00h.ebuild b/sci-physics/root/root-5.28.00h.ebuild
index 4aed68c..51a00d0 100644
--- a/sci-physics/root/root-5.28.00h.ebuild
+++ b/sci-physics/root/root-5.28.00h.ebuild
@@ -38,7 +38,7 @@ CDEPEND="
 	media-libs/glew
 	media-libs/libpng:0
 	media-libs/tiff:0
-	sys-apps/shadow
+	virtual/shadow
 	virtual/jpeg
 	x11-libs/libX11
 	x11-libs/libXext

diff --git a/sci-physics/root/root-5.32.01-r2.ebuild b/sci-physics/root/root-5.32.01-r2.ebuild
index 244b397..f36c6f4 100644
--- a/sci-physics/root/root-5.32.01-r2.ebuild
+++ b/sci-physics/root/root-5.32.01-r2.ebuild
@@ -35,7 +35,7 @@ CDEPEND="
 	media-libs/giflib
 	media-libs/libpng:0
 	media-libs/tiff:0
-	sys-apps/shadow
+	virtual/shadow
 	sys-libs/zlib
 	virtual/jpeg
 	X? (

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 51f5afc..6a05fd1 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -45,7 +45,7 @@ CDEPEND="
 	media-libs/giflib
 	media-libs/libpng:0
 	media-libs/tiff:0
-	sys-apps/shadow
+	virtual/shadow
 	sys-libs/zlib
 	virtual/jpeg
 	X? (



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-03-23 16:04 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-03-23 16:04 UTC (permalink / raw
  To: gentoo-commits

commit:     0cda7f735b4659c4fd8a222646c399274ce140d9
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Mar 23 16:03:08 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Mar 23 16:03:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0cda7f73

sci-physics/root: fix Manifest

hmm... ebuild manifest mangled manifest again...

---
 sci-physics/root/root-5.32.01-r2.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-physics/root/root-5.32.01-r2.ebuild b/sci-physics/root/root-5.32.01-r2.ebuild
index f36c6f4..025dbfb 100644
--- a/sci-physics/root/root-5.32.01-r2.ebuild
+++ b/sci-physics/root/root-5.32.01-r2.ebuild
@@ -35,9 +35,9 @@ CDEPEND="
 	media-libs/giflib
 	media-libs/libpng:0
 	media-libs/tiff:0
-	virtual/shadow
 	sys-libs/zlib
 	virtual/jpeg
+	virtual/shadow
 	X? (
 		media-libs/ftgl
 		media-libs/glew



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-04-02 19:44 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-04-02 19:44 UTC (permalink / raw
  To: gentoo-commits

commit:     a4562c4f64acc5da35a776f7b5d05c0d9054e9e2
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Mon Apr  2 19:43:22 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Mon Apr  2 19:43:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a4562c4f

sci-physics/root: version bump

---
 sci-physics/root/ChangeLog                         |   37 ++++++++++++++-----
 ...{root-5.32.01-r2.ebuild => root-5.32.02.ebuild} |    0
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index c409d8b..307e584 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.93 2012/03/02 05:34:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
+
+*root-5.32.02 (02 Apr 2012)
+
+  02 Apr 2012; Andrew Savchenko <bircoph@gmail.com> -root-5.32.01-r2.ebuild,
+  +root-5.32.02.ebuild:
+  Version bump for a new patch release.
+
+  29 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/root-5.32.00-chklib64.patch, root-5.32.01-r2.ebuild:
+  Import from the science overlay
 
   23 Mar 2012; Andrew Savchenko <bircoph@gmail.com> root-5.26.00g.ebuild,
   root-5.28.00h.ebuild, root-5.32.01-r2.ebuild, root-9999.ebuild:
@@ -20,13 +30,18 @@
   Thanks to Jean-Francois Ostiguy and Jauhien Piatlicki for their
   major work on this bug.
 
-*root-9999 (09 Mar 2012)
+  13 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> +root-5.26.00g.ebuild,
+  +files/root-5.26.00g-explicit-functions.patch, -root-5.28.00d.ebuild,
+  +root-5.28.00h.ebuild, +files/root-5.28.00h-explicit-functions.patch,
+  -root-5.32.00-r2.ebuild, +files/root-5.32.00-explicit-functions.patch,
+  -root-5.32.01.ebuild, +root-5.32.01-r2.ebuild, files/olbd.initd,
+  files/xrootd.initd:
+  Imported changed from bircoph into main tree
+
 *root-5.32.01-r2 (09 Mar 2012)
 
   09 Mar 2012; Andrew Savchenko <bircoph@gmail.com> root-5.26.00g.ebuild,
-  root-5.28.00h.ebuild, -root-5.32.01-r1.ebuild, +root-5.32.01-r2.ebuild,
-  +root-9999.ebuild:
-  Add live ebuild.
+  root-5.28.00h.ebuild, -root-5.32.01-r1.ebuild, +root-5.32.01-r2.ebuild
   Remove llvm (cling) support from everywhere but live ebuild.
   Current cling code highly depends on particular llvm trunk
   revisions, there is no way to support it for regular ebuilds yet.
@@ -45,18 +60,20 @@
 *root-5.26.00g (09 Mar 2012)
 
   09 Mar 2012; Andrew Savchenko <bircoph@gmail.com>
-  +files/root-5.26.00e-libpng15.patch, +root-5.26.00g.ebuild,
+  +root-5.26.00g.ebuild,
   +files/root-5.26.00g-explicit-functions.patch,
-  +files/root-5.28.00b-nobyte-compile.patch, +root-5.28.00h.ebuild,
+  +root-5.28.00h.ebuild,
   +files/root-5.28.00h-explicit-functions.patch,
-  +files/root-5.32.00-explicit-functions.patch, root-5.32.01.ebuild,
-  +files/olbd.confd, +files/olbd.initd, +files/xrootd.confd,
-  +files/xrootd.initd, metadata.xml:
+  +files/root-5.32.00-explicit-functions.patch:
   Version bump for 5.26 and 5.28 branches to the latest patchlevels.
   Fix bug 386905 for all branches by applying upstream fix. Thanks
   gcc and ROOT developers for their hard work.
   Fix pq2 files installation.
 
+  13 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> root-5.26.00e-r1.ebuild,
+  root-5.28.00d.ebuild, root-5.32.00-r2.ebuild, root-5.32.01.ebuild:
+  Switch to virtual/shadow.
+
 *root-5.32.01 (02 Mar 2012)
 
   02 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> +root-5.32.01.ebuild,

diff --git a/sci-physics/root/root-5.32.01-r2.ebuild b/sci-physics/root/root-5.32.02.ebuild
similarity index 100%
rename from sci-physics/root/root-5.32.01-r2.ebuild
rename to sci-physics/root/root-5.32.02.ebuild



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-04-03  4:13 Kacper Kowalik
  0 siblings, 0 replies; 69+ messages in thread
From: Kacper Kowalik @ 2012-04-03  4:13 UTC (permalink / raw
  To: gentoo-commits

commit:     2f45033dd0600ea0c12dada713dc14d373e6f4f8
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Mon Apr  2 19:43:22 2012 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Tue Apr  3 04:05:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2f45033d

sci-physics/root: version bump

---
 sci-physics/root/ChangeLog                         |   37 ++++++++++++++-----
 ...{root-5.32.01-r2.ebuild => root-5.32.02.ebuild} |    0
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index c409d8b..307e584 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.93 2012/03/02 05:34:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
+
+*root-5.32.02 (02 Apr 2012)
+
+  02 Apr 2012; Andrew Savchenko <bircoph@gmail.com> -root-5.32.01-r2.ebuild,
+  +root-5.32.02.ebuild:
+  Version bump for a new patch release.
+
+  29 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/root-5.32.00-chklib64.patch, root-5.32.01-r2.ebuild:
+  Import from the science overlay
 
   23 Mar 2012; Andrew Savchenko <bircoph@gmail.com> root-5.26.00g.ebuild,
   root-5.28.00h.ebuild, root-5.32.01-r2.ebuild, root-9999.ebuild:
@@ -20,13 +30,18 @@
   Thanks to Jean-Francois Ostiguy and Jauhien Piatlicki for their
   major work on this bug.
 
-*root-9999 (09 Mar 2012)
+  13 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> +root-5.26.00g.ebuild,
+  +files/root-5.26.00g-explicit-functions.patch, -root-5.28.00d.ebuild,
+  +root-5.28.00h.ebuild, +files/root-5.28.00h-explicit-functions.patch,
+  -root-5.32.00-r2.ebuild, +files/root-5.32.00-explicit-functions.patch,
+  -root-5.32.01.ebuild, +root-5.32.01-r2.ebuild, files/olbd.initd,
+  files/xrootd.initd:
+  Imported changed from bircoph into main tree
+
 *root-5.32.01-r2 (09 Mar 2012)
 
   09 Mar 2012; Andrew Savchenko <bircoph@gmail.com> root-5.26.00g.ebuild,
-  root-5.28.00h.ebuild, -root-5.32.01-r1.ebuild, +root-5.32.01-r2.ebuild,
-  +root-9999.ebuild:
-  Add live ebuild.
+  root-5.28.00h.ebuild, -root-5.32.01-r1.ebuild, +root-5.32.01-r2.ebuild
   Remove llvm (cling) support from everywhere but live ebuild.
   Current cling code highly depends on particular llvm trunk
   revisions, there is no way to support it for regular ebuilds yet.
@@ -45,18 +60,20 @@
 *root-5.26.00g (09 Mar 2012)
 
   09 Mar 2012; Andrew Savchenko <bircoph@gmail.com>
-  +files/root-5.26.00e-libpng15.patch, +root-5.26.00g.ebuild,
+  +root-5.26.00g.ebuild,
   +files/root-5.26.00g-explicit-functions.patch,
-  +files/root-5.28.00b-nobyte-compile.patch, +root-5.28.00h.ebuild,
+  +root-5.28.00h.ebuild,
   +files/root-5.28.00h-explicit-functions.patch,
-  +files/root-5.32.00-explicit-functions.patch, root-5.32.01.ebuild,
-  +files/olbd.confd, +files/olbd.initd, +files/xrootd.confd,
-  +files/xrootd.initd, metadata.xml:
+  +files/root-5.32.00-explicit-functions.patch:
   Version bump for 5.26 and 5.28 branches to the latest patchlevels.
   Fix bug 386905 for all branches by applying upstream fix. Thanks
   gcc and ROOT developers for their hard work.
   Fix pq2 files installation.
 
+  13 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> root-5.26.00e-r1.ebuild,
+  root-5.28.00d.ebuild, root-5.32.00-r2.ebuild, root-5.32.01.ebuild:
+  Switch to virtual/shadow.
+
 *root-5.32.01 (02 Mar 2012)
 
   02 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> +root-5.32.01.ebuild,

diff --git a/sci-physics/root/root-5.32.01-r2.ebuild b/sci-physics/root/root-5.32.02.ebuild
similarity index 100%
rename from sci-physics/root/root-5.32.01-r2.ebuild
rename to sci-physics/root/root-5.32.02.ebuild



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-04-03  7:53 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-04-03  7:53 UTC (permalink / raw
  To: gentoo-commits

commit:     3099606f10ffe89696d65c1e3b077c1cd76a372f
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue Apr  3 07:51:54 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue Apr  3 07:51:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3099606f

sci-physics/root: fix bug 408987

---
 sci-physics/root/ChangeLog                         |   10 ++++++++++
 ...oot-5.28.00h.ebuild => root-5.28.00h-r1.ebuild} |    5 ++++-
 ...{root-5.32.02.ebuild => root-5.32.02-r1.ebuild} |    5 ++++-
 sci-physics/root/root-9999.ebuild                  |    7 +++++--
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 307e584..d290f70 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-5.32.02-r1 (03 Apr 2012)
+*root-5.28.00h-r1 (03 Apr 2012)
+
+  03 Apr 2012; Andrew Savchenko <bircoph@gmail.com> -root-5.28.00h.ebuild,
+  +root-5.28.00h-r1.ebuild, -root-5.32.02.ebuild, +root-5.32.02-r1.ebuild,
+  root-9999.ebuild:
+  Force format library dependencies on libafterimage and afterstep.
+  This fixes bug 408987. Port to other versions, 5.26 branch is not
+  affected.
+
 *root-5.32.02 (02 Apr 2012)
 
   02 Apr 2012; Andrew Savchenko <bircoph@gmail.com> -root-5.32.01-r2.ebuild,

diff --git a/sci-physics/root/root-5.28.00h.ebuild b/sci-physics/root/root-5.28.00h-r1.ebuild
similarity index 98%
rename from sci-physics/root/root-5.28.00h.ebuild
rename to sci-physics/root/root-5.28.00h-r1.ebuild
index 51a00d0..64b7966 100644
--- a/sci-physics/root/root-5.28.00h.ebuild
+++ b/sci-physics/root/root-5.28.00h-r1.ebuild
@@ -44,7 +44,10 @@ CDEPEND="
 	x11-libs/libXext
 	x11-libs/libXft
 	x11-libs/libXpm
-	|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
+	|| (
+		>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] 
+		>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+	)
 	afs? ( net-fs/openafs )
 	avahi? ( net-dns/avahi )
 	clarens? ( dev-libs/xmlrpc-c )

diff --git a/sci-physics/root/root-5.32.02.ebuild b/sci-physics/root/root-5.32.02-r1.ebuild
similarity index 98%
rename from sci-physics/root/root-5.32.02.ebuild
rename to sci-physics/root/root-5.32.02-r1.ebuild
index 025dbfb..44ca400 100644
--- a/sci-physics/root/root-5.32.02.ebuild
+++ b/sci-physics/root/root-5.32.02-r1.ebuild
@@ -44,7 +44,10 @@ CDEPEND="
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXpm
-		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
+		|| (
+			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] 
+			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+		)
 		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
 		qt4? (
 			x11-libs/qt-gui:4

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 6a05fd1..3ffcc4f 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -45,16 +45,19 @@ CDEPEND="
 	media-libs/giflib
 	media-libs/libpng:0
 	media-libs/tiff:0
-	virtual/shadow
 	sys-libs/zlib
 	virtual/jpeg
+	virtual/shadow
 	X? (
 		media-libs/ftgl
 		media-libs/glew
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXpm
-		|| ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 )
+		|| (
+			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] 
+			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+		)
 		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
 		qt4? (
 			x11-libs/qt-gui:4



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-04-03 18:07 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2012-04-03 18:07 UTC (permalink / raw
  To: gentoo-commits

commit:     eb8aeac5c300ec8ce8f3e03171d3ea84729b43e4
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  3 18:07:30 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Apr  3 18:07:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=eb8aeac5

sci-physics/root: Drop in tree version

(Portage version: 2.2.0_alpha99/git/Linux x86_64, unsigned Manifest commit)

---
 sci-physics/root/ChangeLog               |    4 +
 sci-physics/root/root-5.26.00g.ebuild    |  318 ---------------------------
 sci-physics/root/root-5.28.00h-r1.ebuild |  339 -----------------------------
 sci-physics/root/root-5.32.02-r1.ebuild  |  343 ------------------------------
 4 files changed, 4 insertions(+), 1000 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 0a1a61a..6d49d5c 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  03 Apr 2012; Justin Lecher <jlec@gentoo.org> -root-5.26.00g.ebuild,
+  -root-5.28.00h-r1.ebuild, -root-5.32.02-r1.ebuild:
+  Drop in tree version
+
   03 Apr 2012; Justin Lecher <jlec@gentoo.org> root-5.28.00h-r1.ebuild,
   root-5.32.02-r1.ebuild, root-9999.ebuild, metadata.xml:
   Fix EAPI=4 usage, don't mix CFLAGS/CXXFLAGS, respect LD

diff --git a/sci-physics/root/root-5.26.00g.ebuild b/sci-physics/root/root-5.26.00g.ebuild
deleted file mode 100644
index 301999b..0000000
--- a/sci-physics/root/root-5.26.00g.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00e-r1.ebuild,v 1.12 2011/11/13 11:21:12 jlec Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2"
-
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs versionator
-
-DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4
-PATCH_PV="5.26.00e"
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="
-	ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-	mirror://gentoo/${PN}-${PATCH_PV}-patches.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 )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="afs clarens doc emacs examples fftw geant4 graphviz kerberos ldap
-	+math mysql	odbc +opengl openmp oracle postgres pythia6 pythia8 python
-	qt4 +reflex	ruby ssl xft xinetd xml 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/giflib
-	media-libs/glew
-	media-libs/libpng:0
-	media-libs/tiff:0
-	virtual/shadow
-	virtual/jpeg
-	x11-libs/libXft
-	x11-libs/libXpm
-	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 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	math? ( sci-libs/gsl )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	opengl? ( virtual/opengl virtual/glu )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	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:2 )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="
-	virtual/fortran
-	${CDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	echo
-	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)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use openmp && \
-		[[ $(tc-getCC)$ == *gcc* ]] && \
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || \
-			! has_version 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"
-	elif use openmp; then
-		export USE_OPENMP=1
-		use math && export USE_PARALLEL_MINUIT2=1
-	fi
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${PN}-${PATCH_PV}-make-3.82.patch \
-		"${WORKDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${WORKDIR}"/${PN}-${PATCH_PV}-configure-paths.patch \
-		"${WORKDIR}"/${PN}-${PATCH_PV}-nobyte-compile.patch \
-		"${WORKDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${WORKDIR}"/${PN}-${PATCH_PV}-xrootd-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-libpng15.patch \
-		"${FILESDIR}"/${P}-explicit-functions.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
-	sed -i \
-		-e 's/libPythia6/libpythia6/g' \
-		-e 's/ungif/gif/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 \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-sys-iconpath="${EPREFIX}"/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 \
-		--fail-on-missing \
-		--with-afs-shared=yes \
-		$(use_enable afs) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable fftw fftw3) \
-		$(use_enable geant4 g4root) \
-		$(use_enable graphviz gviz) \
-		$(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="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake 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=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-	rm "${ED}"usr/share/root/fonts/LICENSE
-	pushd "${ED}"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 "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-	rm -f "${ED}"/etc/root/proof/*.sample
-	rm -rf "${ED}"/etc/root/daemons
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	use ruby && elog "ROOT Ruby module is available as libRubyROOT"
-	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
-}

diff --git a/sci-physics/root/root-5.28.00h-r1.ebuild b/sci-physics/root/root-5.28.00h-r1.ebuild
deleted file mode 100644
index 2963ad3..0000000
--- a/sci-physics/root/root-5.28.00h-r1.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.4 2011/11/13 11:21:12 jlec Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2"
-
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs
-
-DOC_PV=5_26
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="
-	ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-	http://dev.gentoo.org/~bicatali/${PN}-${PATCH_PV}-xrootd-prop-flags.patch.bz2
-	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
-	math? (
-		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	+math mpi mysql ncurses odbc +opengl openmp oracle postgres pythia6
-	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
-
-CDEPEND="
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-libs/ftgl
-	media-libs/giflib
-	media-libs/glew
-	media-libs/libpng:0
-	media-libs/tiff:0
-	virtual/shadow
-	virtual/jpeg
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	|| (
-		>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
-		>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
-	)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	qt4? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-opengl:4
-		x11-libs/qt-qt3support:4
-		x11-libs/qt-svg:4
-		x11-libs/qt-webkit:4
-		x11-libs/qt-xmlpatterns:4 )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2:2 )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="
-	virtual/fortran
-${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, 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)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-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"
-		elif use openmp; then
-			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${PN}-${PATCH_PV}-xrootd-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${P}-explicit-functions.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
-	rm -rf graf2d/asimage/src/libAfterImage
-	rm -rf graf3d/ftgl/{inc,src}
-	rm -rf graf2d/freetype/src
-	rm -rf graf3d/glew/{inc,src}
-	rm -rf core/pcre/src
-	rm -rf math/unuran/src/unuran-*.tar.gz
-	find core/zip -type f -name "[a-z]*" | xargs rm
-	rm graf3d/gl/{inc,src}/gl2ps.*
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
-
-	# TODO: unbundle xrootd as a new package
-	#rm -rf net/xrootd/src
-	#sed -i \
-	#	-e 's:-lXrdOuc:-lXrd &:' \
-	#	-e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \
-	#	proof/proofd/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINC:$ODBCINC /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure 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 \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--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 \
-		--fail-on-missing \
-		--with-afs-shared=yes \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable ncurses editline) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(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 tmva) \
-		$(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="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake 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"
-		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	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
-	else
-		rm -rf "${ED}"/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
-	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=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/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 "${ED}"/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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-	rm "${ED}"usr/share/root/fonts/LICENSE
-	pushd "${ED}"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 "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-	rm -f "${ED}"/etc/root/proof/*.sample
-	rm -rf "${ED}"/etc/root/daemons
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
-}

diff --git a/sci-physics/root/root-5.32.02-r1.ebuild b/sci-physics/root/root-5.32.02-r1.ebuild
deleted file mode 100644
index 12559d8..0000000
--- a/sci-physics/root/root-5.32.02-r1.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.01.ebuild,v 1.1 2012/03/02 05:34:01 bicatali Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2"
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs
-
-DOC_PV=5_26
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.32.00
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="
-	ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
-		math? (
-			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	+math mpi mysql odbc +opengl openmp oracle postgres prefix
-	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
-
-CDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/shadow
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| (
-			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
-			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
-		)
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		qt4? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-opengl:4
-			x11-libs/qt-qt3support:4
-			x11-libs/qt-svg:4
-			x11-libs/qt-webkit:4
-			x11-libs/qt-xmlpatterns:4 )
-		xft? ( x11-libs/libXft )
-		)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c[curl] )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	xrootd? ( net-libs/xrootd )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="
-	virtual/fortran
-	${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-REQUIRED_USE="!X? ( !opengl !qt4 !xft )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, 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)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp && ! tc-has-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"
-		elif use openmp; then
-			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -rf graf2d/asimage/src/libAfterImage || die
-	rm -rf graf3d/ftgl/{inc,src} || die
-	rm -rf graf2d/freetype/src || die
-	rm -rf graf3d/glew/{inc,src} || die
-	rm -rf core/pcre/src || die
-	rm -rf math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
-	rm -rf core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure 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 \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-ld=$(tc-getCXX) \
-		--with-afs-shared=yes \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--disable-cling \
-		--enable-astiff \
-		--enable-exceptions	\
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(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 tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable postgres pgsql) \
-		$(use_enable prefix rpath) \
-		$(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="${CXXFLAGS}" F77OPT="${FFLAGS}"
-	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"
-		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	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
-	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-	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}
-
-	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
-	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
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root
-
-	# 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 "${ED}"/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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
-	rm "${ED}"usr/share/root/fonts/LICENSE || die
-	pushd "${ED}"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 || die
-	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
-	rm -f "${ED}"/etc/root/proof/*.sample || die
-	rm -rf "${ED}"/etc/root/daemons || die
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin/ || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
-}



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-04-03 18:07 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2012-04-03 18:07 UTC (permalink / raw
  To: gentoo-commits

commit:     1cf3ca83bcef5eec20424599d0fc65f832b92fff
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  3 18:05:27 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Apr  3 18:05:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1cf3ca83

sci-physics/root: Fix EAPI=4 usage, don't mix CFLAGS/CXXFLAGS, respect LD

(Portage version: 2.2.0_alpha99/git/Linux x86_64, unsigned Manifest commit)

---
 sci-physics/root/ChangeLog               |    4 ++
 sci-physics/root/metadata.xml            |   36 +++++++++---------
 sci-physics/root/root-5.28.00h-r1.ebuild |    2 +-
 sci-physics/root/root-5.32.02-r1.ebuild  |   58 +++++++++++++++--------------
 sci-physics/root/root-9999.ebuild        |   56 +++++++++++++++--------------
 5 files changed, 82 insertions(+), 74 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index d290f70..0a1a61a 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  03 Apr 2012; Justin Lecher <jlec@gentoo.org> root-5.28.00h-r1.ebuild,
+  root-5.32.02-r1.ebuild, root-9999.ebuild, metadata.xml:
+  Fix EAPI=4 usage, don't mix CFLAGS/CXXFLAGS, respect LD
+
 *root-5.32.02-r1 (03 Apr 2012)
 *root-5.28.00h-r1 (03 Apr 2012)
 

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 6ce0ec4..0af5788 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bircoph@gmail.com</email>
-  <name>Andrew Savchenko</name>
-  <description>Maintainer. Assign bugs to him</description>
-</maintainer>
-<herd>sci-physics</herd>
-<longdescription lang="en">
+	<maintainer>
+		<email>bircoph@gmail.com</email>
+		<name>Andrew Savchenko</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<herd>sci-physics</herd>
+	<longdescription lang="en">
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in
   high energy physics, but also in other data analysis applications. It
@@ -15,15 +15,15 @@
   statistics, serialization, optimization, linear algebra, graphics,
   GUI toolkit, and a complete visualization framework.
 </longdescription>
-<use>
-  <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
-  <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-  <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag>
-  <flag name="llvm">Build the new EXPERIMENTAL cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
-  <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
-  <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
-  <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
-  <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
-  <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
-</use>
+	<use>
+		<flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
+		<flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+		<flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag>
+		<flag name="llvm">Build the new EXPERIMENTAL cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
+		<flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
+		<flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
+		<flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
+		<flag name="reflex">Build the reflection database for the C++ interpreter</flag>
+		<flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
+	</use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-5.28.00h-r1.ebuild b/sci-physics/root/root-5.28.00h-r1.ebuild
index 64b7966..2963ad3 100644
--- a/sci-physics/root/root-5.28.00h-r1.ebuild
+++ b/sci-physics/root/root-5.28.00h-r1.ebuild
@@ -45,7 +45,7 @@ CDEPEND="
 	x11-libs/libXft
 	x11-libs/libXpm
 	|| (
-		>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] 
+		>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
 		>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
 	)
 	afs? ( net-fs/openafs )

diff --git a/sci-physics/root/root-5.32.02-r1.ebuild b/sci-physics/root/root-5.32.02-r1.ebuild
index 44ca400..12559d8 100644
--- a/sci-physics/root/root-5.32.02-r1.ebuild
+++ b/sci-physics/root/root-5.32.02-r1.ebuild
@@ -14,11 +14,12 @@ PATCH_PV2=5.32.00
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+SRC_URI="
+	ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
 	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
-	math? (
-		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
+		math? (
+			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
@@ -45,7 +46,7 @@ CDEPEND="
 		x11-libs/libXext
 		x11-libs/libXpm
 		|| (
-			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] 
+			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
 			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
 		)
 		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
@@ -109,7 +110,7 @@ pkg_setup() {
 	enewuser rootd -1 -1 /var/spool/rootd rootd
 
 	if use math; then
-		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+		if use openmp && ! tc-has-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"
@@ -134,17 +135,17 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch
 
 	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
-	rm -rf graf2d/asimage/src/libAfterImage
-	rm -rf graf3d/ftgl/{inc,src}
-	rm -rf graf2d/freetype/src
-	rm -rf graf3d/glew/{inc,src}
-	rm -rf core/pcre/src
-	rm -rf math/unuran/src/unuran-*.tar.gz
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" | xargs rm
-	rm -rf core/lzma/src/*.tar.gz
-	rm graf3d/gl/{inc,src}/gl2ps.*
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+	rm -rf graf2d/asimage/src/libAfterImage || die
+	rm -rf graf3d/ftgl/{inc,src} || die
+	rm -rf graf2d/freetype/src || die
+	rm -rf graf3d/glew/{inc,src} || die
+	rm -rf core/pcre/src || die
+	rm -rf math/unuran/src/unuran-*.tar.gz || die
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
+	rm -rf core/lzma/src/*.tar.gz || die
+	rm graf3d/gl/{inc,src}/gl2ps.* || die
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
 
 	# In Gentoo, libPythia6 is called libpythia6
 	# libungif is called libgif,
@@ -178,6 +179,7 @@ src_configure() {
 		--with-cc=$(tc-getCC) \
 		--with-cxx=$(tc-getCXX) \
 		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
 		--with-afs-shared=yes \
 		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
 		--disable-builtin-afterimage \
@@ -238,7 +240,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed"
+	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}"
 	if use emacs; then
 		elisp-compile build/misc/*.el || die "elisp-compile failed"
 	fi
@@ -259,7 +261,7 @@ doc_install() {
 		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
 		doins -r tmva/test
 	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
 	fi
 }
 
@@ -296,13 +298,13 @@ desktop_install() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 
 	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
 	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
 	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
 	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root || die "doenvd failed"
+	doenvd 99root
 
 	# The build system installs Emacs support unconditionally and in the wrong
 	# directory. Remove it and call elisp-install in case of USE=emacs.
@@ -316,18 +318,18 @@ src_install() {
 	desktop_install
 
 	# Cleanup of files either already distributed or unused on Gentoo
-	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-	rm "${ED}"usr/share/root/fonts/LICENSE
+	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
+	rm "${ED}"usr/share/root/fonts/LICENSE || die
 	pushd "${ED}"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 "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-	rm -f "${ED}"/etc/root/proof/*.sample
-	rm -rf "${ED}"/etc/root/daemons
+		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
+	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
+	rm -f "${ED}"/etc/root/proof/*.sample || die
+	rm -rf "${ED}"/etc/root/daemons || die
 	popd > /dev/null
 	# these should be in PATH
 	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin
+		"${ED}"usr/bin/ || die
 }
 
 pkg_postinst() {

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 3ffcc4f..6b3c224 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -27,12 +27,13 @@ DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
 SRC_URI="${SRC_URI}
 	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
-	math? (
-		ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
+		math? (
+			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
+KEYWORDS=""
 IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
 	llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
 	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
@@ -55,7 +56,7 @@ CDEPEND="
 		x11-libs/libXext
 		x11-libs/libXpm
 		|| (
-			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] 
+			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
 			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
 		)
 		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
@@ -120,7 +121,7 @@ pkg_setup() {
 	enewuser rootd -1 -1 /var/spool/rootd rootd
 
 	if use math; then
-		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+		if use openmp && ! tc-has-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"
@@ -144,17 +145,17 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch
 
 	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
-	rm -rf graf2d/asimage/src/libAfterImage
-	rm -rf graf3d/ftgl/{inc,src}
-	rm -rf graf2d/freetype/src
-	rm -rf graf3d/glew/{inc,src}
-	rm -rf core/pcre/src
-	rm -rf math/unuran/src/unuran-*.tar.gz
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" | xargs rm
-	rm -rf core/lzma/src/*.tar.gz
-	rm graf3d/gl/{inc,src}/gl2ps.*
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+	rm -rf graf2d/asimage/src/libAfterImage || die
+	rm -rf graf3d/ftgl/{inc,src} || die
+	rm -rf graf2d/freetype/src || die
+	rm -rf graf3d/glew/{inc,src} || die
+	rm -rf core/pcre/src || die
+	rm -rf math/unuran/src/unuran-*.tar.gz || die
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
+	rm -rf core/lzma/src/*.tar.gz || die
+	rm graf3d/gl/{inc,src}/gl2ps.* || die
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
 
 	# In Gentoo, libPythia6 is called libpythia6
 	# libungif is called libgif,
@@ -188,6 +189,7 @@ src_configure() {
 		--with-cc=$(tc-getCC) \
 		--with-cxx=$(tc-getCXX) \
 		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
 		--with-afs-shared=yes \
 		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
 		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
@@ -249,7 +251,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed"
+	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}"
 	if use emacs; then
 		elisp-compile build/misc/*.el || die "elisp-compile failed"
 	fi
@@ -270,7 +272,7 @@ doc_install() {
 		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
 		doins -r tmva/test
 	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
 	fi
 }
 
@@ -307,13 +309,13 @@ desktop_install() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 
 	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
 	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
 	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
 	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root || die "doenvd failed"
+	doenvd 99root
 
 	# The build system installs Emacs support unconditionally and in the wrong
 	# directory. Remove it and call elisp-install in case of USE=emacs.
@@ -327,18 +329,18 @@ src_install() {
 	desktop_install
 
 	# Cleanup of files either already distributed or unused on Gentoo
-	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-	rm "${ED}"usr/share/root/fonts/LICENSE
+	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
+	rm "${ED}"usr/share/root/fonts/LICENSE || die
 	pushd "${ED}"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 "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-	rm -f "${ED}"/etc/root/proof/*.sample
-	rm -rf "${ED}"/etc/root/daemons
+		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
+	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
+	rm -f "${ED}"/etc/root/proof/*.sample || die
+	rm -rf "${ED}"/etc/root/daemons || die
 	popd > /dev/null
 	# these should be in PATH
 	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin
+		"${ED}"usr/bin/ || die
 }
 
 pkg_postinst() {



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-05-22 19:43 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2012-05-22 19:43 UTC (permalink / raw
  To: gentoo-commits

commit:     4108610d5d4a76197d836067857f80b374900b5c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 19:24:15 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue May 22 19:24:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4108610d

sci-physics/root: Add missing eutils.eclass

(Portage version: 2.2.0_alpha107/git/Linux x86_64, unsigned Manifest commit)

---
 sci-physics/root/ChangeLog           |    4 ++++
 sci-physics/root/root-5.32.03.ebuild |    6 ++++--
 sci-physics/root/root-9999.ebuild    |    6 ++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index bd33ae5..cb21ccb 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  22 May 2012; Justin Lecher <jlec@gentoo.org> root-5.32.03.ebuild,
+  root-9999.ebuild:
+  Add missing eutils.eclass
+
 *root-5.32.03 (15 May 2012)
 
   15 May 2012; Andrew Savchenko <bircoph@gmail.com>

diff --git a/sci-physics/root/root-5.32.03.ebuild b/sci-physics/root/root-5.32.03.ebuild
index 8366d86..c356d2d 100644
--- a/sci-physics/root/root-5.32.03.ebuild
+++ b/sci-physics/root/root-5.32.03.ebuild
@@ -3,11 +3,11 @@
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
 
 EAPI=4
+
 PYTHON_DEPEND="python? 2"
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
-	inherit subversion
+	_SVN=subversion
 	ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk"
 	ESVN_OPTIONS="--non-interactive --trust-server-cert"
 	SRC_URI=""
@@ -17,6 +17,8 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${_SVN}
+
 DOC_PV=5_26
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 1b9f8e8..33a705f 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -3,11 +3,11 @@
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.01.ebuild,v 1.1 2012/03/02 05:34:01 bicatali Exp $
 
 EAPI=4
+
 PYTHON_DEPEND="python? 2"
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
-	inherit subversion
+	_SVN=subversion
 	ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk"
 	ESVN_OPTIONS="--non-interactive --trust-server-cert"
 	SRC_URI=""
@@ -17,6 +17,8 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${_SVN}
+
 DOC_PV=5_26
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-05-23  5:20 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-05-23  5:20 UTC (permalink / raw
  To: gentoo-commits

commit:     2185e8ccd2ff4d5e008d4342277de9a4fb4901f7
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed May 23 05:20:10 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed May 23 05:20:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2185e8cc

sci-physics/root: update User's Guide

---
 sci-physics/root/ChangeLog                         |    6 ++++++
 ...{root-5.32.03.ebuild => root-5.32.03-r1.ebuild} |    5 ++---
 sci-physics/root/root-9999.ebuild                  |    5 ++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index cb21ccb..9c08600 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-5.32.03-r1 (23 May 2012)
+
+  23 May 2012; Andrew Savchenko <bircoph@gmail.com> -root-5.32.03.ebuild,
+  +root-5.32.03-r1.ebuild, root-9999.ebuild:
+  Update ROOT User's Guide.
+
   22 May 2012; Justin Lecher <jlec@gentoo.org> root-5.32.03.ebuild,
   root-9999.ebuild:
   Add missing eutils.eclass

diff --git a/sci-physics/root/root-5.32.03.ebuild b/sci-physics/root/root-5.32.03-r1.ebuild
similarity index 98%
rename from sci-physics/root/root-5.32.03.ebuild
rename to sci-physics/root/root-5.32.03-r1.ebuild
index c356d2d..c20b911 100644
--- a/sci-physics/root/root-5.32.03.ebuild
+++ b/sci-physics/root/root-5.32.03-r1.ebuild
@@ -19,7 +19,6 @@ fi
 
 inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${_SVN}
 
-DOC_PV=5_26
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
 PATCH_PV=5.28.00b
@@ -28,7 +27,7 @@ PATCH_PV2=5.32.00
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
 SRC_URI="${SRC_URI}
-	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
+	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf
 		math? (
 			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
 			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
@@ -261,7 +260,7 @@ doc_install() {
 	cd "${S}"
 	if use doc; then
 		einfo "Installing user's guides"
-		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
+		dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
 		use math && dodoc \
 			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
 			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 33a705f..762ce88 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -19,7 +19,6 @@ fi
 
 inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${_SVN}
 
-DOC_PV=5_26
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
 PATCH_PV=5.28.00b
@@ -28,7 +27,7 @@ PATCH_PV2=5.32.00
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
 SRC_URI="${SRC_URI}
-	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
+	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf
 		math? (
 			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
 			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
@@ -262,7 +261,7 @@ doc_install() {
 	cd "${S}"
 	if use doc; then
 		einfo "Installing user's guides"
-		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
+		dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
 		use math && dodoc \
 			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
 			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-05-23 20:01 Kacper Kowalik
  0 siblings, 0 replies; 69+ messages in thread
From: Kacper Kowalik @ 2012-05-23 20:01 UTC (permalink / raw
  To: gentoo-commits

commit:     b3d0b7fe371ffcbd278f1a0aba1366f4caeadd20
Author:     Kacper Kowalik (Xarthisius) <xarthisius <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 19:59:48 2012 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Wed May 23 19:59:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b3d0b7fe

[sci-physics/root] add user.eclass for enew{user,group}

---
 sci-physics/root/root-5.32.03-r1.ebuild |    2 +-
 sci-physics/root/root-9999.ebuild       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-physics/root/root-5.32.03-r1.ebuild b/sci-physics/root/root-5.32.03-r1.ebuild
index c20b911..eaa1734 100644
--- a/sci-physics/root/root-5.32.03-r1.ebuild
+++ b/sci-physics/root/root-5.32.03-r1.ebuild
@@ -17,7 +17,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${_SVN}
+inherit elisp-common eutils user fdo-mime fortran-2 python toolchain-funcs ${_SVN}
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 762ce88..881b65f 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -17,7 +17,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${_SVN}
+inherit elisp-common eutils user fdo-mime fortran-2 python toolchain-funcs ${_SVN}
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-05-25 12:33 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-05-25 12:33 UTC (permalink / raw
  To: gentoo-commits

commit:     a4d1997d789d0f7d48dabd8a0a54b7b6ea57895f
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri May 25 12:32:55 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri May 25 12:32:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a4d1997d

sci-physics/root: sync live ebuild with upstream

---
 sci-physics/root/ChangeLog        |    5 +++++
 sci-physics/root/root-9999.ebuild |    2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 9c08600..d6d086b 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  25 May 2012; Andrew Savchenko <bircoph@gmail.com> root-9999.ebuild:
+  Adapt for upstream changes:
+  - enable-exceptions is gone;
+  - as-needed patch is upstream.
+
 *root-5.32.03-r1 (23 May 2012)
 
   23 May 2012; Andrew Savchenko <bircoph@gmail.com> -root-5.32.03.ebuild,

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 881b65f..d5fb847 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -136,7 +136,6 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
@@ -201,7 +200,6 @@ src_configure() {
 		--disable-builtin-zlib \
 		--disable-builtin-lzma \
 		--enable-astiff \
-		--enable-exceptions	\
 		--enable-explicitlink \
 		--enable-gdml \
 		--enable-memstat \



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-05-30 16:34 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-05-30 16:34 UTC (permalink / raw
  To: gentoo-commits

commit:     06f40d28b8cf5594ab1a85f8abc0cf6a7f5fc759
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed May 30 16:33:30 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed May 30 16:33:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=06f40d28

sci-physics/root: use virtualx eclass for Xvfb

---
 sci-physics/root/ChangeLog              |    4 ++++
 sci-physics/root/root-5.32.03-r2.ebuild |   16 +++++-----------
 sci-physics/root/root-9999.ebuild       |   16 +++++-----------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index b632101..45c3f58 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  30 May 2012; Andrew Savchenko <bircoph@gmail.com> root-5.32.03-r2.ebuild,
+  root-9999.ebuild:
+  Use virtualx eclass for Xvfb during htmldoc generation.
+
 *root-5.32.03-r2 (29 May 2012)
 
   29 May 2012; Andrew Savchenko <bircoph@gmail.com>

diff --git a/sci-physics/root/root-5.32.03-r2.ebuild b/sci-physics/root/root-5.32.03-r2.ebuild
index 27cad96..fa88aaa 100644
--- a/sci-physics/root/root-5.32.03-r2.ebuild
+++ b/sci-physics/root/root-5.32.03-r2.ebuild
@@ -17,7 +17,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs virtualx ${_SVN}
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -99,8 +99,7 @@ CDEPEND="
 	xrootd? ( net-libs/xrootd )"
 
 DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	htmldoc? ( x11-base/xorg-server[xvfb] )"
+	virtual/pkgconfig"
 
 RDEPEND="
 	virtual/fortran
@@ -112,6 +111,8 @@ REQUIRED_USE="
 	!X? ( !opengl !qt4 !xft )
 	htmldoc? ( X doc graphviz )"
 
+VIRTUALX_REQUIRED="htmldoc"
+
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {
@@ -283,20 +284,13 @@ src_compile() {
 		elisp-compile build/misc/*.el || die "elisp-compile failed"
 	fi
 	if use htmldoc; then
-		# we need X server running, THtml uses it for GUI snapshots
-		Xvfb -screen 0 1280x1024x24 :50 >/dev/null 2>&1 &
-		local xvfb_pid=$!
-		ps h -C Xvfb | grep -q ${xvfb_pid} || die "Xvfb failed to start"
-
 		LD_LIBRARY_PATH=${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \
 		ROOTSYS=${S} DISPLAY=":50" \
-		emake html || die "html doc generation failed"
+		Xemake html || die "html doc generation failed"
 		# if root.exe crashes, return code will be 0 due to gdb attach,
 		# so we need to check if last html file was generated;
 		# this check is volatile and can't catch crash on the last file.
 		[[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
-
-		kill ${xvfb_pid}
 	fi
 }
 

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 53e7853..9f55ad4 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -17,7 +17,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs virtualx ${_SVN}
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -101,8 +101,7 @@ CDEPEND="
 	xrootd? ( net-libs/xrootd )"
 
 DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	htmldoc? ( x11-base/xorg-server[xvfb] )"
+	virtual/pkgconfig"
 
 RDEPEND="
 	virtual/fortran
@@ -114,6 +113,8 @@ REQUIRED_USE="
 	!X? ( !opengl !qt4 !xft )
 	htmldoc? ( X doc graphviz )"
 
+VIRTUALX_REQUIRED="htmldoc"
+
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {
@@ -283,20 +284,13 @@ src_compile() {
 		elisp-compile build/misc/*.el || die "elisp-compile failed"
 	fi
 	if use htmldoc; then
-		# we need X server running, THtml uses it for GUI snapshots
-		Xvfb -screen 0 1280x1024x24 :50 >/dev/null 2>&1 &
-		local xvfb_pid=$!
-		ps h -C Xvfb | grep -q ${xvfb_pid} || die "Xvfb failed to start"
-
 		LD_LIBRARY_PATH=${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \
 		ROOTSYS=${S} DISPLAY=":50" \
-		emake html || die "html doc generation failed"
+		Xemake html || die "html doc generation failed"
 		# if root.exe crashes, return code will be 0 due to gdb attach,
 		# so we need to check if last html file was generated;
 		# this check is volatile and can't catch crash on the last file.
 		[[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
-
-		kill ${xvfb_pid}
 	fi
 }
 



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-06-13 15:45 Sebastien Fabbro
  0 siblings, 0 replies; 69+ messages in thread
From: Sebastien Fabbro @ 2012-06-13 15:45 UTC (permalink / raw
  To: gentoo-commits

commit:     f55cd03a1d32c087c41be0629f18d5de85464916
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Wed Jun 13 15:44:46 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 15:44:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f55cd03a

sci-physics/root: sync with tree

(Portage version: 2.1.10.63/git/Linux x86_64, unsigned Manifest commit)

---
 sci-physics/root/ChangeLog              |    4 +++
 sci-physics/root/metadata.xml           |   38 +++++++++++++++---------------
 sci-physics/root/root-5.32.03-r2.ebuild |   15 ++++++-----
 3 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 45c3f58..b583997 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  13 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> root-5.32.03-r2.ebuild,
+  metadata.xml:
+  sync with tree
+
   30 May 2012; Andrew Savchenko <bircoph@gmail.com> root-5.32.03-r2.ebuild,
   root-9999.ebuild:
   Use virtualx eclass for Xvfb during htmldoc generation.

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 4eb1afc..bcbc04f 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>bircoph@gmail.com</email>
-		<name>Andrew Savchenko</name>
-		<description>Maintainer. Assign bugs to him</description>
-	</maintainer>
-	<herd>sci-physics</herd>
-	<longdescription lang="en">
+<maintainer>
+  <email>bircoph@gmail.com</email>
+  <name>Andrew Savchenko</name>
+  <description>Maintainer. Assign bugs to him</description>
+</maintainer>
+<herd>sci-physics</herd>
+<longdescription lang="en">
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in
   high energy physics, but also in other data analysis applications. It
@@ -15,16 +15,16 @@
   statistics, serialization, optimization, linear algebra, graphics,
   GUI toolkit, and a complete visualization framework.
 </longdescription>
-	<use>
-		<flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
-		<flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-		<flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag>
-		<flag name="htmldoc">Generate html documentation</flag>
-		<flag name="llvm">Build the new EXPERIMENTAL cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
-		<flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
-		<flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
-		<flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
-		<flag name="reflex">Build the reflection database for the C++ interpreter</flag>
-		<flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
-	</use>
+<use>
+  <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
+  <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+  <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag>
+  <flag name="htmldoc">Generate html documentation</flag>
+  <flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
+  <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
+  <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
+  <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
+  <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
+  <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
+</use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-5.32.03-r2.ebuild b/sci-physics/root/root-5.32.03-r2.ebuild
index fa88aaa..d9b01f5 100644
--- a/sci-physics/root/root-5.32.03-r2.ebuild
+++ b/sci-physics/root/root-5.32.03-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.03-r2.ebuild,v 1.1 2012/06/13 15:42:21 bicatali Exp $
 
 EAPI=4
 
@@ -130,12 +130,13 @@ pkg_setup() {
 	enewuser rootd -1 -1 /var/spool/rootd rootd
 
 	if use math; then
-		if use openmp && ! tc-has-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"
-		elif use openmp; then
-			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+		if use openmp; then
+			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+				ewarn "You are using a gcc without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
 		elif use mpi; then
 			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
 		fi



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-06-19 20:20 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-06-19 20:20 UTC (permalink / raw
  To: gentoo-commits

commit:     05d8d182e85cb2d35f6a2ae5743f26efeb7bc864
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue Jun 19 20:18:31 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue Jun 19 20:18:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=05d8d182

sci-physics/root: fix repoman warnings and update manifest

---
 sci-physics/root/root-5.32.03-r2.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-physics/root/root-5.32.03-r2.ebuild b/sci-physics/root/root-5.32.03-r2.ebuild
index d9b01f5..b20bb5d 100644
--- a/sci-physics/root/root-5.32.03-r2.ebuild
+++ b/sci-physics/root/root-5.32.03-r2.ebuild
@@ -17,7 +17,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs virtualx ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user virtualx ${_SVN}
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-06-19 23:18 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-06-19 23:18 UTC (permalink / raw
  To: gentoo-commits

commit:     33835d7d7e4ba85568a54fa49ab410295e699c7c
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue Jun 19 23:17:02 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue Jun 19 23:17:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=33835d7d

sci-physics/root: version bump for 5.34.00

---
 sci-physics/root/ChangeLog           |    5 +
 sci-physics/root/root-5.34.00.ebuild |  378 ++++++++++++++++++++++++++++++++++
 2 files changed, 383 insertions(+), 0 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 281ea31..c827619 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-5.34.00 (19 Jun 2012)
+
+  19 Jun 2012; Andrew Savchenko <bircoph@gmail.com> +root-5.34.00.ebuild:
+  Version bump form 5.34.00 based on live ebuild.
+
   19 Jun 2012; Andrew Savchenko <bircoph@gmail.com>
   -files/root-5.34-dotfont.patch, files/root-5.34-htmldoc.patch,
   root-9999.ebuild, +files/root-9999-dotfont.patch:

diff --git a/sci-physics/root/root-5.34.00.ebuild b/sci-physics/root/root-5.34.00.ebuild
new file mode 100644
index 0000000..08d6e3f
--- /dev/null
+++ b/sci-physics/root/root-5.34.00.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+
+if [[ ${PV} == "9999" ]] ; then
+	_SVN=subversion
+	ESVN_REPO_URI="http://root.cern.ch/svn/root/trunk"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user virtualx ${_SVN}
+
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+PATCH_PV2=5.32.00
+PATCH_PV3=5.34
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="${SRC_URI}
+	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf
+		math? (
+			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
+		htmldoc? (
+			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="+X afs avahi c++0x clarens doc emacs examples fits fftw graphviz htmldoc
+	kerberos ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix
+	pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
+
+CDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-fonts/dejavu
+	media-libs/freetype
+	media-libs/giflib
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/shadow
+	X? (
+		media-libs/ftgl
+		media-libs/glew
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		|| (
+			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
+			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+		)
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+		qt4? (
+			x11-libs/qt-gui:4
+			x11-libs/qt-opengl:4
+			x11-libs/qt-qt3support:4
+			x11-libs/qt-svg:4
+			x11-libs/qt-webkit:4
+			x11-libs/qt-xmlpatterns:4 )
+		xft? ( x11-libs/libXft )
+		)
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi )
+	c++0x? ( >=sys-devel/gcc-4.7.0 )
+	clarens? ( dev-libs/xmlrpc-c[curl] )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio )
+	fftw? ( sci-libs/fftw:3.0 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	ruby? (
+			dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )
+	xrootd? ( >=net-libs/xrootd-3.2.0 )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="
+	virtual/fortran
+	${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
+
+REQUIRED_USE="
+	!X? ( !opengl !qt4 !xft )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python_pkg_setup
+	echo
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "HDFS, 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)\""
+	echo
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	if use math; then
+		if use openmp; then
+			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+				ewarn "You are using a gcc without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+	rm -rf graf2d/asimage/src/libAfterImage || die
+	rm -rf graf3d/ftgl/{inc,src} || die
+	rm -rf graf2d/freetype/src || die
+	rm -rf graf3d/glew/{inc,src} || die
+	rm -rf core/pcre/src || die
+	rm -rf math/unuran/src/unuran-*.tar.gz || die
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
+	rm -rf core/lzma/src/*.tar.gz || die
+	rm graf3d/gl/{inc,src}/gl2ps.* || die
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+
+	# Make html docs self-consistent for offline work (based on Fedora spec)
+	if use htmldoc; then
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV3}-htmldoc.patch
+		# make images local
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
+			-i etc/html/header.html || die "htmldoc sed failed"
+
+		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
+			die "htmldoc preparation failed"
+	fi
+}
+
+src_configure() {
+	# the configure script is not the standard autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
+		--with-afs-shared=yes \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-builtin-lzma \
+		--disable-cling \
+		--enable-astiff \
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		$(use_enable X x11) \
+		$(use_enable X asimage) \
+		$(use_enable afs) \
+		$(use_enable avahi bonjour) \
+		$(use_enable clarens) \
+		$(use_enable clarens peac) \
+		$(use_enable fits fitsio) \
+		$(use_enable fftw fftw3) \
+		$(use_enable graphviz gviz) \
+		$(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 tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable postgres pgsql) \
+		$(use_enable prefix rpath) \
+		$(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="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
+	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"
+		dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	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
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+	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}
+
+	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
+	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
+
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	doenvd 99root
+
+	# 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 "${ED}"/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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
+	rm "${ED}"usr/share/root/fonts/LICENSE || die
+	pushd "${ED}"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 || die
+	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
+	rm -f "${ED}"/etc/root/proof/*.sample || die
+	rm -rf "${ED}"/etc/root/daemons || die
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin/ || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_optimize /usr/$(get_libdir)/root
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_cleanup /usr/$(get_libdir)/root
+}



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-06-20  9:18 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-06-20  9:18 UTC (permalink / raw
  To: gentoo-commits

commit:     184170cbd76b7a5be2e33f2615a8d245554e3b82
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Jun 20 09:13:56 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Jun 20 09:13:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=184170cb

sci-physics/root: backport htmldoc fixes to 5.32 branch

This fixes bootstrap and some downgrade conditions, where no valid
root is available for documentation build.
Revbump is required to maintain dependecy consistency.

---
 sci-physics/root/ChangeLog                         |    6 +++++
 ...ot-5.32.03-r2.ebuild => root-5.32.03-r3.ebuild} |   24 ++++---------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index c827619..53f4413 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-5.32.03-r3 (20 Jun 2012)
+
+  20 Jun 2012; Andrew Savchenko <bircoph@gmail.com> -root-5.32.03-r2.ebuild,
+  +root-5.32.03-r3.ebuild:
+  Backport htmldoc fixes for 5.32 branch.
+
 *root-5.34.00 (19 Jun 2012)
 
   19 Jun 2012; Andrew Savchenko <bircoph@gmail.com> +root-5.34.00.ebuild:

diff --git a/sci-physics/root/root-5.32.03-r2.ebuild b/sci-physics/root/root-5.32.03-r3.ebuild
similarity index 93%
rename from sci-physics/root/root-5.32.03-r2.ebuild
rename to sci-physics/root/root-5.32.03-r3.ebuild
index b20bb5d..9d87c1c 100644
--- a/sci-physics/root/root-5.32.03-r2.ebuild
+++ b/sci-physics/root/root-5.32.03-r3.ebuild
@@ -17,7 +17,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user virtualx ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -44,7 +44,6 @@ IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerbero
 
 CDEPEND="
 	app-arch/xz-utils
-	!app-doc/root-docs
 	>=dev-lang/cfortran-4.4-r2
 	dev-libs/libpcre
 	media-fonts/dejavu
@@ -107,11 +106,12 @@ RDEPEND="
 	reflex? ( dev-cpp/gccxml )
 	xinetd? ( sys-apps/xinetd )"
 
+PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
+
 REQUIRED_USE="
 	!X? ( !opengl !qt4 !xft )
-	htmldoc? ( X doc graphviz )"
-
-VIRTUALX_REQUIRED="htmldoc"
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )"
 
 S="${WORKDIR}/${PN}"
 
@@ -201,9 +201,6 @@ src_prepare() {
 
 		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
 			die "htmldoc preparation failed"
-
-		# set build etc directory
-		sed "s%@PWD@%${S}%" -i build/unix/makehtml.sh || die "htmldoc sed failed"
 	fi
 }
 
@@ -284,15 +281,6 @@ src_compile() {
 	if use emacs; then
 		elisp-compile build/misc/*.el || die "elisp-compile failed"
 	fi
-	if use htmldoc; then
-		LD_LIBRARY_PATH=${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \
-		ROOTSYS=${S} DISPLAY=":50" \
-		Xemake html || die "html doc generation failed"
-		# if root.exe crashes, return code will be 0 due to gdb attach,
-		# so we need to check if last html file was generated;
-		# this check is volatile and can't catch crash on the last file.
-		[[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
-	fi
 }
 
 doc_install() {
@@ -303,8 +291,6 @@ doc_install() {
 		use math && dodoc \
 			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
 			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-		# too large data to copy
-		use htmldoc && mv htmldoc "${ED}usr/share/doc/${PF}/html"
 	fi
 
 	if use examples; then



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-06-20  9:18 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-06-20  9:18 UTC (permalink / raw
  To: gentoo-commits

commit:     2f928facdb47374bf1f45a1322cae6b3f6938ba3
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Jun 20 07:33:44 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Jun 20 07:33:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2f928fac

sci-physics/root: remove redundant virtualx

Xvfb-related stuff is now in the app-doc/root-docs.

---
 sci-physics/root/root-5.34.00.ebuild |    2 +-
 sci-physics/root/root-9999.ebuild    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-physics/root/root-5.34.00.ebuild b/sci-physics/root/root-5.34.00.ebuild
index 29d1b79..2a75fd8 100644
--- a/sci-physics/root/root-5.34.00.ebuild
+++ b/sci-physics/root/root-5.34.00.ebuild
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user virtualx ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index cc68915..e9b5476 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user virtualx ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-07-02 19:42 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2012-07-02 19:42 UTC (permalink / raw
  To: gentoo-commits

commit:     3f8e874dad67c8c844bd621df6df98cc234ec91d
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 16:44:21 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 16:44:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3f8e874d

sci-physics/root: Drop in tree versions

(Portage version: 2.2.0_alpha114/git/Linux x86_64, unsigned Manifest commit)

---
 sci-physics/root/ChangeLog              |    4 +
 sci-physics/root/metadata.xml           |   40 ++--
 sci-physics/root/root-5.32.03-r3.ebuild |  380 -------------------------------
 sci-physics/root/root-5.34.00.ebuild    |  377 ------------------------------
 4 files changed, 24 insertions(+), 777 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 53f4413..6bd39ed 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  28 Jun 2012; Justin Lecher <jlec@gentoo.org> -root-5.32.03-r3.ebuild,
+  -root-5.34.00.ebuild, metadata.xml:
+  Drop in tree versions
+
 *root-5.32.03-r3 (20 Jun 2012)
 
   20 Jun 2012; Andrew Savchenko <bircoph@gmail.com> -root-5.32.03-r2.ebuild,

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index cb56d9f..5317980 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bircoph@gmail.com</email>
-  <name>Andrew Savchenko</name>
-  <description>Maintainer. Assign bugs to him</description>
-</maintainer>
-<herd>sci-physics</herd>
-<longdescription lang="en">
+	<maintainer>
+		<email>bircoph@gmail.com</email>
+		<name>Andrew Savchenko</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<herd>sci-physics</herd>
+	<longdescription lang="en">
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in
   high energy physics, but also in other data analysis applications. It
@@ -15,17 +15,17 @@
   statistics, serialization, optimization, linear algebra, graphics,
   GUI toolkit, and a complete visualization framework.
 </longdescription>
-<use>
-  <flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>>=4.7.0</flag>
-  <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
-  <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-  <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag>
-  <flag name="htmldoc">Generate html documentation</flag>
-  <flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
-  <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
-  <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
-  <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
-  <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
-  <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
-</use>
+	<use>
+		<flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>&gt;=4.7.0</flag>
+		<flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
+		<flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+		<flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag>
+		<flag name="htmldoc">Generate html documentation</flag>
+		<flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
+		<flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
+		<flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
+		<flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
+		<flag name="reflex">Build the reflection database for the C++ interpreter</flag>
+		<flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
+	</use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-5.32.03-r3.ebuild b/sci-physics/root/root-5.32.03-r3.ebuild
deleted file mode 100644
index 9d87c1c..0000000
--- a/sci-physics/root/root-5.32.03-r3.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.03-r2.ebuild,v 1.1 2012/06/13 15:42:21 bicatali Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
-
-if [[ ${PV} == "9999" ]] ; then
-	_SVN=subversion
-	ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk"
-	ESVN_OPTIONS="--non-interactive --trust-server-cert"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
-
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.32.00
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="${SRC_URI}
-	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf
-		math? (
-			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
-		htmldoc? (
-			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerberos
-	ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6
-	pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
-
-CDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-fonts/dejavu
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/shadow
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| (
-			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
-			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
-		)
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		qt4? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-opengl:4
-			x11-libs/qt-qt3support:4
-			x11-libs/qt-svg:4
-			x11-libs/qt-webkit:4
-			x11-libs/qt-xmlpatterns:4 )
-		xft? ( x11-libs/libXft )
-		)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c[curl] )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	xrootd? ( net-libs/xrootd )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	virtual/fortran
-	${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
-
-REQUIRED_USE="
-	!X? ( !opengl !qt4 !xft )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, 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)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp; then
-			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-				ewarn "You are using a gcc without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -rf graf2d/asimage/src/libAfterImage || die
-	rm -rf graf3d/ftgl/{inc,src} || die
-	rm -rf graf2d/freetype/src || die
-	rm -rf graf3d/glew/{inc,src} || die
-	rm -rf core/pcre/src || die
-	rm -rf math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
-	rm -rf core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-
-	# Make html docs self-consistent for offline work (based on Fedora spec)
-	if use htmldoc; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
-		# make images local
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
-			-i etc/html/header.html || die "htmldoc sed failed"
-
-		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
-			die "htmldoc preparation failed"
-	fi
-}
-
-src_configure() {
-	# the configure script is not the standard autotools
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-ld=$(tc-getCXX) \
-		--with-afs-shared=yes \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--disable-cling \
-		--enable-astiff \
-		--enable-exceptions	\
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(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 tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable postgres pgsql) \
-		$(use_enable prefix rpath) \
-		$(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="${CXXFLAGS}" F77OPT="${FFLAGS}"
-	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"
-		dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	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
-	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-	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}
-
-	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
-	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
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root
-
-	# 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 "${ED}"/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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
-	rm "${ED}"usr/share/root/fonts/LICENSE || die
-	pushd "${ED}"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 || die
-	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
-	rm -f "${ED}"/etc/root/proof/*.sample || die
-	rm -rf "${ED}"/etc/root/daemons || die
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin/ || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
-}

diff --git a/sci-physics/root/root-5.34.00.ebuild b/sci-physics/root/root-5.34.00.ebuild
deleted file mode 100644
index 2a75fd8..0000000
--- a/sci-physics/root/root-5.34.00.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
-
-if [[ ${PV} == "9999" ]] ; then
-	_SVN=subversion
-	ESVN_REPO_URI="http://root.cern.ch/svn/root/trunk"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
-
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.32.00
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="${SRC_URI}
-	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf
-		math? (
-			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
-		htmldoc? (
-			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="+X afs avahi c++0x clarens doc emacs examples fits fftw graphviz htmldoc
-	kerberos ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix
-	pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
-
-CDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-fonts/dejavu
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/shadow
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| (
-			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
-			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
-		)
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		qt4? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-opengl:4
-			x11-libs/qt-qt3support:4
-			x11-libs/qt-svg:4
-			x11-libs/qt-webkit:4
-			x11-libs/qt-xmlpatterns:4 )
-		xft? ( x11-libs/libXft )
-		)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	c++0x? ( >=sys-devel/gcc-4.7.0 )
-	clarens? ( dev-libs/xmlrpc-c[curl] )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	xrootd? ( >=net-libs/xrootd-3.2.0 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	virtual/fortran
-	${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
-
-REQUIRED_USE="
-	!X? ( !opengl !qt4 !xft )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, 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)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp; then
-			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-				ewarn "You are using a gcc without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -rf graf2d/asimage/src/libAfterImage || die
-	rm -rf graf3d/ftgl/{inc,src} || die
-	rm -rf graf2d/freetype/src || die
-	rm -rf graf3d/glew/{inc,src} || die
-	rm -rf core/pcre/src || die
-	rm -rf math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
-	rm -rf core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-
-	# Make html docs self-consistent for offline work (based on Fedora spec)
-	if use htmldoc; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
-		# make images local
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
-			-i etc/html/header.html || die "htmldoc sed failed"
-
-		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
-			die "htmldoc preparation failed"
-	fi
-}
-
-src_configure() {
-	# the configure script is not the standard autotools
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-ld=$(tc-getCXX) \
-		--with-afs-shared=yes \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--disable-cling \
-		--enable-astiff \
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(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 tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable postgres pgsql) \
-		$(use_enable prefix rpath) \
-		$(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="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
-	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"
-		dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	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
-	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-	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}
-
-	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
-	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
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root
-
-	# 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 "${ED}"/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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
-	rm "${ED}"usr/share/root/fonts/LICENSE || die
-	pushd "${ED}"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 || die
-	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
-	rm -f "${ED}"/etc/root/proof/*.sample || die
-	rm -rf "${ED}"/etc/root/daemons || die
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin/ || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
-}



^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-07-21 22:43 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-07-21 22:43 UTC (permalink / raw
  To: gentoo-commits

commit:     59f04e92137d70587e29683fa2be0b8934620325
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Jul 21 22:41:28 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sat Jul 21 22:41:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=59f04e92

sci-physics/root: update live ebuild

- clarens and peac are purged;
- opencascade support is added;

---
 sci-physics/root/ChangeLog        |    5 +++++
 sci-physics/root/metadata.xml     |    1 +
 sci-physics/root/root-9999.ebuild |    6 ++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index f03cc43..6867500 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  21 Jul 2012; Andrew Savchenko <bircoph@gmail.com> root-9999.ebuild,
+  metadata.xml:
+  Clarens and PEAC were removed from ROOT.
+  CAD interface using sci-libs/opencascade was added.
+
   21 Jul 2012; Andrew Savchenko <bircoph@gmail.com>
   -files/root-5.32.00-explicit-functions.patch, +root-5.34.00.ebuild,
   root-9999.ebuild:

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 4e6d2b2..705abb6 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>&gt;=4.7.0</flag>
 		<flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
 		<flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+		<flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
 		<flag name="htmldoc">Generate html documentation</flag>
 		<flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
 		<flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index d28ef75..4e2f20d 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -37,7 +37,7 @@ SRC_URI="${SRC_URI}
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="+X afs avahi -c++0x clarens doc emacs examples fits fftw graphviz htmldoc
+IUSE="+X afs avahi -c++0x doc emacs examples fits fftw geocad graphviz htmldoc
 	kerberos ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
 	pythia6 pythia8 python qt4 +reflex ruby ssl xinetd xml xrootd"
 
@@ -75,10 +75,10 @@ CDEPEND="
 		)
 	afs? ( net-fs/openafs )
 	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c[curl] )
 	emacs? ( virtual/emacs )
 	fits? ( sci-libs/cfitsio )
 	fftw? ( sci-libs/fftw:3.0 )
+	geocad? ( sci-libs/opencascade )
 	graphviz? ( media-gfx/graphviz )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
@@ -244,8 +244,6 @@ src_configure() {
 		$(use_enable X xft) \
 		$(use_enable afs) \
 		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
 		$(use_enable fits fitsio) \
 		$(use_enable fftw fftw3) \
 		$(use_enable graphviz gviz) \


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-07-22 12:45 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2012-07-22 12:45 UTC (permalink / raw
  To: gentoo-commits

commit:     634563d106cf6e9d68f1c2db41b2e42a2f1f2dff
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Jul 22 12:42:44 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Jul 22 12:42:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=634563d1

sci-physics/root: version bump

---
 sci-physics/root/ChangeLog                         |    7 +++++++
 sci-physics/root/metadata.xml                      |    1 -
 .../{root-5.34.00.ebuild => root-5.34.01.ebuild}   |    5 +----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index f575ac2..ca85e0b 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-5.34.01 (22 Jul 2012)
+
+  22 Jul 2012; Andrew Savchenko <bircoph@gmail.com> -root-5.34.00.ebuild,
+  +root-5.34.01.ebuild, metadata.xml:
+  Version bump. Clarens and PEAC are gone, despite this is a minor
+  release.
+
   22 Jul 2012; Andrew Savchenko <bircoph@gmail.com> root-9999.ebuild,
   +files/root-9999-cling.patch:
   One step further to build with cling. But ATM patched version of

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 705abb6..bea8306 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -17,7 +17,6 @@
 </longdescription>
 	<use>
 		<flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>&gt;=4.7.0</flag>
-		<flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
 		<flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
 		<flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
 		<flag name="htmldoc">Generate html documentation</flag>

diff --git a/sci-physics/root/root-5.34.00.ebuild b/sci-physics/root/root-5.34.01.ebuild
similarity index 98%
rename from sci-physics/root/root-5.34.00.ebuild
rename to sci-physics/root/root-5.34.01.ebuild
index 358fed1..53119c0 100644
--- a/sci-physics/root/root-5.34.00.ebuild
+++ b/sci-physics/root/root-5.34.01.ebuild
@@ -37,7 +37,7 @@ SRC_URI="${SRC_URI}
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="+X afs avahi -c++0x clarens doc emacs examples fits fftw graphviz htmldoc
+IUSE="+X afs avahi -c++0x doc emacs examples fits fftw graphviz htmldoc
 	kerberos ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix
 	pythia6 pythia8 python qt4 +reflex ruby ssl xinetd xml xrootd"
 
@@ -75,7 +75,6 @@ CDEPEND="
 		)
 	afs? ( net-fs/openafs )
 	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c[curl] )
 	emacs? ( virtual/emacs )
 	fits? ( sci-libs/cfitsio )
 	fftw? ( sci-libs/fftw:3.0 )
@@ -244,8 +243,6 @@ src_configure() {
 		$(use_enable X xft) \
 		$(use_enable afs) \
 		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
 		$(use_enable fits fitsio) \
 		$(use_enable fftw fftw3) \
 		$(use_enable graphviz gviz) \


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2012-10-29 11:00 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2012-10-29 11:00 UTC (permalink / raw
  To: gentoo-commits

commit:     e813ec7ad9df791cb20512e6917c02dbd5f6b6d1
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 26 10:49:28 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Oct 26 10:49:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e813ec7a

sci-physics/root: Drop virtual/fortran from DEP as it is provided by the fortran-2.eclass

Package-Manager: portage-2.2.0_alpha141

---
 sci-physics/root/ChangeLog        |    3 +++
 sci-physics/root/metadata.xml     |   14 +++++++-------
 sci-physics/root/root-9999.ebuild |    4 +---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 65ee183..8e97e9c 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  26 Oct 2012; Justin Lecher <jlec@gentoo.org> root-9999.ebuild, metadata.xml:
+  Drop virtual/fortran from DEP as it is provided by the fortran-2.eclass
+
 *root-5.34.03 (25 Oct 2012)
 
   25 Oct 2012; Andrew Savchenko <bircoph@gmail.com>

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 705abb6..94d70a3 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bircoph@gmail.com</email>
-  <name>Andrew Savchenko</name>
-  <description>Maintainer. Assign bugs to him</description>
-</maintainer>
-<herd>sci-physics</herd>
-<longdescription lang="en">
+	<maintainer>
+		<email>bircoph@gmail.com</email>
+		<name>Andrew Savchenko</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<herd>sci-physics</herd>
+	<longdescription lang="en">
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in
   high energy physics, but also in other data analysis applications. It

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index af9c8ad..9523e3a 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -100,9 +100,7 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 
-RDEPEND="
-	virtual/fortran
-	${CDEPEND}
+RDEPEND="${CDEPEND}
 	reflex? ( dev-cpp/gccxml )
 	xinetd? ( sys-apps/xinetd )"
 


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2013-05-28 20:28 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2013-05-28 20:28 UTC (permalink / raw
  To: gentoo-commits

commit:     6d9bea070c2086e48644f5907051d0b21aa5af69
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue May 28 20:25:58 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue May 28 20:25:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6d9bea07

root: fix build with postgres

---
 sci-physics/root/ChangeLog                         |  7 +++++
 .../{root-5.34.05.ebuild => root-5.34.07.ebuild}   | 34 ++++++++++++----------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 3317e68..bae3fb6 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-5.34.07 (28 May 2013)
+
+  28 May 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.34.05.ebuild,
+  +root-5.34.07.ebuild:
+  Fix build with USE="postgres": Gentoo doesn't provide
+  /usr/include/postgresql symlink anymore. Remove old.
+
   03 Mar 2013; Justin Lecher <jlec@gentoo.org> root-5.34.05.ebuild,
   root-9999.ebuild, metadata.xml:
   Update to new qt deps names

diff --git a/sci-physics/root/root-5.34.05.ebuild b/sci-physics/root/root-5.34.07.ebuild
similarity index 93%
rename from sci-physics/root/root-5.34.05.ebuild
rename to sci-physics/root/root-5.34.07.ebuild
index ee7dad8..6c85440 100644
--- a/sci-physics/root/root-5.34.05.ebuild
+++ b/sci-physics/root/root-5.34.07.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.03.ebuild,v 1.2 2013/01/22 17:18:55 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.07.ebuild,v 1.1 2013/05/23 23:52:31 bicatali Exp $
 
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
+EAPI=5
 
 if [[ ${PV} == "9999" ]] ; then
-	_SVN=subversion
-	ESVN_REPO_URI="http://root.cern.ch/svn/root/trunk"
+	_GIT=git-2
+	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
 	SRC_URI=""
 	KEYWORDS=""
 else
@@ -16,7 +14,8 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN} versionator
+PYTHON_COMPAT=( python2_{5,6,7} )
+inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_GIT} versionator
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -89,6 +88,7 @@ CDEPEND="
 	postgres? ( dev-db/postgresql-base )
 	pythia6? ( sci-physics/pythia:6 )
 	pythia8? ( sci-physics/pythia:8 )
+	python? ( ${PYTHON_DEPS} )
 	ruby? (
 			dev-lang/ruby
 			dev-ruby/rubygems )
@@ -115,8 +115,7 @@ S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	fortran-2_pkg_setup
-	python_set_active_version 2
-	python_pkg_setup
+	use python && python-single-r1_pkg_setup
 	echo
 	elog "There are extra options on packages not yet in Gentoo:"
 	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
@@ -207,6 +206,8 @@ src_prepare() {
 }
 
 src_configure() {
+	local myconfflags=""
+	use postgres && myconfflags+=" --with-pgsql-incdir=$(pg_config --includedir)"
 	# the configure script is not the standard autotools
 	./configure \
 		--prefix="${EPREFIX}"/usr \
@@ -271,6 +272,7 @@ src_configure() {
 		$(use_enable ssl) \
 		$(use_enable xml) \
 		$(use_enable xrootd) \
+		${myconfflags} \
 		${EXTRA_ECONF} \
 		|| die "configure failed"
 }
@@ -321,10 +323,9 @@ daemon_install() {
 
 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
+	echo "Icon=root-system-bin" >> etc/root.desktop
+	domenu etc/root.desktop
+	doicon build/package/debian/root-system-bin.png
 
 	insinto /usr/share/icons/hicolor/48x48/mimetypes
 	doins build/package/debian/application-x-root.png
@@ -338,7 +339,10 @@ src_install() {
 
 	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
 	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	if use python; then
+		echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+		python_optimize /usr/$(get_libdir)/root
+	fi
 	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
 	doenvd 99root
 
@@ -370,10 +374,8 @@ src_install() {
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
-	use python && python_mod_optimize /usr/$(get_libdir)/root
 }
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
-	use python && python_mod_cleanup /usr/$(get_libdir)/root
 }


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2013-06-04 11:59 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2013-06-04 11:59 UTC (permalink / raw
  To: gentoo-commits

commit:     846ccf51380c63547ed187e7ed0f413efa0d1f1a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 11:56:41 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 11:56:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=846ccf51

sci-physics/root: Fix for correct usage of new python eclasses

Package-Manager: portage-2.2.0_alpha177

---
 sci-physics/root/ChangeLog           |  3 +++
 sci-physics/root/root-5.34.07.ebuild | 13 +++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index bae3fb6..78c4b9c 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  04 Jun 2013; Justin Lecher <jlec@gentoo.org> root-5.34.07.ebuild:
+  Fix for correct usage of new python eclasses
+
 *root-5.34.07 (28 May 2013)
 
   28 May 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.34.05.ebuild,

diff --git a/sci-physics/root/root-5.34.07.ebuild b/sci-physics/root/root-5.34.07.ebuild
index 6c85440..d196d6e 100644
--- a/sci-physics/root/root-5.34.07.ebuild
+++ b/sci-physics/root/root-5.34.07.ebuild
@@ -41,6 +41,13 @@ IUSE="+X afs avahi -c++0x doc emacs examples fits fftw graphviz htmldoc
 	kerberos ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix
 	pythia6 pythia8 python qt4 +reflex ruby ssl xinetd xml xrootd"
 
+REQUIRED_USE="
+	!X? ( !opengl !qt4 )
+	htmldoc? ( doc )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
 CDEPEND="
 	app-arch/xz-utils
 	>=dev-lang/cfortran-4.4-r2
@@ -105,12 +112,6 @@ RDEPEND="${CDEPEND}
 
 PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
 
-REQUIRED_USE="
-	!X? ( !opengl !qt4 )
-	htmldoc? ( doc )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )"
-
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2013-06-08 15:00 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2013-06-08 15:00 UTC (permalink / raw
  To: gentoo-commits

commit:     ab3ad8f5afa35110c2327e436a600fdcd48ada8d
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Jun  8 14:59:12 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sat Jun  8 14:59:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ab3ad8f5

sci-physics/root: version bump

---
 sci-physics/root/ChangeLog                                    | 6 ++++++
 sci-physics/root/{root-5.34.07.ebuild => root-5.34.08.ebuild} | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 78c4b9c..34d215b 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-5.34.08 (08 Jun 2013)
+
+  08 Jun 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.34.07.ebuild,
+  +root-5.34.08.ebuild:
+  Version bump. Adapt for src path changes.
+
   04 Jun 2013; Justin Lecher <jlec@gentoo.org> root-5.34.07.ebuild:
   Fix for correct usage of new python eclasses
 

diff --git a/sci-physics/root/root-5.34.07.ebuild b/sci-physics/root/root-5.34.08.ebuild
similarity index 98%
rename from sci-physics/root/root-5.34.07.ebuild
rename to sci-physics/root/root-5.34.08.ebuild
index d196d6e..42e4cbd 100644
--- a/sci-physics/root/root-5.34.07.ebuild
+++ b/sci-physics/root/root-5.34.08.ebuild
@@ -26,7 +26,7 @@ PATCH_PV3=5.34.05
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
 SRC_URI="${SRC_URI}
-	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf -> ROOTUsersGuide-${PV}.pdf
+	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuide-${PV}.pdf
 		math? (
 			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
 			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
@@ -112,7 +112,7 @@ RDEPEND="${CDEPEND}
 
 PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
 
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${PN}-v5-34-00-patches"
 
 pkg_setup() {
 	fortran-2_pkg_setup


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2013-06-29  6:14 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2013-06-29  6:14 UTC (permalink / raw
  To: gentoo-commits

commit:     91b0c135710a2340f32d4763ec9068599eb2a01b
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Jun 29 06:13:38 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sat Jun 29 06:13:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=91b0c135

sci-physics/root: version bump

---
 sci-physics/root/ChangeLog                                |  6 ++++++
 sci-physics/root/metadata.xml                             |  1 +
 .../root/{root-5.34.08.ebuild => root-5.34.09.ebuild}     | 15 +++++++++------
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 34d215b..4bbc58b 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-5.34.09 (29 Jun 2013)
+
+  29 Jun 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.34.08.ebuild,
+  +root-5.34.09.ebuild:
+  Version bump.
+
 *root-5.34.08 (08 Jun 2013)
 
   08 Jun 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.34.07.ebuild,

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 24363d6..a04fac3 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -22,6 +22,7 @@
     <flag name="htmldoc">Generate html documentation</flag>
     <flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
     <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
+    <flag name="metric">Default to A4 paper size and metric measurement</flag>
     <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
     <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
     <flag name="reflex">Build the reflection database for the C++ interpreter</flag>

diff --git a/sci-physics/root/root-5.34.08.ebuild b/sci-physics/root/root-5.34.09.ebuild
similarity index 94%
rename from sci-physics/root/root-5.34.08.ebuild
rename to sci-physics/root/root-5.34.09.ebuild
index 42e4cbd..24465e0 100644
--- a/sci-physics/root/root-5.34.08.ebuild
+++ b/sci-physics/root/root-5.34.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.07.ebuild,v 1.1 2013/05/23 23:52:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.08.ebuild,v 1.2 2013/06/11 16:29:51 bicatali Exp $
 
 EAPI=5
 
@@ -26,10 +26,12 @@ PATCH_PV3=5.34.05
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
 SRC_URI="${SRC_URI}
-	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuide-${PV}.pdf
+	doc? (
 		math? (
 			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
 			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
+		metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf )
+	   !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf )
 		htmldoc? (
 			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
 			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
@@ -38,8 +40,8 @@ SRC_URI="${SRC_URI}
 SLOT="0"
 LICENSE="LGPL-2.1"
 IUSE="+X afs avahi -c++0x doc emacs examples fits fftw graphviz htmldoc
-	kerberos ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix
-	pythia6 pythia8 python qt4 +reflex ruby ssl xinetd xml xrootd"
+	kerberos ldap +math +metric mpi mysql odbc +opengl openmp oracle postgres
+	prefix pythia6 pythia8 python qt4 +reflex ruby ssl xinetd xml xrootd"
 
 REQUIRED_USE="
 	!X? ( !opengl !qt4 )
@@ -112,7 +114,7 @@ RDEPEND="${CDEPEND}
 
 PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
 
-S="${WORKDIR}/${PN}-v5-34-00-patches"
+S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	fortran-2_pkg_setup
@@ -289,7 +291,8 @@ doc_install() {
 	cd "${S}"
 	if use doc; then
 		einfo "Installing user's guides"
-		dodoc "${DISTDIR}"/ROOTUsersGuide-${PV}.pdf
+		use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \
+			dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf
 		use math && dodoc \
 			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
 			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2013-09-17 19:13 Christoph Junghans
  0 siblings, 0 replies; 69+ messages in thread
From: Christoph Junghans @ 2013-09-17 19:13 UTC (permalink / raw
  To: gentoo-commits

commit:     cd0a32797533046441a8c1b83fdb868a736067df
Author:     poletti-marco <poletti.marco <AT> gmail <DOT> com>
AuthorDate: Tue Sep 17 18:49:10 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 18:49:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cd0a3279

Update root-9999.ebuild

---
 sci-physics/root/root-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 8d162b8..0543c90 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -82,7 +82,7 @@ CDEPEND="
 	graphviz? ( media-gfx/graphviz )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	llvm? ( =sys-devel/clang-9999 =sys-devel/llvm-9999 )
+	llvm? ( >=sys-devel/clang-9999 =sys-devel/llvm-9999 )
 	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
 	mysql? ( virtual/mysql )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2013-10-04 23:39 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2013-10-04 23:39 UTC (permalink / raw
  To: gentoo-commits

commit:     87ad44ebb13dffb8694c825f7fa8cc305fb21b15
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Oct  4 23:33:12 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Oct  4 23:33:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=87ad44eb

sci-physics/root: version bump (bug 486620)

---
 sci-physics/root/ChangeLog                                    | 7 +++++++
 sci-physics/root/{root-5.34.09.ebuild => root-5.34.10.ebuild} | 8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 4bbc58b..84c4640 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-5.34.10 (04 Oct 2013)
+
+  04 Oct 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.34.09.ebuild,
+  +root-5.34.10.ebuild:
+  Version bump per bug 486620 (changes by Oliver Freyermuth).
+  Remove old.
+
 *root-5.34.09 (29 Jun 2013)
 
   29 Jun 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.34.08.ebuild,

diff --git a/sci-physics/root/root-5.34.09.ebuild b/sci-physics/root/root-5.34.10.ebuild
similarity index 97%
rename from sci-physics/root/root-5.34.09.ebuild
rename to sci-physics/root/root-5.34.10.ebuild
index 24465e0..041300d 100644
--- a/sci-physics/root/root-5.34.09.ebuild
+++ b/sci-physics/root/root-5.34.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.08.ebuild,v 1.2 2013/06/11 16:29:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_GIT} versionator
 
 ROOFIT_DOC_PV=2.91-33
@@ -41,7 +41,7 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 IUSE="+X afs avahi -c++0x doc emacs examples fits fftw graphviz htmldoc
 	kerberos ldap +math +metric mpi mysql odbc +opengl openmp oracle postgres
-	prefix pythia6 pythia8 python qt4 +reflex ruby ssl xinetd xml xrootd"
+	prefix pythia6 pythia8 python qt4 +reflex ruby sqlite ssl xinetd xml xrootd"
 
 REQUIRED_USE="
 	!X? ( !opengl !qt4 )
@@ -101,6 +101,7 @@ CDEPEND="
 	ruby? (
 			dev-lang/ruby
 			dev-ruby/rubygems )
+	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl )
 	xml? ( dev-libs/libxml2 )
 	xrootd? ( >=net-libs/xrootd-3.2.0 )"
@@ -272,6 +273,7 @@ src_configure() {
 		$(use_enable reflex cintex) \
 		$(use_enable reflex) \
 		$(use_enable ruby) \
+		$(use_enable sqlite) \
 		$(use_enable ssl) \
 		$(use_enable xml) \
 		$(use_enable xrootd) \


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2013-10-06  3:57 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2013-10-06  3:57 UTC (permalink / raw
  To: gentoo-commits

commit:     742346e6d9ed272113cbbd1963b68d00237e7e92
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Oct  6 03:57:02 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Oct  6 03:57:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=742346e6

sci-physics/root: fix USE flags in the ebuild

---
 sci-physics/root/ChangeLog              |   5 +
 sci-physics/root/root-5.34.10-r1.ebuild | 390 ++++++++++++++++++++++++++++++++
 2 files changed, 395 insertions(+)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 84c4640..e8ffb4a 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-5.34.10-r1 (06 Oct 2013)
+
+  06 Oct 2013; Andrew Savchenko <bircoph@gmail.com> +root-5.34.10-r1.ebuild:
+  Properly use c++0x and oracle deps.
+
 *root-5.34.10 (04 Oct 2013)
 
   04 Oct 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.34.09.ebuild,

diff --git a/sci-physics/root/root-5.34.10-r1.ebuild b/sci-physics/root/root-5.34.10-r1.ebuild
new file mode 100644
index 0000000..833cd85
--- /dev/null
+++ b/sci-physics/root/root-5.34.10-r1.ebuild
@@ -0,0 +1,390 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+	_GIT=git-2
+	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+PYTHON_COMPAT=( python2_{6,7} )
+inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_GIT} versionator
+
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+PATCH_PV2=5.32.00
+PATCH_PV3=5.34.05
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="${SRC_URI}
+	doc? (
+		math? (
+			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
+		metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf )
+	   !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf )
+		htmldoc? (
+			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="+X afs avahi c++0x doc emacs examples fits fftw graphviz htmldoc
+	kerberos ldap +math +metric mpi mysql odbc +opengl openmp oracle postgres
+	prefix pythia6 pythia8 python qt4 +reflex ruby sqlite ssl xinetd xml xrootd"
+
+REQUIRED_USE="
+	!X? ( !opengl !qt4 )
+	htmldoc? ( doc )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-fonts/dejavu
+	media-libs/freetype
+	media-libs/giflib
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/shadow
+	X? (
+		media-libs/ftgl
+		media-libs/glew
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		|| (
+			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
+			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+		)
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtopengl:4
+			dev-qt/qt3support:4
+			dev-qt/qtsvg:4
+			dev-qt/qtwebkit:4
+			dev-qt/qtxmlpatterns:4 )
+			x11-libs/libXft
+		)
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio )
+	fftw? ( sci-libs/fftw:3.0 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+			dev-lang/ruby
+			dev-ruby/rubygems )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )
+	xrootd? ( >=net-libs/xrootd-3.2.0 )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	echo
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
+	elog "HDFS, 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)\""
+	echo
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	if use math; then
+		if use openmp; then
+			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
+				ewarn "You are using a g++ without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
+		! version_is_at_least "4.7" "$(gcc-version)"; then
+		eerror "You are using a g++ without C++0x capabilities"
+		die "Need an C++0x capable compiler"
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+	rm -r graf2d/asimage/src/libAfterImage || die
+	rm -r graf3d/ftgl/{inc,src} || die
+	rm -r graf2d/freetype/src || die
+	rm -r graf3d/glew/{inc,src} || die
+	rm -r core/pcre/src || die
+	rm -r math/unuran/src/unuran-*.tar.gz || die
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
+	rm -r core/lzma/src/*.tar.gz || die
+	rm graf3d/gl/{inc,src}/gl2ps.* || die
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+
+	# Make html docs self-consistent for offline work (based on Fedora spec)
+	if use htmldoc; then
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
+		# make images local
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
+			-i etc/html/header.html || die "htmldoc sed failed"
+
+		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
+			die "htmldoc preparation failed"
+	fi
+}
+
+src_configure() {
+	local myconfflags=""
+	use postgres && myconfflags+=" --with-pgsql-incdir=$(pg_config --includedir)"
+	# the configure script is not the standard autotools
+	# cling is disabled because in requires live llvm and clang
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
+		--with-afs-shared=yes \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-ftgl \
+		--disable-builtin-freetype \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-builtin-lzma \
+		--disable-cling \
+		--enable-astiff \
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		$(use_enable X x11) \
+		$(use_enable X asimage) \
+		$(use_enable X xft) \
+		$(use_enable afs) \
+		$(use_enable avahi bonjour) \
+		$(use_enable c++0x c++11) \
+		$(use_enable fits fitsio) \
+		$(use_enable fftw fftw3) \
+		$(use_enable graphviz gviz) \
+		$(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 tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable oracle) \
+		$(use_enable postgres pgsql) \
+		$(use_enable prefix rpath) \
+		$(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 sqlite) \
+		$(use_enable ssl) \
+		$(use_enable xml) \
+		$(use_enable xrootd) \
+		${myconfflags} \
+		${EXTRA_ECONF} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
+	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"
+		use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \
+			dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	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
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+	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}
+
+	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
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	echo "Icon=root-system-bin" >> etc/root.desktop
+	domenu etc/root.desktop
+	doicon 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
+
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	if use python; then
+		echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+		python_optimize /usr/$(get_libdir)/root
+	fi
+	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	doenvd 99root
+
+	# The build system installs Emacs support unconditionally and in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -r "${ED}"/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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
+	rm "${ED}"usr/share/root/fonts/LICENSE || die
+	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
+	rm posix/mktypes dll_stl/setup \
+		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
+	rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
+	rm "${ED}"/etc/root/proof/*.sample || die
+	rm -r "${ED}"/etc/root/daemons || die
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin/ || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2013-10-07  2:37 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2013-10-07  2:37 UTC (permalink / raw
  To: gentoo-commits

commit:     fba6937f8a7e6e96730922e0679b398366fc2816
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Mon Oct  7 02:36:39 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Mon Oct  7 02:36:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fba6937f

sci-physics/root: add minimal USE flag

---
 sci-physics/root/ChangeLog              |   7 +
 sci-physics/root/metadata.xml           |   2 +-
 sci-physics/root/root-5.34.10-r2.ebuild | 408 ++++++++++++++++++++++++++++++++
 3 files changed, 416 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index e8ffb4a..9b280ee 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-5.34.10-r2 (07 Oct 2013)
+
+  07 Oct 2013; Andrew Savchenko <bircoph@gmail.com> +root-5.34.10-r2.ebuild,
+  metadata.xml:
+  Add minimal USE flag for minimal and gminimal configurations. Use
+  nohouwto to remove useless messages.
+
 *root-5.34.10-r1 (06 Oct 2013)
 
   06 Oct 2013; Andrew Savchenko <bircoph@gmail.com> +root-5.34.10-r1.ebuild:

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index a04fac3..c6422fa 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -16,7 +16,7 @@
   GUI toolkit, and a complete visualization framework.
 </longdescription>
   <use>
-    <flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>&gt;=4.7.0</flag>
+    <flag name="c++0x"> Build ROOT using the C++11 standard. Requires <pkg>sys-devel/gcc</pkg>&gt;=4.7.0</flag>
     <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
     <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
     <flag name="htmldoc">Generate html documentation</flag>

diff --git a/sci-physics/root/root-5.34.10-r2.ebuild b/sci-physics/root/root-5.34.10-r2.ebuild
new file mode 100644
index 0000000..fa064f8
--- /dev/null
+++ b/sci-physics/root/root-5.34.10-r2.ebuild
@@ -0,0 +1,408 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+	_GIT=git-2
+	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+PYTHON_COMPAT=( python2_{6,7} )
+inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_GIT} versionator
+
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+PATCH_PV2=5.32.00
+PATCH_PV3=5.34.05
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="${SRC_URI}
+	!minimal? ( doc? (
+		math? (
+			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
+		metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf )
+	   !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf )
+		htmldoc? (
+			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png )
+	) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="+X afs avahi c++0x doc emacs examples fits fftw graphviz htmldoc
+	kerberos ldap +math +metric minimal mpi mysql odbc +opengl openmp oracle postgres
+	prefix pythia6 pythia8 python qt4 +reflex ruby sqlite ssl xinetd xml xrootd"
+
+REQUIRED_USE="
+	!X? ( !opengl !qt4 )
+	htmldoc? ( doc )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-fonts/dejavu
+	media-libs/freetype
+	media-libs/giflib
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/shadow
+	X? (
+		media-libs/ftgl
+		media-libs/glew
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		!minimal? (
+			|| (
+				>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
+				>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+			)
+			opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+			qt4? (
+				dev-qt/qtgui:4
+				dev-qt/qtopengl:4
+				dev-qt/qt3support:4
+				dev-qt/qtsvg:4
+				dev-qt/qtwebkit:4
+				dev-qt/qtxmlpatterns:4
+			)
+			x11-libs/libXft
+		)
+	)
+	!minimal? (
+		afs? ( net-fs/openafs )
+		avahi? ( net-dns/avahi )
+		emacs? ( virtual/emacs )
+		fits? ( sci-libs/cfitsio )
+		fftw? ( sci-libs/fftw:3.0 )
+		graphviz? ( media-gfx/graphviz )
+		kerberos? ( virtual/krb5 )
+		ldap? ( net-nds/openldap )
+		math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+		mysql? ( virtual/mysql )
+		odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+		oracle? ( dev-db/oracle-instantclient-basic )
+		postgres? ( dev-db/postgresql-base )
+		pythia6? ( sci-physics/pythia:6 )
+		pythia8? ( sci-physics/pythia:8 )
+		python? ( ${PYTHON_DEPS} )
+		ruby? (
+				dev-lang/ruby
+				dev-ruby/rubygems )
+		sqlite? ( dev-db/sqlite:3 )
+		ssl? ( dev-libs/openssl )
+		xml? ( dev-libs/libxml2 )
+		xrootd? ( >=net-libs/xrootd-3.2.0 )
+	)"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	echo
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
+	elog "HDFS, 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)\""
+	echo
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+	use minimal && return
+
+	use python && python-single-r1_pkg_setup
+	if use math; then
+		if use openmp; then
+			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
+				ewarn "You are using a g++ without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
+		! version_is_at_least "4.7" "$(gcc-version)"; then
+		eerror "You are using a g++ without C++0x capabilities"
+		die "Need an C++0x capable compiler"
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+	rm -r graf2d/asimage/src/libAfterImage || die
+	rm -r graf3d/ftgl/{inc,src} || die
+	rm -r graf2d/freetype/src || die
+	rm -r graf3d/glew/{inc,src} || die
+	rm -r core/pcre/src || die
+	rm -r math/unuran/src/unuran-*.tar.gz || die
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
+	rm -r core/lzma/src/*.tar.gz || die
+	rm graf3d/gl/{inc,src}/gl2ps.* || die
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+
+	# Make html docs self-consistent for offline work (based on Fedora spec)
+	if use htmldoc && ! use minimal; then
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
+		# make images local
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
+			-i etc/html/header.html || die "htmldoc sed failed"
+
+		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
+			die "htmldoc preparation failed"
+	fi
+}
+
+src_configure() {
+	# the configure script is not the standard autotools
+	local mycommonconf="
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
+		--nohowto
+	"
+	if use minimal; then
+		./configure \
+			${mycommonconf} \
+			$(usex X --gminimal --minimal) \
+			|| die "configure failed"
+		return
+	fi
+	# cling is disabled because in requires live llvm and clang
+	./configure \
+		${mycommonconf} \
+		--with-afs-shared=yes \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-ftgl \
+		--disable-builtin-freetype \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-builtin-lzma \
+		--disable-cling \
+		--enable-astiff \
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		$(use_enable X x11) \
+		$(use_enable X asimage) \
+		$(use_enable X xft) \
+		$(use_enable afs) \
+		$(use_enable avahi bonjour) \
+		$(use_enable c++0x c++11) \
+		$(use_enable fits fitsio) \
+		$(use_enable fftw fftw3) \
+		$(use_enable graphviz gviz) \
+		$(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 tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable oracle) \
+		$(use_enable postgres pgsql) \
+		$(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "") \
+		$(use_enable prefix rpath) \
+		$(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 sqlite) \
+		$(use_enable ssl) \
+		$(use_enable xml) \
+		$(use_enable xrootd) \
+		${EXTRA_ECONF} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
+	if use emacs && ! use minimal; then
+		elisp-compile build/misc/*.el || die "elisp-compile failed"
+	fi
+}
+
+doc_install() {
+	cd "${S}"
+	if use doc && ! use minimal; then
+		einfo "Installing user's guides"
+		use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \
+			dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	fi
+
+	if use examples && ! use minimal; 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
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+	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}
+
+	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
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	echo "Icon=root-system-bin" >> etc/root.desktop
+	domenu etc/root.desktop
+	doicon 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
+
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	if ! use minimal; then
+		use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+		if use python; then
+			echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+			python_optimize /usr/$(get_libdir)/root
+		fi
+		use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	fi
+	doenvd 99root
+
+	# The build system installs Emacs support unconditionally and in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -r "${ED}"/usr/share/emacs
+	if use emacs && ! use minimal; 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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
+	rm "${ED}"usr/share/root/fonts/LICENSE || die
+	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
+	rm posix/mktypes dll_stl/setup \
+		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
+	rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
+	rm "${ED}"/etc/root/proof/*.sample || die
+	rm -r "${ED}"/etc/root/daemons || die
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin/ || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2013-11-08 17:50 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2013-11-08 17:50 UTC (permalink / raw
  To: gentoo-commits

commit:     7e85e92d43dab6772389a965f189cb62218d3846
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Nov  8 17:48:06 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Nov  8 17:48:06 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7e85e92d

sci-physics/root: update pythia dependency

Since pythia-8.1.80 API was changed and <root-5.34.11 supports only
lower pythia verions. This fixes bug 490332.

---
 sci-physics/root/ChangeLog              | 4 ++++
 sci-physics/root/root-5.34.10-r2.ebuild | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 0f5a8e8..74b3f01 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  08 Nov 2013; Andrew Savchenko <bircoph@gmail.com> root-5.34.10-r2.ebuild:
+  Fix pythia dependency: versions >= 8.1.80 changed API and are no
+  longer supported for this root verison.
+
   15 Oct 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.34.10.ebuild,
   -root-5.34.10-r1.ebuild, root-5.34.10-r2.ebuild, root-9999.ebuild,
   -files/root-5.32.00-nobyte-compile.patch, -files/root-9999-cling.patch:

diff --git a/sci-physics/root/root-5.34.10-r2.ebuild b/sci-physics/root/root-5.34.10-r2.ebuild
index 8d18cef..0d460b0 100644
--- a/sci-physics/root/root-5.34.10-r2.ebuild
+++ b/sci-physics/root/root-5.34.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.10-r2.ebuild,v 1.1 2013/10/29 17:00:37 bicatali Exp $
 
 EAPI=5
 
@@ -101,7 +101,7 @@ CDEPEND="
 		oracle? ( dev-db/oracle-instantclient-basic )
 		postgres? ( dev-db/postgresql-base )
 		pythia6? ( sci-physics/pythia:6 )
-		pythia8? ( sci-physics/pythia:8 )
+		pythia8? ( <sci-physics/pythia-8.1.80:8 )
 		python? ( ${PYTHON_DEPS} )
 		ruby? (
 				dev-lang/ruby
@@ -125,19 +125,19 @@ S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
 	echo
 	elog "There are extra options on packages not yet in Gentoo:"
 	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
 	elog "HDFS, 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 "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
 	echo
 	enewgroup rootd
 	enewuser rootd -1 -1 /var/spool/rootd rootd
 	use minimal && return
 
-	use python && python-single-r1_pkg_setup
 	if use math; then
 		if use openmp; then
 			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2013-12-10 16:18 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2013-12-10 16:18 UTC (permalink / raw
  To: gentoo-commits

commit:     de25dbcde6208391b20cac25f20354afda1b5414
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue Dec 10 16:17:39 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue Dec 10 16:17:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=de25dbcd

sci-physics/root: fix indentation and repoman warnings

---
 sci-physics/root/root-5.34.13.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-physics/root/root-5.34.13.ebuild b/sci-physics/root/root-5.34.13.ebuild
index 4bffdd8..f8e0f1a 100644
--- a/sci-physics/root/root-5.34.13.ebuild
+++ b/sci-physics/root/root-5.34.13.ebuild
@@ -323,12 +323,12 @@ doc_install() {
 	if use doc && ! use minimal; then
 		einfo "Installing user's guides"
 		if use metric; then
-		    dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf
-		    dodoc "${DISTDIR}"/ROOTPrimer-${PV}.pdf
+			dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf
+			dodoc "${DISTDIR}"/ROOTPrimer-${PV}.pdf
 			use math && dodoc "${DISTDIR}"/Spectrum-${PV}.pdf
 		else
 			dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf
-		    dodoc "${DISTDIR}"/ROOTPrimerLetter-${PV}.pdf
+			dodoc "${DISTDIR}"/ROOTPrimerLetter-${PV}.pdf
 			use math && dodoc "${DISTDIR}"/SpectrumLetter-${PV}.pdf
 		fi
 		use math && dodoc \


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2013-12-29  0:31 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2013-12-29  0:31 UTC (permalink / raw
  To: gentoo-commits

commit:     632aa3b7301d190f7831def9cff67ccde65b67bd
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 23:51:45 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 23:51:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=632aa3b7

sci-physics/root: Import tree changes, drop old

Package-Manager: portage-2.2.7

---
 sci-physics/root/ChangeLog              |   4 +
 sci-physics/root/root-5.32.03-r2.ebuild | 383 ----------------------------
 sci-physics/root/root-5.34.13.ebuild    | 425 --------------------------------
 sci-physics/root/root-9999.ebuild       |  17 +-
 4 files changed, 14 insertions(+), 815 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 848c446..c7010f7 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  28 Dec 2013; Justin Lecher <jlec@gentoo.org> -root-5.32.03-r2.ebuild,
+  -root-5.34.13.ebuild, root-9999.ebuild:
+  Import tree changes, drop old
+
   22 Dec 2013; Andrew Savchenko <bircoph@gmail.com> +root-5.32.03-r2.ebuild,
   +files/root-5.28.00b-asneeded.patch, +files/root-5.28.00b-prop-ldflags.patch,
   +files/root-5.28.00b-unuran.patch,

diff --git a/sci-physics/root/root-5.32.03-r2.ebuild b/sci-physics/root/root-5.32.03-r2.ebuild
deleted file mode 100644
index 979b753..0000000
--- a/sci-physics/root/root-5.32.03-r2.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.03-r2.ebuild,v 1.6 2013/03/02 23:27:01 hwoarang Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_{6,7} )
-
-if [[ ${PV} == "9999" ]] ; then
-	_SVN=subversion
-	ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk"
-	ESVN_OPTIONS="--non-interactive --trust-server-cert"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_SVN}
-
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.32.00
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="${SRC_URI}
-	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf
-		math? (
-			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
-		htmldoc? (
-			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerberos
-	ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6
-	pythia8 python qt4 +reflex ruby ssl xinetd xml xrootd"
-
-CDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-fonts/dejavu
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/shadow
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		|| (
-			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
-			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
-		)
-		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-		qt4? (
-			dev-qt/qtgui:4
-			dev-qt/qtopengl:4
-			dev-qt/qt3support:4
-			dev-qt/qtsvg:4
-			dev-qt/qtwebkit:4
-			dev-qt/qtxmlpatterns:4 )
-		x11-libs/libXft
-		)
-	afs? ( net-fs/openafs )
-	avahi? ( net-dns/avahi )
-	clarens? ( dev-libs/xmlrpc-c[curl] )
-	emacs? ( virtual/emacs )
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphviz? ( media-gfx/graphviz )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql-base )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( <sci-physics/pythia-8.1.80:8 )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-			dev-lang/ruby
-			dev-ruby/rubygems )
-	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )
-	xrootd? ( <net-libs/xrootd-3.3 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
-
-REQUIRED_USE="
-	!X? ( !opengl !qt4 )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
-	elog "HDFS, 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)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-
-	if use math; then
-		if use openmp; then
-			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-				ewarn "You are using a gcc without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-rmkdepend.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-rusage.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -rf graf2d/asimage/src/libAfterImage || die
-	rm -rf graf3d/ftgl/{inc,src} || die
-	rm -rf graf2d/freetype/src || die
-	rm -rf graf3d/glew/{inc,src} || die
-	rm -rf core/pcre/src || die
-	rm -rf math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
-	rm -rf core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-
-	# Make html docs self-consistent for offline work (based on Fedora spec)
-	if use htmldoc; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
-		# make images local
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
-			-i etc/html/header.html || die "htmldoc sed failed"
-
-		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
-			die "htmldoc preparation failed"
-	fi
-}
-
-src_configure() {
-	# the configure script is not the standard autotools
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-ld=$(tc-getCXX) \
-		--with-afs-shared=yes \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-freetype \
-		--disable-builtin-ftgl \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--disable-cling \
-		--enable-astiff \
-		--enable-exceptions	\
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(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 tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable postgres pgsql) \
-		$(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "") \
-		$(use_enable prefix rpath) \
-		$(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="${CXXFLAGS}" F77OPT="${FFLAGS}"
-	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"
-		dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	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
-	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-	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}
-
-	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
-	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
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-	if use python; then
-		echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-		python_optimize "${D}/usr/$(get_libdir)/root"
-	fi
-	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root
-
-	# 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 "${ED}"/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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
-	rm "${ED}"usr/share/root/fonts/LICENSE || die
-	pushd "${ED}"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 || die
-	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
-	rm -f "${ED}"/etc/root/proof/*.sample || die
-	rm -rf "${ED}"/etc/root/daemons || die
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin/ || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

diff --git a/sci-physics/root/root-5.34.13.ebuild b/sci-physics/root/root-5.34.13.ebuild
deleted file mode 100644
index f8e0f1a..0000000
--- a/sci-physics/root/root-5.34.13.ebuild
+++ /dev/null
@@ -1,425 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.10-r2.ebuild,v 1.1 2013/10/29 17:00:37 bicatali Exp $
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	_GIT=git-2
-	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-PYTHON_COMPAT=( python2_{6,7} )
-inherit elisp-common eutils fdo-mime fortran-2 ${_GIT} multilib python-single-r1 toolchain-funcs user versionator
-
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.32.00
-PATCH_PV3=5.34.05
-PATCH_PV4=5.34.13
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="http://root.cern.ch/"
-SRC_URI="${SRC_URI}
-	!minimal? ( doc? (
-		math? (
-			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
-			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-			metric? ( ftp://root.cern.ch/root/doc/spectrum/Spectrum.pdf -> Spectrum-${PV}.pdf )
-			!metric? ( ftp://root.cern.ch/root/doc/spectrum/SpectrumLetter.pdf -> SpectrumLetter-${PV}.pdf )
-		)
-		metric? (
-			ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf
-			ftp://root.cern.ch/root/doc/primer/ROOTPrimer.pdf -> ROOTPrimer-${PV}.pdf )
-	   !metric? (
-			ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf
-			ftp://root.cern.ch/root/doc/primer/ROOTPrimerLetter.pdf -> ROOTPrimerLetter-${PV}.pdf )
-		htmldoc? (
-			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
-			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png )
-	) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="+X afs avahi c++0x doc emacs examples fits fftw graphviz htmldoc
-	kerberos ldap +math +metric minimal mpi mysql odbc +opengl openmp oracle postgres
-	prefix pythia6 pythia8 python qt4 +reflex ruby sqlite ssl xinetd xml xrootd"
-
-REQUIRED_USE="
-	!X? ( !opengl !qt4 )
-	htmldoc? ( doc )
-	mpi? ( math !openmp )
-	openmp? ( math !mpi )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/cfortran-4.4-r2
-	dev-libs/libpcre
-	media-fonts/dejavu
-	media-libs/freetype
-	media-libs/giflib
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/shadow
-	X? (
-		media-libs/ftgl
-		media-libs/glew
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		!minimal? (
-			|| (
-				>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
-				>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
-			)
-			opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
-			qt4? (
-				dev-qt/qtgui:4
-				dev-qt/qtopengl:4
-				dev-qt/qt3support:4
-				dev-qt/qtsvg:4
-				dev-qt/qtwebkit:4
-				dev-qt/qtxmlpatterns:4
-			)
-			x11-libs/libXft
-		)
-	)
-	!minimal? (
-		afs? ( net-fs/openafs )
-		avahi? ( net-dns/avahi )
-		emacs? ( virtual/emacs )
-		fits? ( sci-libs/cfitsio )
-		fftw? ( sci-libs/fftw:3.0 )
-		graphviz? ( media-gfx/graphviz )
-		kerberos? ( virtual/krb5 )
-		ldap? ( net-nds/openldap )
-		math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
-		mysql? ( virtual/mysql )
-		odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-		oracle? ( dev-db/oracle-instantclient-basic )
-		postgres? ( dev-db/postgresql-base )
-		pythia6? ( sci-physics/pythia:6 )
-		pythia8? ( >=sci-physics/pythia-8.1.80:8 )
-		python? ( ${PYTHON_DEPS} )
-		ruby? (
-				dev-lang/ruby
-				dev-ruby/rubygems )
-		sqlite? ( dev-db/sqlite:3 )
-		ssl? ( dev-libs/openssl )
-		xml? ( dev-libs/libxml2 )
-		xrootd? ( >=net-libs/xrootd-3.2.0 )
-	)"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	reflex? ( dev-cpp/gccxml )
-	xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	echo
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
-	elog "HDFS, 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=${EROOT%/}/usr/$(get_libdir)\""
-	echo
-	enewgroup rootd
-	enewuser rootd -1 -1 /var/spool/rootd rootd
-	use minimal && return
-
-	if use math; then
-		if use openmp; then
-			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
-				ewarn "You are using a g++ without OpenMP capabilities"
-				die "Need an OpenMP capable compiler"
-			else
-				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
-			fi
-		elif use mpi; then
-			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
-		fi
-	fi
-	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
-		! version_is_at_least "4.7" "$(gcc-version)"; then
-		eerror "You are using a g++ without C++0x capabilities"
-		die "Need an C++0x capable compiler"
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV4}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV4}-pythia8.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV4}-desktop.patch
-
-	# make sure we use system libs and headers
-	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-	rm -r graf2d/asimage/src/libAfterImage || die
-	rm -r graf3d/ftgl/{inc,src} || die
-	rm -r graf2d/freetype/src || die
-	rm -r graf3d/glew/{inc,src} || die
-	rm -r core/pcre/src || die
-	rm -r math/unuran/src/unuran-*.tar.gz || die
-	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
-	rm -r core/lzma/src/*.tar.gz || die
-	rm graf3d/gl/{inc,src}/gl2ps.* || die
-	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
-
-	# In Gentoo, libPythia6 is called libpythia6
-	# libungif is called libgif,
-	# iodbc is in /usr/include/iodbc
-	# pg_config.h is checked instead of libpq-fe.h
-	sed -i \
-		-e 's:libPythia6:libpythia6:g' \
-		-e 's:ungif:gif:g' \
-		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
-		-e 's:libpq-fe.h:pg_config.h:' \
-		configure || die "adjusting configure for Gentoo failed"
-
-	# prefixify the configure script
-	sed -i \
-		-e 's:/usr:${EPREFIX}/usr:g' \
-		configure || die "prefixify configure failed"
-
-	# QTDIR only used for qt3 in gentoo, and configure looks for it.
-	unset QTDIR
-
-	# Make html docs self-consistent for offline work (based on Fedora spec)
-	if use htmldoc && ! use minimal; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
-		# make images local
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
-			-i etc/html/ROOT.css || die "htmldoc sed failed"
-		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
-			-i etc/html/header.html || die "htmldoc sed failed"
-
-		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
-			die "htmldoc preparation failed"
-	fi
-}
-
-src_configure() {
-	# the configure script is not the standard autotools
-	local mycommonconf="
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-ld=$(tc-getCXX) \
-		--nohowto
-	"
-	if use minimal; then
-		./configure \
-			${mycommonconf} \
-			$(usex X --gminimal --minimal) \
-			|| die "configure failed"
-		return
-	fi
-	# cling is disabled because in requires live llvm and clang
-	./configure \
-		${mycommonconf} \
-		--with-afs-shared=yes \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
-		--disable-builtin-afterimage \
-		--disable-builtin-ftgl \
-		--disable-builtin-freetype \
-		--disable-builtin-glew \
-		--disable-builtin-pcre \
-		--disable-builtin-zlib \
-		--disable-builtin-lzma \
-		--disable-cling \
-		--enable-astiff \
-		--enable-explicitlink \
-		--enable-gdml \
-		--enable-memstat \
-		--enable-shadowpw \
-		--enable-shared	\
-		--enable-soversion \
-		--enable-table \
-		--fail-on-missing \
-		$(use_enable X x11) \
-		$(use_enable X asimage) \
-		$(use_enable X xft) \
-		$(use_enable afs) \
-		$(use_enable avahi bonjour) \
-		$(use_enable c++0x cxx11) \
-		$(use_enable fits fitsio) \
-		$(use_enable fftw fftw3) \
-		$(use_enable graphviz gviz) \
-		$(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 tmva) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable opengl) \
-		$(use_enable oracle) \
-		$(use_enable postgres pgsql) \
-		$(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "") \
-		$(use_enable prefix rpath) \
-		$(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 sqlite) \
-		$(use_enable ssl) \
-		$(use_enable xml) \
-		$(use_enable xrootd) \
-		${EXTRA_ECONF} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
-	if use emacs && ! use minimal; then
-		elisp-compile build/misc/*.el || die "elisp-compile failed"
-	fi
-}
-
-doc_install() {
-	cd "${S}"
-	if use doc && ! use minimal; then
-		einfo "Installing user's guides"
-		if use metric; then
-			dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf
-			dodoc "${DISTDIR}"/ROOTPrimer-${PV}.pdf
-			use math && dodoc "${DISTDIR}"/Spectrum-${PV}.pdf
-		else
-			dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf
-			dodoc "${DISTDIR}"/ROOTPrimerLetter-${PV}.pdf
-			use math && dodoc "${DISTDIR}"/SpectrumLetter-${PV}.pdf
-		fi
-		use math && dodoc \
-			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
-	fi
-
-	if use examples && ! use minimal; 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
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-	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}
-
-	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
-	fi
-}
-
-desktop_install() {
-	cd "${S}"
-	echo "Icon=root-system-bin" >> etc/root.desktop
-	domenu etc/root.desktop
-	doicon 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
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
-	if ! use minimal; then
-		use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
-		if use python; then
-			echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-			python_optimize "${D}/usr/$(get_libdir)/root"
-		fi
-		use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	fi
-	doenvd 99root
-
-	# The build system installs Emacs support unconditionally and in the wrong
-	# directory. Remove it and call elisp-install in case of USE=emacs.
-	rm -r "${ED}"/usr/share/emacs
-	if use emacs && ! use minimal; 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 "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
-	rm "${ED}"usr/share/root/fonts/LICENSE || die
-	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
-	rm posix/mktypes dll_stl/setup \
-		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
-	rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
-	rm "${ED}"/etc/root/proof/*.sample || die
-	rm -r "${ED}"/etc/root/daemons || die
-	popd > /dev/null
-	# these should be in PATH
-	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
-		"${ED}"usr/bin/ || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 4c6ffdb..05b899c 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $
+# $Header: $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ SRC_URI="${SRC_URI}
 			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
 			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )
 		metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf )
-	   !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf )
+		!metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf )
 		htmldoc? (
 			http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png
 			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png
@@ -103,7 +103,7 @@ CDEPEND="
 		oracle? ( dev-db/oracle-instantclient-basic )
 		postgres? ( dev-db/postgresql-base )
 		pythia6? ( sci-physics/pythia:6 )
-		pythia8? ( sci-physics/pythia:8 )
+		pythia8? ( >=sci-physics/pythia-8.1.80:8 )
 		python? ( ${PYTHON_DEPS} )
 		ruby? (
 				dev-lang/ruby
@@ -126,19 +126,19 @@ S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
 	echo
 	elog "There are extra options on packages not yet in Gentoo:"
 	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
 	elog "HDFS, 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 "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
 	echo
 	enewgroup rootd
 	enewuser rootd -1 -1 /var/spool/rootd rootd
 	use minimal && return
 
-	use python && python-single-r1_pkg_setup
 	if use math; then
 		if use openmp; then
 			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
@@ -311,8 +311,11 @@ doc_install() {
 	cd "${S}"
 	if use doc && ! use minimal; then
 		einfo "Installing user's guides"
-		use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \
+		if use metric; then
+			dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf
+		else
 			dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf
+		fi
 		use math && dodoc \
 			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
 			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
@@ -366,7 +369,7 @@ src_install() {
 		use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
 		if use python; then
 			echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-			python_optimize /usr/$(get_libdir)/root
+			python_optimize "${ED}/usr/$(get_libdir)/root"
 		fi
 		use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
 	fi


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2014-01-06 19:27 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2014-01-06 19:27 UTC (permalink / raw
  To: gentoo-commits

commit:     b494bad9b7ee341d2ae759bb30b289ee019f5af8
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 19:14:09 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 19:14:09 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b494bad9

sci-physics/root: Switch from git-2 to git-r3

Package-Manager: portage-2.2.8

---
 sci-physics/root/ChangeLog        | 5 ++++-
 sci-physics/root/root-9999.ebuild | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index c7010f7..b4301f4 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-physics/root
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> root-9999.ebuild:
+  Switch from git-2 to git-r3
+
   28 Dec 2013; Justin Lecher <jlec@gentoo.org> -root-5.32.03-r2.ebuild,
   -root-5.34.13.ebuild, root-9999.ebuild:
   Import tree changes, drop old

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 05b899c..6c7ccee 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
 
 if [[ ${PV} == "9999" ]] ; then
-	_GIT=git-2
+	_GIT=git-r3
 	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
 	SRC_URI=""
 	KEYWORDS=""


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2014-07-03 14:15 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2014-07-03 14:15 UTC (permalink / raw
  To: gentoo-commits

commit:     9ba6913bfa97c94855dd0a0834a66ff0111298f8
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Jul  3 14:15:06 2014 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Thu Jul  3 14:15:06 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9ba6913b

sci-physcis/root-9999: patch moved to upstream

---
 sci-physics/root/ChangeLog        | 3 +++
 sci-physics/root/root-9999.ebuild | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 4770753..893e1ea 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  03 Jul 2014; Andrew Savchenko <bircoph@gmail.com> root-9999.ebuild:
+  Tutorial-dirs patch is accepted upstream.
+
   02 Jul 2014; Andrew Savchenko <bircoph@gmail.com> root-6.00.01-r1.ebuild,
   root-9999.ebuild, files/root-6.00.01-tutorials-path.patch:
   Do not compress files required for .credits, .demo, .license

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 9c76fed..66f8d87 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -200,8 +200,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-6.00.01-prop-flags.patch \
 		"${FILESDIR}"/${PN}-6.00.01-llvm.patch \
-		"${FILESDIR}"/${PN}-6.00.01-geocad.patch \
-		"${FILESDIR}"/${PN}-6.00.01-tutorials-path.patch
+		"${FILESDIR}"/${PN}-6.00.01-geocad.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2014-07-06 12:53 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2014-07-06 12:53 UTC (permalink / raw
  To: gentoo-commits

commit:     c6dde42df3dad54c13d282011121aa7744b53a22
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Jul  6 12:45:40 2014 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Jul  6 12:45:40 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c6dde42d

sci-physics/root: rectify license list

---
 sci-physics/root/ChangeLog              | 4 ++++
 sci-physics/root/root-6.00.01-r1.ebuild | 2 +-
 sci-physics/root/root-6.00.02.ebuild    | 2 +-
 sci-physics/root/root-9999.ebuild       | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 3759527..0af159b 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  06 Jul 2014; Andrew Savchenko <bircoph@gmail.com> root-6.00.01-r1.ebuild,
+  root-6.00.02.ebuild, root-9999.ebuild:
+  Update LICENSE: GPL-2 code is not used during compilation.
+
 *root-6.00.02 (05 Jul 2014)
 
   05 Jul 2014; Andrew Savchenko <bircoph@gmail.com> +root-6.00.02.ebuild:

diff --git a/sci-physics/root/root-6.00.01-r1.ebuild b/sci-physics/root/root-6.00.01-r1.ebuild
index d5993c0..ebc10e1 100644
--- a/sci-physics/root/root-6.00.01-r1.ebuild
+++ b/sci-physics/root/root-6.00.01-r1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://root.cern.ch/"
 DOC_URI="ftp://root.cern.ch/${PN}/doc"
 
 SLOT="0/$(get_version_component_range 1-3 ${PV})"
-LICENSE="LGPL-2.1 freedist GPL-2 MSttfEULA LGPL-3 libpng UoI-NCSA"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
 IUSE="+X afs avahi doc emacs examples fits fftw geocad graphviz
 	http kerberos ldap +math minimal mpi mysql odbc +opengl openmp
 	oracle postgres	prefix pythia6 pythia8 python qt4 sqlite ssl

diff --git a/sci-physics/root/root-6.00.02.ebuild b/sci-physics/root/root-6.00.02.ebuild
index 9c76fed..01d4eda 100644
--- a/sci-physics/root/root-6.00.02.ebuild
+++ b/sci-physics/root/root-6.00.02.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://root.cern.ch/"
 DOC_URI="ftp://root.cern.ch/${PN}/doc"
 
 SLOT="0/$(get_version_component_range 1-3 ${PV})"
-LICENSE="LGPL-2.1 freedist GPL-2 MSttfEULA LGPL-3 libpng UoI-NCSA"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
 IUSE="+X afs avahi doc emacs examples fits fftw geocad graphviz
 	http kerberos ldap +math minimal mpi mysql odbc +opengl openmp
 	oracle postgres	prefix pythia6 pythia8 python qt4 sqlite ssl

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 66f8d87..b2074ac 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://root.cern.ch/"
 DOC_URI="ftp://root.cern.ch/${PN}/doc"
 
 SLOT="0/$(get_version_component_range 1-3 ${PV})"
-LICENSE="LGPL-2.1 freedist GPL-2 MSttfEULA LGPL-3 libpng UoI-NCSA"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
 IUSE="+X afs avahi doc emacs examples fits fftw geocad graphviz
 	http kerberos ldap +math minimal mpi mysql odbc +opengl openmp
 	oracle postgres	prefix pythia6 pythia8 python qt4 sqlite ssl


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2014-10-26 16:16 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2014-10-26 16:16 UTC (permalink / raw
  To: gentoo-commits

commit:     4c982f626dbae30caa5885b7bf1181baf6cf9592
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 25 15:50:40 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Oct 25 15:50:40 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4c982f62

sci-physics/root: Fix compilation with USE="mysql" wrt bug #523996; fix die_compiler message

Package-Manager: portage-2.2.8-r2

---
 sci-physics/root/ChangeLog              |  5 +++++
 sci-physics/root/root-5.34.18-r2.ebuild |  2 ++
 sci-physics/root/root-6.00.01-r1.ebuild |  2 ++
 sci-physics/root/root-6.00.02.ebuild    | 10 ++++++----
 sci-physics/root/root-9999.ebuild       | 10 ++++++----
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 9b455b6..aff13e1 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  25 Oct 2014; Matthias Maier <tamiko@gentoo.org> root-5.34.18-r2.ebuild,
+  root-6.00.01-r1.ebuild, root-6.00.02.ebuild, root-9999.ebuild:
+  sci-physics/root: Fix compilation with USE="mysql" wrt bug #523996; fix
+  die_compiler message
+
   29 Sep 2014; Justin Lecher <jlec@gentoo.org> root-6.00.02.ebuild,
   +files/root-6.00.02-tm_zone.patch, metadata.xml:
   Backport fix for build failure

diff --git a/sci-physics/root/root-5.34.18-r2.ebuild b/sci-physics/root/root-5.34.18-r2.ebuild
index 072b81d..7ce12fd 100644
--- a/sci-physics/root/root-5.34.18-r2.ebuild
+++ b/sci-physics/root/root-5.34.18-r2.ebuild
@@ -260,6 +260,8 @@ src_configure() {
 			$(use_enable math tmva)
 			$(use_enable math unuran)
 			$(use_enable mysql)
+			$(usex mysql \
+				"--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
 			$(use_enable odbc)
 			$(use_enable opengl)
 			$(use_enable oracle)

diff --git a/sci-physics/root/root-6.00.01-r1.ebuild b/sci-physics/root/root-6.00.01-r1.ebuild
index ebc10e1..6fe0c16 100644
--- a/sci-physics/root/root-6.00.01-r1.ebuild
+++ b/sci-physics/root/root-6.00.01-r1.ebuild
@@ -322,6 +322,8 @@ src_configure() {
 			$(use_enable math vdt)
 			$(use_enable math unuran)
 			$(use_enable mysql)
+			$(usex mysql \
+				"--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
 			$(use_enable odbc)
 			$(use_enable opengl)
 			$(use_enable oracle)

diff --git a/sci-physics/root/root-6.00.02.ebuild b/sci-physics/root/root-6.00.02.ebuild
index 5208cc9..e53ed3d 100644
--- a/sci-physics/root/root-6.00.02.ebuild
+++ b/sci-physics/root/root-6.00.02.ebuild
@@ -128,10 +128,10 @@ PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
 DOC_DIR="/usr/share/doc/${P}"
 
 die_compiler() {
-	die "Need one of the following C++11 capable compilers:"
-	die "    >=sys-devel/gcc[cxx]-4.8"
-	die "    >=sys-devel/clang-3.4"
-	die "    >=dev-lang/icc-13"
+	die "Need one of the following C++11 capable compilers:"\
+		"    >=sys-devel/gcc[cxx]-4.8"\
+		"    >=sys-devel/clang-3.4"\
+		"    >=dev-lang/icc-13"
 }
 
 pkg_setup() {
@@ -322,6 +322,8 @@ src_configure() {
 			$(use_enable math vdt)
 			$(use_enable math unuran)
 			$(use_enable mysql)
+			$(usex mysql \
+				"--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
 			$(use_enable odbc)
 			$(use_enable opengl)
 			$(use_enable oracle)

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index b2074ac..00f4946 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -128,10 +128,10 @@ PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
 DOC_DIR="/usr/share/doc/${P}"
 
 die_compiler() {
-	die "Need one of the following C++11 capable compilers:"
-	die "    >=sys-devel/gcc[cxx]-4.8"
-	die "    >=sys-devel/clang-3.4"
-	die "    >=dev-lang/icc-13"
+	die "Need one of the following C++11 capable compilers:"\
+		"    >=sys-devel/gcc[cxx]-4.8"\
+		"    >=sys-devel/clang-3.4"\
+		"    >=dev-lang/icc-13"
 }
 
 pkg_setup() {
@@ -320,6 +320,8 @@ src_configure() {
 			$(use_enable math vdt)
 			$(use_enable math unuran)
 			$(use_enable mysql)
+			$(usex mysql \
+				"--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
 			$(use_enable odbc)
 			$(use_enable opengl)
 			$(use_enable oracle)


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2014-11-10 15:14 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2014-11-10 15:14 UTC (permalink / raw
  To: gentoo-commits

commit:     6fa7e817a17a98f9dddb4b9094c7877aab433706
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Mon Nov 10 00:36:44 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 10 00:36:44 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6fa7e817

Drop prop-flags patch for root-9999, patch fails starting from 5.34.23 and ROOT 6 master. Upstream offers configure-flags to set proper flags starting now.

---
 sci-physics/root/ChangeLog        | 6 ++++++
 sci-physics/root/root-9999.ebuild | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index aff13e1..9b1b2dd 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  10 Nov 2014; Oliver Freyermuth <o.freyermuth@googlemail.com>
+  root-9999.ebuild:
+  Drop prop-flags patch for root-9999, patch fails starting from 5.34.23 and
+  ROOT 6 master. Upstream offers configure-flags to set proper flags starting
+  now. 
+
   25 Oct 2014; Matthias Maier <tamiko@gentoo.org> root-5.34.18-r2.ebuild,
   root-6.00.01-r1.ebuild, root-6.00.02.ebuild, root-9999.ebuild:
   sci-physics/root: Fix compilation with USE="mysql" wrt bug #523996; fix

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 00f4946..361cda0 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -198,7 +198,6 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-5.34.13-desktop.patch \
 		"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
 		"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
-		"${FILESDIR}"/${PN}-6.00.01-prop-flags.patch \
 		"${FILESDIR}"/${PN}-6.00.01-llvm.patch \
 		"${FILESDIR}"/${PN}-6.00.01-geocad.patch
 
@@ -299,6 +298,8 @@ src_configure() {
 			--enable-soversion
 			--enable-table
 			--fail-on-missing
+			--cflags='${CFLAGS}'
+			--cxxflags='${CXXFLAGS}'
 			$(use_enable X x11)
 			$(use_enable X asimage)
 			$(use_enable X xft)


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2015-01-01 15:20 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2015-01-01 15:20 UTC (permalink / raw
  To: gentoo-commits

commit:     908be7255801ec31df50c7d92d6c19a6e421bb10
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Jan  1 15:10:56 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Thu Jan  1 15:10:56 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=908be725

Update maintainer info

Package-Manager: portage-2.2.15
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

---
 sci-physics/root/ChangeLog    | 5 ++++-
 sci-physics/root/metadata.xml | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 9b1b2dd..75d4a97 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-physics/root
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  01 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
+  Update maintainer information.
+
   10 Nov 2014; Oliver Freyermuth <o.freyermuth@googlemail.com>
   root-9999.ebuild:
   Drop prop-flags patch for root-9999, patch fails starting from 5.34.23 and

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index abe803e..26e546c 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -2,12 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>bircoph@gmail.com</email>
+    <email>bircoph@gentoo.org</email>
     <name>Andrew Savchenko</name>
-    <description>Maintainer. Assign bugs to him</description>
   </maintainer>
   <herd>sci-physics</herd>
-  <herd>proxy-maintainers</herd>
   <longdescription lang="en">
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2015-01-01 15:20 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2015-01-01 15:20 UTC (permalink / raw
  To: gentoo-commits

commit:     83c35df612bc3c704352e1328ac857d5c9addec5
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Jan  1 15:16:27 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Thu Jan  1 15:16:27 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=83c35df6

Fix bug 534086

Package-Manager: portage-2.2.15
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

---
 sci-physics/root/ChangeLog              | 5 +++++
 sci-physics/root/root-5.34.18-r2.ebuild | 4 ++--
 sci-physics/root/root-6.00.01-r1.ebuild | 4 ++--
 sci-physics/root/root-6.00.02.ebuild    | 4 ++--
 sci-physics/root/root-9999.ebuild       | 4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 75d4a97..c6b232d 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  01 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.18-r2.ebuild,
+  root-6.00.01-r1.ebuild, root-6.00.02.ebuild, root-9999.ebuild:
+  Use virtual for postgres dependency. This fixes bug 534086,
+  reported by Juergen Rose
+
   01 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
   Update maintainer information.
 

diff --git a/sci-physics/root/root-5.34.18-r2.ebuild b/sci-physics/root/root-5.34.18-r2.ebuild
index 7ce12fd..34e6a59 100644
--- a/sci-physics/root/root-5.34.18-r2.ebuild
+++ b/sci-physics/root/root-5.34.18-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.18-r1.ebuild,v 1.3 2014/03/27 18:51:54 bicatali Exp $
 
@@ -88,7 +88,7 @@ CDEPEND="
 		mysql? ( virtual/mysql )
 		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
 		oracle? ( dev-db/oracle-instantclient-basic:0= )
-		postgres? ( dev-db/postgresql-base:= )
+		postgres? ( virtual/postgresql:= )
 		pythia6? ( sci-physics/pythia:6= )
 		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
 		python? ( ${PYTHON_DEPS} )

diff --git a/sci-physics/root/root-6.00.01-r1.ebuild b/sci-physics/root/root-6.00.01-r1.ebuild
index 6fe0c16..47ffb03 100644
--- a/sci-physics/root/root-6.00.01-r1.ebuild
+++ b/sci-physics/root/root-6.00.01-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.18-r1.ebuild,v 1.3 2014/03/27 18:51:54 bicatali Exp $
 
@@ -93,7 +93,7 @@ CDEPEND="
 		mysql? ( virtual/mysql )
 		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
 		oracle? ( dev-db/oracle-instantclient-basic:0= )
-		postgres? ( dev-db/postgresql-base:= )
+		postgres? ( virtual/postgresql:= )
 		pythia6? ( sci-physics/pythia:6= )
 		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
 		python? ( ${PYTHON_DEPS} )

diff --git a/sci-physics/root/root-6.00.02.ebuild b/sci-physics/root/root-6.00.02.ebuild
index e53ed3d..a396ada 100644
--- a/sci-physics/root/root-6.00.02.ebuild
+++ b/sci-physics/root/root-6.00.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.18-r1.ebuild,v 1.3 2014/03/27 18:51:54 bicatali Exp $
 
@@ -93,7 +93,7 @@ CDEPEND="
 		mysql? ( virtual/mysql )
 		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
 		oracle? ( dev-db/oracle-instantclient-basic:0= )
-		postgres? ( dev-db/postgresql-base:= )
+		postgres? ( virtual/postgresql:= )
 		pythia6? ( sci-physics/pythia:6= )
 		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
 		python? ( ${PYTHON_DEPS} )

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 361cda0..bb8d51b 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.18-r1.ebuild,v 1.3 2014/03/27 18:51:54 bicatali Exp $
 
@@ -93,7 +93,7 @@ CDEPEND="
 		mysql? ( virtual/mysql )
 		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
 		oracle? ( dev-db/oracle-instantclient-basic:0= )
-		postgres? ( dev-db/postgresql-base:= )
+		postgres? ( virtual/postgresql:= )
 		pythia6? ( sci-physics/pythia:6= )
 		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
 		python? ( ${PYTHON_DEPS} )


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2015-01-01 23:12 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2015-01-01 23:12 UTC (permalink / raw
  To: gentoo-commits

commit:     e564ff76a0feebab4ec7da7dde27314f2458f15f
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Jan  1 23:09:10 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Thu Jan  1 23:09:10 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e564ff76

Properly fix bug 534086

Package-Manager: portage-2.2.15
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

---
 sci-physics/root/ChangeLog              | 4 ++++
 sci-physics/root/root-5.34.18-r2.ebuild | 2 +-
 sci-physics/root/root-6.00.01-r1.ebuild | 2 +-
 sci-physics/root/root-6.00.02.ebuild    | 2 +-
 sci-physics/root/root-9999.ebuild       | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index c6b232d..4ef278c 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -4,6 +4,10 @@
 
   01 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.18-r2.ebuild,
   root-6.00.01-r1.ebuild, root-6.00.02.ebuild, root-9999.ebuild:
+  Rename virtual/postgresql to dev-db/postgresql
+
+  01 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.18-r2.ebuild,
+  root-6.00.01-r1.ebuild, root-6.00.02.ebuild, root-9999.ebuild:
   Use virtual for postgres dependency. This fixes bug 534086,
   reported by Juergen Rose
 

diff --git a/sci-physics/root/root-5.34.18-r2.ebuild b/sci-physics/root/root-5.34.18-r2.ebuild
index 34e6a59..7108ae3 100644
--- a/sci-physics/root/root-5.34.18-r2.ebuild
+++ b/sci-physics/root/root-5.34.18-r2.ebuild
@@ -88,7 +88,7 @@ CDEPEND="
 		mysql? ( virtual/mysql )
 		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
 		oracle? ( dev-db/oracle-instantclient-basic:0= )
-		postgres? ( virtual/postgresql:= )
+		postgres? ( dev-db/postgresql:= )
 		pythia6? ( sci-physics/pythia:6= )
 		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
 		python? ( ${PYTHON_DEPS} )

diff --git a/sci-physics/root/root-6.00.01-r1.ebuild b/sci-physics/root/root-6.00.01-r1.ebuild
index 47ffb03..fae938e 100644
--- a/sci-physics/root/root-6.00.01-r1.ebuild
+++ b/sci-physics/root/root-6.00.01-r1.ebuild
@@ -93,7 +93,7 @@ CDEPEND="
 		mysql? ( virtual/mysql )
 		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
 		oracle? ( dev-db/oracle-instantclient-basic:0= )
-		postgres? ( virtual/postgresql:= )
+		postgres? ( dev-db/postgresql:= )
 		pythia6? ( sci-physics/pythia:6= )
 		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
 		python? ( ${PYTHON_DEPS} )

diff --git a/sci-physics/root/root-6.00.02.ebuild b/sci-physics/root/root-6.00.02.ebuild
index a396ada..2711170 100644
--- a/sci-physics/root/root-6.00.02.ebuild
+++ b/sci-physics/root/root-6.00.02.ebuild
@@ -93,7 +93,7 @@ CDEPEND="
 		mysql? ( virtual/mysql )
 		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
 		oracle? ( dev-db/oracle-instantclient-basic:0= )
-		postgres? ( virtual/postgresql:= )
+		postgres? ( dev-db/postgresql:= )
 		pythia6? ( sci-physics/pythia:6= )
 		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
 		python? ( ${PYTHON_DEPS} )

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index bb8d51b..ac10320 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -93,7 +93,7 @@ CDEPEND="
 		mysql? ( virtual/mysql )
 		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
 		oracle? ( dev-db/oracle-instantclient-basic:0= )
-		postgres? ( virtual/postgresql:= )
+		postgres? ( dev-db/postgresql:= )
 		pythia6? ( sci-physics/pythia:6= )
 		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
 		python? ( ${PYTHON_DEPS} )


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2015-02-24 23:53 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2015-02-24 23:53 UTC (permalink / raw
  To: gentoo-commits

commit:     8488f45715f6cbc2cf8d789dd20ef61a2b04218f
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue Feb 24 23:49:17 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue Feb 24 23:49:17 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8488f457

sci-physics/root: fix html header background image path

---
 sci-physics/root/ChangeLog           | 4 ++++
 sci-physics/root/root-5.34.26.ebuild | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index a01cdc1..b8503a4 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  24 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.26.ebuild:
+  Remove full path from local images, otherwise html header
+  background is missing.
+
   23 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> -root-5.34.18-r2.ebuild,
   -root-6.00.01-r1.ebuild, -files/root-5.32.00-prop-flags.patch,
   -files/root-5.34.18-tutorials-path.patch, -files/root-6.00.01-cling.patch,

diff --git a/sci-physics/root/root-5.34.26.ebuild b/sci-physics/root/root-5.34.26.ebuild
index 6eeb274..fdd6943 100644
--- a/sci-physics/root/root-5.34.26.ebuild
+++ b/sci-physics/root/root-5.34.26.ebuild
@@ -228,7 +228,7 @@ src_prepare() {
 		configure || die "prefixify configure failed"
 
 	# CSS should use local images
-	sed -i -e 's,http://.*/images/,,' etc/html/ROOT.css || die "html sed failed"
+	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
 
 	# fix reflex path (bug #497280)
 	sed -i -e 's|${ROOTSYS}/lib|@libdir@|' config/genreflex.in || die


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2015-03-02  8:12 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2015-03-02  8:12 UTC (permalink / raw
  To: gentoo-commits

commit:     dfba2207c866b6fb22b3de71a89e5622205f8922
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Mon Mar  2 08:11:57 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Mon Mar  2 08:11:57 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dfba2207

sci-physics/root: cosmetics

---
 sci-physics/root/ChangeLog    |  3 +++
 sci-physics/root/metadata.xml | 36 ++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 6f4801a..1553e5c 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  02 Mar 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
+  Indentation fixes (in order to conform to portage version)
+
   02 Mar 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.26.ebuild,
   files/root-5.32.00-chklib64.patch, -files/root-5.34.26-prop-flags.patch:
   Add configurable LDFLAGS the same way as upstream did for

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 579f100..0ff221b 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>bircoph@gentoo.org</email>
-    <name>Andrew Savchenko</name>
-  </maintainer>
-  <herd>sci-physics</herd>
-  <longdescription lang="en">
+<maintainer>
+  <email>bircoph@gentoo.org</email>
+  <name>Andrew Savchenko</name>
+</maintainer>
+<herd>sci-physics</herd>
+<longdescription lang="en">
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in
   high energy physics, but also in other data analysis applications. It
@@ -14,16 +14,16 @@
   statistics, serialization, optimization, linear algebra, graphics,
   GUI toolkit, and a complete visualization framework.
 </longdescription>
-  <use>
-    <flag name="c++11"> Build ROOT using the C++11 standard</flag>
-    <flag name="c++14"> Build ROOT using the C++14 standard</flag>
-    <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-    <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
-    <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
-    <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
-    <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
-    <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
-    <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
-    <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
-  </use>
+<use>
+  <flag name="c++11"> Build ROOT using the C++11 standard</flag>
+  <flag name="c++14"> Build ROOT using the C++14 standard</flag>
+  <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+  <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
+  <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
+  <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
+  <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
+  <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
+  <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
+  <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
+</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2015-04-11  9:22 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2015-04-11  9:22 UTC (permalink / raw
  To: gentoo-commits

commit:     2fb06979eefdd4cc62c8890b50f9e6f995b5b7a6
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Apr 11 09:22:07 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sat Apr 11 09:22:07 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=2fb06979

sci-physics/root: drop minimal USE flag

 sci-physics/root/ChangeLog           |   4 +
 sci-physics/root/root-6.02.05.ebuild | 236 ++++++++++++++++-------------------
 2 files changed, 115 insertions(+), 125 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index a4087b4..b62d422 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  11 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> root-6.02.05.ebuild:
+  Drop minimal USE flag, as it is useless with current ROOT and
+  recently added USE flags.
+
 *root-6.02.05 (08 Apr 2015)
 
   08 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -root-6.00.02.ebuild,

diff --git a/sci-physics/root/root-6.02.05.ebuild b/sci-physics/root/root-6.02.05.ebuild
index 61882d5..0a1f7e0 100644
--- a/sci-physics/root/root-6.02.05.ebuild
+++ b/sci-physics/root/root-6.02.05.ebuild
@@ -24,7 +24,7 @@ DOC_URI="ftp://root.cern.ch/${PN}/doc"
 SLOT="0/$(get_version_component_range 1-3 ${PV})"
 LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
 IUSE="+X afs avahi doc emacs examples fits fftw gdml geocad
-	graphviz http kerberos ldap +math +memstat minimal mpi mysql odbc
+	graphviz http kerberos ldap +math +memstat mpi mysql odbc
 	+opengl openmp oracle postgres prefix pythia6 pythia8
 	python qt4 shadow sqlite ssl table +tiff xinetd xml xrootd"
 
@@ -33,7 +33,7 @@ IUSE="+X afs avahi doc emacs examples fits fftw gdml geocad
 # TODO: unbundle: cling, vdt
 
 REQUIRED_USE="
-	!X? ( !minimal? ( !opengl !qt4 !tiff ) )
+	!X? ( !opengl !qt4 !tiff )
 	mpi? ( math !openmp )
 	openmp? ( math !mpi )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -55,51 +55,48 @@ CDEPEND="
 		x11-libs/libX11:0=
 		x11-libs/libXext:0=
 		x11-libs/libXpm:0=
-		!minimal? (
-			|| (
-				media-libs/libafterimage:0=[gif,jpeg,png,tiff?]
-				>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff?]
-			)
-			opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
-			qt4? (
-				dev-qt/qtgui:4=
-				dev-qt/qtopengl:4=
-				dev-qt/qt3support:4=
-				dev-qt/qtsvg:4=
-				dev-qt/qtwebkit:4=
-				dev-qt/qtxmlpatterns:4=
-			)
-			x11-libs/libXft:0=
+		|| (
+			media-libs/libafterimage:0=[gif,jpeg,png,tiff?]
+			>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff?]
 		)
-	)
-	!minimal? (
-		afs? ( net-fs/openafs )
-		avahi? ( net-dns/avahi:0= )
-		emacs? ( virtual/emacs )
-		fits? ( sci-libs/cfitsio:0= )
-		fftw? ( sci-libs/fftw:3.0= )
-		geocad? ( <sci-libs/opencascade-6.8.0:= )
-		graphviz? ( media-gfx/graphviz:0= )
-		http? ( dev-libs/fcgi:0= )
-		kerberos? ( virtual/krb5 )
-		ldap? ( net-nds/openldap:0= )
-		math? (
-			sci-libs/gsl:0=
-			sci-mathematics/unuran:0=
-			mpi? ( virtual/mpi )
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
+		qt4? (
+			dev-qt/qtgui:4=
+			dev-qt/qtopengl:4=
+			dev-qt/qt3support:4=
+			dev-qt/qtsvg:4=
+			dev-qt/qtwebkit:4=
+			dev-qt/qtxmlpatterns:4=
 		)
-		mysql? ( virtual/mysql )
-		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
-		oracle? ( dev-db/oracle-instantclient-basic:0= )
-		postgres? ( dev-db/postgresql:= )
-		pythia6? ( sci-physics/pythia:6= )
-		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
-		python? ( ${PYTHON_DEPS} )
-		sqlite? ( dev-db/sqlite:3= )
-		ssl? ( dev-libs/openssl:0= )
-		xml? ( dev-libs/libxml2:2= )
-		xrootd? ( >=net-libs/xrootd-3.3.5:0= )
-	)"
+		x11-libs/libXft:0=
+	)
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi:0= )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	geocad? ( <sci-libs/opencascade-6.8.0:= )
+	graphviz? ( media-gfx/graphviz:0= )
+	http? ( dev-libs/fcgi:0= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:0= )
+	math? (
+		sci-libs/gsl:0=
+		sci-mathematics/unuran:0=
+		mpi? ( virtual/mpi )
+	)
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
+	oracle? ( dev-db/oracle-instantclient-basic:0= )
+	postgres? ( dev-db/postgresql:= )
+	pythia6? ( sci-physics/pythia:6= )
+	pythia8? ( >=sci-physics/pythia-8.1.80:8= )
+	python? ( ${PYTHON_DEPS} )
+	sqlite? ( dev-db/sqlite:3= )
+	ssl? ( dev-libs/openssl:0= )
+	xml? ( dev-libs/libxml2:2= )
+	xrootd? ( >=net-libs/xrootd-3.3.5:0= )
+"
 
 # TODO: ruby is not yet ported to ROOT-6, reenable when (if?) ready
 #		ruby? (
@@ -113,7 +110,7 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	xinetd? ( sys-apps/xinetd )"
 
-PDEPEND="doc? ( !minimal? ( ~app-doc/root-docs-${PV}[http=,math=] ) )"
+PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
 
 # install stuff in ${P} and not ${PF} for easier tracking in root-docs
 DOC_DIR="/usr/share/doc/${P}"
@@ -168,8 +165,6 @@ pkg_setup() {
 	enewgroup rootd
 	enewuser rootd -1 -1 /var/spool/rootd rootd
 
-	use minimal && return
-
 	if use math; then
 		if use openmp; then
 			if [[ "$(tc-getCXX)" == *g++* && "$(tc-getCXX)" != *clang++* ]] && ! tc-has-openmp; then
@@ -301,74 +296,67 @@ src_configure() {
 		--docdir="${EPREFIX}${DOC_DIR}"
 		--tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials"
 		--testdir="${EPREFIX}${DOC_DIR}/examples/tests"
+		--disable-builtin-afterimage
+		--disable-builtin-ftgl
+		--disable-builtin-freetype
+		--disable-builtin-glew
+		--disable-builtin-pcre
+		--disable-builtin-zlib
+		--disable-builtin-lzma
 		--disable-werror
+		--enable-explicitlink
+		--enable-shared
+		--enable-soversion
+		--fail-on-missing
 		--nohowto
+		--with-afs-shared=yes
+		--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
+		$(use_enable X x11)
+		$(use_enable X asimage)
+		$(use_enable X xft)
+		$(use_enable afs)
+		$(use_enable avahi bonjour)
+		$(use_enable fits fitsio)
+		$(use_enable fftw fftw3)
+		$(use_enable gdml)
+		$(use_enable geocad)
+		$(use_enable graphviz gviz)
+		$(use_enable http)
+		$(use_enable kerberos krb5)
+		$(use_enable ldap)
+		$(use_enable math genvector)
+		$(use_enable math gsl-shared)
+		$(use_enable math mathmore)
+		$(use_enable math minuit2)
+		$(use_enable math roofit)
+		$(use_enable math tmva)
+		$(use_enable math vc)
+		$(use_enable math vdt)
+		$(use_enable math unuran)
+		$(use_enable memstat)
+		$(use_enable mysql)
+		$(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
+		$(use_enable odbc)
+		$(use_enable opengl)
+		$(use_enable oracle)
+		$(use_enable postgres pgsql)
+		$(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "")
+		$(use_enable prefix rpath)
+		$(use_enable pythia6)
+		$(use_enable pythia8)
+		$(use_enable python)
+		$(use_enable qt4 qt)
+		$(use_enable qt4 qtgsi)
+		$(use_enable shadow shadowpw)
+		$(use_enable sqlite)
+		$(use_enable ssl)
+		$(use_enable table)
+		$(use_enable tiff astiff)
+		$(use_enable xml)
+		$(use_enable xrootd)
+		${EXTRA_ECONF}
 	)
 
-	if use minimal; then
-		myconf+=( $(usex X --gminimal --minimal) )
-	else
-		myconf+=(
-			--with-afs-shared=yes
-			--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
-			--disable-builtin-afterimage
-			--disable-builtin-ftgl
-			--disable-builtin-freetype
-			--disable-builtin-glew
-			--disable-builtin-pcre
-			--disable-builtin-zlib
-			--disable-builtin-lzma
-			--enable-explicitlink
-			--enable-shared
-			--enable-soversion
-			--fail-on-missing
-			$(use_enable X x11)
-			$(use_enable X asimage)
-			$(use_enable X xft)
-			$(use_enable afs)
-			$(use_enable avahi bonjour)
-			$(use_enable fits fitsio)
-			$(use_enable fftw fftw3)
-			$(use_enable gdml)
-			$(use_enable geocad)
-			$(use_enable graphviz gviz)
-			$(use_enable http)
-			$(use_enable kerberos krb5)
-			$(use_enable ldap)
-			$(use_enable math genvector)
-			$(use_enable math gsl-shared)
-			$(use_enable math mathmore)
-			$(use_enable math minuit2)
-			$(use_enable math roofit)
-			$(use_enable math tmva)
-			$(use_enable math vc)
-			$(use_enable math vdt)
-			$(use_enable math unuran)
-			$(use_enable memstat)
-			$(use_enable mysql)
-			$(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
-			$(use_enable odbc)
-			$(use_enable opengl)
-			$(use_enable oracle)
-			$(use_enable postgres pgsql)
-			$(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "")
-			$(use_enable prefix rpath)
-			$(use_enable pythia6)
-			$(use_enable pythia8)
-			$(use_enable python)
-			$(use_enable qt4 qt)
-			$(use_enable qt4 qtgsi)
-			$(use_enable shadow shadowpw)
-			$(use_enable sqlite)
-			$(use_enable ssl)
-			$(use_enable table)
-			$(use_enable tiff astiff)
-			$(use_enable xml)
-			$(use_enable xrootd)
-			${EXTRA_ECONF}
-		)
-	fi
-
 	./configure ${myconf[@]} || die "configure failed"
 }
 
@@ -378,7 +366,7 @@ src_compile() {
 		F77OPT="${FFLAGS}" \
 		ROOTSYS="${S}" \
 		LD_LIBRARY_PATH="${S}/lib"
-	use emacs && ! use minimal && elisp-compile build/misc/*.el
+	use emacs && elisp-compile build/misc/*.el
 }
 
 daemon_install() {
@@ -429,19 +417,17 @@ src_install() {
 	dodoc README.md
 
 	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
 
-	if ! use minimal; then
-		use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
-		if use python; then
-			echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
-			python_optimize "${D}/usr/$(get_libdir)/root"
-		fi
-		use emacs && elisp-install ${PN} build/misc/*.{el,elc}
-		if use examples; then
-			# these should really be taken care of by the root make install
-			insinto ${DOC_DIR}/examples/tutorials/tmva
-			doins -r tmva/test
-		fi
+	if use python; then
+		echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
+		python_optimize "${D}/usr/$(get_libdir)/root"
+	fi
+	use emacs && elisp-install ${PN} build/misc/*.{el,elc}
+	if use examples; then
+		# these should really be taken care of by the root make install
+		insinto ${DOC_DIR}/examples/tutorials/tmva
+		doins -r tmva/test
 	fi
 	doenvd 99root
 


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2015-04-11 18:12 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2015-04-11 18:12 UTC (permalink / raw
  To: gentoo-commits

commit:     528353b6b98e2c209c1e42316513e103f1afc891
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Apr 11 18:11:19 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sat Apr 11 18:11:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=528353b6

sci-physics/root: fix clang runtime mismatch

 sci-physics/root/ChangeLog                                       | 6 ++++++
 sci-physics/root/{root-6.02.05.ebuild => root-6.02.05-r1.ebuild} | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index b62d422..b1b0b0a 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-6.02.05-r1 (11 Apr 2015)
+
+  11 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -root-6.02.05.ebuild,
+  +root-6.02.05-r1.ebuild:
+  Fix clang buildtime vs runtime mismatch.
+
   11 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> root-6.02.05.ebuild:
   Drop minimal USE flag, as it is useless with current ROOT and
   recently added USE flags.

diff --git a/sci-physics/root/root-6.02.05.ebuild b/sci-physics/root/root-6.02.05-r1.ebuild
similarity index 99%
rename from sci-physics/root/root-6.02.05.ebuild
rename to sci-physics/root/root-6.02.05-r1.ebuild
index 0a1f7e0..2d7388b 100644
--- a/sci-physics/root/root-6.02.05.ebuild
+++ b/sci-physics/root/root-6.02.05-r1.ebuild
@@ -46,7 +46,7 @@ CDEPEND="
 	media-fonts/dejavu
 	media-libs/freetype:2=
 	media-libs/libpng:0=
-	>=sys-devel/clang-3.4
+	>=sys-devel/clang-3.4:=
 	sys-libs/zlib:0=
 	virtual/shadow
 	X? (


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2015-04-12 17:59 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2015-04-12 17:59 UTC (permalink / raw
  To: gentoo-commits

commit:     26e7e22ae62b45403d98c7ca6054561cd7fd28e3
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Apr 12 17:58:50 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Apr 12 17:58:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=26e7e22a

sci-physics/root: fix pg_config QA

 sci-physics/root/ChangeLog              | 4 ++++
 sci-physics/root/root-6.02.05-r2.ebuild | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 4fc73e8..ac89d27 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  12 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> root-6.02.05-r2.ebuild:
+  Fix "pg_config: command not found" QA warning if postgres is not
+  installed.
+
 *root-6.02.05-r2 (12 Apr 2015)
 
   12 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -root-6.02.05-r1.ebuild,

diff --git a/sci-physics/root/root-6.02.05-r2.ebuild b/sci-physics/root/root-6.02.05-r2.ebuild
index 9069f3a..b69ac9f 100644
--- a/sci-physics/root/root-6.02.05-r2.ebuild
+++ b/sci-physics/root/root-6.02.05-r2.ebuild
@@ -348,7 +348,6 @@ src_configure() {
 		$(use_enable opengl)
 		$(use_enable oracle)
 		$(use_enable postgres pgsql)
-		$(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "")
 		$(use_enable prefix rpath)
 		$(use_enable pythia6)
 		$(use_enable pythia8)
@@ -365,6 +364,10 @@ src_configure() {
 		${EXTRA_ECONF}
 	)
 
+	# usex can't be used here, because pg_config may be not
+	# installed with USE="-postgres"
+	use postgres && myconf+=( --with-pgsql-incdir=$(pg_config --includedir) )
+
 	./configure ${myconf[@]} || die "configure failed"
 }
 


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2015-04-13  6:25 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2015-04-13  6:25 UTC (permalink / raw
  To: gentoo-commits

commit:     4e236412cc2d3f5ba06a78260a477eb3de130d45
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Apr 12 17:58:50 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 06:24:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=4e236412

sci-physics/root: fix pg_config QA

 sci-physics/root/ChangeLog              | 4 ++++
 sci-physics/root/root-6.02.05-r2.ebuild | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 4fc73e8..ac89d27 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  12 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> root-6.02.05-r2.ebuild:
+  Fix "pg_config: command not found" QA warning if postgres is not
+  installed.
+
 *root-6.02.05-r2 (12 Apr 2015)
 
   12 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -root-6.02.05-r1.ebuild,

diff --git a/sci-physics/root/root-6.02.05-r2.ebuild b/sci-physics/root/root-6.02.05-r2.ebuild
index 9069f3a..b69ac9f 100644
--- a/sci-physics/root/root-6.02.05-r2.ebuild
+++ b/sci-physics/root/root-6.02.05-r2.ebuild
@@ -348,7 +348,6 @@ src_configure() {
 		$(use_enable opengl)
 		$(use_enable oracle)
 		$(use_enable postgres pgsql)
-		$(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "")
 		$(use_enable prefix rpath)
 		$(use_enable pythia6)
 		$(use_enable pythia8)
@@ -365,6 +364,10 @@ src_configure() {
 		${EXTRA_ECONF}
 	)
 
+	# usex can't be used here, because pg_config may be not
+	# installed with USE="-postgres"
+	use postgres && myconf+=( --with-pgsql-incdir=$(pg_config --includedir) )
+
 	./configure ${myconf[@]} || die "configure failed"
 }
 


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2015-07-18  9:45 Andrew Savchenko
  0 siblings, 0 replies; 69+ messages in thread
From: Andrew Savchenko @ 2015-07-18  9:45 UTC (permalink / raw
  To: gentoo-commits

commit:     edac8a8350c5bd22f8f73f170439290f9b38a71b
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Jul 18 09:44:37 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 09:44:37 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=edac8a83

avoid unconditional pg_config sourcing by usex

 sci-physics/root/ChangeLog           | 4 ++++
 sci-physics/root/root-5.34.32.ebuild | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 10c7d9e..61a91bd 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  18 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.32.ebuild:
+  Do not use usex for postgres to avoid pg_config unconditional sourcing. See
+  bug 555246.
+
 *root-5.34.32 (17 Jul 2015)
 
   17 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> +root-5.34.32.ebuild,

diff --git a/sci-physics/root/root-5.34.32.ebuild b/sci-physics/root/root-5.34.32.ebuild
index 283102f..4b02cba 100644
--- a/sci-physics/root/root-5.34.32.ebuild
+++ b/sci-physics/root/root-5.34.32.ebuild
@@ -310,7 +310,6 @@ src_configure() {
 		$(use_enable opengl)
 		$(use_enable oracle)
 		$(use_enable postgres pgsql)
-		$(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "")
 		$(use_enable prefix rpath)
 		$(use_enable pythia6)
 		$(use_enable pythia8)
@@ -330,6 +329,10 @@ src_configure() {
 		${EXTRA_ECONF}
 	)
 
+	# usex can't be used here, because pg_config may be not
+	# installed with USE="-postgres"
+	use postgres && myconf+=( --with-pgsql-incdir=$(pg_config --includedir) )
+
 	./configure ${myconf[@]} || die "configure failed"
 }
 


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2015-09-23 12:48 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2015-09-23 12:48 UTC (permalink / raw
  To: gentoo-commits

commit:     6e62ce55c1f7a78a98a24e25e90e96412b4380a0
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 12:09:15 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 12:09:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=6e62ce55

sci-physics/root: Use default functions

Package-Manager: portage-2.2.21
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-physics/root/metadata.xml     | 30 +++++++++++++++---------------
 sci-physics/root/root-9999.ebuild |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 7e1dbd5..76b4f49 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bircoph@gentoo.org</email>
-  <name>Andrew Savchenko</name>
-</maintainer>
-<herd>sci-physics</herd>
-<longdescription lang="en">
+  <maintainer>
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <herd>sci-physics</herd>
+  <longdescription lang="en">
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in
   high energy physics, but also in other data analysis applications. It
@@ -14,13 +14,13 @@
   statistics, serialization, optimization, linear algebra, graphics,
   GUI toolkit, and a complete visualization framework.
 </longdescription>
-<use>
-  <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-  <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
-  <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
-  <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
-  <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
-  <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
-  <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
-</use>
+  <use>
+    <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+    <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
+    <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
+    <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
+    <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
+    <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
+    <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
+  </use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 45b50df..91415ff 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -398,7 +398,7 @@ cleanup_install() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	dodoc README.md
 
 	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2016-05-07  9:37 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2016-05-07  9:37 UTC (permalink / raw
  To: gentoo-commits

commit:     c3a3d6b0df1099c22461e3e26b632f09f8b45216
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Tue Apr 26 22:19:44 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 22:19:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c3a3d6b0

sci-physics/root-9999: current master needs write access to /dev/random

Needed at runtime of the ROOT interpreter when JITting code,
thus also necessary to build examples (and the hsimple-target).
Further details upstream: https://sft.its.cern.ch/jira/browse/ROOT-8146
Since write-access needs to actually work, addpredict is insufficient.
Writing to /dev/random should not be a security concern
(entroy is unchanged).

 sci-physics/root/root-9999.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 8bf3758..14d468a 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -397,6 +397,10 @@ cleanup_install() {
 }
 
 src_install() {
+	# Write access to /dev/random is required to run root.exe
+	# More information at https://sft.its.cern.ch/jira/browse/ROOT-8146
+	addwrite /dev/random
+
 	DOCS=($(find README/* -maxdepth 1 -type f))
 	default
 	dodoc README.md


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2016-07-02  9:02 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2016-07-02  9:02 UTC (permalink / raw
  To: gentoo-commits

commit:     9fb26a348d51c5ccac4fc0cef37f50a38b929416
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 09:01:53 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 09:01:53 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=9fb26a34

sci-physics/root fix := under || clause

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-physics/root/root-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 14d468a..f739680 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -91,7 +91,7 @@ CDEPEND="
 			mpi? ( virtual/mpi )
 		)
 		mysql? ( virtual/mysql )
-		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
+		odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )
 		oracle? ( dev-db/oracle-instantclient-basic:0= )
 		postgres? ( dev-db/postgresql:= )
 		pythia6? ( sci-physics/pythia:6= )


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/root/
@ 2017-03-26 14:45 Justin Lecher
  0 siblings, 0 replies; 69+ messages in thread
From: Justin Lecher @ 2017-03-26 14:45 UTC (permalink / raw
  To: gentoo-commits

commit:     563f0e00028cd2a42077bfb7919c420c5c69d5fb
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 08:52:20 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 08:52:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=563f0e00

sci-physics/root: Add missing SLOT operator

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-physics/root/root-9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 4973e90e0..bb5692c84 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
@@ -50,7 +50,7 @@ CDEPEND="
 	media-libs/giflib:0=
 	media-libs/libpng:0=
 	media-libs/tiff:0=
-	>=sys-devel/clang-3.4
+	>=sys-devel/clang-3.4:=
 	sys-libs/zlib:0=
 	virtual/jpeg:0
 	virtual/shadow


^ permalink raw reply related	[flat|nested] 69+ messages in thread

end of thread, other threads:[~2017-03-26 14:46 UTC | newest]

Thread overview: 69+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-17 11:25 [gentoo-commits] proj/sci:master commit in: sci-physics/root/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2017-03-26 14:45 Justin Lecher
2016-07-02  9:02 Justin Lecher
2016-05-07  9:37 Justin Lecher
2015-09-23 12:48 Justin Lecher
2015-07-18  9:45 Andrew Savchenko
2015-04-13  6:25 Justin Lecher
2015-04-12 17:59 Andrew Savchenko
2015-04-11 18:12 Andrew Savchenko
2015-04-11  9:22 Andrew Savchenko
2015-03-02  8:12 Andrew Savchenko
2015-02-24 23:53 Andrew Savchenko
2015-01-01 23:12 Andrew Savchenko
2015-01-01 15:20 Andrew Savchenko
2015-01-01 15:20 Andrew Savchenko
2014-11-10 15:14 Justin Lecher
2014-10-26 16:16 Justin Lecher
2014-07-06 12:53 Andrew Savchenko
2014-07-03 14:15 Andrew Savchenko
2014-01-06 19:27 Justin Lecher
2013-12-29  0:31 Justin Lecher
2013-12-10 16:18 Andrew Savchenko
2013-11-08 17:50 Andrew Savchenko
2013-10-07  2:37 Andrew Savchenko
2013-10-06  3:57 Andrew Savchenko
2013-10-04 23:39 Andrew Savchenko
2013-09-17 19:13 Christoph Junghans
2013-06-29  6:14 Andrew Savchenko
2013-06-08 15:00 Andrew Savchenko
2013-06-04 11:59 Justin Lecher
2013-05-28 20:28 Andrew Savchenko
2012-10-29 11:00 Justin Lecher
2012-07-22 12:45 Andrew Savchenko
2012-07-21 22:43 Andrew Savchenko
2012-07-02 19:42 Justin Lecher
2012-06-20  9:18 Andrew Savchenko
2012-06-20  9:18 Andrew Savchenko
2012-06-19 23:18 Andrew Savchenko
2012-06-19 20:20 Andrew Savchenko
2012-06-13 15:45 Sebastien Fabbro
2012-05-30 16:34 Andrew Savchenko
2012-05-25 12:33 Andrew Savchenko
2012-05-23 20:01 Kacper Kowalik
2012-05-23  5:20 Andrew Savchenko
2012-05-22 19:43 Justin Lecher
2012-04-03 18:07 Justin Lecher
2012-04-03 18:07 Justin Lecher
2012-04-03  7:53 Andrew Savchenko
2012-04-03  4:13 Kacper Kowalik
2012-04-02 19:44 Andrew Savchenko
2012-03-23 16:04 Andrew Savchenko
2012-03-23 16:04 Andrew Savchenko
2012-03-22  0:23 Andrew Savchenko
2012-03-09 13:32 Andrew Savchenko
2012-03-09  2:20 Andrew Savchenko
2012-03-01 14:52 Andrew Savchenko
2012-01-03  3:07 Sebastien Fabbro
2012-01-03  3:07 Sebastien Fabbro
2011-12-15 18:50 Andrew Savchenko
2011-12-11 21:39 Andrew Savchenko
2011-11-25  3:27 Andrew Savchenko
2011-10-27 21:49 Sebastien Fabbro
2011-10-21 21:04 Andrew Savchenko
2011-10-21 12:36 Andrew Savchenko
2011-10-03  0:15 Andrew Savchenko
2011-08-24 10:43 Andrew Savchenko
2011-08-02 22:30 Andrew Savchenko
2011-08-02 21:58 Andrew Savchenko
2011-03-07 12:01 Justin Lecher

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