Version bump

(Portage version: 2.2.01.21688-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

3 files changed, 148 insertions, 4 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 03b346607223..c51a5c1f565f 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.112 2013/01/22 17:18:55 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.113 2013/02/25 04:45:41 bicatali Exp $
+
+*root-5.34.05 (23 Feb 2013)
+
+  23 Feb 2013; Andrew Savchenko <bircoph@gmail.com> -root-5.34.03.ebuild,
+  +root-5.34.05.ebuild, +files/root-5.34.05-nobyte-compile.patch:
+  Version bump.
 
   22 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org>
   +files/root-5.32.00-prop-flags.patch,
diff --git a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
new file mode 100644
index 000000000000..ec67a15887f6
--- /dev/null
+++ b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
@@ -0,0 +1,137 @@
+diff -Naur root.as-needed/Makefile root/Makefile
+--- a/Makefile.orig	2013-02-15 02:27:56.000000000 +0400
++++ b/Makefile	2013-02-23 02:22:14.556465852 +0400
+@@ -1258,10 +1258,7 @@
+ 	   for lib in $(RFLX_GRFLXPY); do \
+ 	      rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \
+ 	   done; \
+-	   for lib in $(RFLX_GRFLXPYC); do \
+-	      rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \
+-	   done; \
+-	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
++	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
+ 	      dir=$(subst lib/,,$(RFLX_GRFLXDD)); \
+ 	      while test "x$${dir}" != "x" && \
+ 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
+diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
+--- root.as-needed/bindings/pyroot/Module.mk	2011-07-10 10:42:48.991561304 +0400
++++ root/bindings/pyroot/Module.mk	2011-07-10 10:43:21.493339703 +0400
+@@ -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.as-needed/build/package/debian/rules root/build/package/debian/rules
+--- root.as-needed/build/package/debian/rules	2011-07-10 10:42:49.241549346 +0400
++++ root/build/package/debian/rules	2011-07-10 10:48:06.989670589 +0400
+@@ -691,10 +691,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			\
+ 		-X$(PREFIX)/lib/root/$(SOVERS)/cint7			\
+ 		-X$(PREFIX)/include/root/Minuit2
+ #		$(foreach i, \
+diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
+--- root.as-needed/cint/cintex/Module.mk	2011-07-10 10:42:49.104889217 +0400
++++ root/cint/cintex/Module.mk	2011-07-10 10:43:21.496672876 +0400
+@@ -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.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
+--- root.as-needed/cint/reflex/Module.mk	2011-07-10 10:42:49.074890651 +0400
++++ root/cint/reflex/Module.mk	2011-07-10 10:43:21.496672876 +0400
+@@ -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.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
+--- root.as-needed/cint/reflex/python/CMakeLists.txt	2011-07-10 10:42:49.074890651 +0400
++++ root/cint/reflex/python/CMakeLists.txt	2011-07-10 10:43:21.496672876 +0400
+@@ -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/root-5.34.03.ebuild b/sci-physics/root/root-5.34.05.ebuild
index 6965ae7cacc2..657ce7f19357 100644
--- a/sci-physics/root/root-5.34.03.ebuild
+++ b/sci-physics/root/root-5.34.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.03.ebuild,v 1.2 2013/01/22 17:18:55 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.05.ebuild,v 1.1 2013/02/25 04:45:41 bicatali Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ 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
+PATCH_PV3=5.34.05
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
@@ -107,6 +107,7 @@ PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
 
 REQUIRED_USE="
 	!X? ( !opengl !qt4 )
+	htmldoc? ( doc )
 	mpi? ( math !openmp )
 	openmp? ( math !mpi )"
 
@@ -149,7 +150,7 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \