Move patches to mirrors. Fixes bug 341971.

Package-Manager: portage-2.2_rc98/cvs/Linux x86_64

8 files changed, 26 insertions, 283 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index c890b79ec3bd..0eed19986f55 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.75 2010/10/19 03:49:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.76 2010/10/22 07:11:29 xarthisius Exp $
+
+*root-5.26.00e-r1 (22 Oct 2010)
+
+  22 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org> -root-5.26.00e.ebuild,
+  +root-5.26.00e-r1.ebuild, -files/root-5.26.00e-configure-paths.patch,
+  -files/root-5.26.00e-glibc212.patch, -files/root-5.26.00e-make-3.82.patch,
+  -files/root-5.26.00e-nobyte-compile.patch,
+  -files/root-5.26.00e-prop-ldflags.patch:
+  Move patches to mirrors. Fixes bug 341971.
 
 *root-5.26.00e (19 Oct 2010)
 
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index d614a6bbc410..11407460ae44 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -6,11 +6,6 @@ AUX olbd.initd 714 RMD160 e2cc28474a280345f6962f890f5ddb3884d7f69f SHA1 4dcdf7ba
 AUX proofd.confd 415 RMD160 3814aacb63d82b9d060086f9bef304d431a15b4e SHA1 31eb7af239a0042f887b5089a7c6c7ec5d6662e9 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38
 AUX proofd.initd 717 RMD160 2ff4ca04e838b171b1a60941ba3aded645a67147 SHA1 80cd4f6fd1e818edf27368b1175ed504e2c619a6 SHA256 341d1b4cd09731c506e97278959e6b669d63d65efb036070ecd4f31b01f34305
 AUX root-5.26.00-make-3.82.patch 1638 RMD160 9c29d5b32a65f181ffd10964113e290b70d20130 SHA1 2ada31318bc631b4442a1a79a4644a8de5c86b9c SHA256 0c94fc3f8bb8eb009465913f2ee20eefc510468643c04d2aad8cc40341fde457
-AUX root-5.26.00e-configure-paths.patch 1327 RMD160 ca926e9eddd5a88f5b3e4efd79c36f8bd0931058 SHA1 1d8112dd31c532560b0b571f6548961226b21e1d SHA256 f96707b3119b2e501cd9fbb6a3cbfbee6868786d3750581bcf34c8982314f97b
-AUX root-5.26.00e-glibc212.patch 275 RMD160 df6ffa73349476e750eee09e24897747fec4e369 SHA1 cb80280498bfbf1c4948d555a9ebca7673c0eb4a SHA256 6bdd690cf542c5e4a796bdb2173284fefc1b8a429e162c5b2e7aee09cd1df558
-AUX root-5.26.00e-make-3.82.patch 1638 RMD160 9c29d5b32a65f181ffd10964113e290b70d20130 SHA1 2ada31318bc631b4442a1a79a4644a8de5c86b9c SHA256 0c94fc3f8bb8eb009465913f2ee20eefc510468643c04d2aad8cc40341fde457
-AUX root-5.26.00e-nobyte-compile.patch 7102 RMD160 b9de8346df9997507193388d64e36992981e26b2 SHA1 941facff70bfcb762a1208c3c187887b4b640464 SHA256 052dc6b4b879eca62ce7f72c9fd81f66039e45cff3df023a64062e8fcb2c2985
-AUX root-5.26.00e-prop-ldflags.patch 453 RMD160 c5e1448df77c6d850e944717edb9260810731622 SHA1 e69717df174b769a97722a4b4d3bfc9454a13180 SHA256 5e4d58d0b5b761745beb34e901e45805b1f6d0d832235fa8b2f2c3bce39046be
 AUX rootd.confd 199 RMD160 9ca9864292e7301d3feb6c36d88ba16002b7d7fa SHA1 822983a24e219bd860124f363a1e4250a17026dd SHA256 7b69f646ce0b2546ce797ec4a05949b02302dc5f4e41d2e8896ed0bc6575ac8d
 AUX rootd.initd 732 RMD160 05b31561a32bc52e223b46fae6ef897ec33e3c9c SHA1 b1dfb6a0a50f151c51f4742ff2206f9430fdbba5 SHA256 7b745b606cab0212d07c9f1079d3f55c85ffc65e9da3a235d1a3c95945d28eb5
 AUX xrootd.confd 200 RMD160 2344c73ca3c27adeb70b092850cfd292af7d58bd SHA1 f2b895f43d3537e8614a907c7c94642f01c084e4 SHA256 03c1191168ddea3bc6621e26eb56e509e6c9a4d58756ffbbd07ff6657200e57d
