diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-06-27 14:30:29 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-06-27 14:30:29 +0000 |
| commit | 8f7bb8921993d7022cdff58b144a456163d445c0 (patch) | |
| tree | 2062b4c358dcb3b36d26b28bb2232ecd6547854b /sci-libs/fftw | |
| parent | Add myself as maintainer, add live ebuild for python3 fork, fix unquited vari... (diff) | |
| download | gentoo-2-8f7bb8921993d7022cdff58b144a456163d445c0.tar.gz gentoo-2-8f7bb8921993d7022cdff58b144a456163d445c0.tar.bz2 gentoo-2-8f7bb8921993d7022cdff58b144a456163d445c0.zip | |
fix emul-linux blocker
(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'sci-libs/fftw')
| -rw-r--r-- | sci-libs/fftw/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/fftw/fftw-3.3.3-r1.ebuild | 5 | ||||
| -rw-r--r-- | sci-libs/fftw/fftw-3.3.3-r2.ebuild | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog index abc168a551ab..b0d634e79121 100644 --- a/sci-libs/fftw/ChangeLog +++ b/sci-libs/fftw/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/fftw # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.142 2013/05/03 14:19:13 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.143 2013/06/27 14:30:29 aballier Exp $ + + 27 Jun 2013; Alexis Ballier <aballier@gentoo.org> fftw-3.3.3-r1.ebuild, + fftw-3.3.3-r2.ebuild: + fix emul-linux blocker 03 May 2013; Justin Lecher <jlec@gentoo.org> fftw-2.1.5-r8.ebuild: Fix obsolete macros to work with automake-1.13, #468456 diff --git a/sci-libs/fftw/fftw-3.3.3-r1.ebuild b/sci-libs/fftw/fftw-3.3.3-r1.ebuild index fe270f6d74ac..9c192d6e6606 100644 --- a/sci-libs/fftw/fftw-3.3.3-r1.ebuild +++ b/sci-libs/fftw/fftw-3.3.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v 1.4 2013/05/01 13:33:43 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v 1.5 2013/06/27 14:30:29 aballier Exp $ EAPI=5 @@ -22,7 +22,8 @@ IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )" RDEPEND="mpi? ( virtual/mpi ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )" + abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} test? ( dev-lang/perl )" diff --git a/sci-libs/fftw/fftw-3.3.3-r2.ebuild b/sci-libs/fftw/fftw-3.3.3-r2.ebuild index 25b71b98ba07..254109334a14 100644 --- a/sci-libs/fftw/fftw-3.3.3-r2.ebuild +++ b/sci-libs/fftw/fftw-3.3.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v 1.2 2013/05/01 13:33:43 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v 1.3 2013/06/27 14:30:29 aballier Exp $ EAPI=5 @@ -23,7 +23,8 @@ REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )" RDEPEND=" mpi? ( virtual/mpi ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )" + abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} test? ( dev-lang/perl )" |