diff options
| author |   Thomas Sachau <tommy@gentoo.org> | 2014-05-02 09:51:49 +0000 |
|---|---|---|
| committer | Thomas Sachau <tommy@gentoo.org> | 2014-05-02 09:51:49 +0000 |
| commit | a8b90026bc23eb8f6ccd5ca2cfc96caa37f8d6cf (patch) | |
| tree | cfd2be690f205423755945ab87b4a054aa76ac32 /x11-libs | |
| parent | bump; drop pypy2_0 add py3.4 support (diff) | |
| download | gentoo-2-a8b90026bc23eb8f6ccd5ca2cfc96caa37f8d6cf.tar.gz gentoo-2-a8b90026bc23eb8f6ccd5ca2cfc96caa37f8d6cf.tar.bz2 gentoo-2-a8b90026bc23eb8f6ccd5ca2cfc96caa37f8d6cf.zip | |
Revert previous commit, multilib_is_native_abi now includes multilib_build_binaries functionality
(Portage version: 2.2.6-r1/cvs/Linux x86_64, signed Manifest commit with key 0x35899067)
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 952b9c45d069..bb5f2555a465 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.374 2014/05/02 09:46:46 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.375 2014/05/02 09:51:49 tommy Exp $ + + 02 May 2014; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> + cairo-1.10.2-r3.ebuild, cairo-1.12.14-r4.ebuild, cairo-1.12.16-r2.ebuild, + cairo-1.12.16.ebuild, cairo-9999.ebuild: + Revert previous commit, multilib_is_native_abi now includes + multilib_build_binaries functionality 02 May 2014; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> cairo-1.10.2-r3.ebuild, cairo-1.12.14-r4.ebuild, cairo-1.12.16-r2.ebuild, diff --git a/x11-libs/cairo/cairo-1.12.16-r2.ebuild b/x11-libs/cairo/cairo-1.12.16-r2.ebuild index 3549df319435..4d8aec75e079 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.3 2014/05/02 09:46:46 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r2.ebuild,v 1.4 2014/05/02 09:51:49 tommy 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 78459a58c950..d5531b58f83b 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.40 2014/05/02 09:46:46 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.41 2014/05/02 09:51:49 tommy 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 |