From 7f463bdf7f81853773c981f0cfea3d1da1c4f584 Mon Sep 17 00:00:00 2001 From: Sébastien Fabbro Date: Sat, 8 Jan 2011 19:03:07 +0000 Subject: root fixes --- sci-physics/root/ChangeLog | 7 +- sci-physics/root/Manifest | 8 +- .../files/root-5.28.00-xrootd-prop-flags.patch | 201 +++++++++++---------- sci-physics/root/metadata.xml | 4 +- sci-physics/root/root-5.28.00.ebuild | 45 ++--- 5 files changed, 123 insertions(+), 142 deletions(-) diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index e1ba1070f..705def009 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for sci-physics/root -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.73 2010/07/10 19:05:23 armin76 Exp $ + 08 Jan 2011; Sébastien Fabbro root-5.28.00.ebuild, + files/root-5.28.00-xrootd-prop-flags.patch: + Respect more LDFLAGS. Go back to old style python and ruby modules, multiple + ABIs too much of a bloat. + *root-5.28.00 (20 Dec 2010) 20 Dec 2010; Sébastien Fabbro -root-5.26.00e.ebuild, diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index 4fc0a98bf..66a5bca9a 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -8,7 +8,7 @@ AUX root-5.28.00-glibc212.patch 276 RMD160 02901df4c8e5e3c7d50a78916f843fde83faf AUX root-5.28.00-nobyte-compile.patch 5483 RMD160 490801842ba9ca6c980e498224d48dc676fcf0fa SHA1 538ac62083b8b12c558b97d72235dd047a64b632 SHA256 81b015dd6c122176fbc3103c75f62b7b1c3db569ad6d461ca544248f4e017b5c AUX root-5.28.00-prop-ldflags.patch 433 RMD160 fd1717af9210471d7de0f06a47011e03d3f76d9a SHA1 b5dac8b013219dcfe577f2972fcc1d548f153cc3 SHA256 04f4b65a91e28386c7a857fe361f091943f4bb6fc82a9473ac7605412c199191 AUX root-5.28.00-unuran.patch 1531 RMD160 8083784cc831fc304f2e94fdf3b8aa8379d0bd9a SHA1 5c4537ba1922775fb63d65340a18a3c2b1d2311b SHA256 09458c60c9d38af2d204939f752ec25364d04cf66810b7cae5e88368f84c31c8 -AUX root-5.28.00-xrootd-prop-flags.patch 31526 RMD160 c8d856d125f8fbd27a8c1687f42cfbd554ff9c79 SHA1 997729f24125834ed31d0c9431c841638b4c7ed8 SHA256 ad7808fc4a507e172a072d6b96c81cc5fba802c331c0362b74198c8087092745 +AUX root-5.28.00-xrootd-prop-flags.patch 31593 RMD160 487dba081b674e708294fdedb5a9d5ef2019a0f1 SHA1 ea6e56f22a8d960646b9db6511d13d915991222b SHA256 612bbfcf8d97098c0ac5e236823de74a1355c5877b90d55240be0c71be96771f AUX rootd.confd 199 RMD160 9ca9864292e7301d3feb6c36d88ba16002b7d7fa SHA1 822983a24e219bd860124f363a1e4250a17026dd SHA256 7b69f646ce0b2546ce797ec4a05949b02302dc5f4e41d2e8896ed0bc6575ac8d AUX rootd.initd 732 RMD160 80360c717b4d189c95a056e29f9d27165893d6f9 SHA1 6d6feb0d8940e2cea3c45d999da954c6a1cf4e45 SHA256 1151b01a9cdaa63a10fcf2d511d15ffc7e71bc53d5394774d0f619bab24d1486 AUX xrootd.confd 200 RMD160 2344c73ca3c27adeb70b092850cfd292af7d58bd SHA1 f2b895f43d3537e8614a907c7c94642f01c084e4 SHA256 03c1191168ddea3bc6621e26eb56e509e6c9a4d58756ffbbd07ff6657200e57d @@ -17,6 +17,6 @@ DIST RooFit_Users_Manual_2.91-33.pdf 1330062 RMD160 650b616018a5493d5fd7da1dc06c DIST TMVAUsersGuide-v4.03.pdf 3913533 RMD160 fbd62b90e7ad47ad69ec62d584417463ec13bf9c SHA1 84a63140cc3e01267d2cc7ffa374a7c24fbed37e SHA256 0cdbb4a2d19eb7a86e2911cfa73a905932e862d6c94be10b7662a9355b0241af DIST Users_Guide_5_26.pdf 11197843 RMD160 0560efd109ee45148d4918eecba76736b583ea00 SHA1 3da4ea7e463825a20514deeb7e3b392b32b08178 SHA256 9d19277da5ac6b20e825a8d1d000dc90c595e1c042e5caca9ffb3271a6347bfe DIST root_v5.28.00.source.tar.gz 30213091 RMD160 3a6166be640011330dac31b43072f5d4c6bebcfa SHA1 3ccb18294ce0cd73ba1617182699df75111095eb SHA256 7eb4938770871cda582c54fcbe55aa6995c98a2b0618652159a1e87b09ba7bec -EBUILD root-5.28.00.ebuild 9705 RMD160 2a7144fed597c900c81a089c567be2c66989fe20 SHA1 db217f4d7aebf1e3e1f0736f599e5cb1137eeeb0 SHA256 ee4ec2ddf3c33edfc907b00cda1a2b2e618770d967699ae5d715b1bb42764c8f -MISC ChangeLog 22871 RMD160 1d9e28033fe1cea229c792577499ce20defc291f SHA1 fcfcf91ce8103f81fde58eacb6c611e11b26db1d SHA256 f8fa1d28d6805577e83797cab85686b803fb3c181e88380f710ff0b3cf456cf8 -MISC metadata.xml 1624 RMD160 11aee558dfde68d67ad7ea85b786f8b2cffc4a98 SHA1 52aa8435837283ea5eadca1d1469b14d00f118c6 SHA256 2648938cf2ffcab17675d38a187d4b6653d2ca02b65ae901b94d24abca5ff6f4 +EBUILD root-5.28.00.ebuild 9320 RMD160 71009c3a18e4e170a452d305689e047f06054188 SHA1 4112423835c1cee4bd94acc6c3c8c7cb763447f0 SHA256 d07ae6bacec47177d3992bcd4aa8f9f609180df47b6c93dd8baf487912d41aa0 +MISC ChangeLog 23101 RMD160 1950d4f1d1526ae1824cf3fe6ee88dab7bf5d5c9 SHA1 e1c4fd8087d51b1d2ec1749dcaa892f82178ebd8 SHA256 88307cb24098a21b82f0847414a4c8915916ee9d7e3362109b3034d7b096a1cb +MISC metadata.xml 1458 RMD160 263331fbbd55f43346fd2096362d56f2e23e26b6 SHA1 72cd35f63b383db4a48d917bb0b2c98ae1eef3a5 SHA256 6e3ea3816d66f2b937f9563106106cf4c089a496c9aedfb2a296bfc8baa084e9 diff --git a/sci-physics/root/files/root-5.28.00-xrootd-prop-flags.patch b/sci-physics/root/files/root-5.28.00-xrootd-prop-flags.patch index b6744165d..33ac9ae7e 100644 --- a/sci-physics/root/files/root-5.28.00-xrootd-prop-flags.patch +++ b/sci-physics/root/files/root-5.28.00-xrootd-prop-flags.patch @@ -1,6 +1,6 @@ -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 2010-12-17 22:55:29.875476979 +0300 -+++ root/net/xrootd/src/xrootd/config/GNUmake.env.in 2010-12-18 05:02:29.765122076 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/config/GNUmake.env.in 2011-01-08 18:49:30.000000000 +0000 @@ -45,6 +45,7 @@ CFHASXRDCRYPTO = @hasxrdcrypto@ @@ -9,9 +9,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.env.in root/net/xrootd # 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 2010-12-17 22:55:29.875476979 +0300 -+++ root/net/xrootd/src/xrootd/config/GNUmake.options.in 2010-12-18 05:02:29.765122076 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/config/GNUmake.options.in 2011-01-08 18:49:30.000000000 +0000 @@ -16,7 +16,7 @@ CF32="$(TYPECF32)" \ CFOP="$(@buildopt@)" \ @@ -30,9 +30,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.options.in root/net/xr 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 2010-12-17 22:55:29.875476979 +0300 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd 2010-12-18 05:02:29.765122076 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd 2011-01-08 18:49:30.000000000 +0000 @@ -11,7 +11,7 @@ -Wall -Wno-deprecated $(CFTRACE) TYPECF32 = @@ -42,9 +42,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd root/net/xr 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 2010-12-17 22:55:29.875476979 +0300 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc 2010-12-18 05:02:29.765122078 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc 2011-01-08 18:49:30.000000000 +0000 @@ -11,7 +11,7 @@ -Wall -Wno-deprecated -D__linux__ $(CFTRACE) TYPECF32 = @@ -54,9 +54,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc root/net/xro 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 2010-12-17 22:55:29.875476979 +0300 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 2010-12-18 05:02:29.765122078 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 2011-01-08 18:49:30.000000000 +0000 @@ -11,7 +11,7 @@ -Wall -Wno-deprecated -D__linux__ $(CFTRACE) TYPECF32 = @@ -66,9 +66,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 root/net 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 2010-12-17 22:55:29.875476979 +0300 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 2010-12-18 05:02:29.765122078 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 2011-01-08 18:49:30.000000000 +0000 @@ -11,7 +11,7 @@ -Wall -Wno-deprecated -D__linux__ $(CFTRACE) TYPECF32 = @@ -78,9 +78,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 root/ne 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 2010-12-17 22:55:29.875476979 +0300 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.icc 2010-12-18 05:02:29.765122078 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.icc 2011-01-08 18:49:30.000000000 +0000 @@ -13,7 +13,7 @@ -ansi -D__linux__ -D__ICC__ -wd1476 -wd191 -wd468 -wd858 -wd1224 -wd584 $(CFTRACE) TYPECF32 = @@ -90,9 +90,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc root/net/xro 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 2010-12-17 22:55:29.875476979 +0300 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 2010-12-18 05:02:29.765122078 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 2011-01-08 18:49:30.000000000 +0000 @@ -14,7 +14,7 @@ -wd1572 -wd584 -i-dynamic $(CFTRACE) TYPECF32 = @@ -102,9 +102,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 root/ne 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 2010-12-17 22:55:29.875476979 +0300 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos 2010-12-18 05:02:29.765122078 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos 2011-01-08 18:49:30.000000000 +0000 @@ -18,7 +18,7 @@ TYPECF32 = TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 @@ -114,9 +114,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos root/net/x 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 2010-12-17 22:55:29.875476979 +0300 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 2010-12-18 05:02:29.765122078 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 2011-01-08 18:49:30.000000000 +0000 @@ -15,7 +15,7 @@ TYPECF32 = TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 @@ -126,9 +126,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 root/net 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 2010-12-17 22:55:29.875476979 +0300 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc 2010-12-18 05:02:29.765122078 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc 2011-01-08 18:49:30.000000000 +0000 @@ -11,7 +11,7 @@ -Wall -Wno-deprecated -DSUNGCC $(CFTRACE) TYPECF32 = @@ -138,9 +138,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc root/net/ 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 2010-12-17 22:55:29.832148475 +0300 -+++ root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile 2010-12-18 05:02:29.765122078 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -71,7 +71,7 @@ $(TESTBIN): $(OBJECTB) $(LIBDEPS) @@ -150,9 +150,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile root/net/xroot $(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 2010-12-17 22:55:29.822149591 +0300 -+++ root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile 2010-12-18 05:02:29.765122078 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -50,7 +50,7 @@ $(XRDADLER32): $(XRDADLER32_OBJ) $(XRDADLERDEPS) @@ -180,9 +180,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile root/net/xroo $(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 2010-12-17 22:55:29.845480323 +0300 -+++ root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile 2010-12-18 05:02:29.765122078 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -67,7 +67,7 @@ $(ECHO)ranlib $(LIBARCH) @@ -192,9 +192,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile root/net/xroot $(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 2010-12-17 22:55:29.818816629 +0300 -+++ root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile 2010-12-18 05:02:29.765122078 +0300 +diff -Nur 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 2010-12-14 14:20:22.000000000 +0000 ++++ root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -160,17 +160,17 @@ $(LIBSHARED): $(OBJECTS) $(LIBDEP) @echo Creating shared library $(LIBSHARED) @@ -250,9 +250,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile root/net/xr $(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 2010-12-17 22:55:29.835481437 +0300 -+++ root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile 2010-12-18 05:02:29.765122078 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -136,7 +136,7 @@ $(BINARY): $(OBJSRVR) $(OBJBOTH) $(LIBDEPS) @@ -262,9 +262,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile root/net/xroot $(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 2010-12-17 22:55:29.868811057 +0300 -+++ root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile 2010-12-18 05:02:29.771787705 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -89,11 +89,11 @@ $(TARGCNSD): $(OBJCNSD) $(OBJCOM) $(LIBDEP) @@ -279,9 +279,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile root/net/xroot $(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 2010-12-17 22:55:29.858812171 +0300 -+++ root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile 2010-12-18 05:02:29.771787705 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -139,7 +139,7 @@ $(LIBRARY): $(OBJECTS) $(LIBUTIL) @@ -305,9 +305,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile root/net/xr $(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/XrdFrm/GNUmakefile root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile 2010-12-17 22:55:29.842147361 +0300 -+++ root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile 2010-12-18 05:06:33.900708559 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -133,15 +133,15 @@ $(BINADMIN): $(OBJLIB) $(OBJADMIN) $(OBJDEPS) @@ -327,9 +327,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile root/net/xroot $(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 2010-12-17 22:55:29.852146247 +0300 -+++ root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile 2010-12-18 05:02:29.771787705 +0300 +diff -Nur 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 2010-12-14 14:20:23.000000000 +0000 ++++ root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile 2011-01-08 18:49:30.000000000 +0000 @@ -141,45 +141,45 @@ $(ADMIN): $(OBJECTS_BIN_ADM) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) @@ -386,9 +386,9 @@ diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile root/net/xroot $(OBJDIR)/%.o : %.cc @echo Compiling $( - Build the *experimental* new C++ interpretor CINT7 Buld the Clarens and PEAC plug-ins, to use in a GRID enabled analysis. Support for images and data from FITS files - Build the sci-physics/geant (GEANT4) navigator - Build the new cling interactive interpreter based on sys-devel/llvm + 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) diff --git a/sci-physics/root/root-5.28.00.ebuild b/sci-physics/root/root-5.28.00.ebuild index 075c500b8..88fbd419d 100644 --- a/sci-physics/root/root-5.28.00.ebuild +++ b/sci-physics/root/root-5.28.00.ebuild @@ -1,14 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI=3 - PYTHON_DEPEND="python? 2" -SUPPORT_PYTHON_ABIS="1" -RUBY_OPTIONAL="yes" -USE_RUBY="ruby18" - inherit versionator eutils elisp-common fdo-mime python toolchain-funcs flag-o-matic #DOC_PV=$(get_major_version)_$(get_version_component_range 2) @@ -27,9 +22,9 @@ SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz SLOT="0" LICENSE="LGPL-2.1" KEYWORDS="~amd64 ~x86" -IUSE="afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap llvm - +math mysql ncurses odbc +opengl openmp oracle postgres pythia6 pythia8 python - +reflex ruby qt4 ssl xft xml xinetd xrootd" +IUSE="afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap + llvm +math mysql ncurses odbc +opengl openmp oracle postgres pythia6 pythia8 + python +reflex ruby qt4 ssl xft xml xinetd xrootd" # libafterimage ignored, to check every version # see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944 @@ -39,15 +34,15 @@ CDEPEND=">=dev-lang/cfortran-4.4-r2 media-libs/ftgl media-libs/giflib media-libs/glew - media-libs/jpeg media-libs/libpng media-libs/tiff sys-apps/shadow + virtual/jpeg x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXpm - afs? ( >=net-fs/openafs-1.4.7 ) + afs? ( net-fs/openafs ) avahi? ( net-dns/avahi ) clarens? ( dev-libs/xmlrpc-c ) emacs? ( virtual/emacs ) @@ -88,7 +83,7 @@ S="${WORKDIR}/${PN}" pkg_setup() { elog - elog "You may want to build ROOT with these non Gentoo extra packages:" + 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." @@ -108,11 +103,6 @@ pkg_setup() { fi } -src_unpack() { - # prevent ruby-ng.eclass from messing with the src path - default -} - src_prepare() { epatch \ "${FILESDIR}"/${P}-prop-ldflags.patch \ @@ -287,6 +277,8 @@ src_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 || die "doenvd failed" # The build system installs Emacs support unconditionally and in the wrong @@ -300,21 +292,6 @@ src_install() { daemon_install desktop_install - if use python; then - local pydir=$(python_get_sitedir) - dodir $(pydir) - mv "${ED}"usr/$(get_libdir)/${PN}/*.py \ - "${ED}"$(pydir) - dosym "${ED}"usr/$(get_libdir)/${PN}/libPyROOT.so \ - ${pydir}/libPyROOT.so - fi - - if use ruby; then - local rubydir=$(${RUBY} -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]') - dodir ${rubydir} - dosym "${ED}"usr/$(get_libdir)/${PN}/libRuby.so ${rubydir}/libRuby.so - fi - # 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 @@ -332,10 +309,10 @@ src_install() { pkg_postinst() { fdo-mime_desktop_database_update - use python && python_mod_optimize + use python && python_mod_optimize /usr/$(get_libdir)/root } pkg_postrm() { fdo-mime_desktop_database_update - use python && python_mod_cleanup + use python && python_mod_cleanup /usr/$(get_libdir)/root } -- cgit v1.2.3-65-gdbad