@@ -20,18 +15,20 @@ DIST TMVAUsersGuide-v4.pdf 2355827 RMD160 0624a6ed7e006581eacdaa69e82bbdca91aa42
 DIST Users_Guide_5_26.pdf 11197843 RMD160 0560efd109ee45148d4918eecba76736b583ea00 SHA1 3da4ea7e463825a20514deeb7e3b392b32b08178 SHA256 9d19277da5ac6b20e825a8d1d000dc90c595e1c042e5caca9ffb3271a6347bfe
 DIST root-5.26.00-patches-p03.tar.bz2 164854 RMD160 5fbcfe152b944323a7c172f429d553e0c0a3d0fd SHA1 e48a8c61434e71c4aee5c3a2a4a342029228c4a3 SHA256 c0c19d663a7e71040612763028f4fdfb85793a0897cf1eb0842ac930861ab2e8
 DIST root-5.26.00-patches-p05.tar.bz2 232546 RMD160 68f3cb6f62953b839fdc91b6b0a042fea71d2d7e SHA1 1e3ec93c3826a0fda3398739837a48c865f2cd41 SHA256 eda78f9e280d0eafb7d0daa933cf6b5e91d0af6bf5325ef9f4839926a91230aa
-DIST root-5.26.00e-xrootd-prop-flags.patch.gz 4445 RMD160 4b8e306b3a95b4edbf55457946c86cd94601c633 SHA1 6267c3ec3adb031dd767ab4316af71d60a690e76 SHA256 fafde2edfda856af801f330bb4a4acd477b2e3d6eba1206d6bfb6cccb9b49d94
+DIST root-5.26.00e-patches.tar.bz2 7102 RMD160 d513c643ec8acdbe293e7ca159f59c765c52a2ad SHA1 ca8a958186fc8a77c04348f61c97e2d836493026 SHA256 f29bf8251b8c7e1809993c4f5ae0f990d5c6e6721e77eb62107d27fa55b9bf47
 DIST root_v5.26.00.source.tar.gz 29209345 RMD160 bf7f91abd76ec86f69eb80506291cb8d4f87614e SHA1 318c5adf7f54f8206d9173d2fb0dc196a0e87192 SHA256 5ec86599bf7ef0fe3db11e5dd2d01183484cb199ab3a1c28d68f10b804e93e76
 DIST root_v5.26.00e.source.tar.gz 28922785 RMD160 692312a1984279255e32c96a0a79b974ff2e2971 SHA1 5a4b7e1b759dfef0dd218491bbe74ca376fc8c07 SHA256 7f2604954775653825b9897da131278c9b349f12d77b1fc087004c1b838f4a80
 EBUILD root-5.26.00-r2.ebuild 8947 RMD160 dc345d9ea444b8aecff9d83c8227f8989f5da871 SHA1 59f8cc02d828d41f98547eeb9bff5d8ed3ba54a2 SHA256 a41571cc2ecf8fb9fe61273dfc0f1357db89d26d2a7594a45a16f65a82020087
 EBUILD root-5.26.00-r4.ebuild 9317 RMD160 2e8ad460e62d02122b6129d1333b5c0d4f22aab0 SHA1 2694b66c177d1ac86d25b8e84cb40336dadbe81c SHA256 65b3b38459a59870d1085c5b9d1a52ebcc219ab5a0eec3057eeb9b638e9f9a79
