gentoo resync : 18.12.2017

10 files changed, 131 insertions, 153 deletions

diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index f0086626a80a..08f4ec037fff 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -9,16 +9,14 @@ AUX root-5.34.05-nobyte-compile.patch 5504 BLAKE2B 052cc5ebd1fae7d439244ccf9f343
 AUX root-5.34.13-unuran.patch 1555 BLAKE2B b476c0f00dd0bfc1f6a6fc63957794cc932fc1e747b5900a0e4b5e2142b3a71b0fe3076591134b46df724b8f9ff5820064bc9cf1e1af4be2a77fb0414f28722c SHA512 571d6bd56d2419e4b96f7ca95d14d291768cc98024f871ca35bfae1a7d1e010a7c101f927c66ece4c006ca89401aeaea89945b8502f1ae2b2068f535d0bc95f3
 AUX root-5.34.26-ldflags.patch 626 BLAKE2B 3c3b8bf4d173afd6024843c0e125d8b64868f367de96775e23ae21ee6adc7fb294700372eb4a3743178728ef947fbaa18e1f3c18ca5731931ed0c1a7b1ab580c SHA512 fa38441a472b8b811c293aecbf1e233ea619cb4a2c9bfb8dda1706c0ac34bf5c3dcf23a43a517a72aab5faa63e733eee74515cbf70b6f15e3cfba46e3e5c4ccc
 AUX root-6.00.01-dotfont.patch 2718 BLAKE2B a130dac163b92a4a91edc22d39722a47fcdb51cb681500a8f734091e2dc0edb6aed4a7e964cbc22120064ea49694e5fd4d2555931da5f89c0f514f75eb7314cf SHA512 8f01655e863d36678dea37df934e3d8d9c2bc85920497345feb8d863bdc1b7413c783b916050d1e7b476ecdf9e1e8afdcbb32e621d625305898d51947b6955c6
-AUX root-6.00.01-llvm.patch 439 BLAKE2B ab63adacefc1758471ea5e369c36bca8c00af5e37b128dd0cc50fde9325db3d18a4afdd594f16c11c8d4b9ad9dd1e1efe7589d97571b40a16b004fcd05b1c4a1 SHA512 cb9edb78a937ace744687506a6ec45b9022b6c7ca687e8fe1e2ee2ddf9e01b49fe8d6933910e2898f14247bdcf5d86b248d28938d28e3453615d56d5f12291d0
-AUX root-6.00.01-nobyte-compile.patch 1308 BLAKE2B 84820b482b8e0052c24773f4c4e214175b28d9fcdd029df4aa55028eeddda575384543a8b7d72b32a2102fadab560797896f6c5b6615ba96aeedd0c9b924c3de SHA512 6387c3277ec16ceb23caa1952b3a9e3869fedd12ed1fd93a4241e865898cd74b4abfe99e0f6fb266cfd5f3a46ede98e56f933ed0ad83829e8445ef583555b674
-AUX root-6.02.05-xrootd4.patch 478 BLAKE2B 0565d04102fd3cf801896f7254e5a1befc667811042bbf53ac620fd406b960cfb00bdc98094c7784acb806e796b1c590382a6eca0aed8de3cc1d5b80a316a268 SHA512 47f37ca84c06d71fc207b18bc38798ccde457e61758ec56f84543aa4619929869e15dd53a8d7302bd4ca458b1e880428aafba4963d63bc5711f4540a096c4ff8
-AUX root-6.04.06-gsl2.patch 1980 BLAKE2B cdd16587648209fe9444b201f47e58748e0411e9869edb1b750b07034f106796d70ad98cf52457b61359a8fc7355d6a28a0f12c098f2f60007363280f59224fe SHA512 493a261589c766fe7ffb1936475466f7aa6ef8f97a99c99c3676149dc5a898621272916e38eaf98d45b4a6a6ef57c0c1eeff565d36d0a2c5c0286ba99c2ed59d
-AUX root-6.04.06-prop-flags.patch 732 BLAKE2B cc1ed237e72aca8954e95a14b8926d83fa6b06512c67db9156fd3f5b1cd1a677eb9fc506e52ad8ff7dfe224d4fe938e5db603225f88fecbc4b7a44d96bc482c8 SHA512 bdd2403c9d96fc3bb4a3a60c584aaa78128d4ed067ba173fd79c7a54e71cd9d3d400f13a4e9f056b4c985a9bdde815f5ae8f5ff22fd40e0a6ab49f38f1c589f5
 AUX root-6.11.02-hsimple.patch 1838 BLAKE2B e5d4a2a04580c1ebe4e1da4cf615939347bcf24003c240870252938421f189e5da3ffc4a913c2241fe93f78077373ac0614bd85d32c33ba0da2203fa906f520a SHA512 3ded889d7a79070d78824bbea059f6451c96d95ac7c45063b2328856111e3dd28677dfd9a0696d0d5cbbe200690ed3f940341966847745c4bcf2f7e235135e5b
