From 6341c8d1550d868f62b8f4a3179dc2dbcee76142 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Thu, 26 Nov 2009 21:37:25 +0000 Subject: Fixing patch application with more recent versions Package-Manager: portage-2.2_rc52/cvs/Linux x86_64 --- sci-physics/cernlib-montecarlo/ChangeLog | 6 +- .../cernlib-montecarlo-2006-r2.ebuild | 8 +- sci-physics/cernlib/ChangeLog | 6 +- sci-physics/cernlib/cernlib-2006-r2.ebuild | 117 --------------------- sci-physics/cernlib/cernlib-2006-r3.ebuild | 8 +- sci-physics/geant/ChangeLog | 6 +- sci-physics/geant/geant-3.21.14-r2.ebuild | 8 +- sci-physics/paw/ChangeLog | 6 +- sci-physics/paw/paw-2.14.04-r2.ebuild | 8 +- 9 files changed, 40 insertions(+), 133 deletions(-) delete mode 100644 sci-physics/cernlib/cernlib-2006-r2.ebuild (limited to 'sci-physics') 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 + cernlib-montecarlo-2006-r2.ebuild: + Fixing patch application with more recent versions 25 Nov 2009; Markus Meier 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" 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 + -cernlib-2006-r2.ebuild, cernlib-2006-r3.ebuild: + Fixing patch application with more recent versions 25 Nov 2009; Markus Meier 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 ' \ - 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 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 geant-4.9.2_p02.ebuild: amd64 stable, bug #294442 + 26 Nov 2009; Sébastien Fabbro + geant-3.21.14-r2.ebuild: + Fixing patch application with more recent versions + 26 Nov 2009; Christian Faulhammer 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" diff --git a/sci-physics/paw/ChangeLog b/sci-physics/paw/ChangeLog index 13ee870305e4..be27c97f997f 100644 --- a/sci-physics/paw/ChangeLog +++ b/sci-physics/paw/ChangeLog @@ -1,6 +1,10 @@ # 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.15 2009/09/17 19:11:27 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/paw/ChangeLog,v 1.16 2009/11/26 21:34:17 bicatali Exp $ + + 26 Nov 2009; Sébastien Fabbro + paw-2.14.04-r2.ebuild: + Fixing patch application with more recent versions 17 Sep 2009; Sébastien Fabbro 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 229c6a3d4989..85003c68b0b4 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.13 2009/09/17 19:11:27 bicatali Exp $ +# $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 $ EAPI=2 inherit eutils toolchain-funcs @@ -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" -- cgit v1.2.3-65-gdbad