[gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/

["Andrew Savchenko" <bircoph@gmail.com>]

commit:     a115046e7624dd639db7afea3b3863bc1aedab36
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Jul 22 08:02:06 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Jul 22 08:02:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a115046e

sci-physics/root: improve cling support

However, patched llvm/clang is still required.

---
 sci-physics/root/ChangeLog                   |    6 ++++++
 sci-physics/root/files/root-9999-cling.patch |   13 +++++++++++++
 sci-physics/root/root-9999.ebuild            |    3 ++-
 3 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 6867500..f575ac2 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 $
 
+  22 Jul 2012; Andrew Savchenko <bircoph@gmail.com> root-9999.ebuild,
+  +files/root-9999-cling.patch:
+  One step further to build with cling. But ATM patched version of
+  llvm/clang is still required. Perhaps, we should install it
+  elsewhere as a separate package?
+
   21 Jul 2012; Andrew Savchenko <bircoph@gmail.com> root-9999.ebuild,
   metadata.xml:
   Clarens and PEAC were removed from ROOT.

diff --git a/sci-physics/root/files/root-9999-cling.patch b/sci-physics/root/files/root-9999-cling.patch
new file mode 100644
index 0000000..9c240dd
--- /dev/null
+++ b/sci-physics/root/files/root-9999-cling.patch
@@ -0,0 +1,13 @@
+--- root/core/utils/Module.mk.orig	2012-07-22 11:18:33.000000000 +0400
++++ root/core/utils/Module.mk	2012-07-22 11:20:02.633436297 +0400
+@@ -95,6 +95,10 @@
+ 	$(MAKEDIR)
+ 	cp $< $@
+ 
++$(UTILSDIRS)/%_tmp.cxx: $(UTILSDIRS)/%.cxx
++	$(MAKEDIR)
++	cp $< $@
++
+ $(call stripsrc,$(UTILSDIRS)/rootcint_tmp.o): $(call stripsrc,$(UTILSDIRS)/rootcint_tmp.cxx)
+ 
+ $(call stripsrc,$(UTILSDIRS)/RStl_tmp.o): $(call stripsrc,$(UTILSDIRS)/RStl_tmp.cxx)

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 4e2f20d..af9c8ad 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -157,7 +157,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-9999-dotfont.patch
+		"${FILESDIR}"/${PN}-9999-dotfont.patch \
+		"${FILESDIR}"/${PN}-9999-cling.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die