From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8E10D139BC7 for ; Sat, 26 Sep 2015 08:45:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E443F21C0A1; Sat, 26 Sep 2015 08:45:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 620BE21C0A1 for ; Sat, 26 Sep 2015 08:45:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02F923403C1 for ; Sat, 26 Sep 2015 08:45:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B01D23B for ; Sat, 26 Sep 2015 08:45:32 +0000 (UTC) From: "Andrew Savchenko" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Savchenko" Message-ID: <1443257057.0d851cd3d2df0cee4e1b9c7ca7c481fa2caceed4.bircoph@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-physics/root/Manifest sci-physics/root/files/root-5.28.00b-asneeded.patch sci-physics/root/files/root-5.28.00b-prop-ldflags.patch sci-physics/root/files/root-5.28.00b-unuran.patch sci-physics/root/files/root-5.32.00-explicit-functions.patch sci-physics/root/files/root-5.32.00-htmldoc.patch sci-physics/root/files/root-5.32.00-nobyte-compile.patch sci-physics/root/metadata.xml sci-physics/root/root-5.32.03-r2.ebuild X-VCS-Directories: sci-physics/root/files/ sci-physics/root/ X-VCS-Committer: bircoph X-VCS-Committer-Name: Andrew Savchenko X-VCS-Revision: 0d851cd3d2df0cee4e1b9c7ca7c481fa2caceed4 X-VCS-Branch: master Date: Sat, 26 Sep 2015 08:45:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 190a1840-cba8-436e-9c92-06de5cfdfcc3 X-Archives-Hash: 8b1d926c054fc2b7ce50dec5ecca8e98 commit: 0d851cd3d2df0cee4e1b9c7ca7c481fa2caceed4 Author: Andrew Savchenko gmail com> AuthorDate: Sat Sep 26 08:21:13 2015 +0000 Commit: Andrew Savchenko gentoo 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 < conftest.mk - include ${ac_srcdir}/config/Makefile.${arch} - conftest: conftest.c -- \$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@ -+ \$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@ - - conftest.c: - echo "int main() { return 0; }" > \$@ -@@ -723,7 +723,7 @@ - cat < conftest.mk - include ${ac_srcdir}/config/Makefile.${arch} - conftest:conftest.c -- \$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@ -+ \$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@ - - conftest.c: - echo "extern int $linksymbol (); " > \$@ diff --git a/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch b/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch deleted file mode 100644 index 7324319..0000000 --- a/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur root.orig/config/Makefile.in root/config/Makefile.in ---- root.orig/config/Makefile.in 2010-12-14 17:20:26.000000000 +0300 -+++ root/config/Makefile.in 2010-12-17 22:33:34.902161458 +0300 -@@ -27,7 +27,7 @@ - - EXTRA_CFLAGS := -Iinclude @cflags@ - EXTRA_CXXFLAGS := -Iinclude @cflags@ --EXTRA_LDFLAGS := @ldflags@ -+EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) - WINRTDEBUG := @winrtdebug@ - - GLBPATCHFLAGS := @glbpatchcflags@ - diff --git a/sci-physics/root/files/root-5.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 @@ Build ROOT using the C++11 standard Build ROOT using the C++14 standard - Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis Support for images and data from FITS files with sci-libs/cfitsio Enable GDML writer and reader Enable ROOT-CAD interface using sci-libs/opencascade - Generate html documentation Enable http server support including but not limited to fastcgi support Build all math related libraries plugins, needs sci-libs/gsl Build memory statistics library, helps to detect memory leaks 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 -}