mgorny 14/04/28 17:36:49 Modified: libpcre-8.34.ebuild libpcre-8.35.ebuild ChangeLog Log: Replace multilib_build_binaries with multilib_is_native_abi. The two are equivalent now, and the team has decided to use the old name as being less confusing. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.4 dev-libs/libpcre/libpcre-8.34.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpcre/libpcre-8.34.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpcre/libpcre-8.34.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpcre/libpcre-8.34.ebuild?r1=1.3&r2=1.4 Index: libpcre-8.34.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.34.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libpcre-8.34.ebuild 18 Jan 2014 04:23:16 -0000 1.3 +++ libpcre-8.34.ebuild 28 Apr 2014 17:36:49 -0000 1.4 @@ -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/dev-libs/libpcre/libpcre-8.34.ebuild,v 1.3 2014/01/18 04:23:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.34.ebuild,v 1.4 2014/04/28 17:36:49 mgorny Exp $ EAPI="4" @@ -57,8 +57,8 @@ $(use_enable jit) $(use_enable jit pcregrep-jit) \ $(use_enable pcre16) \ $(use_enable pcre32) \ - $(multilib_build_binaries && use_enable libedit pcretest-libedit) \ - $(multilib_build_binaries && use_enable readline pcretest-libreadline) \ + $(multilib_is_native_abi && use_enable libedit pcretest-libedit) \ + $(multilib_is_native_abi && use_enable readline pcretest-libreadline) \ $(use_enable static-libs static) \ $(use_enable unicode utf) $(use_enable unicode unicode-properties) \ $(multilib_is_native_abi && use_enable zlib pcregrep-libz) \ @@ -75,7 +75,7 @@ multilib_src_install() { emake \ DESTDIR="${D}" \ - $(multilib_build_binaries || echo "bin_PROGRAMS=") \ + $(multilib_is_native_abi || echo "bin_PROGRAMS=") \ $(multilib_is_native_abi || echo "dist_html_DATA=") \ install multilib_is_native_abi && gen_usr_ldscript -a pcre 1.3 dev-libs/libpcre/libpcre-8.35.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpcre/libpcre-8.35.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpcre/libpcre-8.35.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpcre/libpcre-8.35.ebuild?r1=1.2&r2=1.3 Index: libpcre-8.35.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.35.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libpcre-8.35.ebuild 21 Apr 2014 07:32:16 -0000 1.2 +++ libpcre-8.35.ebuild 28 Apr 2014 17:36:49 -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/dev-libs/libpcre/libpcre-8.35.ebuild,v 1.2 2014/04/21 07:32:16 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.35.ebuild,v 1.3 2014/04/28 17:36:49 mgorny Exp $ EAPI="4" @@ -69,15 +69,15 @@ } multilib_src_compile() { - emake V=1 $(multilib_build_binaries || echo "bin_PROGRAMS=") + emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=") } multilib_src_install() { emake \ DESTDIR="${D}" \ - $(multilib_build_binaries || echo "bin_PROGRAMS= dist_html_DATA=") \ + $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ install - multilib_build_binaries && gen_usr_ldscript -a pcre + multilib_is_native_abi && gen_usr_ldscript -a pcre } multilib_src_install_all() { 1.231 dev-libs/libpcre/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpcre/ChangeLog?rev=1.231&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpcre/ChangeLog?rev=1.231&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpcre/ChangeLog?r1=1.230&r2=1.231 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- ChangeLog 21 Apr 2014 07:32:16 -0000 1.230 +++ ChangeLog 28 Apr 2014 17:36:49 -0000 1.231 @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/libpcre # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.230 2014/04/21 07:32:16 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.231 2014/04/28 17:36:49 mgorny Exp $ + + 28 Apr 2014; Michał Górny <mgo...@gentoo.org> libpcre-8.34.ebuild, + libpcre-8.35.ebuild: + Replace multilib_build_binaries with multilib_is_native_abi. The two are + equivalent now, and the team has decided to use the old name as being less + confusing. 21 Apr 2014; Michał Górny <mgo...@gentoo.org> libpcre-8.35.ebuild: Use multilib_build_binaries consistently, and the new multilib_native_use*
