From b7ed6121e261e9cc3bfe7f354230cb3568a5b527 Mon Sep 17 00:00:00 2001 From: Andrew Savchenko Date: Wed, 3 Aug 2011 01:47:15 +0400 Subject: Version bump based on bug 374709. (Portage version: 2.2.0_alpha47/git/Linux i686, unsigned Manifest commit) --- sci-physics/root/ChangeLog | 24 + sci-physics/root/Manifest | 22 + sci-physics/root/files/olbd.confd | 9 + sci-physics/root/files/olbd.initd | 26 + sci-physics/root/files/proofd.confd | 12 + sci-physics/root/files/proofd.initd | 26 + .../root/files/root-5.28.00b-asneeded.patch | 20 + .../root/files/root-5.28.00b-glibc212.patch | 11 + .../root/files/root-5.28.00b-prop-ldflags.patch | 13 + sci-physics/root/files/root-5.28.00b-unuran.patch | 39 ++ sci-physics/root/files/root-5.30.00-lzma.patch | 13 + .../root/files/root-5.30.00-nobyte-compile.patch | 137 +++++ .../files/root-5.30.00-xrootd-prop-flags.patch | 623 +++++++++++++++++++++ sci-physics/root/files/rootd.confd | 8 + sci-physics/root/files/rootd.initd | 28 + sci-physics/root/files/xrootd.confd | 8 + sci-physics/root/files/xrootd.initd | 26 + sci-physics/root/metadata.xml | 31 + sci-physics/root/root-5.30.00.ebuild | 339 +++++++++++ 19 files changed, 1415 insertions(+) create mode 100644 sci-physics/root/ChangeLog create mode 100644 sci-physics/root/Manifest create mode 100644 sci-physics/root/files/olbd.confd create mode 100644 sci-physics/root/files/olbd.initd create mode 100644 sci-physics/root/files/proofd.confd create mode 100644 sci-physics/root/files/proofd.initd create mode 100644 sci-physics/root/files/root-5.28.00b-asneeded.patch create mode 100644 sci-physics/root/files/root-5.28.00b-glibc212.patch create mode 100644 sci-physics/root/files/root-5.28.00b-prop-ldflags.patch create mode 100644 sci-physics/root/files/root-5.28.00b-unuran.patch create mode 100644 sci-physics/root/files/root-5.30.00-lzma.patch create mode 100644 sci-physics/root/files/root-5.30.00-nobyte-compile.patch create mode 100644 sci-physics/root/files/root-5.30.00-xrootd-prop-flags.patch create mode 100644 sci-physics/root/files/rootd.confd create mode 100644 sci-physics/root/files/rootd.initd create mode 100644 sci-physics/root/files/xrootd.confd create mode 100644 sci-physics/root/files/xrootd.initd create mode 100644 sci-physics/root/metadata.xml create mode 100644 sci-physics/root/root-5.30.00.ebuild (limited to 'sci-physics') diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog new file mode 100644 index 000000000..0a930ca60 --- /dev/null +++ b/sci-physics/root/ChangeLog @@ -0,0 +1,24 @@ +# ChangeLog for sci-physics/root +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*root-5.30.00 (02 Aug 2011) + + 02 Aug 2011; +files/root-5.28.00b-asneeded.patch, + +files/root-5.28.00b-glibc212.patch, +files/root-5.28.00b-prop-ldflags.patch, + +files/root-5.28.00b-unuran.patch, +root-5.30.00.ebuild, + +files/root-5.30.00-lzma.patch, +files/root-5.30.00-nobyte-compile.patch, + +files/root-5.30.00-xrootd-prop-flags.patch, +files/olbd.confd, + +files/olbd.initd, +files/proofd.confd, +files/proofd.initd, + +files/rootd.confd, +files/rootd.initd, +files/xrootd.confd, + +files/xrootd.initd, +metadata.xml: + Version bump. This are changes from bug 374709 including: + - upatchset update; + - lzma support (for root file data compression); + - X support is now optional (but enabled by default, of course), + this is extremely useful on X-less computating stations; + - fix tmva and roofit documentation installation (pdfs were missed due to + ebuild typo; + - some missed deps. + - libXft dep is controlled by xft flag. + diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest new file mode 100644 index 000000000..a6d709daf --- /dev/null +++ b/sci-physics/root/Manifest @@ -0,0 +1,22 @@ +AUX olbd.confd 197 RMD160 798de1808502f3e4ecfc5f024b56a419d9824057 SHA1 f2a4385fdf9849eafb1d5457727f6fbe80af1da3 SHA256 5a34da76bbe56cd3b8128f05c0d9900f9d7f7ffdcffc5deeb816c78ea46679ba +AUX olbd.initd 714 RMD160 77189b1808d0ef1947652f3aa22852001b57c4af SHA1 be3cc5c39c15707f1e9113ca8c70bed601074f8b SHA256 1c4bde12002e9535d298b653c7f74ff6bab305cde70676f574450c843ef52489 +AUX proofd.confd 415 RMD160 3814aacb63d82b9d060086f9bef304d431a15b4e SHA1 31eb7af239a0042f887b5089a7c6c7ec5d6662e9 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38 +AUX proofd.initd 717 RMD160 a1818375ca1e698f39823d2cdd829e84e6642284 SHA1 0eec6610e5619f2ef9ea614fa1c369d3f2018d3c SHA256 0e8c30f73d7086f71f3d44e6556060af7b62de9ca8262efc932f437246c9a843 +AUX root-5.28.00b-asneeded.patch 712 RMD160 0b3a3d41e309f13310fda607955ad88cc6bc176e SHA1 4fa704d2790e19933155da2587a9c6998d3c4e4f SHA256 17d1d41d8c7f78abbb7cd284af0a6aca544820db72fa72956b473c7c1817a96b +AUX root-5.28.00b-glibc212.patch 276 RMD160 02901df4c8e5e3c7d50a78916f843fde83faf1f0 SHA1 842129d6247255b5fa72778a12f08e1383247cd8 SHA256 e51e127a80e2bf1afad41c2b7ca5233c362bce017057ca489bedb2a9442efb62 +AUX root-5.28.00b-prop-ldflags.patch 433 RMD160 fd1717af9210471d7de0f06a47011e03d3f76d9a SHA1 b5dac8b013219dcfe577f2972fcc1d548f153cc3 SHA256 04f4b65a91e28386c7a857fe361f091943f4bb6fc82a9473ac7605412c199191 +AUX root-5.28.00b-unuran.patch 1531 RMD160 8083784cc831fc304f2e94fdf3b8aa8379d0bd9a SHA1 5c4537ba1922775fb63d65340a18a3c2b1d2311b SHA256 09458c60c9d38af2d204939f752ec25364d04cf66810b7cae5e88368f84c31c8 +AUX root-5.30.00-lzma.patch 533 RMD160 6ae18ea2b9562473466dd55bc305e3fe7f947904 SHA1 213f906f083a76428a36a46fdd33a07d1999c637 SHA256 eb8ff6193e40f855d4bd6cb7457260f9bf60d0518734aaa5ca6ed0253ded051c +AUX root-5.30.00-nobyte-compile.patch 5527 RMD160 61c3dfdd4b8f71f64772e20901f6ee11b8f53e12 SHA1 f914ccb7f7d88dd8d9ba4c1f4d940b14134f2c3b SHA256 82152c92efd5002f9c2b230f141cae6c8111b03bd18370030d62f0f7d7127420 +AUX root-5.30.00-xrootd-prop-flags.patch 32577 RMD160 66bb3089624700a2b5a39dce2399e86503dfdeff SHA1 c7844e5d98ffb4818ba68697ed84e0bbe59a7b23 SHA256 a8e37f09026469953fce0ee7840a9e2dda56c877216999aafb55d40fb050ec2c +AUX rootd.confd 199 RMD160 9ca9864292e7301d3feb6c36d88ba16002b7d7fa SHA1 822983a24e219bd860124f363a1e4250a17026dd SHA256 7b69f646ce0b2546ce797ec4a05949b02302dc5f4e41d2e8896ed0bc6575ac8d +AUX rootd.initd 732 RMD160 d634f635f8c33c5cf5b802f3d2a88e501b4ec0bc SHA1 fd9cd9647fc85109b352fe47f1f62dd2b1ef7acc SHA256 9dc18096ad4e4e3a0be9d4779a905fac702f15df876e4c1f5bcb14233b4df882 +AUX xrootd.confd 200 RMD160 2344c73ca3c27adeb70b092850cfd292af7d58bd SHA1 f2b895f43d3537e8614a907c7c94642f01c084e4 SHA256 03c1191168ddea3bc6621e26eb56e509e6c9a4d58756ffbbd07ff6657200e57d +AUX xrootd.initd 720 RMD160 8465440c1d60d1e713b05f91398300f32a90df0b SHA1 094134cc4a1b29726b3d17ac9524b9695227bb92 SHA256 f2be67b71869713adbded64ea9ef086e29228ed044235d0a54f69a30109d76f4 +DIST RooFit_Users_Manual_2.91-33.pdf 1330062 RMD160 650b616018a5493d5fd7da1dc06c6e54eaa419fb SHA1 f176782746542b00ff60320b4a41e1218db3d006 SHA256 101c4e4c41962238fcabf1caa86cafc51241a1800594491b2e62ef8b565a5646 +DIST TMVAUsersGuide-v4.03.pdf 3913533 RMD160 fbd62b90e7ad47ad69ec62d584417463ec13bf9c SHA1 84a63140cc3e01267d2cc7ffa374a7c24fbed37e SHA256 0cdbb4a2d19eb7a86e2911cfa73a905932e862d6c94be10b7662a9355b0241af +DIST Users_Guide_5_26.pdf 9914765 RMD160 9e67a407d5a4d4f7019ab7b9b29bc696b7974987 SHA1 c2ecb87226e2fa38e6214aaf76dd789663d260dd SHA256 d0887800de7ffe7d6c0957891d44a4b34bf9d0eeb3da7e34b735ef998770bf39 +DIST root_v5.30.00.source.tar.gz 40828616 RMD160 027558ac9b0d294fd26437ff31cb4e149f4dd7e7 SHA1 9549bd357e85bb3855abd78c7183c26dbd247fbb SHA256 9be4a4f01dde85d69d4746d5ee750f31abd6e73eff8738e67b4c50f7b52ec647 +EBUILD root-5.30.00.ebuild 10131 RMD160 788508a56b984029f32a5d31de4e87ee0f5de06d SHA1 58163708011595c82ffb1a4918abe5e3e74771a9 SHA256 c160667e68e2428f961eb285ce03ac1e6a46fc2c5228d6244f803343db2dfc32 +MISC ChangeLog 1078 RMD160 a4e8290de134c25dc08a49d15ed977f586ef1e3d SHA1 f3c41c053f597f2cbba0c640a638c333ed4bf8dd SHA256 98253fdfae46bfe5cea4d137afb4c79419b3a152c96aab281d09edd65264b1de +MISC metadata.xml 1491 RMD160 65724809b563fa497bc739148758b89f4a14d52b SHA1 8c8078d0383141d06ca0467aad45d461fa3229ba SHA256 3ae2d0f5bd3c567a41c98be907e8ecdcd58175d64202d17623ffdf34371051f8 diff --git a/sci-physics/root/files/olbd.confd b/sci-physics/root/files/olbd.confd new file mode 100644 index 000000000..848f4d7ba --- /dev/null +++ b/sci-physics/root/files/olbd.confd @@ -0,0 +1,9 @@ +# conf.d file for olbd daemon + +# User to run as (default is `xrootd') +OLBD_USER="root" + +# +# Please refer to the olbd(1) man(1) page for more +# information on command line parameters. +OLBD_OPTS="" diff --git a/sci-physics/root/files/olbd.initd b/sci-physics/root/files/olbd.initd new file mode 100644 index 000000000..95b7bc56e --- /dev/null +++ b/sci-physics/root/files/olbd.initd @@ -0,0 +1,26 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/olbd.initd,v 1.1 2008/12/18 18:10:18 bicatali Exp $ + +depend() { + need net + use dns logger + provide root-file-server +} + +start() { + ebegin "Starting ROOT open load balancer server" + start-stop-daemon --start --quiet --user=${OLBD_USER} \ + --make-pidfile --pidfile=/var/run/olbd.pid \ + --exec /usr/bin/olbd --background -- ${OLBD_OPTS} + eend $? +} + +stop() { + ebegin "Stopping ROOT open load balancer server" + start-stop-daemon --stop --quiet \ + --pidfile=/var/run/olbd.pid \ + --exec /usr/bin/olbd + eend $? +} diff --git a/sci-physics/root/files/proofd.confd b/sci-physics/root/files/proofd.confd new file mode 100644 index 000000000..81720a7eb --- /dev/null +++ b/sci-physics/root/files/proofd.confd @@ -0,0 +1,12 @@ +# conf.d file for proof daemon +# +# Please refer to the proofd(1) man(1) page for more information on +# command line parameters. +# +PROOFD_OPTS= + +# Specify your base of your PROOF directory here. If left blank, it +# will use the system default (e.g., /usr/share/root/proof). +# Note, however, that ROOT recommends that this directory is shared (via +# NFS or similar) among all the nodes of the cluster. +PROOF_DIR= diff --git a/sci-physics/root/files/proofd.initd b/sci-physics/root/files/proofd.initd new file mode 100644 index 000000000..3fac75c4d --- /dev/null +++ b/sci-physics/root/files/proofd.initd @@ -0,0 +1,26 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/proofd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $ + +depend() { + need root-file-server + use logger +} + +start() { + ebegin "Starting parallel ROOT facility server" + start-stop-daemon --start --quiet \ + --pidfile /var/run/proofd.pid \ + --exec /usr/bin/proofd -- ${PROOFD_OPTS} ${PROOF_DIR} + pidof /usr/bin/proofd > /var/run/proofd.pid + eend $? +} + +stop() { + ebegin "Stopping parallel ROOT facility server" + start-stop-daemon --stop --quiet \ + --pidfile /var/run/proofd.pid \ + --exec /usr/bin/proofd + eend $? +} diff --git a/sci-physics/root/files/root-5.28.00b-asneeded.patch b/sci-physics/root/files/root-5.28.00b-asneeded.patch new file mode 100644 index 000000000..b845247e1 --- /dev/null +++ b/sci-physics/root/files/root-5.28.00b-asneeded.patch @@ -0,0 +1,20 @@ +--- 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-glibc212.patch b/sci-physics/root/files/root-5.28.00b-glibc212.patch new file mode 100644 index 000000000..a36543139 --- /dev/null +++ b/sci-physics/root/files/root-5.28.00b-glibc212.patch @@ -0,0 +1,11 @@ +--- 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 ++# include + #else + # define ssize_t int + # include + 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 new file mode 100644 index 000000000..732431943 --- /dev/null +++ b/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000..76422daed --- /dev/null +++ b/sci-physics/root/files/root-5.28.00b-unuran.patch @@ -0,0 +1,39 @@ +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.30.00-lzma.patch b/sci-physics/root/files/root-5.30.00-lzma.patch new file mode 100644 index 000000000..b35f7fddd --- /dev/null +++ b/sci-physics/root/files/root-5.30.00-lzma.patch @@ -0,0 +1,13 @@ +--- root/configure.orig 2011-07-10 11:51:42.000000000 +0400 ++++ root/configure 2011-07-10 11:54:40.053175390 +0400 +@@ -2430,8 +2430,8 @@ + check_header "lzma.h" "" \ + $LZMA ${LZMA:+$LZMA/include} \ + ${finkdir:+$finkdir/include} \ +- /usr/local/include /usr/include/lzma /usr/local/include/lzma \ +- /opt/lzma/include /usr/include ++ /usr/local/include /usr/include /usr/local/include \ ++ /opt/lzma/include + if test "x$found_dir" = "x" ; then + enable_builtin_lzma=yes + else diff --git a/sci-physics/root/files/root-5.30.00-nobyte-compile.patch b/sci-physics/root/files/root-5.30.00-nobyte-compile.patch new file mode 100644 index 000000000..179e5790c --- /dev/null +++ b/sci-physics/root/files/root-5.30.00-nobyte-compile.patch @@ -0,0 +1,137 @@ +diff -Naur root.as-needed/Makefile root/Makefile +--- root.as-needed/Makefile 2011-07-10 10:42:49.758191296 +0400 ++++ root/Makefile 2011-07-10 10:43:21.493339703 +0400 +@@ -1167,10 +1167,7 @@ + if test "x$(RFLX_GRFLXPY)" != "x"; then \ + rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \ + fi; \ +- if test "x$(RFLX_GRFLXPYC)" != "x"; then \ +- rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \ +- fi; \ +- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \ ++ if test "x$(RFLX_GRFLXPY)" != "x"; then \ + dir=$(RFLX_GRFLXDD:lib/=); \ + while test "x$${dir}" != "x" && \ + test -d $(DESTDIR)$(LIBDIR)/$${dir} && \ +diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk +--- root.as-needed/bindings/pyroot/Module.mk 2011-07-10 10:42:48.991561304 +0400 ++++ root/bindings/pyroot/Module.mk 2011-07-10 10:43:21.493339703 +0400 +@@ -48,8 +48,6 @@ + ROOTPY := $(subst $(MODDIR),$(LPATH),$(ROOTPYS)) + $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@ + endif +-ROOTPYC := $(ROOTPY:.py=.pyc) +-ROOTPYO := $(ROOTPY:.py=.pyo) + + # used in the main Makefile + ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH)) +@@ -68,10 +66,8 @@ + include/%.h: $(PYROOTDIRI)/%.h + cp $< $@ + +-%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' +-%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' + +-$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \ ++$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) \ + $(ROOTLIBSDEP) $(PYTHONLIBDEP) + @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ + "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \ +@@ -113,7 +109,7 @@ + + distclean-$(MODNAME): clean-$(MODNAME) + @rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \ +- $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \ ++ $(ROOTPY) $(PYROOTMAP) \ + $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64) + + distclean:: distclean-$(MODNAME) +diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules +--- root.as-needed/build/package/debian/rules 2011-07-10 10:42:49.241549346 +0400 ++++ root/build/package/debian/rules 2011-07-10 10:48:06.989670589 +0400 +@@ -691,10 +691,6 @@ + -X$(SYSCONFDIR)/root/system.rootauthrc \ + -X$(SYSCONFDIR)/root/system.rootdaemonrc \ + -X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a \ +- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc \ +- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo \ +- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc \ +- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo \ + -X$(PREFIX)/lib/root/$(SOVERS)/cint7 \ + -X$(PREFIX)/include/root/Minuit2 + # $(foreach i, \ +diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk +--- root.as-needed/cint/cintex/Module.mk 2011-07-10 10:42:49.104889217 +0400 ++++ root/cint/cintex/Module.mk 2011-07-10 10:43:21.496672876 +0400 +@@ -31,10 +31,6 @@ + CINTEXPY := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS)) + $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@ + endif +-ifneq ($(BUILDPYTHON),no) +-CINTEXPYC := $(CINTEXPY:.py=.pyc) +-CINTEXPYO := $(CINTEXPY:.py=.pyo) +-endif + + # used in the main Makefile + ALLHDRS += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH)) +@@ -86,8 +82,6 @@ + fi) + cp $< $@ + +-%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' +-%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' + + $(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \ + $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP) +diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk +--- root.as-needed/cint/reflex/Module.mk 2011-07-10 10:42:49.074890651 +0400 ++++ root/cint/reflex/Module.mk 2011-07-10 10:43:21.496672876 +0400 +@@ -48,9 +48,6 @@ + RFLX_GRFLXS := $(wildcard $(RFLX_GRFLXSD)/*.py) + RFLX_GRFLXPY := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS)) + RFLX_GRFLXPY += $(RFLX_GCCXMLPATHPY) +-ifneq ($(BUILDPYTHON),no) +-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY)) +-endif + + RFLX_LIBDIR = $(LIBDIR) + +@@ -92,7 +89,7 @@ + + ALLEXECS += $(RFLX_GENMAPX) + +-POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) ++POSTBIN += $(RFLX_GRFLXPY) + + ##### local rules ##### + .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \ +@@ -122,8 +119,6 @@ + mkdir -p lib/python/genreflex; fi ) + cp $< $@ + +-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py +- @python -c 'import py_compile; py_compile.compile( "$<" )' + + $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap + +@@ -149,7 +144,7 @@ + $(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \ + -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL) + +-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) ++all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY) + + clean-genreflex: + @rm -rf lib/python/genreflex +diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt +--- root.as-needed/cint/reflex/python/CMakeLists.txt 2011-07-10 10:42:49.074890651 +0400 ++++ root/cint/reflex/python/CMakeLists.txt 2011-07-10 10:43:21.496672876 +0400 +@@ -15,7 +15,7 @@ + ##################### sources #################### + + FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py) +-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE) ++SET(GENREFLEX_SCRIPT PARENT_SCOPE) + + ##################### gccxmlpath #################### + diff --git a/sci-physics/root/files/root-5.30.00-xrootd-prop-flags.patch b/sci-physics/root/files/root-5.30.00-xrootd-prop-flags.patch new file mode 100644 index 000000000..671cfe3df --- /dev/null +++ b/sci-physics/root/files/root-5.30.00-xrootd-prop-flags.patch @@ -0,0 +1,623 @@ +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.env.in root/net/xrootd/src/xrootd/config/GNUmake.env.in +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.env.in 2011-06-28 13:49:44.000000000 +0400 ++++ root/net/xrootd/src/xrootd/config/GNUmake.env.in 2011-07-10 10:27:45.001375019 +0400 +@@ -47,6 +47,7 @@ + CFHASXRDCRYPTO = @hasxrdcrypto@ + + CFLAGS += $(CFSTRLCPY) $(CFHASOLDHDRS) $(CFFSTATAT) $(CFHASLIBZ) $(CFATOMICS) ++CFLAGS += $(CXXFLAGS) + + # AFS relevant variables + @incafs@ +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.options.in root/net/xrootd/src/xrootd/config/GNUmake.options.in +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.options.in 2011-06-28 13:49:44.000000000 +0400 ++++ root/net/xrootd/src/xrootd/config/GNUmake.options.in 2011-07-10 10:24:16.131357441 +0400 +@@ -16,7 +16,7 @@ + CF32="$(TYPECF32)" \ + CFOP="$(@buildopt@)" \ + LD="$(TYPELD)" \ +-LDOP="$(@buildopt@)" \ ++LDOP="$(LDFLAGS)" \ + LDSO="$(TYPELDSO)" \ + LIBS=" @ldsyslibs@ $(TYPELIBS)" \ + TYPE="$(TYPE)" +@@ -33,7 +33,7 @@ + CF32="$(TYPECF32)" \ + CFOP="$(@buildopt@)" \ + LD="$(TYPELD)" \ +-LDOP="$(@buildopt@)" \ ++LDOP="$(LDFLAGS)" \ + LDSO="$(TYPELDSO)" \ + LIBS=" @ldsyslibs@ $(TYPELIBS)" \ + TYPE="$(TYPE)" +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd 2011-06-28 13:49:44.000000000 +0400 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd 2011-07-10 10:24:16.131357441 +0400 +@@ -11,7 +11,7 @@ + -Wall -Wno-deprecated $(CFTRACE) + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + TYPELDSO = -shared + TYPESHLIB = so +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc 2011-06-28 13:49:44.000000000 +0400 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc 2011-07-10 10:24:16.131357441 +0400 +@@ -11,7 +11,7 @@ + -Wall -Wno-deprecated -D__linux__ $(CFTRACE) + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + TYPELDSO = -shared + TYPESHLIB = so +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 2011-06-28 13:49:44.000000000 +0400 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 2011-07-10 10:24:16.131357441 +0400 +@@ -11,7 +11,7 @@ + -Wall -Wno-deprecated -D__linux__ $(CFTRACE) + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + TYPELDSO = -shared + TYPESHLIB = so +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 2011-06-28 13:49:44.000000000 +0400 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 2011-07-10 10:24:16.131357441 +0400 +@@ -11,7 +11,7 @@ + -Wall -Wno-deprecated -D__linux__ $(CFTRACE) + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + TYPELDSO = -m64 -shared + TYPESHLIB = so +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc root/net/xrootd/src/xrootd/config/GNUmake.rules.icc +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc 2011-06-28 13:49:44.000000000 +0400 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.icc 2011-07-10 10:24:16.131357441 +0400 +@@ -13,7 +13,7 @@ + -ansi -D__linux__ -D__ICC__ -wd1476 -wd191 -wd468 -wd858 -wd1224 -wd584 $(CFTRACE) + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + TYPELDSO = -m32 -shared + TYPESHLIB = so +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 2011-06-28 13:49:44.000000000 +0400 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 2011-07-10 10:24:16.131357441 +0400 +@@ -14,7 +14,7 @@ + -wd1572 -wd584 -i-dynamic $(CFTRACE) + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + TYPELDSO = -m64 -shared + TYPESHLIB = so +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos root/net/xrootd/src/xrootd/config/GNUmake.rules.macos +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos 2011-06-28 13:49:44.000000000 +0400 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos 2011-07-10 10:24:16.131357441 +0400 +@@ -18,7 +18,7 @@ + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + TYPELINK = -undefined dynamic_lookup -multiply_defined suppress +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + ifeq ($(subst $(MACOSX_MINOR),,1234),1234) + TYPELDSO = $(TYPELINK) -dynamiclib -single_module -m32 +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 2011-06-28 13:49:44.000000000 +0400 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 2011-07-10 10:24:16.131357441 +0400 +@@ -15,7 +15,7 @@ + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + TYPELINK = -undefined dynamic_lookup -multiply_defined suppress +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + ifeq ($(subst $(MACOSX_MINOR),,1234),1234) + TYPELDSO = $(TYPELINK) -dynamiclib -single_module -m64 +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc 2011-06-28 13:49:44.000000000 +0400 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc 2011-07-10 10:24:16.131357441 +0400 +@@ -11,7 +11,7 @@ + -Wall -Wno-deprecated -DSUNGCC $(CFTRACE) + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + TYPELDSO = -shared + TYPESHLIB = so +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile 2011-06-28 13:49:42.000000000 +0400 ++++ root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile 2011-07-10 10:24:16.131357441 +0400 +@@ -71,7 +71,7 @@ + + $(TESTBIN): $(OBJECTB) $(LIBDEPS) + @echo Creating executable $(TESTBIN) +- $(ECHO)$(LD) $(CFLAGS) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN) ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN) + + $(OBJDIR)/XrdAccAccess.o: XrdAccAccess.cc XrdAccAccess.hh \ + XrdAccCapability.hh XrdAccConfig.hh XrdAccGroups.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile 2011-06-28 13:49:42.000000000 +0400 ++++ root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile 2011-07-10 10:24:16.131357441 +0400 +@@ -59,7 +59,7 @@ + + $(XRDADLER32): $(XRDADLER32_OBJ) $(XRDADLERDEPT) + @echo Creating executable $(XRDADLER32) +- $(ECHO)$(LD) $(LDOP) $(XRDADLER32_OBJ) $(XRDADLERDEPS) $(XRDADLERLIBS) -o $(XRDADLER32) ++ $(ECHO) $(LD) $(LDFLAGS) $(XRDADLER32_OBJ) $(XRDADLERDEPS) $(XRDADLERLIBS) -o $(XRDADLER32) + + $(XRDADLER32_OBJ): Xrdadler32.cc \ + XrdPosixExtern.hh XrdPosixXrootd.hh \ +@@ -90,7 +90,7 @@ + + $(XRDMPXBIN): $(XRDMPXOBJ) $(XrdMPXDEPS) + @echo Creating executable $(XRDMPXBIN) +- $(ECHO)$(LD) $(LDOP) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN) ++ $(ECHO)$(CC) $(CXXFLAGS) $(LDFLAGS) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN) + + $(XRDMPXOBJ): XrdMpxStats.cc \ + XrdNetDNS.hh XrdNetSocket.hh XrdNetOpts.hh \ +@@ -106,7 +106,7 @@ + + $(XRDW41): $(XRDW41_OBJ) $(XRDW41_DEPS) + @echo Creating executable $(XRDW41) +- $(ECHO)$(LD) $(LDOP) $(XRDW41_OBJ) $(XRDW41LIBS) -o $(XRDW41) ++ $(ECHO)$(CC) $(CXXFLAGS) $(LDFLAGS) $(XRDW41_OBJ) $(XRDW41LIBS) -o $(XRDW41) + + $(XRDW41_OBJ): XrdWait41.cc \ + XrdOucTList.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile 2011-06-28 13:49:43.000000000 +0400 ++++ root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile 2011-07-10 10:24:16.131357441 +0400 +@@ -67,7 +67,7 @@ + $(ECHO)ranlib $(LIBARCH) + + @echo Creating shared library $(LIBRARY) +- $(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) + + $(OBJDIR)/XrdBwm.o: XrdBwm.cc XrdBwm.hh \ + XrdAccAuthorize.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile 2011-06-28 13:49:41.000000000 +0400 ++++ root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile 2011-07-10 10:24:16.131357441 +0400 +@@ -160,17 +160,17 @@ + $(LIBSHARED): $(OBJECTS) $(LIBDEP) + @echo Creating shared library $(LIBSHARED) + $(ECHO)rm -f $(LIBSHARED) +- $(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED) ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED) + ifneq ($(subst $(MACOSX_MINOR),,1234),1234) + $(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \ +- $(CC) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \ + fi + endif + + $(LIBRARY_JNI): $(OBJECT_JNI) + @echo Creating shared library $(LIBRARY_JNI) + $(ECHO)rm -f $(LIBRARY_JNI); +- $(ECHO)$(CC) $(CFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI) ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI) + + $(CLASS_JNI_TARGET): $(CLASS_JNI).java + @echo Creating JNI class file $(CLASS_JNI_TARGET) +@@ -178,27 +178,27 @@ + + $(BINDIR)/TestXrdClient_read: $(OBJECTS) $(OBJECTD) $(LIBDEPS) + @echo Creating executable $(BINDIR)/TestXrdClient_read +- $(ECHO)$(LD) $(LDOP) $(OBJECTD) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient_read ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTD) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient_read + + $(BINDIR)/TestXrdClient: $(OBJECTS) $(OBJECTB) $(LIBDEPS) + @echo Creating executable $(BINDIR)/TestXrdClient +- $(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient + + $(XRDCP): $(OBJECTS) $(OBJECTC) $(LIBDEPS) + @echo Creating executable $(XRDCP) +- $(ECHO)$(LD) $(LDOP) $(OBJECTC) $(BINLIBS) $(LIBS) $(LIBZ) -o $(XRDCP) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTC) $(BINLIBS) $(LIBS) $(LIBZ) -o $(XRDCP) + + $(XRDPREPTOOL): $(OBJECTS) $(OBJECT_PREPTOOL) $(LIBDEPS) + @echo Creating executable $(XRDPREPTOOL) +- $(ECHO)$(LD) $(LDOP) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBS) -o $(XRDPREPTOOL) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBS) -o $(XRDPREPTOOL) + + $(XRDSTAGETOOL): $(OBJECTS) $(OBJECT_STAGETOOL) $(LIBDEPS) + @echo Creating executable $(XRDSTAGETOOL) +- $(ECHO)$(LD) $(LDOP) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBS) -o $(XRDSTAGETOOL) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBS) -o $(XRDSTAGETOOL) + + $(XRDCLI): $(OBJECTS) $(OBJECT_CLI) $(LIBDEPS) + @echo Creating executable $(XRDCLI) +- $(ECHO)$(LD) $(LDOP) $(OBJECT_CLI) $(BINLIBS) $(LIBS) $(LIBREADLINE) -o $(XRDCLI) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECT_CLI) $(BINLIBS) $(LIBS) $(LIBREADLINE) -o $(XRDCLI) + + $(XRDADMIN): $(PERLMOD) + $(ECHO)if [ "$(PERLBIN)" != "" ]; then \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile 2011-06-28 13:49:43.000000000 +0400 ++++ root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile 2011-07-10 10:24:16.138023789 +0400 +@@ -136,7 +136,7 @@ + + $(BINARY): $(OBJSRVR) $(OBJBOTH) $(LIBDEPS) + @echo Creating executable $(BINARY) +- $(ECHO)$(LD) $(LDOP) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY) + + + $(LIBRARY): $(OBJCLNT) $(OBJBOTH) +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile 2011-06-28 13:49:41.000000000 +0400 ++++ root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile 2011-07-10 10:24:16.138023789 +0400 +@@ -90,11 +90,11 @@ + + $(TARGCNSD): $(OBJCNSD) $(OBJCOM) $(LIBDEP) + @echo Creating executable $(BINDIR)/XrdCnsd +- $(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd ++ $(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd + + $(TARGSSI): $(OBJSSI) $(OBJCOM) $(LIBDEP) + @echo Creating executable $(BINDIR)/cns_ssi +- $(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi ++ $(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi + + $(OBJDIR)/XrdCnsConfig.o: XrdCnsConfig.hh XrdCnsConfig.cc \ + XrdCnsDaemon.hh XrdCnsLogRec.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile 2011-06-28 13:49:42.000000000 +0400 ++++ root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile 2011-07-10 10:24:16.138023789 +0400 +@@ -139,7 +139,7 @@ + + $(LIBRARY): $(OBJECTS) $(LIBUTIL) + @echo Creating shared library $(LIBRARY) +- $(ECHO)$(CC) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY) + + $(LIBASSL): $(OBJCSSL) + @echo Creating archive $(LIBASSL) +@@ -149,11 +149,11 @@ + + $(LIBCSSL): $(OBJCSSL) $(LIBARCH) $(LIBUTIL) + @echo Creating shared library $(LIBCSSL) +- $(ECHO)$(LD) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL) + + $(CRYPTOTEST): $(OBJECTA) $(LIBARCH) $(LIBDEPS) + @echo Creating executable $(CRYPTOTEST) +- $(ECHO)$(LD) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST) + + $(OBJDIR)/XrdCryptotest.o: XrdCryptotest.cc XrdSutAux.hh XProtocol.hh XrdSutBucket.hh \ + XrdCryptoAux.hh XrdCryptoFactory.hh XrdCryptoCipher.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdFfs/GNUmakefile root/net/xrootd/src/xrootd/src/XrdFfs/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdFfs/GNUmakefile 2011-06-28 13:49:41.000000000 +0400 ++++ root/net/xrootd/src/xrootd/src/XrdFfs/GNUmakefile 2011-07-10 10:37:08.791154841 +0400 +@@ -82,7 +82,7 @@ + + $(BINARY): $(OBJECTS) $(OBJBIN) $(BINDEPS) + @echo Creating executable $(BINARY) +- $(ECHO)$(LD) $(LDOP) $(OBJBIN) $(BINDEPS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJBIN) $(BINDEPS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY) + + $(OBJDIR)/XrdFfsDent.o: XrdFfsDent.cc XrdFfsDent.hh + @echo Compiling XrdFfsDent.cc +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile 2011-06-28 13:49:42.000000000 +0400 ++++ root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile 2011-07-10 10:24:16.138023789 +0400 +@@ -134,15 +134,15 @@ + + $(BINADMIN): $(OBJLIB) $(OBJADMIN) $(OBJDEPS) + @echo Creating executable $(BINADMIN) +- $(ECHO)$(LD) $(LDOP) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINADMIN) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINADMIN) + + $(BINPURGD): $(OBJLIB) $(OBJPURG) $(OBJADDS) $(OBJDEPS) + @echo Creating executable $(BINPURGD) +- $(ECHO)$(LD) $(LDOP) $(OBJPURG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPURGD) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJPURG) $(OBJADDS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINPURGD) + + $(BINXFRD): $(OBJLIB) $(OBJXFR) $(OBJADDS) $(OBJDEPS) + @echo Creating executables $(BINXFRD) +- $(ECHO)$(LD) $(LDOP) $(OBJXFR) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINXFRD) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJXFR) $(OBJADDS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINXFRD) + + $(BINAGNT): $(BINXFRD) + @echo Creating executables $(BINAGNT) +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile 2011-06-28 13:49:43.000000000 +0400 ++++ root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile 2011-07-10 10:24:16.138023789 +0400 +@@ -141,45 +141,45 @@ + + $(ADMIN): $(OBJECTS_BIN_ADM) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys + + $(COLLECTOR): $(OBJECTS_BIN_CTR) $(LIBRARY_CTR) \ + $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys + + $(CONVTIME): $(OBJECTS_BIN_CTM) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ + + $(COUT2FILE): $(OBJECTS_BIN_C2F) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ + + $(DEBUGPACKET): $(OBJECTS_BIN_DBP) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ + + $(DECODER): $(OBJECTS_BIN_DEC) $(LIBRARY_DEC) $(LIBRARY_OUC) \ + $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ + + $(DUMPPACKETS): $(OBJECTS_BIN_DMP) $(LIBRARY_DEC) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ + + $(FSENDER): $(OBJECTS_BIN_FSD) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ + + $(SENDER): $(OBJECTS_BIN_SND) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys + + $(TESTPARSER): $(OBJECTS_BIN_TPR) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ + + $(OBJDIR)/%.o : %.cc + @echo Compiling $( /var/run/rootd.pid + eend ${retval} +} + +stop() { + ebegin "Stopping ROOT file server" + start-stop-daemon --stop --quiet \ + --pidfile /var/run/rootd.pid \ + --exec /usr/bin/rootd + eend $? +} diff --git a/sci-physics/root/files/xrootd.confd b/sci-physics/root/files/xrootd.confd new file mode 100644 index 000000000..e725cd1e7 --- /dev/null +++ b/sci-physics/root/files/xrootd.confd @@ -0,0 +1,8 @@ +# conf.d file for xroot daemon + +# User to run as (default is `root') +XROOTD_USER="root" + +# Please refer to the xrootd(1) man(1) page for more +# information on command line parameters. +XROOTD_OPTS="" diff --git a/sci-physics/root/files/xrootd.initd b/sci-physics/root/files/xrootd.initd new file mode 100644 index 000000000..27e0001a9 --- /dev/null +++ b/sci-physics/root/files/xrootd.initd @@ -0,0 +1,26 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/xrootd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $ + +depend() { + need net + use logger dns + provide root-file-server +} + +start() { + ebegin "Starting extended ROOTD file server" + start-stop-daemon --start --quiet --user ${XROOTD_USER} \ + --make-pidfile --pidfile /var/run/xrootd.pid \ + --exec /usr/bin/xrootd --background -- ${XROOTD_OPTS} + eend $? +} + +stop() { + ebegin "Stopping extended ROOTD file server" + start-stop-daemon --stop --quiet \ + --pidfile /var/run/xrootd.pid \ + --exec /usr/bin/xrootd + eend $? +} diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml new file mode 100644 index 000000000..ba7366814 --- /dev/null +++ b/sci-physics/root/metadata.xml @@ -0,0 +1,31 @@ + + + +sci-physics + + 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. + + + + Buld 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 + Build the new cling interactive interpreter based on sys-devel/llvm + Build all math related libraries plugins, needs sci-libs/gsl + + Builds the interface to Pythia-6 (sci-physics/pythia) + high energy physics generation events library + + + Builds the interface to Pythia-8 (sci-physics/pythia) + high energy physics generation events library + + Builds the reflection database for the C++ interpretor + Build the xrootd low latency file server + + diff --git a/sci-physics/root/root-5.30.00.ebuild b/sci-physics/root/root-5.30.00.ebuild new file mode 100644 index 000000000..a4c4bf8ec --- /dev/null +++ b/sci-physics/root/root-5.30.00.ebuild @@ -0,0 +1,339 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.3 2011/06/21 14:31:50 jlec Exp $ + +EAPI=3 +PYTHON_DEPEND="python? 2" +inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs flag-o-matic + +#DOC_PV=$(get_major_version)_$(get_version_component_range 2) +DOC_PV=5_26 +ROOFIT_DOC_PV=2.91-33 +TMVA_DOC_PV=4.03 +PATCH_PV=5.28.00b + +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? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.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 ) )" + +SLOT="0" +LICENSE="LGPL-2.1" +KEYWORDS="~amd64 ~x86" +IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap + llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres pythia6 + pythia8 python +reflex ruby qt4 ssl xft xml xinetd xrootd" + +CDEPEND="app-arch/xz-utils + >=dev-lang/cfortran-4.4-r2 + dev-libs/libpcre + media-libs/freetype + media-libs/giflib + media-libs/libpng + media-libs/tiff + sys-apps/shadow + sys-libs/zlib + virtual/jpeg + X? ( + media-libs/ftgl + media-libs/glew + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm + || ( >=media-libs/libafterimage-1.20 >=x11-wm/afterstep-2.2.11 ) + opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) + qt4? ( x11-libs/qt-gui:4 + x11-libs/qt-opengl:4 + x11-libs/qt-qt3support:4 + x11-libs/qt-svg:4 + x11-libs/qt-webkit:4 + x11-libs/qt-xmlpatterns:4 ) + xft? ( x11-libs/libXft ) ) + afs? ( net-fs/openafs ) + avahi? ( net-dns/avahi ) + clarens? ( dev-libs/xmlrpc-c ) + emacs? ( virtual/emacs ) + fits? ( sci-libs/cfitsio ) + fftw? ( sci-libs/fftw:3.0 ) + graphviz? ( media-gfx/graphviz ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + llvm? ( sys-devel/llvm ) + math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) ) + mysql? ( virtual/mysql ) + ncurses? ( sys-libs/ncurses ) + odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) + oracle? ( dev-db/oracle-instantclient-basic ) + postgres? ( dev-db/postgresql-base ) + pythia6? ( sci-physics/pythia:6 ) + pythia8? ( sci-physics/pythia:8 ) + ruby? ( dev-lang/ruby + dev-ruby/rubygems ) + ssl? ( dev-libs/openssl ) + xml? ( dev-libs/libxml2 )" + +DEPEND="${CDEPEND} + dev-util/pkgconfig" + +RDEPEND=" + virtual/fortran +${CDEPEND} + reflex? ( dev-cpp/gccxml ) + xinetd? ( sys-apps/xinetd )" + +S="${WORKDIR}/${PN}" + +pkg_setup() { + fortran-2_pkg_setup + elog + 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)\"" + elog + enewgroup rootd + enewuser rootd -1 -1 /var/spool/rootd rootd + + if use math; then + if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then + ewarn "You are using gcc and OpenMP is available with gcc >= 4.2" + ewarn "If you want to build this package with OpenMP, abort now," + ewarn "and set CC to an OpenMP capable compiler" + elif use openmp; then + export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1 + elif use mpi; then + export USE_MPI=1 USE_PARALLEL_MINUIT2=1 + fi + fi +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-xrootd-prop-flags.patch \ + "${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \ + "${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \ + "${FILESDIR}"/${P}-nobyte-compile.patch \ + "${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \ + "${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \ + "${FILESDIR}"/${P}-lzma.patch + + # make sure we use system libs and headers + rm montecarlo/eg/inc/cfortran.h README/cfortran.doc + rm -rf graf2d/asimage/src/libAfterImage + rm -rf graf3d/ftgl/{inc,src} + rm -rf graf2d/freetype/src + rm -rf graf3d/glew/{inc,src} + rm -rf core/pcre/src + rm -rf math/unuran/src/unuran-*.tar.gz + find core/zip -type f -name "[a-z]*" | xargs rm + rm -rf core/lzma/src/*.tar.gz + rm graf3d/gl/{inc,src}/gl2ps.* + sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk + + # TODO: unbundle xrootd as a new package + #rm -rf net/xrootd/src + #sed -i \ + # -e 's:-lXrdOuc:-lXrd &:' \ + # -e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \ + # proof/proofd/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:$ODBCINC:$ODBCINC /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 +} + +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-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-rpath \ + --enable-astiff \ + --enable-exceptions \ + --enable-explicitlink \ + --enable-gdml \ + --enable-memstat \ + --enable-shadowpw \ + --enable-shared \ + --enable-soversion \ + --enable-table \ + --fail-on-missing \ + --with-afs-shared=yes \ + $(use_enable X x11) \ + $(use_enable X asimage) \ + $(use_enable afs) \ + $(use_enable avahi bonjour) \ + $(use_enable clarens) \ + $(use_enable clarens peac) \ + $(use_enable ncurses editline) \ + $(use_enable fits fitsio) \ + $(use_enable fftw fftw3) \ + $(use_enable graphviz gviz) \ + $(use_enable kerberos krb5) \ + $(use_enable ldap) \ + $(use_enable llvm cling) \ + $(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 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="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed" + 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}"/Users_Guide_${DOC_PV}.pdf + use math && dodoc \ + "${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \ + "${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf + fi + + if use examples; then + # 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 + 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} + + use xrootd && daemons="${daemons} xrootd olbd" + 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 || die "emake install failed" + + 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 || die "doenvd failed" + + # 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} + rm "${ED}"usr/share/root/fonts/LICENSE + 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 + rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib + rm -f "${ED}"/etc/root/proof/*.sample + rm -rf "${ED}"/etc/root/daemons + popd > /dev/null + # these should be in PATH + mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \ + "${ED}"usr/bin +} + +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 +} -- cgit v1.2.3-65-gdbad