+AUX root-6.12.04-find-oracle-12.patch 1013 BLAKE2B 82d9dfc161ede442a8102831abbe042561b5a0b700533b420a2e38cbeddd4d6a2360ec76bdcf5fdd281f3493b6088b39af8edc3bbb33280e6e401474346a9198 SHA512 539cc42a25b1bea39e844a5e8597426f8afe8ea882ea573a40aea9e20e8fe50c6913520239b3aa15195511dfd95fe2baebe2dbeb3fbeddee2e384b25d66d6dc8
+AUX root-6.12.04-no-ocaml.patch 1631 BLAKE2B 808da46144572073e6fac54859a60a9f056e164a4f31718f2962197f162ced11a6f1e9839af50d1d9c720dc0e2811f9eabef4901dfbe0c14d055315abf9dcdad SHA512 37d78c57b05a20088794cf887d60514c932b6b11b2a918b4b2621700be281df80adf3f17d76da17a146e4e941bf472a0a1ddcbbf14406e5d49bd3b8e4dbf3c50
+AUX root-6.12.04-z3.patch 1155 BLAKE2B 31d099bb260a030d88fcfbe0c9c5a7953738619b216da4140e087b29fead0bfd05bd22aa75da99521689decfb54caa23e0b50a9be9c34fe2fd75596b99b13092 SHA512 ca82ed6f3a0eb9e0ae13a0c354eab0a7c9c18e93ef444418f5786decdd8600184a6c2d5deb6d54d1a852076988645a0fbd215459cd15f5569f54606d74ee3e18
 AUX rootd.confd 199 BLAKE2B d7638f5ee8ccb4fcb428d07c59d776a9ab8773fa8a8911281e8f76b32fab5902e3f6f6086ad210af39480df514c947719cc5e76d29c7dbf2a8715ae58ef49880 SHA512 2ce6753d37a7f22cc3656f110f802b8e07c1469bfe4524606c1472369352f8c584c01c716760252fab40369470b72d8c77cdbb2d52126c39371faaf597bf58d8
 AUX rootd.initd 622 BLAKE2B 7edeaf3cf550303642a89eb69edb65e6625215ac2daae5766904bcc14f1b30f6277c6eac6b895f46fbda01656df80cb71fdad6294a19bf581badceaa29278fdf SHA512 fde858a37b52540285d228e52845c963b18065a250aef0753f469753d541f577ac401f01438297c030e47176350bb23c3c0280c9b4ccbc1feda3313ab7c9be2e
 DIST root_v5.34.36.source.tar.gz 75427331 BLAKE2B 203af03e1459c7fe079fcb1b30da145b3262f90c074abb7ff8fb3b1b2b90ac24391ce51aa8afbd10e0db8d69549207f15176207bc30a13720e0ae94342a38dfa SHA512 2cc0c8f8b63b2a3ce01c49c41704483548a7324d92c21a63e3e36a00f4d6f5656a7844fdf48cb71a6f2a2c974112527300ffd3bb5502d8365ffaf138e6ae4c7a
 DIST root_v6.12.04.source.tar.gz 162106020 BLAKE2B f27382cf748d4e31d71b460ecbf9b9f12294fb212bf23dc3d34c98737d8815b2eea2318247e56953ba184bb790bbb2f4b43c675dcb7a02b77c011f19e15d0d83 SHA512 67e400e9e7e8cabfb036a1eb1c262d462f613de7d6e18f8a17109c8eb52932e9ba77e69ab7b1f62c582d06b7f4d020cc888a0dfbefb4d3716743f142c3e3c063
 EBUILD root-5.34.36.ebuild 12173 BLAKE2B 4829235ce5fae8b912afde7d28b619e98c9335cea9f614716f9222916734ef71b87df3d791f18337ddd477a854053ef690e4f4edfd43aeab7ba519686c2baa68 SHA512 52fee9354448cb8b471e28ff4ee2a552a975f36d9b6efc3af1b0e3e83a554dc406c502348ea49bbbbec82cf86cbeb9ed7d6df01645a31e4f5211c665abb27dfd
