sci-physics/root: version bump

4 files changed, 11 insertions, 39 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 77624c155..65ee18368 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,14 @@
 # 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.03 (25 Oct 2012)
+
+  25 Oct 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-5.34.01-glibc216.patch, -root-5.34.02.ebuild,
+  +root-5.34.03.ebuild:
+  Version bump with important fixes in RooFit.
+  Drop old.
+
 *root-5.34.02 (19 Oct 2012)
 *root-5.32.04 (19 Oct 2012)
 
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index f2b3bb8d4..80bd749aa 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,9 +1,9 @@
-DIST ROOTUsersGuide-5.34.02.pdf 9137216 SHA256 b69908af895804e824470078fa32974974a492d8e5db81c2f4b67c68b091c98d SHA512 874316975b28a820badd3c116238005870d4bf559b0c86349293ee9bdc2d0fedc763658ff5f03b8ef4565ecbee9a014de55472c126c4b94b97cb3b103b9c5968 WHIRLPOOL ffc66e18396334e44566be1609177b9e9dab5ea7c72be0ac0ec1fb9aea528a53ce3a8be397ada15e805a43d8edc2293e5f1b1ef551ed3dc2a1619fdf0227e4f0
+DIST ROOTUsersGuide-5.34.03.pdf 9137216 SHA256 b69908af895804e824470078fa32974974a492d8e5db81c2f4b67c68b091c98d SHA512 874316975b28a820badd3c116238005870d4bf559b0c86349293ee9bdc2d0fedc763658ff5f03b8ef4565ecbee9a014de55472c126c4b94b97cb3b103b9c5968 WHIRLPOOL ffc66e18396334e44566be1609177b9e9dab5ea7c72be0ac0ec1fb9aea528a53ce3a8be397ada15e805a43d8edc2293e5f1b1ef551ed3dc2a1619fdf0227e4f0
 DIST ROOTUsersGuide.pdf 9124822 SHA256 70a96c4a2573dc0d320142f86993ecfda24caa755e910340a3014120f2997c8b SHA512 c3b4c18ef2e13968afdf67c6003249d4cfe6ea661fa32ce25127361bae7e3376a25cd3b11591292f3975bcd8105291aca52f2f6214c9fe45f4bd6e7e44d54b25 WHIRLPOOL 11256ba7837d17e5795cf71ac32db43d7d8f797bfbddf5f71612fe2f8fb2e01354372c0ea8f0bc22868881eb0bfdc8a3e3f1b05293d2750d293aa4d59217b2e6
 DIST RooFit_Users_Manual_2.91-33.pdf 1330062 SHA256 101c4e4c41962238fcabf1caa86cafc51241a1800594491b2e62ef8b565a5646 SHA512 732d7dea3541b51e5f0b9b5b70dae57e1bdbb2504c4222d5e5095ec0f9b67307011c1f31c2c95be419b53dd8426f52f62f6c9370084208176a2ed3d7f25d783b WHIRLPOOL 033897bef4bdb13246a81ea6749f7895e6c4d639752e932130234ad9153bb399a4e5d416237850da27f139d3cccc53d9adb7a077abf20d257ce057157d6c3696
 DIST TMVAUsersGuide-v4.03.pdf 3913533 SHA256 0cdbb4a2d19eb7a86e2911cfa73a905932e862d6c94be10b7662a9355b0241af SHA512 d8bb2ce35ef32c4877059898f56513db0b1057924e21935a3d3a6f114748e167984c43fd2ec7e54197fccff875540543968fea9a8e75bf63f5f13521724a7ddb WHIRLPOOL 0a3e2e61e8e32f3a22757178adf033f9fbb89014aecd4df7f8bd49677d772bb3ad2c0f5526259611879f6bb20df647c01e23f53ade483d7a3e2242f8aee6c6aa
 DIST info.png 2060 SHA256 51de6661250f3fb71c6c8250cbc4bdc4dc4283cc90240b4dc1ee6168e8d40279 SHA512 81a730eefbe7a7e15d5840491402c7644bf7ed5d5f8f3830ed9457b343cc7882480e993ea84aef93500742cd0fe8469859cd2c925e5582b91ef56406804ae276 WHIRLPOOL 02ea6daf9e3d21947ebf5dd01c455a13f2fcbf9981be34a150056a3510122ca49e3d137d4f242c7218d4d06ace09566d513a04f09071723ac244f5a38e982bac
 DIST root-banner.png 132555 SHA256 d165e1cc175f654ff79af39193a6144678f600e14a53dd20e2b216b3e8951e94 SHA512 139347f396e88c8062d847d612949204cb80e551a826d926950ca8ab967f0d496487fed17a227fc796ae4db23fca758d91a0af7943142adbed358e98d7667b1f WHIRLPOOL dd23e26acf9303b404cda8135d6946af3b1abba3dfdff8d80e56096f810d50a01ebfb52dc1e6ee1d1b99fbb5859dc850e0e368155339b5007294d95ce8909857
 DIST root_v5.32.04.source.tar.gz 55526502 SHA256 0c0130ba3d74b86caee3071deeceb46545cfde34def8ad2107601e133506acf2 SHA512 796d7f6fe92700232da3fcaac042438e13c13e504179a7375105b2ff06e1fac571ef4d59f270d73844b2a481b0762a873985d22eee2b1a0b156071b777d4417a WHIRLPOOL c5ce0f81331e08b3f79e97c894bff60185bba562388e789d3d1716d3523045a55c24e1cebded4ad19a09023c4b5275fd7d44acb726a1f248a9616ed95addd609
