sci-physics/root: backport upstream patch to fix build with gmake-3.82

4 files changed, 44 insertions, 12 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index eda9c0c31..081fdbbd3 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 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 $
 
+  16 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org> root-5.26.00e.ebuild,
+  +files/root-5.26.00e-make-3.82.patch:
+  backport upstream patch to fix build with gmake-3.82
+
   14 Oct 2010; Sébastien Fabbro <bicatali@gentoo.org>
   +root-5.26.00e.ebuild, +files/root-5.26.00e-configure-paths.patch,
   +files/root-5.26.00e-glibc212.patch,
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 1d01bd878..5fcca84a3 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX olbd.confd 197 RMD160 798de1808502f3e4ecfc5f024b56a419d9824057 SHA1 f2a4385fdf9849eafb1d5457727f6fbe80af1da3 SHA256 5a34da76bbe56cd3b8128f05c0d9900f9d7f7ffdcffc5deeb816c78ea46679ba
 AUX olbd.initd 714 RMD160 8c3e427b54b79408c9b1e1fbf895c59c665fb4d6 SHA1 d625878c925db41e2319867b00926d1e468150fe SHA256 d4cecbd149e4e25e65ea60e68fb5409e34d32f7f577d535b51a2491f8b12964e
 AUX proofd.confd 415 RMD160 3814aacb63d82b9d060086f9bef304d431a15b4e SHA1 31eb7af239a0042f887b5089a7c6c7ec5d6662e9 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38
 AUX proofd.initd 717 RMD160 c93c8d99cb2cfb50ed8269af40fcdfb226ed8008 SHA1 dc4e761bf45920dcdaa25d97085364b8c272a6b5 SHA256 780f5ff7d033146d2cec20e246f3ed7379f1ed65642ef5f4cf018f47b4766a1e
 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 root-5.26.00e-xrootd-prop-flags.patch 35220 RMD160 00ed6eb85a5f234fd3e574cac065b0f3f8b9598a SHA1 9f93fb817e8523f2b4c2e35592f0c2d7470fdd97 SHA256 96f5aec8b82fcd016c37c4bc94865b6fcb8eb203384e61253c70a829b0f37df2
@@ -18,13 +16,6 @@ DIST RooFit_Users_Manual_2.91-33.pdf 1330062 RMD160 650b616018a5493d5fd7da1dc06c
 DIST TMVAUsersGuide-v4.pdf 2355827 RMD160 0624a6ed7e006581eacdaa69e82bbdca91aa42a9 SHA1 98016f0ccfa6c54234e22b46032bb0b2f5d7ac20 SHA256 bbc6563fd14a6a4a88efca55fa75e74d9b5c2a9f5d3044239f3f83dc2967ad62
 DIST Users_Guide_5_26.pdf 11197843 RMD160 0560efd109ee45148d4918eecba76736b583ea00 SHA1 3da4ea7e463825a20514deeb7e3b392b32b08178 SHA256 9d19277da5ac6b20e825a8d1d000dc90c595e1c042e5caca9ffb3271a6347bfe
 DIST root_v5.26.00e.source.tar.gz 28922785 RMD160 692312a1984279255e32c96a0a79b974ff2e2971 SHA1 5a4b7e1b759dfef0dd218491bbe74ca376fc8c07 SHA256 7f2604954775653825b9897da131278c9b349f12d77b1fc087004c1b838f4a80
-EBUILD root-5.26.00e.ebuild 9248 RMD160 63d1e525150149c9f7103193cc42ccd408409eaa SHA1 bbc5f777c26169df3c26e014b1eb1ddba1fccf3c SHA256 ee5011d628b908e0a9b6edcf894a593dcd5c3fb8af6fd4096af7cbfccdf27364
-MISC ChangeLog 21733 RMD160 45813f92bba948935402fd799278644c9b49a0eb SHA1 0e36149c6416703e9b13f30f5fbe726a41d4ad89 SHA256 87a32564f59877e34ae6c1e1ddb9a6fd89c5cb410eb7c467e2c14195b23bdb5a
+EBUILD root-5.26.00e.ebuild 9291 RMD160 0592f1d5b2a7c0c2e8aa28ed8c3c85e67699e0b1 SHA1 8aa4227619820fdb080b2de0af734a497709fe50 SHA256 8575e4b3b88dc9618c6f496497fe528234aaf392fb21e2da68483b5cfdba51fb
+MISC ChangeLog 21905 RMD160 6e96285e707c76252972be9cd675a961ebc1cbec SHA1 6bc2c8c2a50417d4bf019db5e2941181986f8584 SHA256 11e275137c23a292a3a300751864c53969b8c61654daed40f29e6de672d4abba
 MISC metadata.xml 1447 RMD160 ea9e4cda86f83ddbdcfa63667cc0566353d4c118 SHA1 53be10972173afad6271890c02f386fa17c59b92 SHA256 450c6183f001eed437f8097f22caa92d814ddc05855e8166cf656279706af8c5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAky3UQIACgkQ1ycZbhPLE2DG1gCgpkepZcYKUULLJzM/zSxmC4ID
-6dIAoKlxq/PUUmNYZK0E6XNYpE+IYOKW
-=pp+j
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000..dc6d8a018
--- /dev/null
+++ b/sci-physics/root/files/root-5.26.00e-make-3.82.patch
@@ -0,0 +1,36 @@
+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/root-5.26.00e.ebuild b/sci-physics/root/root-5.26.00e.ebuild
index 3ec3caf0d..c42bf2fea 100644
--- a/sci-physics/root/root-5.26.00e.ebuild
+++ b/sci-physics/root/root-5.26.00e.ebuild
@@ -104,6 +104,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-make-3.82.patch
 	epatch "${FILESDIR}"/${P}-prop-ldflags.patch
 	epatch "${FILESDIR}"/${P}-xrootd-prop-flags.patch
 	epatch "${FILESDIR}"/${P}-configure-paths.patch