-EBUILD root-5.26.00e.ebuild 9263 RMD160 93d4b94bd8ed47e611d8985cfbf87a3653edefb2 SHA1 33e811ca7951c7822289463e9382326fab8b1a02 SHA256 7cb723e79a6351686826875d1f9c933db6d5b1ce6304a12d9de9d3b36135579e
-MISC ChangeLog 21189 RMD160 98b0a18b535accc656adb493ee2c2fa81ae2df94 SHA1 513731b4821936921f8963a7807dc4d0d1cbe2af SHA256 5992498798553135637b990c4fc95d18dcf72e2bdbac35fe8e76c390d21a0e95
+EBUILD root-5.26.00e-r1.ebuild 9232 RMD160 01ac1f689e15eec054bad2230545e3317c336122 SHA1 c911c2ce32e9e381b0db38c93c7d4161a8855d4e SHA256 bd713693585c620fd768cb9c75a9112c9475380be8ccdd06459c3311f4b2a249
+MISC ChangeLog 21584 RMD160 ec823eb5da55955682330bf0b2d3791de0593dc3 SHA1 df5458381be40c7b89551fa584042ddab2ed86a1 SHA256 452c849c0a1fba814d104eceda263ba81556332c0ab6272634c69662973d5873
 MISC metadata.xml 1447 RMD160 ea9e4cda86f83ddbdcfa63667cc0566353d4c118 SHA1 53be10972173afad6271890c02f386fa17c59b92 SHA256 450c6183f001eed437f8097f22caa92d814ddc05855e8166cf656279706af8c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAky9FToACgkQ1ycZbhPLE2BaxACdEHRd8IaxXRn3KqyYb1jwtaGn
