summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-02-28 21:24:00 +0000
committerMichał Górny <mgorny@gentoo.org>2014-02-28 21:24:00 +0000
commit9d90d2f0743be8c69f0aa314492e0ef84f4b2172 (patch)
tree562aaf4d1e469ab5fe63f7d2c07e04754ce25235
parentMask new emul-linux-x86-gtklibs. (diff)
downloadgentoo-2-9d90d2f0743be8c69f0aa314492e0ef84f4b2172.tar.gz
gentoo-2-9d90d2f0743be8c69f0aa314492e0ef84f4b2172.tar.bz2
gentoo-2-9d90d2f0743be8c69f0aa314492e0ef84f4b2172.zip
Add missing emul-linux blocker.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
-rw-r--r--x11-libs/cairo/ChangeLog5
-rw-r--r--x11-libs/cairo/cairo-1.12.16-r1.ebuild6
2 files changed, 9 insertions, 2 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 1ebb0a29bba6..4fb7caf6f2ff 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,9 @@
# 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.359 2014/02/28 20:42:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.360 2014/02/28 21:24:00 mgorny Exp $
+
+ 28 Feb 2014; Michał Górny <mgorny@gentoo.org> cairo-1.12.16-r1.ebuild:
+ Add missing emul-linux blocker.
*cairo-1.12.16-r1 (28 Feb 2014)
diff --git a/x11-libs/cairo/cairo-1.12.16-r1.ebuild b/x11-libs/cairo/cairo-1.12.16-r1.ebuild
index c17462589027..fb348f4e3493 100644
--- a/x11-libs/cairo/cairo-1.12.16-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.12.16-r1.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-r1.ebuild,v 1.1 2014/02/28 20:42:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r1.ebuild,v 1.2 2014/02/28 21:24:00 mgorny Exp $
EAPI=5
@@ -48,6 +48,10 @@ RDEPEND="dev-libs/lzo[${MULTILIB_USEDEP}]
)
xcb? (
x11-libs/libxcb[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
)"
DEPEND="${RDEPEND}
virtual/pkgconfig