diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-05-01 13:33:43 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-05-01 13:33:43 +0000 |
| commit | a0a98dff69e617436d7dd519af5f1656e36beeed (patch) | |
| tree | 30cadbb3433d498b66131e3d0f182bb9e76d1ec2 | |
| parent | convert to python-single-r1 wrt #467234 and fix build with automake-1.13 wrt ... (diff) | |
| download | gentoo-2-a0a98dff69e617436d7dd519af5f1656e36beeed.tar.gz gentoo-2-a0a98dff69e617436d7dd519af5f1656e36beeed.tar.bz2 gentoo-2-a0a98dff69e617436d7dd519af5f1656e36beeed.zip | |
sci-libs/fftw: Fix blocker of incompatible emul package versions, thanks mgorny
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
| -rw-r--r-- | sci-libs/fftw/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/fftw/fftw-3.3.3-r1.ebuild | 4 | ||||
| -rw-r--r-- | sci-libs/fftw/fftw-3.3.3-r2.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog index 8a606ee083a6..b1f08bc26203 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.140 2013/04/17 06:26:21 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.141 2013/05/01 13:33:43 jlec Exp $ + + 01 May 2013; Justin Lecher <jlec@gentoo.org> fftw-3.3.3-r1.ebuild, + fftw-3.3.3-r2.ebuild: + Fix blocker of incompatible emul package versions, thanks mgorny 17 Apr 2013; Justin Lecher <jlec@gentoo.org> fftw-2.1.5-r8.ebuild, +files/fftw-2.1.5-texinfo5.1.patch: diff --git a/sci-libs/fftw/fftw-3.3.3-r1.ebuild b/sci-libs/fftw/fftw-3.3.3-r1.ebuild index df2831175c2a..fe270f6d74ac 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.3 2013/03/10 18:47:22 jlec Exp $ +# $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 $ EAPI=5 @@ -22,7 +22,7 @@ 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-20121202 )" + abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )" 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 975d7333d8c1..25b71b98ba07 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.1 2013/03/10 18:47:22 jlec Exp $ +# $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 $ EAPI=5 @@ -23,7 +23,7 @@ REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )" RDEPEND=" mpi? ( virtual/mpi ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20121202 )" + abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )" DEPEND="${RDEPEND} test? ( dev-lang/perl )" |