Fixing patch application with more recent versions

(Portage version: 2.2_rc52/cvs/Linux x86_64)

3 files changed, 10 insertions, 121 deletions

diff --git a/sci-physics/cernlib/ChangeLog b/sci-physics/cernlib/ChangeLog
index 7b677907723a..1784169efc6b 100644
--- a/sci-physics/cernlib/ChangeLog
+++ b/sci-physics/cernlib/ChangeLog
@@ -1,6 +1,10 @@
 # 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.16 2009/11/25 14:45:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.17 2009/11/26 21:37:25 bicatali Exp $
+
+  26 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -cernlib-2006-r2.ebuild, cernlib-2006-r3.ebuild:
+  Fixing patch application with more recent versions
 
   25 Nov 2009; Markus Meier <maekke@gentoo.org> cernlib-2006-r3.ebuild:
   amd64/x86 stable, bug #294439
diff --git a/sci-physics/cernlib/cernlib-2006-r2.ebuild b/sci-physics/cernlib/cernlib-2006-r2.ebuild
deleted file mode 100644
index d58ef66d9220..000000000000
--- a/sci-physics/cernlib/cernlib-2006-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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-r2.ebuild,v 1.3 2009/03/22 21:41:21 darkside Exp $
-
-inherit eutils fortran
-
-DEB_PN=cernlib
-DEB_PV=${PV}.dfsg.2
-DEB_PR=13.2
-DEB_P=${DEB_PN}_${DEB_PV}
-
-DESCRIPTION="CERN program library for High Energy Physics"
-HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/cernlib"
-SRC_URI="mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
-	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.diff.gz"
-
-KEYWORDS="amd64 ~hppa sparc ~x86"
-LICENSE="GPL-2 LGPL-2 BSD"
-
-SLOT="0"
-
-DEPEND="x11-libs/openmotif
-	virtual/lapack
-	dev-lang/cfortran
-	x11-misc/imake
-	x11-misc/makedepend
-	dev-util/pkgconfig"
-
-RDEPEND="x11-libs/openmotif
-	virtual/lapack
-	dev-lang/cfortran"
-
-IUSE=""
-
-S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig"
-
-FORTRAN="gfortran g77 ifc"
-
-src_unpack() {
-
-	unpack ${A}
-	epatch "${DEB_P}-${DEB_PR}".diff
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-nogfortran.patch
-
-	# set some default paths
-	sed -i \
-		-e "s:/usr/local:/usr:g" \
-		-e "s:prefix)/lib:prefix)/$(get_libdir):" \
-		-e 's:$(prefix)/etc:/etc:' \
-		-e 's:$(prefix)/man:$(prefix)/share/man:' \
-		debian/add-ons/cernlib.mk || die "sed failed"
-
-	# use system blas and lapack set by gentoo framework
-	sed -i \
-		-e "s:\$DEPS -lm:$(pkg-config --libs blas):" \
-		-e "s:\$DEPS -llapack -lm:$(pkg-config --libs lapack):" \
-		-e 's:`depend $d $a blas`::' \
-		-e 's:X11R6:X11:g' \
-		debian/add-ons/bin/cernlib.in || die "sed failed"
-
-	cp debian/add-ons/Makefile .
-	export DEB_BUILD_OPTIONS="${FORTRANC} nostrip nocheck"
-
-	einfo "Applying Debian patches"
-	emake -j1 patch || die "debian patch failed"
-
-	# since we depend on cfortran, do not use the one from cernlib
-	rm -f src/include/cfortran/cfortran.h
-
-	# respect users flags
-	sed -i \
-		-e 's/-O3/-O2/g' \
-		-e "s/-O2/${CFLAGS}/g" \
-		src/config/linux.cf	\
-		|| die "sed linux.cf failed"
-	sed -i \
-		-e 's/\$(FCLINK)/\$(FCLINK) $(LDFLAGS)/' \
-		-e 's/\$(CCLINK)/\$(CCLINK) $(LDFLAGS)/' \
-		src/config/{biglib,fortran,Imake}.rules \
-		src/patchy/Imakefile \
-		|| die "sed for ldflags propagation failed"
-
-	# add missing headers for implicit
-	sed -i \
-		-e '0,/^#include/i#include <stdlib.h>' \
-		src/kernlib/kerngen/ccgen*/*.c || die
-}
-
-src_compile() {
-	# parallel make breaks and complex patched imake system, hard to debug
-	emake -j1 cernlib-indep cernlib-arch || die "emake libs failed"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}"/shlib \
-		emake -j1 cernlib-test || die "emake test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}"/debian
-	dodoc changelog README.* deadpool.txt NEWS copyright || die "dodoc failed"
-	newdoc add-ons/README README.add-ons || die "newdoc failed"
-}
-
-pkg_postinst() {
-	elog "Gentoo ${PN} is based on Debian similar package."
-	elog "Serious cernlib users might want to check:"
-	elog "http://people.debian.org/~kmccarty/cernlib/"
-	elog "for the changes and licensing from the original package"
-	if use amd64; then
-		elog "Please see the possible warnings for ${PN} on 64 bits:"
-		elog "${ROOT}/usr/share/doc/${PF}/README.*64*"
-	fi
-}
diff --git a/sci-physics/cernlib/cernlib-2006-r3.ebuild b/sci-physics/cernlib/cernlib-2006-r3.ebuild
index 7c7ad874124d..978cd965e7af 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.2 2009/11/25 14:45:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r3.ebuild,v 1.3 2009/11/26 21:37:25 bicatali Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -31,11 +31,13 @@ DEPEND="${RDEPEND}
 
 IUSE=""
 
-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}"
 	epatch "${FILESDIR}/${P}-nogfortran.patch"
 	# set some default paths