summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2009-11-26 21:36:08 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2009-11-26 21:36:08 +0000
commit6b68d160f4a4311e3a25c8beec27ca4edbf03f30 (patch)
treed90db8dae2768d3cbf11056ec527d8de21d3f4a4 /sci-physics/cernlib-montecarlo
parentFixing patch application with more recent versions (diff)
downloadgentoo-2-6b68d160f4a4311e3a25c8beec27ca4edbf03f30.tar.gz
gentoo-2-6b68d160f4a4311e3a25c8beec27ca4edbf03f30.tar.bz2
gentoo-2-6b68d160f4a4311e3a25c8beec27ca4edbf03f30.zip
Fixing patch application with more recent versions
(Portage version: 2.2_rc52/cvs/Linux x86_64)
Diffstat (limited to 'sci-physics/cernlib-montecarlo')
-rw-r--r--sci-physics/cernlib-montecarlo/ChangeLog6
-rw-r--r--sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild8
2 files changed, 10 insertions, 4 deletions
diff --git a/sci-physics/cernlib-montecarlo/ChangeLog b/sci-physics/cernlib-montecarlo/ChangeLog
index 65f936ecbfc4..a51b05b4f951 100644
--- a/sci-physics/cernlib-montecarlo/ChangeLog
+++ b/sci-physics/cernlib-montecarlo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-physics/cernlib-montecarlo
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.8 2009/11/25 14:46:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.9 2009/11/26 21:36:08 bicatali Exp $
+
+ 26 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
+ cernlib-montecarlo-2006-r2.ebuild:
+ Fixing patch application with more recent versions
25 Nov 2009; Markus Meier <maekke@gentoo.org>
cernlib-montecarlo-2006-r2.ebuild:
diff --git a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild
index 094e7fe19de3..c92e76f2d49f 100644
--- a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild
+++ b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-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/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild,v 1.2 2009/11/25 14:46:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild,v 1.3 2009/11/26 21:36:08 bicatali Exp $
EAPI=2
inherit eutils toolchain-funcs
@@ -30,11 +30,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"