summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2009-11-26 21:35:34 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2009-11-26 21:35:34 +0000
commit1b5c72f2cdeda7ea9c9f52bc045f46efc986ef78 (patch)
treec0638c7944bd4948d54f82903daef0c24b6ec3b7 /sci-physics/geant
parentInitial version of dev-haskell/x11-xft (diff)
downloadgentoo-2-1b5c72f2cdeda7ea9c9f52bc045f46efc986ef78.tar.gz
gentoo-2-1b5c72f2cdeda7ea9c9f52bc045f46efc986ef78.tar.bz2
gentoo-2-1b5c72f2cdeda7ea9c9f52bc045f46efc986ef78.zip
Fixing patch application with more recent versions
(Portage version: 2.2_rc52/cvs/Linux x86_64)
Diffstat (limited to 'sci-physics/geant')
-rw-r--r--sci-physics/geant/ChangeLog6
-rw-r--r--sci-physics/geant/geant-3.21.14-r2.ebuild8
2 files changed, 10 insertions, 4 deletions
diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index a9ec1cbc267f..5d1c8d090e21 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,10 +1,14 @@
# ChangeLog for sci-physics/geant
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.32 2009/11/26 19:44:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.33 2009/11/26 21:35:34 bicatali Exp $
26 Nov 2009; Markus Meier <maekke@gentoo.org> geant-4.9.2_p02.ebuild:
amd64 stable, bug #294442
+ 26 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
+ geant-3.21.14-r2.ebuild:
+ Fixing patch application with more recent versions
+
26 Nov 2009; Christian Faulhammer <fauli@gentoo.org>
geant-4.9.2_p02.ebuild:
stable x86, bug 294442
diff --git a/sci-physics/geant/geant-3.21.14-r2.ebuild b/sci-physics/geant/geant-3.21.14-r2.ebuild
index a3c81fa7edfd..ad09613b5126 100644
--- a/sci-physics/geant/geant-3.21.14-r2.ebuild
+++ b/sci-physics/geant/geant-3.21.14-r2.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/geant/geant-3.21.14-r2.ebuild,v 1.11 2009/05/05 19:49:10 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-3.21.14-r2.ebuild,v 1.12 2009/11/26 21:35:34 bicatali Exp $
EAPI=2
inherit eutils
@@ -31,11 +31,13 @@ DEPEND="${RDEPEND}
x11-misc/imake
x11-misc/makedepend"
-S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig"
+S="${WORKDIR}/${DEB_PN}-${DEB_PV}"
src_prepare() {
cd "${WORKDIR}"
- epatch "${WORKDIR}/${DEB_P}-${DEB_PR}.diff"
+ sed -i -e 's:/tmp/dp.*/cern:cern:g' ${DEB_P}-${DEB_PR}.diff || die
+ epatch ${DEB_P}-${DEB_PR}.diff
+ mv ${DEB_PN}-${DEB_PV}{.orig,}/upstream
cd "${S}"
cp debian/add-ons/Makefile .
export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck"