1 |
commit: ad17e8d42638b8f63f720365c8374ff34140b91d |
2 |
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Feb 23 12:39:29 2013 +0000 |
4 |
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
5 |
CommitDate: Sat Feb 23 12:39:29 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ad17e8d4 |
7 |
|
8 |
sci-physics/root: version bump |
9 |
|
10 |
--- |
11 |
sci-physics/root/ChangeLog | 6 + |
12 |
.../root/files/root-5.34.05-nobyte-compile.patch | 137 ++++++++++++++++++++ |
13 |
.../{root-5.34.03.ebuild => root-5.34.05.ebuild} | 7 +- |
14 |
3 files changed, 147 insertions(+), 3 deletions(-) |
15 |
|
16 |
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog |
17 |
index ee4803a..577734d 100644 |
18 |
--- a/sci-physics/root/ChangeLog |
19 |
+++ b/sci-physics/root/ChangeLog |
20 |
@@ -2,6 +2,12 @@ |
21 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
22 |
# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $ |
23 |
|
24 |
+*root-5.34.05 (23 Feb 2013) |
25 |
+ |
26 |
+ 23 Feb 2013; Andrew Savchenko <bircoph@×××××.com> -root-5.34.03.ebuild, |
27 |
+ +root-5.34.05.ebuild, +files/root-5.34.05-nobyte-compile.patch: |
28 |
+ Version bump. |
29 |
+ |
30 |
21 Jan 2013; Andrew Savchenko <bircoph@×××××.com> |
31 |
-files/root-5.28.00b-asneeded.patch, |
32 |
-files/root-5.28.00b-nobyte-compile.patch, |
33 |
|
34 |
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 |
35 |
new file mode 100644 |
36 |
index 0000000..ec67a15 |
37 |
--- /dev/null |
38 |
+++ b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch |
39 |
@@ -0,0 +1,137 @@ |
40 |
+diff -Naur root.as-needed/Makefile root/Makefile |
41 |
+--- a/Makefile.orig 2013-02-15 02:27:56.000000000 +0400 |
42 |
++++ b/Makefile 2013-02-23 02:22:14.556465852 +0400 |
43 |
+@@ -1258,10 +1258,7 @@ |
44 |
+ for lib in $(RFLX_GRFLXPY); do \ |
45 |
+ rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \ |
46 |
+ done; \ |
47 |
+- for lib in $(RFLX_GRFLXPYC); do \ |
48 |
+- rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \ |
49 |
+- done; \ |
50 |
+- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \ |
51 |
++ if test "x$(RFLX_GRFLXPY)" != "x"; then \ |
52 |
+ dir=$(subst lib/,,$(RFLX_GRFLXDD)); \ |
53 |
+ while test "x$${dir}" != "x" && \ |
54 |
+ test -d $(DESTDIR)$(LIBDIR)/$${dir} && \ |
55 |
+diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk |
56 |
+--- root.as-needed/bindings/pyroot/Module.mk 2011-07-10 10:42:48.991561304 +0400 |
57 |
++++ root/bindings/pyroot/Module.mk 2011-07-10 10:43:21.493339703 +0400 |
58 |
+@@ -48,8 +48,6 @@ |
59 |
+ ROOTPY := $(subst $(MODDIR),$(LPATH),$(ROOTPYS)) |
60 |
+ $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@ |
61 |
+ endif |
62 |
+-ROOTPYC := $(ROOTPY:.py=.pyc) |
63 |
+-ROOTPYO := $(ROOTPY:.py=.pyo) |
64 |
+ |
65 |
+ # used in the main Makefile |
66 |
+ ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH)) |
67 |
+@@ -68,10 +66,8 @@ |
68 |
+ include/%.h: $(PYROOTDIRI)/%.h |
69 |
+ cp $< $@ |
70 |
+ |
71 |
+-%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' |
72 |
+-%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' |
73 |
+ |
74 |
+-$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \ |
75 |
++$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) \ |
76 |
+ $(ROOTLIBSDEP) $(PYTHONLIBDEP) |
77 |
+ @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ |
78 |
+ "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \ |
79 |
+@@ -113,7 +109,7 @@ |
80 |
+ |
81 |
+ distclean-$(MODNAME): clean-$(MODNAME) |
82 |
+ @rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \ |
83 |
+- $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \ |
84 |
++ $(ROOTPY) $(PYROOTMAP) \ |
85 |
+ $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64) |
86 |
+ |
87 |
+ distclean:: distclean-$(MODNAME) |
88 |
+diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules |
89 |
+--- root.as-needed/build/package/debian/rules 2011-07-10 10:42:49.241549346 +0400 |
90 |
++++ root/build/package/debian/rules 2011-07-10 10:48:06.989670589 +0400 |
91 |
+@@ -691,10 +691,6 @@ |
92 |
+ -X$(SYSCONFDIR)/root/system.rootauthrc \ |
93 |
+ -X$(SYSCONFDIR)/root/system.rootdaemonrc \ |
94 |
+ -X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a \ |
95 |
+- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc \ |
96 |
+- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo \ |
97 |
+- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc \ |
98 |
+- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo \ |
99 |
+ -X$(PREFIX)/lib/root/$(SOVERS)/cint7 \ |
100 |
+ -X$(PREFIX)/include/root/Minuit2 |
101 |
+ # $(foreach i, \ |
102 |
+diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk |
103 |
+--- root.as-needed/cint/cintex/Module.mk 2011-07-10 10:42:49.104889217 +0400 |
104 |
++++ root/cint/cintex/Module.mk 2011-07-10 10:43:21.496672876 +0400 |
105 |
+@@ -31,10 +31,6 @@ |
106 |
+ CINTEXPY := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS)) |
107 |
+ $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@ |
108 |
+ endif |
109 |
+-ifneq ($(BUILDPYTHON),no) |
110 |
+-CINTEXPYC := $(CINTEXPY:.py=.pyc) |
111 |
+-CINTEXPYO := $(CINTEXPY:.py=.pyo) |
112 |
+-endif |
113 |
+ |
114 |
+ # used in the main Makefile |
115 |
+ ALLHDRS += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH)) |
116 |
+@@ -86,8 +82,6 @@ |
117 |
+ fi) |
118 |
+ cp $< $@ |
119 |
+ |
120 |
+-%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' |
121 |
+-%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' |
122 |
+ |
123 |
+ $(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \ |
124 |
+ $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP) |
125 |
+diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk |
126 |
+--- root.as-needed/cint/reflex/Module.mk 2011-07-10 10:42:49.074890651 +0400 |
127 |
++++ root/cint/reflex/Module.mk 2011-07-10 10:43:21.496672876 +0400 |
128 |
+@@ -48,9 +48,6 @@ |
129 |
+ RFLX_GRFLXS := $(wildcard $(RFLX_GRFLXSD)/*.py) |
130 |
+ RFLX_GRFLXPY := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS)) |
131 |
+ RFLX_GRFLXPY += $(RFLX_GCCXMLPATHPY) |
132 |
+-ifneq ($(BUILDPYTHON),no) |
133 |
+-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY)) |
134 |
+-endif |
135 |
+ |
136 |
+ RFLX_LIBDIR = $(LIBDIR) |
137 |
+ |
138 |
+@@ -92,7 +89,7 @@ |
139 |
+ |
140 |
+ ALLEXECS += $(RFLX_GENMAPX) |
141 |
+ |
142 |
+-POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) |
143 |
++POSTBIN += $(RFLX_GRFLXPY) |
144 |
+ |
145 |
+ ##### local rules ##### |
146 |
+ .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \ |
147 |
+@@ -122,8 +119,6 @@ |
148 |
+ mkdir -p lib/python/genreflex; fi ) |
149 |
+ cp $< $@ |
150 |
+ |
151 |
+-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py |
152 |
+- @python -c 'import py_compile; py_compile.compile( "$<" )' |
153 |
+ |
154 |
+ $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap |
155 |
+ |
156 |
+@@ -149,7 +144,7 @@ |
157 |
+ $(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \ |
158 |
+ -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL) |
159 |
+ |
160 |
+-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) |
161 |
++all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY) |
162 |
+ |
163 |
+ clean-genreflex: |
164 |
+ @rm -rf lib/python/genreflex |
165 |
+diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt |
166 |
+--- root.as-needed/cint/reflex/python/CMakeLists.txt 2011-07-10 10:42:49.074890651 +0400 |
167 |
++++ root/cint/reflex/python/CMakeLists.txt 2011-07-10 10:43:21.496672876 +0400 |
168 |
+@@ -15,7 +15,7 @@ |
169 |
+ ##################### sources #################### |
170 |
+ |
171 |
+ FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py) |
172 |
+-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE) |
173 |
++SET(GENREFLEX_SCRIPT PARENT_SCOPE) |
174 |
+ |
175 |
+ ##################### gccxmlpath #################### |
176 |
+ |
177 |
|
178 |
diff --git a/sci-physics/root/root-5.34.03.ebuild b/sci-physics/root/root-5.34.05.ebuild |
179 |
similarity index 98% |
180 |
rename from sci-physics/root/root-5.34.03.ebuild |
181 |
rename to sci-physics/root/root-5.34.05.ebuild |
182 |
index f410d92..51cb521 100644 |
183 |
--- a/sci-physics/root/root-5.34.03.ebuild |
184 |
+++ b/sci-physics/root/root-5.34.05.ebuild |
185 |
@@ -1,6 +1,6 @@ |
186 |
# Copyright 1999-2013 Gentoo Foundation |
187 |
# Distributed under the terms of the GNU General Public License v2 |
188 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.03.ebuild,v 1.1 2012/10/26 15:40:47 bicatali Exp $ |
189 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.03.ebuild,v 1.2 2013/01/22 17:18:55 bicatali Exp $ |
190 |
|
191 |
EAPI=4 |
192 |
|
193 |
@@ -22,7 +22,7 @@ ROOFIT_DOC_PV=2.91-33 |
194 |
TMVA_DOC_PV=4.03 |
195 |
PATCH_PV=5.28.00b |
196 |
PATCH_PV2=5.32.00 |
197 |
-PATCH_PV3=5.34.01 |
198 |
+PATCH_PV3=5.34.05 |
199 |
|
200 |
DESCRIPTION="C++ data analysis framework and interpreter from CERN" |
201 |
HOMEPAGE="http://root.cern.ch/" |
202 |
@@ -107,6 +107,7 @@ PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )" |
203 |
|
204 |
REQUIRED_USE=" |
205 |
!X? ( !opengl !qt4 ) |
206 |
+ htmldoc? ( doc ) |
207 |
mpi? ( math !openmp ) |
208 |
openmp? ( math !mpi )" |
209 |
|
210 |
@@ -149,7 +150,7 @@ pkg_setup() { |
211 |
src_prepare() { |
212 |
epatch \ |
213 |
"${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \ |
214 |
- "${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \ |
215 |
+ "${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \ |
216 |
"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \ |
217 |
"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \ |
218 |
"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \ |