aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gmail.com>2013-01-22 02:31:03 +0400
committerAndrew Savchenko <bircoph@gmail.com>2013-01-22 02:31:03 +0400
commit21d42709772f069ee251b1b82d412f727b77c63f (patch)
treede36d74c7011f82fc2a3fc910f1fe8fb6c37b40d /sci-physics
parentsci-chemistry/gromacs: use cuda.eclass (diff)
downloadsci-21d42709772f069ee251b1b82d412f727b77c63f.tar.gz
sci-21d42709772f069ee251b1b82d412f727b77c63f.tar.bz2
sci-21d42709772f069ee251b1b82d412f727b77c63f.zip
Fix bug 452806
Honor system *FLAGS for all build objects. Remove old version and old patches.
Diffstat (limited to 'sci-physics')
-rw-r--r--sci-physics/root/ChangeLog12
-rw-r--r--sci-physics/root/Manifest1
-rw-r--r--sci-physics/root/files/root-5.28.00b-asneeded.patch20
-rw-r--r--sci-physics/root/files/root-5.28.00b-nobyte-compile.patch138
-rw-r--r--sci-physics/root/files/root-5.28.00b-prop-ldflags.patch13
-rw-r--r--sci-physics/root/files/root-5.32.00-explicit-functions.patch18
-rw-r--r--sci-physics/root/files/root-5.32.00-prop-flags.patch15
-rw-r--r--sci-physics/root/metadata.xml1
-rw-r--r--sci-physics/root/root-5.32.04.ebuild378
-rw-r--r--sci-physics/root/root-5.34.03.ebuild6
-rw-r--r--sci-physics/root/root-9999.ebuild4
11 files changed, 31 insertions, 575 deletions
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index f0d539426..ee4803a3f 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,7 +1,17 @@
# ChangeLog for sci-physics/root
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# 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 $
+ 21 Jan 2013; Andrew Savchenko <bircoph@gmail.com>
+ -files/root-5.28.00b-asneeded.patch,
+ -files/root-5.28.00b-nobyte-compile.patch,
+ -files/root-5.28.00b-prop-ldflags.patch,
+ -files/root-5.32.00-explicit-functions.patch,
+ +files/root-5.32.00-prop-flags.patch, -root-5.32.04.ebuild,
+ root-5.34.03.ebuild, root-9999.ebuild:
+ Honor system *FLAGS, this fixes bug 452806.
+ Remove old versions.
+
28 Oct 2012; Andrew Savchenko <bircoph@gmail.com>
-files/root-5.28.00h-explicit-functions.patch:
Remove unused patch.
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 830806da9..8ca275691 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -4,6 +4,5 @@ DIST RooFit_Users_Manual_2.91-33.pdf 1330062 SHA256 101c4e4c41962238fcabf1caa86c
DIST TMVAUsersGuide-v4.03.pdf 3913533 SHA256 0cdbb4a2d19eb7a86e2911cfa73a905932e862d6c94be10b7662a9355b0241af SHA512 d8bb2ce35ef32c4877059898f56513db0b1057924e21935a3d3a6f114748e167984c43fd2ec7e54197fccff875540543968fea9a8e75bf63f5f13521724a7ddb WHIRLPOOL 0a3e2e61e8e32f3a22757178adf033f9fbb89014aecd4df7f8bd49677d772bb3ad2c0f5526259611879f6bb20df647c01e23f53ade483d7a3e2242f8aee6c6aa
DIST info.png 2060 SHA256 51de6661250f3fb71c6c8250cbc4bdc4dc4283cc90240b4dc1ee6168e8d40279 SHA512 81a730eefbe7a7e15d5840491402c7644bf7ed5d5f8f3830ed9457b343cc7882480e993ea84aef93500742cd0fe8469859cd2c925e5582b91ef56406804ae276 WHIRLPOOL 02ea6daf9e3d21947ebf5dd01c455a13f2fcbf9981be34a150056a3510122ca49e3d137d4f242c7218d4d06ace09566d513a04f09071723ac244f5a38e982bac
DIST root-banner.png 132555 SHA256 d165e1cc175f654ff79af39193a6144678f600e14a53dd20e2b216b3e8951e94 SHA512 139347f396e88c8062d847d612949204cb80e551a826d926950ca8ab967f0d496487fed17a227fc796ae4db23fca758d91a0af7943142adbed358e98d7667b1f WHIRLPOOL dd23e26acf9303b404cda8135d6946af3b1abba3dfdff8d80e56096f810d50a01ebfb52dc1e6ee1d1b99fbb5859dc850e0e368155339b5007294d95ce8909857
-DIST root_v5.32.04.source.tar.gz 55526502 SHA256 0c0130ba3d74b86caee3071deeceb46545cfde34def8ad2107601e133506acf2 SHA512 796d7f6fe92700232da3fcaac042438e13c13e504179a7375105b2ff06e1fac571ef4d59f270d73844b2a481b0762a873985d22eee2b1a0b156071b777d4417a WHIRLPOOL c5ce0f81331e08b3f79e97c894bff60185bba562388e789d3d1716d3523045a55c24e1cebded4ad19a09023c4b5275fd7d44acb726a1f248a9616ed95addd609
DIST root_v5.34.03.source.tar.gz 56290003 SHA256 4ce18154f507fcdd8d580b776568d4b87004756d7d17f86796fcba0b2499a1a1 SHA512 522dbcb0ddcc3030f440939e8e5849e0b33ae4e4f7a0de3dd213404e8a9801954ef40a06ef9c206b62be8997d7eec2da72e1b0f1bbfd9fa99683961b99540e4b WHIRLPOOL 5f1bb9900b4a6238e51bc67be935f8a4cfa4455a0b4ef601e11f9235a17f918aa350169ae2eecbdb4f74af6badcd61a5bc3a4d16dce913e32277a458e55cc7ae
DIST rootdrawing-logo.png 15051 SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc7d155944a8e27284af83a6b SHA512 14aa13ebfed3c9412d7d7d04c250740b25fe3af6bcb07e618045a5cec2dc23698a251fd7df2db1a6c37331084db99b029b387ea81c25ac825fc7ae10ad164a68 WHIRLPOOL 877a959a5aead73ba69dbb805c9869cbd6a047ea476bd4e7fef80781563a61d20dad49dd4d8b0005bfc58e8f7c7d38efbb3e085a95974feb81dfc9e339c18741
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 b845247e1..000000000
--- 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 <<EOF > 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 <<EOF > 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-nobyte-compile.patch b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
deleted file mode 100644
index 7029bf169..000000000
--- a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur root.orig/Makefile root/Makefile
---- root.orig/Makefile 2010-12-17 22:48:40.577775091 +0300
-+++ root/Makefile 2010-12-17 22:49:27.902497903 +0300
-@@ -1148,10 +1148,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.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.orig/bindings/pyroot/Module.mk 2010-12-17 22:48:39.941179413 +0300
-+++ root/bindings/pyroot/Module.mk 2010-12-17 22:49:27.899164943 +0300
-@@ -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.orig/build/package/debian/rules root/build/package/debian/rules
---- root.orig/build/package/debian/rules 2010-12-17 22:48:40.197817461 +0300
-+++ root/build/package/debian/rules 2010-12-17 22:49:27.902497903 +0300
-@@ -623,10 +623,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
- # $(foreach i, \
- # $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
- # -X$(i:$(DTMP)/%=%) )
-diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.orig/cint/cintex/Module.mk 2010-12-17 22:48:40.057833071 +0300
-+++ root/cint/cintex/Module.mk 2010-12-17 22:49:27.902497903 +0300
-@@ -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.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.orig/cint/reflex/Module.mk 2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/Module.mk 2010-12-17 22:51:36.871451359 +0300
-@@ -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.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.orig/cint/reflex/python/CMakeLists.txt 2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/python/CMakeLists.txt 2010-12-17 22:49:27.902497903 +0300
-@@ -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.28.00b-prop-ldflags.patch b/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch
deleted file mode 100644
index 732431943..000000000
--- 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 570d61e68..000000000
--- 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-prop-flags.patch b/sci-physics/root/files/root-5.32.00-prop-flags.patch
new file mode 100644
index 000000000..7dfeb1cc3
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-prop-flags.patch
@@ -0,0 +1,15 @@
+--- root/config/Makefile.in.orig 2013-01-21 22:04:43.011452938 +0400
++++ root/config/Makefile.in 2013-01-21 22:04:18.027352209 +0400
+@@ -25,9 +25,9 @@
+ USECONFIG := @useconfig@
+ MKLIBOPTIONS := @mkliboption@
+
+-EXTRA_CFLAGS := -Iinclude @cflags@
+-EXTRA_CXXFLAGS := -Iinclude @cflags@
+-EXTRA_LDFLAGS := @ldflags@
++EXTRA_CFLAGS := -Iinclude @cflags@ $(CFLAGS)
++EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS)
++EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS)
+ WINRTDEBUG := @winrtdebug@
+
+ GLBPATCHFLAGS := @glbpatchcflags@
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 94d70a356..86b00d1f2 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -17,7 +17,6 @@
</longdescription>
<use>
<flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>&gt;=4.7.0</flag>
- <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
<flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
<flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
<flag name="htmldoc">Generate html documentation</flag>
diff --git a/sci-physics/root/root-5.32.04.ebuild b/sci-physics/root/root-5.32.04.ebuild
deleted file mode 100644
index 1e6d66388..000000000
--- a/sci-physics/root/root-5.32.04.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.03-r2.ebuild,v 1.5 2012/10/16 18:50:45 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
-
-if [[ ${PV} == "9999" ]] ; then
- _SVN=subversion
- ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk"
- ESVN_OPTIONS="--non-interactive --trust-server-cert"
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
-
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4.03
-PATCH_PV=5.28.00b
-PATCH_PV2=5.32.00
-
-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
- 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 )
- 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 ) )"
-
-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"
-
-CDEPEND="
- app-arch/xz-utils
- >=dev-lang/cfortran-4.4-r2
- dev-libs/libpcre
- media-fonts/dejavu
- media-libs/freetype
- media-libs/giflib
- media-libs/libpng:0
- media-libs/tiff:0
- sys-libs/zlib
- virtual/jpeg
- virtual/shadow
- X? (
- media-libs/ftgl
- media-libs/glew
- 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? (
- x11-libs/qt-gui:4
- x11-libs/qt-opengl:4
- x11-libs/qt-qt3support:4
- x11-libs/qt-svg:4
- x11-libs/qt-webkit:4
- x11-libs/qt-xmlpatterns:4 )
- xft? ( 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 )
- ruby? (
- dev-lang/ruby
- dev-ruby/rubygems )
- ssl? ( dev-libs/openssl )
- xml? ( dev-libs/libxml2 )
- xrootd? ( net-libs/xrootd )"
-
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
- reflex? ( dev-cpp/gccxml )
- xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )"
-
-REQUIRED_USE="
- !X? ( !opengl !qt4 !xft )
- mpi? ( math !openmp )
- openmp? ( math !mpi )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
- fortran-2_pkg_setup
- python_pkg_setup
- echo
- elog "There are extra options on packages not yet in Gentoo:"
- elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
- 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)\""
- echo
- enewgroup rootd
- enewuser rootd -1 -1 /var/spool/rootd rootd
-
- 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"
- die "Need an OpenMP capable compiler"
- else
- export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
- fi
- elif use mpi; then
- export USE_MPI=1 USE_PARALLEL_MINUIT2=1
- fi
- 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_PV}-glibc212.patch \
- "${FILESDIR}"/${PN}-${PATCH_PV}-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
-
- # 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
- 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 graf3d/gl/{inc,src}/gl2ps.* || die
- sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
-
- # In Gentoo, libPythia6 is called libpythia6
- # libungif is called libgif,
- # iodbc is in /usr/include/iodbc
- # pg_config.h is checked instead of libpq-fe.h
- sed -i \
- -e 's:libPythia6:libpythia6:g' \
- -e 's:ungif:gif:g' \
- -e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
- -e 's:libpq-fe.h:pg_config.h:' \
- configure || die "adjusting configure for Gentoo failed"
-
- # prefixify the configure script
- sed -i \
- -e 's:/usr:${EPREFIX}/usr:g' \
- configure || die "prefixify configure failed"
-
- # QTDIR only used for qt3 in gentoo, and configure looks for it.
- unset QTDIR
-
- # Make html docs self-consistent for offline work (based on Fedora spec)
- if use htmldoc; then
- epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch
- # make images local
- sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \
- -i etc/html/ROOT.css || die "htmldoc sed failed"
- sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \
- -i etc/html/ROOT.css || die "htmldoc sed failed"
- sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \
- -i etc/html/header.html || die "htmldoc sed failed"
-
- cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html ||
- die "htmldoc preparation failed"
- fi
-}
-
-src_configure() {
- # the configure script is not the standard autotools
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --etcdir="${EPREFIX}"/etc/root \
- --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
- --testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
- --with-cc=$(tc-getCC) \
- --with-cxx=$(tc-getCXX) \
- --with-f77=$(tc-getFC) \
- --with-ld=$(tc-getCXX) \
- --with-afs-shared=yes \
- --with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
- --disable-builtin-afterimage \
- --disable-builtin-freetype \
- --disable-builtin-ftgl \
- --disable-builtin-glew \
- --disable-builtin-pcre \
- --disable-builtin-zlib \
- --disable-builtin-lzma \
- --disable-cling \
- --enable-astiff \
- --enable-exceptions \
- --enable-explicitlink \
- --enable-gdml \
- --enable-memstat \
- --enable-shadowpw \
- --enable-shared \
- --enable-soversion \
- --enable-table \
- --fail-on-missing \
- $(use_enable X x11) \
- $(use_enable X asimage) \
- $(use_enable afs) \
- $(use_enable avahi bonjour) \
- $(use_enable clarens) \
- $(use_enable clarens peac) \
- $(use_enable fits fitsio) \
- $(use_enable fftw fftw3) \
- $(use_enable graphviz gviz) \
- $(use_enable kerberos krb5) \
- $(use_enable ldap) \
- $(use_enable math gsl-shared) \
- $(use_enable math genvector) \
- $(use_enable math mathmore) \
- $(use_enable math minuit2) \
- $(use_enable math roofit) \
- $(use_enable math tmva) \
- $(use_enable math unuran) \
- $(use_enable mysql) \
- $(use_enable odbc) \
- $(use_enable opengl) \
- $(use_enable postgres pgsql) \
- $(use_enable prefix rpath) \
- $(use_enable pythia6) \
- $(use_enable pythia8) \
- $(use_enable python) \
- $(use_enable qt4 qt) \
- $(use_enable qt4 qtgsi) \
- $(use_enable reflex cintex) \
- $(use_enable reflex) \
- $(use_enable ruby) \
- $(use_enable ssl) \
- $(use_enable xft) \
- $(use_enable xml) \
- $(use_enable xrootd) \
- ${EXTRA_ECONF} \
- || die "configure failed"
-}
-
-src_compile() {
- emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}"
- if use emacs; then
- elisp-compile build/misc/*.el || die "elisp-compile failed"
- fi
-}
-
-doc_install() {
- cd "${S}"
- if use doc; then
- einfo "Installing user's guides"
- dodoc "${DISTDIR}"/ROOTUsersGuide.pdf
- use math && dodoc \
- "${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
- "${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
- fi
-
- if use examples; 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
- fi
-}
-
-daemon_install() {
- cd "${S}"
- local daemons="rootd proofd"
- dodir /var/spool/rootd
- fowners rootd:rootd /var/spool/rootd
- dodir /var/spool/rootd/{pub,tmp}
- fperms 1777 /var/spool/rootd/{pub,tmp}
-
- for i in ${daemons}; do
- newinitd "${FILESDIR}"/${i}.initd ${i}
- newconfd "${FILESDIR}"/${i}.confd ${i}
- done
- if use xinetd; then
- insinto /etc/xinetd
- doins etc/daemons/{rootd,proofd}.xinetd
- fi
-}
-
-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
-
- insinto /usr/share/icons/hicolor/48x48/mimetypes
- doins build/package/debian/application-x-root.png
-
- insinto /usr/share/icons/hicolor/48x48/apps
- doicon build/package/debian/root-system-bin.xpm
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
- use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
- use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
- 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
- elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
- fi
-
- doc_install
- daemon_install
- desktop_install
-
- # Cleanup of files either already distributed or unused on Gentoo
- 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 \
- 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
- popd > /dev/null
- # these should be in PATH
- mv "${ED}"etc/root/proof/utils/pq2/pq2* \
- "${ED}"usr/bin/ || die
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- use python && python_mod_optimize /usr/$(get_libdir)/root
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- use python && python_mod_cleanup /usr/$(get_libdir)/root
-}
diff --git a/sci-physics/root/root-5.34.03.ebuild b/sci-physics/root/root-5.34.03.ebuild
index 1ce0d9c07..f410d92e3 100644
--- a/sci-physics/root/root-5.34.03.ebuild
+++ b/sci-physics/root/root-5.34.03.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.01.ebuild,v 1.2 2012/10/16 18:50:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.03.ebuild,v 1.1 2012/10/26 15:40:47 bicatali Exp $
EAPI=4
@@ -148,7 +148,7 @@ pkg_setup() {
src_prepare() {
epatch \
- "${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+ "${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 9523e3aa2..c987a0329 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
@@ -148,7 +148,7 @@ pkg_setup() {
src_prepare() {
epatch \
- "${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+ "${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \
"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \