[gentoo-commits] gentoo-x86 commit in sci-physics/geant: geant-3.21.14-r2.ebuild ChangeLog

["Sebastien Fabbro (bicatali)" <bicatali@gentoo.org>]

bicatali    09/11/26 21:35:34

  Modified:             geant-3.21.14-r2.ebuild ChangeLog
  Log:
  Fixing patch application with more recent versions
  (Portage version: 2.2_rc52/cvs/Linux x86_64)

Revision  Changes    Path
1.12                 sci-physics/geant/geant-3.21.14-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/geant/geant-3.21.14-r2.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/geant/geant-3.21.14-r2.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/geant/geant-3.21.14-r2.ebuild?r1=1.11&r2=1.12

Index: geant-3.21.14-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-3.21.14-r2.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- geant-3.21.14-r2.ebuild	5 May 2009 19:49:10 -0000	1.11
+++ geant-3.21.14-r2.ebuild	26 Nov 2009 21:35:34 -0000	1.12
@@ -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 @@
 	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"



1.33                 sci-physics/geant/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/geant/ChangeLog?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/geant/ChangeLog?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/geant/ChangeLog?r1=1.32&r2=1.33

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog	26 Nov 2009 19:44:28 -0000	1.32
+++ ChangeLog	26 Nov 2009 21:35:34 -0000	1.33
@@ -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