Cleaned old, fixed slotting for media-libs/libpng and media-libs/tiff, sort Deps, converted elog -> echo where needed, cleaned illegal epause, formated metadat.xml

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

5 files changed, 80 insertions, 361 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 0e05878c0985..ed9997cfa5fe 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.89 2011/10/18 16:35:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.90 2011/11/13 11:21:12 jlec Exp $
+
+  13 Nov 2011; Justin Lecher <jlec@gentoo.org> -root-5.26.00-r2.ebuild,
+  root-5.26.00e-r1.ebuild, root-5.28.00d.ebuild, metadata.xml:
+  Cleaned old, fixed slotting for media-libs/libpng and media-libs/tiff, sort
+  Deps, converted elog -> echo where needed, cleaned illegal epause, formated
+  metadat.xml
 
   18 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> root-5.26.00e-r1.ebuild,
   +files/root-5.26.00e-libpng15.patch:
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index f78c52ca59fb..cf1fefb20879 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,33 +1,43 @@
 <?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">
-  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
-  contains the CINT C/C++ interpreter and many classes such as
-  statistics, serialization, optimization, linear algebra, graphics,
-  GUI toolkit, and a complete visualization framework.
-</longdescription>
-<use>
-  <flag name="cint7">Build the *experimental* new C++ interpretor CINT7</flag>
-  <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="geant4">Build the <pkg>sci-physics/geant</pkg> (GEANT4) navigator</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">
-    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>
+	<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
+	contains the CINT C/C++ interpreter and many classes such as
+	statistics, serialization, optimization, linear algebra, graphics,
+	GUI toolkit, and a complete visualization framework.
+	</longdescription>
+	<use>
+		<flag name="cint7">Build the *experimental* new C++ interpretor CINT7</flag>
+		<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="geant4">
+			Build the <pkg>sci-physics/geant</pkg> (GEANT4) navigator
+		</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">
+			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>
 </pkgmetadata>
diff --git a/sci-physics/root/root-5.26.00-r2.ebuild b/sci-physics/root/root-5.26.00-r2.ebuild
deleted file mode 100644
index dc7a80ff2d2f..000000000000
--- a/sci-physics/root/root-5.26.00-r2.ebuild
+++ /dev/null
@@ -1,307 +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.26.00-r2.ebuild,v 1.13 2011/06/21 14:31:50 jlec Exp $
-
-EAPI=2
-inherit versionator eutils fortran-2 qt4 elisp-common fdo-mime toolchain-funcs flag-o-matic
-
-DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4
-PATCH_PV=p03
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-	mirror://gentoo/${P}-patches-${PATCH_PV}.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 )"
-
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
-
-IUSE="afs cint7 clarens doc emacs examples fftw geant4 kerberos ldap
-	+math mysql	odbc +opengl openmp oracle postgres pythia6 pythia8 python
-	+reflex	ruby qt4 ssl xft xml xinetd 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/libpng
-	virtual/jpeg
-	media-libs/giflib
-	media-libs/glew
-	media-libs/tiff
-	sys-apps/shadow
-	x11-libs/libXpm
-	x11-libs/libXft
-	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 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	math? ( >=sci-libs/gsl-1.8 )
-	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 )
-	python? ( dev-lang/python )
-	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
-	elog
-	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)\""
-	elog
-	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"
-		epause 5
-	elif use openmp; then
-		export USE_OPENMP=1
-		use math && export USE_PARALLEL_MINUIT2=1
-	fi
-	# bug #287178
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-svn32505.patch
-	epatch "${WORKDIR}"/${P}-prop-ldflags.patch
-	epatch "${WORKDIR}"/${P}-xrootd-prop-flags.patch
-	epatch "${WORKDIR}"/${P}-configure-paths.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, and libftgl_pic is libftgl
-	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 \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--fail-on-missing \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--docdir=/usr/share/doc/${PF} \
-		--tutdir=/usr/share/doc/${PF}/examples/tutorials \
-		--testdir=/usr/share/doc/${PF}/examples/tests \
-		--with-sys-iconpath=/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 \
-		--with-afs-shared=yes \
-		$(use_enable afs) \
-		$(use_enable cint7) \
-		$(use_enable clarens) \
-		$(use_enable clarens peac) \
-		$(use_enable fftw fftw3) \
-		$(use_enable geant4 g4root) \
-		$(use_enable kerberos krb5) \
-		$(use_enable ldap) \
-		$(use_enable math gsl-shared) \
-		$(use_enable math genvector) \
-		$(use_enable math mathmore) \
-		$(use_enable math minuit2) \
-		$(use_enable math roofit) \
-		$(use_enable math unuran) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable 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=/usr/$(get_libdir)/root" > 99root
-	use pythia8 && echo "PYTHIA8=/usr" >> 99root
-	use python && echo "PYTHONPATH=/usr/$(get_libdir)/root" >> 99root
-	use ruby && echo "RUBYLIB=/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 "${D}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-	rm "${D}"usr/share/root/fonts/LICENSE
-	pushd "${D}"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 "${D}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-	rm -f "${D}"/etc/root/proof/*.sample
-	rm -rf "${D}"/etc/root/daemons
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	use ruby && elog "ROOT Ruby module is available as libRubyROOT"
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-physics/root/root-5.26.00e-r1.ebuild b/sci-physics/root/root-5.26.00e-r1.ebuild
index c06df397abb7..2aec893f8ece 100644
--- a/sci-physics/root/root-5.26.00e-r1.ebuild
+++ b/sci-physics/root/root-5.26.00e-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.26.00e-r1.ebuild,v 1.11 2011/10/18 16:35:29 ssuominen Exp $
+# $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
 
