* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2015-09-26 8:45 Andrew Savchenko
0 siblings, 0 replies; 14+ messages in thread
From: Andrew Savchenko @ 2015-09-26 8:45 UTC (permalink / raw
To: gentoo-commits
commit: 0d851cd3d2df0cee4e1b9c7ca7c481fa2caceed4
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Sep 26 08:21:13 2015 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 08:44:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d851cd3
sci-physics/root: remove old version
Remove old and broken 5.32 branch with related patches and USE
flags.
sci-physics/root/Manifest | 7 -
.../root/files/root-5.28.00b-asneeded.patch | 20 --
.../root/files/root-5.28.00b-prop-ldflags.patch | 13 -
sci-physics/root/files/root-5.28.00b-unuran.patch | 39 ---
.../files/root-5.32.00-explicit-functions.patch | 18 -
sci-physics/root/files/root-5.32.00-htmldoc.patch | 12 -
.../root/files/root-5.32.00-nobyte-compile.patch | 137 --------
sci-physics/root/metadata.xml | 2 -
sci-physics/root/root-5.32.03-r2.ebuild | 378 ---------------------
9 files changed, 626 deletions(-)
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 65d6949..3bf0acc 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,10 +1,3 @@
-DIST ROOTUsersGuide.pdf 9124822 SHA256 70a96c4a2573dc0d320142f86993ecfda24caa755e910340a3014120f2997c8b SHA512 c3b4c18ef2e13968afdf67c6003249d4cfe6ea661fa32ce25127361bae7e3376a25cd3b11591292f3975bcd8105291aca52f2f6214c9fe45f4bd6e7e44d54b25 WHIRLPOOL 11256ba7837d17e5795cf71ac32db43d7d8f797bfbddf5f71612fe2f8fb2e01354372c0ea8f0bc22868881eb0bfdc8a3e3f1b05293d2750d293aa4d59217b2e6
-DIST RooFit_Users_Manual_2.91-33.pdf 1330062 SHA256 101c4e4c41962238fcabf1caa86cafc51241a1800594491b2e62ef8b565a5646 SHA512 732d7dea3541b51e5f0b9b5b70dae57e1bdbb2504c4222d5e5095ec0f9b67307011c1f31c2c95be419b53dd8426f52f62f6c9370084208176a2ed3d7f25d783b WHIRLPOOL 033897bef4bdb13246a81ea6749f7895e6c4d639752e932130234ad9153bb399a4e5d416237850da27f139d3cccc53d9adb7a077abf20d257ce057157d6c3696
-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.03.source.tar.gz 55529362 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6 SHA512 2e067eb9c6bbda5cf4df6973a3cf5307540247fb07c349f7ee74c0cf6a4abbb63f585a9ff67139cae985250fc5c5106b5ea03d7d9d2bcd20269e0ec8760ebd02 WHIRLPOOL 87dbf6f55f82001e07afc3b467e95f841f185f1f67d1dbd953f73e8aa9127ef8485db84100d6e9a08f0ae6aa5b45a565398eb6723145fff16c07e5158bb3e3ab
DIST root_v5.34.26.source.tar.gz 75171961 SHA256 c1fd2a249bb7210914b42e35dba4f1262cfa46b79ef7a41f73d7f08f8c54a643 SHA512 f5da5e20d1763608a32d78c48581e574a3f51aef47ecf6987a4064d1fb3234dfc9f626e041a17213f881f52f807ed6a6da60bf1d24951fa7dc2cadd94f8dd8b4 WHIRLPOOL 77b48b815c971642da68b71732a0ea3372648634281be634037b13cb58488f7075ec8bfc9a684e55d85cd9b038f229be29b19a15dfc829f0ce63a5f17241c23c
DIST root_v5.34.32.source.tar.gz 75170203 SHA256 939c7592802a54b6cbc593efb6e51699bf52e92baf6d6b20f486aaa08480fc5f SHA512 6485f2bb544947173e1feb2cfb41d6a176020027f1193d9388700a797ba4badbf497022e6129fdc4879e709460bf1efabf3e51c51840f0c781fa12e631419afc WHIRLPOOL 695147a519415b99e73fdad1cd61bb1944e292628236b5a7cbf1835174c950fa9cb068431a8164f24663323163012ea652db84d082f9f1eb1fcae79489575d9e
DIST root_v6.02.05.source.tar.gz 99121880 SHA256 7a5d4af171ba3b8a736c462b2041f8f35bd4c1d3b6a22c32a3ebd3ffe144ae60 SHA512 b30bc4aafe294ee069ee4c884ff70c983539a48eda586cd1938d00d4688f10e94a435640965b89c6d100fdd998453a4c1ae2109d5f1427f23865a868c561d684 WHIRLPOOL de363835fa00ffa0ff6e596b3c92b59ed59378bac3a344c066f7603d6104058203f76181d4c15478fd9066aedbe6a514257d5796feedb2d5d0d789b263e92955
-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 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 <<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-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.28.00b-unuran.patch b/sci-physics/root/files/root-5.28.00b-unuran.patch
deleted file mode 100644
index 76422da..0000000
--- a/sci-physics/root/files/root-5.28.00b-unuran.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur root-trunk.orig/math/unuran/Module.mk root-trunk/math/unuran/Module.mk
---- root.orig/math/unuran/Module.mk 2010-11-25 20:41:32.000000000 +0100
-+++ root/math/unuran/Module.mk 2010-11-25 20:51:47.190704977 +0100
-@@ -20,7 +20,7 @@
- UNURANETAG := $(call stripsrc,$(UNURANDIRS)/headers.d)
- UNRCFG := $(call stripsrc,$(UNURANDIRS)/$(UNRVERS)/config.h)
-
--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)) \
-@@ -69,10 +69,9 @@
- ##### 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)
-@@ -125,12 +124,12 @@
- 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/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-htmldoc.patch b/sci-physics/root/files/root-5.32.00-htmldoc.patch
deleted file mode 100644
index 3b80b39..0000000
--- a/sci-physics/root/files/root-5.32.00-htmldoc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- root/html/src/THtml.cxx.orig 2012-05-25 16:18:10.000000000 +0400
-+++ root/html/src/THtml.cxx 2012-05-29 19:22:40.810563296 +0400
-@@ -1913,6 +1913,9 @@
- void THtml::CreateStyleSheet() const {
- // Write the default ROOT style sheet.
- CopyFileFromEtcDir("ROOT.css");
-+ CopyFileFromEtcDir("info.png");
-+ CopyFileFromEtcDir("root-banner.png");
-+ CopyFileFromEtcDir("rootdrawing-logo.png");
- CopyFileFromEtcDir("shadowAlpha.png");
- CopyFileFromEtcDir("shadow.gif");
- }
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/metadata.xml b/sci-physics/root/metadata.xml
index 2d5f75a..86bcf98 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -17,11 +17,9 @@
<use>
<flag name="c++11"> Build ROOT using the C++11 standard</flag>
<flag name="c++14"> Build ROOT using the C++14 standard</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="gdml">Enable GDML writer and reader</flag>
<flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
- <flag name="htmldoc">Generate html documentation</flag>
<flag name="http">Enable http server support including but not limited to fastcgi support</flag>
<flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
<flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag>
diff --git a/sci-physics/root/root-5.32.03-r2.ebuild b/sci-physics/root/root-5.32.03-r2.ebuild
deleted file mode 100644
index 7b03c47..0000000
--- a/sci-physics/root/root-5.32.03-r2.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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? (
- 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 )
- )
- 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 )
- 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
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2015-10-29 10:44 Justin Lecher
0 siblings, 0 replies; 14+ messages in thread
From: Justin Lecher @ 2015-10-29 10:44 UTC (permalink / raw
To: gentoo-commits
commit: 208527d690e4939ef3f6ed5fa1e031672d982cf5
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 10:43:47 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 10:43:59 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=208527d6
sci-physics/root: Version Bump
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-physics/root/Manifest | 1 +
.../root/files/root-6.04.06-prop-flags.patch | 22 +
sci-physics/root/metadata.xml | 45 +-
sci-physics/root/root-6.04.06.ebuild | 489 +++++++++++++++++++++
4 files changed, 535 insertions(+), 22 deletions(-)
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 3bf0acc..2104a38 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,3 +1,4 @@
DIST root_v5.34.26.source.tar.gz 75171961 SHA256 c1fd2a249bb7210914b42e35dba4f1262cfa46b79ef7a41f73d7f08f8c54a643 SHA512 f5da5e20d1763608a32d78c48581e574a3f51aef47ecf6987a4064d1fb3234dfc9f626e041a17213f881f52f807ed6a6da60bf1d24951fa7dc2cadd94f8dd8b4 WHIRLPOOL 77b48b815c971642da68b71732a0ea3372648634281be634037b13cb58488f7075ec8bfc9a684e55d85cd9b038f229be29b19a15dfc829f0ce63a5f17241c23c
DIST root_v5.34.32.source.tar.gz 75170203 SHA256 939c7592802a54b6cbc593efb6e51699bf52e92baf6d6b20f486aaa08480fc5f SHA512 6485f2bb544947173e1feb2cfb41d6a176020027f1193d9388700a797ba4badbf497022e6129fdc4879e709460bf1efabf3e51c51840f0c781fa12e631419afc WHIRLPOOL 695147a519415b99e73fdad1cd61bb1944e292628236b5a7cbf1835174c950fa9cb068431a8164f24663323163012ea652db84d082f9f1eb1fcae79489575d9e
DIST root_v6.02.05.source.tar.gz 99121880 SHA256 7a5d4af171ba3b8a736c462b2041f8f35bd4c1d3b6a22c32a3ebd3ffe144ae60 SHA512 b30bc4aafe294ee069ee4c884ff70c983539a48eda586cd1938d00d4688f10e94a435640965b89c6d100fdd998453a4c1ae2109d5f1427f23865a868c561d684 WHIRLPOOL de363835fa00ffa0ff6e596b3c92b59ed59378bac3a344c066f7603d6104058203f76181d4c15478fd9066aedbe6a514257d5796feedb2d5d0d789b263e92955
+DIST root_v6.04.06.source.tar.gz 99180724 SHA256 6deac9cd71fe2d7a48ea2bcbd793639222c4743275dbc946c158295b1e1fe330 SHA512 ac96ac998ed4894587b7d286d79bcbea7b33f15764cc2513ae089e86c584e2dcb064cd135d44a4bfd2bede368eb772ccbffcd6bf426857a1236f5d7e9f5ce6fd WHIRLPOOL 7ffca036917d798ade31e1a22e9518d567e4267af5d1db555ea0e82c1bc2c7a1f665c8cd76d3ce6511507ab7befea4881580259c6142f1e668edafbcbc5e496e
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
new file mode 100644
index 0000000..90db15e
--- /dev/null
+++ b/sci-physics/root/files/root-6.04.06-prop-flags.patch
@@ -0,0 +1,22 @@
+ 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/metadata.xml b/sci-physics/root/metadata.xml
index 86bcf98..d8e9e6f 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
-</maintainer>
-<herd>sci-physics</herd>
-<longdescription lang="en">
+ <maintainer>
+ <email>bircoph@gentoo.org</email>
+ <name>Andrew Savchenko</name>
+ </maintainer>
+ <herd>sci-physics</herd>
+ <longdescription lang="en">
ROOT Object Oriented Technologies is an object oriented data
analysis framework written in C++ by the CERN. Widely used in
high energy physics, but also in other data analysis applications. It
@@ -14,20 +14,21 @@
statistics, serialization, optimization, linear algebra, graphics,
GUI toolkit, and a complete visualization framework.
</longdescription>
-<use>
- <flag name="c++11"> Build ROOT using the C++11 standard</flag>
- <flag name="c++14"> Build ROOT using the C++14 standard</flag>
- <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
- <flag name="gdml">Enable GDML writer and reader</flag>
- <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
- <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
- <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
- <flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag>
- <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
- <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
- <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
- <flag name="shadow">Enable shadow authentication in rootd and proofd</flag>
- <flag name="table">Build libTable contrib library</flag>
- <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
-</use>
+ <use>
+ <flag name="c++11"> Build ROOT using the C++11 standard</flag>
+ <flag name="c++14"> Build ROOT using the C++14 standard</flag>
+ <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+ <flag name="gdml">Enable GDML writer and reader</flag>
+ <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
+ <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
+ <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
+ <flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag>
+ <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
+ <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
+ <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
+ <flag name="shadow">Enable shadow authentication in rootd and proofd</flag>
+ <flag name="table">Build libTable contrib library</flag>
+ <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
+ <flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag>
+ </use>
</pkgmetadata>
diff --git a/sci-physics/root/root-6.04.06.ebuild b/sci-physics/root/root-6.04.06.ebuild
new file mode 100644
index 0000000..1ccb466
--- /dev/null
+++ b/sci-physics/root/root-6.04.06.ebuild
@@ -0,0 +1,489 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \
+ toolchain-funcs user versionator
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
+DOC_URI="ftp://root.cern.ch/${PN}/doc"
+
+SLOT="0/$(get_version_component_range 1-3 ${PV})"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+X afs avahi doc emacs examples fits fftw gdml geocad
+ graphviz http kerberos ldap +math +memstat mpi mysql odbc
+ +opengl openmp oracle postgres prefix pythia6 pythia8
+ python qt4 R shadow sqlite ssl table +tiff xinetd xml xrootd"
+
+# TODO: add support for: davix
+# TODO: ROOT-6 supports x32 ABI, but half of its dependencies doesn't
+# TODO: unbundle: cling, vdt
+
+REQUIRED_USE="
+ !X? ( !opengl !qt4 !tiff )
+ mpi? ( math !openmp )
+ openmp? ( math !mpi )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+CDEPEND="
+ app-arch/xz-utils:0=
+ >=dev-lang/cfortran-4.4-r2
+ dev-libs/libpcre:3=
+ media-fonts/dejavu
+ media-libs/freetype:2=
+ media-libs/libpng:0=
+ >=sys-devel/clang-3.4:=
+ sys-libs/ncurses:=
+ sys-libs/zlib:0=
+ X? (
+ media-libs/ftgl:0=
+ media-libs/glew:0=
+ x11-libs/libX11:0=
+ x11-libs/libXext:0=
+ x11-libs/libXpm:0=
+ || (
+ media-libs/libafterimage:0=[gif,jpeg,png,tiff?]
+ >=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff?]
+ )
+ opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
+ 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:0=
+ )
+ afs? ( net-fs/openafs )
+ avahi? ( net-dns/avahi:0= )
+ emacs? ( virtual/emacs )
+ fits? ( sci-libs/cfitsio:0= )
+ fftw? ( sci-libs/fftw:3.0= )
+ geocad? ( <sci-libs/opencascade-6.8.0:= )
+ graphviz? ( media-gfx/graphviz:0= )
+ http? ( dev-libs/fcgi:0= )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap:0= )
+ math? (
+ sci-libs/gsl:0=
+ sci-mathematics/unuran:0=
+ mpi? ( virtual/mpi )
+ )
+ mysql? ( virtual/mysql )
+ odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
+ oracle? ( dev-db/oracle-instantclient-basic:0= )
+ postgres? ( dev-db/postgresql:= )
+ pythia6? ( sci-physics/pythia:6= )
+ pythia8? ( >=sci-physics/pythia-8.1.80:8= )
+ python? ( ${PYTHON_DEPS} )
+ R? ( dev-lang/R )
+ shadow? ( virtual/shadow )
+ sqlite? ( dev-db/sqlite:3= )
+ ssl? ( dev-libs/openssl:0= )
+ xml? ( dev-libs/libxml2:2= )
+ xrootd? ( >=net-libs/xrootd-3.3.5:0= )
+"
+
+# TODO: ruby is not yet ported to ROOT-6, reenable when (if?) ready
+# ruby? (
+# dev-lang/ruby:=
+# dev-ruby/rubygems:=
+# )
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+ xinetd? ( sys-apps/xinetd )"
+
+PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
+
+# install stuff in ${P} and not ${PF} for easier tracking in root-docs
+DOC_DIR="/usr/share/doc/${P}"
+
+OC_UNSUPPORTED="6.8.0"
+
+die_compiler() {
+ eerror "You are using a $(tc-getCXX)-$5 without C++$1 capabilities"
+ die "Need one of the following C++$1 capable compilers:\n"\
+ " >=sys-devel/gcc[cxx]-$2\n"\
+ " >=sys-devel/clang-$3\n"\
+ " >=dev-lang/icc-$4"
+}
+
+# check compiler to satisfy minimal versions
+# $1 - std version
+# $2 - g++
+# $3 - clang++
+# $4 - icc/icpc
+check_compiler() {
+ local ver
+ case "$(tc-getCXX)" in
+ *clang++*)
+ ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')"
+ ;;
+ *g++*)
+ ver="$(gcc-version)"
+ ;;
+ *icc*|*icpc*)
+ ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')"
+ eerror "ROOT-6 is known not to build with ICC."
+ eerror "Please report any isuses upstream."
+ ;;
+ *)
+ ewarn "You are using an unsupported compiler."
+ ewarn "Please report any issues upstream."
+ return 0
+ ;;
+ esac
+ version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
+}
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ use python && python-single-r1_pkg_setup
+ echo
+ elog "There are extra options on packages not yet in Gentoo:"
+ 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=${EROOT%/}/usr/$(get_libdir)\""
+ echo
+
+ enewgroup rootd
+ enewuser rootd -1 -1 /var/spool/rootd rootd
+
+ if use math; then
+ if use openmp; then
+ if [[ "$(tc-getCXX)" == *g++* && "$(tc-getCXX)" != *clang++* ]] && ! 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
+ fi
+ elif use mpi; then
+ export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+ fi
+ fi
+
+ # c++11 support is mandatory
+ check_compiler "11" "4.8" "3.4" "13"
+
+ # Active version of opencascade may be >= $OC_UNSUPPORTED,
+ # so we need to eselect proper version (it must exist due to DEPEND requirement)
+ if use geocad; then
+ oc_current=$(eselect opencascade show)
+ # Proceed only if active version is unsupported
+ if version_is_at_least "${OC_UNSUPPORTED}" "${oc_current}"; then
+ local -a vlist
+ vlist=( $(version_sort $(eselect opencascade list | awk '/^ / { print $2 }')) )
+ local i
+ # search for higehr version < $OC_UNSUPPORTED
+ # list is sorted acsending, so loop backwards
+ for (( i=$(( ${#vlist[@]} -1 )); i>=0; i-- )); do
+ version_is_at_least "${OC_UNSUPPORTED}" "${vlist[i]}" || break
+ done
+ [[ $i == "-1" ]] && die "No suitable opencascade eselect slot is available (<${OC_UNSUPPORTED})"
+
+ einfo "Switching opencascade to supported slot: ${oc_current} -> ${vlist[i]}"
+ eselect opencascade set ${vlist[i]} > /dev/null || die "eselect opencascade set ${vlist[i]} failed!"
+ else
+ # forget it, effectively disabling eselect cleanup
+ unset oc_current
+ fi
+ fi
+}
+
+src_prepare() {
+ # Second version of makepch is required in order to generate
+ # PCH file appropriate for Gentoo include headers layout.
+ # This can be done only at install stage, when files are placed
+ # as appropriate. Premature modification of makepch.sh will
+ # broke build process, however.
+ #cp "etc/dictpch/makepch.sh" "etc/dictpch/makepch-gentoo.sh" || die
+
+ epatch \
+ "${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
+ "${FILESDIR}"/${PN}-5.32.00-afs.patch \
+ "${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
+ "${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
+ "${FILESDIR}"/${PN}-5.34.13-unuran.patch \
+ "${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
+ "${FILESDIR}"/${PN}-6.00.01-llvm.patch \
+ "${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
+ "${FILESDIR}"/${P}-prop-flags.patch
+ # "${FILESDIR}"/${PN}-6.02.05-xrootd4.patch
+ # "${FILESDIR}"/${PN}-6.02.05-dictpch.patch \
+
+ # make sure we use system libs and headers
+ rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || 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 || 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
+
+ # In Gentoo, libPythia6 is called libpythia6
+ # 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:$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"
+
+ # CSS should use local images
+ sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+
+ # QTDIR only used for qt3 in gentoo, and configure looks for it.
+ unset QTDIR
+}
+
+# NB: ROOT uses bundled LLVM, because it is patched and API-incompatible with
+# system LLVM.
+# NB: As of 6.00.0.1 cmake is not ready as it can't fully replace configure,
+# e.g. for afs and geocad.
+
+src_configure() {
+ local -a myconf
+ # Some compilers need special care
+ case "$(tc-getCXX)" in
+ *clang++*)
+ myconf=(
+ --with-clang
+ --with-f77="$(tc-getFC)"
+ )
+ ;;
+ *icc*|*icpc*)
+ # For icc we need to provide architecture manually
+ # and not to tamper with tc-get*
+ use x86 && myconf=( linuxicc )
+ use amd64 && myconf=( linuxx8664icc )
+ ;;
+ *) # gcc goes here too
+ myconf=(
+ --with-cc="$(tc-getCC)"
+ --with-cxx="$(tc-getCXX)"
+ --with-f77="$(tc-getFC)"
+ --with-ld="$(tc-getCXX)"
+ )
+ ;;
+ esac
+
+ # the configure script is not the standard autotools
+ myconf+=(
+ --prefix="${EPREFIX}/usr"
+ --etcdir="${EPREFIX}/etc/root"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/${PN}"
+ --docdir="${EPREFIX}${DOC_DIR}"
+ --tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials"
+ --testdir="${EPREFIX}${DOC_DIR}/examples/tests"
+ --disable-builtin-afterimage
+ --disable-builtin-ftgl
+ --disable-builtin-freetype
+ --disable-builtin-glew
+ --disable-builtin-lzma
+ --disable-builtin-pcre
+ --disable-builtin-zlib
+ --disable-werror
+ --enable-explicitlink
+ --enable-shared
+ --enable-soversion
+ --fail-on-missing
+ --nohowto
+ --with-afs-shared=yes
+ --with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
+ # Invalid option '-mtune=native'. Try ./configure --help
+ # --cflags=\"${CFLAGS}\"
+ # --cxxflags=\"${CXXFLAGS}\"
+ $(use_enable X x11)
+ $(use_enable X asimage)
+ $(use_enable X xft)
+ $(use_enable afs)
+ $(use_enable avahi bonjour)
+ $(use_enable fits fitsio)
+ $(use_enable fftw fftw3)
+ $(use_enable gdml)
+ $(use_enable geocad)
+ $(use_enable graphviz gviz)
+ $(use_enable http)
+ $(use_enable kerberos krb5)
+ $(use_enable ldap)
+ $(use_enable math genvector)
+ $(use_enable math gsl-shared)
+ $(use_enable math mathmore)
+ $(use_enable math minuit2)
+ $(use_enable math roofit)
+ $(use_enable math tmva)
+ $(use_enable math vc)
+ $(use_enable math vdt)
+ $(use_enable math unuran)
+ $(use_enable memstat)
+ $(use_enable mysql)
+ $(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
+ $(use_enable odbc)
+ $(use_enable opengl)
+ $(use_enable oracle)
+ $(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 R r)
+ $(use_enable shadow shadowpw)
+ $(use_enable sqlite)
+ $(use_enable ssl)
+ $(use_enable table)
+ $(use_enable tiff astiff)
+ $(use_enable xml)
+ $(use_enable xrootd)
+ ${EXTRA_ECONF}
+ )
+
+ # usex can't be used here, because pg_config may be not
+ # installed with USE="-postgres"
+ use postgres && myconf+=( --with-pgsql-incdir=$(pg_config --includedir) )
+
+ einfo "Configuring with ${myconf[@]}"
+ ./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+ emake \
+ OPT="${CXXFLAGS}" \
+ F77OPT="${FFLAGS}" \
+ ROOTSYS="${S}" \
+ LD_LIBRARY_PATH="${S}/lib"
+ use emacs && elisp-compile build/misc/*.el
+}
+
+daemon_install() {
+ 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}
+
+ local i
+ for i in ${daemons}; do
+ newinitd "${FILESDIR}"/${i}.initd ${i}
+ newconfd "${FILESDIR}"/${i}.confd ${i}
+ done
+ if use xinetd; then
+ insinto /etc/xinetd
+ doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
+ fi
+}
+
+desktop_install() {
+ cd "${S}"
+ 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
+
+ insinto /usr/share/icons/hicolor/48x48/apps
+ doicon build/package/debian/root-system-bin.xpm
+}
+
+cleanup_install() {
+ # Cleanup of files either already distributed or unused on Gentoo
+ pushd "${ED}" > /dev/null
+ rm usr/share/root/fonts/LICENSE || die
+ rm etc/root/proof/*.sample || die
+ rm -r etc/root/daemons || die
+ # these should be in PATH
+ mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
+ rm ${DOC_DIR#/}/{INSTALL,LICENSE} || die
+ use examples || rm -r ${DOC_DIR#/}/examples || die
+
+ # clean hardcoded sandbox paths
+ #rm etc/root/dictpch/allCppflags.txt.tmp || die
+ #sed -i "s|${S}/||" etc/root/cling/llvm/Config/llvm-config.h || die
+ # regenerate pch for Gentoo headers layout
+ #rm "etc/root/allDict.cxx.pch" || die
+ #sed -i 's|etc/dictpch|etc/root/dictpch|' etc/root/dictpch/allLinkDefs.h || die
+ #sed -i 's|etc/cling|etc/root/cling|' etc/root/dictpch/allHeaders.h || die
+ #sed -i "s|ROOTDIR_TEMPLATE|${ED}|" etc/root/dictpch/makepch-gentoo.sh || die
+ #etc/root/dictpch/makepch-gentoo.sh etc/root/allDict.cxx.pch || die "PCH generation failed"
+}
+
+src_install() {
+ ROOTSYS="${S}" emake DESTDIR="${D}" install
+ insinto "${DOC_DIR}"
+ doins README.md
+
+ 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 "${D}/usr/$(get_libdir)/root"
+ fi
+ use emacs && elisp-install ${PN} build/misc/*.{el,elc}
+ if use examples; then
+ # these should really be taken care of by the root make install
+ insinto ${DOC_DIR}/examples/tutorials/tmva
+ doins -r tmva/test
+ fi
+ doenvd 99root
+
+ # The build system installs Emacs support unconditionally in the wrong
+ # directory. Remove it and call elisp-install in case of USE=emacs.
+ rm -r "${ED}"/usr/share/emacs || die
+
+ daemon_install
+ desktop_install
+ cleanup_install
+
+ # do not copress files used by ROOT's CLI (.credit, .demo, .license)
+ docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials}
+ # needed for .license command to work
+ cat > "${DOC_DIR}/LICENSE" <<- EOF
+ Please visit
+ https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
+ for the full license test
+ EOF
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+
+ # restort opencascade eselect slot
+ if use geocad && [[ -n ${oc_current} ]]; then
+ einfo "Switching to user set slot: $(eselect opencascade show) -> ${oc_current}"
+ eselect opencascade set ${oc_current} > /dev/null || eerror "eselect opencascade set ${vlist[i]} failed!"
+ unset oc_current
+ fi
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2016-06-19 9:55 Andrew Savchenko
0 siblings, 0 replies; 14+ messages in thread
From: Andrew Savchenko @ 2016-06-19 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 683a1377d8de799d4e190229c131bd95dad9f1c0
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 09:55:12 2016 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 09:55:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=683a1377
sci-physics/root: fix bug 575686
Apply upstream patch to support gsl-2.
Package-Manager: portage-2.3.0_rc1
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
sci-physics/root/files/root-6.04.06-gsl2.patch | 58 ++++++++++++++++++++++++++
sci-physics/root/root-6.04.06.ebuild | 3 +-
2 files changed, 60 insertions(+), 1 deletion(-)
diff --git a/sci-physics/root/files/root-6.04.06-gsl2.patch b/sci-physics/root/files/root-6.04.06-gsl2.patch
new file mode 100644
index 0000000..5d9fb10
--- /dev/null
+++ b/sci-physics/root/files/root-6.04.06-gsl2.patch
@@ -0,0 +1,58 @@
+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/root-6.04.06.ebuild b/sci-physics/root/root-6.04.06.ebuild
index 38e6f29..9cfe322 100644
--- a/sci-physics/root/root-6.04.06.ebuild
+++ b/sci-physics/root/root-6.04.06.ebuild
@@ -241,7 +241,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
"${FILESDIR}"/${PN}-6.00.01-llvm.patch \
"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
- "${FILESDIR}"/${P}-prop-flags.patch
+ "${FILESDIR}"/${P}-prop-flags.patch \
+ "${FILESDIR}"/${P}-gsl2.patch
# "${FILESDIR}"/${PN}-6.02.05-xrootd4.patch
# "${FILESDIR}"/${PN}-6.02.05-dictpch.patch \
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2017-12-15 12:01 Guilherme Amadio
0 siblings, 0 replies; 14+ messages in thread
From: Guilherme Amadio @ 2017-12-15 12:01 UTC (permalink / raw
To: gentoo-commits
commit: 819d5014a7859a590292287d76e5a708daf230c0
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 16:05:56 2017 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 11:56:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=819d5014
sci-physics/root: version bump to 6.12.04
Closes: https://bugs.gentoo.org/622034
Closes: https://bugs.gentoo.org/617160
Closes: https://bugs.gentoo.org/599274
Closes: https://bugs.gentoo.org/596290
Package-Manager: Portage-2.3.18, Repoman-2.3.6
sci-physics/root/Manifest | 1 +
sci-physics/root/files/root-6.11.02-hsimple.patch | 34 +++
sci-physics/root/metadata.xml | 32 +-
sci-physics/root/root-6.12.04.ebuild | 345 ++++++++++++++++++++++
4 files changed, 403 insertions(+), 9 deletions(-)
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index a4a16721db4..16e83ab4a34 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,2 +1,3 @@
DIST root_v5.34.36.source.tar.gz 75427331 BLAKE2B 203af03e1459c7fe079fcb1b30da145b3262f90c074abb7ff8fb3b1b2b90ac24391ce51aa8afbd10e0db8d69549207f15176207bc30a13720e0ae94342a38dfa SHA512 2cc0c8f8b63b2a3ce01c49c41704483548a7324d92c21a63e3e36a00f4d6f5656a7844fdf48cb71a6f2a2c974112527300ffd3bb5502d8365ffaf138e6ae4c7a
DIST root_v6.04.06.source.tar.gz 99180724 BLAKE2B 96416ff36bd8e3084ca3a89bb73bfd4750f25d1fbe132ffac0288a7bdebf0200e769efc5e7d5a0d138176db67cb7531cd28124d3b7c568028a125d8a79ec7669 SHA512 ac96ac998ed4894587b7d286d79bcbea7b33f15764cc2513ae089e86c584e2dcb064cd135d44a4bfd2bede368eb772ccbffcd6bf426857a1236f5d7e9f5ce6fd
+DIST root_v6.12.04.source.tar.gz 162106020 BLAKE2B f27382cf748d4e31d71b460ecbf9b9f12294fb212bf23dc3d34c98737d8815b2eea2318247e56953ba184bb790bbb2f4b43c675dcb7a02b77c011f19e15d0d83 SHA512 67e400e9e7e8cabfb036a1eb1c262d462f613de7d6e18f8a17109c8eb52932e9ba77e69ab7b1f62c582d06b7f4d020cc888a0dfbefb4d3716743f142c3e3c063
diff --git a/sci-physics/root/files/root-6.11.02-hsimple.patch b/sci-physics/root/files/root-6.11.02-hsimple.patch
new file mode 100644
index 00000000000..c1e88bd55b7
--- /dev/null
+++ b/sci-physics/root/files/root-6.11.02-hsimple.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aa05c02568..ef2b5e3f52 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -354,28 +354,6 @@ add_dependencies(onepcm ${__allTargets})
+ install(FILES ${CMAKE_BINARY_DIR}/etc/allDict.cxx.pch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+
+-#---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
+-if(NOT WIN32)
+-add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
+-add_dependencies(hsimple onepcm)
+-if(WIN32)
+- add_custom_command(OUTPUT tutorials/hsimple.root
+- COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} &&
+- set ROOTIGNOREPREFIX=1 &&
+- $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
+- WORKING_DIRECTORY tutorials
+- DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
+-else()
+- add_custom_command(OUTPUT tutorials/hsimple.root
+- COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
+- ROOTIGNOREPREFIX=1
+- $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
+- WORKING_DIRECTORY tutorials
+- DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
+-endif()
+-install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
+-endif()
+-
+ #---version--------------------------------------------------------------------------------------
+ if(NOT WIN32)
+ add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
+
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index b621201035f..1999cbbbd3b 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -10,28 +10,42 @@
<name>Gentoo Physics Project</name>
</maintainer>
<longdescription lang="en">
- ROOT Object Oriented Technologies is an object oriented data
- analysis framework written in C++ by the CERN. Widely used in
- high energy physics, but also in other data analysis applications. It
- contains the CINT C/C++ interpreter and many classes such as
- statistics, serialization, optimization, linear algebra, graphics,
- GUI toolkit, and a complete visualization framework.
-</longdescription>
+ ROOT is a modular scientific software framework. It provides all the
+ functionality needed to deal with big data processing, statistical analysis,
+ visualisation and storage. It is mainly written in C++ but integrated with
+ other languages such as Python and R. ROOT is widely used in high energy
+ physics, but also in other data analysis applications. It contains the
+ CINT (ROOT 5.x) or cling (ROOT 6.x) C/C++ interpreter and many other
+ classes for statistics, serialization, optimization, linear algebra,
+ graphics, GUI toolkit, and a complete visualization framework.
+ </longdescription>
<use>
<flag name="c++11"> Build ROOT using the C++11 standard</flag>
<flag name="c++14"> Build ROOT using the C++14 standard</flag>
- <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+ <flag name="asimage">Enable support for <pkg>media-libs/libafterimage</pkg></flag>
+ <flag name="davix">Enable support for DAVIX Data Management Client (https://cern.ch/davix)</flag>
+ <flag name="fits">Enable support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+ <flag name="fortran">Compile included Fortran programs</flag>
<flag name="gdml">Enable GDML writer and reader</flag>
<flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
<flag name="http">Enable http server support including but not limited to fastcgi support</flag>
+ <flag name="jemalloc">Enable support for <pkg>dev-libs/jemalloc</pkg></flag>
+ <flag name="libcxx">Build ROOT against <pkg>sys-libs/libcxx</pkg></flag>
<flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
<flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag>
+ <flag name="minuit">Build ROOT's internal versions of minuit (fortran) and minuit2 (C++)</flag>
<flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
<flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
+ <flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag>
<flag name="reflex">Build the reflection database for the C++ interpreter</flag>
+ <flag name="roofit">Build RooFit function fitting package</flag>
+ <flag name="root7">Build experimental features to be released with ROOT 7</flag>
<flag name="shadow">Enable shadow authentication in rootd and proofd</flag>
<flag name="table">Build libTable contrib library</flag>
+ <flag name="tbb">Enable implicit multi-threading (IMT) with <pkg>dev-cpp/tbb</pkg></flag>
+ <flag name="tmva">Built TMVA (ROOT's multi-variate analysis toolkit for machine learning)</flag>
+ <flag name="unuran">Enable support for <pkg>sci-mathematics/unuran</pkg></flag>
+ <flag name="vc">Enable support for <pkg>dev-libs/vc</pkg> with VecCore</flag>
<flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
- <flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag>
</use>
</pkgmetadata>
diff --git a/sci-physics/root/root-6.12.04.ebuild b/sci-physics/root/root-6.12.04.ebuild
new file mode 100644
index 00000000000..4fb0c10e18f
--- /dev/null
+++ b/sci-physics/root/root-6.12.04.ebuild
@@ -0,0 +1,345 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_BUILD_TYPE=Release
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils elisp-common eutils fortran-2 python-single-r1 \
+ toolchain-funcs user versionator xdg-utils
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="https://root.cern"
+SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
+
+IUSE="+X avahi aqua +asimage davix emacs +examples fits fftw fortran +gdml
+ graphviz +gsl http jemalloc kerberos ldap libcxx +math memstat +minuit
+ mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt4
+ R +roofit root7 shadow sqlite ssl table +tbb test +threads +tiff +tmva
+ +unuran vc xinetd +xml xrootd"
+
+MY_PV="$(get_version_component_range 1-2 ${PV})"
+MY_P="${PN}/$(get_version_component_range 1-2 ${PV})"
+MY_PREFIX=opt/${MY_P}
+
+SLOT="${MY_PV}/$(get_version_component_range 3 ${PV})"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="
+ !X? ( !asimage !opengl !qt4 !tiff )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ pythia6? ( !pythia8 )
+ pythia8? ( !pythia6 )
+ tmva? ( math gsl )
+ davix? ( ssl )
+"
+
+CDEPEND="
+ app-arch/lz4
+ app-arch/xz-utils
+ fortran? ( dev-lang/cfortran )
+ dev-libs/libpcre:3=
+ media-fonts/dejavu
+ media-libs/freetype:2=
+ media-libs/libpng:0=
+ sys-libs/ncurses:=
+ sys-libs/zlib:0=
+ X? (
+ x11-libs/libX11:0=
+ x11-libs/libXext:0=
+ x11-libs/libXft:0=
+ x11-libs/libXpm:0=
+ opengl? (
+ media-libs/ftgl:0=
+ media-libs/glew:0=
+ virtual/opengl
+ virtual/glu
+ x11-libs/gl2ps:0=
+ )
+ qt4? (
+ dev-qt/qtcore:4=
+ dev-qt/qtgui:4=
+ opengl? ( dev-qt/qtopengl:4= )
+ )
+ )
+ asimage? ( || (
+ media-libs/libafterimage[gif,jpeg,png,tiff?]
+ >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
+ ) )
+ avahi? ( net-dns/avahi[mdnsresponder-compat] )
+ fftw? ( sci-libs/fftw:3.0= )
+ fits? ( sci-libs/cfitsio:0= )
+ graphviz? ( media-gfx/graphviz:0= )
+ gsl? ( sci-libs/gsl )
+ http? ( dev-libs/fcgi:0= )
+ jemalloc? ( dev-libs/jemalloc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap:0= )
+ libcxx? ( sys-libs/libcxx )
+ unuran? ( sci-mathematics/unuran:0= )
+ minuit? ( !sci-libs/minuit )
+ mysql? ( virtual/mysql )
+ odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+ oracle? ( dev-db/oracle-instantclient-basic )
+ postgres? ( dev-db/postgresql:= )
+ pythia6? ( sci-physics/pythia:6= )
+ pythia8? ( sci-physics/pythia:8= )
+ python? ( ${PYTHON_DEPS} )
+ R? ( dev-lang/R )
+ shadow? ( virtual/shadow )
+ sqlite? ( dev-db/sqlite:3= )
+ ssl? ( dev-libs/openssl:0= )
+ tbb? ( dev-cpp/tbb )
+ vc? ( dev-libs/vc )
+ xml? ( dev-libs/libxml2:2= )
+ xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+ xinetd? ( sys-apps/xinetd )"
+
+pkg_setup() {
+ use fortran && fortran-2_pkg_setup
+ use python && python-single-r1_pkg_setup
+
+ echo
+ elog "There are extra options on packages not yet in Gentoo:"
+ elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
+ elog "HDFS, Monalisa, MaxDB/SapDB, SRP, VecCore."
+ elog "You can use the env variable EXTRA_ECONF variable for this."
+ elog "For example, for Chirp, you would set: "
+ elog "EXTRA_ECONF=\"-Dchirp=ON\""
+ echo
+
+ enewgroup rootd
+ enewuser rootd -1 -1 /var/spool/rootd rootd
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ epatch \
+ "${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
+ "${FILESDIR}"/${PN}-5.32.00-afs.patch \
+ "${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
+
+ # make sure we use system libs and headers
+ rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+ rm -r graf2d/asimage/src/libAfterImage || die
+ rm -r graf3d/ftgl/{inc,src} || die
+ rm -r graf2d/freetype/src || die
+ rm -r graf3d/gl/src/gl2ps* || die
+ rm -r graf3d/glew/{inc,src} || die
+ rm -r core/pcre/src || die
+ rm -r math/unuran/src/unuran-*.tar.gz || die
+ rm -r core/lzma/src/*.tar.gz || die
+ LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm || die
+
+ # CSS should use local images
+ sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+}
+
+# Note: ROOT uses bundled LLVM, because it is patched and API-incompatible with system LLVM.
+# Note: ROOT will install many compiler headers and other files into suboptimal places, so
+# we install it into /opt due to QA concerns over the files installed into <prefix>/etc
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_C_FLAGS="${CFLAGS}"
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/${MY_PREFIX}"
+ -Dexplicitlink=ON
+ -Dexceptions=ON
+ -Dfail-on-missing=ON
+ -Dshared=ON
+ -Dsoversion=ON
+ -Dbuiltin_llvm=ON
+ -Dbuiltin_afterimage=OFF
+ -Dbuiltin_cfitsio=OFF
+ -Dbuiltin_davix=$(usex davix) # not in Gentoo yet
+ -Dbuiltin_fftw3=OFF
+ -Dbuiltin_freetype=OFF
+ -Dbuiltin_ftgl=OFF
+ -Dbuiltin_glew=OFF
+ -Dbuiltin_gsl=OFF
+ -Dbuiltin_lzma=OFF
+ -Dbuiltin_pcre=OFF
+ -Dbuiltin_tbb=OFF
+ -Dbuiltin_unuran=OFF
+ -Dbuiltin_vc=OFF
+ -Dbuiltin_xrootd=OFF
+ -Dbuiltin_zlib=OFF
+ -Dx11=$(usex X)
+ -Dxft=$(usex X)
+ # -Dafs=$(usex afs) # option not implemented
+ -Dasimage=$(usex asimage)
+ -Dastiff=$(usex tiff)
+ -Dbonjour=$(usex avahi)
+ -Dlibcxx=$(usex libcxx) # default OFF
+ -Dccache=OFF # use ccache via portage
+ -Dcastor=OFF # default ON
+ -Dchirp=OFF # default ON
+ # -Dcling=$(usex cling) # default ON
+ -Dcocoa=$(usex aqua) # default *
+ -Dcxx14=$(usex root7) # default OFF
+ -Ddavix=$(usex davix) # default *
+ -Ddcache=OFF # $(usex dcache) # default ON
+ -Dfftw3=$(usex fftw) # default ON
+ -Dfitsio=$(usex fits) # default ON
+ -Dfortran=$(usex fortran) # default *
+ -Dgdml=$(usex gdml) # default *
+ -Dgeocad=OFF # default OFF
+ -Dgenvector=$(usex math) # default ON
+ -Dgfal=OFF # $(usex gfal) # default ON
+ -Dglite=OFF #$(usex glite) # default ON (unimplemented option)
+ -Dglobus=OFF #$(usex globus) # default OFF
+ -Dgminimal=OFF # default OFF
+ -Dgnuinstall=OFF # default OFF
+ -Dgsl_shared=$(usex gsl) # default OFF
+ -Dgviz=$(usex graphviz) # default ON
+ -Dhdfs=OFF # $(usex hdfs) # default ON
+ -Dhttp=$(usex http) # default *
+ -Dimt=$(usex tbb) # default OFF
+ -Djemalloc=$(usex jemalloc) # default OFF
+ -Dkrb5=$(usex kerberos) # default ON
+ -Dldap=$(usex ldap) # default ON
+ -Dmathmore=$(usex math) # default ON
+ -Dmemstat=$(usex memstat) # default *
+ #-Dminimal=$(usex minimal) # default OFF
+ -Dminuit=$(usex minuit)
+ -Dminuit2=$(usex minuit) # default * (broken)
+ -Dmonalisa=OFF # default ON
+ -Dmysql=$(usex mysql) # default ON
+ -Dodbc=$(usex odbc) # default ON
+ -Dopengl=$(usex opengl) # default ON
+ -Doracle=$(usex oracle) # default ON
+ -Dpgsql=$(usex postgres) # default ON
+ -Dpythia6=$(usex pythia6) # default ON
+ -Dpythia8=$(usex pythia8) # default ON
+ -Dpython=$(usex python) # default ON
+ -Dqt=$(usex qt4) # default Qt
+ -Dqtgsi=$(usex qt4) # default *
+ -Droofit=$(usex roofit) # default *
+ -Droot7=$(usex root7) # default OFF
+ -Droottest=OFF # default OFF
+ -Druby=OFF # default OFF
+ -Dr=$(usex R) # default OFF
+ -Drfio=OFF # default ON
+ -Drpath=$(usex prefix) # default OFF
+ -Dsapdb=OFF # default ON
+ -Dshadowpw=$(usex shadow) # default ON
+ -Dsqlite=$(usex sqlite) # default ON
+ -Dsrp=OFF # default ON (unimplemented option)
+ -Dssl=$(usex ssl) # default ON
+ -Dtbb=$(usex tbb) # default OFF
+ -Dtable=$(usex table) # default *
+ -Dtcmalloc=OFF # $(usex tcmalloc) # default OFF
+ -Dtesting=$(usex test) # default OFF
+ -Dthread=$(usex threads) # default ON
+ -Dtmva=$(usex tmva) # default ON
+ -Dunuran=$(usex unuran) # default *
+ -Dvc=$(usex vc) # default *
+ -Dvdt=OFF # $(usex math) # default ON
+ -Dxml=$(usex xml) # default ON
+ -Dxrootd=$(usex xrootd) # default ON
+ ${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
+}
+
+daemon_install() {
+ 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}
+
+ local i
+ for i in ${daemons}; do
+ newinitd "${FILESDIR}"/${i}.initd ${i}
+ newconfd "${FILESDIR}"/${i}.confd ${i}
+ done
+ if use xinetd; then
+ insinto /etc/xinetd
+ doins "${BUILD_DIR}"/etc/daemons/{rootd,proofd}.xinetd
+ fi
+}
+
+desktop_install() {
+ pushd "${S}" > /dev/null
+ 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
+
+ insinto /usr/share/icons/hicolor/48x48/apps
+ doicon build/package/debian/root-system-bin.xpm
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # root fails without this symlink, because it looks only into lib
+ [[ -d lib ]] || dosym $(get_libdir) /${MY_PREFIX}/lib
+
+ use emacs && elisp-install ${PN} "${BUILD_DIR}"/root-help.el
+
+ echo "PATH=${EPREFIX}/${MY_PREFIX}/bin" > 99root || die
+ echo "LDPATH=${EPREFIX}/${MY_PREFIX}/$(get_libdir)" >> 99root || die
+
+ if use pythia8; then
+ echo "PYTHIA8=${EPREFIX}/usr" >> 99root || die
+ fi
+
+ if use python; then
+ echo "PYTHONPATH=${EPREFIX}/${MY_PREFIX}/lib" >> 99root
+ python_optimize "${ED}/${MY_PREFIX}/lib"
+ fi
+
+ doenvd 99root
+
+ daemon_install
+ desktop_install
+
+ pushd "${ED}" > /dev/null
+ rm -r ${MY_PREFIX}/{config,emacs,etc/vmc,fonts} || die
+
+ if ! use examples; then
+ rm -r ${MY_PREFIX}/{test,tutorials} || die
+ fi
+
+ if use tmva; then
+ rm -r ${MY_PREFIX}/tmva || die
+ fi
+
+ # do not copress files used by ROOT's CLI (.credit, .demo, .license)
+ docompress -x "${MY_PREFIX}/README/CREDITS"
+ use examples && docompress -x "${MY_PREFIX}/tutorials"
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2017-12-18 13:13 Guilherme Amadio
0 siblings, 0 replies; 14+ messages in thread
From: Guilherme Amadio @ 2017-12-18 13:13 UTC (permalink / raw
To: gentoo-commits
commit: 6fef4a8c4a68fddc2b0162e2963fb643017f6a86
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 10:54:51 2017 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 13:11:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fef4a8c
sci-physics/root: do not look for Z3, since it's not necessary
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sci-physics/root/files/root-6.12.04-z3.patch | 39 ++++++++++++++++++++++++++++
sci-physics/root/root-6.12.04.ebuild | 3 ++-
2 files changed, 41 insertions(+), 1 deletion(-)
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 00000000000..04f6edf2c6d
--- /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.ebuild
index 4a5da3db24e..cb4d5d9a4ec 100644
--- a/sci-physics/root/root-6.12.04.ebuild
+++ b/sci-physics/root/root-6.12.04.ebuild
@@ -128,7 +128,8 @@ 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-z3.patch
# make sure we use system libs and headers
rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2018-03-06 14:43 Guilherme Amadio
0 siblings, 0 replies; 14+ messages in thread
From: Guilherme Amadio @ 2018-03-06 14:43 UTC (permalink / raw
To: gentoo-commits
commit: 07c7bca3d839057a25d4ea681e48e76f76d7c699
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 6 07:11:18 2018 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Tue Mar 6 14:43:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07c7bca3
sci-physics/root: version bump to 6.12/06
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sci-physics/root/Manifest | 2 +-
.../root/files/root-6.12.04-find-oracle-12.patch | 34 ----------------------
...{root-6.12.04-r3.ebuild => root-6.12.06.ebuild} | 1 -
3 files changed, 1 insertion(+), 36 deletions(-)
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 0f1fa9ef4b3..9587434290a 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,2 +1,2 @@
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
+DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1
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
deleted file mode 100644
index 242e76d0987..00000000000
--- a/sci-physics/root/files/root-6.12.04-find-oracle-12.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/root-6.12.04-r3.ebuild b/sci-physics/root/root-6.12.06.ebuild
similarity index 99%
rename from sci-physics/root/root-6.12.04-r3.ebuild
rename to sci-physics/root/root-6.12.06.ebuild
index 9ff4f451b92..c875fb4bddf 100644
--- a/sci-physics/root/root-6.12.04-r3.ebuild
+++ b/sci-physics/root/root-6.12.06.ebuild
@@ -112,7 +112,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.00.01-dotfont.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
)
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2018-03-20 14:15 Benda XU
0 siblings, 0 replies; 14+ messages in thread
From: Benda XU @ 2018-03-20 14:15 UTC (permalink / raw
To: gentoo-commits
commit: 0fa97fd6f71bb38beb26c4015a1bf6b02d6207d3
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 20 14:14:56 2018 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Mar 20 14:15:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa97fd6
sci-physics/root: have root6 compile on Prefix.
1. DEFAULT_SYSROOT of bundled llvm points to EPREFIX, so that system
headers inside EPREFIX is used.
2. prefixify the CMakeList system headers copies.
3. disable ftgl search when USE=opengl is not set.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../root/files/root-6.12.06-disable-ftgl.patch | 45 ++++++++++++++++++++++
sci-physics/root/root-6.12.06-r1.ebuild | 6 ++-
2 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/sci-physics/root/files/root-6.12.06-disable-ftgl.patch b/sci-physics/root/files/root-6.12.06-disable-ftgl.patch
new file mode 100644
index 00000000000..89d8d550d30
--- /dev/null
+++ b/sci-physics/root/files/root-6.12.06-disable-ftgl.patch
@@ -0,0 +1,45 @@
+Forwarded: https://sft.its.cern.ch/jira/browse/ROOT-9315
+
+Index: root-6.12.06/cmake/modules/SearchInstalledSoftware.cmake
+===================================================================
+--- root-6.12.06.orig/cmake/modules/SearchInstalledSoftware.cmake
++++ root-6.12.06/cmake/modules/SearchInstalledSoftware.cmake
+@@ -1075,22 +1075,24 @@ if(globus)
+ endif()
+
+ #---Check for ftgl if needed----------------------------------------------------------
+-if(NOT builtin_ftgl)
+- find_package(FTGL)
+- if(NOT FTGL_FOUND)
+- if(fail-on-missing)
+- message(FATAL_ERROR "ftgl library not found and is required ('builtin_ftgl' is OFF). Set varible FTGL_ROOT_DIR to installation location")
+- else()
+- message(STATUS "ftgl library not found. Set variable FTGL_ROOT_DIR to point to your installation")
+- message(STATUS "For the time being switching ON 'builtin_ftgl' option")
+- set(builtin_ftgl ON CACHE BOOL "" FORCE)
++if(buildgl)
++ if(NOT builtin_ftgl)
++ find_package(FTGL)
++ if(NOT FTGL_FOUND)
++ if(fail-on-missing)
++ message(FATAL_ERROR "ftgl library not found and is required ('builtin_ftgl' is OFF). Set varible FTGL_ROOT_DIR to installation location")
++ else()
++ message(STATUS "ftgl library not found. Set variable FTGL_ROOT_DIR to point to your installation")
++ message(STATUS "For the time being switching ON 'builtin_ftgl' option")
++ set(builtin_ftgl ON CACHE BOOL "" FORCE)
++ endif()
+ endif()
+ endif()
+-endif()
+-if(builtin_ftgl)
+- set(FTGL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/graf3d/ftgl/inc)
+- set(FTGL_CFLAGS -DBUILTIN_FTGL)
+- set(FTGL_LIBRARIES FTGL)
++ if(builtin_ftgl)
++ set(FTGL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/graf3d/ftgl/inc)
++ set(FTGL_CFLAGS -DBUILTIN_FTGL)
++ set(FTGL_LIBRARIES FTGL)
++ endif()
+ endif()
+
+ #---Check for chirp--------------------------------------------------------------------
diff --git a/sci-physics/root/root-6.12.06-r1.ebuild b/sci-physics/root/root-6.12.06-r1.ebuild
index c0815302e7d..6f44ce517b4 100644
--- a/sci-physics/root/root-6.12.06-r1.ebuild
+++ b/sci-physics/root/root-6.12.06-r1.ebuild
@@ -9,7 +9,7 @@ CMAKE_MAKEFILE_GENERATOR=emake
FORTRAN_NEEDED="fortran"
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit cmake-utils elisp-common eutils fortran-2 gnome2-utils \
+inherit cmake-utils elisp-common eutils fortran-2 gnome2-utils prefix \
python-single-r1 toolchain-funcs user versionator xdg-utils
DESCRIPTION="C++ data analysis framework and interpreter from CERN"
@@ -115,6 +115,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.11.02-hsimple.patch
"${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch
"${FILESDIR}"/${PN}-6.12.04-z3.patch
+ "${FILESDIR}"/${PN}-6.12.06-disable-ftgl.patch
)
pkg_setup() {
@@ -151,6 +152,8 @@ src_prepare() {
# CSS should use local images
sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+
+ hprefixify build/CMakeLists.txt core/clingutils/CMakeLists.txt
}
# Note: ROOT uses bundled LLVM, because it is patched and API-incompatible with system LLVM.
@@ -162,6 +165,7 @@ src_configure() {
-DCMAKE_C_FLAGS="${CFLAGS}"
-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/${MY_PREFIX}"
+ -DDEFAULT_SYSROOT="${EPREFIX}" # for llvm system headers
-Dexplicitlink=ON
-Dexceptions=ON
-Dfail-on-missing=ON
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2018-03-22 14:24 Guilherme Amadio
0 siblings, 0 replies; 14+ messages in thread
From: Guilherme Amadio @ 2018-03-22 14:24 UTC (permalink / raw
To: gentoo-commits
commit: 91e8ffac654ffdb0d29bb35827e6ec0ff7ab977d
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 10:21:03 2018 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 14:23:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e8ffac
Revert "sci-physics/root: have root6 compile on Prefix."
This reverts commit 0fa97fd6f71bb38beb26c4015a1bf6b02d6207d3.
This broke the build with USE=opengl.
.../root/files/root-6.12.06-disable-ftgl.patch | 45 ----------------------
sci-physics/root/root-6.12.06-r1.ebuild | 6 +--
2 files changed, 1 insertion(+), 50 deletions(-)
diff --git a/sci-physics/root/files/root-6.12.06-disable-ftgl.patch b/sci-physics/root/files/root-6.12.06-disable-ftgl.patch
deleted file mode 100644
index 89d8d550d30..00000000000
--- a/sci-physics/root/files/root-6.12.06-disable-ftgl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Forwarded: https://sft.its.cern.ch/jira/browse/ROOT-9315
-
-Index: root-6.12.06/cmake/modules/SearchInstalledSoftware.cmake
-===================================================================
---- root-6.12.06.orig/cmake/modules/SearchInstalledSoftware.cmake
-+++ root-6.12.06/cmake/modules/SearchInstalledSoftware.cmake
-@@ -1075,22 +1075,24 @@ if(globus)
- endif()
-
- #---Check for ftgl if needed----------------------------------------------------------
--if(NOT builtin_ftgl)
-- find_package(FTGL)
-- if(NOT FTGL_FOUND)
-- if(fail-on-missing)
-- message(FATAL_ERROR "ftgl library not found and is required ('builtin_ftgl' is OFF). Set varible FTGL_ROOT_DIR to installation location")
-- else()
-- message(STATUS "ftgl library not found. Set variable FTGL_ROOT_DIR to point to your installation")
-- message(STATUS "For the time being switching ON 'builtin_ftgl' option")
-- set(builtin_ftgl ON CACHE BOOL "" FORCE)
-+if(buildgl)
-+ if(NOT builtin_ftgl)
-+ find_package(FTGL)
-+ if(NOT FTGL_FOUND)
-+ if(fail-on-missing)
-+ message(FATAL_ERROR "ftgl library not found and is required ('builtin_ftgl' is OFF). Set varible FTGL_ROOT_DIR to installation location")
-+ else()
-+ message(STATUS "ftgl library not found. Set variable FTGL_ROOT_DIR to point to your installation")
-+ message(STATUS "For the time being switching ON 'builtin_ftgl' option")
-+ set(builtin_ftgl ON CACHE BOOL "" FORCE)
-+ endif()
- endif()
- endif()
--endif()
--if(builtin_ftgl)
-- set(FTGL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/graf3d/ftgl/inc)
-- set(FTGL_CFLAGS -DBUILTIN_FTGL)
-- set(FTGL_LIBRARIES FTGL)
-+ if(builtin_ftgl)
-+ set(FTGL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/graf3d/ftgl/inc)
-+ set(FTGL_CFLAGS -DBUILTIN_FTGL)
-+ set(FTGL_LIBRARIES FTGL)
-+ endif()
- endif()
-
- #---Check for chirp--------------------------------------------------------------------
diff --git a/sci-physics/root/root-6.12.06-r1.ebuild b/sci-physics/root/root-6.12.06-r1.ebuild
index 6f44ce517b4..c0815302e7d 100644
--- a/sci-physics/root/root-6.12.06-r1.ebuild
+++ b/sci-physics/root/root-6.12.06-r1.ebuild
@@ -9,7 +9,7 @@ CMAKE_MAKEFILE_GENERATOR=emake
FORTRAN_NEEDED="fortran"
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit cmake-utils elisp-common eutils fortran-2 gnome2-utils prefix \
+inherit cmake-utils elisp-common eutils fortran-2 gnome2-utils \
python-single-r1 toolchain-funcs user versionator xdg-utils
DESCRIPTION="C++ data analysis framework and interpreter from CERN"
@@ -115,7 +115,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.11.02-hsimple.patch
"${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch
"${FILESDIR}"/${PN}-6.12.04-z3.patch
- "${FILESDIR}"/${PN}-6.12.06-disable-ftgl.patch
)
pkg_setup() {
@@ -152,8 +151,6 @@ src_prepare() {
# CSS should use local images
sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
-
- hprefixify build/CMakeLists.txt core/clingutils/CMakeLists.txt
}
# Note: ROOT uses bundled LLVM, because it is patched and API-incompatible with system LLVM.
@@ -165,7 +162,6 @@ src_configure() {
-DCMAKE_C_FLAGS="${CFLAGS}"
-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/${MY_PREFIX}"
- -DDEFAULT_SYSROOT="${EPREFIX}" # for llvm system headers
-Dexplicitlink=ON
-Dexceptions=ON
-Dfail-on-missing=ON
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2018-03-22 14:24 Guilherme Amadio
0 siblings, 0 replies; 14+ messages in thread
From: Guilherme Amadio @ 2018-03-22 14:24 UTC (permalink / raw
To: gentoo-commits
commit: 0644d83de67b352bf88de744264143d5ad1bd4ce
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 12:44:39 2018 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 14:23:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0644d83d
sci-physics/root: do not look for ftgl and gl2ps with USE=-opengl
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../root/files/root-6.12.04-no-opengl.patch | 23 ++++++++++++++++++++++
sci-physics/root/root-6.12.06-r1.ebuild | 1 +
2 files changed, 24 insertions(+)
diff --git a/sci-physics/root/files/root-6.12.04-no-opengl.patch b/sci-physics/root/files/root-6.12.04-no-opengl.patch
new file mode 100644
index 00000000000..319020222e5
--- /dev/null
+++ b/sci-physics/root/files/root-6.12.04-no-opengl.patch
@@ -0,0 +1,23 @@
+diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
+index a68c462eb3..1e82e57241 100644
+--- a/cmake/modules/SearchInstalledSoftware.cmake
++++ b/cmake/modules/SearchInstalledSoftware.cmake
+@@ -499,7 +499,7 @@ if(opengl)
+ endif()
+
+ #---Check for gl2ps ------------------------------------------------------------------
+-if(NOT builtin_gl2ps)
++if(gl2ps AND NOT builtin_gl2ps)
+ message(STATUS "Looking for gl2ps")
+ find_Package(gl2ps)
+ if(NOT GL2PS_FOUND)
+@@ -999,7 +999,7 @@ if(globus)
+ endif()
+
+ #---Check for ftgl if needed----------------------------------------------------------
+-if(NOT builtin_ftgl)
++if(ftgl AND NOT builtin_ftgl)
+ find_package(FTGL)
+ if(NOT FTGL_FOUND)
+ if(fail-on-missing)
+
diff --git a/sci-physics/root/root-6.12.06-r1.ebuild b/sci-physics/root/root-6.12.06-r1.ebuild
index c0815302e7d..1908822d66c 100644
--- a/sci-physics/root/root-6.12.06-r1.ebuild
+++ b/sci-physics/root/root-6.12.06-r1.ebuild
@@ -114,6 +114,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.00.01-dotfont.patch
"${FILESDIR}"/${PN}-6.11.02-hsimple.patch
"${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch
+ "${FILESDIR}"/${PN}-6.12.04-no-opengl.patch
"${FILESDIR}"/${PN}-6.12.04-z3.patch
)
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2018-07-05 11:15 Guilherme Amadio
0 siblings, 0 replies; 14+ messages in thread
From: Guilherme Amadio @ 2018-07-05 11:15 UTC (permalink / raw
To: gentoo-commits
commit: 63bf6109fdc6cc6426ffbb1bed2f35e5d59cdeef
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 5 09:08:32 2018 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Jul 5 11:04:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63bf6109
sci-physics/root: version bump to 6.14/00
Package-Manager: Portage-2.3.41, Repoman-2.3.9
sci-physics/root/Manifest | 1 +
sci-physics/root/files/root-6.13.02-hsimple.patch | 31 +++
sci-physics/root/files/root-6.14.00-http.patch | 28 ++
sci-physics/root/root-6.14.00.ebuild | 315 ++++++++++++++++++++++
4 files changed, 375 insertions(+)
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 9587434290a..3337509776a 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,2 +1,3 @@
DIST root_v5.34.36.source.tar.gz 75427331 BLAKE2B 203af03e1459c7fe079fcb1b30da145b3262f90c074abb7ff8fb3b1b2b90ac24391ce51aa8afbd10e0db8d69549207f15176207bc30a13720e0ae94342a38dfa SHA512 2cc0c8f8b63b2a3ce01c49c41704483548a7324d92c21a63e3e36a00f4d6f5656a7844fdf48cb71a6f2a2c974112527300ffd3bb5502d8365ffaf138e6ae4c7a
DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1
+DIST root_v6.14.00.source.tar.gz 162436586 BLAKE2B 6047fe9fb898be9d4f00f2e6eb378d213996b49b9677f61ccc0250bb6d0801d8410850a39e0983534da2c6a307bd64b0ed6c03ab873a6c8b844500a96444a455 SHA512 2d4e754e3054018a53af28408b218bc52c0c60bea69a3c9e48f0d3feadbfebb559087fb453505b281fe01043f723e4b766cda8fca1e68dbf9e202c67d417e5b3
diff --git a/sci-physics/root/files/root-6.13.02-hsimple.patch b/sci-physics/root/files/root-6.13.02-hsimple.patch
new file mode 100644
index 00000000000..cab8a40afa7
--- /dev/null
+++ b/sci-physics/root/files/root-6.13.02-hsimple.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 03af62fcd3..8ec5330773 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -367,26 +367,6 @@ else()
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+ endif()
+
+-#---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
+-add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
+-add_dependencies(hsimple onepcm)
+-if(WIN32)
+- add_custom_command(OUTPUT tutorials/hsimple.root
+- COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} &&
+- set ROOTIGNOREPREFIX=1 &&
+- $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
+- WORKING_DIRECTORY tutorials
+- DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
+-else()
+- add_custom_command(OUTPUT tutorials/hsimple.root
+- COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
+- ROOTIGNOREPREFIX=1
+- $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
+- WORKING_DIRECTORY tutorials
+- DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
+-endif()
+-install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
+-
+ #---version--------------------------------------------------------------------------------------
+ if(NOT WIN32)
+ add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
diff --git a/sci-physics/root/files/root-6.14.00-http.patch b/sci-physics/root/files/root-6.14.00-http.patch
new file mode 100644
index 00000000000..04ec4bea567
--- /dev/null
+++ b/sci-physics/root/files/root-6.14.00-http.patch
@@ -0,0 +1,28 @@
+From bed1568548d7a47785d8fe24ec7a9ce5799040ff Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Wed, 27 Jun 2018 15:08:07 +0200
+Subject: [PATCH] Do not exclude etc/http directory from installation
+
+This was an unintended side-effect of a previous commit:
+9b4d0d8dccbd48d21b0f7c79b6eaf94428f691b1.
+---
+ CMakeLists.txt | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4c760d0fdb..a3a0f59925 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -426,8 +426,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
+ PATTERN "rootd.xinetd" EXCLUDE
+ PATTERN "proofd.xinetd" EXCLUDE
+ PATTERN "root.mimes" EXCLUDE
+- PATTERN "cmake" EXCLUDE
+- PATTERN "http" EXCLUDE )
++ PATTERN "cmake" EXCLUDE )
+ install(DIRECTORY fonts/ DESTINATION ${CMAKE_INSTALL_FONTDIR})
+ install(DIRECTORY icons/ DESTINATION ${CMAKE_INSTALL_ICONDIR})
+ install(DIRECTORY macros/ DESTINATION ${CMAKE_INSTALL_MACRODIR})
+--
+2.18.0
+
diff --git a/sci-physics/root/root-6.14.00.ebuild b/sci-physics/root/root-6.14.00.ebuild
new file mode 100644
index 00000000000..d7fcd557dcc
--- /dev/null
+++ b/sci-physics/root/root-6.14.00.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_BUILD_TYPE=Release
+# ninja does not work due to fortran
+CMAKE_MAKEFILE_GENERATOR=emake
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils eapi7-ver elisp-common eutils fortran-2 \
+ prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="https://root.cern"
+SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
+
+IUSE="+X avahi aqua +asimage +davix emacs +examples fits fftw fortran
+ +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat
+ +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8
+ +python qt4 qt5 R +roofit root7 shadow sqlite +ssl table +tbb test
+ +threads +tiff +tmva +unuran vc xinetd +xml xrootd"
+
+SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="
+ !X? ( !asimage !opengl !qt4 !qt5 !tiff )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tmva? ( gsl )
+ davix? ( ssl xml )
+"
+
+CDEPEND="
+ app-arch/lz4
+ app-arch/xz-utils
+ fortran? ( dev-lang/cfortran )
+ dev-libs/libpcre:3=
+ dev-libs/xxhash
+ media-fonts/dejavu
+ media-libs/freetype:2=
+ media-libs/libpng:0=
+ sys-libs/ncurses:=
+ sys-libs/zlib
+ X? (
+ x11-libs/libX11:0=
+ x11-libs/libXext:0=
+ x11-libs/libXft:0=
+ x11-libs/libXpm:0=
+ opengl? (
+ media-libs/ftgl:0=
+ media-libs/glew:0=
+ virtual/opengl
+ virtual/glu
+ x11-libs/gl2ps:0=
+ )
+ qt4? (
+ dev-qt/qtcore:4=
+ dev-qt/qtgui:4=
+ )
+ qt5? (
+ dev-qt/qtcore:5=
+ dev-qt/qtgui:5=
+ dev-qt/qtwebengine:5=
+ )
+ )
+ asimage? ( || (
+ media-libs/libafterimage[gif,jpeg,png,tiff?]
+ >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
+ ) )
+ avahi? ( net-dns/avahi[mdnsresponder-compat] )
+ davix? ( net-libs/davix )
+ emacs? ( virtual/emacs )
+ fftw? ( sci-libs/fftw:3.0= )
+ fits? ( sci-libs/cfitsio:0= )
+ graphviz? ( media-gfx/graphviz:0= )
+ gsl? ( sci-libs/gsl )
+ http? ( dev-libs/fcgi:0= )
+ jemalloc? ( dev-libs/jemalloc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap:0= )
+ libcxx? ( sys-libs/libcxx )
+ unuran? ( sci-mathematics/unuran:0= )
+ minuit? ( !sci-libs/minuit )
+ mysql? ( virtual/mysql )
+ odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+ oracle? ( dev-db/oracle-instantclient-basic )
+ postgres? ( dev-db/postgresql:= )
+ pythia6? ( sci-physics/pythia:6= )
+ pythia8? ( sci-physics/pythia:8= )
+ python? ( ${PYTHON_DEPS} )
+ R? ( dev-lang/R )
+ shadow? ( virtual/shadow )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( dev-libs/openssl:0= )
+ tbb? ( dev-cpp/tbb )
+ vc? ( dev-libs/vc )
+ xml? ( dev-libs/libxml2:2= )
+ xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+ xinetd? ( sys-apps/xinetd )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch
+ "${FILESDIR}"/${PN}-6.13.02-hsimple.patch
+ "${FILESDIR}"/${PN}-6.14.00-http.patch
+)
+
+pkg_setup() {
+ use fortran && fortran-2_pkg_setup
+ use python && python-single-r1_pkg_setup
+
+ echo
+ elog "There are extra options on packages not yet in Gentoo:"
+ elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
+ elog "HDFS, Monalisa, MaxDB/SapDB, SRP, VecCore."
+ elog "You can use the env variable EXTRA_ECONF variable for this."
+ elog "For example, for Chirp, you would set: "
+ elog "EXTRA_ECONF=\"-Dchirp=ON\""
+ echo
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
+
+ # CSS should use local images
+ sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+}
+
+# Note: ROOT uses bundled clang because it is patched and API-incompatible
+# with vanilla clang. The patches enable the C++ interpreter to work.
+# Since ROOT installs many small files into /etc (~100MB in total),
+# we install it into another directory to avoid making /etc too big.
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_C_FLAGS="${CFLAGS}"
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)"
+ -DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/share/man"
+ -DMCAKE_INSTALL_LIBDIR=$(get_libdir)
+ -DDEFAULT_SYSROOT="${EPREFIX}"
+ -DCLING_BUILD_PLUGINS=OFF
+ -Dexplicitlink=ON
+ -Dexceptions=ON
+ -Dfail-on-missing=ON
+ -Dshared=ON
+ -Dsoversion=ON
+ -Dbuiltin_llvm=ON
+ -Dbuiltin_afterimage=OFF
+ -Dbuiltin_cfitsio=OFF
+ -Dbuiltin_davix=OFF
+ -Dbuiltin_fftw3=OFF
+ -Dbuiltin_freetype=OFF
+ -Dbuiltin_ftgl=OFF
+ -Dbuiltin_gl2ps=OFF
+ -Dbuiltin_glew=OFF
+ -Dbuiltin_gsl=OFF
+ -Dbuiltin_lz4=OFF
+ -Dbuiltin_lzma=OFF
+ -Dbuiltin_openssl=OFF
+ -Dbuiltin_pcre=OFF
+ -Dbuiltin_tbb=OFF
+ -Dbuiltin_unuran=OFF
+ -Dbuiltin_vc=OFF
+ -Dbuiltin_vdt=OFF
+ -Dbuiltin_veccore=OFF
+ -Dbuiltin_xrootd=OFF
+ -Dbuiltin_xxhash=OFF
+ -Dbuiltin_zlib=OFF
+ -Dx11=$(usex X)
+ -Dxft=$(usex X)
+ -Dafdsmgrd=OFF
+ -Dafs=OFF # not implemented
+ -Dalien=OFF
+ -Dasimage=$(usex asimage)
+ -Dastiff=$(usex tiff)
+ -Dbonjour=$(usex avahi)
+ -Dlibcxx=$(usex libcxx)
+ -Dccache=OFF # use ccache via portage
+ -Dcastor=OFF
+ -Dchirp=OFF
+ -Dcling=ON # cling=OFF is broken
+ -Dcocoa=$(usex aqua)
+ -Dcxx14=$(usex root7)
+ -Dcxxmodules=OFF # requires clang, unstable
+ -Ddavix=$(usex davix)
+ -Ddcache=OFF
+ -Dfftw3=$(usex fftw)
+ -Dfitsio=$(usex fits)
+ -Dfortran=$(usex fortran)
+ -Dftgl=$(usex opengl)
+ -Dgdml=$(usex gdml)
+ -Dgenvector=ON # genvector=OFF ignored
+ -Dgeocad=OFF
+ -Dgfal=OFF
+ -Dgl2ps=$(usex opengl)
+ -Dglite=OFF # not implemented
+ -Dglobus=OFF
+ -Dgminimal=OFF
+ -Dgnuinstall=OFF
+ -Dgsl_shared=$(usex gsl)
+ -Dgviz=$(usex graphviz)
+ -Dhdfs=OFF
+ -Dhttp=$(usex http)
+ -Dimt=$(usex tbb)
+ -Djemalloc=$(usex jemalloc)
+ -Dkrb5=$(usex kerberos)
+ -Dldap=$(usex ldap)
+ -Dmathmore=$(usex gsl)
+ -Dmemstat=$(usex memstat)
+ -Dminimal=OFF
+ -Dminuit2=$(usex minuit)
+ -Dminuit=$(usex minuit)
+ -Dmonalisa=OFF
+ -Dmysql=$(usex mysql)
+ -Dodbc=$(usex odbc)
+ -Dopengl=$(usex opengl)
+ -Doracle=$(usex oracle)
+ -Dpch=ON # pch=OFF is broken
+ -Dpgsql=$(usex postgres)
+ -Dpythia6=$(usex pythia6)
+ -Dpythia8=$(usex pythia8)
+ -Dpython=$(usex python)
+ -Dqt5web=$(usex qt5)
+ -Dqtgsi=$(usex qt4)
+ -Dqt=$(usex qt4)
+ -Drfio=OFF
+ -Droofit=$(usex roofit)
+ -Droot7=$(usex root7)
+ -Drootbench=OFF
+ -Droottest=$(usex test)
+ -Drpath=ON # needed for multi-slot to work
+ -Druby=OFF # deprecated and broken
+ -Druntime_cxxmodules=OFF # does not work yet
+ -Dr=$(usex R)
+ -Dsapdb=OFF # not implemented
+ -Dshadowpw=$(usex shadow)
+ -Dsqlite=$(usex sqlite)
+ -Dsrp=OFF # not implemented
+ -Dssl=$(usex ssl)
+ -Dtable=$(usex table)
+ -Dtbb=$(usex tbb)
+ -Dtcmalloc=OFF
+ -Dtesting=$(usex test)
+ -Dthread=$(usex threads)
+ -Dtmva-cpu=$(usex tmva)
+ -Dtmva-gpu=OFF
+ -Dtmva=$(usex tmva)
+ -Dunuran=$(usex unuran)
+ -Dvc=$(usex vc)
+ -Dvdt=OFF
+ -Dveccore=OFF
+ -Dxml=$(usex xml)
+ -Dxrootd=$(usex xrootd)
+ ${EXTRA_ECONF}
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ ROOTSYS=${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)
+ ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
+
+ # ROOT fails without this symlink because it only looks in lib
+ if [[ ! -d ${D}/${ROOTSYS}/lib ]]; then
+ dosym $(get_libdir) /usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/lib
+ fi
+
+ cat > ${ROOTENV} <<- EOF || die
+ MANPATH="${ROOTSYS}/share/man"
+ PATH="${ROOTSYS}/bin"
+ ROOTPATH="${ROOTSYS}/bin"
+ LDPATH="${ROOTSYS}/$(get_libdir)"
+ EOF
+
+ if use python; then
+ echo "PYTHONPATH=${ROOTSYS}/$(get_libdir)" >> ${ROOTENV} || die
+ fi
+
+ doenvd ${ROOTENV}
+
+ pushd "${D}/${ROOTSYS}" > /dev/null
+
+ if use emacs; then
+ elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
+ fi
+
+ if ! use gdml; then
+ rm -r geom || die
+ fi
+
+ if ! use examples; then
+ rm -r test tutorials || die
+ fi
+
+ if use tmva; then
+ rm -r tmva || die
+ fi
+
+ # clean up unnecessary files from installation
+ rm -r config emacs etc/vmc fonts || die
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2018-07-05 11:15 Guilherme Amadio
0 siblings, 0 replies; 14+ messages in thread
From: Guilherme Amadio @ 2018-07-05 11:15 UTC (permalink / raw
To: gentoo-commits
commit: f3fff3e43dbf12f9b561b56d8530a21d5c4d4163
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 5 09:27:18 2018 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Jul 5 11:05:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3fff3e4
sci-physics/root: drop old
Closes: https://bugs.gentoo.org/651000
Closes: https://bugs.gentoo.org/620754
Closes: https://bugs.gentoo.org/632128
Closes: https://bugs.gentoo.org/638422
Closes: https://bugs.gentoo.org/649992
Package-Manager: Portage-2.3.41, Repoman-2.3.9
sci-physics/root/Manifest | 1 -
.../root/files/root-5.28.00b-glibc212.patch | 11 -
sci-physics/root/files/root-5.32.00-cfitsio.patch | 13 -
sci-physics/root/files/root-5.32.00-chklib64.patch | 24 --
sci-physics/root/files/root-5.32.00-dotfont.patch | 58 ---
.../root/files/root-5.34.05-nobyte-compile.patch | 137 -------
sci-physics/root/files/root-5.34.13-unuran.patch | 40 --
sci-physics/root/files/root-5.34.26-ldflags.patch | 19 -
sci-physics/root/metadata.xml | 3 -
sci-physics/root/root-5.34.36.ebuild | 441 ---------------------
10 files changed, 747 deletions(-)
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 3337509776a..4409b07a8de 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,3 +1,2 @@
-DIST root_v5.34.36.source.tar.gz 75427331 BLAKE2B 203af03e1459c7fe079fcb1b30da145b3262f90c074abb7ff8fb3b1b2b90ac24391ce51aa8afbd10e0db8d69549207f15176207bc30a13720e0ae94342a38dfa SHA512 2cc0c8f8b63b2a3ce01c49c41704483548a7324d92c21a63e3e36a00f4d6f5656a7844fdf48cb71a6f2a2c974112527300ffd3bb5502d8365ffaf138e6ae4c7a
DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1
DIST root_v6.14.00.source.tar.gz 162436586 BLAKE2B 6047fe9fb898be9d4f00f2e6eb378d213996b49b9677f61ccc0250bb6d0801d8410850a39e0983534da2c6a307bd64b0ed6c03ab873a6c8b844500a96444a455 SHA512 2d4e754e3054018a53af28408b218bc52c0c60bea69a3c9e48f0d3feadbfebb559087fb453505b281fe01043f723e4b766cda8fca1e68dbf9e202c67d417e5b3
diff --git a/sci-physics/root/files/root-5.28.00b-glibc212.patch b/sci-physics/root/files/root-5.28.00b-glibc212.patch
deleted file mode 100644
index a365431396f..00000000000
--- a/sci-physics/root/files/root-5.28.00b-glibc212.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- root.orig/net/auth/src/TAFS.cxx 2010-09-14 03:22:22.647915854 +0400
-+++ root/net/auth/src/TAFS.cxx 2010-09-14 03:22:39.034599899 +0400
-@@ -11,6 +11,7 @@
-
- #ifndef WIN32
- # include <unistd.h>
-+# include <sys/stat.h>
- #else
- # define ssize_t int
- # include <io.h>
-
diff --git a/sci-physics/root/files/root-5.32.00-cfitsio.patch b/sci-physics/root/files/root-5.32.00-cfitsio.patch
deleted file mode 100644
index 156667f8fee..00000000000
--- a/sci-physics/root/files/root-5.32.00-cfitsio.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure 2012-01-19 23:44:44.127607638 +0100
-+++ b/configure 2012-01-20 00:19:20.420652913 +0100
-@@ -3435,9 +3435,7 @@
- cfitsioinc=$found_hdr
- cfitsioincdir=$found_dir
-
-- # At this time, libcfitsio.a should always be prefered over .so,
-- # to avoid forcing users to install cfitsio.
-- check_library "libcfitsio cfitsio" "no" "$cfitsiolibdir" \
-+ check_library "libcfitsio cfitsio" "yes" "$cfitsiolibdir" \
- $CFITSIO ${CFITSIO:+$CFITSIO/lib} ${CFITSIO:+$CFITSIO/.libs} \
- ${finkdir:+$finkdir/lib} \
- /usr/local/lib /usr/lib /opt/cfitsio/lib
diff --git a/sci-physics/root/files/root-5.32.00-chklib64.patch b/sci-physics/root/files/root-5.32.00-chklib64.patch
deleted file mode 100644
index 23f20d54f0c..00000000000
--- a/sci-physics/root/files/root-5.32.00-chklib64.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-bug fix for #406817
---- a/configure 2012-02-29 19:46:41.000000000 +0400
-+++ b/configure 2012-03-22 03:28:43.458968696 +0400
-@@ -441,14 +441,13 @@
- fi
- else
- if file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
-- check_link $chklib64
-- ret=$link_result
-- else
-- logmsg " file $filearg $chklib64 | grep '64-bit'"
-- if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
-- ret=1
-- fi
-+ # get real binary .so name from .so ld script
-+ chklib64=$(gawk '($1 == "GROUP") { print $3 }' $chklib64)
- fi
-+ logmsg " file $filearg $chklib64 | grep '64-bit'"
-+ if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
-+ ret=1
-+ fi
- fi
- logmsg " result: $ret"
- if test $ret -eq 1 ; then
diff --git a/sci-physics/root/files/root-5.32.00-dotfont.patch b/sci-physics/root/files/root-5.32.00-dotfont.patch
deleted file mode 100644
index 85d6dea7655..00000000000
--- a/sci-physics/root/files/root-5.32.00-dotfont.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- root/html/src/TClassDocOutput.cxx.orig 2012-05-25 16:18:10.000000000 +0400
-+++ root/html/src/TClassDocOutput.cxx 2012-05-29 21:36:53.813593012 +0400
-@@ -625,7 +625,7 @@
- << "size=\"8,10\";" << endl
- << "ratio=auto;" << endl
- << "margin=0;" << endl
-- << "node [shape=plaintext,fontsize=40,width=4,height=0.75];" << endl
-+ << "node [shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\"DejaVu Serif\"];" << endl
- << "\"" << fCurrentClass->GetName() << "\" [shape=ellipse];" << endl;
-
- std::stringstream ssDep;
-@@ -704,7 +704,7 @@
- outdot << ";" << endl;
- } else if (writeAndMoreFor) {
- outdot << " \"...andmore" << writeAndMoreFor->GetName()
-- << "\" [label=\"...and more\",fontname=\"Times-Italic\",fillcolor=lightgrey,style=filled];" << endl;
-+ << "\" [label=\"...and more\",fontname=\"DejaVu Serif Italic\",fillcolor=lightgrey,style=filled];" << endl;
- }
- }
- if (!levelExists) break;
-@@ -733,7 +733,7 @@
- << "ranksep=0.1;" << endl
- << "nodesep=0;" << endl
- << "margin=0;" << endl;
-- outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << endl;
-+ outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\"DejaVu Serif\"];" << endl;
-
- std::stringstream ssDep;
- const int numColumns = 3;
-@@ -939,7 +939,7 @@
- << "ranksep=0;" << endl
- << "nodesep=0;" << endl
- << "size=\"8,10\";" << endl
-- << "node [fontsize=20,shape=plaintext];" << endl;
-+ << "node [fontsize=20,shape=plaintext,fontname=\"DejaVu Serif\"];" << endl;
-
- for (std::list<std::string>::iterator iFile = listFilesToParse.begin();
- iFile != listFilesToParse.end(); ++iFile) {
-@@ -999,7 +999,8 @@
- << "ranksep=0.7;" << endl
- << "nodesep=0.3;" << endl
- << "size=\"8,8\";" << endl
-- << "ratio=compress;" << endl;
-+ << "ratio=compress;" << endl
-+ << "node [fontname=\"DejaVu Serif\"];" << endl;
-
- TString libs(fCurrentClass->GetSharedLibs());
- outdot << "\"All Libraries\" [URL=\"LibraryDependencies.html\",shape=box,rank=max,fillcolor=lightgray,style=filled];" << endl;
-@@ -1109,7 +1110,8 @@
-
- dotout << "digraph G {" << endl
- << "ratio=auto;" << endl
-- << "rankdir=RL;" << endl;
-+ << "rankdir=RL;" << endl
-+ << "node [fontname=\"DejaVu Serif\"];" << endl;
-
- // loop on all classes
- TClassDocInfo* cdi = 0;
diff --git a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
deleted file mode 100644
index ec67a15887f..00000000000
--- a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Naur root.as-needed/Makefile root/Makefile
---- a/Makefile.orig 2013-02-15 02:27:56.000000000 +0400
-+++ b/Makefile 2013-02-23 02:22:14.556465852 +0400
-@@ -1258,10 +1258,7 @@
- for lib in $(RFLX_GRFLXPY); do \
- rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \
- done; \
-- for lib in $(RFLX_GRFLXPYC); do \
-- rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \
-- done; \
-- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+ if test "x$(RFLX_GRFLXPY)" != "x"; then \
- dir=$(subst lib/,,$(RFLX_GRFLXDD)); \
- 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-unuran.patch b/sci-physics/root/files/root-5.34.13-unuran.patch
deleted file mode 100644
index 8262313184b..00000000000
--- a/sci-physics/root/files/root-5.34.13-unuran.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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/files/root-5.34.26-ldflags.patch b/sci-physics/root/files/root-5.34.26-ldflags.patch
deleted file mode 100644
index b81dbb5edb0..00000000000
--- a/sci-physics/root/files/root-5.34.26-ldflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 3c8bc686abf57e7e2037c4c191cb63a1a5172b5b
-Author: Andrew Savchenko <bircoph@gmail.com>
-Date: Sun Feb 22 03:45:21 2015 +0300
-
- root-5.32.00-prop-flags.patch -> root-5.34.26-prop-flags.patch
-
-diff --git a/config/Makefile.in b/config/Makefile.in
-index 89674e7..91d25b9 100644
---- a/config/Makefile.in
-+++ b/config/Makefile.in
-@@ -29,7 +29,7 @@ EXTRA_CFLAGS := -Iinclude @cflags@
- USERCONF_CFLAGS:= @usercflags@
- EXTRA_CXXFLAGS := -Iinclude @cflags@
- USERCONF_CXXFLAGS:= @usercxxflags@
--EXTRA_LDFLAGS := @ldflags@
-+EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS)
- WERROR := @werror@
- WINRTDEBUG := @winrtdebug@
-
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index b57d99b68fc..da893cfc0e6 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -20,8 +20,6 @@
graphics, GUI toolkit, and a complete visualization framework.
</longdescription>
<use>
- <flag name="c++11"> Build ROOT using the C++11 standard</flag>
- <flag name="c++14"> Build ROOT using the C++14 standard</flag>
<flag name="asimage">Enable support for <pkg>media-libs/libafterimage</pkg></flag>
<flag name="davix">Enable support for DAVIX Data Management Client (https://cern.ch/davix)</flag>
<flag name="fits">Enable support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
@@ -36,7 +34,6 @@
<flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
<flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
<flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag>
- <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
<flag name="roofit">Build RooFit function fitting package</flag>
<flag name="root7">Build experimental features to be released with ROOT 7</flag>
<flag name="shadow">Enable shadow authentication in rootd and proofd</flag>
diff --git a/sci-physics/root/root-5.34.36.ebuild b/sci-physics/root/root-5.34.36.ebuild
deleted file mode 100644
index 3651637f2f5..00000000000
--- a/sci-physics/root/root-5.34.36.ebuild
+++ /dev/null
@@ -1,441 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="http://root.cern.ch/git/root.git"
-else
- SRC_URI="https://root.cern.ch/download/${PN}_v${PV}.source.tar.gz"
- KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit elisp-common eutils fortran-2 multilib prefix python-single-r1 \
- toolchain-funcs user versionator xdg-utils
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="https://root.cern.ch"
-
-SLOT="0/$(get_version_component_range 1-3 ${PV})"
-LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-IUSE="+X afs c++11 c++14 doc emacs examples fits fftw gdml
- graphviz http kerberos ldap +math +memstat mpi mysql odbc
- +opengl openmp oracle postgres prefix pythia6 pythia8
- python qt4 +reflex ruby shadow sqlite ssl table +tiff xinetd
- xml xrootd zeroconf"
-
-# TODO: add support for: davix
-# TODO: unbundle: vdt
-
-REQUIRED_USE="
- !X? ( !opengl !qt4 !tiff )
- mpi? ( math !openmp )
- openmp? ( math !mpi )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-CDEPEND="
- app-arch/xz-utils:0=
- >=dev-lang/cfortran-4.4-r2
- dev-libs/libpcre:3=
- media-fonts/dejavu
- media-libs/freetype:2=
- media-libs/libpng:0=
- sys-libs/zlib:0=
- X? (
- media-libs/ftgl:0=
- media-libs/glew:0=
- x11-libs/libX11:0=
- x11-libs/libXext:0=
- x11-libs/libXpm:0=
- || (
- media-libs/libafterimage[gif,jpeg,png,tiff?]
- >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
- )
- opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
- 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:0=
- )
- afs? ( net-fs/openafs )
- emacs? ( virtual/emacs )
- fits? ( sci-libs/cfitsio:0= )
- fftw? ( sci-libs/fftw:3.0= )
- graphviz? ( media-gfx/graphviz:0= )
- http? ( dev-libs/fcgi:0= )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap:0= )
- math? (
- sci-libs/gsl:0=
- sci-mathematics/unuran:0=
- mpi? ( virtual/mpi )
- )
- mysql? ( virtual/mysql )
- odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
- oracle? ( dev-db/oracle-instantclient-basic:0= )
- postgres? ( dev-db/postgresql:= )
- pythia6? ( sci-physics/pythia:6= )
- pythia8? ( >=sci-physics/pythia-8.1.80:8= <sci-physics/pythia-8.2.0:8= )
- python? ( ${PYTHON_DEPS} )
- ruby? (
- dev-lang/ruby:=
- dev-ruby/rubygems:=
- )
- shadow? ( virtual/shadow )
- sqlite? ( dev-db/sqlite:3= )
- ssl? ( dev-libs/openssl:0= )
- xml? ( dev-libs/libxml2:2= )
- xrootd? ( >=net-libs/xrootd-3.3.5:0= )
- zeroconf? ( net-dns/avahi:0= )
-"
-
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
- reflex? ( dev-cpp/gccxml )
- xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
-
-S="${WORKDIR}/${PN}"
-
-# install stuff in ${P} and not ${PF} for easier tracking in root-docs
-DOC_DIR="/usr/share/doc/${P}"
-
-die_compiler() {
- eerror "You are using a $(tc-getCXX)-$5 without C++$1 capabilities"
- die "Need one of the following C++$1 capable compilers:\n"\
- " >=sys-devel/gcc[cxx]-$2\n"\
- " >=sys-devel/clang-$3\n"\
- " >=dev-lang/icc-$4"
-}
-
-# check compiler to satisfy minimal versions
-# $1 - std version
-# $2 - g++
-# $3 - clang++
-# $4 - icc/icpc
-check_compiler() {
- local cur ver
- case "$(tc-getCXX)" in
- *clang++*)
- ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')"
- cur="$3"
- ;;
- *g++*)
- ver="$(gcc-version)"
- cur="$2"
- ;;
- *icc*|*icpc*)
- ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')"
- cur="$4"
- ;;
- *)
- ewarn "You are using an unsupported compiler."
- ewarn "Please report any issues upstream."
- return 0
- ;;
- esac
- version_is_at_least "${cur}" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
-}
-
-pkg_setup() {
- fortran-2_pkg_setup
- use python && python-single-r1_pkg_setup
- echo
- elog "There are extra options on packages not yet in Gentoo:"
- 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=${EROOT%/}/usr/$(get_libdir)\""
- echo
-
- enewgroup rootd
- enewuser rootd -1 -1 /var/spool/rootd rootd
-
- if use math; then
- if use openmp; then
- if [[ "$(tc-getCXX)" == *g++* && "$(tc-getCXX)" != *clang++* ]] && ! 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
- fi
- elif use mpi; then
- export USE_MPI=1 USE_PARALLEL_MINUIT2=1
- fi
- fi
-
- use c++11 && check_compiler "11" "4.8" "3.3" "13"
- use c++14 && check_compiler "14" "4.9" "3.4" "15"
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
- "${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
- "${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
- "${FILESDIR}"/${PN}-5.32.00-dotfont.patch \
- "${FILESDIR}"/${PN}-5.34.05-nobyte-compile.patch \
- "${FILESDIR}"/${PN}-5.34.13-unuran.patch \
- "${FILESDIR}"/${PN}-5.34.26-ldflags.patch
-
- # make sure we use system libs and headers
- rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || 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 || 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
-
- # In Gentoo, libPythia6 is called libpythia6
- # 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:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
- -e 's:libpq-fe.h:pg_config.h:' \
- configure || die "adjusting configure for Gentoo failed"
-
- hprefixify configure
- hprefixify -e "s,I/usr/include,I${EPREFIX}/usr/include," config/Makefile.in
-
- # CSS should use local images
- sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
-
- # fix reflex path (bug #497280)
- sed -i -e 's|${ROOTSYS}/lib|@libdir@|' config/genreflex.in || die
-
- # QTDIR only used for qt3 in gentoo, and configure looks for it.
- unset QTDIR
-}
-
-src_configure() {
- local -a myconf
- # Some compilers need special care
- case "$(tc-getCXX)" in
- *clang++*)
- myconf=(
- --with-clang
- --with-f77="$(tc-getFC)"
- )
- ;;
- *icc*|*icpc*)
- # For icc we need to provide architecture manually
- # and not to tamper with tc-get*
- use x86 && myconf=( linuxicc )
- use amd64 && myconf=( linuxx8664icc )
- ;;
- *) # gcc goes here too
- myconf=(
- --with-cc="$(tc-getCC)"
- --with-cxx="$(tc-getCXX)"
- --with-f77="$(tc-getFC)"
- --with-ld="$(tc-getCXX)"
- )
- ;;
- esac
-
- # the configure script is not the standard autotools
- myconf+=(
- --prefix="${EPREFIX}/usr"
- --etcdir="${EPREFIX}/etc/root"
- --libdir="${EPREFIX}/usr/$(get_libdir)/${PN}"
- --docdir="${EPREFIX}${DOC_DIR}"
- --tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials"
- --testdir="${EPREFIX}${DOC_DIR}/examples/tests"
- --cflags='${CFLAGS}'
- --cxxflags='${CXXFLAGS}'
- --disable-builtin-afterimage
- --disable-builtin-ftgl
- --disable-builtin-freetype
- --disable-builtin-glew
- --disable-builtin-lzma
- --disable-builtin-pcre
- --disable-builtin-zlib
- --disable-cling
- --disable-werror
- --enable-explicitlink
- --enable-shared
- --enable-soversion
- --fail-on-missing
- --nohowto
- --with-afs-shared=yes
- --with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
- $(use_enable X x11)
- $(use_enable X asimage)
- $(use_enable X xft)
- $(use_enable afs)
- $(use_enable c++11 cxx11)
- $(use_enable c++14 cxx14)
- $(use_enable fits fitsio)
- $(use_enable fftw fftw3)
- $(use_enable gdml)
- $(use_enable graphviz gviz)
- $(use_enable http)
- $(use_enable kerberos krb5)
- $(use_enable ldap)
- $(use_enable math genvector)
- $(use_enable math gsl-shared)
- $(use_enable math mathmore)
- $(use_enable math minuit2)
- $(use_enable math roofit)
- $(use_enable math tmva)
- $(use_enable math vc)
- $(use_enable math vdt)
- $(use_enable math unuran)
- $(use_enable memstat)
- $(use_enable mysql)
- $(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
- $(use_enable odbc)
- $(use_enable opengl)
- $(use_enable oracle)
- $(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 shadow shadowpw)
- $(use_enable sqlite)
- $(use_enable ssl)
- $(use_enable table)
- $(use_enable tiff astiff)
- $(use_enable xml)
- $(use_enable xrootd)
- $(use_enable zeroconf bonjour)
- ${EXTRA_ECONF}
- )
-
- # usex can't be used here, because pg_config may be not
- # installed with USE="-postgres"
- use postgres && myconf+=( --with-pgsql-incdir=$(pg_config --includedir) )
-
- ./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
- # The build system does not handle the dependency of bin/rmkdepend correctly,
- # preventing it to be called in parallel. Build bin/rmkdepend explicitly
- # first to circumvent the problem.
- emake bin/rmkdepend
- emake \
- OPT="${CXXFLAGS}" \
- F77OPT="${FFLAGS}" \
- ROOTSYS="${S}" \
- LD_LIBRARY_PATH="${S}/lib"
- use emacs && elisp-compile build/misc/*.el
-}
-
-daemon_install() {
- 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}
-
- local i
- for i in ${daemons}; do
- newinitd "${FILESDIR}"/${i}.initd ${i}
- newconfd "${FILESDIR}"/${i}.confd ${i}
- done
- if use xinetd; then
- insinto /etc/xinetd
- doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
- fi
-}
-
-desktop_install() {
- cd "${S}"
- 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
-
- insinto /usr/share/icons/hicolor/48x48/apps
- doicon build/package/debian/root-system-bin.xpm
-}
-
-cleanup_install() {
- # Cleanup of files either already distributed or unused on Gentoo
- pushd "${ED}" > /dev/null
- rm usr/share/root/fonts/LICENSE || die
- rm etc/root/proof/*.sample || die
- rm -r etc/root/daemons || die
- # these should be in PATH
- mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
- rm ${DOC_DIR#/}/{INSTALL,LICENSE,COPYING.CINT} || die
- use examples || rm -r ${DOC_DIR#/}/examples || die
- cd usr/$(get_libdir)/root/cint/cint
- rm lib/posix/mktypes lib/dll_stl/setup lib/G__* || die
- rm lib/dll_stl/G__* lib/dll_stl/rootcint_* lib/posix/exten.o || die
- rm include/makehpib || die
- popd > /dev/null
-}
-
-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 "${D}/usr/$(get_libdir)/root"
- use reflex && python_optimize "${D}/usr/$(get_libdir)/root/python/genreflex/"
- fi
- use ruby && \
- echo "RUBYLIB=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
- use emacs && elisp-install ${PN} build/misc/*.{el,elc}
- if use examples; then
- # these should really be taken care of by the root make install
- insinto ${DOC_DIR}/examples/tutorials/tmva
- doins -r tmva/test
- fi
- doenvd 99root
-
- # The build system installs Emacs support unconditionally in the wrong
- # directory. Remove it and call elisp-install in case of USE=emacs.
- rm -r "${ED}"/usr/share/emacs || die
-
- daemon_install
- desktop_install
- cleanup_install
-
- # do not copress files used by ROOT's CLI (.credit, .demo, .license)
- docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials}
- # needed for .license command to work
- dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE"
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2018-11-19 16:25 Guilherme Amadio
0 siblings, 0 replies; 14+ messages in thread
From: Guilherme Amadio @ 2018-11-19 16:25 UTC (permalink / raw
To: gentoo-commits
commit: 74f34fcebed6f459f69038842ef6246c277b1dc9
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 19 07:13:17 2018 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 16:25:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74f34fce
sci-physics/root: version bump to 6.14/06
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/root/Manifest | 2 +-
sci-physics/root/files/root-6.14.06-oracle.patch | 24 +++++++++++
sci-physics/root/metadata.xml | 3 ++
...{root-6.14.04-r3.ebuild => root-6.14.06.ebuild} | 47 +++++++++++++---------
4 files changed, 57 insertions(+), 19 deletions(-)
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 91e7e9b5c73..dc5a9f7f346 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,2 +1,2 @@
DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1
-DIST root_v6.14.04.source.tar.gz 162451369 BLAKE2B c7af9cf18736c900f71c35b7f9df91784058406c738ac49cf93aa6d1caee13b79e1f68be53ea600fc7311a5af76207f9de71f8438bf6eb43681c93f1815b39a7 SHA512 eb8f3fe89f70b222962ecec7bb7a1ff107dd600bc7ad63cbefc5d4e00561cc80b6430da90d1e59f70dbff69158929eec54614bb5df9894d342482b41c051353f
+DIST root_v6.14.06.source.tar.gz 162462837 BLAKE2B a6904b67d1f5964768fa884bd2b5c648390d0b3626b5be8f39ff0e311bf14690d2aff7eb9d6047fa8d5a9de894935067ea8c033592b9795fc34b61aa5f65fcdb SHA512 83698e1213ae9bd4a87ef3160b459c962199585bed7378efc0cfefdc352e6651a17286a11cd925dbcb5d04e1b832d47a3a69849d048731ea9d0d84f9b0f996a4
diff --git a/sci-physics/root/files/root-6.14.06-oracle.patch b/sci-physics/root/files/root-6.14.06-oracle.patch
new file mode 100644
index 00000000000..232d3b08cfa
--- /dev/null
+++ b/sci-physics/root/files/root-6.14.06-oracle.patch
@@ -0,0 +1,24 @@
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Wed, 14 Nov 2018 11:36:49 +0100
+Subject: Fix FindOracle.cmake to find version 18.x
+
+---
+ cmake/modules/FindOracle.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake
+index b7c8cfbb99..6672cb1bbd 100644
+--- a/cmake/modules/FindOracle.cmake
++++ b/cmake/modules/FindOracle.cmake
+@@ -55,7 +55,7 @@ FIND_LIBRARY(
+ )
+ FIND_LIBRARY(
+ ORACLE_LIBRARY_LNNZ
+- NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 ociw32
++ NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 nnz18 ociw32
+ PATHS ${ORACLE_LIB_LOCATION}
+ )
+
+--
+2.19.1
+
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 6d5558e76bb..3c004c04055 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -21,6 +21,9 @@
</longdescription>
<use>
<flag name="asimage">Enable support for <pkg>media-libs/libafterimage</pkg></flag>
+ <flag name="c++11">Build using the C++11 standard</flag>
+ <flag name="c++14">Build using the C++14 standard</flag>
+ <flag name="c++17">Build using the C++17 standard</flag>
<flag name="cuda">Enable support for nVidia CUDA</flag>
<flag name="davix">Enable support for DAVIX Data Management Client (https://cern.ch/davix)</flag>
<flag name="fits">Enable support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
diff --git a/sci-physics/root/root-6.14.04-r3.ebuild b/sci-physics/root/root-6.14.06.ebuild
similarity index 87%
rename from sci-physics/root/root-6.14.04-r3.ebuild
rename to sci-physics/root/root-6.14.06.ebuild
index 0a144e280c7..57b14c7e31d 100644
--- a/sci-physics/root/root-6.14.04-r3.ebuild
+++ b/sci-physics/root/root-6.14.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,21 +16,24 @@ DESCRIPTION="C++ data analysis framework and interpreter from CERN"
HOMEPAGE="https://root.cern"
SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
-IUSE="+X avahi aqua +asimage cuda +davix emacs +examples fits fftw fortran
- +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat
- +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8
- +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test
- +threads +tiff +tmva +unuran vc xinetd +xml xrootd"
+IUSE="+X avahi aqua +asimage c++11 +c++14 c++17 cuda +davix emacs
+ +examples fits fftw fortran +gdml graphviz +gsl http jemalloc
+ kerberos ldap libcxx memstat +minuit mysql odbc +opengl oracle
+ postgres prefix pythia6 pythia8 +python qt5 R +roofit root7
+ shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran
+ vc xinetd +xml xrootd"
SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
KEYWORDS="~amd64 ~x86"
REQUIRED_USE="
+ ^^ ( c++11 c++14 c++17 )
!X? ( !asimage !opengl !qt5 !tiff )
davix? ( ssl xml )
python? ( ${PYTHON_REQUIRED_USE} )
qt5? ( root7 )
+ root7? ( || ( c++14 c++17 ) )
tmva? ( gsl )
"
@@ -109,21 +112,19 @@ RDEPEND="${CDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch
"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
- "${FILESDIR}"/${PN}-6.13.02-hsimple.patch
+ "${FILESDIR}"/${PN}-6.14.06-oracle.patch
)
pkg_setup() {
use fortran && fortran-2_pkg_setup
use python && python-single-r1_pkg_setup
- echo
elog "There are extra options on packages not yet in Gentoo:"
elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
elog "HDFS, Monalisa, MaxDB/SapDB, SRP, VecCore."
- elog "You can use the env variable EXTRA_ECONF variable for this."
+ elog "You can use the environment variable EXTRA_ECONF for this."
elog "For example, for Chirp, you would set: "
elog "EXTRA_ECONF=\"-Dchirp=ON\""
- echo
}
src_prepare() {
@@ -137,16 +138,18 @@ src_prepare() {
# Note: ROOT uses bundled clang because it is patched and API-incompatible
# with vanilla clang. The patches enable the C++ interpreter to work.
-# Since ROOT installs many small files into /etc (~100MB in total),
-# we install it into another directory to avoid making /etc too big.
+# Since ROOT installs many files into /etc (~100MB in total) that don't
+# really belong there, we install it into another directory to avoid
+# making /etc too big.
src_configure() {
local mycmakeargs=(
-DCMAKE_C_FLAGS="${CFLAGS}"
-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+ -DPYTHON_EXECUTABLE="${PYTHON}"
-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)"
-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/share/man"
- -DMCAKE_INSTALL_LIBDIR=$(get_libdir)
+ -DCMAKE_INSTALL_LIBDIR=$(get_libdir)
-DDEFAULT_SYSROOT="${EPREFIX}"
-DCLING_BUILD_PLUGINS=OFF
-Dexplicitlink=ON
@@ -190,10 +193,13 @@ src_configure() {
-Dccache=OFF # use ccache via portage
-Dcastor=OFF
-Dchirp=OFF
+ -Dclad=OFF
-Dcling=ON # cling=OFF is broken
-Dcocoa=$(usex aqua)
-Dcuda=$(usex cuda)
- -Dcxx14=$(usex root7)
+ -Dcxx11=$(usex c++11)
+ -Dcxx14=$(usex c++14)
+ -Dcxx17=$(usex c++17)
-Dcxxmodules=OFF # requires clang, unstable
-Ddavix=$(usex davix)
-Ddcache=OFF
@@ -239,7 +245,7 @@ src_configure() {
-Droofit=$(usex roofit)
-Droot7=$(usex root7)
-Drootbench=OFF
- -Droottest=$(usex test)
+ -Droottest=OFF
-Drpath=OFF
-Druby=OFF # deprecated and broken
-Druntime_cxxmodules=OFF # does not work yet
@@ -250,7 +256,6 @@ src_configure() {
-Dsrp=OFF # not implemented
-Dssl=$(usex ssl)
-Dtable=$(usex table)
- -Dtbb=$(usex tbb)
-Dtcmalloc=OFF
-Dtesting=$(usex test)
-Dthread=$(usex threads)
@@ -269,6 +274,12 @@ src_configure() {
cmake-utils_src_configure
}
+src_compile() {
+ # needed for hsimple.root
+ addwrite /dev/random
+ cmake-utils_src_compile
+}
+
src_install() {
cmake-utils_src_install
@@ -300,7 +311,7 @@ src_install() {
fi
if ! use examples; then
- rm -r test tutorials || die
+ rm -r tutorials || die
fi
if ! use tmva; then
@@ -308,5 +319,5 @@ src_install() {
fi
# clean up unnecessary files from installation
- rm -r emacs || die
+ rm -r emacs test || die
}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2019-03-23 2:35 Benda XU
0 siblings, 0 replies; 14+ messages in thread
From: Benda XU @ 2019-03-23 2:35 UTC (permalink / raw
To: gentoo-commits
commit: 811b7494b9b244f5dae0bb8cc822e09f6bdcc3c9
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 02:32:25 2019 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 02:35:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811b7494
sci-physics/root: Remove header expansion logic from RootNewMacros.cmake.
The fancy path expansion is not needed for Gentoo and actually
causes runtime bugs, like
Error in cling::AutoloadingVisitor::InsertIntoAutoloadingState:
Missing FileEntry for /var/tmp/portage/sci-physics/JSAP-479/work/JSAP-479/DataType/JPSimOutput.hh
requested to autoload type JPSimTriggerInfoTree_t
portage automatically removes PORTAGE_TMPDIR from rpath ELF fields.
The same applies to rootcling headers.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
| 38 +++
sci-physics/root/root-6.16.00-r1.ebuild | 323 +++++++++++++++++++++
2 files changed, 361 insertions(+)
--git a/sci-physics/root/files/root-6.16.00-disable-header-search.patch b/sci-physics/root/files/root-6.16.00-disable-header-search.patch
new file mode 100644
index 00000000000..06748eb6431
--- /dev/null
+++ b/sci-physics/root/files/root-6.16.00-disable-header-search.patch
@@ -0,0 +1,38 @@
+From: Benda Xu <heroxbd@gentoo.org>
+Date: 2019-03-23
+Subject: Remove header expansion logic from module cmake helper.
+
+Description: ROOT module cmake helper by default expands header inclusion to
+absolute path. In Gentoo, that will capture PORTAGE_TMPDIR resulting in various
+runtime bugs. By removing this convolved logic, headers are untouched and become
+more predictible for rootcling at runtime.
+
+Typical bug it solves:
+
+ Error in cling::AutoloadingVisitor::InsertIntoAutoloadingState:
+ Missing FileEntry for /var/tmp/portage/sci-physics/JSAP-479/work/JSAP-479/DataType/JPSimOutput.hh
+ requested to autoload type JPSimTruthTree_t
+ Error in cling::AutoloadingVisitor::InsertIntoAutoloadingState:
+ Missing FileEntry for /var/tmp/portage/sci-physics/JSAP-479/work/JSAP-479/DataType/JPSimOutput.hh
+ requested to autoload type JPSimTriggerInfoTree_t
+
+Forwarded: No need. Gentoo specific.
+
+--- a/cmake/modules/RootNewMacros.cmake 2019-01-23 16:23:37.000000000 +0800
++++ b/cmake/modules/RootNewMacros.cmake 2019-02-25 00:18:04.000000000 +0800
+@@ -250,14 +250,7 @@ function(ROOT_GENERATE_DICTIONARY dictio
+ list(APPEND headerfiles ${fp})
+ list(APPEND _list_of_header_dependencies ${fp})
+ else()
+- find_file(headerFile ${fp} HINTS ${localinclude} ${incdirs} NO_DEFAULT_PATH)
+- find_file(headerFile ${fp} NO_SYSTEM_ENVIRONMENT_PATH)
+- if(headerFile)
+- list(APPEND headerfiles ${headerFile})
+- list(APPEND _list_of_header_dependencies ${headerFile})
+- else()
+- list(APPEND headerfiles ${fp})
+- endif()
++ list(APPEND headerfiles ${fp})
+ unset(headerFile CACHE)
+ endif()
+ endforeach()
diff --git a/sci-physics/root/root-6.16.00-r1.ebuild b/sci-physics/root/root-6.16.00-r1.ebuild
new file mode 100644
index 00000000000..b6b7b6b7a01
--- /dev/null
+++ b/sci-physics/root/root-6.16.00-r1.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_BUILD_TYPE=Release
+# ninja does not work due to fortran
+CMAKE_MAKEFILE_GENERATOR=emake
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
+ llvm prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="https://root.cern"
+SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
+
+IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix emacs +examples
+ fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap
+ libcxx memstat +minuit mysql odbc +opengl oracle postgres prefix
+ pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl
+ table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd
+ zeroconf"
+
+SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="
+ ^^ ( c++11 c++14 c++17 )
+ cuda? ( tmva !c++17 )
+ !X? ( !asimage !opengl !qt5 !tiff )
+ davix? ( ssl xml )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ qt5? ( root7 )
+ root7? ( || ( c++14 c++17 ) )
+ tmva? ( gsl )
+"
+
+CDEPEND="
+ app-arch/lz4
+ app-arch/xz-utils
+ fortran? ( dev-lang/cfortran )
+ dev-libs/libpcre:3
+ dev-libs/xxhash
+ media-fonts/dejavu
+ media-libs/freetype:2
+ media-libs/libpng:0=
+ sys-devel/llvm:5=
+ sys-libs/ncurses:=
+ sys-libs/zlib
+ X? (
+ x11-libs/libX11:0
+ x11-libs/libXext:0
+ x11-libs/libXft:0
+ x11-libs/libXpm:0
+ opengl? (
+ media-libs/ftgl:0=
+ media-libs/glew:0=
+ virtual/opengl
+ virtual/glu
+ x11-libs/gl2ps:0=
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwebengine:5[widgets]
+ )
+ )
+ asimage? ( || (
+ media-libs/libafterimage[gif,jpeg,png,tiff?]
+ >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
+ ) )
+ zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+ cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
+ davix? ( net-libs/davix )
+ emacs? ( virtual/emacs )
+ fftw? ( sci-libs/fftw:3.0= )
+ fits? ( sci-libs/cfitsio:0= )
+ graphviz? ( media-gfx/graphviz )
+ gsl? ( sci-libs/gsl:= )
+ http? ( dev-libs/fcgi:0= )
+ jemalloc? ( dev-libs/jemalloc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap:0= )
+ libcxx? ( sys-libs/libcxx )
+ unuran? ( sci-mathematics/unuran:0= )
+ minuit? ( !sci-libs/minuit )
+ mysql? ( dev-db/mysql-connector-c )
+ odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+ oracle? ( dev-db/oracle-instantclient-basic )
+ postgres? ( dev-db/postgresql:= )
+ pythia6? ( sci-physics/pythia:6 )
+ pythia8? ( sci-physics/pythia:8 )
+ python? ( ${PYTHON_DEPS} )
+ R? ( dev-lang/R )
+ shadow? ( virtual/shadow )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( dev-libs/openssl:0= )
+ tbb? ( >=dev-cpp/tbb-2018 )
+ tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+ vc? ( dev-libs/vc:= )
+ xml? ( dev-libs/libxml2:2= )
+ xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+ xinetd? ( sys-apps/xinetd )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
+ "${FILESDIR}"/${PN}-6.16.00-disable-header-search.patch
+)
+
+pkg_setup() {
+ LLVM_MAX_SLOT=5 llvm_pkg_setup
+
+ use fortran && fortran-2_pkg_setup
+ use python && python-single-r1_pkg_setup
+
+ elog "There are extra options on packages not available in Gentoo."
+ elog "You can use the environment variable EXTRA_ECONF to enable"
+ elog "these packages. For example, for Vdt you would set:"
+ elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
+
+ # CSS should use local images
+ sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+
+ hprefixify core/clingutils/CMakeLists.txt
+}
+
+# Note: ROOT uses bundled clang because it is patched and API-incompatible
+# with vanilla clang. The patches enable the C++ interpreter to work.
+# Since ROOT installs many files into /etc (>100MB in total) that don't
+# really belong there, we install it into another directory to avoid
+# making /etc too big.
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_C_FLAGS="${CFLAGS}"
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
+ -DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+ -DCMAKE_INSTALL_LIBDIR="lib"
+ -DDEFAULT_SYSROOT="${EPREFIX}"
+ -DCLING_BUILD_PLUGINS=OFF
+ -Dexplicitlink=ON
+ -Dexceptions=ON
+ -Dfail-on-missing=ON
+ -Dgnuinstall=OFF
+ -Dshared=ON
+ -Dsoversion=ON
+ -Dbuiltin_llvm=OFF
+ -Dbuiltin_clang=ON
+ -Dbuiltin_afterimage=OFF
+ -Dbuiltin_cfitsio=OFF
+ -Dbuiltin_davix=OFF
+ -Dbuiltin_fftw3=OFF
+ -Dbuiltin_freetype=OFF
+ -Dbuiltin_ftgl=OFF
+ -Dbuiltin_gl2ps=OFF
+ -Dbuiltin_glew=OFF
+ -Dbuiltin_gsl=OFF
+ -Dbuiltin_lz4=OFF
+ -Dbuiltin_lzma=OFF
+ -Dbuiltin_openssl=OFF
+ -Dbuiltin_pcre=OFF
+ -Dbuiltin_tbb=OFF
+ -Dbuiltin_unuran=OFF
+ -Dbuiltin_vc=OFF
+ -Dbuiltin_vdt=OFF
+ -Dbuiltin_veccore=OFF
+ -Dbuiltin_xrootd=OFF
+ -Dbuiltin_xxhash=OFF
+ -Dbuiltin_zlib=OFF
+ -Dx11=$(usex X)
+ -Dxft=$(usex X)
+ -Dafdsmgrd=OFF
+ -Dafs=OFF # not implemented
+ -Dalien=OFF
+ -Dasimage=$(usex asimage)
+ -Dastiff=$(usex tiff)
+ -Dbonjour=$(usex zeroconf)
+ -Dlibcxx=$(usex libcxx)
+ -Dccache=OFF # use ccache via portage
+ -Dcastor=OFF
+ -Dchirp=OFF
+ -Dclad=OFF
+ -Dcling=ON # cling=OFF is broken
+ -Dcocoa=$(usex aqua)
+ -Dcuda=$(usex cuda)
+ -Dcxx11=$(usex c++11)
+ -Dcxx14=$(usex c++14)
+ -Dcxx17=$(usex c++17)
+ -Dcxxmodules=OFF # requires clang, unstable
+ -Ddavix=$(usex davix)
+ -Ddcache=OFF
+ -Dfftw3=$(usex fftw)
+ -Dfitsio=$(usex fits)
+ -Dfortran=$(usex fortran)
+ -Dftgl=$(usex opengl)
+ -Dgdml=$(usex gdml)
+ -Dgenvector=ON # genvector=OFF ignored
+ -Dgeocad=OFF
+ -Dgfal=OFF
+ -Dgl2ps=$(usex opengl)
+ -Dglite=OFF # not implemented
+ -Dglobus=OFF
+ -Dgminimal=OFF
+ -Dgsl_shared=$(usex gsl)
+ -Dgviz=$(usex graphviz)
+ -Dhdfs=OFF
+ -Dhttp=$(usex http)
+ -Dimt=$(usex tbb)
+ -Djemalloc=$(usex jemalloc)
+ -Dkrb5=$(usex kerberos)
+ -Dldap=$(usex ldap)
+ -Dmathmore=$(usex gsl)
+ -Dmemstat=$(usex memstat)
+ -Dminimal=OFF
+ -Dminuit2=$(usex minuit)
+ -Dminuit=$(usex minuit)
+ -Dmonalisa=OFF
+ -Dmysql=$(usex mysql)
+ -Dodbc=$(usex odbc)
+ -Dopengl=$(usex opengl)
+ -Doracle=$(usex oracle)
+ -Dpch=ON # pch=OFF is broken
+ -Dpgsql=$(usex postgres)
+ -Dpythia6=$(usex pythia6)
+ -Dpythia8=$(usex pythia8)
+ -Dpython=$(usex python)
+ -Dqt5web=$(usex qt5)
+ -Dqtgsi=OFF
+ -Dqt=OFF
+ -Drfio=OFF
+ -Droofit=$(usex roofit)
+ -Droot7=$(usex root7)
+ -Drootbench=OFF
+ -Droottest=OFF
+ -Drpath=OFF
+ -Druby=OFF # deprecated and broken
+ -Druntime_cxxmodules=OFF # does not work yet
+ -Dr=$(usex R)
+ -Dsapdb=OFF # not implemented
+ -Dshadowpw=$(usex shadow)
+ -Dsqlite=$(usex sqlite)
+ -Dsrp=OFF # not implemented
+ -Dssl=$(usex ssl)
+ -Dtable=$(usex table)
+ -Dtcmalloc=OFF
+ -Dtesting=$(usex test)
+ -Dthread=$(usex threads)
+ -Dtmva=$(usex tmva)
+ -Dtmva-cpu=$(usex tmva)
+ -Dtmva-gpu=$(usex cuda)
+ -Dunuran=$(usex unuran)
+ -Dvc=$(usex vc)
+ -Dvdt=OFF
+ -Dveccore=OFF
+ -Dxml=$(usex xml)
+ -Dxrootd=$(usex xrootd)
+ ${EXTRA_ECONF}
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ # needed for hsimple.root
+ addwrite /dev/random
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
+ ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
+
+ cat > ${ROOTENV} <<- EOF || die
+ MANPATH="${ROOTSYS}/share/man"
+ PATH="${ROOTSYS}/bin"
+ ROOTPATH="${ROOTSYS}/bin"
+ LDPATH="${ROOTSYS}/lib"
+ EOF
+
+ if use python; then
+ echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
+ fi
+
+ doenvd ${ROOTENV}
+
+ if use emacs; then
+ elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
+ fi
+
+ pushd "${D}/${ROOTSYS}" > /dev/null
+
+ rm -r test emacs bin/*.{csh,sh,fish} || die
+
+ if ! use examples; then
+ rm -r tutorials || die
+ fi
+
+ # create versioned symlinks for binaries
+ cd bin;
+ for exe in *; do
+ dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
+ done
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/
@ 2020-06-20 17:52 Guilherme Amadio
0 siblings, 0 replies; 14+ messages in thread
From: Guilherme Amadio @ 2020-06-20 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 8caf86846d40011171c4967b7b4047884c9540af
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 17:51:42 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 17:51:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8caf8684
sci-physics/root: fix bug #728372
Closes: https://bugs.gentoo.org/728372
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/root/files/root-6.22.00-rlogger.patch | 36 +++++++++++++++++++++++
sci-physics/root/root-6.22.00.ebuild | 1 +
2 files changed, 37 insertions(+)
diff --git a/sci-physics/root/files/root-6.22.00-rlogger.patch b/sci-physics/root/files/root-6.22.00-rlogger.patch
new file mode 100644
index 00000000000..8ff25c86b52
--- /dev/null
+++ b/sci-physics/root/files/root-6.22.00-rlogger.patch
@@ -0,0 +1,36 @@
+From bea87d2cde7c490c8417a97f043eaa6905c27f08 Mon Sep 17 00:00:00 2001
+From: Axel Naumann <Axel.Naumann@cern.ch>
+Date: Wed, 3 Jun 2020 16:38:49 +0200
+Subject: [PATCH] [cmake] Fix ROOT/RLogger.hxx not found:
+
+When building without root7 but with C++14, RLogger is used.
+Make it available to the include directories.
+
+(cherry picked from commit fbe075ceedcd7d7f9993864c82ac5bd2960f3494)
+---
+ core/base/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
+index 66ec9a2224..95eea9b44a 100644
+--- a/core/base/CMakeLists.txt
++++ b/core/base/CMakeLists.txt
+@@ -198,6 +198,7 @@ set(BASE_SOURCES
+ if(CMAKE_CXX_STANDARD GREATER 11)
+ list(APPEND BASE_HEADERS ROOT/RLogger.hxx)
+ list(APPEND BASE_SOURCES v7/src/RLogger.cxx)
++ set(BASE_V7_INC ${CMAKE_SOURCE_DIR}/core/base/v7/inc)
+ # TLogger.hxx may be used without root7 flag, but is placed in v7/inc/,
+ # so we need to tell ROOT_INSTALL_HEADERS() where to find it
+ set(BASE_HEADER_DIRS inc/ v7/inc/)
+@@ -220,6 +221,7 @@ set(Core_dict_headers ${BASE_HEADERS} PARENT_SCOPE)
+ ROOT_OBJECT_LIBRARY(Base ${BASE_SOURCES})
+
+ target_include_directories(Base PRIVATE
++ ${BASE_V7_INC}
+ ${PCRE_INCLUDE_DIR}
+ res
+ ${CMAKE_SOURCE_DIR}/core/foundation/res
+--
+2.27.0
+
diff --git a/sci-physics/root/root-6.22.00.ebuild b/sci-physics/root/root-6.22.00.ebuild
index bc8ff3c8c0f..f81b6676084 100644
--- a/sci-physics/root/root-6.22.00.ebuild
+++ b/sci-physics/root/root-6.22.00.ebuild
@@ -110,6 +110,7 @@ RDEPEND="${CDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
+ "${FILESDIR}"/${PN}-6.22.00-rlogger.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2020-06-20 17:52 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-26 8:45 [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/ Andrew Savchenko
-- strict thread matches above, loose matches on Subject: below --
2015-10-29 10:44 Justin Lecher
2016-06-19 9:55 Andrew Savchenko
2017-12-15 12:01 Guilherme Amadio
2017-12-18 13:13 Guilherme Amadio
2018-03-06 14:43 Guilherme Amadio
2018-03-20 14:15 Benda XU
2018-03-22 14:24 Guilherme Amadio
2018-03-22 14:24 Guilherme Amadio
2018-07-05 11:15 Guilherme Amadio
2018-07-05 11:15 Guilherme Amadio
2018-11-19 16:25 Guilherme Amadio
2019-03-23 2:35 Benda XU
2020-06-20 17:52 Guilherme Amadio
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox