mgorny 14/04/28 17:45:05 Modified: file-5.18-r1.ebuild file-9999.ebuild ChangeLog Log: Replace multilib_build_binaries with multilib_is_native_abi, in order to put an end to the confusion introduced by having two functions, the proper one suggesting it is just for binaries. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.3 sys-apps/file/file-5.18-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/file-5.18-r1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/file-5.18-r1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/file-5.18-r1.ebuild?r1=1.2&r2=1.3 Index: file-5.18-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.18-r1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- file-5.18-r1.ebuild 27 Mar 2014 14:46:18 -0000 1.2 +++ file-5.18-r1.ebuild 28 Apr 2014 17:45:05 -0000 1.3 @@ -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/sys-apps/file/file-5.18-r1.ebuild,v 1.2 2014/03/27 14:46:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.18-r1.ebuild,v 1.3 2014/04/28 17:45:05 mgorny Exp $ EAPI="4" PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 ) @@ -72,7 +72,7 @@ } multilib_src_compile() { - if multilib_build_binaries ; then + if multilib_is_native_abi ; then emake else emake -C src libmagic.la @@ -90,7 +90,7 @@ } multilib_src_install() { - if multilib_build_binaries ; then + if multilib_is_native_abi ; then default else emake -C src install-{includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" 1.7 sys-apps/file/file-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/file-9999.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/file-9999.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/file-9999.ebuild?r1=1.6&r2=1.7 Index: file-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/file/file-9999.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- file-9999.ebuild 27 Mar 2014 03:30:14 -0000 1.6 +++ file-9999.ebuild 28 Apr 2014 17:45:05 -0000 1.7 @@ -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/sys-apps/file/file-9999.ebuild,v 1.6 2014/03/27 03:30:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-9999.ebuild,v 1.7 2014/04/28 17:45:05 mgorny Exp $ EAPI="4" PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 ) @@ -70,7 +70,7 @@ } multilib_src_compile() { - if multilib_build_binaries ; then + if multilib_is_native_abi ; then emake else emake -C src libmagic.la @@ -88,7 +88,7 @@ } multilib_src_install() { - if multilib_build_binaries ; then + if multilib_is_native_abi ; then default else emake -C src install-{includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" 1.274 sys-apps/file/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/ChangeLog?rev=1.274&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/ChangeLog?rev=1.274&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/ChangeLog?r1=1.273&r2=1.274 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v retrieving revision 1.273 retrieving revision 1.274 diff -u -r1.273 -r1.274 --- ChangeLog 27 Mar 2014 14:46:18 -0000 1.273 +++ ChangeLog 28 Apr 2014 17:45:05 -0000 1.274 @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/file # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.273 2014/03/27 14:46:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.274 2014/04/28 17:45:05 mgorny Exp $ + + 28 Apr 2014; Michał Górny <mgo...@gentoo.org> file-5.18-r1.ebuild, + file-9999.ebuild: + Replace multilib_build_binaries with multilib_is_native_abi, in order to put + an end to the confusion introduced by having two functions, the proper one + suggesting it is just for binaries. 27 Mar 2014; Samuli Suominen <ssuomi...@gentoo.org> file-5.18-r1.ebuild: Update blockers for libmagic.so* wrt #505936 by Graham Murray