@@ -14,7 +14,8 @@ TMVA_DOC_PV=4
 
 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
 	mirror://gentoo/${P}-patches.tar.bz2
 	doc? (
 		ftp://root.cern.ch/root/doc/Users_Guide_${DOC_PV}.pdf
@@ -31,17 +32,18 @@ IUSE="afs clarens doc emacs examples fftw geant4 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-2.1.3_rc5
-	media-libs/libpng
-	virtual/jpeg
 	media-libs/giflib
 	media-libs/glew
-	media-libs/tiff
+	media-libs/libpng:0
+	media-libs/tiff:0
 	sys-apps/shadow
-	x11-libs/libXpm
+	virtual/jpeg
 	x11-libs/libXft
+	x11-libs/libXpm
 	afs? ( >=net-fs/openafs-1.4.7 )
 	clarens? ( dev-libs/xmlrpc-c )
 	emacs? ( virtual/emacs )
@@ -58,11 +60,13 @@ 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-xmlpatterns:4 )
-	ruby? ( dev-lang/ruby
+	ruby? (
+			dev-lang/ruby
 			dev-ruby/rubygems )
 	ssl? ( dev-libs/openssl )
 	xml? ( dev-libs/libxml2:2 )"
@@ -72,21 +76,21 @@ DEPEND="${CDEPEND}
 
 RDEPEND="
 	virtual/fortran
-${CDEPEND}
+	${CDEPEND}
 	xinetd? ( sys-apps/xinetd )"
 
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	fortran-2_pkg_setup
-	elog
+	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)\""
-	elog
+	echo
 	enewgroup rootd
 	enewuser rootd -1 -1 /var/spool/rootd rootd
 
@@ -97,7 +101,6 @@ pkg_setup() {
 		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"
-		epause 5
 	elif use openmp; then
 		export USE_OPENMP=1
 		use math && export USE_PARALLEL_MINUIT2=1
@@ -106,7 +109,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${WORKDIR}"/${P}-make-3.82.patch \
+	epatch \
+		"${WORKDIR}"/${P}-make-3.82.patch \
 		"${WORKDIR}"/${P}-prop-ldflags.patch \
 		"${WORKDIR}"/${P}-configure-paths.patch \
 		"${WORKDIR}"/${P}-nobyte-compile.patch \
diff --git a/sci-physics/root/root-5.28.00d.ebuild b/sci-physics/root/root-5.28.00d.ebuild
index 89904116d005..0a01ee6f6e88 100644
--- a/sci-physics/root/root-5.28.00d.ebuild
+++ b/sci-physics/root/root-5.28.00d.ebuild
@@ -1,9 +1,11 @@
 # 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 $
+# $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 versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic
 
 #DOC_PV=$(get_major_version)_$(get_version_component_range 2)
@@ -14,7 +16,8 @@ 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
+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? (
@@ -28,13 +31,14 @@ 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
+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
+	media-libs/libpng:0
+	media-libs/tiff:0
 	sys-apps/shadow
 	virtual/jpeg
 	x11-libs/libX11
@@ -61,16 +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
+	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"
@@ -85,14 +91,14 @@ S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	fortran-2_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