Forbid as-needed (bug #287178), fixed a syntax while installing TMVA documentation, new version bump with new set of patches. Thanks Andrew Savchenko for his contribution.

Package-Manager: portage-2.2_rc50/cvs/Linux x86_64

5 files changed, 36 insertions, 22 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index f722d4cf89a1..ca140383f2f0 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.57 2009/10/06 17:46:39 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.58 2009/11/19 05:44:31 bicatali Exp $
+
+*root-5.24.00-r1 (19 Nov 2009)
+
+  19 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  root-5.22.00-r2.ebuild, root-5.22.00-r3.ebuild, -root-5.24.00.ebuild,
+  +root-5.24.00-r1.ebuild:
+  Forbid as-needed (bug #287178), fixed a syntax while installing TMVA
+  documentation, new version bump with new set of patches. Thanks Andrew
+  Savchenko for his contribution.
 
   06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> root-5.22.00-r2.ebuild,
   root-5.22.00-r3.ebuild, root-5.24.00.ebuild:
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index e73b5be1f6b2..14486d18d43e 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -16,18 +16,18 @@ DIST Users_Guide_5_22.pdf 10649953 RMD160 ef81cc7791fbc9cd50dbc693538aa3c3cad0f8
 DIST Users_Guide_5_24.pdf 10955895 RMD160 a17ed2ca247154dee5a2e89029305c4791458362 SHA1 01873a1a052cac6a2d9bd3e6085ef7ffc2885695 SHA256 5fe3b03dc869013414941e4359fa60bbf572d903d27d478acf8f4318bbc74332
 DIST root-5.22.00-patches-p03.tar.bz2 83157 RMD160 be7229e25854c46feac225905e73bc0c1e641c1c SHA1 aeb51dd4e3ed15608b3187ab1ff79e88c035a2e4 SHA256 f838cfeec5020defda888a483d8de63efea64fb2e7a389e8f4a5539f8ce3825f
 DIST root-5.22.00-patches-p04.tar.bz2 92875 RMD160 c87aa60cf1a68a13705df3da123cb0e7153297db SHA1 c46b0d7c9ba6093870640f349376bb049074c402 SHA256 30578a1bf11769bd47589fae11d3c135fb716c3351093764e722625154723076
-DIST root-5.24.00-patches-p01.tar.bz2 44343 RMD160 be0e350e6ae79c52dfe1b425c91ef2a1cfe17435 SHA1 ae2887297b43e83a37534a1d3155aae2acbafffb SHA256 66144d5f24ba4198bf7a7530c92e33fad5d8df4f5704a6d84ad8aea0bc5df1a1
+DIST root-5.24.00-patches-p02.tar.bz2 65772 RMD160 4b860be656481a4012f4c1e097311b179e386316 SHA1 7dbc57cbb1fad312ab62a536b505ea9a2553e5ec SHA256 ad4afd90bbec2d2b84e564de24d1cc07c21b7fffd0409d71745d5111ca191309
 DIST root_v5.22.00.source.tar.gz 26320334 RMD160 0fba2518802ce1f737b8cededbf518f0e475ba19 SHA1 b63e09d90ffef973fd487fdc7fc1ed3b26cf6d48 SHA256 9445351905e2b1b546bd6fea9d7397054aa1622a91bbc388014f3706b0843fe2
 DIST root_v5.24.00.source.tar.gz 27387383 RMD160 2f400d69dad1db2cd1e5f96fe4208a5a7b156689 SHA1 8a7d73c069798bb0e075cf31c54dd7feb475cefe SHA256 d4df055276a1a96599e553166efbd11f1f7eb0a2dcf0d892959771705bd1914e
-EBUILD root-5.22.00-r2.ebuild 9136 RMD160 61d62c9075b10a37cfbd53aed4c390bed5c847b0 SHA1 9d9886fd5c9311ea982a5e602dba1f5adaaa84f9 SHA256 4066ff6a1fe1af8161ce955a7788fd15352b2fa2fb95ed44bf8ea81af5103aa7
-EBUILD root-5.22.00-r3.ebuild 9512 RMD160 5769e1e614c937cd686dbf11ddfb4779f8726591 SHA1 837bfe4f6b1fe32e16e107b60362c9c218805dbc SHA256 f9b15c5d3de2e1a707ea71bc20ec858c1eb0f751f6b17e904d661a904cde9926
-EBUILD root-5.24.00.ebuild 9046 RMD160 33ad2a0fd5627611d88111c6afbd80b488272f9f SHA1 15f837978e4b174b3e76548bdbd39674c2af8402 SHA256 924b0efa9a15bb824db753de845d01ecd3e6923dc1f0af0cd1172c42f5a85c78
-MISC ChangeLog 17563 RMD160 d745af3d71b7e7a5d020ea469efa348e5ccfc2b2 SHA1 523fa0b13a57f58a2add1109097504705fd50aaf SHA256 63cd7220a4990f229b94ae6d1b825ec2571a7ebc9ea6c6b0dadad645bffa2725
+EBUILD root-5.22.00-r2.ebuild 9200 RMD160 32a3c002c902f7a76aa93be7c75a32f9f296da01 SHA1 07849f8fa039e13c1b8668175f92847c51c19ecd SHA256 823aa5ac0e2f3b267b06bce4c99cd59654b162f184bb01be136e6adc3a1416f7
+EBUILD root-5.22.00-r3.ebuild 9563 RMD160 0c9b4bcfdeff47e510889d46f03481cfee23847b SHA1 255f7fdd6c26a9861124b705799f95f6d6546db9 SHA256 027f0e4ce64bd39194a71fecd39603ed7f478b6d321edf80b6dd5e09c6aa7a46
+EBUILD root-5.24.00-r1.ebuild 9063 RMD160 92d75f0a8094c03cc12b0b1566de31b8d4b6646e SHA1 f61bc2b8a53fe10736103242234f0c340bcdde2b SHA256 81bf6b93b0fbfcafdc2de2497019b3f6e4239f084f149b229d674d3242a0394a
+MISC ChangeLog 17932 RMD160 93964058ea75248127bdb296236a3f8d11dfd268 SHA1 328087dc47a27d7fa86ba737bcc6cb3c78b30181 SHA256 0f9c885712a5562bae4862aabb86e7bcbfff16e44495016dca01b2bf91019ba1
 MISC metadata.xml 1569 RMD160 dba331cab0e10890d441d667416e43098a764c3f SHA1 38d5cc13c7531ac1ba267f447b2ac84cb9c2e6c4 SHA256 884bc118e850e655cdf52e3f7e8171d8a88d2c6c986fd5d5e49cbd303c18aaa2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrLgowACgkQ+CZEqwt+F6Yp0gCggk8cqgzdTjVlVOLVQiiDxwrL
-pJkAoKGSdhUIkXCG+B6hby9sbCmzhThu
-=9vVa
+iEYEARECAAYFAksE5PoACgkQ1ycZbhPLE2B7xQCgr/z5udNtWj0tPAEhHcYUu98U
+G7sAoJyYH0iDnPCYpEfmIhqOyi6e7XTT
+=eedl
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/root/root-5.22.00-r2.ebuild b/sci-physics/root/root-5.22.00-r2.ebuild
index 8cbbce228e5c..ed6be3ac99ff 100644
--- a/sci-physics/root/root-5.22.00-r2.ebuild
+++ b/sci-physics/root/root-5.22.00-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.22.00-r2.ebuild,v 1.5 2009/10/06 17:46:39 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.22.00-r2.ebuild,v 1.6 2009/11/19 05:44:31 bicatali Exp $
 
 EAPI=2
-inherit versionator eutils qt4 fortran elisp-common fdo-mime toolchain-funcs
+inherit versionator eutils qt4 fortran elisp-common fdo-mime toolchain-funcs flag-o-matic
 
 #DOC_PV=$(get_major_version)_$(get_version_component_range 2)
 DOC_PV=5_21
@@ -105,6 +105,8 @@ pkg_setup() {
 		export USE_OPENMP=1
 		use math && export USE_PARALLEL_MINUIT2=1
 	fi
+	# bug #287178
+	append-ldflags $(no-as-needed)
 }
 
 src_prepare() {
@@ -223,7 +225,7 @@ doc_install() {
 		insinto /usr/share/doc/${PF}
 		doins \
 			"${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide_v${TMVA_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 \
diff --git a/sci-physics/root/root-5.22.00-r3.ebuild b/sci-physics/root/root-5.22.00-r3.ebuild
index ea8af7661430..0104bccfb072 100644
--- a/sci-physics/root/root-5.22.00-r3.ebuild
+++ b/sci-physics/root/root-5.22.00-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.22.00-r3.ebuild,v 1.2 2009/10/06 17:46:39 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.22.00-r3.ebuild,v 1.3 2009/11/19 05:44:31 bicatali Exp $
 
 EAPI=2
 inherit versionator eutils qt4 elisp-common fdo-mime toolchain-funcs
@@ -106,6 +106,8 @@ pkg_setup() {
 		ewarn "switch to an older gcc version or another compiler"
 		die "cint7 incompatible with gcc>4"
 	fi
+	# bug #287178
+	append-ldflags $(no-as-needed)
 }
 
 src_prepare() {
@@ -226,7 +228,7 @@ doc_install() {
 		insinto /usr/share/doc/${PF}
 		doins \
 			"${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide_v${TMVA_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 \
diff --git a/sci-physics/root/root-5.24.00.ebuild b/sci-physics/root/root-5.24.00-r1.ebuild
index 7734bc2d071e..35a564ccb589 100644
--- a/sci-physics/root/root-5.24.00.ebuild
+++ b/sci-physics/root/root-5.24.00-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.24.00.ebuild,v 1.2 2009/10/06 17:46:39 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.24.00-r1.ebuild,v 1.1 2009/11/19 05:44:31 bicatali Exp $
 
 EAPI=2
-inherit versionator eutils qt4 elisp-common fdo-mime toolchain-funcs
+inherit versionator eutils 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=p01
+PATCH_PV=p02
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
@@ -98,16 +98,17 @@ pkg_setup() {
 		export USE_OPENMP=1
 		use math && export USE_PARALLEL_MINUIT2=1
 	fi
+	# bug #287178
+	append-ldflags $(no-as-needed)
 }
 
 src_prepare() {
+	epatch "${WORKDIR}"/${P}-svn31303.patch
 	epatch "${WORKDIR}"/${P}-gcc44.patch
-	epatch "${WORKDIR}"/${P}-svn30106.patch
 	epatch "${WORKDIR}"/${P}-prop-flags.patch
-	epatch "${WORKDIR}"/${P}-as-needed.patch
 	epatch "${WORKDIR}"/${P}-xrootd-prop-flags.patch
+	epatch "${WORKDIR}"/${P}-as-needed.patch
 	epatch "${WORKDIR}"/${P}-configure-paths.patch
-	epatch "${WORKDIR}"/${P}-configure-sandbox.patch
 	epatch "${WORKDIR}"/${P}-g4root-flags.patch
 
 	# use system cfortran
@@ -215,7 +216,7 @@ doc_install() {
 		insinto /usr/share/doc/${PF}
 		doins \
 			"${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \
-			"${DISTDIR}"/TMVAUsersGuide_v${TMVA_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 \