Imported from science overlay. Added a patch from fedora for glib-2.16. Changed all rm -f to rm to make sure they die

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 86 insertions, 33 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 0161ba6b3ab7..842620a95e12 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,24 @@
 # 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.107 2012/07/15 09:35:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.108 2012/07/22 20:33:47 bicatali Exp $
+
+  22 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> -root-5.34.00.ebuild,
+  +root-5.34.01.ebuild, +files/root-5.34.01-glibc216.patch:
+  Imported from science overlay. Added a patch from fedora for glib-2.16.
+  Changed all rm -f to rm to make sure they die
+
+*root-5.34.01 (22 Jul 2012)
+
+  22 Jul 2012; Andrew Savchenko <bircoph@gmail.com> -root-5.34.00.ebuild,
+  +root-5.34.01.ebuild, metadata.xml:
+  Version bump. Clarens and PEAC are gone, despite this is a minor
+  release.
+
+  21 Jul 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-5.32.00-explicit-functions.patch, +root-5.34.00.ebuild,
+  root-9999.ebuild:
+  Fix bug 426432: xft now is a strict dependency for X.
+  Remove unused.
 
   15 Jul 2012; Justin Lecher <jlec@gentoo.org>
   -files/root-5.26.00-make-3.82.patch, -root-5.26.00e-r1.ebuild,
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index fc544504ab6f..2e158d97ca24 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -18,27 +18,28 @@ AUX root-5.32.00-dotfont.patch 2563 SHA256 7b4fc5da17ee8bfa71ed4cb60926a02e4b705
 AUX root-5.32.00-explicit-functions.patch 610 SHA256 1afa92168b1f25ed457c08db85c85173613b82050b558765ba25e056f6f60abc SHA512 04f64a15ab5a714b09b7ec8e6a442e63080857bfd2a895ca0aafda1bbeb60c347d19b1f37e35e0b3ff5da256e33408ab11b935118af9cfbb079cfa54368ebbbb WHIRLPOOL a89ea3c0a8a62ba1247bb9b11f19702c96017f3085f48ba6c3d7978d533eeeaa4ead2508780c5a19ba0193b28a792f9aa5071374d60ec2416280918910187936
 AUX root-5.32.00-htmldoc.patch 485 SHA256 96674266856275b0ef83feefebc2fd5cd3edf73f207b2349b9c44e81e6ac7b98 SHA512 924f3d1cad1a5db0785e5741eb508fccc48bdd5750b938210b4c810b60c081b4855001cf30643dc2c2450364865a724f619fe9043123be8bad9bac03811c26c5 WHIRLPOOL 054018d8f85f4f0be177fc733c1509f15a8326a86be31dc59b764bb21304a4ac80dec23467780812322194174e472df5254307ce3d1870f0d4b26b293ba061d9
 AUX root-5.32.00-nobyte-compile.patch 5527 SHA256 82152c92efd5002f9c2b230f141cae6c8111b03bd18370030d62f0f7d7127420 SHA512 582a43ff07609189c5ef8627b7e0739c9c917a7316c37bda8a3f5d7132de6f3f038edc6599bf43da959a15ce630e96014bb8fa1b175555a94bd7d8d748476d5c WHIRLPOOL e3753dbd7b9df54dce4941f041aed94628350615bbee23fd4a3fc571a890e9c1fe352ab04b298f84cd51c52bedfdf730434ea6c57142ea7165e4530508a34942