-EBUILD root-6.12.04.ebuild 9914 BLAKE2B c236344e2f1934049cdcb275fe679ac6ff43dc26c3bd6754106bdc9118e53df89ebd350334f05a3e76a4ef9241cc8a3325a67e4061a3c271e09dc4bc2333e1b9 SHA512 6418593633fab1a8a64ce7adc0ace86d892bd70df0058eea70ff0ab4f39fb6f2b46e0dacbe8f6c8fb0fa42a00521aed3841a53b3641e30967bdfab9a7e5f708e
+EBUILD root-6.12.04-r1.ebuild 9915 BLAKE2B 0a5fa19d389f26fec7af03427c2bc7458daf7358b1ed8ed894dd0592f5aba4d8fc5b2182393692c2abf73ace6f80445fee058f6f430e81f5ae5eeef53ec09989 SHA512 f5eea751b2c20df1e0d0a70771c1e2194a39ca647a5508786c0fdaebd7c634f400cdd42ebb80d03547900f85626c19eee87f99ba36669c8790a8bd20f89b9cf0
 MISC metadata.xml 3238 BLAKE2B 0396ebafbf0bd14c88f7ba401f12f698ccca313c0c04cab46f9fa198681b0f305f21413bab8a86c97bb65e0bbe00eb6b6f488600402784109dc13ed196d6589b SHA512 2ba887003b3dc6dc3d4de379ec9dde8a7ba8144c2bbd7be50ebcfc7b3bfb3154733edd39007fcd8c380034d028a0d3f352e4cb973d8facd9412f38f820c16b1e
