Re-changing to old style patching at least until patch-2.6 is not buggy and masked

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

6 files changed, 24 insertions, 12 deletions

diff --git a/sci-physics/cernlib/ChangeLog b/sci-physics/cernlib/ChangeLog
index eb4e1e058bf8..bfcfe789612b 100644
--- a/sci-physics/cernlib/ChangeLog
+++ b/sci-physics/cernlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/cernlib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.18 2009/12/04 15:55:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.19 2009/12/04 19:35:03 bicatali Exp $
+
+  04 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  cernlib-2006-r3.ebuild:
+  Re-changing to old style patching at least until patch-2.6 is not buggy
+  and masked
 
   04 Dec 2009; Jeroen Roovers <jer@gentoo.org> cernlib-2006-r3.ebuild:
   Stable for HPPA (bug #294439).
diff --git a/sci-physics/cernlib/cernlib-2006-r3.ebuild b/sci-physics/cernlib/cernlib-2006-r3.ebuild
index cbd19313030a..c018149943dd 100644
--- a/sci-physics/cernlib/cernlib-2006-r3.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-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/cernlib/cernlib-2006-r3.ebuild,v 1.4 2009/12/04 15:55:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r3.ebuild,v 1.5 2009/12/04 19:35:03 bicatali Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -31,13 +31,12 @@ DEPEND="${RDEPEND}
 
 IUSE=""
 
-S="${WORKDIR}/${DEB_PN}-${DEB_PV}"
+S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig"
 
 src_prepare() {
 	cd "${WORKDIR}"
 	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}"
 	epatch "${FILESDIR}/${P}-nogfortran.patch"
 	# set some default paths
diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index 5d1c8d090e21..0bef6353e7ff 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,11 @@
 # 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.33 2009/11/26 21:35:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.34 2009/12/04 19:37:49 bicatali Exp $
+
+  04 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  geant-3.21.14-r2.ebuild:
+  Re-changing to old style patching at least until patch-2.6 is not buggy
+  and masked
 
   26 Nov 2009; Markus Meier <maekke@gentoo.org> geant-4.9.2_p02.ebuild:
   amd64 stable, 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 ad09613b5126..2802935df8bd 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.12 2009/11/26 21:35:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-3.21.14-r2.ebuild,v 1.13 2009/12/04 19:37:49 bicatali Exp $
 
 EAPI=2
 inherit eutils
@@ -31,13 +31,12 @@ DEPEND="${RDEPEND}
 	x11-misc/imake
 	x11-misc/makedepend"
 
-S="${WORKDIR}/${DEB_PN}-${DEB_PV}"
+S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig"
 
 src_prepare() {
 	cd "${WORKDIR}"
 	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"
diff --git a/sci-physics/paw/ChangeLog b/sci-physics/paw/ChangeLog
index be27c97f997f..2aef0427f96f 100644
--- a/sci-physics/paw/ChangeLog
+++ b/sci-physics/paw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/paw
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/paw/ChangeLog,v 1.16 2009/11/26 21:34:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/paw/ChangeLog,v 1.17 2009/12/04 19:36:16 bicatali Exp $
+
+  04 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  paw-2.14.04-r2.ebuild:
+  Re-changing to old style patching at least until patch-2.6 is not buggy
+  and masked
 
   26 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
   paw-2.14.04-r2.ebuild:
diff --git a/sci-physics/paw/paw-2.14.04-r2.ebuild b/sci-physics/paw/paw-2.14.04-r2.ebuild
index 85003c68b0b4..6ed67e4780d0 100644
--- a/sci-physics/paw/paw-2.14.04-r2.ebuild
+++ b/sci-physics/paw/paw-2.14.04-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/paw/paw-2.14.04-r2.ebuild,v 1.14 2009/11/26 21:34:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/paw/paw-2.14.04-r2.ebuild,v 1.15 2009/12/04 19:36:16 bicatali Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -31,13 +31,12 @@ DEPEND="${RDEPEND}
 	x11-misc/imake
 	x11-misc/makedepend"
 
-S="${WORKDIR}/${DEB_PN}-${DEB_PV}"
+S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig"
 
 src_prepare() {
 	cd "${WORKDIR}"
 	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"