diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-04-28 17:50:00 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-04-28 17:50:00 +0000 |
| commit | c4e708611da01c984080b76477a5ef9fc8132bfa (patch) | |
| tree | fd6934aa4596c3afd878f64e2ebc1f1f09536e74 /x11-libs | |
| parent | Replace multilib_build_binaries with multilib_is_native_abi, in order to put ... (diff) | |
| download | gentoo-2-c4e708611da01c984080b76477a5ef9fc8132bfa.tar.gz gentoo-2-c4e708611da01c984080b76477a5ef9fc8132bfa.tar.bz2 gentoo-2-c4e708611da01c984080b76477a5ef9fc8132bfa.zip | |
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!)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/cairo/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-libs/cairo/cairo-1.12.16-r2.ebuild | 6 | ||||
| -rw-r--r-- | x11-libs/cairo/cairo-9999.ebuild | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog index a9c3bb0b77f9..09309f29d938 100644 --- a/x11-libs/cairo/ChangeLog +++ b/x11-libs/cairo/ChangeLog @@ -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 <mgorny@gentoo.org> 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 <tetromino@gentoo.org> metadata.xml: Move myself to primary maintainer in light of Ben's email diff --git a/x11-libs/cairo/cairo-1.12.16-r2.ebuild b/x11-libs/cairo/cairo-1.12.16-r2.ebuild index c706dd40f46a..b966247730b7 100644 --- a/x11-libs/cairo/cairo-1.12.16-r2.ebuild +++ b/x11-libs/cairo/cairo-1.12.16-r2.ebuild @@ -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 @@ multilib_src_configure() { # 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 diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index a2775f0fa89d..72c61c69fe8a 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.ebuild @@ -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 @@ multilib_src_configure() { # 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 |