From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 59D05138247 for ; Thu, 5 Dec 2013 17:08:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3CE1E087F; Thu, 5 Dec 2013 17:08:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4AF31E087F for ; Thu, 5 Dec 2013 17:08:57 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 050B633F59C for ; Thu, 5 Dec 2013 17:08:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AC70FD07EB for ; Thu, 5 Dec 2013 17:08:52 +0000 (UTC) From: "Andrew Savchenko" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Savchenko" Message-ID: <1386263265.9befbea7304e0ca846512fe8aa6fed392d8e2243.bircoph@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/root/ChangeLog sci-physics/root/files/root-5.28.00b-asneeded.patch sci-physics/root/files/root-5.28.00b-prop-ldflags.patch sci-physics/root/files/root-5.32.00-explicit-functions.patch sci-physics/root/files/root-5.32.00-nobyte-compile.patch sci-physics/root/files/root-5.34.13-desktop.patch sci-physics/root/files/root-5.34.13-pythia8.patch sci-physics/root/files/root-5.34.13-unuran.patch sci-physics/root/metadata.xml sci-physics/root/root-5.32.04.ebuild sci-physics/root/root-5.34.13.ebuild X-VCS-Directories: sci-physics/root/files/ sci-physics/root/ X-VCS-Committer: bircoph X-VCS-Committer-Name: Andrew Savchenko X-VCS-Revision: 9befbea7304e0ca846512fe8aa6fed392d8e2243 X-VCS-Branch: master Date: Thu, 5 Dec 2013 17:08:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a3796b57-19c9-40fb-81e9-db1633703c9c X-Archives-Hash: cbe6c36e36ed97b0548d66bd9ac2bafa commit: 9befbea7304e0ca846512fe8aa6fed392d8e2243 Author: Andrew Savchenko gmail com> AuthorDate: Thu Dec 5 17:07:45 2013 +0000 Commit: Andrew Savchenko gmail com> CommitDate: Thu Dec 5 17:07:45 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9befbea7 sci-physics/root: version bump and fixes --- sci-physics/root/ChangeLog | 14 ++ .../root/files/root-5.28.00b-asneeded.patch | 20 -- .../root/files/root-5.28.00b-prop-ldflags.patch | 13 -- .../files/root-5.32.00-explicit-functions.patch | 18 -- .../root/files/root-5.32.00-nobyte-compile.patch | 137 ------------- sci-physics/root/files/root-5.34.13-desktop.patch | 12 ++ sci-physics/root/files/root-5.34.13-pythia8.patch | 13 ++ sci-physics/root/files/root-5.34.13-unuran.patch | 40 ++++ sci-physics/root/metadata.xml | 1 - .../{root-5.32.04.ebuild => root-5.34.13.ebuild} | 223 ++++++++++++--------- 10 files changed, 207 insertions(+), 284 deletions(-) diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index 4f26aae..cc4b7cb 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,20 @@ # 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.13 (05 Dec 2013) + + 05 Dec 2013; Andrew Savchenko -root-5.32.04.ebuild, + +root-5.34.13.ebuild, -files/root-5.28.00b-asneeded.patch, + -files/root-5.28.00b-prop-ldflags.patch, + -files/root-5.32.00-explicit-functions.patch, + -files/root-5.32.00-nobyte-compile.patch, +files/root-5.34.13-desktop.patch, + +files/root-5.34.13-pythia8.patch, +files/root-5.34.13-unuran.patch: + Version bump. Fix Pythia8 version requirements and fix Pythia8 + build using patch from Oliver Freyermuth (see bug 490332 and + https://sft.its.cern.ch/jira/browse/ROOT-5667). Fix c++0x USE flag. + Fix installaton of python optimized modules. Fix desktop file to + conform currest standard. Remove old. + 09 Nov 2013; Andrew Savchenko +root-5.32.04.ebuild, +files/root-5.28.00b-asneeded.patch, +files/root-5.28.00b-prop-ldflags.patch, +files/root-5.32.00-explicit-functions.patch, diff --git a/sci-physics/root/files/root-5.28.00b-asneeded.patch b/sci-physics/root/files/root-5.28.00b-asneeded.patch deleted file mode 100644 index b845247..0000000 --- a/sci-physics/root/files/root-5.28.00b-asneeded.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- root.orig/configure 2010-12-20 07:17:54.000000000 +0000 -+++ root/configure 2010-12-20 07:16:05.000000000 +0000 -@@ -709,7 +709,7 @@ - cat < conftest.mk - include ${ac_srcdir}/config/Makefile.${arch} - conftest: conftest.c -- \$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@ -+ \$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@ - - conftest.c: - echo "int main() { return 0; }" > \$@ -@@ -723,7 +723,7 @@ - cat < conftest.mk - include ${ac_srcdir}/config/Makefile.${arch} - conftest:conftest.c -- \$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@ -+ \$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@ - - conftest.c: - echo "extern int $linksymbol (); " > \$@ diff --git a/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch b/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch deleted file mode 100644 index 7324319..0000000 --- a/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur root.orig/config/Makefile.in root/config/Makefile.in ---- root.orig/config/Makefile.in 2010-12-14 17:20:26.000000000 +0300 -+++ root/config/Makefile.in 2010-12-17 22:33:34.902161458 +0300 -@@ -27,7 +27,7 @@ - - EXTRA_CFLAGS := -Iinclude @cflags@ - EXTRA_CXXFLAGS := -Iinclude @cflags@ --EXTRA_LDFLAGS := @ldflags@ -+EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) - WINRTDEBUG := @winrtdebug@ - - GLBPATCHFLAGS := @glbpatchcflags@ - diff --git a/sci-physics/root/files/root-5.32.00-explicit-functions.patch b/sci-physics/root/files/root-5.32.00-explicit-functions.patch deleted file mode 100644 index 570d61e..0000000 --- a/sci-physics/root/files/root-5.32.00-explicit-functions.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- root/io/io/Module.mk.orig 2012-02-29 19:46:38.000000000 +0400 -+++ root/io/io/Module.mk 2012-03-09 02:29:19.905665572 +0400 -@@ -67,15 +67,5 @@ - distclean:: distclean-$(MODNAME) - - ##### extra rules ###### --#ifeq ($(GCC_VERS_FULL),gcc-4.4.0) --ifeq ($(GCC_VERS),gcc-4.4) --ifneq ($(filter -O%,$(OPT)),) - $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION --endif --endif --ifeq ($(GCC_VERS),gcc-4.5) --ifneq ($(filter -O%,$(OPT)),) - $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION --endif --endif -- diff --git a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch b/sci-physics/root/files/root-5.32.00-nobyte-compile.patch deleted file mode 100644 index 179e579..0000000 --- a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -Naur root.as-needed/Makefile root/Makefile ---- root.as-needed/Makefile 2011-07-10 10:42:49.758191296 +0400 -+++ root/Makefile 2011-07-10 10:43:21.493339703 +0400 -@@ -1167,10 +1167,7 @@ - if test "x$(RFLX_GRFLXPY)" != "x"; then \ - rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \ - fi; \ -- if test "x$(RFLX_GRFLXPYC)" != "x"; then \ -- rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \ -- fi; \ -- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \ -+ if test "x$(RFLX_GRFLXPY)" != "x"; then \ - dir=$(RFLX_GRFLXDD:lib/=); \ - 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/files/root-5.34.13-desktop.patch b/sci-physics/root/files/root-5.34.13-desktop.patch new file mode 100644 index 0000000..7d47bcf --- /dev/null +++ b/sci-physics/root/files/root-5.34.13-desktop.patch @@ -0,0 +1,12 @@ +diff --git a/etc/root.desktop b/etc/root.desktop +index ca38211..688ecfa 100644 +--- a/etc/root.desktop ++++ b/etc/root.desktop +@@ -8,5 +8,5 @@ Name[de]=ROOT + Comment=An object-oriented data analysis framework + Comment[de]=Ein objektorientiertes Framework zur Datenanalyse + StartupNotify=true +-MimeType=application/x-root;text/x-c++src +-Categories=Science;Development;Application; ++MimeType=application/x-root;text/x-c++src; ++Categories=Science;Development; diff --git a/sci-physics/root/files/root-5.34.13-pythia8.patch b/sci-physics/root/files/root-5.34.13-pythia8.patch new file mode 100644 index 0000000..07f62bb --- /dev/null +++ b/sci-physics/root/files/root-5.34.13-pythia8.patch @@ -0,0 +1,13 @@ +diff --git a/montecarlo/pythia8/Module.mk b/montecarlo/pythia8/Module.mk +index b3d0ee4..86fb3d5 100644 +--- a/montecarlo/pythia8/Module.mk ++++ b/montecarlo/pythia8/Module.mk +@@ -50,7 +50,7 @@ $(PYTHIA8LIB): $(PYTHIA8O) $(PYTHIA8DO) $(ORDER_) $(MAINLIBS) $(PYTHIA8LIBDEP) + $(PYTHIA8DS): $(PYTHIA8H) $(PYTHIA8L) $(ROOTCINTTMPDEP) + $(MAKEDIR) + @echo "Generating dictionary $@..." +- $(ROOTCINTTMP) -f $@ -c -I$(FPYTHIA8INCDIR) $(PYTHIA8H) $(PYTHIA8L) ++ $(ROOTCINTTMP) -f $@ -c -p -I$(FPYTHIA8INCDIR) $(PYTHIA8H) $(PYTHIA8L) + + $(PYTHIA8MAP): $(RLIBMAP) $(MAKEFILEDEP) $(PYTHIA8L) + $(RLIBMAP) -o $@ -l $(PYTHIA8LIB) \ diff --git a/sci-physics/root/files/root-5.34.13-unuran.patch b/sci-physics/root/files/root-5.34.13-unuran.patch new file mode 100644 index 0000000..8262313 --- /dev/null +++ b/sci-physics/root/files/root-5.34.13-unuran.patch @@ -0,0 +1,40 @@ +diff --git a/math/unuran/Module.mk b/math/unuran/Module.mk +index 00a530b..7cd22dc 100644 +--- a/math/unuran/Module.mk ++++ b/math/unuran/Module.mk +@@ -31,7 +31,7 @@ UNRS := $(wildcard $(UNRDIRS)/src/utils/*.c) \ + $(wildcard $(UNRDIRS)/src/uniform/*.c) \ + $(wildcard $(UNRDIRS)/src/urng/*.c) + else +-UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -)) ++UNRTARCONTENT:= + UNRS := $(filter %.c, \ + $(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \ + $(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \ +@@ -81,10 +81,9 @@ INCLUDEFILES += $(UNURANDEP) + ##### local rules ##### + .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) + +-include/%.h: $(UNURANDIRI)/%.h $(UNURANETAG) ++include/%.h: $(UNURANDIRI)/%.h + cp $< $@ + +-$(UNURANDEP): $(UNRCFG) + $(UNRS): $(UNURANETAG) + + $(UNURANETAG): $(UNRSRCS) +@@ -137,12 +136,12 @@ $(UNRCFG): $(UNURANETAG) + GNUMAKE=$(MAKE) ./configure CC="$$ACC" \ + CFLAGS="$$ACFLAGS"); + +-$(UNURANLIB): $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \ ++$(UNURANLIB): $(UNURANO) $(UNURANDO) $(ORDER_) \ + $(MAINLIBS) $(UNURANLIBDEP) + @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ + "$(SOFLAGS)" libUnuran.$(SOEXT) $@ \ + "$(UNURANO) $(UNURANDO)" \ +- "$(UNURANLIBEXTRA) $(UNRO)" ++ "$(UNURANLIBEXTRA) -lunuran" + + $(UNURANDS): $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP) + $(MAKEDIR) diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml index 30f4635..67025ea 100644 --- a/sci-physics/root/metadata.xml +++ b/sci-physics/root/metadata.xml @@ -17,7 +17,6 @@ Build ROOT using the C++11 standard. Requires sys-devel/gcc>=4.7.0 - Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis Support for images and data from FITS files with sci-libs/cfitsio Enable ROOT-CAD interface using sci-libs/opencascade Generate html documentation diff --git a/sci-physics/root/root-5.32.04.ebuild b/sci-physics/root/root-5.34.13.ebuild similarity index 62% rename from sci-physics/root/root-5.32.04.ebuild rename to sci-physics/root/root-5.34.13.ebuild index b685c3e..144d222 100644 --- a/sci-physics/root/root-5.32.04.ebuild +++ b/sci-physics/root/root-5.34.13.ebuild @@ -1,13 +1,12 @@ # 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.32.04.ebuild,v 1.2 2013/03/02 23:27:01 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.10-r2.ebuild,v 1.1 2013/10/29 17:00:37 bicatali Exp $ EAPI=5 if [[ ${PV} == "9999" ]] ; then - _SVN=subversion - ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk" - ESVN_OPTIONS="--non-interactive --trust-server-cert" + _GIT=git-2 + EGIT_REPO_URI="http://root.cern.ch/git/root.git" SRC_URI="" KEYWORDS="" else @@ -16,30 +15,42 @@ else fi PYTHON_COMPAT=( python2_{6,7} ) -inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_SVN} +inherit elisp-common eutils fdo-mime fortran-2 ${_GIT} multilib python-single-r1 toolchain-funcs user versionator 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.05 +PATCH_PV4=5.34.13 DESCRIPTION="C++ data analysis framework and interpreter from CERN" HOMEPAGE="http://root.cern.ch/" SRC_URI="${SRC_URI} - doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf + !minimal? ( doc? ( math? ( ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) + metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf ) + !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf ) htmldoc? ( http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png - http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )" + http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) + ) )" SLOT="0" LICENSE="LGPL-2.1" -IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerberos - ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6 - pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd" +IUSE="+X afs avahi c++0x doc emacs examples fits fftw graphviz htmldoc + kerberos ldap +math +metric minimal mpi mysql odbc +opengl openmp oracle postgres + prefix pythia6 pythia8 python qt4 +reflex ruby sqlite ssl xinetd xml xrootd" + +REQUIRED_USE=" + !X? ( !opengl !qt4 ) + htmldoc? ( doc ) + mpi? ( math !openmp ) + openmp? ( math !mpi ) + python? ( ${PYTHON_REQUIRED_USE} )" CDEPEND=" app-arch/xz-utils @@ -59,42 +70,48 @@ CDEPEND=" x11-libs/libX11 x11-libs/libXext x11-libs/libXpm - || ( - >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] - >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] - ) - opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) - qt4? ( - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - dev-qt/qt3support:4 - dev-qt/qtsvg:4 - dev-qt/qtwebkit:4 - dev-qt/qtxmlpatterns:4 ) - xft? ( x11-libs/libXft ) + !minimal? ( + || ( + >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] + >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] + ) + opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) + qt4? ( + dev-qt/qtgui:4 + dev-qt/qtopengl:4 + dev-qt/qt3support:4 + dev-qt/qtsvg:4 + dev-qt/qtwebkit:4 + dev-qt/qtxmlpatterns:4 + ) + x11-libs/libXft ) - afs? ( net-fs/openafs ) - avahi? ( net-dns/avahi ) - clarens? ( dev-libs/xmlrpc-c[curl] ) - emacs? ( virtual/emacs ) - fits? ( sci-libs/cfitsio ) - fftw? ( sci-libs/fftw:3.0 ) - graphviz? ( media-gfx/graphviz ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) ) - mysql? ( virtual/mysql ) - odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql-base ) - pythia6? ( sci-physics/pythia:6 ) - pythia8? ( =sci-physics/pythia-8.1.80:8 ) + python? ( ${PYTHON_DEPS} ) + ruby? ( + dev-lang/ruby + dev-ruby/rubygems ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( dev-libs/openssl ) + xml? ( dev-libs/libxml2 ) + xrootd? ( >=net-libs/xrootd-3.2.0 ) + )" DEPEND="${CDEPEND} virtual/pkgconfig" @@ -105,11 +122,6 @@ RDEPEND="${CDEPEND} PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )" -REQUIRED_USE=" - !X? ( !opengl !qt4 !xft ) - mpi? ( math !openmp ) - openmp? ( math !mpi )" - S="${WORKDIR}/${PN}" pkg_setup() { @@ -117,19 +129,20 @@ pkg_setup() { use python && python-single-r1_pkg_setup echo elog "There are extra options on packages not yet in Gentoo:" - elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus," + elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite," elog "HDFS, Monalisa, MaxDB/SapDB, SRP." elog "You can use the env variable EXTRA_ECONF variable for this." elog "For example, for SRP, you would set: " - elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\"" + elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\"" echo enewgroup rootd enewuser rootd -1 -1 /var/spool/rootd rootd + use minimal && return if use math; then if use openmp; then - if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then - ewarn "You are using a gcc without OpenMP capabilities" + if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then + ewarn "You are using a g++ without OpenMP capabilities" die "Need an OpenMP capable compiler" else export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1 @@ -138,31 +151,36 @@ pkg_setup() { export USE_MPI=1 USE_PARALLEL_MINUIT2=1 fi fi + if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \ + ! version_is_at_least "4.7" "$(gcc-version)"; then + eerror "You are using a g++ without C++0x capabilities" + die "Need an C++0x capable compiler" + fi } src_prepare() { epatch \ - "${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \ + "${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \ + "${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \ "${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \ + "${FILESDIR}"/${PN}-${PATCH_PV4}-unuran.patch \ "${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \ "${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \ "${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch + "${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch \ + "${FILESDIR}"/${PN}-${PATCH_PV4}-pythia8.patch \ + "${FILESDIR}"/${PN}-${PATCH_PV4}-desktop.patch # make sure we use system libs and headers rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die - rm -rf graf2d/asimage/src/libAfterImage || die - rm -rf graf3d/ftgl/{inc,src} || die - rm -rf graf2d/freetype/src || die - rm -rf graf3d/glew/{inc,src} || die - rm -rf core/pcre/src || die - rm -rf math/unuran/src/unuran-*.tar.gz || die + rm -r graf2d/asimage/src/libAfterImage || die + rm -r graf3d/ftgl/{inc,src} || die + rm -r graf2d/freetype/src || die + rm -r graf3d/glew/{inc,src} || die + rm -r core/pcre/src || die + rm -r math/unuran/src/unuran-*.tar.gz || die LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die - rm -rf core/lzma/src/*.tar.gz || die + rm -r core/lzma/src/*.tar.gz || die rm graf3d/gl/{inc,src}/gl2ps.* || die sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die @@ -186,7 +204,7 @@ src_prepare() { unset QTDIR # Make html docs self-consistent for offline work (based on Fedora spec) - if use htmldoc; then + if use htmldoc && ! use minimal; then epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch # make images local sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \ @@ -203,7 +221,7 @@ src_prepare() { src_configure() { # the configure script is not the standard autotools - ./configure \ + local mycommonconf=" --prefix="${EPREFIX}"/usr \ --etcdir="${EPREFIX}"/etc/root \ --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \ @@ -214,18 +232,29 @@ src_configure() { --with-cxx=$(tc-getCXX) \ --with-f77=$(tc-getFC) \ --with-ld=$(tc-getCXX) \ + --nohowto + " + if use minimal; then + ./configure \ + ${mycommonconf} \ + $(usex X --gminimal --minimal) \ + || die "configure failed" + return + fi + # cling is disabled because in requires live llvm and clang + ./configure \ + ${mycommonconf} \ --with-afs-shared=yes \ --with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \ --disable-builtin-afterimage \ - --disable-builtin-freetype \ --disable-builtin-ftgl \ + --disable-builtin-freetype \ --disable-builtin-glew \ --disable-builtin-pcre \ --disable-builtin-zlib \ --disable-builtin-lzma \ --disable-cling \ --enable-astiff \ - --enable-exceptions \ --enable-explicitlink \ --enable-gdml \ --enable-memstat \ @@ -236,10 +265,10 @@ src_configure() { --fail-on-missing \ $(use_enable X x11) \ $(use_enable X asimage) \ + $(use_enable X xft) \ $(use_enable afs) \ $(use_enable avahi bonjour) \ - $(use_enable clarens) \ - $(use_enable clarens peac) \ + $(use_enable c++0x cxx11) \ $(use_enable fits fitsio) \ $(use_enable fftw fftw3) \ $(use_enable graphviz gviz) \ @@ -255,7 +284,9 @@ src_configure() { $(use_enable mysql) \ $(use_enable odbc) \ $(use_enable opengl) \ + $(use_enable oracle) \ $(use_enable postgres pgsql) \ + $(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "") \ $(use_enable prefix rpath) \ $(use_enable pythia6) \ $(use_enable pythia8) \ @@ -265,8 +296,8 @@ src_configure() { $(use_enable reflex cintex) \ $(use_enable reflex) \ $(use_enable ruby) \ + $(use_enable sqlite) \ $(use_enable ssl) \ - $(use_enable xft) \ $(use_enable xml) \ $(use_enable xrootd) \ ${EXTRA_ECONF} \ @@ -274,28 +305,29 @@ src_configure() { } src_compile() { - emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" - if use emacs; then + emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib" + if use emacs && ! use minimal; then elisp-compile build/misc/*.el || die "elisp-compile failed" fi } doc_install() { cd "${S}" - if use doc; then + if use doc && ! use minimal; then einfo "Installing user's guides" - dodoc "${DISTDIR}"/ROOTUsersGuide.pdf + use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \ + dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf use math && dodoc \ "${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \ "${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf fi - if use examples; then + if use examples && ! use minimal; then # these should really be taken care of by the root make install insinto /usr/share/doc/${PF}/examples/tutorials/tmva doins -r tmva/test else - rm -rf "${ED}"/usr/share/doc/${PF}/examples || die + rm -r "${ED}"/usr/share/doc/${PF}/examples || die fi } @@ -319,10 +351,9 @@ daemon_install() { desktop_install() { cd "${S}" - sed -e 's,@prefix@,/usr,' \ - build/package/debian/root-system-bin.desktop.in > root.desktop - domenu root.desktop - doicon "${S}"/build/package/debian/root-system-bin.png + echo "Icon=root-system-bin" >> etc/root.desktop + domenu etc/root.desktop + doicon build/package/debian/root-system-bin.png insinto /usr/share/icons/hicolor/48x48/mimetypes doins build/package/debian/application-x-root.png @@ -335,18 +366,20 @@ src_install() { emake DESTDIR="${D}" install echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root - use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root - if use python; then - echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root - python_optimize /usr/$(get_libdir)/root + if ! use minimal; then + use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root + if use python; then + echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root + python_optimize "${D}/usr/$(get_libdir)/root" + fi + use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root fi - use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root doenvd 99root # The build system installs Emacs support unconditionally and in the wrong # directory. Remove it and call elisp-install in case of USE=emacs. - rm -rf "${ED}"/usr/share/emacs - if use emacs; then + rm -r "${ED}"/usr/share/emacs + if use emacs && ! use minimal; then elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed" fi @@ -358,11 +391,11 @@ src_install() { rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die rm "${ED}"usr/share/root/fonts/LICENSE || die pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null - rm -f posix/mktypes dll_stl/setup \ + rm posix/mktypes dll_stl/setup \ G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die - rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die - rm -f "${ED}"/etc/root/proof/*.sample || die - rm -rf "${ED}"/etc/root/daemons || die + rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die + rm "${ED}"/etc/root/proof/*.sample || die + rm -r "${ED}"/etc/root/daemons || die popd > /dev/null # these should be in PATH mv "${ED}"etc/root/proof/utils/pq2/pq2* \