mgorny 14/05/24 22:14:53 Modified: fftw-3.3.3-r3.ebuild fftw-3.3.4.ebuild ChangeLog Log: Fix the variant-obtaining hack after changes to build dir naming in multilib-build. Bug #511198. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.3 sci-libs/fftw/fftw-3.3.3-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r3.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r3.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r3.ebuild?r1=1.2&r2=1.3 Index: fftw-3.3.3-r3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r3.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fftw-3.3.3-r3.ebuild 21 Oct 2013 13:29:10 -0000 1.2 +++ fftw-3.3.3-r3.ebuild 24 May 2014 22:14:53 -0000 1.3 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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-r3.ebuild,v 1.2 2013/10/21 13:29:10 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r3.ebuild,v 1.3 2014/05/24 22:14:53 mgorny Exp $ EAPI=5 @@ -81,7 +81,7 @@ my_configure() { #a bit hacky improve after #483758 is solved - local x=${BUILD_DIR%-${ABI}} + local x=${BUILD_DIR%-*} x=${x##*-} # there is no abi_x86_32 port of virtual/mpi right now local enable_mpi=$(use_enable mpi) 1.2 sci-libs/fftw/fftw-3.3.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild?r1=1.1&r2=1.2 Index: fftw-3.3.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fftw-3.3.4.ebuild 22 Apr 2014 19:42:37 -0000 1.1 +++ fftw-3.3.4.ebuild 24 May 2014 22:14:53 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.1 2014/04/22 19:42:37 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.2 2014/05/24 22:14:53 mgorny Exp $ EAPI=5 @@ -79,7 +79,7 @@ my_configure() { #a bit hacky improve after #483758 is solved - local x=${BUILD_DIR%-${ABI}} + local x=${BUILD_DIR%-*} x=${x##*-} # there is no abi_x86_32 port of virtual/mpi right now local enable_mpi=$(use_enable mpi) 1.157 sci-libs/fftw/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.157&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.157&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?r1=1.156&r2=1.157 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- ChangeLog 22 Apr 2014 19:42:37 -0000 1.156 +++ ChangeLog 24 May 2014 22:14:53 -0000 1.157 @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/fftw # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.156 2014/04/22 19:42:37 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.157 2014/05/24 22:14:53 mgorny Exp $ + + 24 May 2014; Michał Górny <mgo...@gentoo.org> fftw-3.3.3-r3.ebuild, + fftw-3.3.4.ebuild: + Fix the variant-obtaining hack after changes to build dir naming in multilib- + build. Bug #511198. *fftw-3.3.4 (22 Apr 2014)