-Ot0AoKxm5jdPB9efIa2i7mj66Aw86tQN
-=9TB9
+iJwEAQECAAYFAkzBOS0ACgkQIiMqcbOVdxS0/gP/T0lj8dvc+qkh1TZ+PTAXBr4d
+r7nGSXtCaTHGhq+HHQZpAzPLkfxx3H+EhMeqAODnoHViIJBBbJomQFMhLDQ/0Ky3
+rA8515ann5JnSviUUFazwaF7bAAWHLJu7Dzp0afrF6CQodzukJUqiKmoN063PhYG
+YZL77+myfv/d3da33v8=
+=2okR
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/root/files/root-5.26.00e-configure-paths.patch b/sci-physics/root/files/root-5.26.00e-configure-paths.patch
deleted file mode 100644
index 06d19ccd5391..000000000000
--- a/sci-physics/root/files/root-5.26.00e-configure-paths.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- root.orig/configure	2010-10-13 23:43:25.000000000 +0100
-+++ root/configure	2010-10-13 23:43:58.000000000 +0100
-@@ -728,7 +728,7 @@
-             cat <<EOF > conftest.mk
- include config/Makefile.${arch}
- conftest:conftest.c $symbolfile
--	\$(CC) \$(CFLAGS) \$(LDFLAGS) $symbolfile \$< -o \$@
-+	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $symbolfile -o \$@
- 
- conftest.c:
- 	echo "extern int $symbol (); " > \$@
-@@ -2255,8 +2255,8 @@
- if test ! "x$enable_pgsql" = "xno"; then
-     # Check for PgSQL include and library
-     check_header "libpq-fe.h" "$pgsqlincdir" $PGSQL $PGSQL/include \
--        /usr/include /usr/local/include /usr/local/pgsql/include \
--        /usr/include/pgsql /usr/include/postgresql \
-+        /usr/include/postgresql /usr/include /usr/local/include \
-+        /usr/local/pgsql/include /usr/include/pgsql \
-         /usr/include/postgresql/8.0 /usr/pgsql/include \
-         /usr/local/include/pgsql /usr/local/include/postgresql \
-         /usr/include/postgresql/8.0 /usr/pgsql /usr/local/pgsql \
-@@ -2338,7 +2338,7 @@
-     else
-         check_header "sqlext.h" "$odbcincdir" \
-             $ODBC $ODBC/include $ODBCINCDIR /usr/local/include \
--            /usr/include $finkdir/include
-+            /usr/include $finkdir/include /usr/include/iodbc
-         odbcinc=$found_hdr
-         odbcincdir=$found_dir
- 
diff --git a/sci-physics/root/files/root-5.26.00e-glibc212.patch b/sci-physics/root/files/root-5.26.00e-glibc212.patch
deleted file mode 100644
index 9c17becf452b..000000000000
--- a/sci-physics/root/files/root-5.26.00e-glibc212.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- root/net/auth/src/TAFS.cxx.orig	2010-09-14 03:22:22.647915854 +0400
-+++ root/net/auth/src/TAFS.cxx	2010-09-14 03:22:39.034599899 +0400
-@@ -11,6 +11,7 @@
- 
- #ifndef WIN32
- #   include <unistd.h>
-+#   include <sys/stat.h>
- #else
- #   define ssize_t int
- #   include <io.h>
diff --git a/sci-physics/root/files/root-5.26.00e-make-3.82.patch b/sci-physics/root/files/root-5.26.00e-make-3.82.patch
deleted file mode 100644
index dc6d8a0189e3..000000000000
--- a/sci-physics/root/files/root-5.26.00e-make-3.82.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://root.cern.ch/viewcvs?view=rev&revision=35096
-https://savannah.cern.ch/bugs/?func=detailitem&item_id=72166
-
---- root-5.26.00d/Makefile
-+++ root-5.26.00d/Makefile
-@@ -544,6 +544,30 @@
- .PRECIOUS: include/%.h
- 
- # special rules (need to be defined before generic ones)
-+cint/cint/lib/dll_stl/G__%.o: cint/cint/lib/dll_stl/G__%.cxx
-+	$(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \
-+	   $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \
-+	   -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $<
-+	$(CXX) $(NOOPT) $(CXXFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc  $(CXXOUT)$@ -c $<
-+
-+cint/cint/lib/dll_stl/G__c_%.o: cint/cint/lib/dll_stl/G__c_%.c
-+	$(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \
-+	   $(CFLAGS) $(DICTFLAGS) -I$(CINTDIR)/lib/prec_stl \
-+	   -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $<
-+	$(CC) $(NOOPT) $(CFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc  $(CXXOUT)$@ -c $<
-+
-+cint/cint/lib/G__%.o: cint/cint/lib/G__%.cxx
-+	$(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \
-+	   $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \
-+	   -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $<
-+	$(CXX) $(NOOPT) $(CXXFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc  $(CXXOUT)$@ -c $<
-+
-+cint/cint/lib/G__c_%.o: cint/cint/lib/G__c_%.c
-+	$(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \
-+	   $(CFLAGS) $(DICTFLAGS) -I$(CINTDIR)/lib/prec_stl \
-+	   -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $<
-+	$(CC) $(NOOPT) $(CFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc  $(CXXOUT)$@ -c $<
-+
- G__%.o: G__%.cxx
- 	$(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \
- 	   $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \
diff --git a/sci-physics/root/files/root-5.26.00e-nobyte-compile.patch b/sci-physics/root/files/root-5.26.00e-nobyte-compile.patch
deleted file mode 100644
index 502623ed96b6..000000000000
--- a/sci-physics/root/files/root-5.26.00e-nobyte-compile.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-diff -Nur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.orig/bindings/pyroot/Module.mk	2010-10-13 23:43:25.000000000 +0100
-+++ root/bindings/pyroot/Module.mk	2010-10-13 23:47:08.000000000 +0100
-@@ -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) $@ \
-@@ -112,7 +108,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff -Nur root.orig/build/package/debian/rules root/build/package/debian/rules
---- root.orig/build/package/debian/rules	2010-10-13 23:43:25.000000000 +0100
-+++ root/build/package/debian/rules	2010-10-13 23:47:08.000000000 +0100
-@@ -624,10 +624,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 -Nur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.orig/cint/cintex/Module.mk	2010-10-13 23:43:25.000000000 +0100
-+++ root/cint/cintex/Module.mk	2010-10-13 23:47:08.000000000 +0100
-@@ -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 -Nur root.orig/cint/cintexcompat/Module.mk root/cint/cintexcompat/Module.mk
---- root.orig/cint/cintexcompat/Module.mk	2010-10-13 23:43:25.000000000 +0100
-+++ root/cint/cintexcompat/Module.mk	2010-10-13 23:47:08.000000000 +0100
-@@ -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,12 +82,10 @@
- 		fi)
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- ifeq ($(findstring $(MAKECMDGOALS),distclean maintainer-clean),)
- # Avoid conflict with cintex/Module.mk
--$(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-+$(CINTEXLIB):   $(CINTEXO) $(CINTEXPY)  \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"      \
- 		"$(SOFLAGS)" libCintex.$(SOEXT) $@ "$(CINTEXO)" \
-@@ -113,7 +107,7 @@
- clean::         clean-$(MODNAME)
- 
- distclean-$(MODNAME): clean-$(MODNAME)
--		@rm -f $(CINTEXDEP) $(CINTEXLIB) $(CINTEXMAP) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO)
-+		@rm -f $(CINTEXDEP) $(CINTEXLIB) $(CINTEXMAP) $(CINTEXPY)
- 		@rm -rf include/Cintex
- 
- distclean::     distclean-$(MODNAME)
-diff -Nur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.orig/cint/reflex/Module.mk	2010-10-13 23:43:25.000000000 +0100
-+++ root/cint/reflex/Module.mk	2010-10-13 23:47:08.000000000 +0100
-@@ -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)
- 
-@@ -97,7 +94,7 @@
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-                 clean-check-$(MODNAME) check-$(MODNAME) clean-genreflex
- 
--POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN += $(RFLX_GRFLXPY)
- 
- include/Reflex/%.h: $(REFLEXDIRI)/Reflex/%.h
- 		@(if [ ! -d "include/Reflex" ]; then          \
-@@ -123,8 +120,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 $(REFLEXDICTMAP) -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 -Nur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.orig/cint/reflex/python/CMakeLists.txt	2010-10-13 23:43:25.000000000 +0100
-+++ root/cint/reflex/python/CMakeLists.txt	2010-10-13 23:47:08.000000000 +0100
-@@ -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 -Nur root.orig/Makefile root/Makefile
---- root.orig/Makefile	2010-10-13 23:43:25.000000000 +0100
-+++ root/Makefile	2010-10-13 23:47:08.000000000 +0100
-@@ -1082,10 +1082,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 --git a/sci-physics/root/files/root-5.26.00e-prop-ldflags.patch b/sci-physics/root/files/root-5.26.00e-prop-ldflags.patch
deleted file mode 100644
index 322c3bd67b4a..000000000000
--- a/sci-physics/root/files/root-5.26.00e-prop-ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur root.orig/config/Makefile.in root/config/Makefile.in
---- root.orig/config/Makefile.in	2010-10-13 23:43:25.000000000 +0100
-+++ root/config/Makefile.in	2010-10-13 23:48:57.000000000 +0100
-@@ -9,7 +9,7 @@
- 
- EXTRA_CFLAGS   := -Iinclude @cflags@
- EXTRA_CXXFLAGS := -Iinclude @cflags@
--EXTRA_LDFLAGS  := @ldflags@
-+EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
- WINRTDEBUG     := @winrtdebug@
- ENABLEPCH      := @enable_pch@
- NOSTUBS        := @no_stubs@
diff --git a/sci-physics/root/root-5.26.00e.ebuild b/sci-physics/root/root-5.26.00e-r1.ebuild
index c4b6efcf5fd5..cb75a2d7b2e6 100644
--- a/sci-physics/root/root-5.26.00e.ebuild
+++ b/sci-physics/root/root-5.26.00e-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00e.ebuild,v 1.1 2010/10/19 03:49:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00e-r1.ebuild,v 1.1 2010/10/22 07:11:29 xarthisius Exp $
 
 EAPI=3
 
@@ -15,7 +15,7 @@ TMVA_DOC_PV=4
 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
-	mirror://gentoo/${P}-xrootd-prop-flags.patch.gz
+	mirror://gentoo/${P}-patches.tar.bz2
 	doc? (
 		ftp://root.cern.ch/root/doc/Users_Guide_${DOC_PV}.pdf
 		ftp://root.cern.ch/root/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
@@ -103,12 +103,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-make-3.82.patch
-	epatch "${FILESDIR}"/${P}-prop-ldflags.patch
-	epatch "${FILESDIR}"/${P}-configure-paths.patch
-	epatch "${FILESDIR}"/${P}-nobyte-compile.patch
-	epatch "${FILESDIR}"/${P}-glibc212.patch
-	epatch "${WORKDIR}"/${P}-xrootd-prop-flags.patch
+	epatch "${WORKDIR}"/${P}-make-3.82.patch \
+		"${WORKDIR}"/${P}-prop-ldflags.patch \
+		"${WORKDIR}"/${P}-configure-paths.patch \
+		"${WORKDIR}"/${P}-nobyte-compile.patch \
+		"${WORKDIR}"/${P}-glibc212.patch \
+		"${WORKDIR}"/${P}-xrootd-prop-flags.patch
 
 	# use system cfortran
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc