commit: 0e405916c55dd90708cf3ae85636873df29e74e6 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org> AuthorDate: Mon Dec 18 12:52:00 2017 +0000 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> CommitDate: Mon Dec 18 13:12:03 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e405916
sci-physics/root: drop unused patches Package-Manager: Portage-2.3.19, Repoman-2.3.6 sci-physics/root/files/root-6.00.01-llvm.patch | 13 ----- .../root/files/root-6.00.01-nobyte-compile.patch | 33 ------------ sci-physics/root/files/root-6.02.05-xrootd4.patch | 11 ---- sci-physics/root/files/root-6.04.06-gsl2.patch | 58 ---------------------- .../root/files/root-6.04.06-prop-flags.patch | 22 -------- 5 files changed, 137 deletions(-) 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 c6abb353ee6..00000000000 --- 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 aa58f20686d..00000000000 --- 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 0b4a4bef0f2..00000000000 --- 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 5d9fb102b73..00000000000 --- a/sci-physics/root/files/root-6.04.06-gsl2.patch +++ /dev/null @@ -1,58 +0,0 @@ -commit ee9964210c56e7c1868618a4434c5340fef38fe4 -Author: Pere Mato <[email protected]> -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 90db15e21f6..00000000000 --- 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@
