Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci

13 files changed, 402 insertions, 200 deletions

diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index f378708b5..80ea11cbc 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*bigdft-1.6.0-r1 (15 May 2012)
+*bigdft-1.6_pre1-r1 (15 May 2012)
+
+  15 May 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
+  -bigdft-1.6_pre1.ebuild, +bigdft-1.6_pre1-r1.ebuild, -bigdft-1.6.0.ebuild,
+  +bigdft-1.6.0-r1.ebuild:
+  pkg-config file corrected
+
   30 Mar 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
   -bigdft-1.2.0.2.ebuild, -files/bigdft-1.2.0.2-0001.patch,
   -files/bigdft-1.2.0.2-0002.patch, -files/bigdft-1.2.0.2-0003.patch,
diff --git a/sci-libs/bigdft/bigdft-1.6.0.ebuild b/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild
index 66ea41fb5..ef9b7f103 100644
--- a/sci-libs/bigdft/bigdft-1.6.0.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild
@@ -108,7 +108,7 @@ src_compile() {
 	_check_build_dir
 	pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
 	emake -j1 || die 'emake failed'
-	sed -i -e's%\$(top_builddir)/src/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc
+	sed -i -e's%\$(top_builddir)/[^ ]*/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc
 	popd > /dev/null
 
 	use doc && autotools-utils_src_compile doc
diff --git a/sci-libs/bigdft/bigdft-1.6_pre1.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild
index 21cff15a1..861a9dbb4 100644
--- a/sci-libs/bigdft/bigdft-1.6_pre1.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild
@@ -113,7 +113,7 @@ src_compile() {
 	_check_build_dir
 	pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
 	emake -j1 || die 'emake failed'
-	sed -i -e's%\$(top_builddir)/src/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc
+	sed -i -e's%\$(top_builddir)/[^ ]*/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc
 	popd > /dev/null
 
 	use doc && autotools-utils_src_compile doc
diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog
index fbf4368cc..e5089d178 100644
--- a/sci-physics/abinit/ChangeLog
+++ b/sci-physics/abinit/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 May 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
+  abinit-6.12.3-r1.ebuild:
+  Allow revisions of sci-libs/bigdft-1.6_pre1.
+
 *abinit-6.12.3-r1 (28 Apr 2012)
 
   28 Apr 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
diff --git a/sci-physics/abinit/abinit-6.12.3-r1.ebuild b/sci-physics/abinit/abinit-6.12.3-r1.ebuild
index 9efcd061e..00dbc294c 100644
--- a/sci-physics/abinit/abinit-6.12.3-r1.ebuild
+++ b/sci-physics/abinit/abinit-6.12.3-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cuda cuda-double -debug +etsf_io +fftw +fftw-threads +fox gsl gui +hdf5 libabinit mpi +netcdf python -test +threads -vdwxc"
 
-RDEPEND="=sci-libs/bigdft-1.6_pre1
+RDEPEND="~sci-libs/bigdft-1.6_pre1
 	sci-libs/etsf_io
 	=sci-libs/libxc-1*[fortran]
 	sci-physics/atompaw[libxc]
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 6d49d5c81..bd33ae55b 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,18 @@
 # 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.32.03 (15 May 2012)
+
+  15 May 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-5.26.00e-libpng15.patch,
+  -files/root-5.26.00g-explicit-functions.patch,
+  -files/root-5.28.00b-nobyte-compile.patch,
+  -files/root-5.28.00h-explicit-functions.patch, +root-5.32.03.ebuild,
+  root-9999.ebuild:
+  Bump ebuild, use live ebuild as a template.
+  Switch to virtual/pkgconfig. Remove extra KEYWORDS from live
+  ebuild.
+
   03 Apr 2012; Justin Lecher <jlec@gentoo.org> -root-5.26.00g.ebuild,
   -root-5.28.00h-r1.ebuild, -root-5.32.02-r1.ebuild:
   Drop in tree version
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index ff6fe4766..6258d1c6c 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,3 +1,25 @@
+AUX olbd.confd 197 RMD160 798de1808502f3e4ecfc5f024b56a419d9824057 SHA1 f2a4385fdf9849eafb1d5457727f6fbe80af1da3 SHA256 5a34da76bbe56cd3b8128f05c0d9900f9d7f7ffdcffc5deeb816c78ea46679ba
+AUX olbd.initd 714 RMD160 19a09e2264b984245f6a6b55c302a218bc41e452 SHA1 75e5d0764f00d5f9ef52966b597fa66c67bf7058 SHA256 a12efc3a4af4116558a6efd0964646b677d06879bb2114fc508324d9162bf815
+AUX proofd.confd 415 RMD160 3814aacb63d82b9d060086f9bef304d431a15b4e SHA1 31eb7af239a0042f887b5089a7c6c7ec5d6662e9 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38
+AUX proofd.initd 717 RMD160 09157e82a659255d802a02466dca833135c7839a SHA1 47d139d8cb08e055674018b6b7f68522bf65b5ca SHA256 f60fa92173370e237e3e2cf5be7add5aa63752e3b7496cf3a0a5acc1dc927ebc
+AUX root-5.28.00b-asneeded.patch 712 RMD160 0b3a3d41e309f13310fda607955ad88cc6bc176e SHA1 4fa704d2790e19933155da2587a9c6998d3c4e4f SHA256 17d1d41d8c7f78abbb7cd284af0a6aca544820db72fa72956b473c7c1817a96b
+AUX root-5.28.00b-glibc212.patch 276 RMD160 02901df4c8e5e3c7d50a78916f843fde83faf1f0 SHA1 842129d6247255b5fa72778a12f08e1383247cd8 SHA256 e51e127a80e2bf1afad41c2b7ca5233c362bce017057ca489bedb2a9442efb62
+AUX root-5.28.00b-prop-ldflags.patch 433 RMD160 fd1717af9210471d7de0f06a47011e03d3f76d9a SHA1 b5dac8b013219dcfe577f2972fcc1d548f153cc3 SHA256 04f4b65a91e28386c7a857fe361f091943f4bb6fc82a9473ac7605412c199191
+AUX root-5.28.00b-unuran.patch 1531 RMD160 8083784cc831fc304f2e94fdf3b8aa8379d0bd9a SHA1 5c4537ba1922775fb63d65340a18a3c2b1d2311b SHA256 09458c60c9d38af2d204939f752ec25364d04cf66810b7cae5e88368f84c31c8
+AUX root-5.32.00-afs.patch 1322 RMD160 208adb0105edbad04f74206363f582c0a4dbcf73 SHA1 e713c26f5481755ded620d50a6dffc63eb0cba9d SHA256 a8f8d551668299516e2e091fd29ae15ceb1ba034d9df95b76f99b1dabc94a8dc
+AUX root-5.32.00-cfitsio.patch 593 RMD160 c9fb2e0e57ad6c08bc26eb626772bc3ec901ac46 SHA1 9d07035b5ab27bede96033a777e3d21a26b3ae27 SHA256 9f4f244f272d75e115d8f139670fdcc0cdbcb68972689edbc78e467c3fad3e40
+AUX root-5.32.00-chklib64.patch 866 RMD160 9fada23b979e80dec76184e22895e47e689b55b4 SHA1 fde081f24090a3bb10473170a611384593072134 SHA256 5260cb5e7ab62bb19f6586cf4d9033597bcfd0132f178192be69ce515b2c7c35
+AUX root-5.32.00-explicit-functions.patch 610 RMD160 b8eb20aa9b6864fe138674c5991fe13aaa68981c SHA1 9f4faf15cf43cfa1e3ff4a394db5a4807bed713e SHA256 1afa92168b1f25ed457c08db85c85173613b82050b558765ba25e056f6f60abc
+AUX root-5.32.00-nobyte-compile.patch 5527 RMD160 61c3dfdd4b8f71f64772e20901f6ee11b8f53e12 SHA1 f914ccb7f7d88dd8d9ba4c1f4d940b14134f2c3b SHA256 82152c92efd5002f9c2b230f141cae6c8111b03bd18370030d62f0f7d7127420
+AUX rootd.confd 199 RMD160 9ca9864292e7301d3feb6c36d88ba16002b7d7fa SHA1 822983a24e219bd860124f363a1e4250a17026dd SHA256 7b69f646ce0b2546ce797ec4a05949b02302dc5f4e41d2e8896ed0bc6575ac8d
+AUX rootd.initd 732 RMD160 9cce585e528e27c0fbd791be1f90fa6a1bb3164b SHA1 c15e805b0397bc8513e1c7e5631f2337c3564bbc SHA256 42b9fe01aa41965359c16d4b23f874cea65806d8c7ec11215dbba95ab80e90f3
+AUX xrootd.confd 200 RMD160 2344c73ca3c27adeb70b092850cfd292af7d58bd SHA1 f2b895f43d3537e8614a907c7c94642f01c084e4 SHA256 03c1191168ddea3bc6621e26eb56e509e6c9a4d58756ffbbd07ff6657200e57d
+AUX xrootd.initd 720 RMD160 fb03f7410061e5340cb1f03c1659c553b62cb81f SHA1 a52eebc9bda2a92d0c5f3bbd20d7ea27cecc8cca SHA256 08c85596b8489fec0cea64e1fa9a092094fb05ea0f1151fd26775e4d5a024a8e
 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 Users_Guide_5_26.pdf 9914765 RMD160 9e67a407d5a4d4f7019ab7b9b29bc696b7974987 SHA1 c2ecb87226e2fa38e6214aaf76dd789663d260dd SHA256 d0887800de7ffe7d6c0957891d44a4b34bf9d0eeb3da7e34b735ef998770bf39
+DIST root_v5.32.03.source.tar.gz 55529362 RMD160 90ee828638f322c169875135b51231810dada383 SHA1 cc1125660073918d0f47e209a069be2b9e849dc3 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6
+EBUILD root-5.32.03.ebuild 10361 RMD160 60c36ea4a2f96cbbbd039717531d9c0a496c8e7e SHA1 14bfa7fe83291fe0186f63914c4b073b02b63b48 SHA256 d6abdbb8d60279bae46063bfbdbd1baeb626517d3cec76f6ac2cc6334f6463cd
+EBUILD root-9999.ebuild 10422 RMD160 a1148820f47f8642b48648de609f12b6c9611f71 SHA1 2ab00257926b81f3e1158c4a37c6252b6fbf5b6f SHA256 0cdcef53783ea501fa1755771214424ebe499475133e4a894c7db746bd660ce4
+MISC ChangeLog 29138 RMD160 c96effc07fd3fad1d38d66827587653864899815 SHA1 d8641621338ba39e96ce59896ca13422544b05cf SHA256 6931cc2b0a347c04b2c7b1fab6e45b4331b415bc58943fa9937509f30402ff32
+MISC metadata.xml 1633 RMD160 1bd7f05cfd5810359c908219a6accdf05edd60c9 SHA1 24d9e6c86f34fc4201157a968c35d5694c110fe6 SHA256 a6b756e1a237a98cbfdd1ddb649bb69519c25f6aea280dff9b6b9a1aa2fafbf1
diff --git a/sci-physics/root/files/root-5.26.00e-libpng15.patch b/sci-physics/root/files/root-5.26.00e-libpng15.patch
deleted file mode 100644
index 91ed9c428..000000000
--- a/sci-physics/root/files/root-5.26.00e-libpng15.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-This patch is a copy from media-libs/libafterimage.
-
---- graf2d/asimage/src/libAfterImage/export.c
-+++ graf2d/asimage/src/libAfterImage/export.c
-@@ -496,7 +496,7 @@
- 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
-     if ( png_ptr != NULL )
-     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
--			if( setjmp(png_ptr->jmpbuf) )
-+			if( setjmp(png_jmpbuf(png_ptr)) )
- 			{
- 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
- 				info_ptr = NULL ;
---- graf2d/asimage/src/libAfterImage/import.c
-+++ graf2d/asimage/src/libAfterImage/import.c
-@@ -1251,7 +1251,7 @@
- 			 * the normal method of doing things with libpng).  REQUIRED unless you
- 			 * set up your own error handlers in the png_create_read_struct() earlier.
- 			 */
--			if ( !setjmp (png_ptr->jmpbuf))
-+			if ( !setjmp (png_jmpbuf(png_ptr)))
- 			{
- 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
- 
-@@ -1468,7 +1468,7 @@
- 
- static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
- {
--   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
-+   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
-    memcpy(data, buf->buffer, length);
-    buf->buffer += length;
- }
diff --git a/sci-physics/root/files/root-5.26.00g-explicit-functions.patch b/sci-physics/root/files/root-5.26.00g-explicit-functions.patch
deleted file mode 100644
index 16a720696..000000000
--- a/sci-physics/root/files/root-5.26.00g-explicit-functions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- root/io/io/Module.mk.orig	2011-09-29 13:49:50.000000000 +0400
-+++ root/io/io/Module.mk	2012-03-09 02:57:20.518370595 +0400
-@@ -66,9 +66,4 @@
- distclean::     distclean-$(MODNAME)
- 
- ##### extra rules ######
--#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
--ifeq ($(GCC_VERS),gcc-4.4)
--ifneq ($(filter -O%,$(OPT)),)
-    $(IODIRS)/TStreamerInfoReadBuffer.o: CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
--endif
--endif
diff --git a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
deleted file mode 100644
index 7029bf169..000000000
--- a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur root.orig/Makefile root/Makefile
---- root.orig/Makefile	2010-12-17 22:48:40.577775091 +0300
-+++ root/Makefile	2010-12-17 22:49:27.902497903 +0300
-@@ -1148,10 +1148,7 @@
- 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
- 	   fi; \
--	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
--	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
--	   fi; \
--	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      dir=$(RFLX_GRFLXDD:lib/=); \
- 	      while test "x$${dir}" != "x" && \
- 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-diff -Naur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.orig/bindings/pyroot/Module.mk	2010-12-17 22:48:39.941179413 +0300
-+++ root/bindings/pyroot/Module.mk	2010-12-17 22:49:27.899164943 +0300
-@@ -48,8 +48,6 @@
- ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
- $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
- endif
--ROOTPYC      := $(ROOTPY:.py=.pyc)
--ROOTPYO      := $(ROOTPY:.py=.pyo)
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- include/%.h:    $(PYROOTDIRI)/%.h
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
--$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \
-+$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) \
-                 $(ROOTLIBSDEP) $(PYTHONLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff -Naur root.orig/build/package/debian/rules root/build/package/debian/rules
---- root.orig/build/package/debian/rules	2010-12-17 22:48:40.197817461 +0300
-+++ root/build/package/debian/rules	2010-12-17 22:49:27.902497903 +0300
-@@ -623,10 +623,6 @@
- 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
- 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			
- #		$(foreach i, \
- #		   $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
- #		    -X$(i:$(DTMP)/%=%) )
-diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.orig/cint/cintex/Module.mk	2010-12-17 22:48:40.057833071 +0300
-+++ root/cint/cintex/Module.mk	2010-12-17 22:49:27.902497903 +0300
-@@ -31,10 +31,6 @@
- CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC    := $(CINTEXPY:.py=.pyc)
--CINTEXPYO    := $(CINTEXPY:.py=.pyo)
--endif
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- 		fi)
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.orig/cint/reflex/Module.mk	2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/Module.mk	2010-12-17 22:51:36.871451359 +0300
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
- 
- RFLX_LIBDIR = $(LIBDIR)
- 
-@@ -92,7 +89,7 @@
- 
- ALLEXECS += $(RFLX_GENMAPX)
- 
--POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN  += $(RFLX_GRFLXPY)
- 
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- 		  mkdir -p lib/python/genreflex; fi )
- 		cp $< $@
- 
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
--		@python -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
- 
-@@ -149,7 +144,7 @@
- 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
- 
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
- 
- clean-genreflex:
- 		@rm -rf lib/python/genreflex
-diff -Naur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.orig/cint/reflex/python/CMakeLists.txt	2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/python/CMakeLists.txt	2010-12-17 22:49:27.902497903 +0300
-@@ -15,7 +15,7 @@
- #####################   sources   ####################
- 
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
- 
- #####################  gccxmlpath ####################
- 
-
diff --git a/sci-physics/root/files/root-5.28.00h-explicit-functions.patch b/sci-physics/root/files/root-5.28.00h-explicit-functions.patch
deleted file mode 100644
index 918b696cb..000000000
--- a/sci-physics/root/files/root-5.28.00h-explicit-functions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- root/io/io/Module.mk.orig	2011-11-24 20:12:56.000000000 +0400
-+++ root/io/io/Module.mk	2012-03-09 03:45:42.850549826 +0400
-@@ -67,9 +67,4 @@
- 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
diff --git a/sci-physics/root/root-5.32.03.ebuild b/sci-physics/root/root-5.32.03.ebuild
new file mode 100644
index 000000000..8366d8624
--- /dev/null
+++ b/sci-physics/root/root-5.32.03.ebuild
@@ -0,0 +1,352 @@
+# 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.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion
+	ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk"
+	ESVN_OPTIONS="--non-interactive --trust-server-cert"
+	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
+
+DOC_PV=5_26
+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/Users_Guide_${DOC_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 ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
+	+math mpi mysql odbc +opengl openmp oracle postgres prefix
+	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
+
+CDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	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 )
+		xft? ( 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 )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="
+	virtual/fortran
+	${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+REQUIRED_USE="!X? ( !opengl !qt4 !xft )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	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 && ! tc-has-openmp; then
+			ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
+			ewarn "If you want to build this package with OpenMP, abort now,"
+			ewarn "and set CC to an OpenMP capable compiler"
+		elif use openmp; then
+			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.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}-explicit-functions.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
+}
+
+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-exceptions	\
+		--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 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 xft) \
+		$(use_enable xml) \
+		$(use_enable xrootd) \
+		${EXTRA_ECONF} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}"
+	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}"/Users_Guide_${DOC_PV}.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 6b3c224b9..1b9f8e871 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -33,7 +33,6 @@ SRC_URI="${SRC_URI}
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS=""
 IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
 	llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
 	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
@@ -94,7 +93,7 @@ CDEPEND="
 	xrootd? ( net-libs/xrootd )"
 
 DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
+	virtual/pkgconfig"
 
 RDEPEND="
 	virtual/fortran