+AUX root-5.34.01-glibc216.patch 1389 SHA256 191db0de52bebf8be9fed61f975e809147f79b061f93e8023d29190cfc0ff880 SHA512 2cf2d67e0aca6e49d3755255025a7278123b4a42bfa0bb6c735ee9888eaea46c772b47297c0fca8614e68db49d5d84022b787141968ed3fd826ff644c41ce6f3 WHIRLPOOL 710d78093bcd98b497db6dc49fa652ab5a0ff4cf5619d0f4df321f6c4b64e24ea2f627e6a8dce3c06596912dca911fec4ac97e6cac55b90f3b59e325852e7a73
 AUX rootd.confd 199 SHA256 7b69f646ce0b2546ce797ec4a05949b02302dc5f4e41d2e8896ed0bc6575ac8d SHA512 2ce6753d37a7f22cc3656f110f802b8e07c1469bfe4524606c1472369352f8c584c01c716760252fab40369470b72d8c77cdbb2d52126c39371faaf597bf58d8 WHIRLPOOL b4c65e5026d6583775cda7b13fdbc5ae48c82c36710efbdd6b112243310090c05b5726d6e76d1ae25d585ecaa4aec4a5059336bf54135bafd0e4a921db468742
 AUX rootd.initd 732 SHA256 42b9fe01aa41965359c16d4b23f874cea65806d8c7ec11215dbba95ab80e90f3 SHA512 65152830554ed509db7e5545bffb4976a608ee576d62ac648fc5520ff96ea5062c9b20c195dad2cf8dc2b34079e6beb252d427030825e14dc867ae4599bc64b8 WHIRLPOOL ec03db863e079b3f910ec0f86b036a828b2a5804f6bd6e0398e5207000f1ca10b6b1e71504d6c6b3a2d216b20d7db27d2425070f9d6bb0696ef384dfe8526fc0
 AUX xrootd.confd 200 SHA256 03c1191168ddea3bc6621e26eb56e509e6c9a4d58756ffbbd07ff6657200e57d SHA512 0c29b090540cc62841cb17c57514d7d8d0dc99a96cbc1bdb54f450c4cf0d1e1843f6d5f04faffb452a883bda980c1d276d730997e85b1e68f40d9ab694ba86aa WHIRLPOOL 6115b4282e4d0c71bea1075548bba26a451c1aab2540f14b9280cb5b143ab41c8b68e28f91ad258f75f847dea1f8e8855d257a6880dccfe1fbe474ac4ec36c3f
 AUX xrootd.initd 720 SHA256 88112617e0ff9dff557ec800835dd93f1e1e4316e4c137034af4943c02678f64 SHA512 d36ed289f8120a697a7e2cb2bd772c4d9abb81607d7214b12b46698994e29653c97c1bf9cd7cd18fa7ed1943840204b6ad83a0b80716c99532b871d8dba9c411 WHIRLPOOL 5af152cc03b19884d0b803f29afdbdb7756c48cde5e9d8855da0208691fe48a48d34be3cbaffee251a07e4f447fa95476174af33b9a4b22ee57acc6827faa2af
+DIST ROOTUsersGuide-5.34.01.pdf 9124822 SHA256 70a96c4a2573dc0d320142f86993ecfda24caa755e910340a3014120f2997c8b SHA512 c3b4c18ef2e13968afdf67c6003249d4cfe6ea661fa32ce25127361bae7e3376a25cd3b11591292f3975bcd8105291aca52f2f6214c9fe45f4bd6e7e44d54b25 WHIRLPOOL 11256ba7837d17e5795cf71ac32db43d7d8f797bfbddf5f71612fe2f8fb2e01354372c0ea8f0bc22868881eb0bfdc8a3e3f1b05293d2750d293aa4d59217b2e6
 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.03.source.tar.gz 55529362 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6 SHA512 2e067eb9c6bbda5cf4df6973a3cf5307540247fb07c349f7ee74c0cf6a4abbb63f585a9ff67139cae985250fc5c5106b5ea03d7d9d2bcd20269e0ec8760ebd02 WHIRLPOOL 87dbf6f55f82001e07afc3b467e95f841f185f1f67d1dbd953f73e8aa9127ef8485db84100d6e9a08f0ae6aa5b45a565398eb6723145fff16c07e5158bb3e3ab
-DIST root_v5.34.00.source.tar.gz 56214534 SHA256 808e04876dbc9cfbfea54ee11ba35e90382e8ff4219dbdbe2d2236a9dadf7df1 SHA512 2502281b8b5de5771d5a135080d2aba7797a477e0a769c8e6b2801959896bb4b0ce8f2e0c6a64459ffb28e46d681cad0b8af5430c0648654b57a9a3d744a499d WHIRLPOOL e7db950b5460ec8871b4b2b191d33850b23951b0de3285aad602d380f3935f3ab7ac86cd6fb8ab6534d188bf31a80c0e3d7972f931f7d9588274d9b76bea7861
+DIST root_v5.34.01.source.tar.gz 56204557 SHA256 8910333b73051225b05829c1603f5c89be2da9d8577fd646e7fdc0626ecd35be SHA512 6cc20e402a2208fd8a66179121e0833528bf0aacb3923161901931375eac54303718ead49a3dbbd482207e8d0fc4087a6704038599b024d8892396627cb94ff4 WHIRLPOOL 51ef39a257a27427c1a29ca37ae7925f25ddaa81d58b2c2775f1a8fb5ad42ec3a5393a15b8a73131a43125c395bb048e63246b964fe407db10754f6d0dc21335
 DIST rootdrawing-logo.png 15051 SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc7d155944a8e27284af83a6b SHA512 14aa13ebfed3c9412d7d7d04c250740b25fe3af6bcb07e618045a5cec2dc23698a251fd7df2db1a6c37331084db99b029b387ea81c25ac825fc7ae10ad164a68 WHIRLPOOL 877a959a5aead73ba69dbb805c9869cbd6a047ea476bd4e7fef80781563a61d20dad49dd4d8b0005bfc58e8f7c7d38efbb3e085a95974feb81dfc9e339c18741
 EBUILD root-5.32.03-r2.ebuild 11389 SHA256 1843dc212b6a92d543a4c95457a2cba0a8c68896bb876065e6228cbe894caa48 SHA512 4b497fd0d46761ba433a0f7f18705365f3f0cadd7f79307b99861c8ce4040b0d02b65d91718df324b8a7a53465020fcf9e2f4751ff24ed3f3718712ae63d3a4c WHIRLPOOL e71db9ec1b215a8086e8ea25fa4d8b9cc42e5a905f9021c7de9c42a5736cbe62563bb25d5dc8456b5122f9c0e68e43fde99b4f89640767ab444090efc0410e87
-EBUILD root-5.34.00.ebuild 11497 SHA256 b51564a3a922cf67ced4c3c4757e5f909bc565c9323737a567bf70ad4209f627 SHA512 808ae7d8e5a8bd10cdec0d2b893e6deb8c9b413840f2641df93843dd9cfa0ad8e164d33d5fab482542576742d7d0d44cb25bc21d68c833d5165ebe4484622544 WHIRLPOOL 4a5b373f1f3a75c3c203eca0caa3096af6c03d1f781802bb8290dfe2e47bbf2df59abcda8db4a656541415f3ccc11f8ee56fa8301e3d97358220d7620cd4aaad
-MISC ChangeLog 32454 SHA256 7235e8a6a583580c6c919b30a48be701eafb340f52a9cd2831d8bb314784bf12 SHA512 01489250583ba16a93e5073598eec2991f2bafc64a83757c5d328378ef0a4ad168a0f04974a80d753a576fcc523102d7898902febeb1993dce37f18185dcd4f3 WHIRLPOOL c16b0ab6baa328a64a8f312b017a3fbf5adf6a8bce8f2b9afcf46f0c6fe28012aebe89324fb4cce2de2adea03032d2c64f7b16bacd8c6dfce9c850bf4028e2a5
+EBUILD root-5.34.01.ebuild 11467 SHA256 d038b21d31048e088a6e82e10eb0face993c08ca4de35e04a257e57a4cd8fb9f SHA512 3762b47bb60550c0d8aeac5e1d22a9b4f63f632decf6a8c5dd12cf74d054c137812601063043dbc002f14b6798c078a59aebe241c467745f700e2cbba48f784a WHIRLPOOL cc4916251aefe9f35e8629292c2b68793eb82e6c8069a6d67a942aec90c47c90909aee15dffa9ad9f3bc8aaf0b01c60403583adc0a03c553d724eab45c4de9a2
+MISC ChangeLog 33154 SHA256 dd5f9312f849e4aa8e9ab554acbedd58228628eaf19832bcc01d7acbf4523242 SHA512 7c11c7262a5bbe0c112903b637d0ced9ece48f2de50072687beb24dd0df2c668c055ab168444c7043387f7a3fe29bb8aa6ed730403b7c0de01fdf9434b2f9808 WHIRLPOOL 9c3eb373206d80a74a38b142373bb6b4132c894f97d6c4ff57ee15a41af2619f9dd4a31e854e498020b160c0543700626437ae79b3bfff5f1969df5b116d83b4
 MISC metadata.xml 1617 SHA256 3d1e4a4d14b0062964bcf9700c30c95ae5fda2f913d9b224d2163a986ac75ba3 SHA512 42e85b73ba585295f5dccef5ccad39445db4a1ebf20db8e4e799a45a54c34afca559a0a9592cf1a9eee94376acd8a289258e4e0bf816d490b7b6ecc2af5d64f3 WHIRLPOOL 32d37ecad572e72553adf10975bf40bbabb7a77887d4abc56b4b8a3636ddd98291cf62039cde767dfc9b8d7be2ba40b4cd5719bab1190806da0a70a10dd034a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlACjvgACgkQgAnW8HDreRbvmACgmraZHmzSstrLVUr5r8qIW/WE
-0CUAn27uezC9kWZjYegoGSo5PIwNylkK
-=ERQ7
+iEYEAREIAAYFAlAMY7YACgkQ1ycZbhPLE2BP6ACgixYvX6b4a/1PoEBgbulyd1WY
++rQAoItgVR4YaaTrXpS0Axj1V4I8ac98
+=14+h
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/root/files/root-5.34.01-glibc216.patch b/sci-physics/root/files/root-5.34.01-glibc216.patch
new file mode 100644
index 000000000000..b2da15970ea7
--- /dev/null
+++ b/sci-physics/root/files/root-5.34.01-glibc216.patch
@@ -0,0 +1,35 @@
+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.00.ebuild b/sci-physics/root/root-5.34.01.ebuild
index faff57df347e..51c9f319594c 100644
--- a/sci-physics/root/root-5.34.00.ebuild
+++ b/sci-physics/root/root-5.34.01.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.3 2012/07/03 18:58:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.01.ebuild,v 1.1 2012/07/22 20:33:47 bicatali Exp $
 
 EAPI=4
 
@@ -22,11 +22,12 @@ ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
 PATCH_PV=5.28.00b
 PATCH_PV2=5.32.00
+PATCH_PV3=5.34.01
 
 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/ROOTUsersGuide.pdf
+	doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf -> ROOTUsersGuide-${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 )
@@ -37,9 +38,9 @@ SRC_URI="${SRC_URI}
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="+X afs avahi -c++0x clarens doc emacs examples fits fftw graphviz htmldoc
+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 xft xinetd xml xrootd"
+	pythia6 pythia8 python qt4 +reflex ruby ssl xinetd xml xrootd"
 
 CDEPEND="
 	app-arch/xz-utils
@@ -71,11 +72,10 @@ CDEPEND="
 			x11-libs/qt-svg:4
 			x11-libs/qt-webkit:4
 			x11-libs/qt-xmlpatterns:4 )
-		xft? ( x11-libs/libXft )
+		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 )
@@ -108,7 +108,7 @@ RDEPEND="
 PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
 
 REQUIRED_USE="
-	!X? ( !opengl !qt4 !xft )
+	!X? ( !opengl !qt4 )
 	mpi? ( math !openmp )
 	openmp? ( math !mpi )"
 
@@ -157,18 +157,19 @@ 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_PV2}-dotfont.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV3}-glibc216.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
+	rm -r graf2d/asimage/src/libAfterImage || die
+	rm -r graf3d/ftgl/{inc,src} || die
+	rm -r graf2d/freetype/src || die
+	rm -r graf3d/glew/{inc,src} || die
+	rm -r core/pcre/src || die
+	rm -r 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 -r 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
 
@@ -241,10 +242,9 @@ src_configure() {
 		--fail-on-missing \
 		$(use_enable X x11) \
 		$(use_enable X asimage) \
+		$(use_enable X xft) \
 		$(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) \
@@ -271,7 +271,6 @@ src_configure() {
 		$(use_enable reflex) \
 		$(use_enable ruby) \
 		$(use_enable ssl) \
-		$(use_enable xft) \
 		$(use_enable xml) \
 		$(use_enable xrootd) \
 		${EXTRA_ECONF} \
@@ -289,7 +288,7 @@ doc_install() {
 	cd "${S}"
 	if use doc; then
 		einfo "Installing user's guides"
-		dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
+		dodoc "${DISTDIR}"/ROOTUsersGuide-${PV}.pdf
 		use math && dodoc \
 			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
 			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
@@ -300,7 +299,7 @@ doc_install() {
 		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
 		doins -r tmva/test
 	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
 	fi
 }
 
@@ -347,7 +346,7 @@ src_install() {
 
 	# 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
+	rm -r "${ED}"/usr/share/emacs
 	if use emacs; then
 		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
 	fi
@@ -360,11 +359,11 @@ src_install() {
 	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 \
+	rm 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
+	rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
+	rm "${ED}"/etc/root/proof/*.sample || die
+	rm -r "${ED}"/etc/root/daemons || die
 	popd > /dev/null
 	# these should be in PATH
 	mv "${ED}"etc/root/proof/utils/pq2/pq2* \