diff --git a/sci-physics/root/files/root-6.00.01-llvm.patch b/sci-physics/root/files/root-6.00.01-llvm.patch
deleted file mode 100644
index c6abb353ee64..000000000000
--- a/sci-physics/root/files/root-6.00.01-llvm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/interpreter/llvm/src/Makefile.config.in b/interpreter/llvm/src/Makefile.config.in
-index 7633be2..c8756b1 100644
---- a/interpreter/llvm/src/Makefile.config.in
-+++ b/interpreter/llvm/src/Makefile.config.in
-@@ -170,6 +170,8 @@ CXXFLAGS += @CXXFLAGS@
- 
- # Linker flags.
- LDFLAGS += @LDFLAGS@
-+NOUNDEF := -Wl,--no-undefined
-+LDFLAGS := $(filter-out $(NOUNDEF),$(LDFLAGS))
- 
- # Path to the library archiver program.
- AR_PATH = @AR@
diff --git a/sci-physics/root/files/root-6.00.01-nobyte-compile.patch b/sci-physics/root/files/root-6.00.01-nobyte-compile.patch
deleted file mode 100644
index aa58f20686dc..000000000000
--- a/sci-physics/root/files/root-6.00.01-nobyte-compile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 --git a/sci-physics/root/files/root-6.02.05-xrootd4.patch b/sci-physics/root/files/root-6.02.05-xrootd4.patch
deleted file mode 100644
index 0b4a4bef0f2e..000000000000
--- a/sci-physics/root/files/root-6.02.05-xrootd4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://sft.its.cern.ch/jira/browse/ROOT-6998
---- root-6.02.05/net/netxng/src/TNetXNGFile.cxx.orig	2015-02-09 11:59:47.000000000 +0300
-+++ root-6.02.05/net/netxng/src/TNetXNGFile.cxx	2015-04-05 11:32:31.893127758 +0300
-@@ -28,6 +28,7 @@
- #include <XrdCl/XrdClFile.hh>
- #include <XrdCl/XrdClXRootDResponses.hh>
- #include <XrdCl/XrdClDefaultEnv.hh>
-+#include <XrdVersion.hh>
- #include <iostream>
- 
- //------------------------------------------------------------------------------
diff --git a/sci-physics/root/files/root-6.04.06-gsl2.patch b/sci-physics/root/files/root-6.04.06-gsl2.patch
deleted file mode 100644
index 5d9fb102b73c..000000000000
--- a/sci-physics/root/files/root-6.04.06-gsl2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-commit ee9964210c56e7c1868618a4434c5340fef38fe4
-Author: Pere Mato <pere.mato@cern.ch>
-Date:   Tue Dec 15 11:58:24 2015 +0100
-
-    Fix for ROOT-7776 - Integrate GSL 2.0 in ROOT. Changed the version used when option builtin_gsl=ON to 2.1 (latest production).
-
-diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
-index 6f04dad..309a8de 100644
---- a/cmake/modules/SearchInstalledSoftware.cmake
-+++ b/cmake/modules/SearchInstalledSoftware.cmake
-@@ -332,7 +332,7 @@ if(mathmore OR builtin_gsl)
-       endif()
-     endif()
-   else()
--    set(gsl_version 1.15)
-+    set(gsl_version 2.1)
-     message(STATUS "Downloading and building GSL version ${gsl_version}")
-     ExternalProject_Add(
-       GSL
-diff --git a/math/mathmore/src/GSLMultiFit.h b/math/mathmore/src/GSLMultiFit.h
-index 1d86da5..5b5a887 100644
---- a/math/mathmore/src/GSLMultiFit.h
-+++ b/math/mathmore/src/GSLMultiFit.h
-@@ -31,6 +31,7 @@
- #include "gsl/gsl_matrix.h"
- #include "gsl/gsl_multifit_nlin.h"
- #include "gsl/gsl_blas.h"
-+#include "gsl/gsl_version.h"
- #include "GSLMultiFitFunctionWrapper.h"
- 
- #include "Math/IFunction.h"
-@@ -143,7 +144,11 @@ public:
-    /// gradient value at the minimum
-    const double * Gradient() const {
-       if (fSolver == 0) return 0;
-+#if GSL_MAJOR_VERSION  > 1
-+      fType->gradient(fSolver->state, fVec);
-+#else
-       gsl_multifit_gradient(fSolver->J, fSolver->f,fVec);
-+#endif
-       return fVec->data;
-    }
- 
-@@ -154,7 +159,14 @@ public:
-       unsigned int npar = fSolver->fdf->p;
-       fCov = gsl_matrix_alloc( npar, npar );
-       static double kEpsrel = 0.0001;
-+#if GSL_MAJOR_VERSION > 1
-+      gsl_matrix* J = gsl_matrix_alloc(npar,npar);
-+      gsl_multifit_fdfsolver_jac (fSolver, J);
-+      int ret = gsl_multifit_covar(J, kEpsrel, fCov);
-+      gsl_matrix_free(J);
-+#else
-       int ret = gsl_multifit_covar(fSolver->J, kEpsrel, fCov);
-+#endif
-       if (ret != GSL_SUCCESS) return 0;
-       return fCov->data;
-    }
diff --git a/sci-physics/root/files/root-6.04.06-prop-flags.patch b/sci-physics/root/files/root-6.04.06-prop-flags.patch
deleted file mode 100644
index 90db15e21f6d..000000000000
--- a/sci-physics/root/files/root-6.04.06-prop-flags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
- config/Makefile.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/config/Makefile.in b/config/Makefile.in
-index 9243c90..a23a4d2 100644
---- a/config/Makefile.in
-+++ b/config/Makefile.in
-@@ -64,11 +64,11 @@ HOST           := @host@
- USECONFIG      := @useconfig@
- MKLIBOPTIONS   := @mkliboption@
- 
--EXTRA_CFLAGS   := -Iinclude @cflags@
-+EXTRA_CFLAGS   := -Iinclude @cflags@ $(CFLAGS)
- USERCONF_CFLAGS:= @usercflags@
--EXTRA_CXXFLAGS := -Iinclude @cflags@
-+EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS)
- USERCONF_CXXFLAGS:= @usercxxflags@
--EXTRA_LDFLAGS  := @ldflags@
-+EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
- WERROR         := @werror@
- WINRTDEBUG     := @winrtdebug@
- CTORSINITARRAY := @ctorsinitarray@
diff --git a/sci-physics/root/files/root-6.12.04-find-oracle-12.patch b/sci-physics/root/files/root-6.12.04-find-oracle-12.patch
new file mode 100644
index 000000000000..242e76d09879
--- /dev/null
+++ b/sci-physics/root/files/root-6.12.04-find-oracle-12.patch
@@ -0,0 +1,34 @@
+From 7aa8aacad80c75b40bb25bdeccc7cacce9a270ca Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Mon, 18 Dec 2017 13:32:06 +0100
+Subject: [PATCH] Fix FindOracle.cmake to find version 12.x
+
+---
+ cmake/modules/FindOracle.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake
+index 24031664a6..b7c8cfbb99 100644
+--- a/cmake/modules/FindOracle.cmake
++++ b/cmake/modules/FindOracle.cmake
+@@ -12,7 +12,7 @@ set(ORACLE_FOUND 0)
+ if(ORACLE_INCLUDE_DIR AND ORACLE_LIBRARY_OCCI)
+   set(ORACLE_FIND_QUIETLY 1)
+ endif()
+-set(ORACLE_HOME $ENV{ORACLE_DIR})
++set(ORACLE_HOME $ENV{ORACLE_HOME})
+ 
+ IF (ORACLE_PATH_INCLUDES)
+     SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES})
+@@ -55,7 +55,7 @@ FIND_LIBRARY(
+ )
+ FIND_LIBRARY(
+     ORACLE_LIBRARY_LNNZ
+-    NAMES libnnz10 nnz10 libnnz11 nnz11 ociw32
++    NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 ociw32
+     PATHS ${ORACLE_LIB_LOCATION}
+ )
+ 
+-- 
+2.15.1
+
diff --git a/sci-physics/root/files/root-6.12.04-no-ocaml.patch b/sci-physics/root/files/root-6.12.04-no-ocaml.patch
new file mode 100644
index 000000000000..1d91739f01a0
--- /dev/null
+++ b/sci-physics/root/files/root-6.12.04-no-ocaml.patch
@@ -0,0 +1,49 @@
+From 7405b8848e7c0d5ddcaa1f27b905b6931dc262e2 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Mon, 18 Dec 2017 13:08:14 +0100
+Subject: [PATCH] Disable OCaml bindings in LLVM
+
+---
+ interpreter/llvm/src/cmake/config-ix.cmake | 28 ----------------------------
+ 1 file changed, 28 deletions(-)
+
+diff --git a/interpreter/llvm/src/cmake/config-ix.cmake b/interpreter/llvm/src/cmake/config-ix.cmake
+index 6fb589cfd3..d1c9a70d10 100644
+--- a/interpreter/llvm/src/cmake/config-ix.cmake
++++ b/interpreter/llvm/src/cmake/config-ix.cmake
+@@ -575,32 +575,4 @@ if(CMAKE_HOST_APPLE AND APPLE)
+   endif()
+ endif()
+ 
+-# Keep the version requirements in sync with bindings/ocaml/README.txt.
+-include(FindOCaml)
+-include(AddOCaml)
+-if(WIN32)
+-  message(STATUS "OCaml bindings disabled.")
+-else()
+-  find_package(OCaml)
+-  if( NOT OCAML_FOUND )
+-    message(STATUS "OCaml bindings disabled.")
+-  else()
+-    if( OCAML_VERSION VERSION_LESS "4.00.0" )
+-      message(STATUS "OCaml bindings disabled, need OCaml >=4.00.0.")
+-    else()
+-      find_ocamlfind_package(ctypes VERSION 0.4 OPTIONAL)
+-      if( HAVE_OCAML_CTYPES )
+-        message(STATUS "OCaml bindings enabled.")
+-        find_ocamlfind_package(oUnit VERSION 2 OPTIONAL)
+-        set(LLVM_BINDINGS "${LLVM_BINDINGS} ocaml")
+-
+-        set(LLVM_OCAML_INSTALL_PATH "${OCAML_STDLIB_PATH}" CACHE STRING
+-            "Install directory for LLVM OCaml packages")
+-      else()
+-        message(STATUS "OCaml bindings disabled, need ctypes >=0.4.")
+-      endif()
+-    endif()
+-  endif()
+-endif()
+-
+ string(REPLACE " " ";" LLVM_BINDINGS_LIST "${LLVM_BINDINGS}")
+-- 
+2.15.1
+
diff --git a/sci-physics/root/files/root-6.12.04-z3.patch b/sci-physics/root/files/root-6.12.04-z3.patch
new file mode 100644
index 000000000000..04f6edf2c6d5
--- /dev/null
+++ b/sci-physics/root/files/root-6.12.04-z3.patch
@@ -0,0 +1,39 @@
+From 4445e05660493841b5fb683c7e8a8dc6c08564ac Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Mon, 18 Dec 2017 11:49:55 +0100
+Subject: [PATCH] Only look for Z3 if necessary
+
+---
+ interpreter/llvm/src/tools/clang/CMakeLists.txt | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/interpreter/llvm/src/tools/clang/CMakeLists.txt b/interpreter/llvm/src/tools/clang/CMakeLists.txt
+index 2667b1d689..a1559d9b15 100644
+--- a/interpreter/llvm/src/tools/clang/CMakeLists.txt
++++ b/interpreter/llvm/src/tools/clang/CMakeLists.txt
+@@ -186,8 +186,6 @@ if (LIBXML2_FOUND)
+   set(CLANG_HAVE_LIBXML 1)
+ endif()
+ 
+-find_package(Z3 4.5)
+-
+ include(CheckIncludeFile)
+ check_include_file(sys/resource.h CLANG_HAVE_RLIMITS)
+ 
+@@ -381,11 +379,8 @@ if(NOT CLANG_ENABLE_STATIC_ANALYZER AND (CLANG_ENABLE_ARCMT OR CLANG_ANALYZER_BU
+ endif()
+ 
+ if(CLANG_ANALYZER_BUILD_Z3)
+-  if(Z3_FOUND)
+-    set(CLANG_ANALYZER_WITH_Z3 1)
+-  else()
+-    message(FATAL_ERROR "Cannot find Z3 header file or shared library")
+-  endif()
++  find_package(Z3 4.5 REQUIRED)
++  set(CLANG_ANALYZER_WITH_Z3 1)
+ endif()
+ 
+ if(CLANG_ENABLE_ARCMT)
+-- 
+2.15.1
+
diff --git a/sci-physics/root/root-6.12.04.ebuild b/sci-physics/root/root-6.12.04-r1.ebuild
index 4fb0c10e18f8..f428493ad11e 100644
--- a/sci-physics/root/root-6.12.04.ebuild
+++ b/sci-physics/root/root-6.12.04-r1.ebuild
@@ -31,8 +31,6 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="
 	!X? ( !asimage !opengl !qt4 !tiff )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	pythia6? ( !pythia8 )
-	pythia8? ( !pythia6 )
 	tmva? ( math gsl )
 	davix? ( ssl )
 "
@@ -130,7 +128,10 @@ src_prepare() {
         "${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
         "${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
         "${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
-		"${FILESDIR}"/${PN}-6.11.02-hsimple.patch
+		"${FILESDIR}"/${PN}-6.11.02-hsimple.patch \
+		"${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch \
+		"${FILESDIR}"/${PN}-6.12.04-find-oracle-12.patch \
+		"${FILESDIR}"/${PN}-6.12.04-z3.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -254,13 +255,6 @@ src_configure() {
 		${EXTRA_ECONF}
 	)
 
-	if use oracle ; then
-			mycmakeargs+=(
-				-DORACLE_PATH_INCLUDES="${ORACLE_HOME}/include"
-				-DORACLE_PATH_LIB="${ORACLE_HOME}/$(get_libdir)"
-			)
-	fi
-
 	cmake-utils_src_configure
 }
 
@@ -304,6 +298,7 @@ src_install() {
 	use emacs && elisp-install ${PN} "${BUILD_DIR}"/root-help.el
 
 	echo "PATH=${EPREFIX}/${MY_PREFIX}/bin" > 99root || die
+	echo "ROOTPATH=${EPREFIX}/${MY_PREFIX}/bin" > 99root || die
 	echo "LDPATH=${EPREFIX}/${MY_PREFIX}/$(get_libdir)" >> 99root || die
 
 	if use pythia8; then