-DIST root_v5.34.02.source.tar.gz 56243895 SHA256 401ae3b69a397e0ab557faf640a13f49f8aab41dc03b4e7ebddbe37be32fedb1 SHA512 3f8da0e78e2be7a3961b97e6da0bc6957f74c51f4356a273a996a081b6ec9ce62311d89bd3aa3bbfcd3a7e47ea8324ebc6565eae40b72a9c85aa7a7c7b18fd79 WHIRLPOOL 1ca36f02a7f060f946b5c5a578fe8edf710da5bbc257dacd6dbbf513c95738e73da58915acb90322f38094a383b9cf34f24ea17f982da6ae8069abe25ab96cac
+DIST root_v5.34.03.source.tar.gz 56284551 SHA256 eb9df75a7f2032a85210a630e2f96ce2ecbf3051d895245048656fb171ef3f32 SHA512 186d8edc3759ed725f4c96080d30e9816ec68dcab488644055508055a738a23499366ff52a6255577a0b7a6ee6eb91097835b947d5afd40731fb7a64f1f3480e WHIRLPOOL edd8bf842c7938196956a9a71fb52e615220433eefaf68e128969e29bdb4b77c8190276968bb2565a94855264fee6843ec6f88148df0fdca12da2d54cba03772
 DIST rootdrawing-logo.png 15051 SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc7d155944a8e27284af83a6b SHA512 14aa13ebfed3c9412d7d7d04c250740b25fe3af6bcb07e618045a5cec2dc23698a251fd7df2db1a6c37331084db99b029b387ea81c25ac825fc7ae10ad164a68 WHIRLPOOL 877a959a5aead73ba69dbb805c9869cbd6a047ea476bd4e7fef80781563a61d20dad49dd4d8b0005bfc58e8f7c7d38efbb3e085a95974feb81dfc9e339c18741
diff --git a/sci-physics/root/files/root-5.34.01-glibc216.patch b/sci-physics/root/files/root-5.34.01-glibc216.patch
deleted file mode 100644
index b2da15970..000000000
--- a/sci-physics/root/files/root-5.34.01-glibc216.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur root-5.34.00.orig/build/rmkdepend/main.c root-5.34.00/build/rmkdepend/main.c
---- root-5.34.00.orig/build/rmkdepend/main.c	2012-06-05 15:31:46.000000000 +0200
-+++ root-5.34.00/build/rmkdepend/main.c	2012-07-05 20:42:58.938953353 +0200
-@@ -60,7 +60,7 @@
- #  endif
- # elif defined(__CYGWIN__)
- extern int fchmod(int, mode_t);
--#else
-+# elif !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 16)
- extern int fchmod(int, int);
- # endif
- #endif
-diff -ur root-5.34.00.orig/cint/tool/rmkdepend/main.c root-5.34.00/cint/tool/rmkdepend/main.c
---- root-5.34.00.orig/cint/tool/rmkdepend/main.c	2012-06-05 15:31:30.000000000 +0200
-+++ root-5.34.00/cint/tool/rmkdepend/main.c	2012-07-05 20:42:58.492949104 +0200
-@@ -58,7 +58,7 @@
- #if !defined(MAC_OS_X_VERSION_10_4)
- extern int fchmod();
- #endif
--#else
-+#elif !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 16)
- extern int fchmod();
- #endif
- #endif
-diff -ur root-5.34.00.orig/core/unix/src/TUnixSystem.cxx root-5.34.00/core/unix/src/TUnixSystem.cxx
---- root-5.34.00.orig/core/unix/src/TUnixSystem.cxx	2012-06-05 15:31:17.000000000 +0200
-+++ root-5.34.00/core/unix/src/TUnixSystem.cxx	2012-07-05 20:29:29.969242837 +0200
-@@ -98,6 +98,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <errno.h>
-+#include <sys/resource.h>
- #include <sys/wait.h>
- #include <time.h>
- #include <sys/time.h>
diff --git a/sci-physics/root/root-5.34.02.ebuild b/sci-physics/root/root-5.34.03.ebuild
index 9f28943ce..1ce0d9c07 100644
--- a/sci-physics/root/root-5.34.02.ebuild
+++ b/sci-physics/root/root-5.34.03.ebuild
@@ -155,8 +155,7 @@ src_prepare() {
 		"${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_PV3}-glibc216.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