sci-physics/root: Add missing eclass, fix logic in version comparision when using gcc (4.7 is not at least then 4.7.0); dropped old

(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

8 files changed, 37 insertions, 1380 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index c07b93781781..9eae61bf9f6c 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.102 2012/06/27 17:55:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.103 2012/06/28 17:02:39 jlec Exp $
+
+  28 Jun 2012; Justin Lecher <jlec@gentoo.org> root-5.26.00e-r1.ebuild,
+  -root-5.26.00g.ebuild, -root-5.28.00h-r1.ebuild, -root-5.32.02-r1.ebuild,
+  -root-5.32.03.ebuild, root-5.34.00.ebuild, metadata.xml:
+  Add missing eclass, fix logic in version comparision when using gcc (4.7 is
+  not at least then 4.7.0); dropped old
+
+  28 Jun 2012; Justin Lecher <jlec@gentoo.org> root-5.34.00.ebuild,
+  metadata.xml:
+  Add missing eclass
 
   27 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org>
   files/root-5.32.00-htmldoc.patch, root-5.32.03-r2.ebuild,
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index b48b9799c5fc..c232a33b09a5 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="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="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="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.26.00e-r1.ebuild b/sci-physics/root/root-5.26.00e-r1.ebuild
index 01ee89e52f35..0ae336a73d78 100644
--- a/sci-physics/root/root-5.26.00e-r1.ebuild
+++ b/sci-physics/root/root-5.26.00e-r1.ebuild
@@ -1,12 +1,12 @@
 # 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.14 2012/05/04 07:55:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00e-r1.ebuild,v 1.15 2012/06/28 17:02:39 jlec Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2"
 
-inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs
+inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs user
 
 DOC_PV=$(get_major_version)_$(get_version_component_range 2)
 ROOFIT_DOC_PV=2.91-33
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 4e163e2fdedb..000000000000
--- 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.00g.ebuild,v 1.2 2012/05/04 07:55:34 jdhore 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}
-	virtual/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 83480ac7640b..000000000000
--- 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.00h-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore 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}
-	virtual/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 85fcd71929ad..000000000000
--- 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.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
-
-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}
-	virtual/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
-}
diff --git a/sci-physics/root/root-5.32.03.ebuild b/sci-physics/root/root-5.32.03.ebuild
deleted file mode 100644
index 898368b9390d..000000000000
--- a/sci-physics/root/root-5.32.03.ebuild
+++ /dev/null
@@ -1,353 +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.ebuild,v 1.1 2012/05/15 17:43:07 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
-	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=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="${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 ) )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-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}
-	virtual/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; 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
-
-	# 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
-}
diff --git a/sci-physics/root/root-5.34.00.ebuild b/sci-physics/root/root-5.34.00.ebuild
index e851e2e7e93a..76e43de553ee 100644
--- a/sci-physics/root/root-5.34.00.ebuild
+++ b/sci-physics/root/root-5.34.00.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.34.00.ebuild,v 1.1 2012/06/27 17:55:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.00.ebuild,v 1.2 2012/06/28 17:02:39 jlec Exp $
 
 EAPI=4
 
@@ -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 ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN} versionator
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -140,9 +140,9 @@ pkg_setup() {
 			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
 		fi
 	fi
-	if use c++0x && [[ $(tc-getCXX)$ == *g++* ]] && \
-		! version_is_at_least "4.7.0" "$(gcc-version)"; then
-		ewarn "You are using a g++ without C++0x capabilities"
+	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
 }