[gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/

[Andrew Savchenko]

commit:     36674bd9b66a67fc529c5d7650c1a1f342e4065d
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Dec  4 00:25:09 2011 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Dec  4 00:25:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=36674bd9

sci-physics/root: new production release bump

Main changes:
- xrootd is now unbundled as a separate package;
- build with USE=afs works with an openafs patch from bug 393071.

For more details please see package ChangeLog.

---
 sci-physics/root/ChangeLog                         |   28 +
 sci-physics/root/files/olbd.confd                  |    9 -
 sci-physics/root/files/olbd.initd                  |   26 -
 .../root/files/root-5.28.00b-nobyte-compile.patch  |  138 -----
 .../files/root-5.30.00-xrootd-prop-flags.patch     |  623 --------------------
 sci-physics/root/files/root-5.32.00-afs.patch      |   33 +
 sci-physics/root/files/xrootd.confd                |    8 -
 sci-physics/root/files/xrootd.initd                |   26 -
 .../{root-5.30.05.ebuild => root-5.32.00.ebuild}   |   16 +-
 9 files changed, 66 insertions(+), 841 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index c42ef3c..d657b4a 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,34 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-5.32.00 (03 Dec 2011)
+
+  03 Dec 2011; Andrew Savchenko <bircoph@×××××.com>
+  -files/root-5.28.00b-nobyte-compile.patch,
+  -files/root-5.30.00-xrootd-prop-flags.patch, -root-5.30.05.ebuild,
+  +root-5.32.00.ebuild, +files/root-5.32.00-afs.patch, -files/olbd.confd,
+  -files/olbd.initd, -files/rootd.initd, -files/xrootd.confd,
+  -files/xrootd.initd:
+  Version bump to the new production release 5.32.00
+
+  Major changes are:
+  - xrootd is now unbundled upstream, separate sci-physics/xrootd
+  package was added to the science overlay for this support, all
+  xrootd-related patches and scripts are removed from this ebuild and
+  used in sci-physcis/xrootd.
+  - AFS support for net-fs/openafs-1.6.0 is fixed now with a patch
+  for openafs itself: the problem is that openafs hides some symbols
+  from shared versions of the libraries which are present in the same
+  static libraries. One of such symbols, ka_GetAFSTicket, is required
+  for root to build and root can't use static libafsauthent.a due to
+  relocation issues.
+
+  To enable AFS support the following needed:
+  - type cast patch;
+  - strlcpy and strlcat from ROOT core lib must be defined weak,
+  since they are redefined in openafs lib;
+  - ka_GetAFSTicket symbol is added to openafs by patch in bug #393071.
+
 *root-5.30.05 (25 Nov 2011)
 
   25 Nov 2011; Andrew Savchenko <bircoph@×××××.com> -root-5.30.03-r1.ebuild,

diff --git a/sci-physics/root/files/olbd.confd b/sci-physics/root/files/olbd.confd
deleted file mode 100644
index 848f4d7..0000000
--- a/sci-physics/root/files/olbd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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
deleted file mode 100644
index 95b7bc5..0000000
--- a/sci-physics/root/files/olbd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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/root-5.28.00b-nobyte-compile.patch b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
deleted file mode 100644
index 7029bf1..0000000
--- a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur root.orig/Makefile root/Makefile
---- root.orig/Makefile	2010-12-17 22:48:40.577775091 +0300
-+++ root/Makefile	2010-12-17 22:49:27.902497903 +0300
-@@ -1148,10 +1148,7 @@
- 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
- 	   fi; \
--	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
--	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
--	   fi; \
--	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
- 	      dir=$(RFLX_GRFLXDD:lib/=); \
- 	      while test "x$${dir}" != "x" && \
- 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-diff -Naur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.orig/bindings/pyroot/Module.mk	2010-12-17 22:48:39.941179413 +0300
-+++ root/bindings/pyroot/Module.mk	2010-12-17 22:49:27.899164943 +0300
-@@ -48,8 +48,6 @@
- ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
- $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
- endif
--ROOTPYC      := $(ROOTPY:.py=.pyc)
--ROOTPYO      := $(ROOTPY:.py=.pyo)
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- include/%.h:    $(PYROOTDIRI)/%.h
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
--$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \
-+$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) \
-                 $(ROOTLIBSDEP) $(PYTHONLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff -Naur root.orig/build/package/debian/rules root/build/package/debian/rules
---- root.orig/build/package/debian/rules	2010-12-17 22:48:40.197817461 +0300
-+++ root/build/package/debian/rules	2010-12-17 22:49:27.902497903 +0300
-@@ -623,10 +623,6 @@
- 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
- 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
- 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
--		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			
- #		$(foreach i, \
- #		   $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
- #		    -X$(i:$(DTMP)/%=%) )
-diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.orig/cint/cintex/Module.mk	2010-12-17 22:48:40.057833071 +0300
-+++ root/cint/cintex/Module.mk	2010-12-17 22:49:27.902497903 +0300
-@@ -31,10 +31,6 @@
- CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC    := $(CINTEXPY:.py=.pyc)
--CINTEXPYO    := $(CINTEXPY:.py=.pyo)
--endif
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- 		fi)
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.orig/cint/reflex/Module.mk	2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/Module.mk	2010-12-17 22:51:36.871451359 +0300
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
- 
- RFLX_LIBDIR = $(LIBDIR)
- 
-@@ -92,7 +89,7 @@
- 
- ALLEXECS += $(RFLX_GENMAPX)
- 
--POSTBIN  += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN  += $(RFLX_GRFLXPY)
- 
- ##### local rules #####
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- 		  mkdir -p lib/python/genreflex; fi )
- 		cp $< $@
- 
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
--		@python -c 'import py_compile; py_compile.compile( "$<" )'
- 
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
- 
-@@ -149,7 +144,7 @@
- 		$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
- 
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
- 
- clean-genreflex:
- 		@rm -rf lib/python/genreflex
-diff -Naur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.orig/cint/reflex/python/CMakeLists.txt	2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/python/CMakeLists.txt	2010-12-17 22:49:27.902497903 +0300
-@@ -15,7 +15,7 @@
- #####################   sources   ####################
- 
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
- 
- #####################  gccxmlpath ####################
- 
-

