From: "Andrew Savchenko" <bircoph@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
Date: Sat, 23 Feb 2013 12:45:04 +0000 (UTC) [thread overview]
Message-ID: <1361623169.ad17e8d42638b8f63f720365c8374ff34140b91d.bircoph@gentoo> (raw)
commit: ad17e8d42638b8f63f720365c8374ff34140b91d
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Feb 23 12:39:29 2013 +0000
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sat Feb 23 12:39:29 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ad17e8d4
sci-physics/root: version bump
---
sci-physics/root/ChangeLog | 6 +
.../root/files/root-5.34.05-nobyte-compile.patch | 137 ++++++++++++++++++++
.../{root-5.34.03.ebuild => root-5.34.05.ebuild} | 7 +-
3 files changed, 147 insertions(+), 3 deletions(-)
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index ee4803a..577734d 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2013 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.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.
+
21 Jan 2013; Andrew Savchenko <bircoph@gmail.com>
-files/root-5.28.00b-asneeded.patch,
-files/root-5.28.00b-nobyte-compile.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 0000000..ec67a15
--- /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
similarity index 98%
rename from sci-physics/root/root-5.34.03.ebuild
rename to sci-physics/root/root-5.34.05.ebuild
index f410d92..51cb521 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.1 2012/10/26 15:40:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.03.ebuild,v 1.2 2013/01/22 17:18:55 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 \
next reply other threads:[~2013-02-23 12:45 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-23 12:45 Andrew Savchenko [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-07-06 14:06 [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/ Justin Bronder
2015-10-01 6:06 Justin Lecher
2015-07-18 13:49 Andrew Savchenko
2015-04-12 13:55 Andrew Savchenko
2015-04-08 2:24 Andrew Savchenko
2015-03-02 7:13 Andrew Savchenko
2014-07-06 12:53 Andrew Savchenko
2014-07-02 22:37 Andrew Savchenko
2014-07-02 16:32 Andrew Savchenko
2014-07-02 13:35 Andrew Savchenko
2013-12-10 15:05 Andrew Savchenko
2013-12-05 17:08 Andrew Savchenko
2013-11-09 5:04 Andrew Savchenko
2013-10-16 4:49 Nicolas Bock
2013-10-15 14:17 Andrew Savchenko
2013-01-21 22:32 Andrew Savchenko
2012-10-28 22:46 Andrew Savchenko
2012-10-25 16:37 Andrew Savchenko
2012-10-19 21:32 Andrew Savchenko
2012-07-23 21:11 Andrew Savchenko
2012-07-22 8:03 Andrew Savchenko
2012-07-21 17:12 Andrew Savchenko
2012-07-01 6:59 Andrew Savchenko
2012-06-20 9:18 Andrew Savchenko
2012-06-19 20:20 Andrew Savchenko
2012-06-19 20:20 Andrew Savchenko
2012-05-29 23:01 Andrew Savchenko
2012-05-15 8:49 Andrew Savchenko
2012-03-21 23:46 Andrew Savchenko
2012-03-09 1:11 Andrew Savchenko
2012-03-01 14:37 Andrew Savchenko
2012-02-27 18:11 Andrew Savchenko
2012-02-13 17:43 Sebastien Fabbro
2012-01-20 9:14 Andrew Savchenko
2011-12-04 0:50 Andrew Savchenko
2011-12-04 0:29 Andrew Savchenko
2011-10-21 12:36 Andrew Savchenko
2011-10-07 19:43 Andrew Savchenko
2011-08-02 21:49 Andrew Savchenko
2011-03-16 21:16 Sebastien Fabbro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1361623169.ad17e8d42638b8f63f720365c8374ff34140b91d.bircoph@gentoo \
--to=bircoph@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox