sci-physics/root: fix bug 426432

5 files changed, 418 insertions, 28 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index cd986fdaa..f03cc434a 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # 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 $
 
+  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.
+
   01 Jul 2012; Andrew Savchenko <bircoph@gmail.com> root-5.34.00.ebuild,
   root-9999.ebuild, -files/olbd.confd, -files/olbd.initd, -files/xrootd.confd,
   -files/xrootd.initd, metadata.xml:
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 173265d2e..8386c1202 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,6 +1,26 @@
-DIST ROOTUsersGuide.pdf 9124817 RMD160 52122f6f5870a12a6b701ffc4cbf428ab8382253 SHA1 dadfe5eb61a0a3f24067f73f6c6585927685701f SHA256 51c5ce0c7f32b83700b441a1c069e555bbb7949518858fc6189722501994f5c1
-DIST RooFit_Users_Manual_2.91-33.pdf 1330062 RMD160 650b616018a5493d5fd7da1dc06c6e54eaa419fb SHA1 f176782746542b00ff60320b4a41e1218db3d006 SHA256 101c4e4c41962238fcabf1caa86cafc51241a1800594491b2e62ef8b565a5646
-DIST TMVAUsersGuide-v4.03.pdf 3913533 RMD160 fbd62b90e7ad47ad69ec62d584417463ec13bf9c SHA1 84a63140cc3e01267d2cc7ffa374a7c24fbed37e SHA256 0cdbb4a2d19eb7a86e2911cfa73a905932e862d6c94be10b7662a9355b0241af
-DIST info.png 2060 RMD160 9e9e984337699e08d86a3352f414658d44d30480 SHA1 592745253491d94624ee68721f62ecdfb1b1b278 SHA256 51de6661250f3fb71c6c8250cbc4bdc4dc4283cc90240b4dc1ee6168e8d40279
-DIST root-banner.png 132555 RMD160 d4cf5f8a60ee1df686e47a696e76c1ecdda4f1e7 SHA1 6760c589cc13f0f906cbd8598b4edffc28ad911b SHA256 d165e1cc175f654ff79af39193a6144678f600e14a53dd20e2b216b3e8951e94
-DIST rootdrawing-logo.png 15051 RMD160 a10172fa5e9a9737b6b5e678af3f8426d804e275 SHA1 dd4c0e3e2ef5ebc59440677a78605b4b54fff48a SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc7d155944a8e27284af83a6b
+AUX proofd.confd 415 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38 SHA512 5aa6e6313cf159d2b407286a15f7f959d966a7e9b74bd2a74f13bd3fe01c04d99b46b5fb55f4a7434ebe911cd8b6469657d96591d624a7bfc7d39d49ab62b900 WHIRLPOOL 4a0604d8827cd733a2f5b34183bfd9458aff94f036f9177f2de3283da7722cf2e6dbf6acae93fe3ccd8144ad646c283458550f97f357148cc9f903c7469c57ca
+AUX proofd.initd 717 SHA256 f60fa92173370e237e3e2cf5be7add5aa63752e3b7496cf3a0a5acc1dc927ebc SHA512 73db660c9a3ab8e9a1e1794c7a54ffff3c9c25b9aa0b8273e24c7dcdcb6ac60824a8782087529834d1c4316c1166178ac39daa0feda2971784cc3115bba2a30f WHIRLPOOL 491ccca22cf08d9dc2f61fc6e4cf1fa00c8ad995ce20e7e94cd3b1ea5438568dc23e31a01ae98ea4431aa351c4983c77b26baa3052b42a9747e84c5413cb2be9
+AUX root-5.28.00b-asneeded.patch 712 SHA256 17d1d41d8c7f78abbb7cd284af0a6aca544820db72fa72956b473c7c1817a96b SHA512 6523b0e9610d38f1b65bd0c2af122069abbaa209939073ab0f5f7c279fcc1458663255e5cbcf01787b43519d40496019a9eb4c38d5df26122674bc2435a5aabb WHIRLPOOL 3ed8f327051c118a3d1a2bc23220a89e14fc2efbf88f6ace37d2194462fa3792ac4a32a9cb52bfc94063e5d180e759d12bd85953c52415df4154c186b7864d77
+AUX root-5.28.00b-glibc212.patch 276 SHA256 e51e127a80e2bf1afad41c2b7ca5233c362bce017057ca489bedb2a9442efb62 SHA512 26138c8d14f319248d2b33395a57767c8d9bbf552244c2c55a7d6c0a1526de4c84313e020dc6c7483866cb3a927ba047d60f9b4dc8bd8291dd451a847b7e7379 WHIRLPOOL 0226880ce82aa5ba6e552f9bd2042842250694105734186a2185436ba8e2a13131f7e6263a99a1c228df724178453962f89ab74d90b62521e6db42be792c1fa9
+AUX root-5.28.00b-prop-ldflags.patch 433 SHA256 04f4b65a91e28386c7a857fe361f091943f4bb6fc82a9473ac7605412c199191 SHA512 ae1f5dbb9f973c71426d448d1d28e74c4134ca38464fb9deb35fad5e056525c1b1d23630472eea2d796e15d03b102d97b6a6d4802a7ff884f008c90adece0168 WHIRLPOOL 72eac221f1e5fb471900123c44d27df0a7af4203e3c566d7440ce4f77506ef93e66d87730a3ec06da164651255c2ed3f532685eb4dbf2ad8a9660158c600bf25
+AUX root-5.28.00b-unuran.patch 1531 SHA256 09458c60c9d38af2d204939f752ec25364d04cf66810b7cae5e88368f84c31c8 SHA512 10605b6b2cd8cf895995b8d2afccbac40506ad11f35d6405db558a86b1a84d6a31db36dfa5cc7a76e86506b60443f0c1464dd92d6c3932722dc22d985af894fd WHIRLPOOL c45307d021f61390d125f126f72c1384dde39cfb207c81e6f659a5c34da452c837a8143178db392256054e3c323aa12a5ff857dd62daccf038ab7d4b0c2a5189
+AUX root-5.32.00-afs.patch 1322 SHA256 a8f8d551668299516e2e091fd29ae15ceb1ba034d9df95b76f99b1dabc94a8dc SHA512 4c021dadf266d58cc6ba3906ba3cd3ca2e2051f69266a7c3b32931ef8c0f40af2d79cb640aaf9c93b3302f9f17a3361683f616c18db2f25d86ca21d37f7b0bf8 WHIRLPOOL b35195e89b86ec6b7fef4927f97180ef3a6860c822e684b89fa76d53b595ede4c4eabe9948f067b1c1de91dce1f57011404c6534909e3b33a2b7451db5ae76a8
+AUX root-5.32.00-cfitsio.patch 593 SHA256 9f4f244f272d75e115d8f139670fdcc0cdbcb68972689edbc78e467c3fad3e40 SHA512 1e9b1de637aeb667718e7e262615126626f951acefd2e1c4a3f53cfb13fb4dbde0186c301ffcc175cbab701825f340cffdb26cf741b244fba84cb8938ccb89e8 WHIRLPOOL 2231b4b349ad3a97aca94b21337981cc7477592a8aad4d604ac6d7aee98d9e5d66d90a0155c47ce53244b550f1c5b1d5b7581208d1c16a57a2e8fe6de3fbdc32
+AUX root-5.32.00-chklib64.patch 866 SHA256 5260cb5e7ab62bb19f6586cf4d9033597bcfd0132f178192be69ce515b2c7c35 SHA512 79d37e0e6c84fc36d712bf12e35ae51affa05696c78bfe8d88455bbac24a475cf5432d8fa4fa9c4140007179eaafee40f081ebbd898d104948c4cd226e967799 WHIRLPOOL 6a5182de8eace74276aec5560eac5f61683645b629975ddbfd251876590c959f4cfc193624e3c57cdf3070c24e41cccf43da4edb1813a06d5dc8d41e4e1d3f50
+AUX root-5.32.00-dotfont.patch 2563 SHA256 7b4fc5da17ee8bfa71ed4cb60926a02e4b7058f8955dd54fb7f15ee4910823f6 SHA512 332ffe0ac6d1249ef1643b6a1df77ef23c1af1c4547f248295c1ae9c284384446a84a374b2b117b1157e770ac65a404be1c4cc17a497c43e2c34bcbf51619441 WHIRLPOOL 9633f52670bd8ad65393ddba7b2152e644feedb97df479229a07b232da10e4fae911356c2700fc0ff552096e575fb29882e46e38f609399ecbdc97f3f16b8e96
+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-9999-dotfont.patch 2718 SHA256 27d05ede039fb85472203839a628b15f8ee9fc3c39e1d29a19349e069f891d61 SHA512 8f01655e863d36678dea37df934e3d8d9c2bc85920497345feb8d863bdc1b7413c783b916050d1e7b476ecdf9e1e8afdcbb32e621d625305898d51947b6955c6 WHIRLPOOL 75e2712f13cf64102fd0dce6d92c7c21c3606ad4679615336ce6b607f236eb6b1d57ffa0498ae3df194b08c6cdc371fef36912fb3e3cc1fc84ac3f1664793708
+AUX rootd.confd 199 SHA256 7b69f646ce0b2546ce797ec4a05949b02302dc5f4e41d2e8896ed0bc6575ac8d SHA512 2ce6753d37a7f22cc3656f110f802b8e07c1469bfe4524606c1472369352f8c584c01c716760252fab40369470b72d8c77cdbb2d52126c39371faaf597bf58d8 WHIRLPOOL b4c65e5026d6583775cda7b13fdbc5ae48c82c36710efbdd6b112243310090c05b5726d6e76d1ae25d585ecaa4aec4a5059336bf54135bafd0e4a921db468742
+AUX rootd.initd 732 SHA256 42b9fe01aa41965359c16d4b23f874cea65806d8c7ec11215dbba95ab80e90f3 SHA512 65152830554ed509db7e5545bffb4976a608ee576d62ac648fc5520ff96ea5062c9b20c195dad2cf8dc2b34079e6beb252d427030825e14dc867ae4599bc64b8 WHIRLPOOL ec03db863e079b3f910ec0f86b036a828b2a5804f6bd6e0398e5207000f1ca10b6b1e71504d6c6b3a2d216b20d7db27d2425070f9d6bb0696ef384dfe8526fc0
+DIST ROOTUsersGuide.pdf 9124817 SHA256 51c5ce0c7f32b83700b441a1c069e555bbb7949518858fc6189722501994f5c1 SHA512 4a4888225e0a5f97ff05079401b9e000fc71cde2916067d7ed16d2919024896149dcea9e05b46cb1bc8acf96bff445b2dcc92fb6985aee7809c1046fc84c2933 WHIRLPOOL b7cf4577fe4873ab2aeb479c1e06ac5ea524099a675e0c9a16523e1bb42a5b52bd594b37cae921f38e5ab318622d509daf2b6e604f0c992fa52cfad1f5051135
+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.34.00.source.tar.gz 56214534 SHA256 808e04876dbc9cfbfea54ee11ba35e90382e8ff4219dbdbe2d2236a9dadf7df1 SHA512 2502281b8b5de5771d5a135080d2aba7797a477e0a769c8e6b2801959896bb4b0ce8f2e0c6a64459ffb28e46d681cad0b8af5430c0648654b57a9a3d744a499d WHIRLPOOL e7db950b5460ec8871b4b2b191d33850b23951b0de3285aad602d380f3935f3ab7ac86cd6fb8ab6534d188bf31a80c0e3d7972f931f7d9588274d9b76bea7861
+DIST rootdrawing-logo.png 15051 SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc7d155944a8e27284af83a6b SHA512 14aa13ebfed3c9412d7d7d04c250740b25fe3af6bcb07e618045a5cec2dc23698a251fd7df2db1a6c37331084db99b029b387ea81c25ac825fc7ae10ad164a68 WHIRLPOOL 877a959a5aead73ba69dbb805c9869cbd6a047ea476bd4e7fef80781563a61d20dad49dd4d8b0005bfc58e8f7c7d38efbb3e085a95974feb81dfc9e339c18741
+EBUILD root-5.34.00.ebuild 11481 SHA256 35a875e149b816e742d3f304aac7c9c103e04bd03e8f3f66bfc88ad1a95c822f SHA512 e2af92739823988e5e173d7fc412cafb0cd535bb348c590c6e7d9dae9fdf9a48c565ae04c2376ab0183110463bb9c51e14dbe34acb74442a1634cbac4e24dbbc WHIRLPOOL 334a07736bf6b0a56e290d10b9031c87c6b0579393b87a616335fa3c844f03b3c2edc10d48e83b640779d30444b4871039ef56d9ffa2f3ecaffb2f2d739d5289
+EBUILD root-9999.ebuild 11573 SHA256 9ca0df6d2bc9979a438b5c5f7859c5eb8e4b6888347c5c57b038738beee54928 SHA512 f40e9e241f8d7b1dd3abf6736f41b2d2b65675b265aa3f099c1e828bd3e780b7c36c579a11f76a3b1062a04496a77e1399f6120bdb302f89265c923a97f234ec WHIRLPOOL 0a957e05731ec2f88c46d10095c310510df8f29c5606efcd352400ec8d9b4dab1c64b9e79f7acf2d2a7621a68ad27bf694f6ce5319b1d4b1ba8d55c610b036ad
+MISC ChangeLog 31899 SHA256 410de020f8dbb42707aef706f6d31e5a2b4a377dd7a399058abb7017f21b16db SHA512 3751252d6be8406f9725dfa97381bc213b358c87012fb1a3e3a9af45c84842468af1f526547ee76782ead1a179eafb56e5df79fd052c7ef673a3fa2b7e6b989f WHIRLPOOL f7b3a9a3026ebb3527953c061f67cd6e756481daa5923c41b2b61a4c87f28331e7a0c4101654e70c307cf31d5d311c1c8d89cbee94370663429975bcbc617b0b
+MISC metadata.xml 1719 SHA256 f04b2de46ba225c470020b291e2ac5554a6b64e1f12828c7c5421d1810cb052c SHA512 4dcb27a00651b3d46ea9a59daf073c20501dcd54e42cf16b3f6044838c6cde6e2b4efa331e886725042d29308c21a912e6d9c8174c343118eabdc5afd202106b WHIRLPOOL 796847eae45d0f69cae0494366b61175b4f016bf12c68f9ce597341aef8964882d2cfe6bd544367ca429337d29ec3f5d4d7e3202898fa621316f0994e139dba8
diff --git a/sci-physics/root/files/root-5.32.00-explicit-functions.patch b/sci-physics/root/files/root-5.32.00-explicit-functions.patch
deleted file mode 100644
index 570d61e68..000000000
--- a/sci-physics/root/files/root-5.32.00-explicit-functions.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- root/io/io/Module.mk.orig	2012-02-29 19:46:38.000000000 +0400
-+++ root/io/io/Module.mk	2012-03-09 02:29:19.905665572 +0400
-@@ -67,15 +67,5 @@
- distclean::     distclean-$(MODNAME)
- 
- ##### extra rules ######
--#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
--ifeq ($(GCC_VERS),gcc-4.4)
--ifneq ($(filter -O%,$(OPT)),)
-    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
--endif
--endif
--ifeq ($(GCC_VERS),gcc-4.5)
--ifneq ($(filter -O%,$(OPT)),)
-    $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
--endif
--endif
--
diff --git a/sci-physics/root/root-5.34.00.ebuild b/sci-physics/root/root-5.34.00.ebuild
new file mode 100644
index 000000000..358fed190
--- /dev/null
+++ b/sci-physics/root/root-5.34.00.ebuild
@@ -0,0 +1,382 @@
+# 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 $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+
+if [[ ${PV} == "9999" ]] ; then
+	_SVN=subversion
+	ESVN_REPO_URI="http://root.cern.ch/svn/root/trunk"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN} versionator
+
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+PATCH_PV2=5.32.00
+
+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
+		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 )
+		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
+			http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="+X afs avahi -c++0x clarens 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"
+
+CDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-fonts/dejavu
+	media-libs/freetype
+	media-libs/giflib
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/shadow
+	X? (
+		media-libs/ftgl
+		media-libs/glew
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		|| (
+			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
+			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+		)
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+		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 )
+		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 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	ruby? (
+			dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )
+	xrootd? ( >=net-libs/xrootd-3.2.0 )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="
+	virtual/fortran
+	${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
+
+REQUIRED_USE="
+	!X? ( !opengl !qt4 )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python_set_active_version 2
+	python_pkg_setup
+	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)\""
+	echo
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	if use math; then
+		if use openmp; then
+			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
+				ewarn "You are using a g++ without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
+		! version_is_at_least "4.7" "$(gcc-version)"; then
+		eerror "You are using a g++ without C++0x capabilities"
+		die "Need an C++0x capable compiler"
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.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
+	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
+	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 graf3d/gl/{inc,src}/gl2ps.* || die
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+
+	# Make html docs self-consistent for offline work (based on Fedora spec)
+	if use htmldoc; then
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
+		# make images local
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
+			-i etc/html/ROOT.css || die "htmldoc sed failed"
+		sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
+			-i etc/html/header.html || die "htmldoc sed failed"
+
+		cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
+			die "htmldoc preparation failed"
+	fi
+}
+
+src_configure() {
+	# the configure script is not the standard autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
+		--with-afs-shared=yes \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-builtin-lzma \
+		--disable-cling \
+		--enable-astiff \
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--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) \
+		$(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 tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable postgres pgsql) \
+		$(use_enable prefix rpath) \
+		$(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 xml) \
+		$(use_enable xrootd) \
+		${EXTRA_ECONF} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib"
+	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"
+		dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	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
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+	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}
+
+	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
+	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
+
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	doenvd 99root
+
+	# 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
+	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 "${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 \
+		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
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin/ || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_optimize /usr/$(get_libdir)/root
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_cleanup /usr/$(get_libdir)/root
+}
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 689046eff..d28ef75f9 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -39,7 +39,7 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 IUSE="+X afs avahi -c++0x clarens doc emacs examples fits fftw graphviz htmldoc
 	kerberos ldap llvm +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,7 +71,7 @@ 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 )
@@ -109,7 +109,7 @@ RDEPEND="
 PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
 
 REQUIRED_USE="
-	!X? ( !opengl !qt4 !xft )
+	!X? ( !opengl !qt4 )
 	mpi? ( math !openmp )
 	openmp? ( math !mpi )"
 
@@ -241,6 +241,7 @@ 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) \
@@ -272,7 +273,6 @@ src_configure() {
 		$(use_enable reflex) \
 		$(use_enable ruby) \
 		$(use_enable ssl) \
-		$(use_enable xft) \
 		$(use_enable xml) \
 		$(use_enable xrootd) \
 		${EXTRA_ECONF} \