Fix building with gmake-3.82 wrt 333083. Thanks to Diego for reporting.

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

4 files changed, 51 insertions, 7 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index e99b35437d6d..d4cee59693ea 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,10 @@
 # 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.73 2010/07/10 19:05:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.74 2010/10/16 17:37:24 xarthisius Exp $
+
+  16 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  root-5.26.00-r4.ebuild, +files/root-5.26.00-make-3.82.patch:
+  Fix building with gmake-3.82 wrt 333083. Thanks to Diego for reporting.
 
   10 Jul 2010; Raúl Porcel <armin76@gentoo.org> root-5.26.00-r2.ebuild:
   sparc stable wrt #318469
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 684e29f701ff..25f60adee1cd 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -5,6 +5,7 @@ AUX olbd.confd 197 RMD160 798de1808502f3e4ecfc5f024b56a419d9824057 SHA1 f2a4385f
 AUX olbd.initd 714 RMD160 e2cc28474a280345f6962f890f5ddb3884d7f69f SHA1 4dcdf7ba35a834db2ac5a5bdfe4d2c31938f0552 SHA256 5d6c1b6e7b40d6842df6a6f7314fa2f49329b820ff86592d2f8d2662a414ec39
 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 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
@@ -16,13 +17,15 @@ DIST root-5.26.00-patches-p03.tar.bz2 164854 RMD160 5fbcfe152b944323a7c172f429d5
 DIST root-5.26.00-patches-p05.tar.bz2 232546 RMD160 68f3cb6f62953b839fdc91b6b0a042fea71d2d7e SHA1 1e3ec93c3826a0fda3398739837a48c865f2cd41 SHA256 eda78f9e280d0eafb7d0daa933cf6b5e91d0af6bf5325ef9f4839926a91230aa
 DIST root_v5.26.00.source.tar.gz 29209345 RMD160 bf7f91abd76ec86f69eb80506291cb8d4f87614e SHA1 318c5adf7f54f8206d9173d2fb0dc196a0e87192 SHA256 5ec86599bf7ef0fe3db11e5dd2d01183484cb199ab3a1c28d68f10b804e93e76
 EBUILD root-5.26.00-r2.ebuild 8947 RMD160 dc345d9ea444b8aecff9d83c8227f8989f5da871 SHA1 59f8cc02d828d41f98547eeb9bff5d8ed3ba54a2 SHA256 a41571cc2ecf8fb9fe61273dfc0f1357db89d26d2a7594a45a16f65a82020087
-EBUILD root-5.26.00-r4.ebuild 9272 RMD160 0eea96903cfb0383d12310fc257f4cadc1b439c9 SHA1 84b82dc53fed4370f8b3cc7d106a06a8e599dcae SHA256 1ce3ba7009bfb1d2c4497a930d359aa597d93837793b4e660db8caa1e17cd06f
-MISC ChangeLog 20615 RMD160 f3ef8e27de50478a5da9eb0ced8b34d1e7c3d99b SHA1 ccd39f3d31a1ca78f771088e7b638d67fa68ee39 SHA256 8cfcf20d8e621eebec30a4fb07e39770a2f455a26e86e6119ded8e00cf005c2f
+EBUILD root-5.26.00-r4.ebuild 9317 RMD160 2e8ad460e62d02122b6129d1333b5c0d4f22aab0 SHA1 2694b66c177d1ac86d25b8e84cb40336dadbe81c SHA256 65b3b38459a59870d1085c5b9d1a52ebcc219ab5a0eec3057eeb9b638e9f9a79
+MISC ChangeLog 20810 RMD160 7ea0afa59ba258f4c810b3aeeb38fbe638329a5d SHA1 aff8f03fb8bafd40fab39e7f3643e67244526583 SHA256 7305e7e8dfbc3e98d4140a8f09cbd6bda543f2f2fa0b208e4fb8b1fea9fec515
 MISC metadata.xml 1447 RMD160 ea9e4cda86f83ddbdcfa63667cc0566353d4c118 SHA1 53be10972173afad6271890c02f386fa17c59b92 SHA256 450c6183f001eed437f8097f22caa92d814ddc05855e8166cf656279706af8c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxkMT8ACgkQ1ycZbhPLE2BHdgCcDnAJ4aN1yCmpjfsBovJnX3TE
-lxEAn0TBy6sm6tVCwErs1tmTqJBOyGAE
-=5Wl5
+iJwEAQECAAYFAky54uEACgkQIiMqcbOVdxSafAP/evHW6/rTYCzAeNNKLJVGbrB1
+s0b7SbbzdOB/7BgGKJ3S6Q/PIuQQYHSeRx+t8i2KmF4ebi+TYURq4ykiR85DP78h
+RAad9SsXWRvXQlzzdHRepVOKnz6v78WQnvoK7UTvU9oiIkHC5l0CIKu8aSdVFTBt
+7ZMmD8chnMcD+RB981c=
+=emos
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/root/files/root-5.26.00-make-3.82.patch b/sci-physics/root/files/root-5.26.00-make-3.82.patch
new file mode 100644
index 000000000000..dc6d8a0189e3
--- /dev/null
+++ b/sci-physics/root/files/root-5.26.00-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.00-r4.ebuild b/sci-physics/root/root-5.26.00-r4.ebuild
index 74f3c51dba3e..d5bae6066c6c 100644
--- a/sci-physics/root/root-5.26.00-r4.ebuild
+++ b/sci-physics/root/root-5.26.00-r4.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.00-r4.ebuild,v 1.4 2010/07/06 15:59:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00-r4.ebuild,v 1.5 2010/10/16 17:37:24 xarthisius Exp $
 
 EAPI=3
 
@@ -105,6 +105,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-make-3.82.patch
 	epatch "${WORKDIR}"/${P}-svn34137.patch
 	epatch "${WORKDIR}"/${P}-prop-ldflags.patch
 	epatch "${WORKDIR}"/${P}-xrootd-prop-flags.patch