From a3ce715d7aa96fbfa3945c91b7784c967c5afa01 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Thu, 15 Apr 2010 20:21:21 +0000 Subject: [PATCH] Fixes for broken move to EAPI=3 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sci-libs/blas-atlas/ChangeLog | 8 +++++++- ...atlas-3.9.23-r1.ebuild => blas-atlas-3.9.23-r2.ebuild} | 4 ++-- sci-libs/lapack-atlas/ChangeLog | 8 +++++++- ...las-3.9.23-r1.ebuild => lapack-atlas-3.9.23-r2.ebuild} | 7 +++---- 4 files changed, 19 insertions(+), 8 deletions(-) rename sci-libs/blas-atlas/{blas-atlas-3.9.23-r1.ebuild => blas-atlas-3.9.23-r2.ebuild} (98%) rename sci-libs/lapack-atlas/{lapack-atlas-3.9.23-r1.ebuild => lapack-atlas-3.9.23-r2.ebuild} (97%) diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog index 420183e23a26..693745bc604d 100644 --- a/sci-libs/blas-atlas/ChangeLog +++ b/sci-libs/blas-atlas/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/blas-atlas # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.98 2010/03/07 16:56:06 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.99 2010/04/15 20:20:43 jlec Exp $ + +*blas-atlas-3.9.23-r2 (15 Apr 2010) + + 15 Apr 2010; Justin Lecher -blas-atlas-3.9.23-r1.ebuild, + +blas-atlas-3.9.23-r2.ebuild: + Fixes for broken move to EAPI=3 *blas-atlas-3.9.23-r1 (07 Mar 2010) diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.23-r1.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild similarity index 98% rename from sci-libs/blas-atlas/blas-atlas-3.9.23-r1.ebuild rename to sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild index 8e37a3abb05c..41e155c1291a 100644 --- a/sci-libs/blas-atlas/blas-atlas-3.9.23-r1.ebuild +++ b/sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23-r1.ebuild,v 1.2 2010/03/07 23:25:28 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild,v 1.1 2010/04/15 20:20:43 jlec Exp $ EAPI="3" @@ -76,7 +76,7 @@ src_prepare() { mkdir "${BLD_DIR}" || die "failed to generate build directory" cd "${BLD_DIR}" cp "${FILESDIR}"/war . && chmod a+x war || die "failed to install war" - sed -i -e '1c\#! '"${EPREFIX}"'/bin/bash' war || die + sed -i -e '1c\#!'"${EPREFIX}"'/bin/bash' war || die } src_configure() { diff --git a/sci-libs/lapack-atlas/ChangeLog b/sci-libs/lapack-atlas/ChangeLog index 7fdab60a75f2..d55d4cba702b 100644 --- a/sci-libs/lapack-atlas/ChangeLog +++ b/sci-libs/lapack-atlas/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/lapack-atlas # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.79 2010/03/07 20:25:14 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.80 2010/04/15 20:21:21 jlec Exp $ + +*lapack-atlas-3.9.23-r2 (15 Apr 2010) + + 15 Apr 2010; Justin Lecher + -lapack-atlas-3.9.23-r1.ebuild, +lapack-atlas-3.9.23-r2.ebuild: + Fixes for broken move to EAPI=3 *lapack-atlas-3.9.23-r1 (07 Mar 2010) diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r1.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild similarity index 97% rename from sci-libs/lapack-atlas/lapack-atlas-3.9.23-r1.ebuild rename to sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild index fc95583f3f9c..7f77f45a2ed0 100644 --- a/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r1.ebuild +++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r1.ebuild,v 1.3 2010/03/07 21:45:06 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild,v 1.1 2010/04/15 20:21:21 jlec Exp $ EAPI="3" @@ -22,8 +22,8 @@ SRC_URI="${SRC_URI1} ${SRC_URI2} mirror://gentoo/${L_PN}-reference-${L_PV}-autotools.patch.bz2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="doc" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" CDEPEND="virtual/blas virtual/cblas @@ -66,8 +66,7 @@ src_prepare() { mkdir "${BLD_DIR}" || die "failed to generate build directory" cd "${BLD_DIR}" cp "${FILESDIR}"/war . && chmod a+x war || die "failed to install war" - sed -i -e '1c\#! '"${EPREFIX}"'/bin/bash' \ - -e '/^\$ARCHIVER \$@$/i\shift' war + sed -i -e '1c\#! '"${EPREFIX}"'/bin/bash' war cd "${S_LAPACK}" epatch "${WORKDIR}"/${L_PN}-reference-${L_PV}-autotools.patch epatch "${FILESDIR}"/${L_PN}-reference-${L_PV}-test-fix.patch -- 2.26.2