Move patches to mirrors. Fixes bug 341971.

(Portage version: 2.2_rc98/cvs/Linux x86_64)

7 files changed, 18 insertions, 272 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/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