[gentoo-commits] proj/sci:master commit in: sci-physics/root/

["Andrew Savchenko" <bircoph@gmail.com>]

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