summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2009-06-23 16:35:48 +0000
committerJeroen Roovers <jer@gentoo.org>2009-06-23 16:35:48 +0000
commit4e1841040bc9d0459740654e589b3231a69daeb0 (patch)
tree3b8164140e560e7942f113f57b5cc3aee7f73119 /sci-physics/root
parentStable for HPPA (bug #275056). (diff)
downloadgentoo-2-4e1841040bc9d0459740654e589b3231a69daeb0.tar.gz
gentoo-2-4e1841040bc9d0459740654e589b3231a69daeb0.tar.bz2
gentoo-2-4e1841040bc9d0459740654e589b3231a69daeb0.zip
Fix spelling error causing compile failure (bug #275205).
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'sci-physics/root')
-rw-r--r--sci-physics/root/ChangeLog8
-rw-r--r--sci-physics/root/files/root-5.20.00-defind.patch20
-rw-r--r--sci-physics/root/root-5.20.00-r3.ebuild5
3 files changed, 30 insertions, 3 deletions
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 02ad3f483b1d..e9a0fccbfc5a 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-physics/root
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.47 2009/05/05 19:43:13 fauli Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.48 2009/06/23 16:35:48 jer Exp $
+
+ 23 Jun 2009; Jeroen Roovers <jer@gentoo.org> root-5.20.00-r3.ebuild,
+ +files/root-5.20.00-defind.patch:
+ Fix spelling error causing compile failure (bug #275205).
05 May 2009; Christian Faulhammer <fauli@gentoo.org>
root-5.20.00-r3.ebuild:
diff --git a/sci-physics/root/files/root-5.20.00-defind.patch b/sci-physics/root/files/root-5.20.00-defind.patch
new file mode 100644
index 000000000000..e52c5025cefc
--- /dev/null
+++ b/sci-physics/root/files/root-5.20.00-defind.patch
@@ -0,0 +1,20 @@
+--- root/cint/cint/src/Type.cxx.orig 2008-06-25 08:24:00.000000000 +0200
++++ root/cint/cint/src/Type.cxx 2009-06-23 17:59:36.000000000 +0200
+@@ -125,7 +125,7 @@
+ strcpy(G__buf,
+ G__type2string((int)type,(int)tagnum,-1,(int)reftype,(int)isconst));
+ return(G__buf);
+-#elif !defind(G__OLDIMPLEMENTATION401)
++#elif !defined(G__OLDIMPLEMENTATION401)
+ return(G__type2string((int)type,(int)tagnum,-1,(int)reftype,(int)isconst));
+ #else
+ return(G__type2string((int)type,(int)tagnum,-1,(int)reftype));
+@@ -138,7 +138,7 @@
+ strcpy(G__buf,G__type2string((int)type,(int)tagnum,(int)typenum,(int)reftype
+ ,(int)isconst));
+ return(G__buf);
+-#elif !defind(G__OLDIMPLEMENTATION401)
++#elif !defined(G__OLDIMPLEMENTATION401)
+ return(G__type2string((int)type,(int)tagnum,(int)typenum,(int)reftype
+ ,(int)isconst));
+ #else
diff --git a/sci-physics/root/root-5.20.00-r3.ebuild b/sci-physics/root/root-5.20.00-r3.ebuild
index 1d5052025bbc..698ce21b7352 100644
--- a/sci-physics/root/root-5.20.00-r3.ebuild
+++ b/sci-physics/root/root-5.20.00-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.20.00-r3.ebuild,v 1.9 2009/05/05 19:43:13 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.20.00-r3.ebuild,v 1.10 2009/06/23 16:35:48 jer Exp $
EAPI=1
inherit versionator eutils qt4 fortran elisp-common fdo-mime
@@ -111,6 +111,9 @@ src_unpack() {
# various patches from upstream branch
epatch "${WORKDIR}"/${P}-upstream.patch
+ # fix spelling errors (bug #275205)
+ epatch "${FILESDIR}/${P}-defind.patch"
+
# use system cfortran
rm montecarlo/eg/inc/cfortran.h README/cfortran.doc