mgorny 14/04/28 17:50:00 Modified: cairo-9999.ebuild cairo-1.12.16-r2.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.39 x11-libs/cairo/cairo-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.39&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.39&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?r1=1.38&r2=1.39 Index: cairo-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- cairo-9999.ebuild 20 Apr 2014 17:55:37 -0000 1.38 +++ cairo-9999.ebuild 28 Apr 2014 17:50:00 -0000 1.39 @@ -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/x11-libs/cairo/cairo-9999.ebuild,v 1.38 2014/04/20 17:55:37 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.39 2014/04/28 17:50:00 mgorny Exp $ EAPI=5 @@ -113,12 +113,12 @@ # TODO: remove this (and add USE-dep) when DirectFB is converted, # bug #484248 -- but beware of the circular dep. - if ! multilib_build_binaries; then + if ! multilib_is_native_abi; then myopts+=" --disable-directfb" fi # TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010 - if ! multilib_build_binaries; then + if ! multilib_is_native_abi; then myopts+=" --disable-qt" fi 1.2 x11-libs/cairo/cairo-1.12.16-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r2.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r2.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r2.ebuild?r1=1.1&r2=1.2 Index: cairo-1.12.16-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cairo-1.12.16-r2.ebuild 20 Apr 2014 17:55:37 -0000 1.1 +++ cairo-1.12.16-r2.ebuild 28 Apr 2014 17:50:00 -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/x11-libs/cairo/cairo-1.12.16-r2.ebuild,v 1.1 2014/04/20 17:55:37 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r2.ebuild,v 1.2 2014/04/28 17:50:00 mgorny Exp $ EAPI=5 @@ -113,12 +113,12 @@ # TODO: remove this (and add USE-dep) when DirectFB is converted, # bug #484248 -- but beware of the circular dep. - if ! multilib_build_binaries; then + if ! multilib_is_native_abi; then myopts+=" --disable-directfb" fi # TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010 - if ! multilib_build_binaries; then + if ! multilib_is_native_abi; then myopts+=" --disable-qt" fi 1.373 x11-libs/cairo/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.373&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.373&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.372&r2=1.373 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v retrieving revision 1.372 retrieving revision 1.373 diff -u -r1.372 -r1.373 --- ChangeLog 20 Apr 2014 18:00:01 -0000 1.372 +++ ChangeLog 28 Apr 2014 17:50:00 -0000 1.373 @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/cairo # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.372 2014/04/20 18:00:01 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.373 2014/04/28 17:50:00 mgorny Exp $ + + 28 Apr 2014; Michał Górny <[email protected]> cairo-1.12.16-r2.ebuild, + cairo-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. 20 Apr 2014; Alexandre Rostovtsev <[email protected]> metadata.xml: Move myself to primary maintainer in light of Ben's email