diff --git a/sci-physics/root/files/root-5.30.00-xrootd-prop-flags.patch b/sci-physics/root/files/root-5.30.00-xrootd-prop-flags.patch
deleted file mode 100644
index 671cfe3..0000000
--- a/sci-physics/root/files/root-5.30.00-xrootd-prop-flags.patch
+++ /dev/null
@@ -1,623 +0,0 @@
-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 $(<F)
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile root/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile	2011-06-28 13:49:40.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
-@@ -76,14 +76,14 @@
- 
- $(LIBPLDR): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP)
- 	@echo Creating shared library $(LIBPLDR)
--	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJECTT) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBPLDR)
-+	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(OBJECTT) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBPLDR)
- 
- $(LIBRARY): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
- ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
- 	$(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \
--	   $(CC) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(MORELIBS) $(LIBS) -o $(LIBDIR)/libXrdPosix.$(TYPEDYLIB); \
-+	   $(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(MORELIBS) $(LIBS) -o $(LIBDIR)/libXrdPosix.$(TYPEDYLIB); \
- 	fi
- endif
- # MacOS X does not support linking against shared libraries so include
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile root/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile	2011-06-28 13:49:40.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
-@@ -70,7 +70,7 @@
- 
- $(TARGETS): $(OBJECTS) $(OBJECTT) $(LIBDEP)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(CFLAGS) $(OBJECTT) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTT) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY)
- 
- $(OBJDIR)/XrdPss.o:  XrdPss.cc         XrdPss.hh \
-                      XrdFfsPosix.hh    XrdPosixXrootd.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
-@@ -6,7 +6,7 @@
-   
- include ../GNUmake.env
- 
--LFLAGS  = -L$(LIBDIR) -lXrdOuc $(LDSO)
-+LFLAGS  = $(LDSO) -L$(LIBDIR) -lXrdOuc
- 
- LIBDEPS = $(LIBDIR)/libXrdOuc.a
- 
-@@ -48,7 +48,7 @@
- 
- $(TARGETS): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJECTS) $(LFLAGS) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LFLAGS) -o $(LIBRARY)
- 
- $(OBJDIR)/XrdRootdProtocol.o: XrdRootdProtocol.hh XrdLink.hh \
-                               XrdScheduler.hh     XrdTrace.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile	2011-07-10 10:24:16.138023789 +0400
-@@ -78,15 +78,15 @@
- 
- $(LIBRARY): $(OBJSLIB) $(LIBDEPS)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
- 
- $(TSTBINA): $(OBJECTA) $(LIBDEPS)
- 	@echo Creating executable $(TSTBINA) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTA) $(LIBS) $(BINLIBS) -o $(TSTBINA)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(LIBS) $(BINLIBS) -o $(TSTBINA)
- 
- $(TSTBINB): $(OBJECTB) $(LIBDEPS)
- 	@echo Creating executable $(TSTBINB) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTB) $(LIBS) $(BINLIBS) -o $(TSTBINB)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTB) $(LIBS) $(BINLIBS) -o $(TSTBINB)
- 
- $(OBJDIR)/XrdSecClient.o: XrdSysPthread.hh XrdSecPManager.hh XrdSecInterface.hh \
-                           XrdOucErrInfo.hh XrdSecClient.cc   XrdSecEntity.hh
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile	2011-07-10 10:31:48.396441015 +0400
-@@ -115,23 +115,23 @@
- 
- $(LIBRARY): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(LD) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBRARY)
- 
- $(LIBGMLDAP): $(OBJECTC)
- 	@echo Creating shared library $(LIBGMLDAP) 
--	$(ECHO)$(LD) $(OBJECTC) $(LDSO) $(LIBS) -o $(LIBGMLDAP)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTC) $(LDSO) $(LIBS) -o $(LIBGMLDAP)
- 
- $(LIBGMDN): $(OBJECTD)
- 	@echo Creating shared library $(LIBGMDN) 
--	$(ECHO)$(LD) $(OBJECTD) $(LDSO) $(LIBDIR)/libXrdOuc.a $(LIBS) -o $(LIBGMDN)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTD) $(LDSO) $(LIBDIR)/libXrdOuc.a $(LIBS) -o $(LIBGMDN)
- 
- $(SECGSITEST): $(OBJECTA) $(LIBDEPS)
- 	@echo Creating executable $(SECGSITEST) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS) -o $(SECGSITEST)
-+	$(ECHO)$(CC) $(LDFLAGS) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS) -o $(SECGSITEST)
- 
- $(SECGSIPROXY): $(OBJECTB) $(LIBDEPS)
- 	@echo Creating executable $(SECGSIPROXY) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(SECGSIPROXY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(SECGSIPROXY)
- 
- $(OBJDIR)/XrdSecgsitest.o: XrdSecgsitest.cc XrdOucString.hh \
- 		XrdSysError.hh XrdSutAux.hh XProtocol.hh XPtypes.hh XrdCryptoAux.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -45,7 +45,7 @@
- 
- $(TARGETS): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(TARGETS) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
- 
- $(OBJDIR)/XrdSecProtocolkrb4.o: XrdSecProtocolkrb4.cc XrdSecInterface.hh \
-                                 XrdSysPthread.hh      XrdOucTokenizer.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -49,7 +49,7 @@
- 
- $(TARGETS): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(TARGETS) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
- 
- $(OBJDIR)/XrdSecProtocolkrb5.o: XrdSecProtocolkrb5.cc XrdSecInterface.hh \
-                                 XrdSysPthread.hh      XrdOucTokenizer.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile	2011-06-28 13:49:43.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -65,11 +65,11 @@
- 
- $(LIBRARY): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(LIBRARY)
- 
- $(SRVADMIN): $(OBJECTA) $(LIBDEPS)
- 	@echo Creating executable $(SRVADMIN) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS)  $(RESOLVLIB) -o $(SRVADMIN)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(BINLIBS) $(LIBS)  $(RESOLVLIB) -o $(SRVADMIN)
- 
- $(OBJDIR)/XrdSecpwdSrvAdmin.o: XrdSecpwdSrvAdmin.cc \
- 		XrdOucString.hh XrdSutAux.hh XProtocol.hh XPtypes.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile	2011-06-28 13:49:44.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -85,7 +85,7 @@
- 
- $(LIBRARY): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY);
- 
- $(LIBGRST): $(OBJGRST)
- 	@echo Creating archive $(LIBGRST)
-@@ -95,7 +95,7 @@
- 
- $(SECSSLTEST): $(OBJECTA) $(LIBDEPS)
- 	@echo Creating executable $(SECSSLTEST)
--	$(ECHO)$(LD) $(LDOP) $(OBJECTA) -L$(LIBDIR) -lXrdSecssl $(MORELIBS) $(LIBS) -o $(SECSSLTEST)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) -L$(LIBDIR) -lXrdSecssl $(MORELIBS) $(LIBS) -o $(SECSSLTEST)
- 
- $(OBJDIR)/XrdSecProtocolsslProc.o:  XrdSecProtocolsslProc.cc 	XrdSecProtocolsslProc.hh \
- 			        XrdOucString.hh 	XrdOucHash.hh
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile	2011-06-28 13:49:40.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -77,11 +77,11 @@
- 
- $(TARGLSO): $(OBJSLIB) $(LIBDEPS)
- 	@echo Creating shared library $(TARGLSO)
--	$(ECHO)$(CC) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBSSL) $(LIBS) -o $(TARGLSO);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBSSL) $(LIBS) -o $(TARGLSO);
- 
- $(TARGBIN): $(OBJSBIN)
- 	@echo Creating executable $(TARGBIN)
--	$(ECHO)$(LD) $(LDOP) $(OBJSBIN) $(MORELIBS) $(LIBS) -o $(TARGBIN);
-+	$(ECHO) $(LD) $(LDFLAGS) $(OBJSBIN) $(MORELIBS) $(LIBS) -o $(TARGBIN);
- 
- $(OBJDIR)/XrdSecProtocolsss.o: XrdSecProtocolsss.cc    XrdSecProtocolsss.hh \
-                                XrdNetDNS.hh            XrdOucErrInfo.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile	2011-06-28 13:49:42.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -45,7 +45,7 @@
- 
- $(TARGETS): $(OBJECTS) $(LIBDEPS)
- 	@echo Creating shared library $(TARGETS) 
--	$(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS);
- 
- $(OBJDIR)/XrdSecProtocolunix.o: XrdSecProtocolunix.cc XrdSecInterface.hh \
-                                 XrdSysHeaders.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile	2011-06-28 13:49:40.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -67,7 +67,7 @@
- 
- $(LIBRARY): $(OBJECTS) $(LIBDIR)/libXrdOuc.a
- 	@echo Creating shared library $(LIBRARY) 
--	$(ECHO)$(CC) $(OBJECTS) $(LIBDIR)/libXrdOuc.a $(LDSO) -o $(LIBRARY)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LIBDIR)/libXrdOuc.a $(LDSO) -o $(LIBRARY)
- 
- $(OBJDIR)/XrdSutPFAdmin.o: XrdSutPFAdmin.cc XrdOucString.hh \
- 		XrdSutAux.hh XProtocol.hh XPtypes.hh \
-diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile
---- root.orig/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile	2011-06-28 13:49:41.000000000 +0400
-+++ root/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile	2011-07-10 10:24:16.141356963 +0400
-@@ -95,7 +95,7 @@
- 
- $(TARGETS): $(OBJECTS) $(OBJDEPS)
- 	@echo Creating executable $(TARGETS) 
--	$(ECHO)$(LD) $(LDOP) $(OBJECTS) $(OBJFS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(TARGETS)
-+	$(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(OBJFS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(TARGETS)
- 
- $(OBJDIR)/XrdXrootdAdmin.o: XrdXrootdAdmin.hh      XrdXrootdAdmin.cc \
-                             XrdXrootdTrace.hh      XrdXrootdProtocol.hh \

diff --git a/sci-physics/root/files/root-5.32.00-afs.patch b/sci-physics/root/files/root-5.32.00-afs.patch
new file mode 100644
index 0000000..c0ca29a
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-afs.patch
@@ -0,0 +1,33 @@
+--- root/net/auth/src/TAFS.cxx.orig	2011-12-04 00:56:29.405007770 +0400
++++ root/net/auth/src/TAFS.cxx	2011-12-04 00:56:35.534709259 +0400
+@@ -138,7 +138,7 @@
+       } else {
+          if (isatty(0) != 0 && isatty(1) != 0) {
+             Gl_config("noecho", 1);
+-            pw = Getline((char *) prompt.Data());
++            pw = const_cast<char *> Getline((char *) prompt.Data());
+             Gl_config("noecho", 0);
+          } else {
+             Warning("TAFS", "not tty: cannot prompt for passwd: failure");
+--- root/core/clib/src/strlcat.c.orig	2011-12-04 01:49:26.495179487 +0400
++++ root/core/clib/src/strlcat.c	2011-12-04 01:50:41.407524763 +0400
+@@ -38,7 +38,7 @@
+  * Returns strlen(src) + MIN(siz, strlen(initial dst)).
+  * If retval >= siz, truncation occurred.
+  */
+-size_t
++size_t __attribute__((weak))
+ strlcat(char *dst, const char *src, size_t siz)
+ {
+         register char *d = dst;
+--- root/core/clib/src/strlcpy.c.orig	2011-12-04 01:49:34.329797251 +0400
++++ root/core/clib/src/strlcpy.c	2011-12-04 01:50:49.051151843 +0400
+@@ -36,7 +36,7 @@
+  * will be copied.  Always NUL terminates (unless siz == 0).
+  * Returns strlen(src); if retval >= siz, truncation occurred.
+  */
+-size_t
++size_t __attribute__((weak))
+ strlcpy(char *dst, const char *src, size_t siz)
+ {
+         register char *d = dst;

diff --git a/sci-physics/root/files/xrootd.confd b/sci-physics/root/files/xrootd.confd
deleted file mode 100644
index e725cd1..0000000
--- a/sci-physics/root/files/xrootd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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
deleted file mode 100644
index 27e0001..0000000
--- a/sci-physics/root/files/xrootd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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/root-5.30.05.ebuild b/sci-physics/root/root-5.32.00.ebuild
similarity index 96%
rename from sci-physics/root/root-5.30.05.ebuild
rename to sci-physics/root/root-5.32.00.ebuild
index d237779..94e0940 100644
--- a/sci-physics/root/root-5.30.05.ebuild
+++ b/sci-physics/root/root-5.32.00.ebuild
@@ -12,6 +12,7 @@ ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
 PATCH_PV=5.28.00b
 PATCH_PV2=5.30.00
+PATCH_PV3=5.32.00
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
@@ -78,7 +79,8 @@ CDEPEND="
 			dev-lang/ruby
 			dev-ruby/rubygems )
 	ssl? ( dev-libs/openssl )
-	xml? ( dev-libs/libxml2 )"
+	xml? ( dev-libs/libxml2 )
+	xrootd? ( sci-physics/xrootd )"
 
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig"
@@ -122,12 +124,12 @@ pkg_setup() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-xrootd-prop-flags.patch \
 		"${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_PV}-unuran.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV3}-afs.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
@@ -142,13 +144,6 @@ src_prepare() {
 	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
@@ -275,7 +270,6 @@ daemon_install() {
 	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}